1 files changed, 26 insertions, 26 deletions
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
        /// <returns>A grid configuration object</returns>
                public GridConfig GetConfigObject()
                {
-                        OpenSim.Framework.Console.MainConsole.Instance.Verbose("Loading Db40Config dll");
+                        OpenSim.Framework.Console.MainLog.Instance.Verbose("Loading Db40Config dll");
                        return ( new DbGridConfig());
                }
        }
@@ -63,24 +63,24 @@ namespace OpenGrid.Config.GridConfigDb4o
        /// User configuration for the Grid Config interfaces
        /// </summary>
                public void LoadDefaults() {
-                        OpenSim.Framework.Console.MainConsole.Instance.Notice("Config.cs:LoadDefaults() - Please press enter to retain default or enter new settings");
+                        OpenSim.Framework.Console.MainLog.Instance.Notice("Config.cs:LoadDefaults() - Please press enter to retain default or enter new settings");
                        
            // About the grid options
-                        this.GridOwner = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Grid owner", "OGS development team");
+                        this.GridOwner = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Grid owner", "OGS development team");
            // Asset Options
-                        this.DefaultAssetServer = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Default asset server","http://127.0.0.1:8003/");
+                        this.DefaultAssetServer = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Default asset server","http://127.0.0.1:8003/");
-            this.AssetSendKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to send to asset server","null");
+            this.AssetSendKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to send to asset server","null");
-            this.AssetRecvKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to expect from asset server","null");
+            this.AssetRecvKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to expect from asset server","null");
            // User Server Options
-                this.DefaultUserServer = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Default user server","http://127.0.0.1:8002/");
+                this.DefaultUserServer = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Default user server","http://127.0.0.1:8002/");
-                this.UserSendKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to send to user server","null");
+                this.UserSendKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to send to user server","null");
-                this.UserRecvKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to expect from user server","null");
+                this.UserRecvKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to expect from user server","null");
            // Region Server Options
-            this.SimSendKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to send to sims","null");
+            this.SimSendKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to send to sims","null");
-            this.SimRecvKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to expect from sims","null");
+            this.SimRecvKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to expect from sims","null");
                }
        /// <summary>
@@ -95,7 +95,7 @@ namespace OpenGrid.Config.GridConfigDb4o
                                IObjectSet result = db.Get(typeof(DbGridConfig));
                // Found?
                                if(result.Count==1) {
-                                        OpenSim.Framework.Console.MainConsole.Instance.Verbose("Config.cs:InitConfig() - Found a GridConfig object in the local database, loading");
+                                        OpenSim.Framework.Console.MainLog.Instance.Verbose("Config.cs:InitConfig() - Found a GridConfig object in the local database, loading");
                                        foreach (DbGridConfig cfg in result) {
                        // Import each setting into this class
                        // Grid Settings
@@ -114,40 +114,40 @@ namespace OpenGrid.Config.GridConfigDb4o
                                        }
                // Create a new configuration object from this class
                                } else {
-                                        OpenSim.Framework.Console.MainConsole.Instance.Verbose("Config.cs:InitConfig() - Could not find object in database, loading precompiled defaults");
+                                        OpenSim.Framework.Console.MainLog.Instance.Verbose("Config.cs:InitConfig() - Could not find object in database, loading precompiled defaults");
                    // Load default settings into this class
                                        LoadDefaults();
                    // Saves to the database file...
-                    OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Writing out default settings to local database");
+                    OpenSim.Framework.Console.MainLog.Instance.Verbose( "Writing out default settings to local database");
                                        db.Set(this);
                    // Closes file locks
                                        db.Close();
                                }
                        } catch(Exception e) {
-                                OpenSim.Framework.Console.MainConsole.Instance.Warn("Config.cs:InitConfig() - Exception occured");
+                                OpenSim.Framework.Console.MainLog.Instance.Warn("Config.cs:InitConfig() - Exception occured");
-                OpenSim.Framework.Console.MainConsole.Instance.Warn(e.ToString());
+                OpenSim.Framework.Console.MainLog.Instance.Warn(e.ToString());
                        }
                        
            // Grid Settings
-                        OpenSim.Framework.Console.MainConsole.Instance.Verbose("Grid settings loaded:");
+                        OpenSim.Framework.Console.MainLog.Instance.Verbose("Grid settings loaded:");
-                        OpenSim.Framework.Console.MainConsole.Instance.Verbose("Grid owner: " + this.GridOwner);
+                        OpenSim.Framework.Console.MainLog.Instance.Verbose("Grid owner: " + this.GridOwner);
            // Asset Settings
-                        OpenSim.Framework.Console.MainConsole.Instance.Verbose("Default asset server: " + this.DefaultAssetServer);
+                        OpenSim.Framework.Console.MainLog.Instance.Verbose("Default asset server: " + this.DefaultAssetServer);
-                        OpenSim.Framework.Console.MainConsole.Instance.Verbose("Key to send to asset server: " + this.AssetSendKey);
+                        OpenSim.Framework.Console.MainLog.Instance.Verbose("Key to send to asset server: " + this.AssetSendKey);
-                        OpenSim.Framework.Console.MainConsole.Instance.Verbose("Key to expect from asset server: " + this.AssetRecvKey);
+                        OpenSim.Framework.Console.MainLog.Instance.Verbose("Key to expect from asset server: " + this.AssetRecvKey);
            // User Settings
-                        OpenSim.Framework.Console.MainConsole.Instance.Verbose("Default user server: " + this.DefaultUserServer);
+                        OpenSim.Framework.Console.MainLog.Instance.Verbose("Default user server: " + this.DefaultUserServer);
-                        OpenSim.Framework.Console.MainConsole.Instance.Verbose("Key to send to user server: " + this.UserSendKey);
+                        OpenSim.Framework.Console.MainLog.Instance.Verbose("Key to send to user server: " + this.UserSendKey);
-                        OpenSim.Framework.Console.MainConsole.Instance.Verbose("Key to expect from user server: " + this.UserRecvKey);
+                        OpenSim.Framework.Console.MainLog.Instance.Verbose("Key to expect from user server: " + this.UserRecvKey);
            // Region Settings
-                        OpenSim.Framework.Console.MainConsole.Instance.Verbose("Key to send to sims: " + this.SimSendKey);
+                        OpenSim.Framework.Console.MainLog.Instance.Verbose("Key to send to sims: " + this.SimSendKey);
-                        OpenSim.Framework.Console.MainConsole.Instance.Verbose("Key to expect from sims: " + this.SimRecvKey);
+                        OpenSim.Framework.Console.MainLog.Instance.Verbose("Key to expect from sims: " + this.SimRecvKey);
                }
        
        /// <summary>

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>