diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Grid/AssetInventoryServer/AssetInventoryServer.cs (renamed from OpenSim/Grid/NewAssetServer/AssetServer.cs) | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/OpenSim/Grid/NewAssetServer/AssetServer.cs b/OpenSim/Grid/AssetInventoryServer/AssetInventoryServer.cs index c6864e7..2c588f5 100644 --- a/OpenSim/Grid/NewAssetServer/AssetServer.cs +++ b/OpenSim/Grid/AssetInventoryServer/AssetInventoryServer.cs | |||
@@ -40,11 +40,11 @@ using HttpServer; | |||
40 | using log4net; | 40 | using log4net; |
41 | using OpenSim.Framework; | 41 | using OpenSim.Framework; |
42 | 42 | ||
43 | namespace AssetServer | 43 | namespace OpenSim.Grid.AssetInventoryServer |
44 | { | 44 | { |
45 | public class AssetServer : ServiceBase | 45 | public class AssetInventoryServer : ServiceBase |
46 | { | 46 | { |
47 | public const string CONFIG_FILE = "AssetServer.ini"; | 47 | public const string CONFIG_FILE = "AssetInventoryServer.ini"; |
48 | 48 | ||
49 | public WebServer HttpServer; | 49 | public WebServer HttpServer; |
50 | public IniConfigSource ConfigFile; | 50 | public IniConfigSource ConfigFile; |
@@ -55,9 +55,9 @@ namespace AssetServer | |||
55 | public IAuthorizationProvider AuthorizationProvider; | 55 | public IAuthorizationProvider AuthorizationProvider; |
56 | public IMetricsProvider MetricsProvider; | 56 | public IMetricsProvider MetricsProvider; |
57 | 57 | ||
58 | public AssetServer() | 58 | public AssetInventoryServer() |
59 | { | 59 | { |
60 | this.ServiceName = "OpenSimAssetServer"; | 60 | this.ServiceName = "OpenSimAssetInventoryServer"; |
61 | } | 61 | } |
62 | 62 | ||
63 | public bool Start() | 63 | public bool Start() |
@@ -138,7 +138,7 @@ namespace AssetServer | |||
138 | // return false; | 138 | // return false; |
139 | //} | 139 | //} |
140 | 140 | ||
141 | StorageProvider = LoadAssetServerPlugin() as IAssetStorageProvider; | 141 | StorageProvider = LoadAssetInventoryServerPlugin() as IAssetStorageProvider; |
142 | 142 | ||
143 | try | 143 | try |
144 | { | 144 | { |
@@ -163,7 +163,7 @@ namespace AssetServer | |||
163 | 163 | ||
164 | public void Shutdown() | 164 | public void Shutdown() |
165 | { | 165 | { |
166 | foreach (IExtension<AssetServer> extension in ExtensionLoader<AssetServer>.Extensions) | 166 | foreach (IExtension<AssetInventoryServer> extension in ExtensionLoader<AssetInventoryServer>.Extensions) |
167 | { | 167 | { |
168 | Logger.Log.Debug("Disposing extension " + extension.GetType().Name); | 168 | Logger.Log.Debug("Disposing extension " + extension.GetType().Name); |
169 | try { extension.Stop(); } | 169 | try { extension.Stop(); } |
@@ -215,12 +215,13 @@ namespace AssetServer | |||
215 | 215 | ||
216 | #endregion | 216 | #endregion |
217 | 217 | ||
218 | private IAssetServerPlugin LoadAssetServerPlugin() | 218 | private IAssetInventoryServerPlugin LoadAssetInventoryServerPlugin() |
219 | { | 219 | { |
220 | PluginLoader<IAssetServerPlugin> loader = new PluginLoader<IAssetServerPlugin>(new AssetServerPluginInitialiser(this)); | 220 | PluginLoader<IAssetInventoryServerPlugin> loader = new PluginLoader<IAssetInventoryServerPlugin>(new AssetInventoryServerPluginInitialiser(this)); |
221 | 221 | ||
222 | //loader.Add ("/OpenSim/AssetServer/StorageProvider", new PluginProviderFilter (provider)); | 222 | //loader.Add ("/OpenSim/AssetInventoryServer/StorageProvider", new PluginProviderFilter (provider)); |
223 | loader.Add("/OpenSim/AssetServer/StorageProvider", new PluginCountConstraint(1)); | 223 | //loader.Add("/OpenSim/AssetInventoryServer/StorageProvider", new PluginCountConstraint(1)); |
224 | loader.Add("/OpenSim/AssetInventoryServer/StorageProvider"); | ||
224 | loader.Load(); | 225 | loader.Load(); |
225 | 226 | ||
226 | return loader.Plugin; | 227 | return loader.Plugin; |