3 files changed, 256 insertions, 256 deletions

diff --git a/OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs b/OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs
index d72c40f..8b74195 100644
--- a/OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs
+++ b/OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs
@@ -1,89 +1,89 @@
-using System;

-using System.Collections.Generic;

-using System.Net;

-using System.IO;

-using System.Text;

-

-using OpenSim.Framework.Configuration.Interfaces;

-

-namespace OpenSim.Framework.Configuration.HTTP

-{

-    public class HTTPConfiguration : IGenericConfig

-    {

-        RemoteConfigSettings remoteConfigSettings;

-

-        XmlConfiguration xmlConfig;

-

-        private string configFileName = "";

-

-        public HTTPConfiguration()

-        {

-            remoteConfigSettings = new RemoteConfigSettings("remoteconfig.xml");

-            xmlConfig = new XmlConfiguration();

-        }

-

-        public void SetFileName(string fileName)

-        {

-            configFileName = fileName;

-        }

-

-        public void LoadData()

-        {

-            try

-            {

-                StringBuilder sb = new StringBuilder();

-

-                byte[] buf = new byte[8192];

-                HttpWebRequest request = (HttpWebRequest)WebRequest.Create(this.remoteConfigSettings.baseConfigURL + this.configFileName);

-                HttpWebResponse response = (HttpWebResponse)request.GetResponse();

-

-                Stream resStream = response.GetResponseStream();

-

-                string tempString = null;

-                int count = 0;

-

-                do

-                {

-                    count = resStream.Read(buf, 0, buf.Length);

-                    if (count != 0)

-                    {

-                        tempString = Encoding.ASCII.GetString(buf, 0, count);

-                        sb.Append(tempString);

-                    }

-                }

-                while (count > 0);

-                LoadDataFromString(sb.ToString());

-            }

-            catch (WebException)

-            {

-                Console.MainLog.Instance.Warn("Unable to connect to remote configuration file (" + remoteConfigSettings.baseConfigURL + configFileName + "). Creating local file instead.");

-                xmlConfig.SetFileName(configFileName);

-                xmlConfig.LoadData();

-            }

-        }

-

-        public void LoadDataFromString(string data)

-        {

-            xmlConfig.LoadDataFromString(data);

-            

-        }

-

-        public string GetAttribute(string attributeName)

-        {

-            return xmlConfig.GetAttribute(attributeName);

-        }

-

-        public bool SetAttribute(string attributeName, string attributeValue)

-        {

-            return true;

-        }

-

-        public void Commit()

-        {

-        }

-

-        public void Close()

-        {

-        }

-    }

-}

+using System;
+using System.Collections.Generic;
+using System.Net;
+using System.IO;
+using System.Text;
+
+using OpenSim.Framework.Configuration.Interfaces;
+
+namespace OpenSim.Framework.Configuration.HTTP
+{
+    public class HTTPConfiguration : IGenericConfig
+    {
+        RemoteConfigSettings remoteConfigSettings;
+
+        XmlConfiguration xmlConfig;
+
+        private string configFileName = "";
+
+        public HTTPConfiguration()
+        {
+            remoteConfigSettings = new RemoteConfigSettings("remoteconfig.xml");
+            xmlConfig = new XmlConfiguration();
+        }
+
+        public void SetFileName(string fileName)
+        {
+            configFileName = fileName;
+        }
+
+        public void LoadData()
+        {
+            try
+            {
+                StringBuilder sb = new StringBuilder();
+
+                byte[] buf = new byte[8192];
+                HttpWebRequest request = (HttpWebRequest)WebRequest.Create(this.remoteConfigSettings.baseConfigURL + this.configFileName);
+                HttpWebResponse response = (HttpWebResponse)request.GetResponse();
+
+                Stream resStream = response.GetResponseStream();
+
+                string tempString = null;
+                int count = 0;
+
+                do
+                {
+                    count = resStream.Read(buf, 0, buf.Length);
+                    if (count != 0)
+                    {
+                        tempString = Encoding.ASCII.GetString(buf, 0, count);
+                        sb.Append(tempString);
+                    }
+                }
+                while (count > 0);
+                LoadDataFromString(sb.ToString());
+            }
+            catch (WebException)
+            {
+                Console.MainLog.Instance.Warn("Unable to connect to remote configuration file (" + remoteConfigSettings.baseConfigURL + configFileName + "). Creating local file instead.");
+                xmlConfig.SetFileName(configFileName);
+                xmlConfig.LoadData();
+            }
+        }
+
+        public void LoadDataFromString(string data)
+        {
+            xmlConfig.LoadDataFromString(data);
+            
+        }
+
+        public string GetAttribute(string attributeName)
+        {
+            return xmlConfig.GetAttribute(attributeName);
+        }
+
+        public bool SetAttribute(string attributeName, string attributeValue)
+        {
+            return true;
+        }
+
+        public void Commit()
+        {
+        }
+
+        public void Close()
+        {
+        }
+    }
+}
diff --git a/OpenSim/Framework/Configuration/HTTP/RemoteConfigSettings.cs b/OpenSim/Framework/Configuration/HTTP/RemoteConfigSettings.cs
index e3cfac7..77719ee 100644
--- a/OpenSim/Framework/Configuration/HTTP/RemoteConfigSettings.cs
+++ b/OpenSim/Framework/Configuration/HTTP/RemoteConfigSettings.cs
@@ -1,34 +1,34 @@
-using System;

