1 files changed, 123 insertions, 122 deletions
diff --git a/OpenSim/Framework/GenericConfig/Xml/XmlConfig.cs b/OpenSim/Framework/General/Configuration/XmlConfiguration.cs
index 2ed8d28..e1f3816 100644
--- a/OpenSim/Framework/GenericConfig/Xml/XmlConfig.cs
+++ b/OpenSim/Framework/General/Configuration/XmlConfiguration.cs
@@ -1,122 +1,123 @@
-/*
+/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
+* Copyright (c) Contributors, http://www.openmetaverse.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;
+using System;
-using System.IO;
+using System.IO;
-using System.Xml;
+using System.Xml;
-using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Interfaces;
-namespace OpenSim.GenericConfig
-{
+namespace OpenSim.Framework.Configuration
-    public class XmlConfig : IGenericConfig
+{
-    {
+    public class XmlConfiguration : IGenericConfig
-        private XmlDocument doc;
+    {
-        private XmlNode rootNode;
+        private XmlDocument doc;
-        private XmlNode configNode;
+        private XmlNode rootNode;
-        private string fileName;
+        private XmlNode configNode;
-        private bool createdFile = false;
+        private string fileName;
+        private bool createdFile = false;
-        public XmlConfig(string filename)
-        {
+        public XmlConfiguration(string filename)
-            fileName = filename;
+        {
-        }
+            fileName = filename;
+        }
-        public void LoadData()
-        {
+        public void LoadData()
-            doc = new XmlDocument();
+        {
+            doc = new XmlDocument();
-            if (File.Exists(fileName))
-            {
+            if (File.Exists(fileName))
-                XmlTextReader reader = new XmlTextReader(fileName);
+            {
-                reader.WhitespaceHandling = WhitespaceHandling.None;
+                XmlTextReader reader = new XmlTextReader(fileName);
-                doc.Load(reader);
+                reader.WhitespaceHandling = WhitespaceHandling.None;
-                reader.Close();
+                doc.Load(reader);
-            }
+                reader.Close();
-            else
+            }
-            {
+            else
-                createdFile = true;
+            {
-                rootNode = doc.CreateNode(XmlNodeType.Element, "Root", "");
+                createdFile = true;
-                doc.AppendChild(rootNode);
+                rootNode = doc.CreateNode(XmlNodeType.Element, "Root", "");
-                configNode = doc.CreateNode(XmlNodeType.Element, "Config", "");
+                doc.AppendChild(rootNode);
-                rootNode.AppendChild(configNode);
+                configNode = doc.CreateNode(XmlNodeType.Element, "Config", "");
-            }
+                rootNode.AppendChild(configNode);
+            }
-            rootNode = doc.FirstChild;
-            if (rootNode.Name != "Root")
+            rootNode = doc.FirstChild;
-                throw new Exception("Error: Invalid .xml File. Missing <Root>");
+            if (rootNode.Name != "Root")
+                throw new Exception("Error: Invalid .xml File. Missing <Root>");
-            configNode = rootNode.FirstChild;
-            if (configNode.Name != "Config")
+            configNode = rootNode.FirstChild;
-                throw new Exception("Error: Invalid .xml File. <Root> first child should be <Config>");
+            if (configNode.Name != "Config")
+                throw new Exception("Error: Invalid .xml File. <Root> first child should be <Config>");
-            if (createdFile)
-            {
+            if (createdFile)
-                this.Commit();
+            {
-            }
+                this.Commit();
-        }
+            }
+        }
-        public string GetAttribute(string attributeName)
-        {
+        public string GetAttribute(string attributeName)
-            string result = "";
+        {
-            if (configNode.Attributes[attributeName] != null)
+            string result = null;
-            {
+            if (configNode.Attributes[attributeName] != null)
-                result = ((XmlAttribute)configNode.Attributes.GetNamedItem(attributeName)).Value;
+            {
-            }
+                result = ((XmlAttribute)configNode.Attributes.GetNamedItem(attributeName)).Value;
-            return result;
+            }
-        }
+            return result;
+        }
-        public bool SetAttribute(string attributeName, string attributeValue)
-        {
+        public bool SetAttribute(string attributeName, string attributeValue)
-            if (configNode.Attributes[attributeName] != null)
+        {
-            {
+            if (configNode.Attributes[attributeName] != null)
-                ((XmlAttribute)configNode.Attributes.GetNamedItem(attributeName)).Value = attributeValue;
+            {
-            }
+                ((XmlAttribute)configNode.Attributes.GetNamedItem(attributeName)).Value = attributeValue;
-            else
+            }
-            {
+            else
-                XmlAttribute attri;
+            {
-                attri = doc.CreateAttribute(attributeName);
+                XmlAttribute attri;
-                attri.Value = attributeValue;
+                attri = doc.CreateAttribute(attributeName);
-                configNode.Attributes.Append(attri);
+                attri.Value = attributeValue;
-            }
+                configNode.Attributes.Append(attri);
-            return true;
+            }
-        }
+            return true;
+        }
-        public void Commit()
-        {
+        public void Commit()
-            doc.Save(fileName);
+        {
-        }
+            doc.Save(fileName);
+        }
-        public void Close()
-        {
+        public void Close()
-            configNode = null;
+        {
-            rootNode = null;
+            configNode = null;
-            doc = null;
+            rootNode = null;
-        }
+            doc = null;
+        }
-    }
-}
+    }
+}

diff --git a/OpenSim/Framework/GenericConfig/Xml/XmlConfig.cs b/OpenSim/Framework/General/Configuration/XmlConfiguration.cs index 2ed8d28..e1f3816 100644 --- a/OpenSim/Framework/GenericConfig/Xml/XmlConfig.cs +++ b/OpenSim/Framework/General/Configuration/XmlConfiguration.cs
@@ -1,122 +1,123 @@
1	/*	1	/*
2	* Copyright (c) Contributors, http://www.openmetaverse.org/	2	* Copyright (c) Contributors, http://www.openmetaverse.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;	28	using System;
29	using System.IO;	29	using System.IO;
30	using System.Xml;	30	using System.Xml;
31	using OpenSim.Framework.Interfaces;	31
32		32	using OpenSim.Framework.Interfaces;
33	namespace OpenSim.GenericConfig	33
34	{	34	namespace OpenSim.Framework.Configuration
35	public class XmlConfig : IGenericConfig	35	{
36	{	36	public class XmlConfiguration : IGenericConfig
37	private XmlDocument doc;	37	{
38	private XmlNode rootNode;	38	private XmlDocument doc;
39	private XmlNode configNode;	39	private XmlNode rootNode;
40	private string fileName;	40	private XmlNode configNode;
41	private bool createdFile = false;	41	private string fileName;
42		42	private bool createdFile = false;
43	public XmlConfig(string filename)	43
44	{	44	public XmlConfiguration(string filename)
45	fileName = filename;	45	{
46	}	46	fileName = filename;
47		47	}
48	public void LoadData()	48
49	{	49	public void LoadData()
50	doc = new XmlDocument();	50	{
51		51	doc = new XmlDocument();
52	if (File.Exists(fileName))	52
53	{	53	if (File.Exists(fileName))
54	XmlTextReader reader = new XmlTextReader(fileName);	54	{
55	reader.WhitespaceHandling = WhitespaceHandling.None;	55	XmlTextReader reader = new XmlTextReader(fileName);
56	doc.Load(reader);	56	reader.WhitespaceHandling = WhitespaceHandling.None;
57	reader.Close();	57	doc.Load(reader);
58	}	58	reader.Close();
59	else	59	}
60	{	60	else
61	createdFile = true;	61	{
62	rootNode = doc.CreateNode(XmlNodeType.Element, "Root", "");	62	createdFile = true;
63	doc.AppendChild(rootNode);	63	rootNode = doc.CreateNode(XmlNodeType.Element, "Root", "");
64	configNode = doc.CreateNode(XmlNodeType.Element, "Config", "");	64	doc.AppendChild(rootNode);
65	rootNode.AppendChild(configNode);	65	configNode = doc.CreateNode(XmlNodeType.Element, "Config", "");
66	}	66	rootNode.AppendChild(configNode);
67		67	}
68		68
69	rootNode = doc.FirstChild;	69
70	if (rootNode.Name != "Root")	70	rootNode = doc.FirstChild;
71	throw new Exception("Error: Invalid .xml File. Missing <Root>");	71	if (rootNode.Name != "Root")
72		72	throw new Exception("Error: Invalid .xml File. Missing <Root>");
73	configNode = rootNode.FirstChild;	73
74	if (configNode.Name != "Config")	74	configNode = rootNode.FirstChild;
75	throw new Exception("Error: Invalid .xml File. <Root> first child should be <Config>");	75	if (configNode.Name != "Config")
76		76	throw new Exception("Error: Invalid .xml File. <Root> first child should be <Config>");
77	if (createdFile)	77
78	{	78	if (createdFile)
79	this.Commit();	79	{
80	}	80	this.Commit();
81	}	81	}
82		82	}
83	public string GetAttribute(string attributeName)	83
84	{	84	public string GetAttribute(string attributeName)
85	string result = "";	85	{
86	if (configNode.Attributes[attributeName] != null)	86	string result = null;
87	{	87	if (configNode.Attributes[attributeName] != null)
88	result = ((XmlAttribute)configNode.Attributes.GetNamedItem(attributeName)).Value;	88	{
89	}	89	result = ((XmlAttribute)configNode.Attributes.GetNamedItem(attributeName)).Value;
90	return result;	90	}
91	}	91	return result;
92		92	}
93	public bool SetAttribute(string attributeName, string attributeValue)	93
94	{	94	public bool SetAttribute(string attributeName, string attributeValue)
95	if (configNode.Attributes[attributeName] != null)	95	{
96	{	96	if (configNode.Attributes[attributeName] != null)
97	((XmlAttribute)configNode.Attributes.GetNamedItem(attributeName)).Value = attributeValue;	97	{
98	}	98	((XmlAttribute)configNode.Attributes.GetNamedItem(attributeName)).Value = attributeValue;
99	else	99	}
100	{	100	else
101	XmlAttribute attri;	101	{
102	attri = doc.CreateAttribute(attributeName);	102	XmlAttribute attri;
103	attri.Value = attributeValue;	103	attri = doc.CreateAttribute(attributeName);
104	configNode.Attributes.Append(attri);	104	attri.Value = attributeValue;
105	}	105	configNode.Attributes.Append(attri);
106	return true;	106	}
107	}	107	return true;
108		108	}
109	public void Commit()	109
110	{	110	public void Commit()
111	doc.Save(fileName);	111	{
112	}	112	doc.Save(fileName);
113		113	}
114	public void Close()	114
115	{	115	public void Close()
116	configNode = null;	116	{
117	rootNode = null;	117	configNode = null;
118	doc = null;	118	rootNode = null;
119	}	119	doc = null;
120		120	}
121	}	121
122	}	122	}
		123	}