aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2009-08-21 11:35:40 +0100
committerMelanie2009-08-21 11:35:40 +0100
commit7daf6dbbd3ae70f43793c360bc3ab08efd89e850 (patch)
tree18a76a8f5000ede58c34044c3db35c7dd07d77a5
parentAdd copyright header. Formatting cleanup. (diff)
downloadopensim-SC_OLD-7daf6dbbd3ae70f43793c360bc3ab08efd89e850.zip
opensim-SC_OLD-7daf6dbbd3ae70f43793c360bc3ab08efd89e850.tar.gz
opensim-SC_OLD-7daf6dbbd3ae70f43793c360bc3ab08efd89e850.tar.bz2
opensim-SC_OLD-7daf6dbbd3ae70f43793c360bc3ab08efd89e850.tar.xz
Add -xmlfile= option to UGM, to let the files be outside bin if desired
-rw-r--r--OpenSim/Grid/GridServer/GridServerBase.cs3
-rw-r--r--OpenSim/Grid/GridServer/Program.cs2
-rw-r--r--OpenSim/Grid/MessagingServer/Main.cs4
-rw-r--r--OpenSim/Grid/UserServer/Main.cs5
4 files changed, 11 insertions, 3 deletions
diff --git a/OpenSim/Grid/GridServer/GridServerBase.cs b/OpenSim/Grid/GridServer/GridServerBase.cs
index e3ad52a..d63ac2e 100644
--- a/OpenSim/Grid/GridServer/GridServerBase.cs
+++ b/OpenSim/Grid/GridServer/GridServerBase.cs
@@ -49,6 +49,7 @@ namespace OpenSim.Grid.GridServer
49 protected GridConfig m_config; 49 protected GridConfig m_config;
50 public string m_consoleType = "local"; 50 public string m_consoleType = "local";
51 public IConfigSource m_configSource = null; 51 public IConfigSource m_configSource = null;
52 public string m_configFile = "GridServer_Config.xml";
52 53
53 public GridConfig Config 54 public GridConfig Config
54 { 55 {
@@ -91,7 +92,7 @@ namespace OpenSim.Grid.GridServer
91 break; 92 break;
92 } 93 }
93 MainConsole.Instance = m_console; 94 MainConsole.Instance = m_console;
94 m_config = new GridConfig("GRID SERVER", (Path.Combine(Util.configDir(), "GridServer_Config.xml"))); 95 m_config = new GridConfig("GRID SERVER", (Path.Combine(Util.configDir(), m_configFile)));
95 96
96 m_log.Info("[GRID]: Starting HTTP process"); 97 m_log.Info("[GRID]: Starting HTTP process");
97 m_httpServer = new BaseHttpServer(m_config.HttpPort); 98 m_httpServer = new BaseHttpServer(m_config.HttpPort);
diff --git a/OpenSim/Grid/GridServer/Program.cs b/OpenSim/Grid/GridServer/Program.cs
index c7ba897..741a01b 100644
--- a/OpenSim/Grid/GridServer/Program.cs
+++ b/OpenSim/Grid/GridServer/Program.cs
@@ -36,6 +36,7 @@ namespace OpenSim.Grid.GridServer
36 { 36 {
37 ArgvConfigSource argvSource = new ArgvConfigSource(args); 37 ArgvConfigSource argvSource = new ArgvConfigSource(args);
38 argvSource.AddSwitch("Startup", "console", "c"); 38 argvSource.AddSwitch("Startup", "console", "c");
39 argvSource.AddSwitch("Startup", "xmlfile", "x");
39 40
40 XmlConfigurator.Configure(); 41 XmlConfigurator.Configure();
41 42
@@ -45,6 +46,7 @@ namespace OpenSim.Grid.GridServer
45 if (startupConfig != null) 46 if (startupConfig != null)
46 { 47 {
47 app.m_consoleType = startupConfig.GetString("console", "local"); 48 app.m_consoleType = startupConfig.GetString("console", "local");
49 app.m_configFile = startupConfig.GetString("xmlfile", "GridServer_Config.xml");
48 } 50 }
49 51
50 app.m_configSource = argvSource; 52 app.m_configSource = argvSource;
diff --git a/OpenSim/Grid/MessagingServer/Main.cs b/OpenSim/Grid/MessagingServer/Main.cs
index 654e770..c8035a4 100644
--- a/OpenSim/Grid/MessagingServer/Main.cs
+++ b/OpenSim/Grid/MessagingServer/Main.cs
@@ -59,6 +59,7 @@ namespace OpenSim.Grid.MessagingServer
59 59
60 protected static string m_consoleType = "local"; 60 protected static string m_consoleType = "local";
61 protected static IConfigSource m_config = null; 61 protected static IConfigSource m_config = null;
62 protected static string m_configFile = "MessagingServer_Config.xml";
62 63
63 public static void Main(string[] args) 64 public static void Main(string[] args)
64 { 65 {
@@ -69,6 +70,7 @@ namespace OpenSim.Grid.MessagingServer
69 if (startupConfig != null) 70 if (startupConfig != null)
70 { 71 {
71 m_consoleType = startupConfig.GetString("console", "local"); 72 m_consoleType = startupConfig.GetString("console", "local");
73 m_configFile = startupConfig.GetString("xmlfile", "MessagingServer_Config.xml");
72 } 74 }
73 75
74 m_config = argvSource; 76 m_config = argvSource;
@@ -164,7 +166,7 @@ namespace OpenSim.Grid.MessagingServer
164 166
165 protected override void StartupSpecific() 167 protected override void StartupSpecific()
166 { 168 {
167 Cfg = new MessageServerConfig("MESSAGING SERVER", (Path.Combine(Util.configDir(), "MessagingServer_Config.xml"))); 169 Cfg = new MessageServerConfig("MESSAGING SERVER", (Path.Combine(Util.configDir(), m_configFile)));
168 170
169 m_userDataBaseService = new UserDataBaseService(); 171 m_userDataBaseService = new UserDataBaseService();
170 m_userDataBaseService.AddPlugin(Cfg.DatabaseProvider, Cfg.DatabaseConnect); 172 m_userDataBaseService.AddPlugin(Cfg.DatabaseProvider, Cfg.DatabaseConnect);
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs
index 1ee53ef..baf0fd3 100644
--- a/OpenSim/Grid/UserServer/Main.cs
+++ b/OpenSim/Grid/UserServer/Main.cs
@@ -76,16 +76,19 @@ namespace OpenSim.Grid.UserServer
76 76
77 protected static string m_consoleType = "local"; 77 protected static string m_consoleType = "local";
78 protected static IConfigSource m_config = null; 78 protected static IConfigSource m_config = null;
79 protected static string m_configFile = "UserServer_Config.xml";
79 80
80 public static void Main(string[] args) 81 public static void Main(string[] args)
81 { 82 {
82 ArgvConfigSource argvSource = new ArgvConfigSource(args); 83 ArgvConfigSource argvSource = new ArgvConfigSource(args);
83 argvSource.AddSwitch("Startup", "console", "c"); 84 argvSource.AddSwitch("Startup", "console", "c");
85 argvSource.AddSwitch("Startup", "xmlfile", "x");
84 86
85 IConfig startupConfig = argvSource.Configs["Startup"]; 87 IConfig startupConfig = argvSource.Configs["Startup"];
86 if (startupConfig != null) 88 if (startupConfig != null)
87 { 89 {
88 m_consoleType = startupConfig.GetString("console", "local"); 90 m_consoleType = startupConfig.GetString("console", "local");
91 m_configFile = startupConfig.GetString("xmlfile", "UserServer_Config.xml");
89 } 92 }
90 93
91 m_config = argvSource; 94 m_config = argvSource;
@@ -151,7 +154,7 @@ namespace OpenSim.Grid.UserServer
151 154
152 protected virtual IInterServiceInventoryServices StartupCoreComponents() 155 protected virtual IInterServiceInventoryServices StartupCoreComponents()
153 { 156 {
154 Cfg = new UserConfig("USER SERVER", (Path.Combine(Util.configDir(), "UserServer_Config.xml"))); 157 Cfg = new UserConfig("USER SERVER", (Path.Combine(Util.configDir(), m_configFile)));
155 158
156 m_httpServer = new BaseHttpServer(Cfg.HttpPort); 159 m_httpServer = new BaseHttpServer(Cfg.HttpPort);
157 160