Move ArchiveConstants to OpenSim.Framework.Archive

- move a couple constants from InventoryArchiveConstants to
  ArchiveConstants, now only one of these is needed
- change InventoryArchiveConstants references to ArchiveConstants
- remove InventoryArchive AssetInventoryServer plugin dependency on
  OpenSim.Region.CodeModules
- trim trailing whitespace

1 files changed, 38 insertions, 38 deletions

diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
index ef7f93f..ea72f08 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
@@ -53,31 +53,31 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
             lock (this)
             {
                 Monitor.PulseAll(this);
-            }            
+            }
         }
-        
+
         /// <summary>
         /// Test saving a V0.1 OpenSim Inventory Archive (subject to change since there is no fixed format yet).
         /// </summary>
         [Test]
         public void TestSaveIarV0p1()
-        {        
+        {
             //log4net.Config.XmlConfigurator.Configure();
-            
+
             InventoryArchiverModule archiverModule = new InventoryArchiverModule();
-            
+
             Scene scene = SceneSetupHelpers.SetupScene();
             SceneSetupHelpers.SetupSceneModules(scene, archiverModule);
             CommunicationsManager cm = scene.CommsManager;
-                        
-            // Create user            
+
+            // Create user
             string userFirstName = "Jock";
             string userLastName = "Stirrup";
             UUID userId = UUID.Parse("00000000-0000-0000-0000-000000000020");
             cm.UserAdminService.AddUser(userFirstName, userLastName, string.Empty, string.Empty, 1000, 1000, userId);
             CachedUserInfo userInfo = cm.UserProfileCacheService.GetUserDetails(userId);
             userInfo.FetchInventory();
-            
+
             // Create asset
             SceneObjectGroup object1;
             SceneObjectPart part1;
@@ -88,81 +88,81 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
                 Vector3 groupPosition = new Vector3(10, 20, 30);
                 Quaternion rotationOffset = new Quaternion(20, 30, 40, 50);
                 Vector3 offsetPosition = new Vector3(5, 10, 15);
-                
-                part1 
+
+                part1
                     = new SceneObjectPart(
                         ownerId, shape, groupPosition, rotationOffset, offsetPosition);
                 part1.Name = partName;
-                
+
                 object1 = new SceneObjectGroup(part1);
             }
 
-            UUID asset1Id = UUID.Parse("00000000-0000-0000-0000-000000000060");           
+            UUID asset1Id = UUID.Parse("00000000-0000-0000-0000-000000000060");
             AssetBase asset1 = new AssetBase();
             asset1.FullID = asset1Id;
-            asset1.Data = Encoding.ASCII.GetBytes(object1.ToXmlString2());            
+            asset1.Data = Encoding.ASCII.GetBytes(object1.ToXmlString2());
             cm.AssetCache.AddAsset(asset1);
-            
+
             // Create item
             UUID item1Id = UUID.Parse("00000000-0000-0000-0000-000000000080");
             InventoryItemBase item1 = new InventoryItemBase();
             item1.Name = "My Little Dog";
             item1.AssetID = asset1.FullID;
             item1.ID = item1Id;
-            item1.Folder = userInfo.RootFolder.FindFolderByPath("Objects").ID;            
-            scene.AddInventoryItem(userId, item1);            
-            
+            item1.Folder = userInfo.RootFolder.FindFolderByPath("Objects").ID;
+            scene.AddInventoryItem(userId, item1);
+
             MemoryStream archiveWriteStream = new MemoryStream();
-            archiverModule.OnInventoryArchiveSaved += SaveCompleted;                
-            
+            archiverModule.OnInventoryArchiveSaved += SaveCompleted;
+
             lock (this)
             {
-                archiverModule.ArchiveInventory(userFirstName, userLastName, "Objects", archiveWriteStream);                            
+                archiverModule.ArchiveInventory(userFirstName, userLastName, "Objects", archiveWriteStream);
                 Monitor.Wait(this, 60000);
-            } 
+            }
 
-            byte[] archive = archiveWriteStream.ToArray();           
+            byte[] archive = archiveWriteStream.ToArray();
             MemoryStream archiveReadStream = new MemoryStream(archive);
             TarArchiveReader tar = new TarArchiveReader(archiveReadStream);
-            
+
             InventoryFolderImpl objectsFolder = userInfo.RootFolder.FindFolderByPath("Objects");
-            
+
             //bool gotControlFile = false;
             bool gotObject1File = false;
             //bool gotObject2File = false;
             string expectedObject1FilePath = string.Format(
                 "{0}{1}/{2}_{3}.xml",
-                InventoryArchiveConstants.INVENTORY_PATH,                                                           
+                ArchiveConstants.INVENTORY_PATH,
                 string.Format(
-                    "Objects{0}{1}", InventoryArchiveConstants.INVENTORY_NODE_NAME_COMPONENT_SEPARATOR, objectsFolder.ID), 
+                    "Objects{0}{1}", ArchiveConstants.INVENTORY_NODE_NAME_COMPONENT_SEPARATOR, objectsFolder.ID),
                 item1.Name,
                 item1Id);
-            
+
 /*
             string expectedObject2FileName = string.Format(
                 "{0}_{1:000}-{2:000}-{3:000}__{4}.xml",
                 part2.Name,
                 Math.Round(part2.GroupPosition.X), Math.Round(part2.GroupPosition.Y), Math.Round(part2.GroupPosition.Z),
                 part2.UUID);
-                */            
-            
+                */
+
             string filePath;
             TarArchiveReader.TarEntryType tarEntryType;
-            
+
             while (tar.ReadEntry(out filePath, out tarEntryType) != null)
             {
                 Console.WriteLine("Got {0}", filePath);
-                
+
                 /*
                 if (ArchiveConstants.CONTROL_FILE_PATH == filePath)
                 {
                     gotControlFile = true;
                 }
                 */
-                if (filePath.StartsWith(InventoryArchiveConstants.INVENTORY_PATH) && filePath.EndsWith(".xml"))
-                {                    
+                if (filePath.StartsWith(ArchiveConstants.INVENTORY_PATH) && filePath.EndsWith(".xml"))
+                {
                     //string fileName = filePath.Remove(0, "Objects/".Length);
-                    
+
                     //if (fileName.StartsWith(part1.Name))
                     //{
                         Assert.That(filePath, Is.EqualTo(expectedObject1FilePath));
@@ -171,7 +171,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
                     //else if (fileName.StartsWith(part2.Name))
                     //{
                     //    Assert.That(fileName, Is.EqualTo(expectedObject2FileName));
-                    //    gotObject2File = true;                        
+                    //    gotObject2File = true;
                     //}
                 }
             }
@@ -179,8 +179,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
             //Assert.That(gotControlFile, Is.True, "No control file in archive");
             Assert.That(gotObject1File, Is.True, "No item1 file in archive");
             //Assert.That(gotObject2File, Is.True, "No object2 file in archive");
-            
-            // TODO: Test presence of more files and contents of files.            
-        }        
+
+            // TODO: Test presence of more files and contents of files.
+        }
     }
 }