1 files changed, 33 insertions, 1 deletions

diff --git a/OpenSim/Grid/GridServer/GridServerBase.cs b/OpenSim/Grid/GridServer/GridServerBase.cs
index faf1d8b..c29924b 100644
--- a/OpenSim/Grid/GridServer/GridServerBase.cs
+++ b/OpenSim/Grid/GridServer/GridServerBase.cs
@@ -28,9 +28,14 @@
 using System;
 using System.IO;
 using System.Timers;
+using System.Collections;
+using System.Collections.Generic;
 using OpenSim.Framework;
 using OpenSim.Framework.Console;
 using OpenSim.Framework.Servers;
+using Nwc.XmlRpc;
+using Mono.Addins;
+using Mono.Addins.Description;
 
 namespace OpenSim.Grid.GridServer
 {
@@ -40,6 +45,13 @@ namespace OpenSim.Grid.GridServer
     {
         protected GridConfig m_config;
         protected GridManager m_gridManager;
+                protected BaseHttpServer httpServer;
+        protected List<IGridPlugin> m_plugins = new List<IGridPlugin>();
+
+        public BaseHttpServer
+                {
+                        get { return httpServer; }
+                }
 
         public void Work()
         {
@@ -76,7 +88,7 @@ namespace OpenSim.Grid.GridServer
             SetupGridManager();
 
             m_console.Status("[GRID]: Starting HTTP process");
-            BaseHttpServer httpServer = new BaseHttpServer(m_config.HttpPort);
+            httpServer = new BaseHttpServer(m_config.HttpPort);
             //GridManagementAgent GridManagerAgent = new GridManagementAgent(httpServer, "gridserver", m_config.SimSendKey, m_config.SimRecvKey, managercallback);
 
             httpServer.AddXmlRPCHandler("simulator_login", m_gridManager.XmlRpcSimulatorLoginMethod);
@@ -99,6 +111,8 @@ namespace OpenSim.Grid.GridServer
             //httpServer.AddRestHandler("GET", "/regions/", m_gridManager.RestGetRegionMethod);
             //httpServer.AddRestHandler("POST", "/regions/", m_gridManager.RestSetRegionMethod);
 
+            LoadGridPlugins();
+
             httpServer.Start();
 
             m_console.Status("[GRID]: Starting sim status checker");
@@ -108,6 +122,23 @@ namespace OpenSim.Grid.GridServer
             simCheckTimer.Enabled = true;
         }
 
+        protected void LoadGridPlugins()
+        {
+            //m_console.Status("[GRIDPLUGINS]: Looking for plugins");
+            AddinManager.Initialize(".");
+            AddinManager.Registry.Update(null);
+
+            ExtensionNodeList nodes = AddinManager.GetExtensionNodes("/OpenSim/GridServer");
+            foreach (TypeExtensionNode node in nodes)
+            {
+                m_console.Status("[GRIDPLUGINS]: Loading OpenSim plugin "+node.Path);
+                IGridPlugin plugin = (IGridPlugin) node.CreateInstance();
+                plugin.Initialise(this);
+                m_plugins.Add(plugin);
+            }
+        }
+                
+
         protected virtual void SetupGridManager()
         {
             m_console.Status("[GRID]: Connecting to Storage Server");
@@ -169,6 +200,7 @@ namespace OpenSim.Grid.GridServer
                     break;                                        
 
                 case "shutdown":
+                    foreach(IGridPlugin plugin in m_plugins) plugin.Close();
                     m_console.Close();
                     Environment.Exit(0);
                     break;