OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add -xmlfile= option to UGM, to let the files be outside bin if desired

arthursv
Melanie 2009-08-21 11:35:40 +01:00
parent 158ad39df0
commit 7daf6dbbd3
4 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Grid/GridServer/GridServerBase.cs
View File

@ -49,6 +49,7 @@ namespace OpenSim.Grid.GridServer
protected GridConfig m_config; protected GridConfig m_config;
public string m_consoleType = "local"; public string m_consoleType = "local";
public IConfigSource m_configSource = null; public IConfigSource m_configSource = null;
public string m_configFile = "GridServer_Config.xml";
public GridConfig Config public GridConfig Config
{ {
@ -91,7 +92,7 @@ namespace OpenSim.Grid.GridServer
break; break;
} }
MainConsole.Instance = m_console; MainConsole.Instance = m_console;
m_config = new GridConfig("GRID SERVER", (Path.Combine(Util.configDir(), "GridServer_Config.xml"))); m_config = new GridConfig("GRID SERVER", (Path.Combine(Util.configDir(), m_configFile)));
m_log.Info("[GRID]: Starting HTTP process"); m_log.Info("[GRID]: Starting HTTP process");
m_httpServer = new BaseHttpServer(m_config.HttpPort); m_httpServer = new BaseHttpServer(m_config.HttpPort);

2
OpenSim/Grid/GridServer/Program.cs
View File

@ -36,6 +36,7 @@ namespace OpenSim.Grid.GridServer
{ {
ArgvConfigSource argvSource = new ArgvConfigSource(args); ArgvConfigSource argvSource = new ArgvConfigSource(args);
argvSource.AddSwitch("Startup", "console", "c"); argvSource.AddSwitch("Startup", "console", "c");
argvSource.AddSwitch("Startup", "xmlfile", "x");
XmlConfigurator.Configure(); XmlConfigurator.Configure();
@ -45,6 +46,7 @@ namespace OpenSim.Grid.GridServer
if (startupConfig != null) if (startupConfig != null)
{ {
app.m_consoleType = startupConfig.GetString("console", "local"); app.m_consoleType = startupConfig.GetString("console", "local");
app.m_configFile = startupConfig.GetString("xmlfile", "GridServer_Config.xml");
} }
app.m_configSource = argvSource; app.m_configSource = argvSource;

4
OpenSim/Grid/MessagingServer/Main.cs
View File

@ -59,6 +59,7 @@ namespace OpenSim.Grid.MessagingServer
protected static string m_consoleType = "local"; protected static string m_consoleType = "local";
protected static IConfigSource m_config = null; protected static IConfigSource m_config = null;
protected static string m_configFile = "MessagingServer_Config.xml";
public static void Main(string[] args) public static void Main(string[] args)
{ {
@ -69,6 +70,7 @@ namespace OpenSim.Grid.MessagingServer
if (startupConfig != null) if (startupConfig != null)
{ {
m_consoleType = startupConfig.GetString("console", "local"); m_consoleType = startupConfig.GetString("console", "local");
m_configFile = startupConfig.GetString("xmlfile", "MessagingServer_Config.xml");
} }
m_config = argvSource; m_config = argvSource;
@ -164,7 +166,7 @@ namespace OpenSim.Grid.MessagingServer
protected override void StartupSpecific() protected override void StartupSpecific()
{ {
Cfg = new MessageServerConfig("MESSAGING SERVER", (Path.Combine(Util.configDir(), "MessagingServer_Config.xml"))); Cfg = new MessageServerConfig("MESSAGING SERVER", (Path.Combine(Util.configDir(), m_configFile)));
m_userDataBaseService = new UserDataBaseService(); m_userDataBaseService = new UserDataBaseService();
m_userDataBaseService.AddPlugin(Cfg.DatabaseProvider, Cfg.DatabaseConnect); m_userDataBaseService.AddPlugin(Cfg.DatabaseProvider, Cfg.DatabaseConnect);

5
OpenSim/Grid/UserServer/Main.cs
View File

@ -76,16 +76,19 @@ namespace OpenSim.Grid.UserServer
protected static string m_consoleType = "local"; protected static string m_consoleType = "local";
protected static IConfigSource m_config = null; protected static IConfigSource m_config = null;
protected static string m_configFile = "UserServer_Config.xml";
public static void Main(string[] args) public static void Main(string[] args)
{ {
ArgvConfigSource argvSource = new ArgvConfigSource(args); ArgvConfigSource argvSource = new ArgvConfigSource(args);
argvSource.AddSwitch("Startup", "console", "c"); argvSource.AddSwitch("Startup", "console", "c");
argvSource.AddSwitch("Startup", "xmlfile", "x");
IConfig startupConfig = argvSource.Configs["Startup"]; IConfig startupConfig = argvSource.Configs["Startup"];
if (startupConfig != null) if (startupConfig != null)
{ {
m_consoleType = startupConfig.GetString("console", "local"); m_consoleType = startupConfig.GetString("console", "local");
m_configFile = startupConfig.GetString("xmlfile", "UserServer_Config.xml");
} }
m_config = argvSource; m_config = argvSource;
@ -151,7 +154,7 @@ namespace OpenSim.Grid.UserServer
protected virtual IInterServiceInventoryServices StartupCoreComponents() protected virtual IInterServiceInventoryServices StartupCoreComponents()
{ {
Cfg = new UserConfig("USER SERVER", (Path.Combine(Util.configDir(), "UserServer_Config.xml"))); Cfg = new UserConfig("USER SERVER", (Path.Combine(Util.configDir(), m_configFile)));
m_httpServer = new BaseHttpServer(Cfg.HttpPort); m_httpServer = new BaseHttpServer(Cfg.HttpPort);