3 files changed, 256 insertions, 175 deletions

diff --git a/OpenSim/Region/Modules/AvatarFactory/Properties/AssemblyInfo.cs b/OpenSim/Region/Modules/AvatarFactory/Properties/AssemblyInfo.cs
index 5707990..ec9714a 100644
--- a/OpenSim/Region/Modules/AvatarFactory/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/Modules/AvatarFactory/Properties/AssemblyInfo.cs
@@ -1,4 +1,31 @@
-using System.Reflection;
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSim Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * 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
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
@@ -10,7 +37,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("OpenSim.Region.Modules.AvatarFactory")]
-[assembly: AssemblyCopyright("Copyright ©  2008")]
+[assembly: AssemblyCopyright("Copyright (c) 2008")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
diff --git a/OpenSim/Region/Modules/SvnSerialiser/Properties/AssemblyInfo.cs b/OpenSim/Region/Modules/SvnSerialiser/Properties/AssemblyInfo.cs
index 3d0aa3e..e50a89e 100644
--- a/OpenSim/Region/Modules/SvnSerialiser/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/Modules/SvnSerialiser/Properties/AssemblyInfo.cs
@@ -1,36 +1,63 @@
-using System.Reflection;

-using System.Runtime.CompilerServices;

-using System.Runtime.InteropServices;

-

-// General Information about an assembly is controlled through the following 

-// set of attributes. Change these attribute values to modify the information

-// associated with an assembly.

-[assembly: AssemblyTitle("SvnSerialiser")]

-[assembly: AssemblyDescription("")]

-[assembly: AssemblyConfiguration("")]

-[assembly: AssemblyCompany("")]

-[assembly: AssemblyProduct("SvnSerialiser")]

-[assembly: AssemblyCopyright("Copyright ©  2008")]

-[assembly: AssemblyTrademark("")]

-[assembly: AssemblyCulture("")]

-

-// Setting ComVisible to false makes the types in this assembly not visible 

-// to COM components.  If you need to access a type in this assembly from 

-// COM, set the ComVisible attribute to true on that type.

-[assembly: ComVisible(false)]

-

-// The following GUID is for the ID of the typelib if this project is exposed to COM

-[assembly: Guid("c0893655-0c18-4dd7-8b5b-5f58ab1ec6c7")]

-

-// Version information for an assembly consists of the following four values:

-//

-//      Major Version

-//      Minor Version 

-//      Build Number

-//      Revision

-//

-// You can specify all the values or you can default the Build and Revision Numbers 

-// by using the '*' as shown below:

-// [assembly: AssemblyVersion("1.0.*")]

-[assembly: AssemblyVersion("1.0.0.0")]

-[assembly: AssemblyFileVersion("1.0.0.0")]

+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSim Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * 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
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("SvnSerialiser")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("SvnSerialiser")]
+[assembly: AssemblyCopyright("Copyright (c) 2008")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("c0893655-0c18-4dd7-8b5b-5f58ab1ec6c7")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/OpenSim/Region/Modules/SvnSerialiser/SvnBackupModule.cs b/OpenSim/Region/Modules/SvnSerialiser/SvnBackupModule.cs
index 71882fd..a27ccec 100644
--- a/OpenSim/Region/Modules/SvnSerialiser/SvnBackupModule.cs
+++ b/OpenSim/Region/Modules/SvnSerialiser/SvnBackupModule.cs
@@ -1,137 +1,164 @@
-using System;

-using System.Collections.Generic;

-using Nini.Config;

-using OpenSim.Region.Environment.Interfaces;

-using OpenSim.Region.Environment.Scenes;

-using OpenSim.Region.Environment.Modules.ExportSerialiser;

-

-using PumaCode.SvnDotNet.SubversionSharp;

-using PumaCode.SvnDotNet.AprSharp;

-

-namespace OpenSim.Region.Modules.SvnSerialiser

-{

-    public class SvnBackupModule : IRegionModule

-    {

-        private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);

-        

-        private SvnClient m_svnClient;

-        private bool m_installBackupOnLoad = false;

-        private string m_svnurl = "svn://url.tld/repository/";

-        private string m_svnuser = "user";

-        private string m_svnpass = "password";

-        private string m_svndir = "modsvn/";

-        private IRegionSerialiser m_serialiser;

-        private List<Scene> m_scenes = new List<Scene>();

-

-        #region SvnModule Core

-

-        public void SaveRegion(Scene scene)

-        {

-            List<string> filenames = m_serialiser.SerialiseRegion(scene, m_svndir);

-            foreach (string filename in filenames)

-            {

-                m_svnClient.Add3(filename, false, true, false);

-            }

-

-            m_svnClient.Commit3(filenames, true, false);

-        }

-

-        #endregion

-

-        #region SvnDotNet Callbacks

-

-        private SvnError SimpleAuth(out SvnAuthCredSimple svnCredentials, IntPtr baton,

-            AprString realm, AprString username, bool maySave, AprPool pool)

-        {

-            svnCredentials = SvnAuthCredSimple.Alloc(pool);

-            svnCredentials.Username = new AprString(m_svnuser, pool);

-            svnCredentials.Password = new AprString(m_svnpass, pool);

-            svnCredentials.MaySave = false;

-            return SvnError.NoError;

-        }

-

-        private SvnError GetCommitLogCallback(out AprString logMessage, out SvnPath tmpFile, AprArray commitItems, IntPtr baton, AprPool pool)

-        {

-            if (!commitItems.IsNull)

-            {

-                foreach (SvnClientCommitItem item in commitItems)

-                {

-                    m_log.Debug("[SVNBACKUP]: Updated " + item.Path.ToString() + " (" + item.Kind.ToString() + ") " + item.Revision.ToString());

-                    m_log.Debug("[SVNBACKUP]: " + item.Url.ToString() + " -> " + item.CopyFromUrl.ToString());

-                }

-            }

-

-            m_log.Debug("[SVNBACKUP]: Appending log message.");

-

-            logMessage = new AprString("Automated Region Backup", pool);

-            tmpFile = new SvnPath(pool);

-

-            return (SvnError.NoError);

-        }

-

-        #endregion

-

-        #region IRegionModule Members

-

-        public void Initialise(Scene scene, IConfigSource source)

-        {

-            lock (m_scenes)

-            {

-                m_scenes.Add(scene);

-            }

-

-            scene.EventManager.OnPluginConsole += EventManager_OnPluginConsole;

-        }

-

-        void EventManager_OnPluginConsole(string[] args)

-        {

-            if (args[0] == "testsvn")

-                SaveRegion(m_scenes[0]);

-        }

-

-        public void PostInitialise()

-        {

-            m_log.Info("[SVNBACKUP]: Disabled.");

-            return; 

-

-            m_log.Info("[SVNBACKUP]: Connecting...");

-

-            m_svnClient = new SvnClient();

-            m_svnClient.AddUsernameProvider();

-            m_svnClient.AddPromptProvider(new SvnAuthProviderObject.SimplePrompt(SimpleAuth), IntPtr.Zero, 2);

-            m_svnClient.OpenAuth();

-

-            m_log.Info("[SVNBACKUP]: Checking out base directory...");

-

-            if (!System.IO.Directory.Exists(m_svndir))

-                System.IO.Directory.CreateDirectory(m_svndir);

-

-            m_svnClient.Checkout2(m_svnurl, m_svndir, Svn.Revision.Head, Svn.Revision.Head, true, false);

-

-            if (m_scenes.Count > 0)

-                m_serialiser = m_scenes[0].RequestModuleInterface<IRegionSerialiser>();

-

-            if (m_installBackupOnLoad)

-            {

-

-            }

-        }

-

-        public void Close()

-        {

-            

-        }

-

-        public string Name

-        {

-            get { return "SvnBackupModule"; }

-        }

-

-        public bool IsSharedModule

-        {

-            get { return true; }

-        }

-

-        #endregion

-    }

-}

