Rename OpenSim.Framework.Archive to OpenSim.Framework.Serialization

Update using statements and prebuild.xml. Also trim trailing whitespace.

1 files changed, 77 insertions, 77 deletions

diff --git a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
index f6d0347..6a64ff1 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
@@ -34,7 +34,7 @@ using NUnit.Framework;
 using NUnit.Framework.SyntaxHelpers;
 using OpenMetaverse;
 using OpenSim.Framework;
-using OpenSim.Framework.Archive;
+using OpenSim.Framework.Serialization;
 using OpenSim.Region.CoreModules.World.Serialiser;
 using OpenSim.Region.CoreModules.World.Terrain;
 using OpenSim.Region.Framework.Scenes;
@@ -48,29 +48,29 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
         private void SaveCompleted(string errorMessage)
         {
             lock (this)
-            {               
+            {
                 System.Console.WriteLine("About to pulse ArchiverTests");
-                Monitor.PulseAll(this);                
-            }            
+                Monitor.PulseAll(this);
+            }
         }
-        
+
         /// <summary>
         /// Test saving a V0.2 OpenSim Region Archive.
         /// </summary>
-        [Test]        
+        [Test]
         public void TestSaveOarV0p2()
-        {        
+        {
             log4net.Config.XmlConfigurator.Configure();
-            
+
             ArchiverModule archiverModule = new ArchiverModule();
             SerialiserModule serialiserModule = new SerialiserModule();
             TerrainModule terrainModule = new TerrainModule();
-            
+
             Scene scene = SceneSetupHelpers.SetupScene();
             SceneSetupHelpers.SetupSceneModules(scene, archiverModule, serialiserModule, terrainModule);
-            
+
             SceneObjectPart part1;
-            
+
             // Create and add prim 1
             {
                 string partName = "My Little Pony";
@@ -79,17 +79,17 @@ namespace OpenSim.Region.CoreModules.World.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;
-                
+
                 scene.AddNewSceneObject(new SceneObjectGroup(part1), false);
             }
-            
+
             SceneObjectPart part2;
-            
+
             // Create and add prim 2
             {
                 string partName = "Action Man";
@@ -98,28 +98,28 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
                 Vector3 groupPosition = new Vector3(90, 80, 70);
                 Quaternion rotationOffset = new Quaternion(60, 70, 80, 90);
                 Vector3 offsetPosition = new Vector3(20, 25, 30);
-                
+
                 part2
                     = new SceneObjectPart(
                         ownerId, shape, groupPosition, rotationOffset, offsetPosition);
                 part2.Name = partName;
-                
+
                 scene.AddNewSceneObject(new SceneObjectGroup(part2), false);
-            }                                    
-            
-            MemoryStream archiveWriteStream = new MemoryStream();            
+            }
+
+            MemoryStream archiveWriteStream = new MemoryStream();
             scene.EventManager.OnOarFileSaved += SaveCompleted;
-            
+
             lock (this)
             {
-                archiverModule.ArchiveRegion(archiveWriteStream);                            
+                archiverModule.ArchiveRegion(archiveWriteStream);
                 Monitor.Wait(this, 60000);
-            }         
+            }
 
-            byte[] archive = archiveWriteStream.ToArray();           
+            byte[] archive = archiveWriteStream.ToArray();
             MemoryStream archiveReadStream = new MemoryStream(archive);
             TarArchiveReader tar = new TarArchiveReader(archiveReadStream);
-        
+
             bool gotControlFile = false;
             bool gotObject1File = false;
             bool gotObject2File = false;
@@ -132,11 +132,11 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
                 "{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);            
-            
+                part2.UUID);
+
             string filePath;
             TarArchiveReader.TarEntryType tarEntryType;
