diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Archiver')
12 files changed, 111 insertions, 129 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveConstants.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveConstants.cs index 179d1a2..bc54eb6 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveConstants.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveConstants.cs | |||
@@ -25,9 +25,9 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System.Collections.Generic; | 28 | using System.Collections.Generic; |
29 | using OpenMetaverse; | 29 | using OpenMetaverse; |
30 | 30 | ||
31 | namespace OpenSim.Region.CoreModules.World.Archiver | 31 | namespace OpenSim.Region.CoreModules.World.Archiver |
32 | { | 32 | { |
33 | /// <summary> | 33 | /// <summary> |
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs index 0cc1f86..3efb457 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs | |||
@@ -1,4 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) Contributors, http://opensimulator.org/ | 2 | * Copyright (c) Contributors, http://opensimulator.org/ |
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | 3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. |
4 | * | 4 | * |
@@ -25,21 +25,21 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.IO; | 30 | using System.IO; |
31 | using System.IO.Compression; | 31 | using System.IO.Compression; |
32 | using System.Reflection; | 32 | using System.Net; |
33 | using System.Xml; | 33 | using System.Reflection; |
34 | using System.Net; | 34 | using System.Text; |
35 | using OpenMetaverse; | 35 | using log4net; |
36 | using log4net; | 36 | using OpenMetaverse; |
37 | using OpenSim.Framework; | 37 | using OpenSim.Framework; |
38 | using OpenSim.Framework.Communications.Cache; | 38 | using OpenSim.Framework.Communications.Cache; |
39 | using OpenSim.Region.Framework.Interfaces; | 39 | using OpenSim.Region.CoreModules.World.Terrain; |
40 | using OpenSim.Region.Framework.Scenes; | 40 | using OpenSim.Region.Framework.Interfaces; |
41 | using OpenSim.Region.CoreModules.World.Terrain; | 41 | using OpenSim.Region.Framework.Scenes; |
42 | 42 | ||
43 | namespace OpenSim.Region.CoreModules.World.Archiver | 43 | namespace OpenSim.Region.CoreModules.World.Archiver |
44 | { | 44 | { |
45 | /// <summary> | 45 | /// <summary> |
@@ -49,7 +49,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
49 | { | 49 | { |
50 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 50 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
51 | 51 | ||
52 | private static System.Text.ASCIIEncoding m_asciiEncoding = new System.Text.ASCIIEncoding(); | 52 | private static ASCIIEncoding m_asciiEncoding = new ASCIIEncoding(); |
53 | 53 | ||
54 | private Scene m_scene; | 54 | private Scene m_scene; |
55 | private Stream m_loadStream; | 55 | private Stream m_loadStream; |
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs index d3c2cd1..c2ed257 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs | |||
@@ -25,19 +25,18 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.IO; | 30 | using System.IO; |
31 | using System.Reflection; | 31 | using System.Reflection; |
32 | using System.Xml; | 32 | using System.Xml; |
33 | using OpenMetaverse; | 33 | using log4net; |
34 | using log4net; | 34 | using OpenMetaverse; |
35 | using OpenSim.Framework; | 35 | using OpenSim.Framework; |
36 | using OpenSim.Region.Framework.Interfaces; | 36 | using OpenSim.Region.CoreModules.World.Terrain; |
37 | using OpenSim.Region.Framework.Scenes; | 37 | using OpenSim.Region.Framework.Interfaces; |
38 | using OpenSim.Region.CoreModules.World.Serialiser; | 38 | using OpenSim.Region.Framework.Scenes; |
39 | using OpenSim.Region.CoreModules.World.Terrain; | 39 | |
40 | |||
41 | namespace OpenSim.Region.CoreModules.World.Archiver | 40 | namespace OpenSim.Region.CoreModules.World.Archiver |
42 | { | 41 | { |
43 | /// <summary> | 42 | /// <summary> |
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs index ee0ec69..ba4d51b 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs | |||
@@ -25,23 +25,20 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using OpenSim.Framework; | 28 | using System; |
29 | using OpenSim.Framework.Communications.Cache; | 29 | using System.Collections.Generic; |
30 | using OpenSim.Region.Framework.Interfaces; | 30 | using System.IO; |
31 | using OpenSim.Region.Framework.Scenes; | 31 | using System.IO.Compression; |
32 | using OpenSim.Region.CoreModules.World.Serialiser; | 32 | using System.Reflection; |
33 | using OpenSim.Region.CoreModules.World.Terrain; | 33 | using System.Text.RegularExpressions; |
34 | using System; | 34 | using System.Threading; |
35 | using System.Collections.Generic; | 35 | using log4net; |
36 | using System.IO; | 36 | using OpenMetaverse; |
37 | using System.IO.Compression; | 37 | using OpenSim.Framework; |
38 | using System.Reflection; | 38 | using OpenSim.Region.CoreModules.World.Terrain; |
39 | using System.Text.RegularExpressions; | 39 | using OpenSim.Region.Framework.Interfaces; |
40 | using System.Threading; | 40 | using OpenSim.Region.Framework.Scenes; |
41 | using OpenMetaverse; | 41 | |
42 | using log4net; | ||
43 | using Nini.Config; | ||
44 | |||
45 | namespace OpenSim.Region.CoreModules.World.Archiver | 42 | namespace OpenSim.Region.CoreModules.World.Archiver |
46 | { | 43 | { |
47 | /// <summary> | 44 | /// <summary> |
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs index dd65e83..eeb5acd 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs | |||
@@ -25,18 +25,13 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System.Collections.Generic; | 28 | using System.IO; |
29 | using System.IO; | 29 | using System.Reflection; |
30 | using System.Reflection; | 30 | using log4net; |
31 | using System.Threading; | 31 | using Nini.Config; |
32 | using OpenMetaverse; | 32 | using OpenSim.Region.Framework.Interfaces; |
33 | using log4net; | 33 | using OpenSim.Region.Framework.Scenes; |
34 | using Nini.Config; | 34 | |
35 | using OpenSim.Framework.Communications.Cache; | ||
36 | using OpenSim.Region.Framework.Interfaces; | ||
37 | using OpenSim.Region.Framework.Scenes; | ||
38 | using OpenSim.Region.CoreModules.World.Serialiser; | ||
39 | |||
40 | namespace OpenSim.Region.CoreModules.World.Archiver | 35 | namespace OpenSim.Region.CoreModules.World.Archiver |
41 | { | 36 | { |
42 | /// <summary> | 37 | /// <summary> |
diff --git a/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs index 76d27ce..5488262 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs | |||
@@ -25,14 +25,14 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System.Collections.Generic; | 28 | using System.Collections.Generic; |
29 | using System.IO; | 29 | using System.IO; |
30 | using System.Reflection; | 30 | using System.Reflection; |
31 | using System.Xml; | 31 | using System.Xml; |
32 | using OpenMetaverse; | 32 | using log4net; |
33 | using log4net; | 33 | using OpenMetaverse; |
34 | using OpenSim.Framework; | 34 | using OpenSim.Framework; |
35 | 35 | ||
36 | namespace OpenSim.Region.CoreModules.World.Archiver | 36 | namespace OpenSim.Region.CoreModules.World.Archiver |
37 | { | 37 | { |
38 | /// <summary> | 38 | /// <summary> |
diff --git a/OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs index f9909d9..39d2591 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs | |||
@@ -25,16 +25,16 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.IO; | 30 | using System.IO; |
31 | using System.Reflection; | 31 | using System.Reflection; |
32 | using System.Xml; | 32 | using System.Text; |
33 | using OpenMetaverse; | 33 | using System.Xml; |
34 | using log4net; | 34 | using log4net; |
35 | using OpenSim.Framework; | 35 | using OpenMetaverse; |
36 | using OpenSim.Framework.Communications.Cache; | 36 | using OpenSim.Framework; |
37 | 37 | ||
38 | namespace OpenSim.Region.CoreModules.World.Archiver | 38 | namespace OpenSim.Region.CoreModules.World.Archiver |
39 | { | 39 | { |
40 | /// <summary> | 40 | /// <summary> |
@@ -44,7 +44,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
44 | { | 44 | { |
45 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 45 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
46 | 46 | ||
47 | protected static System.Text.ASCIIEncoding m_asciiEncoding = new System.Text.ASCIIEncoding(); | 47 | protected static ASCIIEncoding m_asciiEncoding = new ASCIIEncoding(); |
48 | 48 | ||
49 | /// <summary> | 49 | /// <summary> |
50 | /// Store for asset data we received before we get the metadata | 50 | /// Store for asset data we received before we get the metadata |
diff --git a/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs index 8971b6e..659a7ce 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs | |||
@@ -1,4 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) Contributors, http://opensimulator.org/ | 2 | * Copyright (c) Contributors, http://opensimulator.org/ |
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | 3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. |
4 | * | 4 | * |
@@ -25,17 +25,14 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.Reflection; | 30 | using System.Reflection; |
31 | using System.Threading; | 31 | using System.Threading; |
32 | using OpenMetaverse; | 32 | using log4net; |
33 | using log4net; | 33 | using OpenMetaverse; |
34 | using OpenSim.Framework; | 34 | using OpenSim.Framework; |
35 | using OpenSim.Framework.Communications.Cache; | 35 | |
36 | using OpenSim.Region.Framework.Interfaces; | ||
37 | using OpenSim.Region.Framework.Scenes; | ||
38 | |||
39 | namespace OpenSim.Region.CoreModules.World.Archiver | 36 | namespace OpenSim.Region.CoreModules.World.Archiver |
40 | { | 37 | { |
41 | /// <summary> | 38 | /// <summary> |
diff --git a/OpenSim/Region/CoreModules/World/Archiver/RegionSettingsSerializer.cs b/OpenSim/Region/CoreModules/World/Archiver/RegionSettingsSerializer.cs index 3e3e74a..94845cb 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/RegionSettingsSerializer.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/RegionSettingsSerializer.cs | |||
@@ -25,13 +25,12 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System.IO; |
29 | using System.IO; | 29 | using System.Text; |
30 | using System.Text; | 30 | using System.Xml; |
31 | using System.Xml; | 31 | using OpenMetaverse; |
32 | using OpenMetaverse; | 32 | using OpenSim.Framework; |
33 | using OpenSim.Framework; | 33 | |
34 | |||
35 | namespace OpenSim.Region.CoreModules.World.Archiver | 34 | namespace OpenSim.Region.CoreModules.World.Archiver |
36 | { | 35 | { |
37 | /// <summary> | 36 | /// <summary> |
diff --git a/OpenSim/Region/CoreModules/World/Archiver/TarArchiveReader.cs b/OpenSim/Region/CoreModules/World/Archiver/TarArchiveReader.cs index 506d770..983814d 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/TarArchiveReader.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/TarArchiveReader.cs | |||
@@ -1,4 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) Contributors, http://opensimulator.org/ | 2 | * Copyright (c) Contributors, http://opensimulator.org/ |
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | 3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. |
4 | * | 4 | * |
@@ -25,12 +25,10 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.IO; | 29 | using System.IO; |
30 | using System.Reflection; | 30 | using System.Text; |
31 | using System.Text; | 31 | |
32 | using log4net; | ||
33 | |||
34 | namespace OpenSim.Region.CoreModules.World.Archiver | 32 | namespace OpenSim.Region.CoreModules.World.Archiver |
35 | { | 33 | { |
36 | /// <summary> | 34 | /// <summary> |
diff --git a/OpenSim/Region/CoreModules/World/Archiver/TarArchiveWriter.cs b/OpenSim/Region/CoreModules/World/Archiver/TarArchiveWriter.cs index 437939e..8e59983 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/TarArchiveWriter.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/TarArchiveWriter.cs | |||
@@ -25,13 +25,11 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.IO; | 30 | using System.IO; |
31 | using System.Text; | 31 | using System.Text; |
32 | using System.Reflection; | 32 | |
33 | using log4net; | ||
34 | |||
35 | namespace OpenSim.Region.CoreModules.World.Archiver | 33 | namespace OpenSim.Region.CoreModules.World.Archiver |
36 | { | 34 | { |
37 | /// <summary> | 35 | /// <summary> |
diff --git a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs index f201e74..1ad7e9e 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs | |||
@@ -25,20 +25,19 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.IO; | 29 | using System.IO; |
30 | using System.Threading; | 30 | using System.Threading; |
31 | using NUnit.Framework; | 31 | using log4net.Config; |
32 | using NUnit.Framework.SyntaxHelpers; | 32 | using NUnit.Framework; |
33 | using OpenMetaverse; | 33 | using NUnit.Framework.SyntaxHelpers; |
34 | using OpenSim.Framework; | 34 | using OpenMetaverse; |
35 | using OpenSim.Region.Framework.Interfaces; | 35 | using OpenSim.Framework; |
36 | using OpenSim.Region.CoreModules.World.Archiver; | 36 | using OpenSim.Region.CoreModules.World.Serialiser; |
37 | using OpenSim.Region.CoreModules.World.Serialiser; | 37 | using OpenSim.Region.CoreModules.World.Terrain; |
38 | using OpenSim.Region.CoreModules.World.Terrain; | 38 | using OpenSim.Region.Framework.Scenes; |
39 | using OpenSim.Region.Framework.Scenes; | 39 | using OpenSim.Tests.Common.Setup; |
40 | using OpenSim.Tests.Common.Setup; | 40 | |
41 | |||
42 | namespace OpenSim.Region.CoreModules.World.Archiver.Tests | 41 | namespace OpenSim.Region.CoreModules.World.Archiver.Tests |
43 | { | 42 | { |
44 | [TestFixture] | 43 | [TestFixture] |
@@ -222,7 +221,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests | |||
222 | [Test] | 221 | [Test] |
223 | public void TestMergeOarV0p2() | 222 | public void TestMergeOarV0p2() |
224 | { | 223 | { |
225 | log4net.Config.XmlConfigurator.Configure(); | 224 | XmlConfigurator.Configure(); |
226 | 225 | ||
227 | MemoryStream archiveWriteStream = new MemoryStream(); | 226 | MemoryStream archiveWriteStream = new MemoryStream(); |
228 | 227 | ||