4 files changed, 302 insertions, 2 deletions

diff --git a/OpenSim/ApplicationPlugins/LoadRegions/IRegionLoader.cs b/OpenSim/ApplicationPlugins/LoadRegions/IRegionLoader.cs
new file mode 100644
index 0000000..c566fc7
--- /dev/null
+++ b/OpenSim/ApplicationPlugins/LoadRegions/IRegionLoader.cs
@@ -0,0 +1,37 @@
+/*
+ * 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 OpenSimulator 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 Nini.Config;
+
+namespace OpenSim.Framework
+{
+    public interface IRegionLoader
+    {
+        void SetIniConfigSource(IConfigSource configSource);
+        RegionInfo[] LoadRegions();
+    }
+}
\ No newline at end of file
diff --git a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
index 74d9ae4..89224a6 100644
--- a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
+++ b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
@@ -32,8 +32,6 @@ using System.Threading;
 using log4net;
 using OpenMetaverse;
 using OpenSim.Framework;
-using OpenSim.Framework.RegionLoader.Filesystem;
-using OpenSim.Framework.RegionLoader.Web;
 using OpenSim.Region.CoreModules.Agent.AssetTransaction;
 using OpenSim.Region.CoreModules.Avatar.InstantMessage;
 using OpenSim.Region.CoreModules.Scripting.DynamicTexture;
diff --git a/OpenSim/ApplicationPlugins/LoadRegions/RegionLoaderFileSystem.cs b/OpenSim/ApplicationPlugins/LoadRegions/RegionLoaderFileSystem.cs
new file mode 100644
index 0000000..1873a06
--- /dev/null
+++ b/OpenSim/ApplicationPlugins/LoadRegions/RegionLoaderFileSystem.cs
@@ -0,0 +1,117 @@
+/*
+ * 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 OpenSimulator 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 log4net;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Reflection;
+using Nini.Config;
+using OpenSim.Framework;
+
+namespace OpenSim.ApplicationPlugins.LoadRegions
+{
+    public class RegionLoaderFileSystem : IRegionLoader
+    {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        
+        private IConfigSource m_configSource;
+
+        public void SetIniConfigSource(IConfigSource configSource)
+        {
+            m_configSource = configSource;
+        }
+
+        public RegionInfo[] LoadRegions()
+        {
+            string regionConfigPath = Path.Combine(Util.configDir(), "Regions");
+            bool allowRegionless = false;
+
+            try
+            {
+                IConfig startupConfig = (IConfig)m_configSource.Configs["Startup"];
+                regionConfigPath = startupConfig.GetString("regionload_regionsdir", regionConfigPath).Trim();
+                allowRegionless = startupConfig.GetBoolean("allow_regionless", false);
+            }
+            catch (Exception)
+            {
+                // No INI setting recorded.
+            }
+
+            if (!Directory.Exists(regionConfigPath))
+            {
+                Directory.CreateDirectory(regionConfigPath);
+            }
+
+            string[] configFiles = Directory.GetFiles(regionConfigPath, "*.xml");
+            string[] iniFiles = Directory.GetFiles(regionConfigPath, "*.ini");
+
+            // Create an empty Regions.ini if there are no existing config files.
+            if (!allowRegionless && configFiles.Length == 0 && iniFiles.Length == 0)
+            {                
+                new RegionInfo("DEFAULT REGION CONFIG", Path.Combine(regionConfigPath, "Regions.ini"), false, m_configSource);
+                iniFiles = Directory.GetFiles(regionConfigPath, "*.ini");
+            }
+            
+            m_log.InfoFormat("[REGION LOADER FILE SYSTEM]: Loading config files from {0}", regionConfigPath);
+
+            List<RegionInfo> regionInfos = new List<RegionInfo>();
+
+            int i = 0;
+            foreach (string file in iniFiles)
+            {
+                m_log.InfoFormat("[REGION LOADER FILE SYSTEM]: Loading config file {0}", file);
+                
+                IConfigSource source = new IniConfigSource(file);
+
+                foreach (IConfig config in source.Configs)
+                {                   
+                    RegionInfo regionInfo = new RegionInfo("REGION CONFIG #" + (i + 1), file, false, m_configSource, config.Name);
+                    regionInfos.Add(regionInfo);
+                    
+                    m_log.InfoFormat("[REGION LOADER FILE SYSTEM]: Loaded config for region {0}", regionInfo.RegionName);
+                    
+                    i++;
+                }
+            }
+
+            foreach (string file in configFiles)
+            {
+                m_log.InfoFormat("[REGION LOADER FILE SYSTEM]: Loading config file {0}", file);
+                
+                RegionInfo regionInfo = new RegionInfo("REGION CONFIG #" + (i + 1), file, false, m_configSource);
+                regionInfos.Add(regionInfo);
+                
+                m_log.InfoFormat("[REGION LOADER FILE SYSTEM]: Loaded config for region {0}", regionInfo.RegionName);
+                
+                i++;
+            }
+
+            return regionInfos.ToArray();
+        }
+    }
+}
\ No newline at end of file
diff --git a/OpenSim/ApplicationPlugins/LoadRegions/RegionLoaderWebServer.cs b/OpenSim/ApplicationPlugins/LoadRegions/RegionLoaderWebServer.cs
new file mode 100644
index 0000000..850f3e0
--- /dev/null
+++ b/OpenSim/ApplicationPlugins/LoadRegions/RegionLoaderWebServer.cs
@@ -0,0 +1,148 @@
+/*
+ * 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 OpenSimulator 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.IO;
+using System.Net;
+using System.Reflection;
+using System.Xml;
+using log4net;
+using Nini.Config;
+using OpenSim.Framework;
+
+namespace OpenSim.ApplicationPlugins.LoadRegions
+{
+    public class RegionLoaderWebServer : IRegionLoader
+    {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        private IConfigSource m_configSource;
+
+        public void SetIniConfigSource(IConfigSource configSource)
+        {
+            m_configSource = configSource;
+        }
+
+        public RegionInfo[] LoadRegions()
+        {
+            if (m_configSource == null)
+            {
+                m_log.Error("[WEBLOADER]: Unable to load configuration source!");
+                return null;
+            }
+            else
+            {
+                IConfig startupConfig = (IConfig) m_configSource.Configs["Startup"];
+                string url = startupConfig.GetString("regionload_webserver_url", String.Empty).Trim();
+                bool allowRegionless = startupConfig.GetBoolean("allow_regionless", false);
+
+                if (url == String.Empty)
+                {
+                    m_log.Error("[WEBLOADER]: Unable to load webserver URL - URL was empty.");
+                    return null;
+                }
+                else
+                {
+                    RegionInfo[] regionInfos = new RegionInfo[] {};
+                    int regionCount = 0;
+                    HttpWebRequest webRequest = (HttpWebRequest) WebRequest.Create(url);
+                    webRequest.Timeout = 30000; //30 Second Timeout
+                    m_log.DebugFormat("[WEBLOADER]: Sending download request to {0}", url);
+
+                    try
+                    {
+                        string xmlSource = String.Empty;
+
+                        using (HttpWebResponse webResponse = (HttpWebResponse) webRequest.GetResponse())
+                        {
+                            m_log.Debug("[WEBLOADER]: Downloading region information...");
+
+                            using (Stream s = webResponse.GetResponseStream())
+                            {
+                                using (StreamReader reader = new StreamReader(s))
+                                {
+                                    string tempStr = reader.ReadLine();
+                                    while (tempStr != null)
+                                    {
+                                        xmlSource = xmlSource + tempStr;
+                                        tempStr = reader.ReadLine();
+                                    }
+                                }
+                            }
+                        }
+
+                        m_log.Debug("[WEBLOADER]: Done downloading region information from server. Total Bytes: " +
+                                    xmlSource.Length);
+                        XmlDocument xmlDoc = new XmlDocument();
+                        xmlDoc.LoadXml(xmlSource);
+                        if (xmlDoc.FirstChild.Name == "Nini")
+                        {
+                            regionCount = xmlDoc.FirstChild.ChildNodes.Count;
+    
+                            if (regionCount > 0)
+                            {
+                                regionInfos = new RegionInfo[regionCount];
+                                int i;
+                                for (i = 0; i < xmlDoc.FirstChild.ChildNodes.Count; i++)
+                                {
+                                    m_log.Debug(xmlDoc.FirstChild.ChildNodes[i].OuterXml);
+                                    regionInfos[i] =
+                                        new RegionInfo("REGION CONFIG #" + (i + 1), xmlDoc.FirstChild.ChildNodes[i],false,m_configSource);
+                                }
+                            }
+                        }
+                    }
+                    catch (WebException ex)
+                    {
+                        using (HttpWebResponse response = (HttpWebResponse)ex.Response)
+                        {
+                            if (response.StatusCode == HttpStatusCode.NotFound)
+                            {
+                                if (!allowRegionless)
+                                    throw ex;
+                            }
+                            else
+                            {
+                                throw ex;
+                            }
+                        }
+                    }
+
+                    if (regionCount > 0 | allowRegionless)
+                    {
+                        return regionInfos;
+                    }
+                    else
+                    {
+                        m_log.Error("[WEBLOADER]: No region configs were available.");
+                        return null;
+                    }
+                }
+            }
+        }
+    }
+}