aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenGridServices
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenGridServices.sln124
-rw-r--r--OpenGridServices/OpenGrid.Config/GridConfigDb4o/DbGridConfig.cs52
-rw-r--r--OpenGridServices/OpenGridServices.AssetServer/Main.cs14
-rw-r--r--OpenGridServices/OpenGridServices.GridServer/GridManager.cs26
-rw-r--r--OpenGridServices/OpenGridServices.GridServer/Main.cs6
-rw-r--r--OpenGridServices/OpenGridServices.UserServer/Main.cs14
-rw-r--r--OpenGridServices/OpenUser.Config/UserConfigDb4o/DbUserConfig.cs32
7 files changed, 129 insertions, 139 deletions
diff --git a/OpenGridServices.sln b/OpenGridServices.sln
index e492872..7c6da45 100644
--- a/OpenGridServices.sln
+++ b/OpenGridServices.sln
@@ -25,71 +25,61 @@ EndProject
25Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenUser.Config.UserConfigDb4o", "OpenGridServices\OpenUser.Config\UserConfigDb4o\OpenUser.Config.UserConfigDb4o.csproj", "{7E494328-0000-0000-0000-000000000000}" 25Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenUser.Config.UserConfigDb4o", "OpenGridServices\OpenUser.Config\UserConfigDb4o\OpenUser.Config.UserConfigDb4o.csproj", "{7E494328-0000-0000-0000-000000000000}"
26EndProject 26EndProject
27Global 27Global
28 GlobalSection(SolutionConfigurationPlatforms) = preSolution 28 GlobalSection(SolutionConfigurationPlatforms) = preSolution
29 Debug|Any CPU = Debug|Any CPU 29 Debug|Any CPU = Debug|Any CPU
30 Release|Any CPU = Release|Any CPU 30 Release|Any CPU = Release|Any CPU
31 EndGlobalSection 31 EndGlobalSection
32 GlobalSection(ProjectDependencies) = postSolution 32 GlobalSection(ProjectConfigurationPlatforms) = postSolution
33 ({39BD9497-0000-0000-0000-000000000000}).2 = ({62CDF671-0000-0000-0000-000000000000}) 33 {B0027747-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
34 ({0A563AC1-0000-0000-0000-000000000000}).1 = ({62CDF671-0000-0000-0000-000000000000}) 34 {B0027747-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
35 ({0F3C3AC1-0000-0000-0000-000000000000}).2 = ({62CDF671-0000-0000-0000-000000000000}) 35 {B0027747-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
36 ({1E3F341A-0000-0000-0000-000000000000}).1 = ({62CDF671-0000-0000-0000-000000000000}) 36 {B0027747-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
37 ({DA9A7391-0000-0000-0000-000000000000}).2 = ({62CDF671-0000-0000-0000-000000000000}) 37 {62CDF671-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
38 ({21BFC8E2-0000-0000-0000-000000000000}).2 = ({62CDF671-0000-0000-0000-000000000000}) 38 {62CDF671-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
39 ({21BFC8E2-0000-0000-0000-000000000000}).3 = ({7924FD35-0000-0000-0000-000000000000}) 39 {62CDF671-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
40 ({66591469-0000-0000-0000-000000000000}).2 = ({62CDF671-0000-0000-0000-000000000000}) 40 {62CDF671-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
41 EndGlobalSection 41 {39BD9497-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
42 GlobalSection(ProjectConfigurationPlatforms) = postSolution 42 {39BD9497-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
43 {B0027747-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 43 {39BD9497-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
44 {B0027747-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 44 {39BD9497-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
45 {B0027747-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 45 {0A563AC1-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
46 {B0027747-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 46 {0A563AC1-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
47 {62CDF671-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 47 {0A563AC1-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
48 {62CDF671-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 48 {0A563AC1-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
49 {62CDF671-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 49 {0F3C3AC1-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
50 {62CDF671-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 50 {0F3C3AC1-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
51 {39BD9497-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 51 {0F3C3AC1-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
52 {39BD9497-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 52 {0F3C3AC1-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
53 {39BD9497-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 53 {1E3F341A-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
54 {39BD9497-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 54 {1E3F341A-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
55 {0A563AC1-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 55 {1E3F341A-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
56 {0A563AC1-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 56 {1E3F341A-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
57 {0A563AC1-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 57 {7924FD35-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
58 {0A563AC1-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 58 {7924FD35-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
59 {0F3C3AC1-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 59 {7924FD35-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
60 {0F3C3AC1-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 60 {7924FD35-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
61 {0F3C3AC1-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 61 {DA9A7391-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
62 {0F3C3AC1-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 62 {DA9A7391-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
63 {1E3F341A-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 63 {DA9A7391-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
64 {1E3F341A-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 64 {DA9A7391-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
65 {1E3F341A-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 65 {0021261B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
66 {1E3F341A-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 66 {0021261B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
67 {7924FD35-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 67 {0021261B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
68 {7924FD35-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 68 {0021261B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
69 {7924FD35-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 69 {21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
70 {7924FD35-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 70 {21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
71 {DA9A7391-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 71 {21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
72 {DA9A7391-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 72 {21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
73 {DA9A7391-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 73 {66591469-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
74 {DA9A7391-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 74 {66591469-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
75 {0021261B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 75 {66591469-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
76 {0021261B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 76 {66591469-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
77 {0021261B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 77 {7E494328-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
78 {0021261B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 78 {7E494328-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
79 {21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 79 {7E494328-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
80 {21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 80 {7E494328-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
81 {21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 81 EndGlobalSection
82 {21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 82 GlobalSection(SolutionProperties) = preSolution
83 {66591469-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 83 HideSolutionNode = FALSE
84 {66591469-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 84 EndGlobalSection
85 {66591469-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
86 {66591469-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
87 {7E494328-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
88 {7E494328-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
89 {7E494328-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
90 {7E494328-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
91 EndGlobalSection
92 GlobalSection(SolutionProperties) = preSolution
93 HideSolutionNode = FALSE
94 EndGlobalSection
95EndGlobal 85EndGlobal
diff --git a/OpenGridServices/OpenGrid.Config/GridConfigDb4o/DbGridConfig.cs b/OpenGridServices/OpenGrid.Config/GridConfigDb4o/DbGridConfig.cs
index e69515a..2218004 100644
--- a/OpenGridServices/OpenGrid.Config/GridConfigDb4o/DbGridConfig.cs
+++ b/OpenGridServices/OpenGrid.Config/GridConfigDb4o/DbGridConfig.cs
@@ -44,7 +44,7 @@ namespace OpenGrid.Config.GridConfigDb4o
44 /// <returns>A grid configuration object</returns> 44 /// <returns>A grid configuration object</returns>
45 public GridConfig GetConfigObject() 45 public GridConfig GetConfigObject()
46 { 46 {
47 OpenSim.Framework.Console.MainConsole.Instance.Verbose("Loading Db40Config dll"); 47 OpenSim.Framework.Console.MainLog.Instance.Verbose("Loading Db40Config dll");
48 return ( new DbGridConfig()); 48 return ( new DbGridConfig());
49 } 49 }
50 } 50 }
@@ -63,24 +63,24 @@ namespace OpenGrid.Config.GridConfigDb4o
63 /// User configuration for the Grid Config interfaces 63 /// User configuration for the Grid Config interfaces
64 /// </summary> 64 /// </summary>
65 public void LoadDefaults() { 65 public void LoadDefaults() {
66 OpenSim.Framework.Console.MainConsole.Instance.Notice("Config.cs:LoadDefaults() - Please press enter to retain default or enter new settings"); 66 OpenSim.Framework.Console.MainLog.Instance.Notice("Config.cs:LoadDefaults() - Please press enter to retain default or enter new settings");
67 67
68 // About the grid options 68 // About the grid options
69 this.GridOwner = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Grid owner", "OGS development team"); 69 this.GridOwner = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Grid owner", "OGS development team");
70 70
71 // Asset Options 71 // Asset Options
72 this.DefaultAssetServer = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Default asset server","http://127.0.0.1:8003/"); 72 this.DefaultAssetServer = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Default asset server","http://127.0.0.1:8003/");
73 this.AssetSendKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to send to asset server","null"); 73 this.AssetSendKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to send to asset server","null");
74 this.AssetRecvKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to expect from asset server","null"); 74 this.AssetRecvKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to expect from asset server","null");
75 75
76 // User Server Options 76 // User Server Options
77 this.DefaultUserServer = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Default user server","http://127.0.0.1:8002/"); 77 this.DefaultUserServer = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Default user server","http://127.0.0.1:8002/");
78 this.UserSendKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to send to user server","null"); 78 this.UserSendKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to send to user server","null");
79 this.UserRecvKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to expect from user server","null"); 79 this.UserRecvKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to expect from user server","null");
80 80
81 // Region Server Options 81 // Region Server Options
82 this.SimSendKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to send to sims","null"); 82 this.SimSendKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to send to sims","null");
83 this.SimRecvKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to expect from sims","null"); 83 this.SimRecvKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to expect from sims","null");
84 } 84 }
85 85
86 /// <summary> 86 /// <summary>
@@ -95,7 +95,7 @@ namespace OpenGrid.Config.GridConfigDb4o
95 IObjectSet result = db.Get(typeof(DbGridConfig)); 95 IObjectSet result = db.Get(typeof(DbGridConfig));
96 // Found? 96 // Found?
97 if(result.Count==1) { 97 if(result.Count==1) {
98 OpenSim.Framework.Console.MainConsole.Instance.Verbose("Config.cs:InitConfig() - Found a GridConfig object in the local database, loading"); 98 OpenSim.Framework.Console.MainLog.Instance.Verbose("Config.cs:InitConfig() - Found a GridConfig object in the local database, loading");
99 foreach (DbGridConfig cfg in result) { 99 foreach (DbGridConfig cfg in result) {
100 // Import each setting into this class 100 // Import each setting into this class
101 // Grid Settings 101 // Grid Settings
@@ -114,40 +114,40 @@ namespace OpenGrid.Config.GridConfigDb4o
114 } 114 }
115 // Create a new configuration object from this class 115 // Create a new configuration object from this class
116 } else { 116 } else {
117 OpenSim.Framework.Console.MainConsole.Instance.Verbose("Config.cs:InitConfig() - Could not find object in database, loading precompiled defaults"); 117 OpenSim.Framework.Console.MainLog.Instance.Verbose("Config.cs:InitConfig() - Could not find object in database, loading precompiled defaults");
118 118
119 // Load default settings into this class 119 // Load default settings into this class
120 LoadDefaults(); 120 LoadDefaults();
121 121
122 // Saves to the database file... 122 // Saves to the database file...
123 OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Writing out default settings to local database"); 123 OpenSim.Framework.Console.MainLog.Instance.Verbose( "Writing out default settings to local database");
124 db.Set(this); 124 db.Set(this);
125 125
126 // Closes file locks 126 // Closes file locks
127 db.Close(); 127 db.Close();
128 } 128 }
129 } catch(Exception e) { 129 } catch(Exception e) {
130 OpenSim.Framework.Console.MainConsole.Instance.Warn("Config.cs:InitConfig() - Exception occured"); 130 OpenSim.Framework.Console.MainLog.Instance.Warn("Config.cs:InitConfig() - Exception occured");
131 OpenSim.Framework.Console.MainConsole.Instance.Warn(e.ToString()); 131 OpenSim.Framework.Console.MainLog.Instance.Warn(e.ToString());
132 } 132 }
133 133
134 // Grid Settings 134 // Grid Settings
135 OpenSim.Framework.Console.MainConsole.Instance.Verbose("Grid settings loaded:"); 135 OpenSim.Framework.Console.MainLog.Instance.Verbose("Grid settings loaded:");
136 OpenSim.Framework.Console.MainConsole.Instance.Verbose("Grid owner: " + this.GridOwner); 136 OpenSim.Framework.Console.MainLog.Instance.Verbose("Grid owner: " + this.GridOwner);
137 137
138 // Asset Settings 138 // Asset Settings
139 OpenSim.Framework.Console.MainConsole.Instance.Verbose("Default asset server: " + this.DefaultAssetServer); 139 OpenSim.Framework.Console.MainLog.Instance.Verbose("Default asset server: " + this.DefaultAssetServer);
140 OpenSim.Framework.Console.MainConsole.Instance.Verbose("Key to send to asset server: " + this.AssetSendKey); 140 OpenSim.Framework.Console.MainLog.Instance.Verbose("Key to send to asset server: " + this.AssetSendKey);
141 OpenSim.Framework.Console.MainConsole.Instance.Verbose("Key to expect from asset server: " + this.AssetRecvKey); 141 OpenSim.Framework.Console.MainLog.Instance.Verbose("Key to expect from asset server: " + this.AssetRecvKey);
142 142
143 // User Settings 143 // User Settings
144 OpenSim.Framework.Console.MainConsole.Instance.Verbose("Default user server: " + this.DefaultUserServer); 144 OpenSim.Framework.Console.MainLog.Instance.Verbose("Default user server: " + this.DefaultUserServer);
145 OpenSim.Framework.Console.MainConsole.Instance.Verbose("Key to send to user server: " + this.UserSendKey); 145 OpenSim.Framework.Console.MainLog.Instance.Verbose("Key to send to user server: " + this.UserSendKey);
146 OpenSim.Framework.Console.MainConsole.Instance.Verbose("Key to expect from user server: " + this.UserRecvKey); 146 OpenSim.Framework.Console.MainLog.Instance.Verbose("Key to expect from user server: " + this.UserRecvKey);
147 147
148 // Region Settings 148 // Region Settings
149 OpenSim.Framework.Console.MainConsole.Instance.Verbose("Key to send to sims: " + this.SimSendKey); 149 OpenSim.Framework.Console.MainLog.Instance.Verbose("Key to send to sims: " + this.SimSendKey);
150 OpenSim.Framework.Console.MainConsole.Instance.Verbose("Key to expect from sims: " + this.SimRecvKey); 150 OpenSim.Framework.Console.MainLog.Instance.Verbose("Key to expect from sims: " + this.SimRecvKey);
151 } 151 }
152 152
153 /// <summary> 153 /// <summary>
diff --git a/OpenGridServices/OpenGridServices.AssetServer/Main.cs b/OpenGridServices/OpenGridServices.AssetServer/Main.cs
index 8cdd2c6..057004d 100644
--- a/OpenGridServices/OpenGridServices.AssetServer/Main.cs
+++ b/OpenGridServices/OpenGridServices.AssetServer/Main.cs
@@ -55,7 +55,7 @@ namespace OpenGridServices.AssetServer
55 55
56 public static OpenAsset_Main assetserver; 56 public static OpenAsset_Main assetserver;
57 57
58 private ConsoleBase m_console; 58 private LogBase m_console;
59 59
60 [STAThread] 60 [STAThread]
61 public static void Main(string[] args) 61 public static void Main(string[] args)
@@ -74,14 +74,14 @@ namespace OpenGridServices.AssetServer
74 74
75 while (true) 75 while (true)
76 { 76 {
77 m_console.MainConsolePrompt(); 77 m_console.MainLogPrompt();
78 } 78 }
79 } 79 }
80 80
81 private OpenAsset_Main() 81 private OpenAsset_Main()
82 { 82 {
83 m_console = new ConsoleBase("opengrid-AssetServer-console.log", "OpenAsset", this, false); 83 m_console = new LogBase("opengrid-AssetServer-console.log", "OpenAsset", this, false);
84 MainConsole.Instance = m_console; 84 MainLog.Instance = m_console;
85 } 85 }
86 86
87 public void Startup() 87 public void Startup()
@@ -165,13 +165,13 @@ namespace OpenGridServices.AssetServer
165 try 165 try
166 { 166 {
167 db = Db4oFactory.OpenFile("assets.yap"); 167 db = Db4oFactory.OpenFile("assets.yap");
168 OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Main.cs:setupDB() - creation"); 168 OpenSim.Framework.Console.MainLog.Instance.Verbose( "Main.cs:setupDB() - creation");
169 } 169 }
170 catch (Exception e) 170 catch (Exception e)
171 { 171 {
172 db.Close(); 172 db.Close();
173 OpenSim.Framework.Console.MainConsole.Instance.Warn("Main.cs:setupDB() - Exception occured"); 173 OpenSim.Framework.Console.MainLog.Instance.Warn("Main.cs:setupDB() - Exception occured");
174 OpenSim.Framework.Console.MainConsole.Instance.Warn(e.ToString()); 174 OpenSim.Framework.Console.MainLog.Instance.Warn(e.ToString());
175 } 175 }
176 if (!yapfile) 176 if (!yapfile)
177 { 177 {
diff --git a/OpenGridServices/OpenGridServices.GridServer/GridManager.cs b/OpenGridServices/OpenGridServices.GridServer/GridManager.cs
index 10cbf82..8ae365f 100644
--- a/OpenGridServices/OpenGridServices.GridServer/GridManager.cs
+++ b/OpenGridServices/OpenGridServices.GridServer/GridManager.cs
@@ -53,10 +53,10 @@ namespace OpenGridServices.GridServer
53 /// <param name="FileName">The filename to the grid server plugin DLL</param> 53 /// <param name="FileName">The filename to the grid server plugin DLL</param>
54 public void AddPlugin(string FileName) 54 public void AddPlugin(string FileName)
55 { 55 {
56 OpenSim.Framework.Console.MainConsole.Instance.Verbose("Storage: Attempting to load " + FileName); 56 OpenSim.Framework.Console.MainLog.Instance.Verbose("Storage: Attempting to load " + FileName);
57 Assembly pluginAssembly = Assembly.LoadFrom(FileName); 57 Assembly pluginAssembly = Assembly.LoadFrom(FileName);
58 58
59 OpenSim.Framework.Console.MainConsole.Instance.Verbose("Storage: Found " + pluginAssembly.GetTypes().Length + " interfaces."); 59 OpenSim.Framework.Console.MainLog.Instance.Verbose("Storage: Found " + pluginAssembly.GetTypes().Length + " interfaces.");
60 foreach (Type pluginType in pluginAssembly.GetTypes()) 60 foreach (Type pluginType in pluginAssembly.GetTypes())
61 { 61 {
62 if (!pluginType.IsAbstract) 62 if (!pluginType.IsAbstract)
@@ -69,7 +69,7 @@ namespace OpenGridServices.GridServer
69 IGridData plug = (IGridData)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); 69 IGridData plug = (IGridData)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
70 plug.Initialise(); 70 plug.Initialise();
71 this._plugins.Add(plug.getName(), plug); 71 this._plugins.Add(plug.getName(), plug);
72 OpenSim.Framework.Console.MainConsole.Instance.Verbose("Storage: Added IGridData Interface"); 72 OpenSim.Framework.Console.MainLog.Instance.Verbose("Storage: Added IGridData Interface");
73 } 73 }
74 74
75 typeInterface = null; 75 typeInterface = null;
@@ -82,7 +82,7 @@ namespace OpenGridServices.GridServer
82 ILogData plug = (ILogData)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); 82 ILogData plug = (ILogData)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
83 plug.Initialise(); 83 plug.Initialise();
84 this._logplugins.Add(plug.getName(), plug); 84 this._logplugins.Add(plug.getName(), plug);
85 OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Storage: Added ILogData Interface"); 85 OpenSim.Framework.Console.MainLog.Instance.Verbose( "Storage: Added ILogData Interface");
86 } 86 }
87 87
88 typeInterface = null; 88 typeInterface = null;
@@ -110,7 +110,7 @@ namespace OpenGridServices.GridServer
110 } 110 }
111 catch (Exception e) 111 catch (Exception e)
112 { 112 {
113 OpenSim.Framework.Console.MainConsole.Instance.Warn("Storage: unable to write log via " + kvp.Key); 113 OpenSim.Framework.Console.MainLog.Instance.Warn("Storage: unable to write log via " + kvp.Key);
114 } 114 }
115 } 115 }
116 } 116 }
@@ -129,7 +129,7 @@ namespace OpenGridServices.GridServer
129 } 129 }
130 catch (Exception e) 130 catch (Exception e)
131 { 131 {
132 OpenSim.Framework.Console.MainConsole.Instance.Warn("Storage: Unable to find region " + uuid.ToStringHyphenated() + " via " + kvp.Key); 132 OpenSim.Framework.Console.MainLog.Instance.Warn("Storage: Unable to find region " + uuid.ToStringHyphenated() + " via " + kvp.Key);
133 } 133 }
134 } 134 }
135 return null; 135 return null;
@@ -150,7 +150,7 @@ namespace OpenGridServices.GridServer
150 } 150 }
151 catch (Exception e) 151 catch (Exception e)
152 { 152 {
153 OpenSim.Framework.Console.MainConsole.Instance.Warn("Storage: Unable to find region " + handle.ToString() + " via " + kvp.Key); 153 OpenSim.Framework.Console.MainLog.Instance.Warn("Storage: Unable to find region " + handle.ToString() + " via " + kvp.Key);
154 } 154 }
155 } 155 }
156 return null; 156 return null;
@@ -174,7 +174,7 @@ namespace OpenGridServices.GridServer
174 } 174 }
175 catch (Exception e) 175 catch (Exception e)
176 { 176 {
177 OpenSim.Framework.Console.MainConsole.Instance.Warn("Storage: Unable to query regionblock via " + kvp.Key); 177 OpenSim.Framework.Console.MainLog.Instance.Warn("Storage: Unable to query regionblock via " + kvp.Key);
178 } 178 }
179 } 179 }
180 180
@@ -362,7 +362,7 @@ namespace OpenGridServices.GridServer
362 362
363 simProfileList.Add(simProfileBlock); 363 simProfileList.Add(simProfileBlock);
364 } 364 }
365 OpenSim.Framework.Console.MainConsole.Instance.Verbose("World map request processed, returned " + simProfileList.Count.ToString() + " region(s) in range via FastMode"); 365 OpenSim.Framework.Console.MainLog.Instance.Verbose("World map request processed, returned " + simProfileList.Count.ToString() + " region(s) in range via FastMode");
366 } 366 }
367 else 367 else
368 { 368 {
@@ -388,7 +388,7 @@ namespace OpenGridServices.GridServer
388 } 388 }
389 } 389 }
390 } 390 }
391 OpenSim.Framework.Console.MainConsole.Instance.Verbose("World map request processed, returned " + simProfileList.Count.ToString() + " region(s) in range via Standard Mode"); 391 OpenSim.Framework.Console.MainLog.Instance.Verbose("World map request processed, returned " + simProfileList.Count.ToString() + " region(s) in range via Standard Mode");
392 } 392 }
393 393
394 responseData["sim-profiles"] = simProfileList; 394 responseData["sim-profiles"] = simProfileList;
@@ -549,18 +549,18 @@ namespace OpenGridServices.GridServer
549 549
550 try 550 try
551 { 551 {
552 OpenSim.Framework.Console.MainConsole.Instance.Verbose("Updating / adding via " + _plugins.Count + " storage provider(s) registered."); 552 OpenSim.Framework.Console.MainLog.Instance.Verbose("Updating / adding via " + _plugins.Count + " storage provider(s) registered.");
553 foreach (KeyValuePair<string, IGridData> kvp in _plugins) 553 foreach (KeyValuePair<string, IGridData> kvp in _plugins)
554 { 554 {
555 try 555 try
556 { 556 {
557 kvp.Value.AddProfile(TheSim); 557 kvp.Value.AddProfile(TheSim);
558 OpenSim.Framework.Console.MainConsole.Instance.Verbose("New sim added to grid (" + TheSim.regionName + ")"); 558 OpenSim.Framework.Console.MainLog.Instance.Verbose("New sim added to grid (" + TheSim.regionName + ")");
559 logToDB(TheSim.UUID.ToStringHyphenated(), "RestSetSimMethod", "", 5, "Region successfully updated and connected to grid."); 559 logToDB(TheSim.UUID.ToStringHyphenated(), "RestSetSimMethod", "", 5, "Region successfully updated and connected to grid.");
560 } 560 }
561 catch (Exception e) 561 catch (Exception e)
562 { 562 {
563 OpenSim.Framework.Console.MainConsole.Instance.Verbose("getRegionPlugin Handle " + kvp.Key + " unable to add new sim: " + e.ToString()); 563 OpenSim.Framework.Console.MainLog.Instance.Verbose("getRegionPlugin Handle " + kvp.Key + " unable to add new sim: " + e.ToString());
564 } 564 }
565 } 565 }
566 return "OK"; 566 return "OK";
diff --git a/OpenGridServices/OpenGridServices.GridServer/Main.cs b/OpenGridServices/OpenGridServices.GridServer/Main.cs
index 37b9f7a..b948fd6 100644
--- a/OpenGridServices/OpenGridServices.GridServer/Main.cs
+++ b/OpenGridServices/OpenGridServices.GridServer/Main.cs
@@ -63,7 +63,7 @@ namespace OpenGridServices.GridServer
63 63
64 private GridManager m_gridManager; 64 private GridManager m_gridManager;
65 65
66 private ConsoleBase m_console; 66 private LogBase m_console;
67 67
68 [STAThread] 68 [STAThread]
69 public static void Main(string[] args) 69 public static void Main(string[] args)
@@ -91,8 +91,8 @@ namespace OpenGridServices.GridServer
91 91
92 private OpenGrid_Main() 92 private OpenGrid_Main()
93 { 93 {
94 m_console = new ConsoleBase("opengrid-gridserver-console.log", "OpenGrid", this, false); 94 m_console = new LogBase("opengrid-gridserver-console.log", "OpenGrid", this, false);
95 MainConsole.Instance = m_console; 95 MainLog.Instance = m_console;
96 96
97 97
98 } 98 }
diff --git a/OpenGridServices/OpenGridServices.UserServer/Main.cs b/OpenGridServices/OpenGridServices.UserServer/Main.cs
index c17d2c6..56a3892 100644
--- a/OpenGridServices/OpenGridServices.UserServer/Main.cs
+++ b/OpenGridServices/OpenGridServices.UserServer/Main.cs
@@ -57,7 +57,7 @@ namespace OpenGridServices.UserServer
57 57
58 public Dictionary<LLUUID, UserProfile> UserSessions = new Dictionary<LLUUID, UserProfile>(); 58 public Dictionary<LLUUID, UserProfile> UserSessions = new Dictionary<LLUUID, UserProfile>();
59 59
60 ConsoleBase m_console; 60 LogBase m_console;
61 61
62 [STAThread] 62 [STAThread]
63 public static void Main(string[] args) 63 public static void Main(string[] args)
@@ -72,8 +72,8 @@ namespace OpenGridServices.UserServer
72 72
73 private OpenUser_Main() 73 private OpenUser_Main()
74 { 74 {
75 m_console = new ConsoleBase("opengrid-userserver-console.log", "OpenUser", this , false); 75 m_console = new LogBase("opengrid-userserver-console.log", "OpenUser", this , false);
76 MainConsole.Instance = m_console; 76 MainLog.Instance = m_console;
77 } 77 }
78 78
79 private void Work() 79 private void Work()
@@ -82,7 +82,7 @@ namespace OpenGridServices.UserServer
82 82
83 while (true) 83 while (true)
84 { 84 {
85 m_console.MainConsolePrompt(); 85 m_console.MainLogPrompt();
86 } 86 }
87 } 87 }
88 88
@@ -93,16 +93,16 @@ namespace OpenGridServices.UserServer
93 this.ConfigDB(this.localXMLConfig); 93 this.ConfigDB(this.localXMLConfig);
94 this.localXMLConfig.Close(); 94 this.localXMLConfig.Close();
95 95
96 MainConsole.Instance.Verbose("Main.cs:Startup() - Loading configuration"); 96 MainLog.Instance.Verbose("Main.cs:Startup() - Loading configuration");
97 Cfg = this.LoadConfigDll(this.ConfigDll); 97 Cfg = this.LoadConfigDll(this.ConfigDll);
98 Cfg.InitConfig(); 98 Cfg.InitConfig();
99 99
100 MainConsole.Instance.Verbose( "Main.cs:Startup() - Establishing data connection"); 100 MainLog.Instance.Verbose( "Main.cs:Startup() - Establishing data connection");
101 m_userManager = new UserManager(); 101 m_userManager = new UserManager();
102 m_userManager._config = Cfg; 102 m_userManager._config = Cfg;
103 m_userManager.AddPlugin(StorageDll); 103 m_userManager.AddPlugin(StorageDll);
104 104
105 MainConsole.Instance.Verbose("Main.cs:Startup() - Starting HTTP process"); 105 MainLog.Instance.Verbose("Main.cs:Startup() - Starting HTTP process");
106 BaseHttpServer httpServer = new BaseHttpServer(8002); 106 BaseHttpServer httpServer = new BaseHttpServer(8002);
107 107
108 httpServer.AddXmlRPCHandler("login_to_simulator", m_userManager.XmlRpcLoginMethod); 108 httpServer.AddXmlRPCHandler("login_to_simulator", m_userManager.XmlRpcLoginMethod);
diff --git a/OpenGridServices/OpenUser.Config/UserConfigDb4o/DbUserConfig.cs b/OpenGridServices/OpenUser.Config/UserConfigDb4o/DbUserConfig.cs
index fe0e7aa..770a6b9 100644
--- a/OpenGridServices/OpenUser.Config/UserConfigDb4o/DbUserConfig.cs
+++ b/OpenGridServices/OpenUser.Config/UserConfigDb4o/DbUserConfig.cs
@@ -37,7 +37,7 @@ namespace OpenUser.Config.UserConfigDb4o
37 { 37 {
38 public UserConfig GetConfigObject() 38 public UserConfig GetConfigObject()
39 { 39 {
40 OpenSim.Framework.Console.MainConsole.Instance.Verbose("Loading Db40Config dll"); 40 OpenSim.Framework.Console.MainLog.Instance.Verbose("Loading Db40Config dll");
41 return ( new DbUserConfig()); 41 return ( new DbUserConfig());
42 } 42 }
43 } 43 }
@@ -47,13 +47,13 @@ namespace OpenUser.Config.UserConfigDb4o
47 private IObjectContainer db; 47 private IObjectContainer db;
48 48
49 public void LoadDefaults() { 49 public void LoadDefaults() {
50 OpenSim.Framework.Console.MainConsole.Instance.Notice("Config.cs:LoadDefaults() - Please press enter to retain default or enter new settings"); 50 OpenSim.Framework.Console.MainLog.Instance.Notice("Config.cs:LoadDefaults() - Please press enter to retain default or enter new settings");
51 51
52 this.DefaultStartupMsg = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Default startup message", "Welcome to OGS"); 52 this.DefaultStartupMsg = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Default startup message", "Welcome to OGS");
53 53
54 this.GridServerURL = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Grid server URL","http://127.0.0.1:8001/"); 54 this.GridServerURL = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Grid server URL","http://127.0.0.1:8001/");
55 this.GridSendKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to send to grid server","null"); 55 this.GridSendKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to send to grid server","null");
56 this.GridRecvKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to expect from grid server","null"); 56 this.GridRecvKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to expect from grid server","null");
57 } 57 }
58 58
59 public override void InitConfig() { 59 public override void InitConfig() {
@@ -61,7 +61,7 @@ namespace OpenUser.Config.UserConfigDb4o
61 db = Db4oFactory.OpenFile("openuser.yap"); 61 db = Db4oFactory.OpenFile("openuser.yap");
62 IObjectSet result = db.Get(typeof(DbUserConfig)); 62 IObjectSet result = db.Get(typeof(DbUserConfig));
63 if(result.Count==1) { 63 if(result.Count==1) {
64 OpenSim.Framework.Console.MainConsole.Instance.Verbose("Config.cs:InitConfig() - Found a UserConfig object in the local database, loading"); 64 OpenSim.Framework.Console.MainLog.Instance.Verbose("Config.cs:InitConfig() - Found a UserConfig object in the local database, loading");
65 foreach (DbUserConfig cfg in result) { 65 foreach (DbUserConfig cfg in result) {
66 this.GridServerURL=cfg.GridServerURL; 66 this.GridServerURL=cfg.GridServerURL;
67 this.GridSendKey=cfg.GridSendKey; 67 this.GridSendKey=cfg.GridSendKey;
@@ -69,22 +69,22 @@ namespace OpenUser.Config.UserConfigDb4o
69 this.DefaultStartupMsg=cfg.DefaultStartupMsg; 69 this.DefaultStartupMsg=cfg.DefaultStartupMsg;
70 } 70 }
71 } else { 71 } else {
72 OpenSim.Framework.Console.MainConsole.Instance.Verbose("Config.cs:InitConfig() - Could not find object in database, loading precompiled defaults"); 72 OpenSim.Framework.Console.MainLog.Instance.Verbose("Config.cs:InitConfig() - Could not find object in database, loading precompiled defaults");
73 LoadDefaults(); 73 LoadDefaults();
74 OpenSim.Framework.Console.MainConsole.Instance.Verbose("Writing out default settings to local database"); 74 OpenSim.Framework.Console.MainLog.Instance.Verbose("Writing out default settings to local database");
75 db.Set(this); 75 db.Set(this);
76 db.Close(); 76 db.Close();
77 } 77 }
78 } catch(Exception e) { 78 } catch(Exception e) {
79 OpenSim.Framework.Console.MainConsole.Instance.Warn("Config.cs:InitConfig() - Exception occured"); 79 OpenSim.Framework.Console.MainLog.Instance.Warn("Config.cs:InitConfig() - Exception occured");
80 OpenSim.Framework.Console.MainConsole.Instance.Warn(e.ToString()); 80 OpenSim.Framework.Console.MainLog.Instance.Warn(e.ToString());
81 } 81 }
82 82
83 OpenSim.Framework.Console.MainConsole.Instance.Verbose("User settings loaded:"); 83 OpenSim.Framework.Console.MainLog.Instance.Verbose("User settings loaded:");
84 OpenSim.Framework.Console.MainConsole.Instance.Verbose("Default startup message: " + this.DefaultStartupMsg); 84 OpenSim.Framework.Console.MainLog.Instance.Verbose("Default startup message: " + this.DefaultStartupMsg);
85 OpenSim.Framework.Console.MainConsole.Instance.Verbose("Grid server URL: " + this.GridServerURL); 85 OpenSim.Framework.Console.MainLog.Instance.Verbose("Grid server URL: " + this.GridServerURL);
86 OpenSim.Framework.Console.MainConsole.Instance.Verbose("Key to send to grid: " + this.GridSendKey); 86 OpenSim.Framework.Console.MainLog.Instance.Verbose("Key to send to grid: " + this.GridSendKey);
87 OpenSim.Framework.Console.MainConsole.Instance.Verbose("Key to expect from grid: " + this.GridRecvKey); 87 OpenSim.Framework.Console.MainLog.Instance.Verbose("Key to expect from grid: " + this.GridRecvKey);
88 } 88 }
89 89
90 90