Rename NewAssetServer AssetInventoryServer and fully qualify with

OpenSim.Grid.AssetInventoryServer.

13 files changed, 47 insertions, 47 deletions

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

     {