as per the "Filesystem cleanup for OpenSim repository" mailing list thread. Have flattened the OpenSim.Framework project/namespace. The problem is that the namespace is still wrong as its "OpenSim.Framework" while the directory is "OpenSim\Framework\General" , so we need to decide if we change the directory or correct the namespace.

Note this has lead to a big flat project, but I think a lot of the files we most likely don't even use any longer. And others belong in other projects/namespaces anyway.
author: MW 2007-10-29 21:46:25 +0000
committer: MW 2007-10-29 21:46:25 +0000
commit: 3d8219f6c7faa256d6a13ab7925f75d83af95b78 (patch)
tree: ea507efa88aa7e526575469a6ce913fdc0c0358e /OpenSim/Framework/General/Configuration/UserConfig.cs
parent: Fixed a bug in SQLAssetServer that only seemed to be a problem when running u... (diff)
download: opensim-SC_OLD-3d8219f6c7faa256d6a13ab7925f75d83af95b78.zip
opensim-SC_OLD-3d8219f6c7faa256d6a13ab7925f75d83af95b78.tar.gz
opensim-SC_OLD-3d8219f6c7faa256d6a13ab7925f75d83af95b78.tar.bz2
opensim-SC_OLD-3d8219f6c7faa256d6a13ab7925f75d83af95b78.tar.xz
1 files changed, 98 insertions, 98 deletions
diff --git a/OpenSim/Framework/General/Configuration/UserConfig.cs b/OpenSim/Framework/General/UserConfig.cs
index d664e94..3d79fc9 100644
--- a/OpenSim/Framework/General/Configuration/UserConfig.cs
+++ b/OpenSim/Framework/General/UserConfig.cs
@@ -1,98 +1,98 @@
-/*
+/*
-* 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;
+using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
-using System.Text;
+using System.Text;
-namespace OpenSim.Framework.Configuration
+namespace OpenSim.Framework
-{
+{
-    /// <summary>
+    /// <summary>
-    /// UserConfig -- For User Server Configuration
+    /// UserConfig -- For User Server Configuration
-    /// </summary>
+    /// </summary>
-    public class UserConfig
+    public class UserConfig
-    {
+    {
-        public string DefaultStartupMsg = "";
+        public string DefaultStartupMsg = "";
-        public string GridServerURL = "";
+        public string GridServerURL = "";
-        public string GridSendKey = "";
+        public string GridSendKey = "";
-        public string GridRecvKey = "";
+        public string GridRecvKey = "";
-        public string DatabaseProvider = "";
+        public string DatabaseProvider = "";
-        public static uint DefaultHttpPort = 8002;
+        public static uint DefaultHttpPort = 8002;
-        public uint HttpPort = DefaultHttpPort;
+        public uint HttpPort = DefaultHttpPort;
-        private ConfigurationMember configMember;
+        private ConfigurationMember configMember;
-        public UserConfig(string description, string filename)
+        public UserConfig(string description, string filename)
-        {
+        {
-            configMember = new ConfigurationMember(filename, description, this.loadConfigurationOptions, this.handleIncomingConfiguration);
+            configMember = new ConfigurationMember(filename, description, this.loadConfigurationOptions, this.handleIncomingConfiguration);
-            configMember.performConfigurationRetrieve();
+            configMember.performConfigurationRetrieve();
-        }
+        }
-        public void loadConfigurationOptions()
+        public void loadConfigurationOptions()
-        {
+        {
-            configMember.addConfigurationOption("default_startup_message", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Default Startup Message", "Welcome to OGS", false);
+            configMember.addConfigurationOption("default_startup_message", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Default Startup Message", "Welcome to OGS", false);
-            configMember.addConfigurationOption("default_grid_server", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Default Grid Server URI", "http://127.0.0.1:" + GridConfig.DefaultHttpPort.ToString() + "/", false);
+            configMember.addConfigurationOption("default_grid_server", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Default Grid Server URI", "http://127.0.0.1:" + GridConfig.DefaultHttpPort.ToString() + "/", false);
-            configMember.addConfigurationOption("grid_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to send to grid server", "null", false);
+            configMember.addConfigurationOption("grid_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to send to grid server", "null", false);
-            configMember.addConfigurationOption("grid_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to expect from grid server", "null", false);
+            configMember.addConfigurationOption("grid_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to expect from grid server", "null", false);
-            configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "DLL for database provider", "OpenSim.Framework.Data.MySQL.dll", false);
+            configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "DLL for database provider", "OpenSim.Framework.Data.MySQL.dll", false);
-            configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, "Http Listener port", DefaultHttpPort.ToString(), false);
+            configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, "Http Listener port", DefaultHttpPort.ToString(), false);
-        }
+        }
-        public bool handleIncomingConfiguration(string configuration_key, object configuration_result)
+        public bool handleIncomingConfiguration(string configuration_key, object configuration_result)
-        {
+        {
-            switch (configuration_key)
+            switch (configuration_key)
-            {
+            {
-                case "default_startup_message":
+                case "default_startup_message":
-                    this.DefaultStartupMsg = (string)configuration_result;
+                    this.DefaultStartupMsg = (string)configuration_result;
-                    break;
+                    break;
-                case "default_grid_server":
+                case "default_grid_server":
-                    this.GridServerURL = (string)configuration_result;
+                    this.GridServerURL = (string)configuration_result;
-                    break;
+                    break;
-                case "grid_send_key":
+                case "grid_send_key":
-                    this.GridSendKey = (string)configuration_result;
+                    this.GridSendKey = (string)configuration_result;
-                    break;
+                    break;
-                case "grid_recv_key":
+                case "grid_recv_key":
-                    this.GridRecvKey = (string)configuration_result;
+                    this.GridRecvKey = (string)configuration_result;
-                    break;
+                    break;
-                case "database_provider":
+                case "database_provider":
-                    this.DatabaseProvider = (string)configuration_result;
+                    this.DatabaseProvider = (string)configuration_result;
-                    break;
+                    break;
-                case "http_port":
+                case "http_port":
-                    HttpPort = (uint)configuration_result;
+                    HttpPort = (uint)configuration_result;
-                    break;
+                    break;
-            }
+            }
-            return true;
+            return true;
-        }
+        }
-    }
+    }
-}
+}
author	MW	2007-10-29 21:46:25 +0000
committer	MW	2007-10-29 21:46:25 +0000
commit	3d8219f6c7faa256d6a13ab7925f75d83af95b78 (patch)
tree	ea507efa88aa7e526575469a6ce913fdc0c0358e /OpenSim/Framework/General/Configuration/UserConfig.cs
parent	Fixed a bug in SQLAssetServer that only seemed to be a problem when running u... (diff)
download	opensim-SC_OLD-3d8219f6c7faa256d6a13ab7925f75d83af95b78.zip opensim-SC_OLD-3d8219f6c7faa256d6a13ab7925f75d83af95b78.tar.gz opensim-SC_OLD-3d8219f6c7faa256d6a13ab7925f75d83af95b78.tar.bz2 opensim-SC_OLD-3d8219f6c7faa256d6a13ab7925f75d83af95b78.tar.xz

diff --git a/OpenSim/Framework/General/Configuration/UserConfig.cs b/OpenSim/Framework/General/UserConfig.cs index d664e94..3d79fc9 100644 --- a/OpenSim/Framework/General/Configuration/UserConfig.cs +++ b/OpenSim/Framework/General/UserConfig.cs
@@ -1,98 +1,98 @@
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		28
29	using System;	29	using System;
30	using System.Collections.Generic;	30	using System.Collections.Generic;
31	using System.Text;	31	using System.Text;
32		32
33	namespace OpenSim.Framework.Configuration	33	namespace OpenSim.Framework
34	{	34	{
35	/// <summary>	35	/// <summary>
36	/// UserConfig -- For User Server Configuration	36	/// UserConfig -- For User Server Configuration
37	/// </summary>	37	/// </summary>
38	public class UserConfig	38	public class UserConfig
39	{	39	{
40	public string DefaultStartupMsg = "";	40	public string DefaultStartupMsg = "";
41	public string GridServerURL = "";	41	public string GridServerURL = "";
42	public string GridSendKey = "";	42	public string GridSendKey = "";
43	public string GridRecvKey = "";	43	public string GridRecvKey = "";
44		44
45	public string DatabaseProvider = "";	45	public string DatabaseProvider = "";
46		46
47	public static uint DefaultHttpPort = 8002;	47	public static uint DefaultHttpPort = 8002;
48	public uint HttpPort = DefaultHttpPort;	48	public uint HttpPort = DefaultHttpPort;
49		49
50	private ConfigurationMember configMember;	50	private ConfigurationMember configMember;
51		51
52	public UserConfig(string description, string filename)	52	public UserConfig(string description, string filename)
53	{	53	{
54	configMember = new ConfigurationMember(filename, description, this.loadConfigurationOptions, this.handleIncomingConfiguration);	54	configMember = new ConfigurationMember(filename, description, this.loadConfigurationOptions, this.handleIncomingConfiguration);
55	configMember.performConfigurationRetrieve();	55	configMember.performConfigurationRetrieve();
56	}	56	}
57		57
58	public void loadConfigurationOptions()	58	public void loadConfigurationOptions()
59	{	59	{
60	configMember.addConfigurationOption("default_startup_message", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Default Startup Message", "Welcome to OGS", false);	60	configMember.addConfigurationOption("default_startup_message", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Default Startup Message", "Welcome to OGS", false);
61		61
62	configMember.addConfigurationOption("default_grid_server", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Default Grid Server URI", "http://127.0.0.1:" + GridConfig.DefaultHttpPort.ToString() + "/", false);	62	configMember.addConfigurationOption("default_grid_server", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Default Grid Server URI", "http://127.0.0.1:" + GridConfig.DefaultHttpPort.ToString() + "/", false);
63	configMember.addConfigurationOption("grid_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to send to grid server", "null", false);	63	configMember.addConfigurationOption("grid_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to send to grid server", "null", false);
64	configMember.addConfigurationOption("grid_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to expect from grid server", "null", false);	64	configMember.addConfigurationOption("grid_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to expect from grid server", "null", false);
65	configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "DLL for database provider", "OpenSim.Framework.Data.MySQL.dll", false);	65	configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "DLL for database provider", "OpenSim.Framework.Data.MySQL.dll", false);
66		66
67	configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, "Http Listener port", DefaultHttpPort.ToString(), false);	67	configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, "Http Listener port", DefaultHttpPort.ToString(), false);
68		68
69	}	69	}
70		70
71	public bool handleIncomingConfiguration(string configuration_key, object configuration_result)	71	public bool handleIncomingConfiguration(string configuration_key, object configuration_result)
72	{	72	{
73	switch (configuration_key)	73	switch (configuration_key)
74	{	74	{
75	case "default_startup_message":	75	case "default_startup_message":
76	this.DefaultStartupMsg = (string)configuration_result;	76	this.DefaultStartupMsg = (string)configuration_result;
77	break;	77	break;
78	case "default_grid_server":	78	case "default_grid_server":
79	this.GridServerURL = (string)configuration_result;	79	this.GridServerURL = (string)configuration_result;
80	break;	80	break;
81	case "grid_send_key":	81	case "grid_send_key":
82	this.GridSendKey = (string)configuration_result;	82	this.GridSendKey = (string)configuration_result;
83	break;	83	break;
84	case "grid_recv_key":	84	case "grid_recv_key":
85	this.GridRecvKey = (string)configuration_result;	85	this.GridRecvKey = (string)configuration_result;
86	break;	86	break;
87	case "database_provider":	87	case "database_provider":
88	this.DatabaseProvider = (string)configuration_result;	88	this.DatabaseProvider = (string)configuration_result;
89	break;	89	break;
90	case "http_port":	90	case "http_port":
91	HttpPort = (uint)configuration_result;	91	HttpPort = (uint)configuration_result;
92	break;	92	break;
93	}	93	}
94		94
95	return true;	95	return true;
96	}	96	}
97	}	97	}
98	}	98	}