aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Grid')
-rw-r--r--OpenSim/Grid/AssetServer/AssetHttpServer.cs15
-rw-r--r--OpenSim/Grid/AssetServer/Main.cs24
-rw-r--r--OpenSim/Grid/AssetServer/Properties/AssemblyInfo.cs2
-rw-r--r--OpenSim/Grid/Framework.Manager/GridManagementAgent.cs6
-rw-r--r--OpenSim/Grid/Framework.Manager/GridServerManager.cs3
-rw-r--r--OpenSim/Grid/GridServer.Config/AssemblyInfo.cs2
-rw-r--r--OpenSim/Grid/GridServer.Config/DbGridConfig.cs55
-rw-r--r--OpenSim/Grid/GridServer/GridManager.cs41
-rw-r--r--OpenSim/Grid/GridServer/Main.cs14
-rw-r--r--OpenSim/Grid/GridServer/Properties/AssemblyInfo.cs2
-rw-r--r--OpenSim/Grid/UserServer.Config/AssemblyInfo.cs2
-rw-r--r--OpenSim/Grid/UserServer.Config/DbUserConfig.cs35
-rw-r--r--OpenSim/Grid/UserServer/Main.cs17
-rw-r--r--OpenSim/Grid/UserServer/Properties/AssemblyInfo.cs2
-rw-r--r--OpenSim/Grid/UserServer/UserManager.cs13
15 files changed, 90 insertions, 143 deletions
diff --git a/OpenSim/Grid/AssetServer/AssetHttpServer.cs b/OpenSim/Grid/AssetServer/AssetHttpServer.cs
index 31cb379..9546891 100644
--- a/OpenSim/Grid/AssetServer/AssetHttpServer.cs
+++ b/OpenSim/Grid/AssetServer/AssetHttpServer.cs
@@ -26,15 +26,10 @@
26* 26*
27*/ 27*/
28using System; 28using System;
29using System.Collections.Generic; 29using System.IO;
30using System.Net; 30using System.Net;
31using System.Text; 31using System.Text;
32using System.Text.RegularExpressions; 32using System.Text.RegularExpressions;
33using System.Threading;
34//using OpenSim.CAPS;
35using Nwc.XmlRpc;
36using System.Collections;
37using OpenSim.Framework.Console;
38using OpenSim.Framework.Servers; 33using OpenSim.Framework.Servers;
39 34
40namespace OpenSim.Grid.AssetServer 35namespace OpenSim.Grid.AssetServer
@@ -69,9 +64,9 @@ namespace OpenSim.Grid.AssetServer
69 response.KeepAlive = false; 64 response.KeepAlive = false;
70 response.SendChunked = false; 65 response.SendChunked = false;
71 66
72 System.IO.Stream body = request.InputStream; 67 Stream body = request.InputStream;
73 System.Text.Encoding encoding = System.Text.Encoding.UTF8; 68 Encoding encoding = Encoding.UTF8;
74 System.IO.StreamReader reader = new System.IO.StreamReader(body, encoding); 69 StreamReader reader = new StreamReader(body, encoding);
75 70
76 string requestBody = reader.ReadToEnd(); 71 string requestBody = reader.ReadToEnd();
77 body.Close(); 72 body.Close();
@@ -114,7 +109,7 @@ namespace OpenSim.Grid.AssetServer
114 109
115 Encoding Windows1252Encoding = Encoding.GetEncoding(1252); 110 Encoding Windows1252Encoding = Encoding.GetEncoding(1252);
116 byte[] buffer = Windows1252Encoding.GetBytes(responseString); 111 byte[] buffer = Windows1252Encoding.GetBytes(responseString);
117 System.IO.Stream output = response.OutputStream; 112 Stream output = response.OutputStream;
118 response.SendChunked = false; 113 response.SendChunked = false;
119 response.ContentLength64 = buffer.Length; 114 response.ContentLength64 = buffer.Length;
120 output.Write(buffer, 0, buffer.Length); 115 output.Write(buffer, 0, buffer.Length);
diff --git a/OpenSim/Grid/AssetServer/Main.cs b/OpenSim/Grid/AssetServer/Main.cs
index d06998d..112d72f 100644
--- a/OpenSim/Grid/AssetServer/Main.cs
+++ b/OpenSim/Grid/AssetServer/Main.cs
@@ -29,20 +29,10 @@
29using System; 29using System;
30using System.IO; 30using System.IO;
31using System.Text; 31using System.Text;
32using System.Timers; 32using Db4objects.Db4o;
33using System.Net;
34using System.Reflection;
35using System.Threading;
36using libsecondlife; 33using libsecondlife;
37using OpenSim.Framework;
38using OpenSim.Framework.Sims;
39using OpenSim.Framework.Console; 34using OpenSim.Framework.Console;
40using OpenSim.Framework.Types; 35using OpenSim.Framework.Types;
41using OpenSim.Framework.Interfaces;
42using OpenSim.Framework.Utilities;
43using OpenSim.Framework.Servers;
44using Db4objects.Db4o;
45using Db4objects.Db4o.Query;
46 36
47namespace OpenSim.Grid.AssetServer 37namespace OpenSim.Grid.AssetServer
48{ 38{
@@ -81,7 +71,7 @@ namespace OpenSim.Grid.AssetServer
81 private OpenAsset_Main() 71 private OpenAsset_Main()
82 { 72 {
83 m_console = new LogBase("opengrid-AssetServer-console.log", "OpenAsset", this, false); 73 m_console = new LogBase("opengrid-AssetServer-console.log", "OpenAsset", this, false);
84 OpenSim.Framework.Console.MainLog.Instance = m_console; 74 MainLog.Instance = m_console;
85 } 75 }
86 76
87 public void Startup() 77 public void Startup()
@@ -161,17 +151,17 @@ namespace OpenSim.Grid.AssetServer
161 151
162 public void setupDB() 152 public void setupDB()
163 { 153 {
164 bool yapfile = System.IO.File.Exists("assets.yap"); 154 bool yapfile = File.Exists("assets.yap");
165 try 155 try
166 { 156 {
167 db = Db4oFactory.OpenFile("assets.yap"); 157 db = Db4oFactory.OpenFile("assets.yap");
168 OpenSim.Framework.Console.MainLog.Instance.Verbose( "Main.cs:setupDB() - creation"); 158 MainLog.Instance.Verbose( "Main.cs:setupDB() - creation");
169 } 159 }
170 catch (Exception e) 160 catch (Exception e)
171 { 161 {
172 db.Close(); 162 db.Close();
173 OpenSim.Framework.Console.MainLog.Instance.Warn("Main.cs:setupDB() - Exception occured"); 163 MainLog.Instance.Warn("Main.cs:setupDB() - Exception occured");
174 OpenSim.Framework.Console.MainLog.Instance.Warn(e.ToString()); 164 MainLog.Instance.Warn(e.ToString());
175 } 165 }
176 if (!yapfile) 166 if (!yapfile)
177 { 167 {
@@ -273,7 +263,7 @@ namespace OpenSim.Grid.AssetServer
273 { 263 {
274 264
275 265
276 string dataPath = Path.Combine(System.AppDomain.CurrentDomain.BaseDirectory, "assets"); //+ folder; 266 string dataPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "assets"); //+ folder;
277 string fileName = Path.Combine(dataPath, filename); 267 string fileName = Path.Combine(dataPath, filename);
278 FileInfo fInfo = new FileInfo(fileName); 268 FileInfo fInfo = new FileInfo(fileName);
279 long numBytes = fInfo.Length; 269 long numBytes = fInfo.Length;
diff --git a/OpenSim/Grid/AssetServer/Properties/AssemblyInfo.cs b/OpenSim/Grid/AssetServer/Properties/AssemblyInfo.cs
index f9a18a8..dc39ce2 100644
--- a/OpenSim/Grid/AssetServer/Properties/AssemblyInfo.cs
+++ b/OpenSim/Grid/AssetServer/Properties/AssemblyInfo.cs
@@ -26,9 +26,7 @@
26* 26*
27*/ 27*/
28using System.Reflection; 28using System.Reflection;
29using System.Runtime.CompilerServices;
30using System.Runtime.InteropServices; 29using System.Runtime.InteropServices;
31
32// General Information about an assembly is controlled through the following 30// General Information about an assembly is controlled through the following
33// set of attributes. Change these attribute values to modify the information 31// set of attributes. Change these attribute values to modify the information
34// associated with an assembly. 32// associated with an assembly.
diff --git a/OpenSim/Grid/Framework.Manager/GridManagementAgent.cs b/OpenSim/Grid/Framework.Manager/GridManagementAgent.cs
index 3f5d7dd..6c916a2 100644
--- a/OpenSim/Grid/Framework.Manager/GridManagementAgent.cs
+++ b/OpenSim/Grid/Framework.Manager/GridManagementAgent.cs
@@ -25,12 +25,10 @@
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*/
28using Nwc.XmlRpc;
29using OpenSim.Framework;
30using OpenSim.Framework.Servers;
31using System.Collections; 28using System.Collections;
32using System.Collections.Generic;
33using libsecondlife; 29using libsecondlife;
30using Nwc.XmlRpc;
31using OpenSim.Framework.Servers;
34 32
35namespace OpenSim.Framework.Manager 33namespace OpenSim.Framework.Manager
36{ 34{
diff --git a/OpenSim/Grid/Framework.Manager/GridServerManager.cs b/OpenSim/Grid/Framework.Manager/GridServerManager.cs
index d5eaf6f..67cd35d 100644
--- a/OpenSim/Grid/Framework.Manager/GridServerManager.cs
+++ b/OpenSim/Grid/Framework.Manager/GridServerManager.cs
@@ -28,10 +28,9 @@
28 28
29using System; 29using System;
30using System.Collections; 30using System.Collections;
31using System.Collections.Generic;
32using Nwc.XmlRpc;
33using System.Threading; 31using System.Threading;
34using libsecondlife; 32using libsecondlife;
33using Nwc.XmlRpc;
35 34
36namespace OpenSim.Framework.Manager { 35namespace OpenSim.Framework.Manager {
37 36
diff --git a/OpenSim/Grid/GridServer.Config/AssemblyInfo.cs b/OpenSim/Grid/GridServer.Config/AssemblyInfo.cs
index c9701d6..39c9e8f 100644
--- a/OpenSim/Grid/GridServer.Config/AssemblyInfo.cs
+++ b/OpenSim/Grid/GridServer.Config/AssemblyInfo.cs
@@ -26,9 +26,7 @@
26* 26*
27*/ 27*/
28using System.Reflection; 28using System.Reflection;
29using System.Runtime.CompilerServices;
30using System.Runtime.InteropServices; 29using System.Runtime.InteropServices;
31
32// Information about this assembly is defined by the following 30// Information about this assembly is defined by the following
33// attributes. 31// attributes.
34// 32//
diff --git a/OpenSim/Grid/GridServer.Config/DbGridConfig.cs b/OpenSim/Grid/GridServer.Config/DbGridConfig.cs
index 2218004..4acf81d 100644
--- a/OpenSim/Grid/GridServer.Config/DbGridConfig.cs
+++ b/OpenSim/Grid/GridServer.Config/DbGridConfig.cs
@@ -26,10 +26,9 @@
26* 26*
27*/ 27*/
28using System; 28using System;
29using System.Collections.Generic; 29using Db4objects.Db4o;
30using OpenSim.Framework.Console; 30using OpenSim.Framework.Console;
31using OpenSim.Framework.Interfaces; 31using OpenSim.Framework.Interfaces;
32using Db4objects.Db4o;
33 32
34namespace OpenGrid.Config.GridConfigDb4o 33namespace OpenGrid.Config.GridConfigDb4o
35{ 34{
@@ -44,7 +43,7 @@ namespace OpenGrid.Config.GridConfigDb4o
44 /// <returns>A grid configuration object</returns> 43 /// <returns>A grid configuration object</returns>
45 public GridConfig GetConfigObject() 44 public GridConfig GetConfigObject()
46 { 45 {
47 OpenSim.Framework.Console.MainLog.Instance.Verbose("Loading Db40Config dll"); 46 MainLog.Instance.Verbose("Loading Db40Config dll");
48 return ( new DbGridConfig()); 47 return ( new DbGridConfig());
49 } 48 }
50 } 49 }
@@ -63,24 +62,24 @@ namespace OpenGrid.Config.GridConfigDb4o
63 /// User configuration for the Grid Config interfaces 62 /// User configuration for the Grid Config interfaces
64 /// </summary> 63 /// </summary>
65 public void LoadDefaults() { 64 public void LoadDefaults() {
66 OpenSim.Framework.Console.MainLog.Instance.Notice("Config.cs:LoadDefaults() - Please press enter to retain default or enter new settings"); 65 MainLog.Instance.Notice("Config.cs:LoadDefaults() - Please press enter to retain default or enter new settings");
67 66
68 // About the grid options 67 // About the grid options
69 this.GridOwner = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Grid owner", "OGS development team"); 68 this.GridOwner = MainLog.Instance.CmdPrompt("Grid owner", "OGS development team");
70 69
71 // Asset Options 70 // Asset Options
72 this.DefaultAssetServer = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Default asset server","http://127.0.0.1:8003/"); 71 this.DefaultAssetServer = MainLog.Instance.CmdPrompt("Default asset server","http://127.0.0.1:8003/");
73 this.AssetSendKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to send to asset server","null"); 72 this.AssetSendKey = MainLog.Instance.CmdPrompt("Key to send to asset server","null");
74 this.AssetRecvKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to expect from asset server","null"); 73 this.AssetRecvKey = MainLog.Instance.CmdPrompt("Key to expect from asset server","null");
75 74
76 // User Server Options 75 // User Server Options
77 this.DefaultUserServer = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Default user server","http://127.0.0.1:8002/"); 76 this.DefaultUserServer = MainLog.Instance.CmdPrompt("Default user server","http://127.0.0.1:8002/");
78 this.UserSendKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to send to user server","null"); 77 this.UserSendKey = MainLog.Instance.CmdPrompt("Key to send to user server","null");
79 this.UserRecvKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to expect from user server","null"); 78 this.UserRecvKey = MainLog.Instance.CmdPrompt("Key to expect from user server","null");
80 79
81 // Region Server Options 80 // Region Server Options
82 this.SimSendKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to send to sims","null"); 81 this.SimSendKey = MainLog.Instance.CmdPrompt("Key to send to sims","null");
83 this.SimRecvKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to expect from sims","null"); 82 this.SimRecvKey = MainLog.Instance.CmdPrompt("Key to expect from sims","null");
84 } 83 }
85 84
86 /// <summary> 85 /// <summary>
@@ -95,7 +94,7 @@ namespace OpenGrid.Config.GridConfigDb4o
95 IObjectSet result = db.Get(typeof(DbGridConfig)); 94 IObjectSet result = db.Get(typeof(DbGridConfig));
96 // Found? 95 // Found?
97 if(result.Count==1) { 96 if(result.Count==1) {
98 OpenSim.Framework.Console.MainLog.Instance.Verbose("Config.cs:InitConfig() - Found a GridConfig object in the local database, loading"); 97 MainLog.Instance.Verbose("Config.cs:InitConfig() - Found a GridConfig object in the local database, loading");
99 foreach (DbGridConfig cfg in result) { 98 foreach (DbGridConfig cfg in result) {
100 // Import each setting into this class 99 // Import each setting into this class
101 // Grid Settings 100 // Grid Settings
@@ -114,40 +113,40 @@ namespace OpenGrid.Config.GridConfigDb4o
114 } 113 }
115 // Create a new configuration object from this class 114 // Create a new configuration object from this class
116 } else { 115 } else {
117 OpenSim.Framework.Console.MainLog.Instance.Verbose("Config.cs:InitConfig() - Could not find object in database, loading precompiled defaults"); 116 MainLog.Instance.Verbose("Config.cs:InitConfig() - Could not find object in database, loading precompiled defaults");
118 117
119 // Load default settings into this class 118 // Load default settings into this class
120 LoadDefaults(); 119 LoadDefaults();
121 120
122 // Saves to the database file... 121 // Saves to the database file...
123 OpenSim.Framework.Console.MainLog.Instance.Verbose( "Writing out default settings to local database"); 122 MainLog.Instance.Verbose( "Writing out default settings to local database");
124 db.Set(this); 123 db.Set(this);
125 124
126 // Closes file locks 125 // Closes file locks
127 db.Close(); 126 db.Close();
128 } 127 }
129 } catch(Exception e) { 128 } catch(Exception e) {
130 OpenSim.Framework.Console.MainLog.Instance.Warn("Config.cs:InitConfig() - Exception occured"); 129 MainLog.Instance.Warn("Config.cs:InitConfig() - Exception occured");
131 OpenSim.Framework.Console.MainLog.Instance.Warn(e.ToString()); 130 MainLog.Instance.Warn(e.ToString());
132 } 131 }
133 132
134 // Grid Settings 133 // Grid Settings
135 OpenSim.Framework.Console.MainLog.Instance.Verbose("Grid settings loaded:"); 134 MainLog.Instance.Verbose("Grid settings loaded:");
136 OpenSim.Framework.Console.MainLog.Instance.Verbose("Grid owner: " + this.GridOwner); 135 MainLog.Instance.Verbose("Grid owner: " + this.GridOwner);
137 136
138 // Asset Settings 137 // Asset Settings
139 OpenSim.Framework.Console.MainLog.Instance.Verbose("Default asset server: " + this.DefaultAssetServer); 138 MainLog.Instance.Verbose("Default asset server: " + this.DefaultAssetServer);
140 OpenSim.Framework.Console.MainLog.Instance.Verbose("Key to send to asset server: " + this.AssetSendKey); 139 MainLog.Instance.Verbose("Key to send to asset server: " + this.AssetSendKey);
141 OpenSim.Framework.Console.MainLog.Instance.Verbose("Key to expect from asset server: " + this.AssetRecvKey); 140 MainLog.Instance.Verbose("Key to expect from asset server: " + this.AssetRecvKey);
142 141
143 // User Settings 142 // User Settings
144 OpenSim.Framework.Console.MainLog.Instance.Verbose("Default user server: " + this.DefaultUserServer); 143 MainLog.Instance.Verbose("Default user server: " + this.DefaultUserServer);
145 OpenSim.Framework.Console.MainLog.Instance.Verbose("Key to send to user server: " + this.UserSendKey); 144 MainLog.Instance.Verbose("Key to send to user server: " + this.UserSendKey);
146 OpenSim.Framework.Console.MainLog.Instance.Verbose("Key to expect from user server: " + this.UserRecvKey); 145 MainLog.Instance.Verbose("Key to expect from user server: " + this.UserRecvKey);
147 146
148 // Region Settings 147 // Region Settings
149 OpenSim.Framework.Console.MainLog.Instance.Verbose("Key to send to sims: " + this.SimSendKey); 148 MainLog.Instance.Verbose("Key to send to sims: " + this.SimSendKey);
150 OpenSim.Framework.Console.MainLog.Instance.Verbose("Key to expect from sims: " + this.SimRecvKey); 149 MainLog.Instance.Verbose("Key to expect from sims: " + this.SimRecvKey);
151 } 150 }
152 151
153 /// <summary> 152 /// <summary>
diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs
index e562721..7986591 100644
--- a/OpenSim/Grid/GridServer/GridManager.cs
+++ b/OpenSim/Grid/GridServer/GridManager.cs
@@ -28,15 +28,14 @@
28using System; 28using System;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Text;
32using System.Reflection; 31using System.Reflection;
33using OpenSim.Framework.Data; 32using System.Xml;
34using OpenSim.Framework.Utilities;
35using OpenSim.Framework.Console;
36using OpenSim.Framework.Sims;
37using libsecondlife; 33using libsecondlife;
38using Nwc.XmlRpc; 34using Nwc.XmlRpc;
39using System.Xml; 35using OpenSim.Framework.Console;
36using OpenSim.Framework.Data;
37using OpenSim.Framework.Interfaces;
38using OpenSim.Framework.Utilities;
40 39
41namespace OpenSim.Grid.GridServer 40namespace OpenSim.Grid.GridServer
42{ 41{
@@ -45,7 +44,7 @@ namespace OpenSim.Grid.GridServer
45 Dictionary<string, IGridData> _plugins = new Dictionary<string, IGridData>(); 44 Dictionary<string, IGridData> _plugins = new Dictionary<string, IGridData>();
46 Dictionary<string, ILogData> _logplugins = new Dictionary<string, ILogData>(); 45 Dictionary<string, ILogData> _logplugins = new Dictionary<string, ILogData>();
47 46
48 public OpenSim.Framework.Interfaces.GridConfig config; 47 public GridConfig config;
49 48
50 /// <summary> 49 /// <summary>
51 /// Adds a new grid server plugin - grid servers will be requested in the order they were loaded. 50 /// Adds a new grid server plugin - grid servers will be requested in the order they were loaded.
@@ -53,10 +52,10 @@ namespace OpenSim.Grid.GridServer
53 /// <param name="FileName">The filename to the grid server plugin DLL</param> 52 /// <param name="FileName">The filename to the grid server plugin DLL</param>
54 public void AddPlugin(string FileName) 53 public void AddPlugin(string FileName)
55 { 54 {
56 OpenSim.Framework.Console.MainLog.Instance.Verbose("Storage: Attempting to load " + FileName); 55 MainLog.Instance.Verbose("Storage: Attempting to load " + FileName);
57 Assembly pluginAssembly = Assembly.LoadFrom(FileName); 56 Assembly pluginAssembly = Assembly.LoadFrom(FileName);
58 57
59 OpenSim.Framework.Console.MainLog.Instance.Verbose("Storage: Found " + pluginAssembly.GetTypes().Length + " interfaces."); 58 MainLog.Instance.Verbose("Storage: Found " + pluginAssembly.GetTypes().Length + " interfaces.");
60 foreach (Type pluginType in pluginAssembly.GetTypes()) 59 foreach (Type pluginType in pluginAssembly.GetTypes())
61 { 60 {
62 if (!pluginType.IsAbstract) 61 if (!pluginType.IsAbstract)
@@ -69,7 +68,7 @@ namespace OpenSim.Grid.GridServer
69 IGridData plug = (IGridData)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); 68 IGridData plug = (IGridData)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
70 plug.Initialise(); 69 plug.Initialise();
71 this._plugins.Add(plug.getName(), plug); 70 this._plugins.Add(plug.getName(), plug);
72 OpenSim.Framework.Console.MainLog.Instance.Verbose("Storage: Added IGridData Interface"); 71 MainLog.Instance.Verbose("Storage: Added IGridData Interface");
73 } 72 }
74 73
75 typeInterface = null; 74 typeInterface = null;
@@ -82,7 +81,7 @@ namespace OpenSim.Grid.GridServer
82 ILogData plug = (ILogData)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); 81 ILogData plug = (ILogData)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
83 plug.Initialise(); 82 plug.Initialise();
84 this._logplugins.Add(plug.getName(), plug); 83 this._logplugins.Add(plug.getName(), plug);
85 OpenSim.Framework.Console.MainLog.Instance.Verbose( "Storage: Added ILogData Interface"); 84 MainLog.Instance.Verbose( "Storage: Added ILogData Interface");
86 } 85 }
87 86
88 typeInterface = null; 87 typeInterface = null;
@@ -110,7 +109,7 @@ namespace OpenSim.Grid.GridServer
110 } 109 }
111 catch (Exception) 110 catch (Exception)
112 { 111 {
113 OpenSim.Framework.Console.MainLog.Instance.Warn("Storage: unable to write log via " + kvp.Key); 112 MainLog.Instance.Warn("Storage: unable to write log via " + kvp.Key);
114 } 113 }
115 } 114 }
116 } 115 }
@@ -120,7 +119,7 @@ namespace OpenSim.Grid.GridServer
120 /// </summary> 119 /// </summary>
121 /// <param name="uuid">A UUID key of the region to return</param> 120 /// <param name="uuid">A UUID key of the region to return</param>
122 /// <returns>A SimProfileData for the region</returns> 121 /// <returns>A SimProfileData for the region</returns>
123 public SimProfileData getRegion(libsecondlife.LLUUID uuid) 122 public SimProfileData getRegion(LLUUID uuid)
124 { 123 {
125 foreach(KeyValuePair<string,IGridData> kvp in _plugins) { 124 foreach(KeyValuePair<string,IGridData> kvp in _plugins) {
126 try 125 try
@@ -129,7 +128,7 @@ namespace OpenSim.Grid.GridServer
129 } 128 }
130 catch (Exception) 129 catch (Exception)
131 { 130 {
132 OpenSim.Framework.Console.MainLog.Instance.Warn("Storage: Unable to find region " + uuid.ToStringHyphenated() + " via " + kvp.Key); 131 MainLog.Instance.Warn("Storage: Unable to find region " + uuid.ToStringHyphenated() + " via " + kvp.Key);
133 } 132 }
134 } 133 }
135 return null; 134 return null;
@@ -150,7 +149,7 @@ namespace OpenSim.Grid.GridServer
150 } 149 }
151 catch 150 catch
152 { 151 {
153 OpenSim.Framework.Console.MainLog.Instance.Warn("Storage: Unable to find region " + handle.ToString() + " via " + kvp.Key); 152 MainLog.Instance.Warn("Storage: Unable to find region " + handle.ToString() + " via " + kvp.Key);
154 } 153 }
155 } 154 }
156 return null; 155 return null;
@@ -174,7 +173,7 @@ namespace OpenSim.Grid.GridServer
174 } 173 }
175 catch 174 catch
176 { 175 {
177 OpenSim.Framework.Console.MainLog.Instance.Warn("Storage: Unable to query regionblock via " + kvp.Key); 176 MainLog.Instance.Warn("Storage: Unable to query regionblock via " + kvp.Key);
178 } 177 }
179 } 178 }
180 179
@@ -370,7 +369,7 @@ namespace OpenSim.Grid.GridServer
370 369
371 simProfileList.Add(simProfileBlock); 370 simProfileList.Add(simProfileBlock);
372 } 371 }
373 OpenSim.Framework.Console.MainLog.Instance.Verbose("World map request processed, returned " + simProfileList.Count.ToString() + " region(s) in range via FastMode"); 372 MainLog.Instance.Verbose("World map request processed, returned " + simProfileList.Count.ToString() + " region(s) in range via FastMode");
374 } 373 }
375 else 374 else
376 { 375 {
@@ -403,7 +402,7 @@ namespace OpenSim.Grid.GridServer
403 } 402 }
404 } 403 }
405 } 404 }
406 OpenSim.Framework.Console.MainLog.Instance.Verbose("World map request processed, returned " + simProfileList.Count.ToString() + " region(s) in range via Standard Mode"); 405 MainLog.Instance.Verbose("World map request processed, returned " + simProfileList.Count.ToString() + " region(s) in range via Standard Mode");
407 } 406 }
408 407
409 responseData["sim-profiles"] = simProfileList; 408 responseData["sim-profiles"] = simProfileList;
@@ -565,7 +564,7 @@ namespace OpenSim.Grid.GridServer
565 564
566 try 565 try
567 { 566 {
568 OpenSim.Framework.Console.MainLog.Instance.Verbose("Updating / adding via " + _plugins.Count + " storage provider(s) registered."); 567 MainLog.Instance.Verbose("Updating / adding via " + _plugins.Count + " storage provider(s) registered.");
569 foreach (KeyValuePair<string, IGridData> kvp in _plugins) 568 foreach (KeyValuePair<string, IGridData> kvp in _plugins)
570 { 569 {
571 try 570 try
@@ -575,7 +574,7 @@ namespace OpenSim.Grid.GridServer
575 if ((reserveData != null && reserveData.gridRecvKey == TheSim.regionRecvKey) || (reserveData == null)) 574 if ((reserveData != null && reserveData.gridRecvKey == TheSim.regionRecvKey) || (reserveData == null))
576 { 575 {
577 kvp.Value.AddProfile(TheSim); 576 kvp.Value.AddProfile(TheSim);
578 OpenSim.Framework.Console.MainLog.Instance.Verbose("New sim added to grid (" + TheSim.regionName + ")"); 577 MainLog.Instance.Verbose("New sim added to grid (" + TheSim.regionName + ")");
579 logToDB(TheSim.UUID.ToStringHyphenated(), "RestSetSimMethod", "", 5, "Region successfully updated and connected to grid."); 578 logToDB(TheSim.UUID.ToStringHyphenated(), "RestSetSimMethod", "", 5, "Region successfully updated and connected to grid.");
580 } 579 }
581 else 580 else
@@ -585,7 +584,7 @@ namespace OpenSim.Grid.GridServer
585 } 584 }
586 catch (Exception e) 585 catch (Exception e)
587 { 586 {
588 OpenSim.Framework.Console.MainLog.Instance.Verbose("getRegionPlugin Handle " + kvp.Key + " unable to add new sim: " + e.ToString()); 587 MainLog.Instance.Verbose("getRegionPlugin Handle " + kvp.Key + " unable to add new sim: " + e.ToString());
589 } 588 }
590 } 589 }
591 return "OK"; 590 return "OK";
diff --git a/OpenSim/Grid/GridServer/Main.cs b/OpenSim/Grid/GridServer/Main.cs
index 490f757..20c4905 100644
--- a/OpenSim/Grid/GridServer/Main.cs
+++ b/OpenSim/Grid/GridServer/Main.cs
@@ -27,20 +27,14 @@
27*/ 27*/
28 28
29using System; 29using System;
30using System.IO;
31using System.Text;
32using System.Timers;
33using System.Net;
34using System.Threading;
35using System.Reflection; 30using System.Reflection;
36using libsecondlife; 31using System.Threading;
37using OpenSim.Framework.Manager; 32using System.Timers;
38using OpenSim.Framework;
39using OpenSim.Framework.Sims;
40using OpenSim.Framework.Console; 33using OpenSim.Framework.Console;
41using OpenSim.Framework.Interfaces; 34using OpenSim.Framework.Interfaces;
42using OpenSim.Framework.Servers; 35using OpenSim.Framework.Servers;
43using OpenSim.GenericConfig; 36using OpenSim.GenericConfig;
37using Timer=System.Timers.Timer;
44 38
45namespace OpenSim.Grid.GridServer 39namespace OpenSim.Grid.GridServer
46{ 40{
@@ -156,7 +150,7 @@ namespace OpenSim.Grid.GridServer
156 150
157 m_console.Verbose( "Main.cs:Startup() - Starting sim status checker"); 151 m_console.Verbose( "Main.cs:Startup() - Starting sim status checker");
158 152
159 System.Timers.Timer simCheckTimer = new System.Timers.Timer(3600000 * 3); // 3 Hours between updates. 153 Timer simCheckTimer = new Timer(3600000 * 3); // 3 Hours between updates.
160 simCheckTimer.Elapsed += new ElapsedEventHandler(CheckSims); 154 simCheckTimer.Elapsed += new ElapsedEventHandler(CheckSims);
161 simCheckTimer.Enabled = true; 155 simCheckTimer.Enabled = true;
162 } 156 }
diff --git a/OpenSim/Grid/GridServer/Properties/AssemblyInfo.cs b/OpenSim/Grid/GridServer/Properties/AssemblyInfo.cs
index 303dddf..62a68a8 100644
--- a/OpenSim/Grid/GridServer/Properties/AssemblyInfo.cs
+++ b/OpenSim/Grid/GridServer/Properties/AssemblyInfo.cs
@@ -26,9 +26,7 @@
26* 26*
27*/ 27*/
28using System.Reflection; 28using System.Reflection;
29using System.Runtime.CompilerServices;
30using System.Runtime.InteropServices; 29using System.Runtime.InteropServices;
31
32// General Information about an assembly is controlled through the following 30// General Information about an assembly is controlled through the following
33// set of attributes. Change these attribute values to modify the information 31// set of attributes. Change these attribute values to modify the information
34// associated with an assembly. 32// associated with an assembly.
diff --git a/OpenSim/Grid/UserServer.Config/AssemblyInfo.cs b/OpenSim/Grid/UserServer.Config/AssemblyInfo.cs
index 25e0211..15298e8 100644
--- a/OpenSim/Grid/UserServer.Config/AssemblyInfo.cs
+++ b/OpenSim/Grid/UserServer.Config/AssemblyInfo.cs
@@ -26,9 +26,7 @@
26* 26*
27*/ 27*/
28using System.Reflection; 28using System.Reflection;
29using System.Runtime.CompilerServices;
30using System.Runtime.InteropServices; 29using System.Runtime.InteropServices;
31
32// Information about this assembly is defined by the following 30// Information about this assembly is defined by the following
33// attributes. 31// attributes.
34// 32//
diff --git a/OpenSim/Grid/UserServer.Config/DbUserConfig.cs b/OpenSim/Grid/UserServer.Config/DbUserConfig.cs
index 770a6b9..c7f8255 100644
--- a/OpenSim/Grid/UserServer.Config/DbUserConfig.cs
+++ b/OpenSim/Grid/UserServer.Config/DbUserConfig.cs
@@ -26,10 +26,9 @@
26* 26*
27*/ 27*/
28using System; 28using System;
29using System.Collections.Generic; 29using Db4objects.Db4o;
30using OpenSim.Framework.Console; 30using OpenSim.Framework.Console;
31using OpenSim.Framework.Interfaces; 31using OpenSim.Framework.Interfaces;
32using Db4objects.Db4o;
33 32
34namespace OpenUser.Config.UserConfigDb4o 33namespace OpenUser.Config.UserConfigDb4o
35{ 34{
@@ -37,7 +36,7 @@ namespace OpenUser.Config.UserConfigDb4o
37 { 36 {
38 public UserConfig GetConfigObject() 37 public UserConfig GetConfigObject()
39 { 38 {
40 OpenSim.Framework.Console.MainLog.Instance.Verbose("Loading Db40Config dll"); 39 MainLog.Instance.Verbose("Loading Db40Config dll");
41 return ( new DbUserConfig()); 40 return ( new DbUserConfig());
42 } 41 }
43 } 42 }
@@ -47,13 +46,13 @@ namespace OpenUser.Config.UserConfigDb4o
47 private IObjectContainer db; 46 private IObjectContainer db;
48 47
49 public void LoadDefaults() { 48 public void LoadDefaults() {
50 OpenSim.Framework.Console.MainLog.Instance.Notice("Config.cs:LoadDefaults() - Please press enter to retain default or enter new settings"); 49 MainLog.Instance.Notice("Config.cs:LoadDefaults() - Please press enter to retain default or enter new settings");
51 50
52 this.DefaultStartupMsg = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Default startup message", "Welcome to OGS"); 51 this.DefaultStartupMsg = MainLog.Instance.CmdPrompt("Default startup message", "Welcome to OGS");
53 52
54 this.GridServerURL = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Grid server URL","http://127.0.0.1:8001/"); 53 this.GridServerURL = MainLog.Instance.CmdPrompt("Grid server URL","http://127.0.0.1:8001/");
55 this.GridSendKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to send to grid server","null"); 54 this.GridSendKey = MainLog.Instance.CmdPrompt("Key to send to grid server","null");
56 this.GridRecvKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to expect from grid server","null"); 55 this.GridRecvKey = MainLog.Instance.CmdPrompt("Key to expect from grid server","null");
57 } 56 }
58 57
59 public override void InitConfig() { 58 public override void InitConfig() {
@@ -61,7 +60,7 @@ namespace OpenUser.Config.UserConfigDb4o
61 db = Db4oFactory.OpenFile("openuser.yap"); 60 db = Db4oFactory.OpenFile("openuser.yap");
62 IObjectSet result = db.Get(typeof(DbUserConfig)); 61 IObjectSet result = db.Get(typeof(DbUserConfig));
63 if(result.Count==1) { 62 if(result.Count==1) {
64 OpenSim.Framework.Console.MainLog.Instance.Verbose("Config.cs:InitConfig() - Found a UserConfig object in the local database, loading"); 63 MainLog.Instance.Verbose("Config.cs:InitConfig() - Found a UserConfig object in the local database, loading");
65 foreach (DbUserConfig cfg in result) { 64 foreach (DbUserConfig cfg in result) {
66 this.GridServerURL=cfg.GridServerURL; 65 this.GridServerURL=cfg.GridServerURL;
67 this.GridSendKey=cfg.GridSendKey; 66 this.GridSendKey=cfg.GridSendKey;
@@ -69,22 +68,22 @@ namespace OpenUser.Config.UserConfigDb4o
69 this.DefaultStartupMsg=cfg.DefaultStartupMsg; 68 this.DefaultStartupMsg=cfg.DefaultStartupMsg;
70 } 69 }
71 } else { 70 } else {
72 OpenSim.Framework.Console.MainLog.Instance.Verbose("Config.cs:InitConfig() - Could not find object in database, loading precompiled defaults"); 71 MainLog.Instance.Verbose("Config.cs:InitConfig() - Could not find object in database, loading precompiled defaults");
73 LoadDefaults(); 72 LoadDefaults();
74 OpenSim.Framework.Console.MainLog.Instance.Verbose("Writing out default settings to local database"); 73 MainLog.Instance.Verbose("Writing out default settings to local database");
75 db.Set(this); 74 db.Set(this);
76 db.Close(); 75 db.Close();
77 } 76 }
78 } catch(Exception e) { 77 } catch(Exception e) {
79 OpenSim.Framework.Console.MainLog.Instance.Warn("Config.cs:InitConfig() - Exception occured"); 78 MainLog.Instance.Warn("Config.cs:InitConfig() - Exception occured");
80 OpenSim.Framework.Console.MainLog.Instance.Warn(e.ToString()); 79 MainLog.Instance.Warn(e.ToString());
81 } 80 }
82 81
83 OpenSim.Framework.Console.MainLog.Instance.Verbose("User settings loaded:"); 82 MainLog.Instance.Verbose("User settings loaded:");
84 OpenSim.Framework.Console.MainLog.Instance.Verbose("Default startup message: " + this.DefaultStartupMsg); 83 MainLog.Instance.Verbose("Default startup message: " + this.DefaultStartupMsg);
85 OpenSim.Framework.Console.MainLog.Instance.Verbose("Grid server URL: " + this.GridServerURL); 84 MainLog.Instance.Verbose("Grid server URL: " + this.GridServerURL);
86 OpenSim.Framework.Console.MainLog.Instance.Verbose("Key to send to grid: " + this.GridSendKey); 85 MainLog.Instance.Verbose("Key to send to grid: " + this.GridSendKey);
87 OpenSim.Framework.Console.MainLog.Instance.Verbose("Key to expect from grid: " + this.GridRecvKey); 86 MainLog.Instance.Verbose("Key to expect from grid: " + this.GridRecvKey);
88 } 87 }
89 88
90 89
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs
index c65bb97..5560e7d 100644
--- a/OpenSim/Grid/UserServer/Main.cs
+++ b/OpenSim/Grid/UserServer/Main.cs
@@ -27,18 +27,13 @@
27*/ 27*/
28 28
29using System; 29using System;
30using System.Collections;
31using System.Collections.Generic; 30using System.Collections.Generic;
32using System.Reflection; 31using System.Reflection;
33using System.IO;
34using System.Text;
35using libsecondlife; 32using libsecondlife;
36using OpenSim.Framework.User;
37using OpenSim.Framework.Sims;
38using OpenSim.Framework.Inventory;
39using OpenSim.Framework.Interfaces;
40using OpenSim.Framework.Console; 33using OpenSim.Framework.Console;
34using OpenSim.Framework.Interfaces;
41using OpenSim.Framework.Servers; 35using OpenSim.Framework.Servers;
36using OpenSim.Framework.User;
42using OpenSim.Framework.Utilities; 37using OpenSim.Framework.Utilities;
43using OpenSim.GenericConfig; 38using OpenSim.GenericConfig;
44 39
@@ -73,7 +68,7 @@ namespace OpenSim.Grid.UserServer
73 private OpenUser_Main() 68 private OpenUser_Main()
74 { 69 {
75 m_console = new LogBase("opengrid-userserver-console.log", "OpenUser", this , false); 70 m_console = new LogBase("opengrid-userserver-console.log", "OpenUser", this , false);
76 OpenSim.Framework.Console.MainLog.Instance = m_console; 71 MainLog.Instance = m_console;
77 } 72 }
78 73
79 private void Work() 74 private void Work()
@@ -93,16 +88,16 @@ namespace OpenSim.Grid.UserServer
93 this.ConfigDB(this.localXMLConfig); 88 this.ConfigDB(this.localXMLConfig);
94 this.localXMLConfig.Close(); 89 this.localXMLConfig.Close();
95 90
96 OpenSim.Framework.Console.MainLog.Instance.Verbose("Main.cs:Startup() - Loading configuration"); 91 MainLog.Instance.Verbose("Main.cs:Startup() - Loading configuration");
97 Cfg = this.LoadConfigDll(this.ConfigDll); 92 Cfg = this.LoadConfigDll(this.ConfigDll);
98 Cfg.InitConfig(); 93 Cfg.InitConfig();
99 94
100 OpenSim.Framework.Console.MainLog.Instance.Verbose("Main.cs:Startup() - Establishing data connection"); 95 MainLog.Instance.Verbose("Main.cs:Startup() - Establishing data connection");
101 m_userManager = new UserManager(); 96 m_userManager = new UserManager();
102 m_userManager._config = Cfg; 97 m_userManager._config = Cfg;
103 m_userManager.AddPlugin(StorageDll); 98 m_userManager.AddPlugin(StorageDll);
104 99
105 OpenSim.Framework.Console.MainLog.Instance.Verbose("Main.cs:Startup() - Starting HTTP process"); 100 MainLog.Instance.Verbose("Main.cs:Startup() - Starting HTTP process");
106 BaseHttpServer httpServer = new BaseHttpServer(8002); 101 BaseHttpServer httpServer = new BaseHttpServer(8002);
107 102
108 httpServer.AddXmlRPCHandler("login_to_simulator", m_userManager.XmlRpcLoginMethod); 103 httpServer.AddXmlRPCHandler("login_to_simulator", m_userManager.XmlRpcLoginMethod);
diff --git a/OpenSim/Grid/UserServer/Properties/AssemblyInfo.cs b/OpenSim/Grid/UserServer/Properties/AssemblyInfo.cs
index 5d5ce8d..a0a6f3c 100644
--- a/OpenSim/Grid/UserServer/Properties/AssemblyInfo.cs
+++ b/OpenSim/Grid/UserServer/Properties/AssemblyInfo.cs
@@ -1,7 +1,5 @@
1using System.Reflection; 1using System.Reflection;
2using System.Runtime.CompilerServices;
3using System.Runtime.InteropServices; 2using System.Runtime.InteropServices;
4
5// General Information about an assembly is controlled through the following 3// General Information about an assembly is controlled through the following
6// set of attributes. Change these attribute values to modify the information 4// set of attributes. Change these attribute values to modify the information
7// associated with an assembly. 5// associated with an assembly.
diff --git a/OpenSim/Grid/UserServer/UserManager.cs b/OpenSim/Grid/UserServer/UserManager.cs
index a3e3322..4610a9d 100644
--- a/OpenSim/Grid/UserServer/UserManager.cs
+++ b/OpenSim/Grid/UserServer/UserManager.cs
@@ -27,22 +27,11 @@
27*/ 27*/
28using System; 28using System;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic;
31using System.Text;
32using OpenSim.Framework.Data;
33using libsecondlife;
34using System.Reflection;
35
36using System.Xml;
37using Nwc.XmlRpc; 30using Nwc.XmlRpc;
31using OpenSim.Framework.Data;
38using OpenSim.Framework.Sims; 32using OpenSim.Framework.Sims;
39using OpenSim.Framework.Inventory;
40using OpenSim.Framework.Utilities;
41
42using OpenSim.Framework.UserManagement; 33using OpenSim.Framework.UserManagement;
43 34
44using System.Security.Cryptography;
45
46namespace OpenSim.Grid.UserServer 35namespace OpenSim.Grid.UserServer
47{ 36{
48 public class UserManager : UserManagerBase 37 public class UserManager : UserManagerBase
generated by cgit v1.1 at 2024-07-04 22:45:25 +0000