2 files changed, 11 insertions, 42 deletions

diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs
index 5bf728a..d598728 100644
--- a/OpenSim/Grid/UserServer/Main.cs
+++ b/OpenSim/Grid/UserServer/Main.cs
@@ -66,8 +66,6 @@ namespace OpenSim.Grid.UserServer
         public UserLoginService m_loginService;
         public MessageServersConnector m_messagesService;
 
-        protected GridInfoServiceModule m_gridInfoService;
-
         protected UserServerCommandModule m_consoleCommandModule;
         protected UserServerEventDispatchModule m_eventDispatcher;
 
@@ -213,9 +211,6 @@ namespace OpenSim.Grid.UserServer
 
             m_messagesService = new MessageServersConnector();
             m_messagesService.Initialise(this);
-
-            m_gridInfoService = new GridInfoServiceModule();
-            m_gridInfoService.Initialise(this);
         }
 
         protected virtual void StartOtherComponents(IInterServiceInventoryServices inventoryService)
@@ -252,7 +247,6 @@ namespace OpenSim.Grid.UserServer
             m_userDataBaseService.PostInitialise();
             m_messagesService.PostInitialise();
             m_eventDispatcher.PostInitialise(); //it will register event handlers in here
-            m_gridInfoService.PostInitialise();
             m_userManager.PostInitialise();
             m_avatarAppearanceModule.PostInitialise();
             m_friendsModule.PostInitialise();
@@ -266,7 +260,6 @@ namespace OpenSim.Grid.UserServer
             m_friendsModule.RegisterHandlers(m_httpServer);
             m_avatarAppearanceModule.RegisterHandlers(m_httpServer);
             m_messagesService.RegisterHandlers(m_httpServer);
-            m_gridInfoService.RegisterHandlers(m_httpServer);
         }
 
         public override void ShutdownSpecific()
diff --git a/OpenSim/Grid/UserServer.Modules/GridInfoServiceModule.cs b/OpenSim/Server/Handlers/Grid/GridInfoServerInConnector.cs
index 0c84348..c9e80d9 100644
--- a/OpenSim/Grid/UserServer.Modules/GridInfoServiceModule.cs
+++ b/OpenSim/Server/Handlers/Grid/GridInfoServerInConnector.cs
@@ -27,53 +27,29 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Reflection;
 using log4net;
-using log4net.Config;
 using OpenMetaverse;
+using Nini.Config;
 using OpenSim.Framework;
-using OpenSim.Framework.Communications;
-using OpenSim.Framework.Communications.Services;
-using OpenSim.Framework.Communications.Cache;
-using OpenSim.Framework.Servers;
 using OpenSim.Framework.Servers.HttpServer;
-using OpenSim.Grid.Communications.OGS1;
-using OpenSim.Grid.Framework;
+using OpenSim.Server.Handlers.Base;
 
-namespace OpenSim.Grid.UserServer.Modules
+namespace OpenSim.Server.Handlers.Grid
 {
-    public class GridInfoServiceModule
+    public class GridInfoServerInConnector : ServiceConnector
     {
-        protected IGridServiceCore m_core;
-        protected GridInfoService m_gridInfoService;
-        protected BaseHttpServer m_httpServer;
+        private string m_ConfigName = "GridInfoService";
 
-        public GridInfoServiceModule()
-        {
-        }
-
-        public void Initialise(IGridServiceCore core)
-        {
-            m_core = core;
-            m_gridInfoService = new GridInfoService();
-        }
-
-        public void PostInitialise()
+        public GridInfoServerInConnector(IConfigSource config, IHttpServer server, string configName) :
+            base(config, server, configName)
         {
+            GridInfoHandlers handlers = new GridInfoHandlers(config);
 
+            server.AddStreamHandler(new RestStreamHandler("GET", "/get_grid_info",
+                                                               handlers.RestGetGridInfoMethod));
+            server.AddXmlRPCHandler("get_grid_info", handlers.XmlRpcGridInfoMethod);
         }
 
-        public void RegisterHandlers(BaseHttpServer httpServer)
-        {
-            m_httpServer = httpServer;
-            m_httpServer.AddStreamHandler(new RestStreamHandler("GET", "/get_grid_info",
-                                                               m_gridInfoService.RestGetGridInfoMethod));
-            m_httpServer.AddXmlRPCHandler("get_grid_info", m_gridInfoService.XmlRpcGridInfoMethod);
-        }
-
-        public void Close()
-        {
-        }
     }
 }