-            
+
             while (tar.ReadEntry(out filePath, out tarEntryType) != null)
             {
                 if (ArchiveConstants.CONTROL_FILE_PATH == filePath)
@@ -146,7 +146,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
                 else if (filePath.StartsWith(ArchiveConstants.OBJECTS_PATH))
                 {
                     string fileName = filePath.Remove(0, ArchiveConstants.OBJECTS_PATH.Length);
-                    
+
                     if (fileName.StartsWith(part1.Name))
                     {
                         Assert.That(fileName, Is.EqualTo(expectedObject1FileName));
@@ -155,7 +155,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
                     else if (fileName.StartsWith(part2.Name))
                     {
                         Assert.That(fileName, Is.EqualTo(expectedObject2FileName));
-                        gotObject2File = true;                        
+                        gotObject2File = true;
                     }
                 }
             }
@@ -163,7 +163,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
             Assert.That(gotControlFile, Is.True, "No control file in archive");
             Assert.That(gotObject1File, Is.True, "No object1 file in archive");
             Assert.That(gotObject2File, Is.True, "No object2 file in archive");
-            
+
             // TODO: Test presence of more files and contents of files.
             // Temporary
             Console.WriteLine("Successfully completed {0}", MethodBase.GetCurrentMethod());
@@ -171,143 +171,143 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
 
         /// <summary>
         /// Test loading a V0.2 OpenSim Region Archive.
-        /// </summary>        
+        /// </summary>
         [Test]
         public void TestLoadOarV0p2()
         {
             //log4net.Config.XmlConfigurator.Configure();
-            
+
             MemoryStream archiveWriteStream = new MemoryStream();
             TarArchiveWriter tar = new TarArchiveWriter(archiveWriteStream);
-            
+
             tar.WriteFile(ArchiveConstants.CONTROL_FILE_PATH, ArchiveWriteRequestExecution.Create0p2ControlFile());
-            
+
             string part1Name = "object1";
             PrimitiveBaseShape shape = PrimitiveBaseShape.CreateCylinder();
             Vector3 groupPosition = new Vector3(90, 80, 70);
             Quaternion rotationOffset = new Quaternion(60, 70, 80, 90);
             Vector3 offsetPosition = new Vector3(20, 25, 30);
-                        
+
             SceneObjectPart part1
                 = new SceneObjectPart(
                     UUID.Zero, shape, groupPosition, rotationOffset, offsetPosition);
             part1.Name = part1Name;
             SceneObjectGroup object1 = new SceneObjectGroup(part1);
-            
+
             string object1FileName = string.Format(
                 "{0}_{1:000}-{2:000}-{3:000}__{4}.xml",
                 part1Name,
                 Math.Round(groupPosition.X), Math.Round(groupPosition.Y), Math.Round(groupPosition.Z),
-                part1.UUID);            
+                part1.UUID);
             tar.WriteFile(ArchiveConstants.OBJECTS_PATH + object1FileName, object1.ToXmlString2());
-            
+
             tar.Close();
-            
+
             MemoryStream archiveReadStream = new MemoryStream(archiveWriteStream.ToArray());
-            
+
             SerialiserModule serialiserModule = new SerialiserModule();
             ArchiverModule archiverModule = new ArchiverModule();
-            
+
             Scene scene = SceneSetupHelpers.SetupScene();
-            SceneSetupHelpers.SetupSceneModules(scene, serialiserModule, archiverModule);          
-            
+            SceneSetupHelpers.SetupSceneModules(scene, serialiserModule, archiverModule);
+
             archiverModule.DearchiveRegion(archiveReadStream);
- 
+
             SceneObjectPart object1PartLoaded = scene.GetSceneObjectPart(part1Name);
-            
+
             Assert.That(object1PartLoaded, Is.Not.Null, "object1 was not loaded");
-            Assert.That(object1PartLoaded.Name, Is.EqualTo(part1Name), "object1 names not identical"); 
+            Assert.That(object1PartLoaded.Name, Is.EqualTo(part1Name), "object1 names not identical");
             Assert.That(object1PartLoaded.GroupPosition, Is.EqualTo(groupPosition), "object1 group position not equal");
             Assert.That(
                 object1PartLoaded.RotationOffset, Is.EqualTo(rotationOffset), "object1 rotation offset not equal");
             Assert.That(
                 object1PartLoaded.OffsetPosition, Is.EqualTo(offsetPosition), "object1 offset position not equal");
-                            
+
             // Temporary
-            Console.WriteLine("Successfully completed {0}", MethodBase.GetCurrentMethod());             
+            Console.WriteLine("Successfully completed {0}", MethodBase.GetCurrentMethod());
         }
-        
+
         /// <summary>
         /// Test merging a V0.2 OpenSim Region Archive into an existing scene
