Rename NewAssetServer AssetInventoryServer and fully qualify with

OpenSim.Grid.AssetInventoryServer.

24 files changed, 94 insertions, 93 deletions

diff --git a/OpenSim/Data/MySQL/Resources/OpenSim.Data.MySQL.addin.xml b/OpenSim/Data/MySQL/Resources/OpenSim.Data.MySQL.addin.xml
index 9f583a2..281e3af 100644
--- a/OpenSim/Data/MySQL/Resources/OpenSim.Data.MySQL.addin.xml
+++ b/OpenSim/Data/MySQL/Resources/OpenSim.Data.MySQL.addin.xml
@@ -4,7 +4,7 @@
     </Runtime>
     <Dependencies>
         <Addin id="OpenSim.Data" version="0.5" />
-        <Addin id="OpenSim.Grid.AssetServer.Plugins.OpenSim" version="0.1" />
+        <Addin id="OpenSim.Grid.AssetInventoryServer.Plugins.OpenSim" version="0.1" />
     </Dependencies>
     <Extension path = "/OpenSim/GridData">
         <Plugin id="MySQLGridData" provider="OpenSim.Data.MySQL.dll" type="OpenSim.Data.MySQL.MySQLGridData" />
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;
 using log4net;

 using OpenSim.Framework;

 

-namespace AssetServer

