6 files changed, 120 insertions, 114 deletions

diff --git a/OpenSim/Framework/IInventoryData.cs b/OpenSim/Data/IInventoryData.cs
index 8ea1fb3..03b1cbe 100644
--- a/OpenSim/Framework/IInventoryData.cs
+++ b/OpenSim/Data/IInventoryData.cs
@@ -27,8 +27,9 @@
 
 using System.Collections.Generic;
 using OpenMetaverse;
+using OpenSim.Framework;
 
-namespace OpenSim.Framework
+namespace OpenSim.Data
 {
     /// <summary>
     /// An interface for accessing inventory data from a storage server
@@ -130,7 +131,7 @@ namespace OpenSim.Framework
         /// </summary>
         /// <param name="folder">The id of the folder</param>
         void deleteInventoryFolder(UUID folder);
-        
+
         /// <summary>
         /// Returns all activated gesture-items in the inventory of the specified avatar.
         /// </summary>
diff --git a/OpenSim/Data/Tests/BasicInventoryTest.cs b/OpenSim/Data/Tests/BasicInventoryTest.cs
index ea8e4e8..2e6226f 100644
--- a/OpenSim/Data/Tests/BasicInventoryTest.cs
+++ b/OpenSim/Data/Tests/BasicInventoryTest.cs
@@ -94,9 +94,9 @@ namespace OpenSim.Data.Tests
             iname1 = "Shirt";
             iname2 = "Text Board";
             iname3 = "No Pants Barrel";
-            
+
         }
