aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Grid')
-rw-r--r--OpenSim/Grid/AssetInventoryServer/AssetInventoryServer.cs (renamed from OpenSim/Grid/NewAssetServer/AssetServer.cs)23
-rw-r--r--OpenSim/Grid/AssetInventoryServer/Extensions/AuthorizeAll.cs (renamed from OpenSim/Grid/NewAssetServer/Extensions/AuthorizeAll.cs)8
-rw-r--r--OpenSim/Grid/AssetInventoryServer/Extensions/BrowseFrontend.cs (renamed from OpenSim/Grid/NewAssetServer/Extensions/BrowseFrontend.cs)8
-rw-r--r--OpenSim/Grid/AssetInventoryServer/Extensions/DBConnString.cs (renamed from OpenSim/Grid/NewAssetServer/Extensions/DBConnString.cs)4
-rw-r--r--OpenSim/Grid/AssetInventoryServer/Extensions/NullAuthentication.cs (renamed from OpenSim/Grid/NewAssetServer/Extensions/NullAuthentication.cs)8
-rw-r--r--OpenSim/Grid/AssetInventoryServer/Extensions/NullMetrics.cs (renamed from OpenSim/Grid/NewAssetServer/Extensions/NullMetrics.cs)8
-rw-r--r--OpenSim/Grid/AssetInventoryServer/Extensions/OpenSimFrontend.cs (renamed from OpenSim/Grid/NewAssetServer/Extensions/OpenSimFrontend.cs)8
-rw-r--r--OpenSim/Grid/AssetInventoryServer/Extensions/OpenSimInventoryFrontend.cs (renamed from OpenSim/Grid/NewAssetServer/Extensions/OpenSimInventoryFrontend.cs)8
-rw-r--r--OpenSim/Grid/AssetInventoryServer/Extensions/OpenSimMySQLInventory.cs (renamed from OpenSim/Grid/NewAssetServer/Extensions/OpenSimMySQLInventory.cs)8
-rw-r--r--OpenSim/Grid/AssetInventoryServer/Extensions/OpenSimMySQLStorage.cs (renamed from OpenSim/Grid/NewAssetServer/Extensions/OpenSimMySQLStorage.cs)8
-rw-r--r--OpenSim/Grid/AssetInventoryServer/Extensions/ReferenceFrontend.cs (renamed from OpenSim/Grid/NewAssetServer/Extensions/ReferenceFrontend.cs)8
-rw-r--r--OpenSim/Grid/AssetInventoryServer/Extensions/SimpleInventory.cs (renamed from OpenSim/Grid/NewAssetServer/Extensions/SimpleInventory.cs)8
-rw-r--r--OpenSim/Grid/AssetInventoryServer/Extensions/SimpleStorage.cs (renamed from OpenSim/Grid/NewAssetServer/Extensions/SimpleStorage.cs)8
-rw-r--r--OpenSim/Grid/AssetInventoryServer/Extensions/SimpleUtils.cs (renamed from OpenSim/Grid/NewAssetServer/Extensions/SimpleUtils.cs)2
-rw-r--r--OpenSim/Grid/AssetInventoryServer/Interfaces.cs (renamed from OpenSim/Grid/NewAssetServer/Interfaces.cs)16
-rw-r--r--OpenSim/Grid/AssetInventoryServer/InventoryObjects.cs (renamed from OpenSim/Grid/NewAssetServer/InventoryObjects.cs)2
-rw-r--r--OpenSim/Grid/AssetInventoryServer/Logger.cs (renamed from OpenSim/Grid/NewAssetServer/Logger.cs)2
-rw-r--r--OpenSim/Grid/AssetInventoryServer/Main.cs (renamed from OpenSim/Grid/NewAssetServer/Main.cs)6
-rw-r--r--OpenSim/Grid/AssetInventoryServer/Metadata.cs (renamed from OpenSim/Grid/NewAssetServer/Metadata.cs)2
-rw-r--r--OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimAssetStoragePlugin.cs (renamed from OpenSim/Grid/NewAssetServer/Plugins/OpenSim/OpenSimAssetStoragePlugin.cs)10
-rw-r--r--OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/Resources/AssetInventoryServerOpenSimPlugins.addin.xml14
-rw-r--r--OpenSim/Grid/AssetInventoryServer/Utils.cs (renamed from OpenSim/Grid/NewAssetServer/Utils.cs)2
-rw-r--r--OpenSim/Grid/NewAssetServer/Plugins/OpenSim/Resources/AssetServerOpenSimPlugins.addin.xml14
23 files changed, 93 insertions, 92 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;
40using log4net; 40using log4net;
41using OpenSim.Framework; 41using OpenSim.Framework;
42 42
43namespace AssetServer 43namespace 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;
diff --git a/OpenSim/Grid/NewAssetServer/Extensions/AuthorizeAll.cs b/OpenSim/Grid/AssetInventoryServer/Extensions/AuthorizeAll.cs
index f112c5e..a4a2226 100644
--- a/OpenSim/Grid/NewAssetServer/Extensions/AuthorizeAll.cs
+++ b/OpenSim/Grid/AssetInventoryServer/Extensions/AuthorizeAll.cs
@@ -31,17 +31,17 @@ using System;
31using ExtensionLoader; 31using ExtensionLoader;
32using OpenMetaverse; 32using OpenMetaverse;
33 33
34namespace AssetServer.Extensions 34namespace OpenSim.Grid.AssetInventoryServer.Extensions
35{ 35{
36 public class AuthorizeAll : IExtension<AssetServer>, IAuthorizationProvider 36 public class AuthorizeAll : IExtension<AssetInventoryServer>, IAuthorizationProvider
37 { 37 {
38 AssetServer server; 38 AssetInventoryServer server;
39 39
40 public AuthorizeAll() 40 public AuthorizeAll()
41 { 41 {
42 } 42 }
43 43
44 public void Start(AssetServer server) 44 public void Start(AssetInventoryServer server)
45 { 45 {
46 this.server = server; 46 this.server = server;
47 } 47 }
diff --git a/OpenSim/Grid/NewAssetServer/Extensions/BrowseFrontend.cs b/OpenSim/Grid/AssetInventoryServer/Extensions/BrowseFrontend.cs
index 9f42722..ba4c4e2 100644
--- a/OpenSim/Grid/NewAssetServer/Extensions/BrowseFrontend.cs
+++ b/OpenSim/Grid/AssetInventoryServer/Extensions/BrowseFrontend.cs
@@ -37,17 +37,17 @@ using ExtensionLoader;
37using OpenMetaverse; 37using OpenMetaverse;
38using HttpServer; 38using HttpServer;
39 39
40namespace AssetServer.Extensions 40namespace OpenSim.Grid.AssetInventoryServer.Extensions
41{ 41{
42 public class BrowseFrontend : IExtension<AssetServer> 42 public class BrowseFrontend : IExtension<AssetInventoryServer>
43 { 43 {
44 AssetServer server; 44 AssetInventoryServer server;
45 45
46 public BrowseFrontend() 46 public BrowseFrontend()
47 { 47 {
48 } 48 }
49 49
50 public void Start(AssetServer server) 50 public void Start(AssetInventoryServer server)
51 { 51 {
52 this.server = server; 52 this.server = server;
53 53
diff --git a/OpenSim/Grid/NewAssetServer/Extensions/DBConnString.cs b/OpenSim/Grid/AssetInventoryServer/Extensions/DBConnString.cs
index 3c5f971..58054d6 100644
--- a/OpenSim/Grid/NewAssetServer/Extensions/DBConnString.cs
+++ b/OpenSim/Grid/AssetInventoryServer/Extensions/DBConnString.cs
@@ -32,7 +32,7 @@ using System.Xml;
32using ExtensionLoader.Config; 32using ExtensionLoader.Config;
33using MySql.Data.MySqlClient; 33using MySql.Data.MySqlClient;
34 34
35namespace AssetServer.Extensions 35namespace OpenSim.Grid.AssetInventoryServer.Extensions
36{ 36{
37 public static class DBConnString 37 public static class DBConnString
38 { 38 {
@@ -68,7 +68,7 @@ namespace AssetServer.Extensions
68 else 68 else
69 { 69 {
70 Logger.Log.Error("Database connection string is missing, check that the database_connect line is " + 70 Logger.Log.Error("Database connection string is missing, check that the database_connect line is " +
71 "correct and uncommented in AssetServer.ini"); 71 "correct and uncommented in AssetInventoryServer.ini");
72 } 72 }
73 } 73 }
74 74
diff --git a/OpenSim/Grid/NewAssetServer/Extensions/NullAuthentication.cs b/OpenSim/Grid/AssetInventoryServer/Extensions/NullAuthentication.cs
index 9d38bf4..796d80c 100644
--- a/OpenSim/Grid/NewAssetServer/Extensions/NullAuthentication.cs
+++ b/OpenSim/Grid/AssetInventoryServer/Extensions/NullAuthentication.cs
@@ -31,17 +31,17 @@ using System;
31using ExtensionLoader; 31using ExtensionLoader;
32using OpenMetaverse; 32using OpenMetaverse;
33 33
34namespace AssetServer.Extensions 34namespace OpenSim.Grid.AssetInventoryServer.Extensions
35{ 35{
36 public class NullAuthentication : IExtension<AssetServer>, IAuthenticationProvider 36 public class NullAuthentication : IExtension<AssetInventoryServer>, IAuthenticationProvider
37 { 37 {
38 AssetServer server; 38 AssetInventoryServer server;
39 39
40 public NullAuthentication() 40 public NullAuthentication()
41 { 41 {
42 } 42 }
43 43
44 public void Start(AssetServer server) 44 public void Start(AssetInventoryServer server)
45 { 45 {
46 this.server = server; 46 this.server = server;
47 } 47 }
diff --git a/OpenSim/Grid/NewAssetServer/Extensions/NullMetrics.cs b/OpenSim/Grid/AssetInventoryServer/Extensions/NullMetrics.cs
index 84657c4..c00203b 100644
--- a/OpenSim/Grid/NewAssetServer/Extensions/NullMetrics.cs
+++ b/OpenSim/Grid/AssetInventoryServer/Extensions/NullMetrics.cs
@@ -31,17 +31,17 @@ using System;
31using ExtensionLoader; 31using ExtensionLoader;
32using OpenMetaverse; 32using OpenMetaverse;
33 33
34namespace AssetServer.Extensions 34namespace OpenSim.Grid.AssetInventoryServer.Extensions
35{ 35{
36 public class NullMetrics : IExtension<AssetServer>, IMetricsProvider 36 public class NullMetrics : IExtension<AssetInventoryServer>, IMetricsProvider
37 { 37 {
38 AssetServer server; 38 AssetInventoryServer server;
39 39
40 public NullMetrics() 40 public NullMetrics()
41 { 41 {
42 } 42 }
43 43
44 public void Start(AssetServer server) 44 public void Start(AssetInventoryServer server)
45 { 45 {
46 this.server = server; 46 this.server = server;
47 } 47 }
diff --git a/OpenSim/Grid/NewAssetServer/Extensions/OpenSimFrontend.cs b/OpenSim/Grid/AssetInventoryServer/Extensions/OpenSimFrontend.cs
index 7a645b3..4fff5e9 100644
--- a/OpenSim/Grid/NewAssetServer/Extensions/OpenSimFrontend.cs
+++ b/OpenSim/Grid/AssetInventoryServer/Extensions/OpenSimFrontend.cs
@@ -36,17 +36,17 @@ using ExtensionLoader;
36using OpenMetaverse; 36using OpenMetaverse;
37using HttpServer; 37using HttpServer;
38 38
39namespace AssetServer.Extensions 39namespace OpenSim.Grid.AssetInventoryServer.Extensions
40{ 40{
41 public class OpenSimFrontend : IExtension<AssetServer> 41 public class OpenSimFrontend : IExtension<AssetInventoryServer>
42 { 42 {
43 AssetServer server; 43 AssetInventoryServer server;
44 44
45 public OpenSimFrontend() 45 public OpenSimFrontend()
46 { 46 {
47 } 47 }
48 48
49 public void Start(AssetServer server) 49 public void Start(AssetInventoryServer server)
50 { 50 {
51 this.server = server; 51 this.server = server;
52 52
diff --git a/OpenSim/Grid/NewAssetServer/Extensions/OpenSimInventoryFrontend.cs b/OpenSim/Grid/AssetInventoryServer/Extensions/OpenSimInventoryFrontend.cs
index a559f19..a0ebba5 100644
--- a/OpenSim/Grid/NewAssetServer/Extensions/OpenSimInventoryFrontend.cs
+++ b/OpenSim/Grid/AssetInventoryServer/Extensions/OpenSimInventoryFrontend.cs
@@ -37,11 +37,11 @@ using OpenMetaverse;
37using OpenMetaverse.StructuredData; 37using OpenMetaverse.StructuredData;
38using HttpServer; 38using HttpServer;
39 39
40namespace AssetServer.Extensions 40namespace OpenSim.Grid.AssetInventoryServer.Extensions
41{ 41{
42 public class OpenSimInventoryFrontend : IExtension<AssetServer> 42 public class OpenSimInventoryFrontend : IExtension<AssetInventoryServer>
43 { 43 {
44 AssetServer server; 44 AssetInventoryServer server;
45 Utils.InventoryItemSerializer itemSerializer = new Utils.InventoryItemSerializer(); 45 Utils.InventoryItemSerializer itemSerializer = new Utils.InventoryItemSerializer();
46 Utils.InventoryFolderSerializer folderSerializer = new Utils.InventoryFolderSerializer(); 46 Utils.InventoryFolderSerializer folderSerializer = new Utils.InventoryFolderSerializer();
47 Utils.InventoryCollectionSerializer collectionSerializer = new Utils.InventoryCollectionSerializer(); 47 Utils.InventoryCollectionSerializer collectionSerializer = new Utils.InventoryCollectionSerializer();
@@ -50,7 +50,7 @@ namespace AssetServer.Extensions
50 { 50 {
51 } 51 }
52 52
53 public void Start(AssetServer server) 53 public void Start(AssetInventoryServer server)
54 { 54 {
55 this.server = server; 55 this.server = server;
56 56
diff --git a/OpenSim/Grid/NewAssetServer/Extensions/OpenSimMySQLInventory.cs b/OpenSim/Grid/AssetInventoryServer/Extensions/OpenSimMySQLInventory.cs
index 1b5facd..7d6c0c2 100644
--- a/OpenSim/Grid/NewAssetServer/Extensions/OpenSimMySQLInventory.cs
+++ b/OpenSim/Grid/AssetInventoryServer/Extensions/OpenSimMySQLInventory.cs
@@ -37,13 +37,13 @@ using ExtensionLoader.Config;
37using OpenMetaverse; 37using OpenMetaverse;
38using OpenMetaverse.StructuredData; 38using OpenMetaverse.StructuredData;
39 39
40namespace AssetServer.Extensions 40namespace OpenSim.Grid.AssetInventoryServer.Extensions
41{ 41{
42 public class OpenSimMySQLInventory : IExtension<AssetServer>, IInventoryProvider 42 public class OpenSimMySQLInventory : IExtension<AssetInventoryServer>, IInventoryProvider
43 { 43 {
44 const string EXTENSION_NAME = "OpenSimMySQLInventory"; // Used in metrics reporting 44 const string EXTENSION_NAME = "OpenSimMySQLInventory"; // Used in metrics reporting
45 45
46 AssetServer server; 46 AssetInventoryServer server;
47 47
48 public OpenSimMySQLInventory() 48 public OpenSimMySQLInventory()
49 { 49 {
@@ -51,7 +51,7 @@ namespace AssetServer.Extensions
51 51
52 #region Required Interfaces 52 #region Required Interfaces
53 53
54 public void Start(AssetServer server) 54 public void Start(AssetInventoryServer server)
55 { 55 {
56 this.server = server; 56 this.server = server;
57 57
diff --git a/OpenSim/Grid/NewAssetServer/Extensions/OpenSimMySQLStorage.cs b/OpenSim/Grid/AssetInventoryServer/Extensions/OpenSimMySQLStorage.cs
index 34f1ef0..36528b0 100644
--- a/OpenSim/Grid/NewAssetServer/Extensions/OpenSimMySQLStorage.cs
+++ b/OpenSim/Grid/AssetInventoryServer/Extensions/OpenSimMySQLStorage.cs
@@ -37,13 +37,13 @@ using ExtensionLoader.Config;
37using OpenMetaverse; 37using OpenMetaverse;
38using OpenMetaverse.StructuredData; 38using OpenMetaverse.StructuredData;
39 39
40namespace AssetServer.Extensions 40namespace OpenSim.Grid.AssetInventoryServer.Extensions
41{ 41{
42 public class OpenSimMySQLStorage : IExtension<AssetServer>, IStorageProvider 42 public class OpenSimMySQLStorage : IExtension<AssetInventoryServer>, IStorageProvider
43 { 43 {
44 const string EXTENSION_NAME = "OpenSimMySQLStorage"; // Used in metrics reporting 44 const string EXTENSION_NAME = "OpenSimMySQLStorage"; // Used in metrics reporting
45 45
46 AssetServer server; 46 AssetInventoryServer server;
47 47
48 public OpenSimMySQLStorage() 48 public OpenSimMySQLStorage()
49 { 49 {
@@ -51,7 +51,7 @@ namespace AssetServer.Extensions
51 51
52 #region Required Interfaces 52 #region Required Interfaces
53 53
54 public void Start(AssetServer server) 54 public void Start(AssetInventoryServer server)
55 { 55 {
56 this.server = server; 56 this.server = server;
57 57
diff --git a/OpenSim/Grid/NewAssetServer/Extensions/ReferenceFrontend.cs b/OpenSim/Grid/AssetInventoryServer/Extensions/ReferenceFrontend.cs
index 133f87c..454984e 100644
--- a/OpenSim/Grid/NewAssetServer/Extensions/ReferenceFrontend.cs
+++ b/OpenSim/Grid/AssetInventoryServer/Extensions/ReferenceFrontend.cs
@@ -36,17 +36,17 @@ using OpenMetaverse;
36using OpenMetaverse.StructuredData; 36using OpenMetaverse.StructuredData;
37using HttpServer; 37using HttpServer;
38 38
39namespace AssetServer.Extensions 39namespace OpenSim.Grid.AssetInventoryServer.Extensions
40{ 40{
41 public class ReferenceFrontend : IExtension<AssetServer> 41 public class ReferenceFrontend : IExtension<AssetInventoryServer>
42 { 42 {
43 AssetServer server; 43 AssetInventoryServer server;
44 44
45 public ReferenceFrontend() 45 public ReferenceFrontend()
46 { 46 {
47 } 47 }
48 48
49 public void Start(AssetServer server) 49 public void Start(AssetInventoryServer server)
50 { 50 {
51 this.server = server; 51 this.server = server;
52 52
diff --git a/OpenSim/Grid/NewAssetServer/Extensions/SimpleInventory.cs b/OpenSim/Grid/AssetInventoryServer/Extensions/SimpleInventory.cs
index 782b6b4..f8acdea 100644
--- a/OpenSim/Grid/NewAssetServer/Extensions/SimpleInventory.cs
+++ b/OpenSim/Grid/AssetInventoryServer/Extensions/SimpleInventory.cs
@@ -36,14 +36,14 @@ using ExtensionLoader;
36using OpenMetaverse; 36using OpenMetaverse;
37using OpenMetaverse.StructuredData; 37using OpenMetaverse.StructuredData;
38 38
39namespace AssetServer.Extensions 39namespace OpenSim.Grid.AssetInventoryServer.Extensions
40{ 40{
41 public class SimpleInventory : IExtension<AssetServer>, IInventoryProvider 41 public class SimpleInventory : IExtension<AssetInventoryServer>, IInventoryProvider
42 { 42 {
43 const string EXTENSION_NAME = "SimpleInventory"; // Used for metrics reporting 43 const string EXTENSION_NAME = "SimpleInventory"; // Used for metrics reporting
44 const string DEFAULT_INVENTORY_DIR = "SimpleInventory"; 44 const string DEFAULT_INVENTORY_DIR = "SimpleInventory";
45 45
46 AssetServer server; 46 AssetInventoryServer server;
47 Dictionary<Uri, InventoryCollection> inventories = new Dictionary<Uri, InventoryCollection>(); 47 Dictionary<Uri, InventoryCollection> inventories = new Dictionary<Uri, InventoryCollection>();
48 Dictionary<Uri, List<InventoryItem>> activeGestures = new Dictionary<Uri, List<InventoryItem>>(); 48 Dictionary<Uri, List<InventoryItem>> activeGestures = new Dictionary<Uri, List<InventoryItem>>();
49 Utils.InventoryItemSerializer itemSerializer = new Utils.InventoryItemSerializer(); 49 Utils.InventoryItemSerializer itemSerializer = new Utils.InventoryItemSerializer();
@@ -55,7 +55,7 @@ namespace AssetServer.Extensions
55 55
56 #region Required Interfaces 56 #region Required Interfaces
57 57
58 public void Start(AssetServer server) 58 public void Start(AssetInventoryServer server)
59 { 59 {
60 this.server = server; 60 this.server = server;
61 61
diff --git a/OpenSim/Grid/NewAssetServer/Extensions/SimpleStorage.cs b/OpenSim/Grid/AssetInventoryServer/Extensions/SimpleStorage.cs
index 1c0fe33..c9cf138 100644
--- a/OpenSim/Grid/NewAssetServer/Extensions/SimpleStorage.cs
+++ b/OpenSim/Grid/AssetInventoryServer/Extensions/SimpleStorage.cs
@@ -35,15 +35,15 @@ using ExtensionLoader;
35using OpenMetaverse; 35using OpenMetaverse;
36using OpenMetaverse.StructuredData; 36using OpenMetaverse.StructuredData;
37 37
38namespace AssetServer.Extensions 38namespace OpenSim.Grid.AssetInventoryServer.Extensions
39{ 39{
40 public class SimpleStorage : IExtension<AssetServer>, IStorageProvider 40 public class SimpleStorage : IExtension<AssetInventoryServer>, IStorageProvider
41 { 41 {
42 const string EXTENSION_NAME = ""; // Used in metrics reporting 42 const string EXTENSION_NAME = ""; // Used in metrics reporting
43 const string DEFAULT_DATA_DIR = "SimpleAssets"; 43 const string DEFAULT_DATA_DIR = "SimpleAssets";
44 const string TEMP_DATA_DIR = "SimpleAssetsTemp"; 44 const string TEMP_DATA_DIR = "SimpleAssetsTemp";
45 45
46 AssetServer server; 46 AssetInventoryServer server;
47 Dictionary<UUID, Metadata> metadataStorage; 47 Dictionary<UUID, Metadata> metadataStorage;
48 Dictionary<UUID, string> filenames; 48 Dictionary<UUID, string> filenames;
49 49
@@ -53,7 +53,7 @@ namespace AssetServer.Extensions
53 53
54 #region Required Interfaces 54 #region Required Interfaces
55 55
56 public void Start(AssetServer server) 56 public void Start(AssetInventoryServer server)
57 { 57 {
58 this.server = server; 58 this.server = server;
59 metadataStorage = new Dictionary<UUID, Metadata>(); 59 metadataStorage = new Dictionary<UUID, Metadata>();
diff --git a/OpenSim/Grid/NewAssetServer/Extensions/SimpleUtils.cs b/OpenSim/Grid/AssetInventoryServer/Extensions/SimpleUtils.cs
index 6642f90..fe6491e 100644
--- a/OpenSim/Grid/NewAssetServer/Extensions/SimpleUtils.cs
+++ b/OpenSim/Grid/AssetInventoryServer/Extensions/SimpleUtils.cs
@@ -2,7 +2,7 @@
2using System.IO; 2using System.IO;
3using OpenMetaverse; 3using OpenMetaverse;
4 4
5namespace AssetServer.Extensions 5namespace OpenSim.Grid.AssetInventoryServer.Extensions
6{ 6{
7 public static class SimpleUtils 7 public static class SimpleUtils
8 { 8 {
diff --git a/OpenSim/Grid/NewAssetServer/Interfaces.cs b/OpenSim/Grid/AssetInventoryServer/Interfaces.cs
index 8368922..fd9ed2c 100644
--- a/OpenSim/Grid/NewAssetServer/Interfaces.cs
+++ b/OpenSim/Grid/AssetInventoryServer/Interfaces.cs
@@ -34,7 +34,7 @@ using OpenMetaverse;
34using OpenMetaverse.StructuredData; 34using OpenMetaverse.StructuredData;
35using OpenSim.Framework; 35using OpenSim.Framework;
36 36
37namespace AssetServer 37namespace OpenSim.Grid.AssetInventoryServer
38{ 38{
39 /// <summary> 39 /// <summary>
40 /// Response from a call to a backend provider 40 /// Response from a call to a backend provider
@@ -50,27 +50,27 @@ namespace AssetServer
50 Failure 50 Failure
51 } 51 }
52 52
53 public class AssetServerPluginInitialiser : PluginInitialiserBase 53 public class AssetInventoryServerPluginInitialiser : PluginInitialiserBase
54 { 54 {
55 private AssetServer server; 55 private AssetInventoryServer server;
56 56
57 public AssetServerPluginInitialiser (AssetServer server) 57 public AssetInventoryServerPluginInitialiser (AssetInventoryServer server)
58 { 58 {
59 this.server = server; 59 this.server = server;
60 } 60 }
61 61
62 public override void Initialise (IPlugin plugin) 62 public override void Initialise (IPlugin plugin)
63 { 63 {
64 IAssetServerPlugin p = plugin as IAssetServerPlugin; 64 IAssetInventoryServerPlugin p = plugin as IAssetInventoryServerPlugin;
65 p.Initialise (server); 65 p.Initialise (server);
66 } 66 }
67 } 67 }
68 68
69 #region Interfaces 69 #region Interfaces
70 70
71 public interface IAssetServerPlugin : IPlugin 71 public interface IAssetInventoryServerPlugin : IPlugin
72 { 72 {
73 void Initialise(AssetServer server); 73 void Initialise(AssetInventoryServer server);
74 } 74 }
75 75
76 public interface IStorageProvider 76 public interface IStorageProvider
@@ -83,7 +83,7 @@ namespace AssetServer
83 int ForEach(Action<Metadata> action, int start, int count); 83 int ForEach(Action<Metadata> action, int start, int count);
84 } 84 }
85 85
86 public interface IAssetStorageProvider : IAssetServerPlugin 86 public interface IAssetStorageProvider : IAssetInventoryServerPlugin
87 { 87 {
88 BackendResponse TryFetchMetadata(UUID assetID, out Metadata metadata); 88 BackendResponse TryFetchMetadata(UUID assetID, out Metadata metadata);
89 BackendResponse TryFetchData(UUID assetID, out byte[] assetData); 89 BackendResponse TryFetchData(UUID assetID, out byte[] assetData);
diff --git a/OpenSim/Grid/NewAssetServer/InventoryObjects.cs b/OpenSim/Grid/AssetInventoryServer/InventoryObjects.cs
index cffa643..6f054ff 100644
--- a/OpenSim/Grid/NewAssetServer/InventoryObjects.cs
+++ b/OpenSim/Grid/AssetInventoryServer/InventoryObjects.cs
@@ -31,7 +31,7 @@ using System;
31using System.Collections.Generic; 31using System.Collections.Generic;
32using OpenMetaverse; 32using OpenMetaverse;
33 33
34namespace AssetServer 34namespace OpenSim.Grid.AssetInventoryServer
35{ 35{
36 public class InventoryBase 36 public class InventoryBase
37 { 37 {
diff --git a/OpenSim/Grid/NewAssetServer/Logger.cs b/OpenSim/Grid/AssetInventoryServer/Logger.cs
index dd40115..546e3c4 100644
--- a/OpenSim/Grid/NewAssetServer/Logger.cs
+++ b/OpenSim/Grid/AssetInventoryServer/Logger.cs
@@ -33,7 +33,7 @@ using log4net.Config;
33 33
34[assembly: log4net.Config.XmlConfigurator(ConfigFileExtension = "log4net")] 34[assembly: log4net.Config.XmlConfigurator(ConfigFileExtension = "log4net")]
35 35
36namespace AssetServer 36namespace OpenSim.Grid.AssetInventoryServer
37{ 37{
38 /// <summary> 38 /// <summary>
39 /// Singleton logging class for the entire library 39 /// Singleton logging class for the entire library
diff --git a/OpenSim/Grid/NewAssetServer/Main.cs b/OpenSim/Grid/AssetInventoryServer/Main.cs
index 9f7dd3e..69ed8c0 100644
--- a/OpenSim/Grid/NewAssetServer/Main.cs
+++ b/OpenSim/Grid/AssetInventoryServer/Main.cs
@@ -30,14 +30,14 @@
30using System; 30using System;
31using System.ServiceProcess; 31using System.ServiceProcess;
32 32
33namespace AssetServer 33namespace OpenSim.Grid.AssetInventoryServer
34{ 34{
35 class MainEntry 35 class MainEntry
36 { 36 {
37 static void Main(string[] args) 37 static void Main(string[] args)
38 { 38 {
39#if DEBUG 39#if DEBUG
40 AssetServer server = new AssetServer(); 40 AssetInventoryServer server = new AssetInventoryServer();
41 if (server.Start()) 41 if (server.Start())
42 { 42 {
43 Console.WriteLine("Asset server is running. Press CTRL+C to quit"); 43 Console.WriteLine("Asset server is running. Press CTRL+C to quit");
@@ -54,7 +54,7 @@ namespace AssetServer
54 Console.ReadLine(); 54 Console.ReadLine();
55 } 55 }
56#else 56#else
57 ServiceBase[] servicesToRun = new ServiceBase[] { new AssetServer() }; 57 ServiceBase[] servicesToRun = new ServiceBase[] { new AssetInventoryServer() };
58 ServiceBase.Run(servicesToRun); 58 ServiceBase.Run(servicesToRun);
59#endif 59#endif
60 } 60 }
diff --git a/OpenSim/Grid/NewAssetServer/Metadata.cs b/OpenSim/Grid/AssetInventoryServer/Metadata.cs
index 247a3e8..3735ea4 100644
--- a/OpenSim/Grid/NewAssetServer/Metadata.cs
+++ b/OpenSim/Grid/AssetInventoryServer/Metadata.cs
@@ -4,7 +4,7 @@ using System.Xml;
4using OpenMetaverse; 4using OpenMetaverse;
5using OpenMetaverse.StructuredData; 5using OpenMetaverse.StructuredData;
6 6
7namespace AssetServer 7namespace OpenSim.Grid.AssetInventoryServer
8{ 8{
9 public class Metadata 9 public class Metadata
10 { 10 {
diff --git a/OpenSim/Grid/NewAssetServer/Plugins/OpenSim/OpenSimAssetStoragePlugin.cs b/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimAssetStoragePlugin.cs
index dd05e5d..7f5f85a 100644
--- a/OpenSim/Grid/NewAssetServer/Plugins/OpenSim/OpenSimAssetStoragePlugin.cs
+++ b/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimAssetStoragePlugin.cs
@@ -37,15 +37,15 @@ using ExtensionLoader.Config;
37using OpenMetaverse; 37using OpenMetaverse;
38using OpenMetaverse.StructuredData; 38using OpenMetaverse.StructuredData;
39using OpenSim.Framework; 39using OpenSim.Framework;
40using AssetServer.Extensions; 40using OpenSim.Grid.AssetInventoryServer.Extensions;
41 41
42namespace AssetServer.Plugins 42namespace OpenSim.Grid.AssetInventoryServer.Plugins
43{ 43{
44 public class OpenSimAssetStoragePlugin : IAssetStorageProvider 44 public class OpenSimAssetStoragePlugin : IAssetStorageProvider
45 { 45 {
46 const string EXTENSION_NAME = "OpenSimAssetStorage"; // Used in metrics reporting 46 const string EXTENSION_NAME = "OpenSimAssetStorage"; // Used in metrics reporting
47 47
48 private AssetServer server; 48 private AssetInventoryServer server;
49 private IAssetProviderPlugin m_assetProvider; 49 private IAssetProviderPlugin m_assetProvider;
50 50
51 public OpenSimAssetStoragePlugin() 51 public OpenSimAssetStoragePlugin()
@@ -291,7 +291,7 @@ namespace AssetServer.Plugins
291 291
292 #region IPlugin implementation 292 #region IPlugin implementation
293 293
294 public void Initialise(AssetServer server) 294 public void Initialise(AssetInventoryServer server)
295 { 295 {
296 this.server = server; 296 this.server = server;
297 297
@@ -332,7 +332,7 @@ namespace AssetServer.Plugins
332 332
333 public string Name 333 public string Name
334 { 334 {
335 get { return "AssetServer storage provider"; } 335 get { return "AssetInventoryServer storage provider"; }
336 } 336 }
337 337
338 #endregion IPlugin implementation 338 #endregion IPlugin implementation
diff --git a/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/Resources/AssetInventoryServerOpenSimPlugins.addin.xml b/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/Resources/AssetInventoryServerOpenSimPlugins.addin.xml
new file mode 100644
index 0000000..eeda54a
--- /dev/null
+++ b/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/Resources/AssetInventoryServerOpenSimPlugins.addin.xml
@@ -0,0 +1,14 @@
1<Addin id="OpenSim.Grid.AssetInventoryServer.Plugins.OpenSim" version="0.1">
2 <Runtime>
3 <Import assembly="OpenSim.Grid.AssetInventoryServer.Plugins.OpenSim.dll"/>
4 </Runtime>
5 <Dependencies>
6 <Addin id="OpenSim.Grid.AssetInventoryServer" version="0.1" />
7 </Dependencies>
8 <ExtensionPoint path = "/OpenSim/AssetData">
9 <ExtensionNode name="Plugin" type="OpenSim.Framework.PluginExtensionNode" objectType="OpenSim.Framework.IAssetProviderPlugin"/>
10 </ExtensionPoint>
11 <Extension path="/OpenSim/AssetInventoryServer/StorageProvider">
12 <Plugin id="OpenSimAssetStorage" provider="OpenSim.Grid.AssetInventoryServer.Plugins.OpenSim.dll" type="OpenSim.Grid.AssetInventoryServer.Plugins.OpenSimAssetStoragePlugin" />
13 </Extension>
14</Addin>
diff --git a/OpenSim/Grid/NewAssetServer/Utils.cs b/OpenSim/Grid/AssetInventoryServer/Utils.cs
index 5499933..a81a0ba 100644
--- a/OpenSim/Grid/NewAssetServer/Utils.cs
+++ b/OpenSim/Grid/AssetInventoryServer/Utils.cs
@@ -37,7 +37,7 @@ using OpenMetaverse;
37using OpenMetaverse.StructuredData; 37using OpenMetaverse.StructuredData;
38using HttpServer; 38using HttpServer;
39 39
40namespace AssetServer 40namespace OpenSim.Grid.AssetInventoryServer
41{ 41{
42 public static class Utils 42 public static class Utils
43 { 43 {
diff --git a/OpenSim/Grid/NewAssetServer/Plugins/OpenSim/Resources/AssetServerOpenSimPlugins.addin.xml b/OpenSim/Grid/NewAssetServer/Plugins/OpenSim/Resources/AssetServerOpenSimPlugins.addin.xml
deleted file mode 100644
index 0e473ad..0000000
--- a/OpenSim/Grid/NewAssetServer/Plugins/OpenSim/Resources/AssetServerOpenSimPlugins.addin.xml
+++ /dev/null
@@ -1,14 +0,0 @@
1<Addin id="OpenSim.Grid.AssetServer.Plugins.OpenSim" version="0.1">
2 <Runtime>
3 <Import assembly="OpenSim.Grid.AssetServer.Plugins.OpenSim.dll"/>
4 </Runtime>
5 <Dependencies>
6 <Addin id="OpenSim.Grid.NewAssetServer" version="0.1" />
7 </Dependencies>
8 <ExtensionPoint path = "/OpenSim/AssetData">
9 <ExtensionNode name="Plugin" type="OpenSim.Framework.PluginExtensionNode" objectType="OpenSim.Framework.IAssetProviderPlugin"/>
10 </ExtensionPoint>
11 <Extension path="/OpenSim/AssetServer/StorageProvider">
12 <Plugin id="OpenSimAssetStorage" provider="OpenSim.Grid.AssetServer.Plugins.OpenSim.dll" type="AssetServer.Plugins.OpenSimAssetStoragePlugin" />
13 </Extension>
14</Addin>