-using System.Collections.Generic;

-using System.Text;

-

-using OpenSim.Framework.Configuration;

-

-namespace OpenSim.Framework.Configuration.HTTP

-{

-    public class RemoteConfigSettings

-    {

-        private ConfigurationMember configMember;

-

-        public string baseConfigURL = "";

-        public RemoteConfigSettings(string filename)

-        {

-            configMember = new ConfigurationMember(filename, "REMOTE CONFIG SETTINGS", loadConfigurationOptions, handleIncomingConfiguration);

-            configMember.forceConfigurationPluginLibrary("OpenSim.Framework.Configuration.XML.dll");

-            configMember.performConfigurationRetrieve();

-        }

-

-        public void loadConfigurationOptions()

-        {

-            configMember.addConfigurationOption("base_config_url", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "URL Containing Configuration Files", "http://localhost/", false);

-        }

-        public bool handleIncomingConfiguration(string configuration_key, object configuration_result)

-        {

-            if (configuration_key == "base_config_url")

-            {

-                baseConfigURL = (string)configuration_result;

-            }

-            return true;

-        }

-    }

-}

+using System;
+using System.Collections.Generic;
+using System.Text;
+
+using OpenSim.Framework.Configuration;
+
+namespace OpenSim.Framework.Configuration.HTTP
+{
+    public class RemoteConfigSettings
+    {
+        private ConfigurationMember configMember;
+
+        public string baseConfigURL = "";
+        public RemoteConfigSettings(string filename)
+        {
+            configMember = new ConfigurationMember(filename, "REMOTE CONFIG SETTINGS", loadConfigurationOptions, handleIncomingConfiguration);
+            configMember.forceConfigurationPluginLibrary("OpenSim.Framework.Configuration.XML.dll");
+            configMember.performConfigurationRetrieve();
+        }
+
+        public void loadConfigurationOptions()
+        {
+            configMember.addConfigurationOption("base_config_url", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "URL Containing Configuration Files", "http://localhost/", false);
+        }
+        public bool handleIncomingConfiguration(string configuration_key, object configuration_result)
+        {
+            if (configuration_key == "base_config_url")
+            {
+                baseConfigURL = (string)configuration_result;
+            }
+            return true;
+        }
+    }
+}
diff --git a/OpenSim/Framework/Configuration/XML/XmlConfiguration.cs b/OpenSim/Framework/Configuration/XML/XmlConfiguration.cs
index 5b66035..72faed6 100644
--- a/OpenSim/Framework/Configuration/XML/XmlConfiguration.cs
+++ b/OpenSim/Framework/Configuration/XML/XmlConfiguration.cs
@@ -1,133 +1,133 @@
-/*

-* Copyright (c) Contributors, http://www.openmetaverse.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.IO;

-using System.Xml;

-

-using OpenSim.Framework.Interfaces;

-using OpenSim.Framework.Configuration.Interfaces;

-

-namespace OpenSim.Framework.Configuration

-{

-    public class XmlConfiguration : IGenericConfig

-    {

-        private XmlDocument doc;

-        private XmlNode rootNode;

-        private XmlNode configNode;

-        private string fileName;

-        private bool createdFile = false;

-

-        public void SetFileName(string file)

-        {

-            fileName = file;

-        }

-

-        private void LoadDataToClass()

-        {

-            rootNode = doc.FirstChild;

-            if (rootNode.Name != "Root")

-                throw new Exception("Error: Invalid .xml File. Missing <Root>");

-

-            configNode = rootNode.FirstChild;

-            if (configNode.Name != "Config")

-                throw new Exception("Error: Invalid .xml File. <Root> first child should be <Config>");

-        }

-        public void LoadData()

-        {

-            doc = new XmlDocument();

-            if (File.Exists(fileName))

-            {

-                XmlTextReader reader = new XmlTextReader(fileName);

-                reader.WhitespaceHandling = WhitespaceHandling.None;

-                doc.Load(reader);

-                reader.Close();

-            }

-            else

-            {

-                createdFile = true;

-                rootNode = doc.CreateNode(XmlNodeType.Element, "Root", "");

-                doc.AppendChild(rootNode);

-                configNode = doc.CreateNode(XmlNodeType.Element, "Config", "");

-                rootNode.AppendChild(configNode);

-            }

-

-            LoadDataToClass();            

-

-            if (createdFile)

-            {

-                this.Commit();

-            }

-        }

-

-        public void LoadDataFromString(string data)

-        {

-            doc = new XmlDocument();

-            doc.LoadXml(data);

-

-            LoadDataToClass();

-        }

-        public string GetAttribute(string attributeName)

-        {

-            string result = null;

-            if (configNode.Attributes[attributeName] != null)

-            {

-                result = ((XmlAttribute)configNode.Attributes.GetNamedItem(attributeName)).Value;

-            }

-            return result;

-        }

-

-        public bool SetAttribute(string attributeName, string attributeValue)

-        {

-            if (configNode.Attributes[attributeName] != null)

-            {

-                ((XmlAttribute)configNode.Attributes.GetNamedItem(attributeName)).Value = attributeValue;

-            }

-            else

-            {

-                XmlAttribute attri;

-                attri = doc.CreateAttribute(attributeName);

-                attri.Value = attributeValue;

-                configNode.Attributes.Append(attri);

-            }

-            return true;

-        }

-

-        public void Commit()

-        {

-            doc.Save(fileName);

-        }

-

-        public void Close()

-        {

-            configNode = null;

-            rootNode = null;

-            doc = null;

-        }

-

-    }

-}

+/*
+* Copyright (c) Contributors, http://www.openmetaverse.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.IO;
+using System.Xml;
+
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Configuration.Interfaces;
+
+namespace OpenSim.Framework.Configuration
+{
+    public class XmlConfiguration : IGenericConfig
+    {
+        private XmlDocument doc;
+        private XmlNode rootNode;
+        private XmlNode configNode;
+        private string fileName;
+        private bool createdFile = false;
+
+        public void SetFileName(string file)
+        {
+            fileName = file;
+        }
+
+        private void LoadDataToClass()
+        {
+            rootNode = doc.FirstChild;
+            if (rootNode.Name != "Root")
+                throw new Exception("Error: Invalid .xml File. Missing <Root>");
+
+            configNode = rootNode.FirstChild;
+            if (configNode.Name != "Config")
+                throw new Exception("Error: Invalid .xml File. <Root> first child should be <Config>");
+        }
+        public void LoadData()
+        {
+            doc = new XmlDocument();
+            if (File.Exists(fileName))
+            {
+                XmlTextReader reader = new XmlTextReader(fileName);
+                reader.WhitespaceHandling = WhitespaceHandling.None;
+                doc.Load(reader);
+                reader.Close();
+            }
+            else
+            {
+                createdFile = true;
+                rootNode = doc.CreateNode(XmlNodeType.Element, "Root", "");
+                doc.AppendChild(rootNode);
+                configNode = doc.CreateNode(XmlNodeType.Element, "Config", "");
+                rootNode.AppendChild(configNode);
+            }
+
+            LoadDataToClass();            
+
+            if (createdFile)
+            {
+                this.Commit();
+            }
+        }
+
+        public void LoadDataFromString(string data)
+        {
+            doc = new XmlDocument();
+            doc.LoadXml(data);
+
+            LoadDataToClass();
+        }
+        public string GetAttribute(string attributeName)
+        {
+            string result = null;
+            if (configNode.Attributes[attributeName] != null)
+            {
+                result = ((XmlAttribute)configNode.Attributes.GetNamedItem(attributeName)).Value;
+            }
+            return result;
+        }
+
+        public bool SetAttribute(string attributeName, string attributeValue)
+        {
+            if (configNode.Attributes[attributeName] != null)
+            {
+                ((XmlAttribute)configNode.Attributes.GetNamedItem(attributeName)).Value = attributeValue;
+            }
+            else
+            {
+                XmlAttribute attri;
+                attri = doc.CreateAttribute(attributeName);
+                attri.Value = attributeValue;
+                configNode.Attributes.Append(attri);
+            }
+            return true;
+        }
+
+        public void Commit()
+        {
+            doc.Save(fileName);
+        }
+
+        public void Close()
+        {
+            configNode = null;
+            rootNode = null;
+            doc = null;
+        }
+
+    }
+}