-        
+
         [Test]
         public void T001_LoadEmpty()
         {
@@ -163,7 +163,7 @@ namespace OpenSim.Data.Tests
         {
             InventoryFolderBase f2 = NewFolder(folder3, folder1, owner1, name3);
             db.addInventoryFolder(f2);
-           
+
             Assert.That(db.getInventoryFolders(zero).Count, Is.EqualTo(1));
             Assert.That(db.getInventoryFolders(folder1).Count, Is.EqualTo(2));
             Assert.That(db.getInventoryFolders(folder2).Count, Is.EqualTo(0));
@@ -171,7 +171,7 @@ namespace OpenSim.Data.Tests
             Assert.That(db.getInventoryFolders(UUID.Random()).Count, Is.EqualTo(0));
 
         }
-        
+
         [Test]
         public void T013_FolderHierarchy()
         {
@@ -182,14 +182,14 @@ namespace OpenSim.Data.Tests
             Assert.That(db.getFolderHierarchy(UUID.Random()).Count, Is.EqualTo(0));
         }
 
-        
+
         [Test]
         public void T014_MoveFolder()
         {
             InventoryFolderBase f2 = db.getInventoryFolder(folder2);
             f2.ParentID = folder3;
             db.moveInventoryFolder(f2);
-           
+
             Assert.That(db.getInventoryFolders(zero).Count, Is.EqualTo(1));
             Assert.That(db.getInventoryFolders(folder1).Count, Is.EqualTo(1));
             Assert.That(db.getInventoryFolders(folder2).Count, Is.EqualTo(0));
@@ -228,7 +228,7 @@ namespace OpenSim.Data.Tests
             db.addInventoryItem(NewItem(item3, folder3, owner1, iname3, asset3));
             Assert.That(db.getInventoryInFolder(folder3).Count, Is.EqualTo(3));
         }
-        
+
         [Test]
         public void T102_CompareItems()
         {
@@ -245,7 +245,7 @@ namespace OpenSim.Data.Tests
             Assert.That(i2.AssetID, Is.EqualTo(asset2));
             Assert.That(i3.AssetID, Is.EqualTo(asset3));
         }
-     
+
         [Test]
         public void T103UpdateItem()
         {
@@ -257,7 +257,7 @@ namespace OpenSim.Data.Tests
             i1.Description = niname1;
             i1.Owner = owner2;
             db.updateInventoryItem(i1);
-            
+
             i1 = db.getInventoryItem(item1);
             Assert.That(i1.Name, Is.EqualTo(niname1));
             Assert.That(i1.Description, Is.EqualTo(niname1));
@@ -287,4 +287,4 @@ namespace OpenSim.Data.Tests
             return f;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Framework/Communications/InventoryServiceBase.cs b/OpenSim/Framework/Communications/InventoryServiceBase.cs
index 7a44420..ec5c493 100644
--- a/OpenSim/Framework/Communications/InventoryServiceBase.cs
+++ b/OpenSim/Framework/Communications/InventoryServiceBase.cs
@@ -33,6 +33,8 @@ using System.Threading;
 using OpenMetaverse;
 using log4net;
 
+using OpenSim.Data;
+
 namespace OpenSim.Framework.Communications
 {
     /// <summary>
@@ -50,12 +52,12 @@ namespace OpenSim.Framework.Communications
         /// <summary>
         /// Add a new inventory data plugin - plugins will be requested in the order they were added.
         /// </summary>
-        /// <param name="plugin">The plugin that will provide data</param>     
+        /// <param name="plugin">The plugin that will provide data</param>
         public void AddPlugin(IInventoryDataPlugin plugin)
         {
             m_plugins.Add(plugin);
         }
-        
+
         /// <summary>
         /// Adds a new inventory data plugin - plugins will be requested in the order they were loaded.
         /// </summary>
diff --git a/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs b/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs
index 827a03b..86d85b1 100644
--- a/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs
+++ b/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs
@@ -30,19 +30,20 @@ using log4net;
 using NUnit.Framework;
 using NUnit.Framework.SyntaxHelpers;
 using OpenMetaverse;
-using OpenSim.Framework;
+//using OpenSim.Framework;
 using OpenSim.Framework.Communications.Cache;
 using OpenSim.Region.Communications.Local;
 using OpenSim.Tests.Common.Mock;
+using OpenSim.Data;
 
 namespace OpenSim.Framework.Communications.Tests
-{       
+{
     /// <summary>
     /// User profile cache service tests
     /// </summary>
-    [TestFixture]    
+    [TestFixture]
     public class UserProfileCacheServiceTests
-    {        
+    {
         /// <summary>
         /// Test user details get.
         /// </summary>
@@ -51,17 +52,17 @@ namespace OpenSim.Framework.Communications.Tests
         {
             UUID nonExistingUserId = UUID.Parse("00000000-0000-0000-0000-000000000001");
             UUID existingUserId = UUID.Parse("00000000-0000-0000-0000-000000000002");
-            
+
             TestCommunicationsManager commsManager = new TestCommunicationsManager();
             CachedUserInfo existingUserInfo = UserProfileTestUtils.CreateUserWithInventory(commsManager, existingUserId);
-            
+
             Assert.That(existingUserInfo, Is.Not.Null, "Existing user info unexpectedly not found");
-            
+
             CachedUserInfo nonExistingUserInfo = commsManager.UserProfileCacheService.GetUserDetails(nonExistingUserId);
-            
-            Assert.That(nonExistingUserInfo, Is.Null, "Non existing user info unexpectedly found");                        
+
+            Assert.That(nonExistingUserInfo, Is.Null, "Non existing user info unexpectedly found");
         }
-        
+
         /// <summary>
         /// Test requesting inventory for a user
         /// </summary>
@@ -69,11 +70,11 @@ namespace OpenSim.Framework.Communications.Tests
         public void TestRequestInventoryForUser()
         {
             TestCommunicationsManager commsManager = new TestCommunicationsManager();
-            CachedUserInfo userInfo = UserProfileTestUtils.CreateUserWithInventory(commsManager);          
-            
+            CachedUserInfo userInfo = UserProfileTestUtils.CreateUserWithInventory(commsManager);
+
             Assert.That(userInfo.HasReceivedInventory, Is.True);
         }
-                
+
         /// <summary>
         /// Test retrieving a child folder
         /// </summary>
@@ -82,45 +83,45 @@ namespace OpenSim.Framework.Communications.Tests
         {
             TestCommunicationsManager commsManager = new TestCommunicationsManager();
             CachedUserInfo userInfo = UserProfileTestUtils.CreateUserWithInventory(commsManager);
-            
+
             UUID folderId = UUID.Parse("00000000-0000-0000-0000-000000000011");
-            
-            Assert.That(userInfo.RootFolder.GetChildFolder(folderId), Is.Null);                                   
+
+            Assert.That(userInfo.RootFolder.GetChildFolder(folderId), Is.Null);
             userInfo.CreateFolder("testFolder", folderId, (ushort)AssetType.Animation, userInfo.RootFolder.ID);
-            
+
             Assert.That(userInfo.RootFolder.GetChildFolder(folderId), Is.Not.Null);
-        }           
-        
+        }
+
         /// <summary>
         /// Test creating an inventory folder
         /// </summary>
         [Test]
         public void TestCreateFolder()
-        {           
+        {
             TestCommunicationsManager commsManager = new TestCommunicationsManager();
             IInventoryDataPlugin inventoryDataPlugin = commsManager.InventoryDataPlugin;
-            
+
             CachedUserInfo userInfo = UserProfileTestUtils.CreateUserWithInventory(commsManager);
-            
-            UUID folderId = UUID.Parse("00000000-0000-0000-0000-000000000010");            
+
+            UUID folderId = UUID.Parse("00000000-0000-0000-0000-000000000010");
             Assert.That(userInfo.RootFolder.ContainsChildFolder(folderId), Is.False);
-            
+
             // 1: Try a folder create that should fail because the parent id given does not exist
             UUID missingFolderId = UUID.Random();
-             
+
             Assert.That(
                 userInfo.CreateFolder("testFolder1", folderId, (ushort)AssetType.Animation, missingFolderId), Is.False);
             Assert.That(inventoryDataPlugin.getInventoryFolder(folderId), Is.Null);
             Assert.That(userInfo.RootFolder.ContainsChildFolder(missingFolderId), Is.False);
             Assert.That(userInfo.RootFolder.FindFolder(folderId), Is.Null);
-            
+
             // 2: Try a folder create that should work
             Assert.That(
                 userInfo.CreateFolder("testFolder2", folderId, (ushort)AssetType.Animation, userInfo.RootFolder.ID), Is.True);
             Assert.That(inventoryDataPlugin.getInventoryFolder(folderId), Is.Not.Null);
             Assert.That(userInfo.RootFolder.ContainsChildFolder(folderId), Is.True);
         }
-        
+
         /// <summary>
         /// Test updating a folder
         /// </summary>
@@ -129,54 +130,54 @@ namespace OpenSim.Framework.Communications.Tests
         {
             TestCommunicationsManager commsManager = new TestCommunicationsManager();
             IInventoryDataPlugin inventoryDataPlugin = commsManager.InventoryDataPlugin;
-            
+
             CachedUserInfo userInfo = UserProfileTestUtils.CreateUserWithInventory(commsManager);
-            
+
             UUID folder1Id = UUID.Parse("00000000-0000-0000-0000-000000000060");
             InventoryFolderImpl rootFolder = userInfo.RootFolder;
-            
+
             userInfo.CreateFolder("folder1", folder1Id, (ushort)AssetType.Animation, rootFolder.ID);
-            
+
             // 1: Test updates that don't involve moving the folder
             {
                 string newFolderName1 = "newFolderName1";
                 ushort folderType1 = (ushort)AssetType.Texture;
                 userInfo.UpdateFolder(newFolderName1, folder1Id, folderType1, rootFolder.ID);
-                
+
                 InventoryFolderImpl folder1 = rootFolder.GetChildFolder(folder1Id);
                 Assert.That(newFolderName1, Is.EqualTo(folder1.Name));
                 Assert.That(folderType1, Is.EqualTo((ushort)folder1.Type));
-                
+
                 InventoryFolderBase dataFolder1 = inventoryDataPlugin.getInventoryFolder(folder1Id);
                 Assert.That(newFolderName1, Is.EqualTo(dataFolder1.Name));
                 Assert.That(folderType1, Is.EqualTo((ushort)dataFolder1.Type));
             }
-            
+
             // 2: Test an update that also involves moving the folder
             {
                 UUID folder2Id = UUID.Parse("00000000-0000-0000-0000-000000000061");
                 userInfo.CreateFolder("folder2", folder2Id, (ushort)AssetType.Animation, rootFolder.ID);
                 InventoryFolderImpl folder2 = rootFolder.GetChildFolder(folder2Id);
-                
+
                 string newFolderName2 = "newFolderName2";
                 ushort folderType2 = (ushort)AssetType.Bodypart;
                 userInfo.UpdateFolder(newFolderName2, folder1Id, folderType2, folder2Id);
-                
+
                 InventoryFolderImpl folder1 = folder2.GetChildFolder(folder1Id);
                 Assert.That(newFolderName2, Is.EqualTo(folder1.Name));
                 Assert.That(folderType2, Is.EqualTo((ushort)folder1.Type));
                 Assert.That(folder2Id, Is.EqualTo(folder1.ParentID));
-                
+
                 Assert.That(folder2.ContainsChildFolder(folder1Id), Is.True);
                 Assert.That(rootFolder.ContainsChildFolder(folder1Id), Is.False);
-                
+
                 InventoryFolderBase dataFolder1 = inventoryDataPlugin.getInventoryFolder(folder1Id);
                 Assert.That(newFolderName2, Is.EqualTo(dataFolder1.Name));
-                Assert.That(folderType2, Is.EqualTo((ushort)dataFolder1.Type));  
+                Assert.That(folderType2, Is.EqualTo((ushort)dataFolder1.Type));
                 Assert.That(folder2Id, Is.EqualTo(dataFolder1.ParentID));
             }
-            
-        }            
+
+        }
 
         /// <summary>
         /// Test moving an inventory folder
@@ -186,32 +187,32 @@ namespace OpenSim.Framework.Communications.Tests
         {
             TestCommunicationsManager commsManager = new TestCommunicationsManager();
             IInventoryDataPlugin inventoryDataPlugin = commsManager.InventoryDataPlugin;
-            
+
             CachedUserInfo userInfo = UserProfileTestUtils.CreateUserWithInventory(commsManager);
 
             UUID folder1Id = UUID.Parse("00000000-0000-0000-0000-000000000020");
             UUID folder2Id = UUID.Parse("00000000-0000-0000-0000-000000000021");
-            UUID folderToMoveId = UUID.Parse("00000000-0000-0000-0000-000000000030");            
+            UUID folderToMoveId = UUID.Parse("00000000-0000-0000-0000-000000000030");
             InventoryFolderImpl rootFolder = userInfo.RootFolder;
-            
+
             userInfo.CreateFolder("folder1", folder1Id, (ushort)AssetType.Animation, rootFolder.ID);
             InventoryFolderImpl folder1 = rootFolder.GetChildFolder(folder1Id);
             userInfo.CreateFolder("folder2", folder2Id, (ushort)AssetType.Animation, rootFolder.ID);
             InventoryFolderImpl folder2 = rootFolder.GetChildFolder(folder2Id);
-            
+
             // Check folder is currently in folder1
             userInfo.CreateFolder("folderToMove", folderToMoveId, (ushort)AssetType.Animation, folder1Id);
             Assert.That(folder1.ContainsChildFolder(folderToMoveId), Is.True);
-            
+
             userInfo.MoveFolder(folderToMoveId, folder2Id);
-            
+
             // Check folder is now in folder2 and no trace remains in folder1
             Assert.That(folder2.ContainsChildFolder(folderToMoveId), Is.True);
             Assert.That(inventoryDataPlugin.getInventoryFolder(folderToMoveId).ParentID, Is.EqualTo(folder2Id));
-            
+
             Assert.That(folder1.ContainsChildFolder(folderToMoveId), Is.False);
         }
-        
+
         /// <summary>
         /// Test purging an inventory folder
         /// </summary>
@@ -219,21 +220,21 @@ namespace OpenSim.Framework.Communications.Tests
         public void TestPurgeFolder()
         {
             //log4net.Config.XmlConfigurator.Configure();
-            
+
             TestCommunicationsManager commsManager = new TestCommunicationsManager();
             IInventoryDataPlugin inventoryDataPlugin = commsManager.InventoryDataPlugin;
-            
+
             CachedUserInfo userInfo = UserProfileTestUtils.CreateUserWithInventory(commsManager);
-            
+
             UUID folder1Id = UUID.Parse("00000000-0000-0000-0000-000000000070");
             InventoryFolderImpl rootFolder = userInfo.RootFolder;
-            
+
             userInfo.CreateFolder("folder1", folder1Id, (ushort)AssetType.Animation, rootFolder.ID);
             Assert.That(inventoryDataPlugin.getInventoryFolder(folder1Id), Is.Not.Null);
-            
+
             // Test purge
             userInfo.PurgeFolder(rootFolder.ID);
-            
+
             Assert.That(rootFolder.RequestListOfFolders(), Is.Empty);
             Assert.That(inventoryDataPlugin.getInventoryFolder(folder1Id), Is.Null);
         }
diff --git a/OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs b/OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs
index 1663ac1..566d8d2 100644
--- a/OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs
+++ b/OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs
@@ -30,6 +30,7 @@ using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Servers;
 using OpenSim.Region.Communications.Local;
+using OpenSim.Data;
 
 namespace OpenSim.Tests.Common.Mock
 {
@@ -40,36 +41,36 @@ namespace OpenSim.Tests.Common.Mock
             get { return m_userDataPlugin; }
         }
         private IUserDataPlugin m_userDataPlugin;
-        
+
         public IInventoryDataPlugin InventoryDataPlugin
         {
             get { return m_inventoryDataPlugin; }
         }
         private IInventoryDataPlugin m_inventoryDataPlugin;
-        
+
         public TestCommunicationsManager()
             : this(null)
-        {          
+        {
         }
-        
+
         public TestCommunicationsManager(NetworkServersInfo serversInfo)
             : base(serversInfo, new BaseHttpServer(666), null, false, null)
-        {           
+        {
             m_userDataPlugin = new TestUserDataPlugin();
             m_inventoryDataPlugin = new TestInventoryDataPlugin();
-                     
+
             LocalInventoryService lis = new LocalInventoryService();
             lis.AddPlugin(m_inventoryDataPlugin);
             m_interServiceInventoryService = lis;
-            AddInventoryService(lis);      
-            
+            AddInventoryService(lis);
+
             LocalUserServices lus = new LocalUserServices(991, 992, lis);
             lus.AddPlugin(m_userDataPlugin);
             m_userService = lus;
-            m_userAdminService = lus;         
-            
+            m_userAdminService = lus;
+
             LocalBackEndServices gs = new LocalBackEndServices();
-            m_gridService = gs;      
+            m_gridService = gs;
             m_interRegion = gs;
         }
     }
diff --git a/OpenSim/Tests/Common/Mock/TestInventoryDataPlugin.cs b/OpenSim/Tests/Common/Mock/TestInventoryDataPlugin.cs
index 8e19aec..59d923c 100644
--- a/OpenSim/Tests/Common/Mock/TestInventoryDataPlugin.cs
+++ b/OpenSim/Tests/Common/Mock/TestInventoryDataPlugin.cs
@@ -29,6 +29,7 @@ using System;
 using System.Collections.Generic;
 using OpenMetaverse;
 using OpenSim.Framework;
+using OpenSim.Data;
 
 namespace OpenSim.Tests.Common.Mock
 {
@@ -43,12 +44,12 @@ namespace OpenSim.Tests.Common.Mock
         /// Known inventory folders
         /// </value>
         private Dictionary<UUID, InventoryFolderBase> m_folders = new Dictionary<UUID, InventoryFolderBase>();
-        
+
         /// <value>
         /// User root folders
         /// </value>
         private Dictionary<UUID, InventoryFolderBase> m_rootFolders = new Dictionary<UUID, InventoryFolderBase>();
-        
+
         public string Version { get { return "0"; } }
         public string Name { get { return "TestInventoryDataPlugin"; } }
 
@@ -56,10 +57,10 @@ namespace OpenSim.Tests.Common.Mock
         public void Initialise(string connect) {}
         public void Dispose() {}
 
-        public List<InventoryFolderBase> getFolderHierarchy(UUID parentID) 
+        public List<InventoryFolderBase> getFolderHierarchy(UUID parentID)
         {
             List<InventoryFolderBase> folders = new List<InventoryFolderBase>();
-            
+
             foreach (InventoryFolderBase folder in m_folders.Values)
             {
                 if (folder.ParentID == parentID)
@@ -68,77 +69,77 @@ namespace OpenSim.Tests.Common.Mock
                     folders.Add(folder);
                 }
             }
-            
+
             return folders;
         }
-        
-        public List<InventoryItemBase> getInventoryInFolder(UUID folderID) 
-        { 
-            return new List<InventoryItemBase>(); 
+
+        public List<InventoryItemBase> getInventoryInFolder(UUID folderID)
+        {
+            return new List<InventoryItemBase>();
         }
-        
+
         public List<InventoryFolderBase> getUserRootFolders(UUID user) { return null; }
-        
-        public InventoryFolderBase getUserRootFolder(UUID user) 
-        { 
+
+        public InventoryFolderBase getUserRootFolder(UUID user)
+        {
             InventoryFolderBase folder = null;
             m_rootFolders.TryGetValue(user, out folder);
-            
+
             return folder;
         }
-        
-        public List<InventoryFolderBase> getInventoryFolders(UUID parentID) 
+
+        public List<InventoryFolderBase> getInventoryFolders(UUID parentID)
         {
             List<InventoryFolderBase> folders = new List<InventoryFolderBase>();
-            
+
             foreach (InventoryFolderBase folder in m_folders.Values)
             {
                 if (folder.ParentID == parentID)
                     folders.Add(folder);
             }
-            
+
             return folders;
         }
-        
+
         public InventoryItemBase getInventoryItem(UUID item) { return null; }
-        
-        public InventoryFolderBase getInventoryFolder(UUID folderId) 
+
+        public InventoryFolderBase getInventoryFolder(UUID folderId)
         {
             InventoryFolderBase folder = null;
             m_folders.TryGetValue(folderId, out folder);
-            
+
             return folder;
         }
-        
+
         public void addInventoryItem(InventoryItemBase item) {}
         public void updateInventoryItem(InventoryItemBase item) {}
         public void deleteInventoryItem(UUID item) {}
-        
-        public void addInventoryFolder(InventoryFolderBase folder) 
+
+        public void addInventoryFolder(InventoryFolderBase folder)
         {
             m_folders[folder.ID] = folder;
-            
+
             if (folder.ParentID == UUID.Zero)
                 m_rootFolders[folder.Owner] = folder;
         }
-        
+
         public void updateInventoryFolder(InventoryFolderBase folder)
         {
             m_folders[folder.ID] = folder;
         }
-        
-        public void moveInventoryFolder(InventoryFolderBase folder) 
+
+        public void moveInventoryFolder(InventoryFolderBase folder)
         {
             // Simple replace
-            updateInventoryFolder(folder);            
+            updateInventoryFolder(folder);
         }
-        
-        public void deleteInventoryFolder(UUID folderId) 
+
+        public void deleteInventoryFolder(UUID folderId)
         {
             if (m_folders.ContainsKey(folderId))
                 m_folders.Remove(folderId);
         }
-        
-        public List<InventoryItemBase> fetchActiveGestures(UUID avatarID) { return null; }          
+
+        public List<InventoryItemBase> fetchActiveGestures(UUID avatarID) { return null; }
     }
 }