diff options
author | mingchen | 2007-07-18 23:15:08 +0000 |
---|---|---|
committer | mingchen | 2007-07-18 23:15:08 +0000 |
commit | 222becc8795d8abd8263c8abf8212de91faa4748 (patch) | |
tree | ac0eb1b420c2f60975b759296c94813f41925798 /OpenSim/Grid/UserServer | |
parent | * Reverting 1371 (diff) | |
download | opensim-SC_OLD-222becc8795d8abd8263c8abf8212de91faa4748.zip opensim-SC_OLD-222becc8795d8abd8263c8abf8212de91faa4748.tar.gz opensim-SC_OLD-222becc8795d8abd8263c8abf8212de91faa4748.tar.bz2 opensim-SC_OLD-222becc8795d8abd8263c8abf8212de91faa4748.tar.xz |
*New Configuration System, much easier and less buggy compared to the original system in place
*View RegionInfo.cs for an example on how it works!
*This hopefully copies all the files over, but who knows :)
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Grid/UserServer/Main.cs | 40 |
1 files changed, 2 insertions, 38 deletions
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs index 9bdf8d7..b702beb 100644 --- a/OpenSim/Grid/UserServer/Main.cs +++ b/OpenSim/Grid/UserServer/Main.cs | |||
@@ -35,7 +35,7 @@ using OpenSim.Framework.Interfaces; | |||
35 | using OpenSim.Framework.Servers; | 35 | using OpenSim.Framework.Servers; |
36 | using OpenSim.Framework.User; | 36 | using OpenSim.Framework.User; |
37 | using OpenSim.Framework.Utilities; | 37 | using OpenSim.Framework.Utilities; |
38 | using OpenSim.GenericConfig; | 38 | using OpenSim.Framework.Configuration; |
39 | 39 | ||
40 | namespace OpenSim.Grid.UserServer | 40 | namespace OpenSim.Grid.UserServer |
41 | { | 41 | { |
@@ -46,7 +46,6 @@ namespace OpenSim.Grid.UserServer | |||
46 | private string ConfigDll = "OpenSim.Grid.UserServer.Config.dll"; | 46 | private string ConfigDll = "OpenSim.Grid.UserServer.Config.dll"; |
47 | private string StorageDll = "OpenSim.Framework.Data.MySQL.dll"; | 47 | private string StorageDll = "OpenSim.Framework.Data.MySQL.dll"; |
48 | private UserConfig Cfg; | 48 | private UserConfig Cfg; |
49 | protected IGenericConfig localXMLConfig; | ||
50 | 49 | ||
51 | public UserManager m_userManager; | 50 | public UserManager m_userManager; |
52 | 51 | ||
@@ -83,14 +82,7 @@ namespace OpenSim.Grid.UserServer | |||
83 | 82 | ||
84 | public void Startup() | 83 | public void Startup() |
85 | { | 84 | { |
86 | this.localXMLConfig = new XmlConfig("UserServerConfig.xml"); | 85 | this.Cfg = new UserConfig("USER SERVER", "UserServer_Config.xml"); |
87 | this.localXMLConfig.LoadData(); | ||
88 | this.ConfigDB(this.localXMLConfig); | ||
89 | this.localXMLConfig.Close(); | ||
90 | |||
91 | MainLog.Instance.Verbose("Main.cs:Startup() - Loading configuration"); | ||
92 | Cfg = this.LoadConfigDll(this.ConfigDll); | ||
93 | Cfg.InitConfig(); | ||
94 | 86 | ||
95 | MainLog.Instance.Verbose("Main.cs:Startup() - Establishing data connection"); | 87 | MainLog.Instance.Verbose("Main.cs:Startup() - Establishing data connection"); |
96 | m_userManager = new UserManager(); | 88 | m_userManager = new UserManager(); |
@@ -179,34 +171,6 @@ namespace OpenSim.Grid.UserServer | |||
179 | } | 171 | } |
180 | } | 172 | } |
181 | 173 | ||
182 | private UserConfig LoadConfigDll(string dllName) | ||
183 | { | ||
184 | Assembly pluginAssembly = Assembly.LoadFrom(dllName); | ||
185 | UserConfig config = null; | ||
186 | |||
187 | foreach (Type pluginType in pluginAssembly.GetTypes()) | ||
188 | { | ||
189 | if (pluginType.IsPublic) | ||
190 | { | ||
191 | if (!pluginType.IsAbstract) | ||
192 | { | ||
193 | Type typeInterface = pluginType.GetInterface("IUserConfig", true); | ||
194 | |||
195 | if (typeInterface != null) | ||
196 | { | ||
197 | IUserConfig plug = (IUserConfig)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); | ||
198 | config = plug.GetConfigObject(); | ||
199 | break; | ||
200 | } | ||
201 | |||
202 | typeInterface = null; | ||
203 | } | ||
204 | } | ||
205 | } | ||
206 | pluginAssembly = null; | ||
207 | return config; | ||
208 | } | ||
209 | |||
210 | public void Show(string ShowWhat) | 174 | public void Show(string ShowWhat) |
211 | { | 175 | { |
212 | } | 176 | } |