aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Framework/Archive/TarArchiveReader.cs (renamed from OpenSim/Region/CoreModules/World/Archiver/TarArchiveReader.cs)24
-rw-r--r--OpenSim/Framework/Archive/TarArchiveWriter.cs (renamed from OpenSim/Region/CoreModules/World/Archiver/TarArchiveWriter.cs)26
-rw-r--r--OpenSim/Grid/AssetInventoryServer/Plugins/InventoryArchivePlugin.cs2
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs1
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs1
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs3
-rw-r--r--OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs1
-rw-r--r--OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs1
-rw-r--r--OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs1
-rw-r--r--OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs3
-rw-r--r--prebuild.xml26
11 files changed, 60 insertions, 29 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/TarArchiveReader.cs b/OpenSim/Framework/Archive/TarArchiveReader.cs
index 070f597..eee65f5 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/TarArchiveReader.cs
+++ b/OpenSim/Framework/Archive/TarArchiveReader.cs
@@ -31,7 +31,7 @@ using System.Reflection;
31using System.Text; 31using System.Text;
32using log4net; 32using log4net;
33 33
34namespace OpenSim.Region.CoreModules.World.Archiver 34namespace OpenSim.Framework.Archive
35{ 35{
36 /// <summary> 36 /// <summary>
37 /// Temporary code to do the bare minimum required to read a tar archive for our purposes 37 /// Temporary code to do the bare minimum required to read a tar archive for our purposes
@@ -39,8 +39,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver
39 public class TarArchiveReader 39 public class TarArchiveReader
40 { 40 {
41 //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 41 //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
42 42
43 public enum TarEntryType 43 public enum TarEntryType
44 { 44 {
45 TYPE_UNKNOWN = 0, 45 TYPE_UNKNOWN = 0,
46 TYPE_NORMAL_FILE = 1, 46 TYPE_NORMAL_FILE = 1,
@@ -89,7 +89,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
89 return null; 89 return null;
90 90
91 entryType = header.EntryType; 91 entryType = header.EntryType;
92 filePath = header.FilePath; 92 filePath = header.FilePath;
93 return ReadData(header.FileSize); 93 return ReadData(header.FileSize);
94 } 94 }
95 95
@@ -104,7 +104,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
104 // If we've reached the end of the archive we'll be in null block territory, which means 104 // If we've reached the end of the archive we'll be in null block territory, which means
105 // the next byte will be 0 105 // the next byte will be 0
106 if (header[0] == 0) 106 if (header[0] == 0)
107 return null; 107 return null;
108 108
109 TarHeader tarHeader = new TarHeader(); 109 TarHeader tarHeader = new TarHeader();
110 110
@@ -117,15 +117,15 @@ namespace OpenSim.Region.CoreModules.World.Archiver
117 header = m_br.ReadBytes(512); 117 header = m_br.ReadBytes(512);
118 } 118 }
119 else 119 else
120 { 120 {
121 tarHeader.FilePath = m_asciiEncoding.GetString(header, 0, 100); 121 tarHeader.FilePath = m_asciiEncoding.GetString(header, 0, 100);
122 tarHeader.FilePath = tarHeader.FilePath.Trim(m_nullCharArray); 122 tarHeader.FilePath = tarHeader.FilePath.Trim(m_nullCharArray);
123 //m_log.DebugFormat("[TAR ARCHIVE READER]: Got short file name {0}", tarHeader.FilePath); 123 //m_log.DebugFormat("[TAR ARCHIVE READER]: Got short file name {0}", tarHeader.FilePath);
124 } 124 }
125 125
126 tarHeader.FileSize = ConvertOctalBytesToDecimal(header, 124, 11); 126 tarHeader.FileSize = ConvertOctalBytesToDecimal(header, 124, 11);
127 127
128 switch (header[156]) 128 switch (header[156])
129 { 129 {
130 case 0: 130 case 0:
131 tarHeader.EntryType = TarEntryType.TYPE_NORMAL_FILE; 131 tarHeader.EntryType = TarEntryType.TYPE_NORMAL_FILE;
@@ -154,11 +154,11 @@ namespace OpenSim.Region.CoreModules.World.Archiver
154 case (byte)'7': 154 case (byte)'7':
155 tarHeader.EntryType = TarEntryType.TYPE_CONTIGUOUS_FILE; 155 tarHeader.EntryType = TarEntryType.TYPE_CONTIGUOUS_FILE;
156 break; 156 break;
157 } 157 }
158 158
159 return tarHeader; 159 return tarHeader;
160 } 160 }
161 161
162 /// <summary> 162 /// <summary>
163 /// Read data following a header 163 /// Read data following a header
164 /// </summary> 164 /// </summary>
@@ -179,7 +179,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
179 179
180 m_br.ReadBytes(paddingLeft); 180 m_br.ReadBytes(paddingLeft);
181 } 181 }
182 182
183 return data; 183 return data;
184 } 184 }
185 185
diff --git a/OpenSim/Region/CoreModules/World/Archiver/TarArchiveWriter.cs b/OpenSim/Framework/Archive/TarArchiveWriter.cs
index 506fcc5..59198b8 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/TarArchiveWriter.cs
+++ b/OpenSim/Framework/Archive/TarArchiveWriter.cs
@@ -30,7 +30,7 @@ using System.Collections.Generic;
30using System.IO; 30using System.IO;
31using System.Text; 31using System.Text;
32 32
33namespace OpenSim.Region.CoreModules.World.Archiver 33namespace OpenSim.Framework.Archive
34{ 34{
35 /// <summary> 35 /// <summary>
36 /// Temporary code to produce a tar archive in tar v7 format 36 /// Temporary code to produce a tar archive in tar v7 format
@@ -45,12 +45,12 @@ namespace OpenSim.Region.CoreModules.World.Archiver
45 /// Binary writer for the underlying stream 45 /// Binary writer for the underlying stream
46 /// </summary> 46 /// </summary>
47 protected BinaryWriter m_bw; 47 protected BinaryWriter m_bw;
48 48
49 public TarArchiveWriter(Stream s) 49 public TarArchiveWriter(Stream s)
50 { 50 {
51 m_bw = new BinaryWriter(s); 51 m_bw = new BinaryWriter(s);
52 } 52 }
53 53
54 /// <summary> 54 /// <summary>
55 /// Write a directory entry to the tar archive. We can only handle one path level right now! 55 /// Write a directory entry to the tar archive. We can only handle one path level right now!
56 /// </summary> 56 /// </summary>
@@ -63,7 +63,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
63 63
64 WriteFile(dirName, new byte[0]); 64 WriteFile(dirName, new byte[0]);
65 } 65 }
66 66
67 /// <summary> 67 /// <summary>
68 /// Write a file to the tar archive 68 /// Write a file to the tar archive
69 /// </summary> 69 /// </summary>
@@ -83,9 +83,9 @@ namespace OpenSim.Region.CoreModules.World.Archiver
83 { 83 {
84 if (filePath.Length > 100) 84 if (filePath.Length > 100)
85 WriteEntry("././@LongLink", m_asciiEncoding.GetBytes(filePath), 'L'); 85 WriteEntry("././@LongLink", m_asciiEncoding.GetBytes(filePath), 'L');
86 86
87 char fileType; 87 char fileType;
88 88
89 if (filePath.EndsWith("/")) 89 if (filePath.EndsWith("/"))
90 { 90 {
91 fileType = '5'; 91 fileType = '5';
@@ -93,11 +93,11 @@ namespace OpenSim.Region.CoreModules.World.Archiver
93 else 93 else
94 { 94 {
95 fileType = '0'; 95 fileType = '0';
96 } 96 }
97 97
98 WriteEntry(filePath, data, fileType); 98 WriteEntry(filePath, data, fileType);
99 } 99 }
100 100
101 /// <summary> 101 /// <summary>
102 /// Finish writing the raw tar archive data to a stream. The stream will be closed on completion. 102 /// Finish writing the raw tar archive data to a stream. The stream will be closed on completion.
103 /// </summary> 103 /// </summary>
@@ -106,7 +106,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
106 public void Close() 106 public void Close()
107 { 107 {
108 //m_log.Debug("[TAR ARCHIVE WRITER]: Writing final consecutive 0 blocks"); 108 //m_log.Debug("[TAR ARCHIVE WRITER]: Writing final consecutive 0 blocks");
109 109
110 // Write two consecutive 0 blocks to end the archive 110 // Write two consecutive 0 blocks to end the archive
111 byte[] finalZeroPadding = new byte[1024]; 111 byte[] finalZeroPadding = new byte[1024];
112 m_bw.Write(finalZeroPadding); 112 m_bw.Write(finalZeroPadding);
@@ -133,7 +133,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
133 byte[] oBytes = m_asciiEncoding.GetBytes(oString); 133 byte[] oBytes = m_asciiEncoding.GetBytes(oString);
134 134
135 return oBytes; 135 return oBytes;
136 } 136 }
137 137
138 /// <summary> 138 /// <summary>
139 /// Write a particular entry 139 /// Write a particular entry
@@ -211,7 +211,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
211 211
212 byte[] padding = new byte[paddingRequired]; 212 byte[] padding = new byte[paddingRequired];
213 m_bw.Write(padding); 213 m_bw.Write(padding);
214 } 214 }
215 } 215 }
216 } 216 }
217} 217}
diff --git a/OpenSim/Grid/AssetInventoryServer/Plugins/InventoryArchivePlugin.cs b/OpenSim/Grid/AssetInventoryServer/Plugins/InventoryArchivePlugin.cs
index 8d60aa6..ceded03 100644
--- a/OpenSim/Grid/AssetInventoryServer/Plugins/InventoryArchivePlugin.cs
+++ b/OpenSim/Grid/AssetInventoryServer/Plugins/InventoryArchivePlugin.cs
@@ -33,8 +33,8 @@ using System.Xml;
33using System.Reflection; 33using System.Reflection;
34using OpenMetaverse; 34using OpenMetaverse;
35using OpenSim.Framework; 35using OpenSim.Framework;
36using OpenSim.Framework.Archive;
36using OpenSim.Framework.Servers; 37using OpenSim.Framework.Servers;
37using OpenSim.Region.CoreModules.World.Archiver;
38using OpenSim.Region.CoreModules.Avatar.Inventory.Archiver; 38using OpenSim.Region.CoreModules.Avatar.Inventory.Archiver;
39using log4net; 39using log4net;
40 40
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
index 4a681bc..5de8adc 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
@@ -35,6 +35,7 @@ using System.Xml;
35using log4net; 35using log4net;
36using OpenMetaverse; 36using OpenMetaverse;
37using OpenSim.Framework; 37using OpenSim.Framework;
38using OpenSim.Framework.Archive;
38using OpenSim.Framework.Communications; 39using OpenSim.Framework.Communications;
39using OpenSim.Framework.Communications.Cache; 40using OpenSim.Framework.Communications.Cache;
40using OpenSim.Region.CoreModules.World.Archiver; 41using OpenSim.Region.CoreModules.World.Archiver;
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
index b0f2742..71c4740 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
@@ -34,6 +34,7 @@ using System.Xml;
34using log4net; 34using log4net;
35using OpenMetaverse; 35using OpenMetaverse;
36using OpenSim.Framework; 36using OpenSim.Framework;
37using OpenSim.Framework.Archive;
37using OpenSim.Framework.Communications; 38using OpenSim.Framework.Communications;
38using OpenSim.Framework.Communications.Cache; 39using OpenSim.Framework.Communications.Cache;
39using OpenSim.Region.CoreModules.World.Archiver; 40using OpenSim.Region.CoreModules.World.Archiver;
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
index 5cc0340..ef7f93f 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
@@ -34,6 +34,7 @@ using NUnit.Framework.SyntaxHelpers;
34using OpenMetaverse; 34using OpenMetaverse;
35using OpenSim.Data; 35using OpenSim.Data;
36using OpenSim.Framework; 36using OpenSim.Framework;
37using OpenSim.Framework.Archive;
37using OpenSim.Framework.Communications; 38using OpenSim.Framework.Communications;
38using OpenSim.Framework.Communications.Cache; 39using OpenSim.Framework.Communications.Cache;
39using OpenSim.Region.CoreModules.Avatar.Inventory.Archiver; 40using OpenSim.Region.CoreModules.Avatar.Inventory.Archiver;
@@ -182,4 +183,4 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
182 // TODO: Test presence of more files and contents of files. 183 // TODO: Test presence of more files and contents of files.
183 } 184 }
184 } 185 }
185} \ No newline at end of file 186}
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
index 3525e04..69766d4 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
@@ -35,6 +35,7 @@ using System.Text;
35using log4net; 35using log4net;
36using OpenMetaverse; 36using OpenMetaverse;
37using OpenSim.Framework; 37using OpenSim.Framework;
38using OpenSim.Framework.Archive;
38using OpenSim.Framework.Communications.Cache; 39using OpenSim.Framework.Communications.Cache;
39using OpenSim.Region.CoreModules.World.Terrain; 40using OpenSim.Region.CoreModules.World.Terrain;
40using OpenSim.Region.Framework.Interfaces; 41using OpenSim.Region.Framework.Interfaces;
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs
index cc4eadb..34332f8 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs
@@ -33,6 +33,7 @@ using System.Xml;
33using log4net; 33using log4net;
34using OpenMetaverse; 34using OpenMetaverse;
35using OpenSim.Framework; 35using OpenSim.Framework;
36using OpenSim.Framework.Archive;
36using OpenSim.Region.CoreModules.World.Terrain; 37using OpenSim.Region.CoreModules.World.Terrain;
37using OpenSim.Region.Framework.Interfaces; 38using OpenSim.Region.Framework.Interfaces;
38using OpenSim.Region.Framework.Scenes; 39using OpenSim.Region.Framework.Scenes;
diff --git a/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs
index 8debfcf..fb78af9 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs
@@ -32,6 +32,7 @@ using System.Xml;
32using log4net; 32using log4net;
33using OpenMetaverse; 33using OpenMetaverse;
34using OpenSim.Framework; 34using OpenSim.Framework;
35using OpenSim.Framework.Archive;
35 36
36namespace OpenSim.Region.CoreModules.World.Archiver 37namespace OpenSim.Region.CoreModules.World.Archiver
37{ 38{
diff --git a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
index ba5fa31..b5a2d13 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
@@ -33,6 +33,7 @@ using NUnit.Framework;
33using NUnit.Framework.SyntaxHelpers; 33using NUnit.Framework.SyntaxHelpers;
34using OpenMetaverse; 34using OpenMetaverse;
35using OpenSim.Framework; 35using OpenSim.Framework;
36using OpenSim.Framework.Archive;
36using OpenSim.Region.CoreModules.World.Serialiser; 37using OpenSim.Region.CoreModules.World.Serialiser;
37using OpenSim.Region.CoreModules.World.Terrain; 38using OpenSim.Region.CoreModules.World.Terrain;
38using OpenSim.Region.Framework.Scenes; 39using OpenSim.Region.Framework.Scenes;
@@ -303,4 +304,4 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
303 } 304 }
304 } 305 }
305 } 306 }
306} \ No newline at end of file 307}
diff --git a/prebuild.xml b/prebuild.xml
index 9b1b6c4..f52de6d 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -105,6 +105,27 @@
105 </Files> 105 </Files>
106 </Project> 106 </Project>
107 107
108 <Project name="OpenSim.Framework.Archive" path="OpenSim/Framework/Archive" type="Library">
109 <Configuration name="Debug">
110 <Options>
111 <OutputPath>../../../bin/</OutputPath>
112 </Options>
113 </Configuration>
114 <Configuration name="Release">
115 <Options>
116 <OutputPath>../../../bin/</OutputPath>
117 </Options>
118 </Configuration>
119
120 <ReferencePath>../../../bin/</ReferencePath>
121 <Reference name="System"/>
122 <Reference name="log4net.dll"/>
123
124 <Files>
125 <Match pattern="*.cs" recurse="true"/>
126 </Files>
127 </Project>
128
108 <Project name="OpenSim.Framework.Statistics" path="OpenSim/Framework/Statistics" type="Library"> 129 <Project name="OpenSim.Framework.Statistics" path="OpenSim/Framework/Statistics" type="Library">
109 <Configuration name="Debug"> 130 <Configuration name="Debug">
110 <Options> 131 <Options>
@@ -1098,6 +1119,7 @@
1098 <Reference name="OpenSim.Framework.Communications"/> 1119 <Reference name="OpenSim.Framework.Communications"/>
1099 <Reference name="OpenSim.Data" /> 1120 <Reference name="OpenSim.Data" />
1100 <Reference name="OpenSim.Region.Framework" /> 1121 <Reference name="OpenSim.Region.Framework" />
1122 <Reference name="OpenSim.Framework.Archive"/>
1101 <Reference name="OpenSim.Framework.Console"/> 1123 <Reference name="OpenSim.Framework.Console"/>
1102 <Reference name="OpenSim.Framework.Servers"/> 1124 <Reference name="OpenSim.Framework.Servers"/>
1103 <Reference name="OpenSim.Framework.Statistics"/> 1125 <Reference name="OpenSim.Framework.Statistics"/>
@@ -1138,11 +1160,12 @@
1138 <Reference name="OpenMetaverseTypes"/> 1160 <Reference name="OpenMetaverseTypes"/>
1139 <Reference name="OpenMetaverse.StructuredData"/> 1161 <Reference name="OpenMetaverse.StructuredData"/>
1140 <Reference name="OpenSim.Framework"/> 1162 <Reference name="OpenSim.Framework"/>
1163 <Reference name="OpenSim.Framework.Archive"/>
1141 <Reference name="OpenSim.Framework.Servers"/> 1164 <Reference name="OpenSim.Framework.Servers"/>
1142 <Reference name="OpenSim.Grid.AssetInventoryServer" /> 1165 <Reference name="OpenSim.Grid.AssetInventoryServer" />
1143 <Reference name="log4net"/> 1166 <Reference name="log4net"/>
1144 1167
1145 <!-- Needed for TarArchiver. Hopefully it can be moved to Framework or something so we don't depend on Region DLLs. --> 1168 <!-- Needed for InventoryArchiveConstants. Hopefully it can be moved to Framework or something so we don't depend on Region DLLs. -->
1146 <Reference name="OpenSim.Region.CoreModules"/> 1169 <Reference name="OpenSim.Region.CoreModules"/>
1147 1170
1148 <Files> 1171 <Files>
@@ -2951,6 +2974,7 @@
2951 <Reference name="OpenMetaverse.dll"/> 2974 <Reference name="OpenMetaverse.dll"/>
2952 <Reference name="OpenSim.Data"/> 2975 <Reference name="OpenSim.Data"/>
2953 <Reference name="OpenSim.Framework"/> 2976 <Reference name="OpenSim.Framework"/>
2977 <Reference name="OpenSim.Framework.Archive"/>
2954 <Reference name="OpenSim.Framework.Communications"/> 2978 <Reference name="OpenSim.Framework.Communications"/>
2955 <Reference name="OpenSim.Framework.Console"/> 2979 <Reference name="OpenSim.Framework.Console"/>
2956 <Reference name="OpenSim.Framework.Servers"/> 2980 <Reference name="OpenSim.Framework.Servers"/>