Fix loading modules with alternate configurations and ports into ROBUST.

Make all current modules support the configuration name option

11 files changed, 49 insertions, 33 deletions

diff --git a/OpenSim/Server/Handlers/Asset/AssetServerConnector.cs b/OpenSim/Server/Handlers/Asset/AssetServerConnector.cs
index 7c74e05..f7eb292 100644
--- a/OpenSim/Server/Handlers/Asset/AssetServerConnector.cs
+++ b/OpenSim/Server/Handlers/Asset/AssetServerConnector.cs
@@ -37,13 +37,17 @@ namespace OpenSim.Server.Handlers.Asset
     public class AssetServiceConnector : ServiceConnector
     {
         private IAssetService m_AssetService;
+        private string m_ConfigName = "AssetService";
 
-        public AssetServiceConnector(IConfigSource config, IHttpServer server) :
-                base(config, server)
+        public AssetServiceConnector(IConfigSource config, IHttpServer server, string configName) :
+                base(config, server, configName)
         {
-            IConfig serverConfig = config.Configs["AssetService"];
+            if (configName != String.Empty)
+                m_ConfigName = configName;
+
+            IConfig serverConfig = config.Configs[m_ConfigName];
             if (serverConfig == null)
-                throw new Exception("No section 'Server' in config file");
+                throw new Exception(String.Format("No section '{0}' in config file", m_ConfigName));
 
             string assetService = serverConfig.GetString("LocalServiceModule",
                     String.Empty);
@@ -55,7 +59,6 @@ namespace OpenSim.Server.Handlers.Asset
             m_AssetService =
                     ServerUtils.LoadPlugin<IAssetService>(assetService, args);
 
-            //System.Console.WriteLine("XXXXXXXXXXXXXXXXXXX m_AssetSetvice == null? " + ((m_AssetService == null) ? "yes" : "no"));
             server.AddStreamHandler(new AssetServerGetHandler(m_AssetService));
             server.AddStreamHandler(new AssetServerPostHandler(m_AssetService));
             server.AddStreamHandler(new AssetServerDeleteHandler(m_AssetService));
diff --git a/OpenSim/Server/Handlers/Authentication/AuthenticationServerConnector.cs b/OpenSim/Server/Handlers/Authentication/AuthenticationServerConnector.cs
index 589dc3b..2abef0a 100644
--- a/OpenSim/Server/Handlers/Authentication/AuthenticationServerConnector.cs
+++ b/OpenSim/Server/Handlers/Authentication/AuthenticationServerConnector.cs
@@ -37,13 +37,17 @@ namespace OpenSim.Server.Handlers.Authentication
     public class AuthenticationServiceConnector : ServiceConnector
     {
         private IAuthenticationService m_AuthenticationService;
+        private string m_ConfigName = "AuthenticationService";
 
-        public AuthenticationServiceConnector(IConfigSource config, IHttpServer server) :
-                base(config, server)
+        public AuthenticationServiceConnector(IConfigSource config, IHttpServer server, string configName) :
+                base(config, server, configName)
         {
-            IConfig serverConfig = config.Configs["AuthenticationService"];
+            if (configName != String.Empty)
+                m_ConfigName = configName;
+
+            IConfig serverConfig = config.Configs[m_ConfigName];
             if (serverConfig == null)
-                throw new Exception("No section 'Server' in config file");
+                throw new Exception(String.Format("No section '{0}' in config file", m_ConfigName));
 
             string authenticationService = serverConfig.GetString("AuthenticationServiceModule",
                     String.Empty);
diff --git a/OpenSim/Server/Handlers/Authorization/AuthorizationServerConnector.cs b/OpenSim/Server/Handlers/Authorization/AuthorizationServerConnector.cs
index 0d9f239..20fd0f7 100644
--- a/OpenSim/Server/Handlers/Authorization/AuthorizationServerConnector.cs
+++ b/OpenSim/Server/Handlers/Authorization/AuthorizationServerConnector.cs
@@ -37,13 +37,16 @@ namespace OpenSim.Server.Handlers.Authorization
     public class AuthorizationServerConnector : ServiceConnector
     {
         private IAuthorizationService m_AuthorizationService;
+        private string m_ConfigName = "AuthorizationService";
 
-        public AuthorizationServerConnector(IConfigSource config, IHttpServer server) :
-                base(config, server)
+        public AuthorizationServerConnector(IConfigSource config, IHttpServer server, string configName) :
+                base(config, server, configName)
         {
-            IConfig serverConfig = config.Configs["AuthorizationService"];
+            if (configName != String.Empty)
+                m_ConfigName = configName;
+            IConfig serverConfig = config.Configs[m_ConfigName];
             if (serverConfig == null)
-                throw new Exception("No section 'Server' in config file");
+                throw new Exception(String.Format("No section '{0}' in config file", m_ConfigName));
 
             string authorizationService = serverConfig.GetString("LocalServiceModule",
                     String.Empty);
diff --git a/OpenSim/Server/Handlers/Base/ServerConnector.cs b/OpenSim/Server/Handlers/Base/ServerConnector.cs
index 62fe773..71876da 100644
--- a/OpenSim/Server/Handlers/Base/ServerConnector.cs
+++ b/OpenSim/Server/Handlers/Base/ServerConnector.cs
@@ -39,7 +39,7 @@ namespace OpenSim.Server.Handlers.Base
 
     public class ServiceConnector : IServiceConnector
     {
-        public ServiceConnector(IConfigSource config, IHttpServer server)
+        public ServiceConnector(IConfigSource config, IHttpServer server, string configName)
         {
         }
     }
diff --git a/OpenSim/Server/Handlers/Freeswitch/FreeswitchServerConnector.cs b/OpenSim/Server/Handlers/Freeswitch/FreeswitchServerConnector.cs
index a4ab0d3..07bafc8 100644
--- a/OpenSim/Server/Handlers/Freeswitch/FreeswitchServerConnector.cs
+++ b/OpenSim/Server/Handlers/Freeswitch/FreeswitchServerConnector.cs
@@ -37,19 +37,23 @@ namespace OpenSim.Server.Handlers.Freeswitch
     public class FreeswitchServerConnector : ServiceConnector
     {
         private IFreeswitchService m_FreeswitchService;
+        private string m_ConfigName = "FreeswitchService";
 
-        public FreeswitchServerConnector(IConfigSource config, IHttpServer server) :
-                base(config, server)
+        public FreeswitchServerConnector(IConfigSource config, IHttpServer server, string configName) :
+                base(config, server, configName)
         {
-            IConfig serverConfig = config.Configs["FreeswitchService"];
+            if (configName != String.Empty)
+                m_ConfigName = configName;
+
+            IConfig serverConfig = config.Configs[m_ConfigName];
             if (serverConfig == null)
-                throw new Exception("No section 'Server' in config file");
+                throw new Exception(String.Format("No section '{0}' in config file", m_ConfigName));
 
             string freeswitchService = serverConfig.GetString("LocalServiceModule",
                     String.Empty);
 
             if (freeswitchService == String.Empty)
-                throw new Exception("No FreeswitchService in config file");
+                throw new Exception("No LocalServiceModule in config file");
 
             Object[] args = new Object[] { config };
             m_FreeswitchService =
diff --git a/OpenSim/Server/Handlers/Grid/GridServerConnector.cs b/OpenSim/Server/Handlers/Grid/GridServerConnector.cs
index ebdf489..14daf12 100644
--- a/OpenSim/Server/Handlers/Grid/GridServerConnector.cs
+++ b/OpenSim/Server/Handlers/Grid/GridServerConnector.cs
@@ -37,19 +37,20 @@ namespace OpenSim.Server.Handlers.Grid
     public class GridServiceConnector : ServiceConnector
     {
         private IGridService m_GridService;
+        private string m_ConfigName = "GridService";
 
-        public GridServiceConnector(IConfigSource config, IHttpServer server) :
-                base(config, server)
+        public GridServiceConnector(IConfigSource config, IHttpServer server, string configName) :
+                base(config, server, configName)
         {
-            IConfig serverConfig = config.Configs["GridService"];
+            IConfig serverConfig = config.Configs[m_ConfigName];
             if (serverConfig == null)
-                throw new Exception("No section 'Server' in config file");
+                throw new Exception(String.Format("No section {0} in config file", m_ConfigName));
 
             string gridService = serverConfig.GetString("LocalServiceModule",
                     String.Empty);
 
             if (gridService == String.Empty)
-                throw new Exception("No GridService in config file");
+                throw new Exception("No LocalServiceModule in config file");
 
             Object[] args = new Object[] { config };
             m_GridService = ServerUtils.LoadPlugin<IGridService>(gridService, args);
diff --git a/OpenSim/Server/Handlers/Grid/HypergridServerConnector.cs b/OpenSim/Server/Handlers/Grid/HypergridServerConnector.cs
index ad63485..e226759 100644
--- a/OpenSim/Server/Handlers/Grid/HypergridServerConnector.cs
+++ b/OpenSim/Server/Handlers/Grid/HypergridServerConnector.cs
@@ -51,7 +51,7 @@ namespace OpenSim.Server.Handlers.Grid
         private List<SimpleRegionInfo> m_RegionsOnSim = new List<SimpleRegionInfo>();
 
         public HypergridServiceInConnector(IConfigSource config, IHttpServer server) :
-                base(config, server)
+                base(config, server, String.Empty)
         {
             server.AddXmlRPCHandler("linkk_region", LinkRegionRequest, false);
         }
diff --git a/OpenSim/Server/Handlers/Inventory/InventoryServerInConnector.cs b/OpenSim/Server/Handlers/Inventory/InventoryServerInConnector.cs
index 998b322..ca45263 100644
--- a/OpenSim/Server/Handlers/Inventory/InventoryServerInConnector.cs
+++ b/OpenSim/Server/Handlers/Inventory/InventoryServerInConnector.cs
@@ -54,19 +54,20 @@ namespace OpenSim.Server.Handlers.Inventory
         //private AuthedSessionCache m_session_cache = new AuthedSessionCache(INVENTORY_DEFAULT_SESSION_TIME);
 
         private string m_userserver_url;
+        private string m_ConfigName = "InventoryService";
 
-        public InventoryServiceInConnector(IConfigSource config, IHttpServer server) :
-                base(config, server)
+        public InventoryServiceInConnector(IConfigSource config, IHttpServer server, string configName) :
+                base(config, server, configName)
         {
-            IConfig serverConfig = config.Configs["InventoryService"];
+            IConfig serverConfig = config.Configs[m_ConfigName];
             if (serverConfig == null)
-                throw new Exception("No section 'InventoryService' in config file");
+                throw new Exception(String.Format("No section '{0}' in config file", m_ConfigName));
 
             string inventoryService = serverConfig.GetString("LocalServiceModule",
                     String.Empty);
 
             if (inventoryService == String.Empty)
-                throw new Exception("No InventoryService in config file");
+                throw new Exception("No LocalServiceModule in config file");
 
             Object[] args = new Object[] { config };
             m_InventoryService =
diff --git a/OpenSim/Server/Handlers/Land/LandServiceInConnector.cs b/OpenSim/Server/Handlers/Land/LandServiceInConnector.cs
index 10e3b47..d368bd3 100644
--- a/OpenSim/Server/Handlers/Land/LandServiceInConnector.cs
+++ b/OpenSim/Server/Handlers/Land/LandServiceInConnector.cs
@@ -46,7 +46,7 @@ namespace OpenSim.Server.Handlers.Land
         // TODO : private IAuthenticationService m_AuthenticationService;
 
         public LandServiceInConnector(IConfigSource source, IHttpServer server, ILandService service, IScene scene) :
-                base(source, server)
+                base(source, server, String.Empty)
         {
             m_LandService = service;
             if (m_LandService == null)
diff --git a/OpenSim/Server/Handlers/Neighbour/NeighbourServiceInConnector.cs b/OpenSim/Server/Handlers/Neighbour/NeighbourServiceInConnector.cs
index b3a91cf..ac2e75f 100644
--- a/OpenSim/Server/Handlers/Neighbour/NeighbourServiceInConnector.cs
+++ b/OpenSim/Server/Handlers/Neighbour/NeighbourServiceInConnector.cs
@@ -46,7 +46,7 @@ namespace OpenSim.Server.Handlers.Neighbour
         private IAuthenticationService m_AuthenticationService = null;
 
         public NeighbourServiceInConnector(IConfigSource source, IHttpServer server, INeighbourService nService, IScene scene) :
-                base(source, server)
+                base(source, server, String.Empty)
         {
 
             m_NeighbourService = nService;
diff --git a/OpenSim/Server/Handlers/Simulation/SimulationServiceInConnector.cs b/OpenSim/Server/Handlers/Simulation/SimulationServiceInConnector.cs
index 0bb4713..fe93fa5 100644
--- a/OpenSim/Server/Handlers/Simulation/SimulationServiceInConnector.cs
+++ b/OpenSim/Server/Handlers/Simulation/SimulationServiceInConnector.cs
@@ -41,7 +41,7 @@ namespace OpenSim.Server.Handlers.Simulation
         private IAuthenticationService m_AuthenticationService;
 
         public SimulationServiceInConnector(IConfigSource config, IHttpServer server, IScene scene) :
-                base(config, server)
+                base(config, server, String.Empty)
         {
             IConfig serverConfig = config.Configs["SimulationService"];
             if (serverConfig == null)