Merge branch 'master' of ssh://MyConnection/var/git/opensim

4 files changed, 133 insertions, 23 deletions

diff --git a/OpenSim/Grid/GridServer/GridServerBase.cs b/OpenSim/Grid/GridServer/GridServerBase.cs
index c41a728..e3ad52a 100644
--- a/OpenSim/Grid/GridServer/GridServerBase.cs
+++ b/OpenSim/Grid/GridServer/GridServerBase.cs
@@ -31,6 +31,7 @@ using System.IO;
 using System.Reflection;
 using System.Timers;
 using log4net;
+using Nini.Config;
 using OpenSim.Framework;
 using OpenSim.Framework.Console;
 using OpenSim.Framework.Servers;
@@ -46,6 +47,8 @@ namespace OpenSim.Grid.GridServer
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         protected GridConfig m_config;
+        public string m_consoleType = "local";
+        public IConfigSource m_configSource = null;
 
         public GridConfig Config
         {
@@ -71,16 +74,36 @@ namespace OpenSim.Grid.GridServer
 
         public GridServerBase()
         {
-            m_console = new LocalConsole("Grid");
-            MainConsole.Instance = m_console;
         }
 
         protected override void StartupSpecific()
         {
+            switch (m_consoleType)
+            {
+            case "rest":
+                m_console = new RemoteConsole("Grid");
+                break;
+            case "basic":
+                m_console = new CommandConsole("Grid");
+                break;
+            default:
+                m_console = new LocalConsole("Grid");
+                break;
+            }
+            MainConsole.Instance = m_console;
             m_config = new GridConfig("GRID SERVER", (Path.Combine(Util.configDir(), "GridServer_Config.xml")));
 
             m_log.Info("[GRID]: Starting HTTP process");
             m_httpServer = new BaseHttpServer(m_config.HttpPort);
+            if (m_console is RemoteConsole)
+            {
+                RemoteConsole c = (RemoteConsole)m_console;
+                c.SetServer(m_httpServer);
+                IConfig netConfig = m_configSource.AddConfig("Network");
+                netConfig.Set("ConsoleUser", m_config.ConsoleUser);
+                netConfig.Set("ConsolePass", m_config.ConsolePass);
+                c.ReadConfig(m_configSource);
+            }
 
             LoadPlugins();
 
diff --git a/OpenSim/Grid/GridServer/Program.cs b/OpenSim/Grid/GridServer/Program.cs
index 9618b85..c7ba897 100644
--- a/OpenSim/Grid/GridServer/Program.cs
+++ b/OpenSim/Grid/GridServer/Program.cs
@@ -26,6 +26,7 @@
  */
 
 using log4net.Config;
+using Nini.Config;
 
 namespace OpenSim.Grid.GridServer
 {
@@ -33,10 +34,21 @@ namespace OpenSim.Grid.GridServer
     {
         public static void Main(string[] args)
         {
+            ArgvConfigSource argvSource = new ArgvConfigSource(args);
+            argvSource.AddSwitch("Startup", "console", "c");
+
             XmlConfigurator.Configure();
 
             GridServerBase app = new GridServerBase();
 
+            IConfig startupConfig = argvSource.Configs["Startup"];
+            if (startupConfig != null)
+            {
+                app.m_consoleType = startupConfig.GetString("console", "local");
+            }
+
+            app.m_configSource = argvSource;
+
 //            if (args.Length > 0 && args[0] == "-setuponly")
 //            {
 //                app.Config();
diff --git a/OpenSim/Grid/MessagingServer/Main.cs b/OpenSim/Grid/MessagingServer/Main.cs
index dcefeea..654e770 100644
--- a/OpenSim/Grid/MessagingServer/Main.cs
+++ b/OpenSim/Grid/MessagingServer/Main.cs
@@ -30,6 +30,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
 using log4net;
+using Nini.Config;
 using log4net.Config;
 using OpenSim.Framework;
 using OpenSim.Framework.Console;
@@ -56,8 +57,22 @@ namespace OpenSim.Grid.MessagingServer
 
         // private UUID m_lastCreatedUser = UUID.Random();
 
+        protected static string m_consoleType = "local";
+        protected static IConfigSource m_config = null;
+
         public static void Main(string[] args)
         {
+            ArgvConfigSource argvSource = new ArgvConfigSource(args);
+            argvSource.AddSwitch("Startup", "console", "c");
+
+            IConfig startupConfig = argvSource.Configs["Startup"];
+            if (startupConfig != null)
+            {
+                m_consoleType = startupConfig.GetString("console", "local");
+            }
+
+            m_config = argvSource;
+
             XmlConfigurator.Configure();
 
             m_log.Info("[SERVER]: Launching MessagingServer...");
@@ -70,7 +85,18 @@ namespace OpenSim.Grid.MessagingServer
 
         public OpenMessage_Main()
         {
-            m_console = new LocalConsole("Messaging");
+            switch (m_consoleType)
+            {
+            case "rest":
+                m_console = new RemoteConsole("Messaging");
+                break;
+            case "basic":
+                m_console = new CommandConsole("Messaging");
+                break;
+            default:
+                m_console = new LocalConsole("Messaging");
+                break;
+            }
             MainConsole.Instance = m_console;
         }
 
@@ -88,20 +114,33 @@ namespace OpenSim.Grid.MessagingServer
         {
             if (m_userServerModule.registerWithUserServer())
             {
-                m_log.Info("[SERVER]: Starting HTTP process");
-                m_httpServer = new BaseHttpServer(Cfg.HttpPort);
-
-                m_httpServer.AddXmlRPCHandler("login_to_simulator", msgsvc.UserLoggedOn);
-                m_httpServer.AddXmlRPCHandler("logout_of_simulator", msgsvc.UserLoggedOff);
-                m_httpServer.AddXmlRPCHandler("get_presence_info_bulk", msgsvc.GetPresenceInfoBulk);
-                m_httpServer.AddXmlRPCHandler("process_region_shutdown", msgsvc.ProcessRegionShutdown);
-                m_httpServer.AddXmlRPCHandler("agent_location", msgsvc.AgentLocation);
-                m_httpServer.AddXmlRPCHandler("agent_leaving", msgsvc.AgentLeaving);
-
-                m_httpServer.AddXmlRPCHandler("region_startup", m_regionModule.RegionStartup);
-                m_httpServer.AddXmlRPCHandler("region_shutdown", m_regionModule.RegionShutdown);
-
-                m_httpServer.Start();
+                if (m_httpServer == null)
+                {
+                    m_log.Info("[SERVER]: Starting HTTP process");
+                    m_httpServer = new BaseHttpServer(Cfg.HttpPort);
+
+                    if (m_console is RemoteConsole)
+                    {
+                        RemoteConsole c = (RemoteConsole)m_console;
+                        c.SetServer(m_httpServer);
+                        IConfig netConfig = m_config.AddConfig("Network");
+                        netConfig.Set("ConsoleUser", Cfg.ConsoleUser);
+                        netConfig.Set("ConsolePass", Cfg.ConsolePass);
+                        c.ReadConfig(m_config);
+                    }
+
+                    m_httpServer.AddXmlRPCHandler("login_to_simulator", msgsvc.UserLoggedOn);
+                    m_httpServer.AddXmlRPCHandler("logout_of_simulator", msgsvc.UserLoggedOff);
+                    m_httpServer.AddXmlRPCHandler("get_presence_info_bulk", msgsvc.GetPresenceInfoBulk);
+                    m_httpServer.AddXmlRPCHandler("process_region_shutdown", msgsvc.ProcessRegionShutdown);
+                    m_httpServer.AddXmlRPCHandler("agent_location", msgsvc.AgentLocation);
+                    m_httpServer.AddXmlRPCHandler("agent_leaving", msgsvc.AgentLeaving);
+
+                    m_httpServer.AddXmlRPCHandler("region_startup", m_regionModule.RegionStartup);
+                    m_httpServer.AddXmlRPCHandler("region_shutdown", m_regionModule.RegionShutdown);
+
+                    m_httpServer.Start();
+                }
                 m_log.Info("[SERVER]: Userserver registration was successful");
             }
             else
@@ -114,12 +153,12 @@ namespace OpenSim.Grid.MessagingServer
         private void deregisterFromUserServer()
         {
             m_userServerModule.deregisterWithUserServer();
-            if (m_httpServer != null)
-            {
+//            if (m_httpServer != null)
+//            {
                 // try a completely fresh registration, with fresh handlers, too
-                m_httpServer.Stop();
-                m_httpServer = null;
-            }
+//                m_httpServer.Stop();
+//                m_httpServer = null;
+//            }
             m_console.Output("[SERVER]: Deregistered from userserver.");
         }
 
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs
index 86c2abb..1ee53ef 100644
--- a/OpenSim/Grid/UserServer/Main.cs
+++ b/OpenSim/Grid/UserServer/Main.cs
@@ -43,6 +43,7 @@ using OpenSim.Framework.Statistics;
 using OpenSim.Grid.Communications.OGS1;
 using OpenSim.Grid.Framework;
 using OpenSim.Grid.UserServer.Modules;
+using Nini.Config;
 
 namespace OpenSim.Grid.UserServer
 {
@@ -73,8 +74,22 @@ namespace OpenSim.Grid.UserServer
 
         protected AvatarCreationModule m_appearanceModule;
 
+        protected static string m_consoleType = "local";
+        protected static IConfigSource m_config = null;
+
         public static void Main(string[] args)
         {
+            ArgvConfigSource argvSource = new ArgvConfigSource(args);
+            argvSource.AddSwitch("Startup", "console", "c");
+
+            IConfig startupConfig = argvSource.Configs["Startup"];
+            if (startupConfig != null)
+            {
+                m_consoleType = startupConfig.GetString("console", "local");
+            }
+
+            m_config = argvSource;
+
             XmlConfigurator.Configure();
 
             m_log.Info("Launching UserServer...");
@@ -87,7 +102,18 @@ namespace OpenSim.Grid.UserServer
 
         public OpenUser_Main()
         {
-            m_console = new LocalConsole("User");
+            switch (m_consoleType)
+            {
+            case "rest":
+                m_console = new RemoteConsole("User");
+                break;
+            case "basic":
+                m_console = new CommandConsole("User");
+                break;
+            default:
+                m_console = new LocalConsole("User");
+                break;
+            }
             MainConsole.Instance = m_console;
         }
 
@@ -129,6 +155,16 @@ namespace OpenSim.Grid.UserServer
 
             m_httpServer = new BaseHttpServer(Cfg.HttpPort);
 
+            if (m_console is RemoteConsole)
+            {
+                RemoteConsole c = (RemoteConsole)m_console;
+                c.SetServer(m_httpServer);
+                IConfig netConfig = m_config.AddConfig("Network");
+                netConfig.Set("ConsoleUser", Cfg.ConsoleUser);
+                netConfig.Set("ConsolePass", Cfg.ConsolePass);
+                c.ReadConfig(m_config);
+            }
+
             RegisterInterface<CommandConsole>(m_console);
             RegisterInterface<UserConfig>(Cfg);