+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSim Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * 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
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections.Generic;
+using Nini.Config;
+using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Environment.Modules.ExportSerialiser;
+
+using PumaCode.SvnDotNet.SubversionSharp;
+using PumaCode.SvnDotNet.AprSharp;
+
+namespace OpenSim.Region.Modules.SvnSerialiser
+{
+    public class SvnBackupModule : IRegionModule
+    {
+        private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+        
+        private SvnClient m_svnClient;
+        private bool m_installBackupOnLoad = false;
+        private string m_svnurl = "svn://url.tld/repository/";
+        private string m_svnuser = "user";
+        private string m_svnpass = "password";
+        private string m_svndir = "modsvn/";
+        private IRegionSerialiser m_serialiser;
+        private List<Scene> m_scenes = new List<Scene>();
+
+        #region SvnModule Core
+
+        public void SaveRegion(Scene scene)
+        {
+            List<string> filenames = m_serialiser.SerialiseRegion(scene, m_svndir);
+            foreach (string filename in filenames)
+            {
+                m_svnClient.Add3(filename, false, true, false);
+            }
+
+            m_svnClient.Commit3(filenames, true, false);
+        }
+
+        #endregion
+
+        #region SvnDotNet Callbacks
+
+        private SvnError SimpleAuth(out SvnAuthCredSimple svnCredentials, IntPtr baton,
+            AprString realm, AprString username, bool maySave, AprPool pool)
+        {
+            svnCredentials = SvnAuthCredSimple.Alloc(pool);
+            svnCredentials.Username = new AprString(m_svnuser, pool);
+            svnCredentials.Password = new AprString(m_svnpass, pool);
+            svnCredentials.MaySave = false;
+            return SvnError.NoError;
+        }
+
+        private SvnError GetCommitLogCallback(out AprString logMessage, out SvnPath tmpFile, AprArray commitItems, IntPtr baton, AprPool pool)
+        {
+            if (!commitItems.IsNull)
+            {
+                foreach (SvnClientCommitItem item in commitItems)
+                {
+                    m_log.Debug("[SVNBACKUP]: Updated " + item.Path.ToString() + " (" + item.Kind.ToString() + ") " + item.Revision.ToString());
+                    m_log.Debug("[SVNBACKUP]: " + item.Url.ToString() + " -> " + item.CopyFromUrl.ToString());
+                }
+            }
+
+            m_log.Debug("[SVNBACKUP]: Appending log message.");
+
+            logMessage = new AprString("Automated Region Backup", pool);
+            tmpFile = new SvnPath(pool);
+
+            return (SvnError.NoError);
+        }
+
+        #endregion
+
+        #region IRegionModule Members
+
+        public void Initialise(Scene scene, IConfigSource source)
+        {
+            lock (m_scenes)
+            {
+                m_scenes.Add(scene);
+            }
+
+            scene.EventManager.OnPluginConsole += EventManager_OnPluginConsole;
+        }
+
+        void EventManager_OnPluginConsole(string[] args)
+        {
+            if (args[0] == "testsvn")
+                SaveRegion(m_scenes[0]);
+        }
+
+        public void PostInitialise()
+        {
+            m_log.Info("[SVNBACKUP]: Disabled.");
+            return; 
+
+            m_log.Info("[SVNBACKUP]: Connecting...");
+
+            m_svnClient = new SvnClient();
+            m_svnClient.AddUsernameProvider();
+            m_svnClient.AddPromptProvider(new SvnAuthProviderObject.SimplePrompt(SimpleAuth), IntPtr.Zero, 2);
+            m_svnClient.OpenAuth();
+
+            m_log.Info("[SVNBACKUP]: Checking out base directory...");
+
+            if (!System.IO.Directory.Exists(m_svndir))
+                System.IO.Directory.CreateDirectory(m_svndir);
+
+            m_svnClient.Checkout2(m_svnurl, m_svndir, Svn.Revision.Head, Svn.Revision.Head, true, false);
+
+            if (m_scenes.Count > 0)
+                m_serialiser = m_scenes[0].RequestModuleInterface<IRegionSerialiser>();
+
+            if (m_installBackupOnLoad)
+            {
+
+            }
+        }
+
+        public void Close()
+        {
+            
+        }
+
+        public string Name
+        {
+            get { return "SvnBackupModule"; }
+        }
+
+        public bool IsSharedModule
+        {
+            get { return true; }
+        }
+
+        #endregion
+    }
+}