1 files changed, 26 insertions, 58 deletions

diff --git a/OpenSim/Services/Connectors/User/UserServiceConnector.cs b/OpenSim/Server/Handlers/Hypergrid/GatekeeperServerConnector.cs
index 683990f..f2d9321 100644
--- a/OpenSim/Services/Connectors/User/UserServiceConnector.cs
+++ b/OpenSim/Server/Handlers/Hypergrid/GatekeeperServerConnector.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) Contributors, http://opensimulator.org/
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
@@ -25,90 +25,58 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using log4net;
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Reflection;
 using Nini.Config;
 using OpenSim.Framework;
-using OpenSim.Framework.Communications;
-using OpenSim.Framework.Servers.HttpServer;
+using OpenSim.Server.Base;
 using OpenSim.Services.Interfaces;
-using OpenMetaverse;
+using OpenSim.Framework.Servers.HttpServer;
+using OpenSim.Server.Handlers.Base;
 
-namespace OpenSim.Services.Connectors
+using log4net;
+
+namespace OpenSim.Server.Handlers.Hypergrid
 {
-    public class UserServicesConnector : IUserAccountService
+    public class GatekeeperServiceInConnector : ServiceConnector
     {
         private static readonly ILog m_log =
                 LogManager.GetLogger(
                 MethodBase.GetCurrentMethod().DeclaringType);
 
-//        private string m_ServerURI = String.Empty;
-
-        public UserServicesConnector()
+        private IGatekeeperService m_GatekeeperService;
+        public IGatekeeperService GateKeeper
         {
+            get { return m_GatekeeperService; }
         }
 
-        public UserServicesConnector(string serverURI)
+        public GatekeeperServiceInConnector(IConfigSource config, IHttpServer server, ISimulationService simService) :
+                base(config, server, String.Empty)
         {
-//            m_ServerURI = serverURI.TrimEnd('/');
-        }
-
-        public UserServicesConnector(IConfigSource source)
-        {
-            Initialise(source);
-        }
-
-        public virtual void Initialise(IConfigSource source)
-        {
-            IConfig assetConfig = source.Configs["UserService"];
-            if (assetConfig == null)
+            IConfig gridConfig = config.Configs["GatekeeperService"];
+            if (gridConfig != null)
             {
-                m_log.Error("[USER CONNECTOR]: UserService missing from OpanSim.ini");
-                throw new Exception("User connector init error");
-            }
+                string serviceDll = gridConfig.GetString("LocalServiceModule", string.Empty);
+                Object[] args = new Object[] { config, simService };
+                m_GatekeeperService = ServerUtils.LoadPlugin<IGatekeeperService>(serviceDll, args);
 
-            string serviceURI = assetConfig.GetString("UserServerURI",
-                    String.Empty);
-
-            if (serviceURI == String.Empty)
-            {
-                m_log.Error("[USER CONNECTOR]: No Server URI named in section UserService");
-                throw new Exception("User connector init error");
             }
-            //m_ServerURI = serviceURI;
-        }
+            if (m_GatekeeperService == null)
+                throw new Exception("Gatekeeper server connector cannot proceed because of missing service");
 
-        public UserAccount GetUserAccount(UUID scopeID, string firstName, string lastName)
-        {
-            return null;
-        }
+            HypergridHandlers hghandlers = new HypergridHandlers(m_GatekeeperService);
+            server.AddXmlRPCHandler("link_region", hghandlers.LinkRegionRequest, false);
+            server.AddXmlRPCHandler("get_region", hghandlers.GetRegion, false);
 
-        public UserAccount GetUserAccount(UUID scopeID, UUID userID)
-        {
-            return null;
-        }
+            server.AddHTTPHandler("/foreignagent/", new GatekeeperAgentHandler(m_GatekeeperService).Handler);
 
-        public bool SetHomePosition(UserAccount data, UUID regionID, UUID regionSecret)
-        {
-            return false;
-        }
-
-        public bool SetUserAccount(UserAccount data, UUID principalID, string token)
-        {
-            return false;
         }
 
-        public bool CreateUserAccount(UserAccount data, UUID principalID, string token)
+        public GatekeeperServiceInConnector(IConfigSource config, IHttpServer server)
+            : this(config, server, null)
         {
-            return false;
         }
 
-        public List<UserAccount> GetUserAccount(UUID scopeID, string query)
-        {
-            return null;
-        }
     }
 }