ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-13 05:05:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

*New Configuration System, much easier and less buggy compared to the original system in place

Browse Source 
*View RegionInfo.cs for an example on how it works!
*This hopefully copies all the files over, but who knows :)
This commit is contained in:
mingchen
2007-07-18 23:15:08 +00:00
parent 4cd9a87183
commit 222becc879
20 changed files with 796 additions and 678 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,6 +38,8 @@ using OpenSim.Framework.Data;
using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Utilities;
using OpenSim.Framework.Configuration;
namespace OpenSim.Grid.GridServer
{
class GridManager

40
OpenSim/Grid/GridServer/Main.cs
View File

@@ -33,7 +33,8 @@ using System.Timers;
using OpenSim.Framework.Console;
using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Servers;
using OpenSim.GenericConfig;
using OpenSim.Framework.Configuration;
using Timer=System.Timers.Timer;
namespace OpenSim.Grid.GridServer
@@ -47,7 +48,6 @@ namespace OpenSim.Grid.GridServer
public GridConfig Cfg;
public static OpenGrid_Main thegrid;
protected IGenericConfig localXMLConfig;
public static bool setuponly;
@@ -105,14 +105,8 @@ namespace OpenSim.Grid.GridServer
public void Startup()
{
this.localXMLConfig = new XmlConfig("GridServerConfig.xml");
this.localXMLConfig.LoadData();
this.ConfigDB(this.localXMLConfig);
this.localXMLConfig.Close();
m_console.Verbose( "Main.cs:Startup() - Loading configuration");
Cfg = this.LoadConfigDll(this.ConfigDll);
Cfg.InitConfig();
this.Cfg = new GridConfig("GRID SERVER","GridServer_Config.xml"); //Yeah srsly, that's it.
if (setuponly) Environment.Exit(0);
m_console.Verbose( "Main.cs:Startup() - Connecting to Storage Server");
@@ -148,34 +142,6 @@ namespace OpenSim.Grid.GridServer
simCheckTimer.Enabled = true;
}
private GridConfig LoadConfigDll(string dllName)
{
Assembly pluginAssembly = Assembly.LoadFrom(dllName);
GridConfig config = null;
foreach (Type pluginType in pluginAssembly.GetTypes())
{
if (pluginType.IsPublic)
{
if (!pluginType.IsAbstract)
{
Type typeInterface = pluginType.GetInterface("IGridConfig", true);
if (typeInterface != null)
{
IGridConfig plug = (IGridConfig)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
config = plug.GetConfigObject();
break;
}
typeInterface = null;
}
}
}
pluginAssembly = null;
return config;
}
public void CheckSims(object sender, ElapsedEventArgs e)
{
/*

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

@@ -35,7 +35,7 @@ using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Servers;
using OpenSim.Framework.User;
using OpenSim.Framework.Utilities;
using OpenSim.GenericConfig;
using OpenSim.Framework.Configuration;
namespace OpenSim.Grid.UserServer
{
@@ -46,7 +46,6 @@ namespace OpenSim.Grid.UserServer
private string ConfigDll = "OpenSim.Grid.UserServer.Config.dll";
private string StorageDll = "OpenSim.Framework.Data.MySQL.dll";
private UserConfig Cfg;
protected IGenericConfig localXMLConfig;
public UserManager m_userManager;
@@ -83,14 +82,7 @@ namespace OpenSim.Grid.UserServer
public void Startup()
{
this.localXMLConfig = new XmlConfig("UserServerConfig.xml");
this.localXMLConfig.LoadData();
this.ConfigDB(this.localXMLConfig);
this.localXMLConfig.Close();
MainLog.Instance.Verbose("Main.cs:Startup() - Loading configuration");
Cfg = this.LoadConfigDll(this.ConfigDll);
Cfg.InitConfig();
this.Cfg = new UserConfig("USER SERVER", "UserServer_Config.xml");
MainLog.Instance.Verbose("Main.cs:Startup() - Establishing data connection");
m_userManager = new UserManager();
@@ -179,34 +171,6 @@ namespace OpenSim.Grid.UserServer
}
}
private UserConfig LoadConfigDll(string dllName)
{
Assembly pluginAssembly = Assembly.LoadFrom(dllName);
UserConfig config = null;
foreach (Type pluginType in pluginAssembly.GetTypes())
{
if (pluginType.IsPublic)
{
if (!pluginType.IsAbstract)
{
Type typeInterface = pluginType.GetInterface("IUserConfig", true);
if (typeInterface != null)
{
IUserConfig plug = (IUserConfig)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
config = plug.GetConfigObject();
break;
}
typeInterface = null;
}
}
}
pluginAssembly = null;
return config;
}
public void Show(string ShowWhat)
{
}