-        /// </summary>        
+        /// </summary>
         ///[Test]
         public void TestMergeOarV0p2()
         {
             //XmlConfigurator.Configure();
-            
+
             MemoryStream archiveWriteStream = new MemoryStream();
 
             string part2Name = "objectMerge";
             PrimitiveBaseShape part2Shape = PrimitiveBaseShape.CreateCylinder();
             Vector3 part2GroupPosition = new Vector3(90, 80, 70);
             Quaternion part2RotationOffset = new Quaternion(60, 70, 80, 90);
-            Vector3 part2OffsetPosition = new Vector3(20, 25, 30);            
-            
+            Vector3 part2OffsetPosition = new Vector3(20, 25, 30);
+
             // Create an oar file that we can use for the merge
             {
                 ArchiverModule archiverModule = new ArchiverModule();
                 SerialiserModule serialiserModule = new SerialiserModule();
                 TerrainModule terrainModule = new TerrainModule();
-                
+
                 Scene scene = SceneSetupHelpers.SetupScene();
                 SceneSetupHelpers.SetupSceneModules(scene, archiverModule, serialiserModule, terrainModule);
-                                            
+
                 SceneObjectPart part2
                     = new SceneObjectPart(
                         UUID.Zero, part2Shape, part2GroupPosition, part2RotationOffset, part2OffsetPosition);
                 part2.Name = part2Name;
                 SceneObjectGroup object2 = new SceneObjectGroup(part2);
-                
+
                 scene.AddNewSceneObject(object2, false);
-     
+
                 // Write out this scene
                 scene.EventManager.OnOarFileSaved += SaveCompleted;
-                
+
                 lock (this)
                 {
-                    archiverModule.ArchiveRegion(archiveWriteStream);                            
+                    archiverModule.ArchiveRegion(archiveWriteStream);
                     Monitor.Wait(this, 60000);
                 }
             }
-            
+
             {
                 ArchiverModule archiverModule = new ArchiverModule();
                 SerialiserModule serialiserModule = new SerialiserModule();
                 TerrainModule terrainModule = new TerrainModule();
-                
+
                 Scene scene = SceneSetupHelpers.SetupScene();
                 SceneSetupHelpers.SetupSceneModules(scene, archiverModule, serialiserModule, terrainModule);
-                
+
                 string part1Name = "objectExisting";
                 PrimitiveBaseShape part1Shape = PrimitiveBaseShape.CreateCylinder();
                 Vector3 part1GroupPosition = new Vector3(80, 70, 60);
                 Quaternion part1RotationOffset = new Quaternion(50, 60, 70, 80);
                 Vector3 part1OffsetPosition = new Vector3(15, 20, 25);
-                            
+
                 SceneObjectPart part1
                     = new SceneObjectPart(
                         UUID.Zero, part1Shape, part1GroupPosition, part1RotationOffset, part1OffsetPosition);
                 part1.Name = part1Name;
-                SceneObjectGroup object1 = new SceneObjectGroup(part1);            
-                
+                SceneObjectGroup object1 = new SceneObjectGroup(part1);
+
                 scene.AddNewSceneObject(object1, false);
-                
+
                 // Merge in the archive we created earlier
-                byte[] archive = archiveWriteStream.ToArray();           
-                MemoryStream archiveReadStream = new MemoryStream(archive);            
-                
+                byte[] archive = archiveWriteStream.ToArray();
+                MemoryStream archiveReadStream = new MemoryStream(archive);
+
                 archiverModule.DearchiveRegion(archiveReadStream, true);
-                
-                SceneObjectPart object1Existing = scene.GetSceneObjectPart(part1Name);            
+
+                SceneObjectPart object1Existing = scene.GetSceneObjectPart(part1Name);
                 Assert.That(object1Existing, Is.Not.Null, "object1 was not present after merge");
-                Assert.That(object1Existing.Name, Is.EqualTo(part1Name), "object1 names not identical after merge"); 
+                Assert.That(object1Existing.Name, Is.EqualTo(part1Name), "object1 names not identical after merge");
                 Assert.That(object1Existing.GroupPosition, Is.EqualTo(part1GroupPosition), "object1 group position not equal after merge");
-                
+
                 SceneObjectPart object2PartMerged = scene.GetSceneObjectPart(part2Name);
                 Assert.That(object2PartMerged, Is.Not.Null, "object2 was not present after merge");
-                Assert.That(object2PartMerged.Name, Is.EqualTo(part2Name), "object2 names not identical after merge"); 
+                Assert.That(object2PartMerged.Name, Is.EqualTo(part2Name), "object2 names not identical after merge");
                 Assert.That(object2PartMerged.GroupPosition, Is.EqualTo(part2GroupPosition), "object2 group position not equal after merge");
-            }               
+            }
         }
     }
 }