4 files changed, 71 insertions, 54 deletions

diff --git a/OpenSim/Server/Base/HttpServerBase.cs b/OpenSim/Server/Base/HttpServerBase.cs
index eed2645..a18cdc1 100644
--- a/OpenSim/Server/Base/HttpServerBase.cs
+++ b/OpenSim/Server/Base/HttpServerBase.cs
@@ -56,15 +56,16 @@ namespace OpenSim.Server.Base
 
             if (networkConfig == null)
             {
-                System.Console.WriteLine("Section 'Network' not found, server can't start");
-                Thread.CurrentThread.Abort();
+                System.Console.WriteLine("ERROR: Section [Network] not found, server can't start");
+                Environment.Exit(1);
             }
 
             uint port = (uint)networkConfig.GetInt("port", 0);
 
             if (port == 0)
             {
-                Thread.CurrentThread.Abort();
+                System.Console.WriteLine("ERROR: No 'port' entry found in [Network].  Server can't start");
+                Environment.Exit(1);
             }
 
             bool ssl_main = networkConfig.GetBoolean("https_main",false);
@@ -84,23 +85,24 @@ namespace OpenSim.Server.Base
             // Then, check for https settings and ADD a server to
             // m_Servers
             //
-            if ( !ssl_main )
+            if (!ssl_main)
             {
                 httpServer = new BaseHttpServer(port);
             }
             else
             {
                 string cert_path = networkConfig.GetString("cert_path",String.Empty);
-                if ( cert_path == String.Empty )
+                if (cert_path == String.Empty)
                 {
-                    System.Console.WriteLine("Path to X509 certificate is missing, server can't start.");
-                    Thread.CurrentThread.Abort();
+                    System.Console.WriteLine("ERROR: Path to X509 certificate is missing, server can't start.");
+                    Environment.Exit(1);
                 }
+
                 string cert_pass = networkConfig.GetString("cert_pass",String.Empty);
-                if ( cert_pass == String.Empty )
+                if (cert_pass == String.Empty)
                 {
-                    System.Console.WriteLine("Password for X509 certificate is missing, server can't start.");
-                    Thread.CurrentThread.Abort();
+                    System.Console.WriteLine("ERROR: Password for X509 certificate is missing, server can't start.");
+                    Environment.Exit(1);
                 }
 
                 httpServer = new BaseHttpServer(port, ssl_main, cert_path, cert_pass);
@@ -110,10 +112,24 @@ namespace OpenSim.Server.Base
             MainServer.Instance = httpServer;
 
             // If https_listener = true, then add an ssl listener on the https_port...
-            if ( ssl_listener == true ) {
-
+            if (ssl_listener == true) 
+            {
                 uint https_port = (uint)networkConfig.GetInt("https_port", 0);
 
+<<<<<<< HEAD
+                string cert_path = networkConfig.GetString("cert_path",String.Empty);
+                if (cert_path == String.Empty)
+                {
+                    System.Console.WriteLine("ERROR: Path to X509 certificate is missing, server can't start.");
+                    Environment.Exit(1);
+                }
+
+                string cert_pass = networkConfig.GetString("cert_pass",String.Empty);
+                if (cert_pass == String.Empty)
+                {
+                    System.Console.WriteLine("ERROR: Password for X509 certificate is missing, server can't start.");
+                    Environment.Exit(1);
+=======
                 m_log.WarnFormat("[SSL]: External flag is {0}", ssl_external);
                 if (!ssl_external)
                 {
@@ -136,6 +152,7 @@ namespace OpenSim.Server.Base
                 {
                     m_log.WarnFormat("[SSL]: SSL port is active but no SSL is used because external SSL was requested.");
                     MainServer.AddHttpServer(new BaseHttpServer(https_port));
+>>>>>>> avn/ubitvar
                 }
             }
         }
diff --git a/OpenSim/Server/Base/Properties/AssemblyInfo.cs b/OpenSim/Server/Base/Properties/AssemblyInfo.cs
index 67340c7..e819a2b 100644
--- a/OpenSim/Server/Base/Properties/AssemblyInfo.cs
+++ b/OpenSim/Server/Base/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.8.0.*")]
+[assembly: AssemblyVersion("0.8.2.*")]
 
diff --git a/OpenSim/Server/Base/ServerUtils.cs b/OpenSim/Server/Base/ServerUtils.cs
index 08ba50d..18a4266 100644
--- a/OpenSim/Server/Base/ServerUtils.cs
+++ b/OpenSim/Server/Base/ServerUtils.cs
@@ -41,7 +41,7 @@ using OpenSim.Framework.Servers.HttpServer;
 using OpenSim.Framework.Servers;
 
 
-[assembly:AddinRoot("Robust", "0.1")]
+[assembly:AddinRoot("Robust", OpenSim.VersionInfo.VersionNumber)]
 namespace OpenSim.Server.Base
 {
     [TypeExtensionPoint(Path="/Robust/Connector", Name="RobustConnector")]
@@ -89,9 +89,9 @@ namespace OpenSim.Server.Base
             Config = config;
 
             Registry = new AddinRegistry(registryPath, ".");
-            suppress_console_output_(true);
+            //suppress_console_output_(true);
             AddinManager.Initialize(registryPath);
-            suppress_console_output_(false);
+            //suppress_console_output_(false);
             AddinManager.Registry.Update();
             CommandManager commandmanager = new CommandManager(Registry);
             AddinManager.AddExtensionNodeHandler("/Robust/Connector", OnExtensionChanged);
@@ -196,17 +196,19 @@ namespace OpenSim.Server.Base
 
         public static  byte[] SerializeResult(XmlSerializer xs, object data)
         {
-            MemoryStream ms = new MemoryStream();
-            XmlTextWriter xw = new XmlTextWriter(ms, Util.UTF8);
-            xw.Formatting = Formatting.Indented;
-            xs.Serialize(xw, data);
-            xw.Flush();
+            using (MemoryStream ms = new MemoryStream())
+            using (XmlTextWriter xw = new XmlTextWriter(ms, Util.UTF8))
+            {
+                xw.Formatting = Formatting.Indented;
+                xs.Serialize(xw, data);
+                xw.Flush();
 
-            ms.Seek(0, SeekOrigin.Begin);
-            byte[] ret = ms.GetBuffer();
-            Array.Resize(ref ret, (int)ms.Length);
+                ms.Seek(0, SeekOrigin.Begin);
+                byte[] ret = ms.GetBuffer();
+                Array.Resize(ref ret, (int)ms.Length);
 
-            return ret;
+                return ret;
+            }
         }
 
         /// <summary>
@@ -266,7 +268,7 @@ namespace OpenSim.Server.Base
                             && pluginType.ToString() != pluginType.Namespace + "." + className)
                             continue;
                         
-                        Type typeInterface = pluginType.GetInterface(interfaceName, true);
+                        Type typeInterface = pluginType.GetInterface(interfaceName);
 
                         if (typeInterface != null)
                         {
@@ -280,11 +282,11 @@ namespace OpenSim.Server.Base
                             {
                                 if (!(e is System.MissingMethodException))
                                 {
-                                    m_log.ErrorFormat("[SERVER UTILS]: Error loading plugin {0} from {1}. Exception: {2}, {3}",
+                                    m_log.Error(string.Format("[SERVER UTILS]: Error loading plugin {0} from {1}. Exception: {2}",
                                         interfaceName, 
                                         dllName, 
-                                        e.InnerException == null ? e.Message : e.InnerException.Message, 
-                                        e.StackTrace);
+                                        e.InnerException == null ? e.Message : e.InnerException.Message),
+                                            e);
                                 }
                                 m_log.ErrorFormat("[SERVER UTILS]: Error loading plugin {0}: {1} args.Length {2}", dllName, e.Message, args.Length);
                                 return null;
diff --git a/OpenSim/Server/Base/ServicesServerBase.cs b/OpenSim/Server/Base/ServicesServerBase.cs
index 667cef8..1f2c54d 100644
--- a/OpenSim/Server/Base/ServicesServerBase.cs
+++ b/OpenSim/Server/Base/ServicesServerBase.cs
@@ -49,9 +49,7 @@ namespace OpenSim.Server.Base
     {
         // Logger
         //
-        private static readonly ILog m_log =
-                LogManager.GetLogger(
-                MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         // Command line args
         //
@@ -72,11 +70,9 @@ namespace OpenSim.Server.Base
         public ServicesServerBase(string prompt, string[] args) : base()
         {
             // Save raw arguments
-            //
             m_Arguments = args;
 
             // Read command line
-            //
             ArgvConfigSource argvConfig = new ArgvConfigSource(args);
 
             argvConfig.AddSwitch("Startup", "console", "c");
@@ -86,8 +82,9 @@ namespace OpenSim.Server.Base
             argvConfig.AddSwitch("Startup", "logconfig", "g");
 
             // Automagically create the ini file name
-            //
-            string fileName = Path.GetFileNameWithoutExtension(Assembly.GetEntryAssembly().Location);
+            string fileName = "";
+            if (Assembly.GetEntryAssembly() != null)
+                fileName = Path.GetFileNameWithoutExtension(Assembly.GetEntryAssembly().Location);
             string iniFile = fileName + ".ini";
             string logConfig = null;
 
@@ -95,19 +92,17 @@ namespace OpenSim.Server.Base
             if (startupConfig != null)
             {
                 // Check if a file name was given on the command line
-                //
                 iniFile = startupConfig.GetString("inifile", iniFile);
-                //
+
                 // Check if a prompt was given on the command line
                 prompt = startupConfig.GetString("prompt", prompt);
-                //
+                
                 // Check for a Log4Net config file on the command line
-                logConfig =startupConfig.GetString("logconfig",logConfig);
+                logConfig =startupConfig.GetString("logconfig", logConfig);
             }
 
-            // Find out of the file name is a URI and remote load it
-            // if it's possible. Load it as a local file otherwise.
-            //
+            // Find out of the file name is a URI and remote load it if possible.
+            // Load it as a local file otherwise.
             Uri configUri;
 
             try
@@ -129,13 +124,16 @@ namespace OpenSim.Server.Base
                 Environment.Exit(1);
             }
 
-            // Merge the configuration from the command line into the
-            // loaded file
-            //
+            // Merge OpSys env vars
+            m_log.Info("[CONFIG]: Loading environment variables for Config");
+            Util.MergeEnvironmentToConfig(Config);
+            
+            // Merge the configuration from the command line into the loaded file
             Config.Merge(argvConfig);
 
+            Config.ReplaceKeyValues();
+
             // Refresh the startupConfig post merge
-            //
             if (Config.Configs["Startup"] != null)
             {
                 startupConfig = Config.Configs["Startup"];
@@ -145,13 +143,10 @@ namespace OpenSim.Server.Base
 
             prompt = startupConfig.GetString("Prompt", prompt);
 
-            // Allow derived classes to load config before the console is
-            // opened.
-            //
+            // Allow derived classes to load config before the console is opened.
             ReadConfig();
 
             // Create main console
-            //
             string consoleType = "local";
             if (startupConfig != null)
                 consoleType = startupConfig.GetString("console", consoleType);
@@ -165,9 +160,13 @@ namespace OpenSim.Server.Base
                 MainConsole.Instance = new RemoteConsole(prompt);
                 ((RemoteConsole)MainConsole.Instance).ReadConfig(Config);
             }
-            else
+            else if (consoleType == "mock")
+            {
+                MainConsole.Instance = new MockConsole();
+            }
+            else if (consoleType == "local")
             {
-                MainConsole.Instance = new LocalConsole(prompt);
+                MainConsole.Instance = new LocalConsole(prompt, startupConfig);
             }
 
             m_console = MainConsole.Instance;
@@ -195,7 +194,6 @@ namespace OpenSim.Server.Base
 
             // Allow derived classes to perform initialization that
             // needs to be done after the console has opened
-            //
             Initialise();
         }