1 files changed, 73 insertions, 73 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestExecution.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestExecution.cs
index 4164cea..3d7273e 100644
--- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestExecution.cs
+++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestExecution.cs
@@ -1,73 +1,73 @@
-/*
+/*
- * Copyright (c) Contributors, http://opensimulator.org/
+ * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
+ *
- * Redistribution and use in source and binary forms, with or without
+ * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
+ *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
+ *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
+ *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
+ *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
+ *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSim Project nor the
+ *     * Neither the name of the OpenSim Project nor the
- *       names of its contributors may be used to endorse or promote products
+ *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
+ *       derived from this software without specific prior written permission.
- *
+ *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+ */
-using System.Collections.Generic;
+using System.Collections.Generic;
-using System.Reflection;
+using System.Reflection;
-using libsecondlife;
+using libsecondlife;
-using log4net;
+using log4net;
-using OpenSim.Framework;
+using OpenSim.Framework;
-namespace OpenSim.Region.Environment.Modules.World.Archiver
+namespace OpenSim.Region.Environment.Modules.World.Archiver
-{
+{
-    /// <summary>
+    /// <summary>
-    /// Method called when all the necessary assets for an archive request have been received.
+    /// Method called when all the necessary assets for an archive request have been received.
-    /// </summary>
+    /// </summary>
-    public delegate void AssetsRequestCallback(IDictionary<LLUUID, AssetBase> assets);
+    public delegate void AssetsRequestCallback(IDictionary<LLUUID, AssetBase> assets);
-    
+    
-    /// <summary>
+    /// <summary>
-    /// Execute the write of an archive once we have received all the necessary data
+    /// Execute the write of an archive once we have received all the necessary data
-    /// </summary>
+    /// </summary>
-    public class ArchiveWriteRequestExecution
+    public class ArchiveWriteRequestExecution
-    {
+    {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        protected string m_savePath;
+        protected string m_savePath;
-        protected string m_serializedEntities;        
+        protected string m_serializedEntities;        
-        
+        
-        public ArchiveWriteRequestExecution(string serializedEntities, string savePath)
+        public ArchiveWriteRequestExecution(string serializedEntities, string savePath)
-        {
+        {
-            m_serializedEntities = serializedEntities;
+            m_serializedEntities = serializedEntities;
-            m_savePath = savePath;
+            m_savePath = savePath;
-        }
+        }
-        
+        
-        protected internal void ReceivedAllAssets(IDictionary<LLUUID, AssetBase> assets)
+        protected internal void ReceivedAllAssets(IDictionary<LLUUID, AssetBase> assets)
-        {
+        {
-            m_log.DebugFormat("[ARCHIVER]: Received all {0} assets required", assets.Count);
+            m_log.DebugFormat("[ARCHIVER]: Received all {0} assets required", assets.Count);
-            TarArchiveWriter archive = new TarArchiveWriter();
+            TarArchiveWriter archive = new TarArchiveWriter();
-            archive.AddFile(ArchiveConstants.PRIMS_PATH, m_serializedEntities);
+            archive.AddFile(ArchiveConstants.PRIMS_PATH, m_serializedEntities);
-            
+            
-            AssetsArchiver assetsArchiver = new AssetsArchiver(assets);
+            AssetsArchiver assetsArchiver = new AssetsArchiver(assets);
-            assetsArchiver.Archive(archive);
+            assetsArchiver.Archive(archive);
-            archive.WriteTar(m_savePath);
+            archive.WriteTar(m_savePath);
-            m_log.InfoFormat("[ARCHIVER]: Wrote out OpenSimulator archive {0}", m_savePath);
+            m_log.InfoFormat("[ARCHIVER]: Wrote out OpenSimulator archive {0}", m_savePath);
-        }        
+        }        
-    }
+    }
-}
+}

diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestExecution.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestExecution.cs index 4164cea..3d7273e 100644 --- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestExecution.cs +++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestExecution.cs
@@ -1,73 +1,73 @@
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	*
5	* Redistribution and use in source and binary forms, with or without	5	* Redistribution and use in source and binary forms, with or without
6	* modification, are permitted provided that the following conditions are met:	6	* modification, are permitted provided that the following conditions are met:
7	* * Redistributions of source code must retain the above copyright	7	* * Redistributions of source code must retain the above copyright
8	* notice, this list of conditions and the following disclaimer.	8	* notice, this list of conditions and the following disclaimer.
9	* * Redistributions in binary form must reproduce the above copyright	9	* * Redistributions in binary form must reproduce the above copyright
10	* notice, this list of conditions and the following disclaimer in the	10	* notice, this list of conditions and the following disclaimer in the
11	* documentation and/or other materials provided with the distribution.	11	* documentation and/or other materials provided with the distribution.
12	* * Neither the name of the OpenSim Project nor the	12	* * Neither the name of the OpenSim Project nor the
13	* names of its contributors may be used to endorse or promote products	13	* names of its contributors may be used to endorse or promote products
14	* derived from this software without specific prior written permission.	14	* derived from this software without specific prior written permission.
15	*	15	*
16	* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY	16	* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17	* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED	17	* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18	* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE	18	* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19	* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY	19	* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20	* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES	20	* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21	* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;	21	* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22	* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND	22	* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23	* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT	23	* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS	24	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
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.Reflection;	29	using System.Reflection;
30	using libsecondlife;	30	using libsecondlife;
31	using log4net;	31	using log4net;
32	using OpenSim.Framework;	32	using OpenSim.Framework;
33		33
34	namespace OpenSim.Region.Environment.Modules.World.Archiver	34	namespace OpenSim.Region.Environment.Modules.World.Archiver
35	{	35	{
36	/// <summary>	36	/// <summary>
37	/// Method called when all the necessary assets for an archive request have been received.	37	/// Method called when all the necessary assets for an archive request have been received.
38	/// </summary>	38	/// </summary>
39	public delegate void AssetsRequestCallback(IDictionary<LLUUID, AssetBase> assets);	39	public delegate void AssetsRequestCallback(IDictionary<LLUUID, AssetBase> assets);
40		40
41	/// <summary>	41	/// <summary>
42	/// Execute the write of an archive once we have received all the necessary data	42	/// Execute the write of an archive once we have received all the necessary data
43	/// </summary>	43	/// </summary>
44	public class ArchiveWriteRequestExecution	44	public class ArchiveWriteRequestExecution
45	{	45	{
46	private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);	46	private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
47		47
48	protected string m_savePath;	48	protected string m_savePath;
49	protected string m_serializedEntities;	49	protected string m_serializedEntities;
50		50
51	public ArchiveWriteRequestExecution(string serializedEntities, string savePath)	51	public ArchiveWriteRequestExecution(string serializedEntities, string savePath)
52	{	52	{
53	m_serializedEntities = serializedEntities;	53	m_serializedEntities = serializedEntities;
54	m_savePath = savePath;	54	m_savePath = savePath;
55	}	55	}
56		56
57	protected internal void ReceivedAllAssets(IDictionary<LLUUID, AssetBase> assets)	57	protected internal void ReceivedAllAssets(IDictionary<LLUUID, AssetBase> assets)
58	{	58	{
59	m_log.DebugFormat("[ARCHIVER]: Received all {0} assets required", assets.Count);	59	m_log.DebugFormat("[ARCHIVER]: Received all {0} assets required", assets.Count);
60		60
61	TarArchiveWriter archive = new TarArchiveWriter();	61	TarArchiveWriter archive = new TarArchiveWriter();
62		62
63	archive.AddFile(ArchiveConstants.PRIMS_PATH, m_serializedEntities);	63	archive.AddFile(ArchiveConstants.PRIMS_PATH, m_serializedEntities);
64		64
65	AssetsArchiver assetsArchiver = new AssetsArchiver(assets);	65	AssetsArchiver assetsArchiver = new AssetsArchiver(assets);
66	assetsArchiver.Archive(archive);	66	assetsArchiver.Archive(archive);
67		67
68	archive.WriteTar(m_savePath);	68	archive.WriteTar(m_savePath);
69		69
70	m_log.InfoFormat("[ARCHIVER]: Wrote out OpenSimulator archive {0}", m_savePath);	70	m_log.InfoFormat("[ARCHIVER]: Wrote out OpenSimulator archive {0}", m_savePath);
71	}	71	}
72	}	72	}
73	}	73	}