+namespace OpenSim.Grid.AssetInventoryServer

 {

-    public class AssetServer : ServiceBase

+    public class AssetInventoryServer : ServiceBase

     {

-        public const string CONFIG_FILE = "AssetServer.ini";

+        public const string CONFIG_FILE = "AssetInventoryServer.ini";

 

         public WebServer HttpServer;

         public IniConfigSource ConfigFile;

@@ -55,9 +55,9 @@ namespace AssetServer
         public IAuthorizationProvider AuthorizationProvider;

         public IMetricsProvider MetricsProvider;

 

-        public AssetServer()

+        public AssetInventoryServer()

         {

-            this.ServiceName = "OpenSimAssetServer";

+            this.ServiceName = "OpenSimAssetInventoryServer";

         }

 

         public bool Start()

@@ -138,7 +138,7 @@ namespace AssetServer
             //    return false;

             //}

 

-            StorageProvider = LoadAssetServerPlugin() as IAssetStorageProvider;

+            StorageProvider = LoadAssetInventoryServerPlugin() as IAssetStorageProvider;

 

             try

             {

@@ -163,7 +163,7 @@ namespace AssetServer
 

         public void Shutdown()

         {

-            foreach (IExtension<AssetServer> extension in ExtensionLoader<AssetServer>.Extensions)

+            foreach (IExtension<AssetInventoryServer> extension in ExtensionLoader<AssetInventoryServer>.Extensions)

             {

                 Logger.Log.Debug("Disposing extension " + extension.GetType().Name);

                 try { extension.Stop(); }

@@ -215,12 +215,13 @@ namespace AssetServer
 

         #endregion

 

-        private IAssetServerPlugin LoadAssetServerPlugin()

+        private IAssetInventoryServerPlugin LoadAssetInventoryServerPlugin()

         {

-            PluginLoader<IAssetServerPlugin> loader = new PluginLoader<IAssetServerPlugin>(new AssetServerPluginInitialiser(this));

+            PluginLoader<IAssetInventoryServerPlugin> loader = new PluginLoader<IAssetInventoryServerPlugin>(new AssetInventoryServerPluginInitialiser(this));

 

-            //loader.Add ("/OpenSim/AssetServer/StorageProvider", new PluginProviderFilter (provider));

-            loader.Add("/OpenSim/AssetServer/StorageProvider", new PluginCountConstraint(1));

+            //loader.Add ("/OpenSim/AssetInventoryServer/StorageProvider", new PluginProviderFilter (provider));

+            //loader.Add("/OpenSim/AssetInventoryServer/StorageProvider", new PluginCountConstraint(1));

+            loader.Add("/OpenSim/AssetInventoryServer/StorageProvider");

             loader.Load();

 

             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;
 using ExtensionLoader;

 using OpenMetaverse;

 

-namespace AssetServer.Extensions

+namespace OpenSim.Grid.AssetInventoryServer.Extensions

 {

-    public class AuthorizeAll : IExtension<AssetServer>, IAuthorizationProvider

+    public class AuthorizeAll : IExtension<AssetInventoryServer>, IAuthorizationProvider

     {

-        AssetServer server;

+        AssetInventoryServer server;

 

         public AuthorizeAll()

         {

         }

 

-        public void Start(AssetServer server)

+        public void Start(AssetInventoryServer server)

         {

             this.server = server;

         }

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;
 using OpenMetaverse;

 using HttpServer;

 

-namespace AssetServer.Extensions

+namespace OpenSim.Grid.AssetInventoryServer.Extensions

 {

-    public class BrowseFrontend : IExtension<AssetServer>

+    public class BrowseFrontend : IExtension<AssetInventoryServer>

     {

-        AssetServer server;

+        AssetInventoryServer server;

 

         public BrowseFrontend()

         {

         }

 

-        public void Start(AssetServer server)

+        public void Start(AssetInventoryServer server)

         {

             this.server = server;

 

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;
 using ExtensionLoader.Config;

 using MySql.Data.MySqlClient;

 

-namespace AssetServer.Extensions

+namespace OpenSim.Grid.AssetInventoryServer.Extensions

 {

     public static class DBConnString

     {

@@ -68,7 +68,7 @@ namespace AssetServer.Extensions
                 else

                 {

                     Logger.Log.Error("Database connection string is missing, check that the database_connect line is " +

-                        "correct and uncommented in AssetServer.ini");

+                        "correct and uncommented in AssetInventoryServer.ini");

                 }

             }

 

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;
 using ExtensionLoader;

 using OpenMetaverse;

 

-namespace AssetServer.Extensions

+namespace OpenSim.Grid.AssetInventoryServer.Extensions

 {

-    public class NullAuthentication : IExtension<AssetServer>, IAuthenticationProvider

+    public class NullAuthentication : IExtension<AssetInventoryServer>, IAuthenticationProvider

     {

-        AssetServer server;

+        AssetInventoryServer server;

 

         public NullAuthentication()

         {

         }

 

-        public void Start(AssetServer server)

+        public void Start(AssetInventoryServer server)

         {

             this.server = server;

         }

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;
 using ExtensionLoader;

 using OpenMetaverse;

 

-namespace AssetServer.Extensions

+namespace OpenSim.Grid.AssetInventoryServer.Extensions

 {

-    public class NullMetrics : IExtension<AssetServer>, IMetricsProvider

+    public class NullMetrics : IExtension<AssetInventoryServer>, IMetricsProvider

     {

-        AssetServer server;

+        AssetInventoryServer server;

 

         public NullMetrics()

         {

         }

 

-        public void Start(AssetServer server)

+        public void Start(AssetInventoryServer server)

         {

             this.server = server;

         }

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;
 using OpenMetaverse;

 using HttpServer;

 

-namespace AssetServer.Extensions

+namespace OpenSim.Grid.AssetInventoryServer.Extensions

 {

-    public class OpenSimFrontend : IExtension<AssetServer>

+    public class OpenSimFrontend : IExtension<AssetInventoryServer>

     {

-        AssetServer server;

+        AssetInventoryServer server;

 

         public OpenSimFrontend()

         {

         }

 

-        public void Start(AssetServer server)

+        public void Start(AssetInventoryServer server)

         {

             this.server = server;

 

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;
 using OpenMetaverse.StructuredData;

 using HttpServer;

 

-namespace AssetServer.Extensions

+namespace OpenSim.Grid.AssetInventoryServer.Extensions

 {

-    public class OpenSimInventoryFrontend : IExtension<AssetServer>

+    public class OpenSimInventoryFrontend : IExtension<AssetInventoryServer>

     {

-        AssetServer server;

+        AssetInventoryServer server;

         Utils.InventoryItemSerializer itemSerializer = new Utils.InventoryItemSerializer();

         Utils.InventoryFolderSerializer folderSerializer = new Utils.InventoryFolderSerializer();

         Utils.InventoryCollectionSerializer collectionSerializer = new Utils.InventoryCollectionSerializer();

@@ -50,7 +50,7 @@ namespace AssetServer.Extensions
         {

         }

 

-        public void Start(AssetServer server)

+        public void Start(AssetInventoryServer server)

         {

             this.server = server;

 

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;
 using OpenMetaverse;

 using OpenMetaverse.StructuredData;

 

-namespace AssetServer.Extensions

+namespace OpenSim.Grid.AssetInventoryServer.Extensions

 {

-    public class OpenSimMySQLInventory : IExtension<AssetServer>, IInventoryProvider

+    public class OpenSimMySQLInventory : IExtension<AssetInventoryServer>, IInventoryProvider

     {

         const string EXTENSION_NAME = "OpenSimMySQLInventory"; // Used in metrics reporting

 

-        AssetServer server;

+        AssetInventoryServer server;

 

         public OpenSimMySQLInventory()

         {

@@ -51,7 +51,7 @@ namespace AssetServer.Extensions
 

         #region Required Interfaces

 

-        public void Start(AssetServer server)

+        public void Start(AssetInventoryServer server)

         {

             this.server = server;

 

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;
 using OpenMetaverse;

 using OpenMetaverse.StructuredData;

 

-namespace AssetServer.Extensions

+namespace OpenSim.Grid.AssetInventoryServer.Extensions

 {

-    public class OpenSimMySQLStorage : IExtension<AssetServer>, IStorageProvider

+    public class OpenSimMySQLStorage : IExtension<AssetInventoryServer>, IStorageProvider

     {

         const string EXTENSION_NAME = "OpenSimMySQLStorage"; // Used in metrics reporting

 

-        AssetServer server;

+        AssetInventoryServer server;

 

         public OpenSimMySQLStorage()

         {

@@ -51,7 +51,7 @@ namespace AssetServer.Extensions
 

         #region Required Interfaces

 

-        public void Start(AssetServer server)

+        public void Start(AssetInventoryServer server)

         {

             this.server = server;

 

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;
 using OpenMetaverse.StructuredData;

 using HttpServer;

 

-namespace AssetServer.Extensions

+namespace OpenSim.Grid.AssetInventoryServer.Extensions

 {

-    public class ReferenceFrontend : IExtension<AssetServer>

+    public class ReferenceFrontend : IExtension<AssetInventoryServer>

     {

-        AssetServer server;

+        AssetInventoryServer server;

 

         public ReferenceFrontend()

         {

         }

 

-        public void Start(AssetServer server)

+        public void Start(AssetInventoryServer server)

         {

             this.server = server;

 

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;
 using OpenMetaverse;

 using OpenMetaverse.StructuredData;

 

-namespace AssetServer.Extensions

+namespace OpenSim.Grid.AssetInventoryServer.Extensions

 {

-    public class SimpleInventory : IExtension<AssetServer>, IInventoryProvider

+    public class SimpleInventory : IExtension<AssetInventoryServer>, IInventoryProvider

     {

         const string EXTENSION_NAME = "SimpleInventory"; // Used for metrics reporting

         const string DEFAULT_INVENTORY_DIR = "SimpleInventory";

 

-        AssetServer server;

+        AssetInventoryServer server;

         Dictionary<Uri, InventoryCollection> inventories = new Dictionary<Uri, InventoryCollection>();

         Dictionary<Uri, List<InventoryItem>> activeGestures = new Dictionary<Uri, List<InventoryItem>>();

         Utils.InventoryItemSerializer itemSerializer = new Utils.InventoryItemSerializer();

@@ -55,7 +55,7 @@ namespace AssetServer.Extensions
 

         #region Required Interfaces

 

-        public void Start(AssetServer server)

+        public void Start(AssetInventoryServer server)

         {

             this.server = server;

 

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;
 using OpenMetaverse;

 using OpenMetaverse.StructuredData;

 

-namespace AssetServer.Extensions

+namespace OpenSim.Grid.AssetInventoryServer.Extensions

 {

-    public class SimpleStorage : IExtension<AssetServer>, IStorageProvider

+    public class SimpleStorage : IExtension<AssetInventoryServer>, IStorageProvider

     {

         const string EXTENSION_NAME = ""; // Used in metrics reporting

         const string DEFAULT_DATA_DIR = "SimpleAssets";

         const string TEMP_DATA_DIR = "SimpleAssetsTemp";

 

-        AssetServer server;

+        AssetInventoryServer server;

         Dictionary<UUID, Metadata> metadataStorage;

         Dictionary<UUID, string> filenames;

 

@@ -53,7 +53,7 @@ namespace AssetServer.Extensions
 

         #region Required Interfaces

 

-        public void Start(AssetServer server)

+        public void Start(AssetInventoryServer server)

         {

             this.server = server;

             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 @@
 using System.IO;

 using OpenMetaverse;

 

-namespace AssetServer.Extensions

+namespace OpenSim.Grid.AssetInventoryServer.Extensions

 {

     public static class SimpleUtils

     {

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;
 using OpenMetaverse.StructuredData;

 using OpenSim.Framework;

 

-namespace AssetServer

+namespace OpenSim.Grid.AssetInventoryServer

 {

     /// <summary>

     /// Response from a call to a backend provider

@@ -50,27 +50,27 @@ namespace AssetServer
         Failure

     }

 

-    public class AssetServerPluginInitialiser : PluginInitialiserBase

+    public class AssetInventoryServerPluginInitialiser : PluginInitialiserBase

     {

-        private AssetServer server;

+        private AssetInventoryServer server;

 

-        public AssetServerPluginInitialiser (AssetServer server)

+        public AssetInventoryServerPluginInitialiser (AssetInventoryServer server)

         {

             this.server = server;

         }

 

         public override void Initialise (IPlugin plugin)

         {

-            IAssetServerPlugin p = plugin as IAssetServerPlugin;

+            IAssetInventoryServerPlugin p = plugin as IAssetInventoryServerPlugin;

             p.Initialise (server);

         }

     }

 

     #region Interfaces

 

-    public interface IAssetServerPlugin : IPlugin

+    public interface IAssetInventoryServerPlugin : IPlugin

     {

-        void Initialise(AssetServer server);

+        void Initialise(AssetInventoryServer server);

     }

 

     public interface IStorageProvider

@@ -83,7 +83,7 @@ namespace AssetServer
         int ForEach(Action<Metadata> action, int start, int count);

     }

 

-    public interface IAssetStorageProvider : IAssetServerPlugin

+    public interface IAssetStorageProvider : IAssetInventoryServerPlugin

     {

         BackendResponse TryFetchMetadata(UUID assetID, out Metadata metadata);

         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;
 using System.Collections.Generic;

 using OpenMetaverse;

 

-namespace AssetServer

+namespace OpenSim.Grid.AssetInventoryServer

 {

     public class InventoryBase

     {

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;
 

 [assembly: log4net.Config.XmlConfigurator(ConfigFileExtension = "log4net")]

 

-namespace AssetServer

+namespace OpenSim.Grid.AssetInventoryServer

 {

     /// <summary>

     /// 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 @@
 using System;

 using System.ServiceProcess;

 

-namespace AssetServer

+namespace OpenSim.Grid.AssetInventoryServer

 {

     class MainEntry

     {

         static void Main(string[] args)

         {

 #if DEBUG

-            AssetServer server = new AssetServer();

+            AssetInventoryServer server = new AssetInventoryServer();

             if (server.Start())

             {

                 Console.WriteLine("Asset server is running. Press CTRL+C to quit");

@@ -54,7 +54,7 @@ namespace AssetServer
                     Console.ReadLine();

             }

 #else

-            ServiceBase[] servicesToRun = new ServiceBase[] { new AssetServer() };

+            ServiceBase[] servicesToRun = new ServiceBase[] { new AssetInventoryServer() };

             ServiceBase.Run(servicesToRun);

 #endif

         }

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;
 using OpenMetaverse;

 using OpenMetaverse.StructuredData;

 

-namespace AssetServer

+namespace OpenSim.Grid.AssetInventoryServer

 {

     public class Metadata

     {

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;
 using OpenMetaverse;

 using OpenMetaverse.StructuredData;

 using OpenSim.Framework;

-using AssetServer.Extensions;

+using OpenSim.Grid.AssetInventoryServer.Extensions;

 

-namespace AssetServer.Plugins

+namespace OpenSim.Grid.AssetInventoryServer.Plugins

 {

     public class OpenSimAssetStoragePlugin : IAssetStorageProvider

     {

         const string EXTENSION_NAME = "OpenSimAssetStorage"; // Used in metrics reporting

 

-        private AssetServer server;

+        private AssetInventoryServer server;

         private IAssetProviderPlugin m_assetProvider;

 

         public OpenSimAssetStoragePlugin()

@@ -291,7 +291,7 @@ namespace AssetServer.Plugins
 

         #region IPlugin implementation

 

-        public void Initialise(AssetServer server)

+        public void Initialise(AssetInventoryServer server)

         {

             this.server = server;

 

@@ -332,7 +332,7 @@ namespace AssetServer.Plugins
 

         public string Name

         {

-            get { return "AssetServer storage provider"; }

+            get { return "AssetInventoryServer storage provider"; }

         }

 

         #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 @@
+<Addin id="OpenSim.Grid.AssetInventoryServer.Plugins.OpenSim" version="0.1">
+    <Runtime>
+        <Import assembly="OpenSim.Grid.AssetInventoryServer.Plugins.OpenSim.dll"/>
+    </Runtime>
+    <Dependencies>
+        <Addin id="OpenSim.Grid.AssetInventoryServer" version="0.1" />
+    </Dependencies>
+    <ExtensionPoint path = "/OpenSim/AssetData">
+        <ExtensionNode name="Plugin" type="OpenSim.Framework.PluginExtensionNode" objectType="OpenSim.Framework.IAssetProviderPlugin"/>
+    </ExtensionPoint>
+    <Extension path="/OpenSim/AssetInventoryServer/StorageProvider">
+        <Plugin id="OpenSimAssetStorage" provider="OpenSim.Grid.AssetInventoryServer.Plugins.OpenSim.dll" type="OpenSim.Grid.AssetInventoryServer.Plugins.OpenSimAssetStoragePlugin" />
+    </Extension>
+</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;
 using OpenMetaverse.StructuredData;

 using HttpServer;

 

-namespace AssetServer

+namespace OpenSim.Grid.AssetInventoryServer

 {

     public static class Utils

     {

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 @@
-<Addin id="OpenSim.Grid.AssetServer.Plugins.OpenSim" version="0.1">
-    <Runtime>
-        <Import assembly="OpenSim.Grid.AssetServer.Plugins.OpenSim.dll"/>
-    </Runtime>
-    <Dependencies>
-        <Addin id="OpenSim.Grid.NewAssetServer" version="0.1" />
-    </Dependencies>
-    <ExtensionPoint path = "/OpenSim/AssetData">
-        <ExtensionNode name="Plugin" type="OpenSim.Framework.PluginExtensionNode" objectType="OpenSim.Framework.IAssetProviderPlugin"/>
-    </ExtensionPoint>
-    <Extension path="/OpenSim/AssetServer/StorageProvider">
-        <Plugin id="OpenSimAssetStorage" provider="OpenSim.Grid.AssetServer.Plugins.OpenSim.dll" type="AssetServer.Plugins.OpenSimAssetStoragePlugin" />
-    </Extension>
-</Addin>