diff options
Diffstat (limited to 'Common/OpenGrid.Framework.UserManager')
-rw-r--r-- | Common/OpenGrid.Framework.UserManager/UserManagerBase.cs | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/Common/OpenGrid.Framework.UserManager/UserManagerBase.cs b/Common/OpenGrid.Framework.UserManager/UserManagerBase.cs index d6d50c1..eaa53dd 100644 --- a/Common/OpenGrid.Framework.UserManager/UserManagerBase.cs +++ b/Common/OpenGrid.Framework.UserManager/UserManagerBase.cs | |||
@@ -54,10 +54,10 @@ namespace OpenGrid.Framework.UserManagement | |||
54 | /// <param name="FileName">The filename to the user server plugin DLL</param> | 54 | /// <param name="FileName">The filename to the user server plugin DLL</param> |
55 | public void AddPlugin(string FileName) | 55 | public void AddPlugin(string FileName) |
56 | { | 56 | { |
57 | OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Userstorage: Attempting to load " + FileName); | 57 | OpenSim.Framework.Console.MainLog.Instance.Verbose( "Userstorage: Attempting to load " + FileName); |
58 | Assembly pluginAssembly = Assembly.LoadFrom(FileName); | 58 | Assembly pluginAssembly = Assembly.LoadFrom(FileName); |
59 | 59 | ||
60 | OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Userstorage: Found " + pluginAssembly.GetTypes().Length + " interfaces."); | 60 | OpenSim.Framework.Console.MainLog.Instance.Verbose( "Userstorage: Found " + pluginAssembly.GetTypes().Length + " interfaces."); |
61 | foreach (Type pluginType in pluginAssembly.GetTypes()) | 61 | foreach (Type pluginType in pluginAssembly.GetTypes()) |
62 | { | 62 | { |
63 | if (!pluginType.IsAbstract) | 63 | if (!pluginType.IsAbstract) |
@@ -69,7 +69,7 @@ namespace OpenGrid.Framework.UserManagement | |||
69 | IUserData plug = (IUserData)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); | 69 | IUserData plug = (IUserData)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( "Userstorage: Added IUserData Interface"); | 72 | OpenSim.Framework.Console.MainLog.Instance.Verbose( "Userstorage: Added IUserData Interface"); |
73 | } | 73 | } |
74 | 74 | ||
75 | typeInterface = null; | 75 | typeInterface = null; |
@@ -105,7 +105,7 @@ namespace OpenGrid.Framework.UserManagement | |||
105 | } | 105 | } |
106 | catch (Exception e) | 106 | catch (Exception e) |
107 | { | 107 | { |
108 | OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")"); | 108 | OpenSim.Framework.Console.MainLog.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")"); |
109 | } | 109 | } |
110 | } | 110 | } |
111 | } | 111 | } |
@@ -127,7 +127,7 @@ namespace OpenGrid.Framework.UserManagement | |||
127 | } | 127 | } |
128 | catch (Exception e) | 128 | catch (Exception e) |
129 | { | 129 | { |
130 | OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")"); | 130 | OpenSim.Framework.Console.MainLog.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")"); |
131 | } | 131 | } |
132 | } | 132 | } |
133 | 133 | ||
@@ -152,7 +152,7 @@ namespace OpenGrid.Framework.UserManagement | |||
152 | } | 152 | } |
153 | catch (Exception e) | 153 | catch (Exception e) |
154 | { | 154 | { |
155 | OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")"); | 155 | OpenSim.Framework.Console.MainLog.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")"); |
156 | } | 156 | } |
157 | } | 157 | } |
158 | 158 | ||
@@ -184,7 +184,7 @@ namespace OpenGrid.Framework.UserManagement | |||
184 | } | 184 | } |
185 | catch (Exception e) | 185 | catch (Exception e) |
186 | { | 186 | { |
187 | OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")"); | 187 | OpenSim.Framework.Console.MainLog.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")"); |
188 | } | 188 | } |
189 | } | 189 | } |
190 | 190 | ||
@@ -206,7 +206,7 @@ namespace OpenGrid.Framework.UserManagement | |||
206 | } | 206 | } |
207 | catch (Exception e) | 207 | catch (Exception e) |
208 | { | 208 | { |
209 | OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")"); | 209 | OpenSim.Framework.Console.MainLog.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")"); |
210 | } | 210 | } |
211 | } | 211 | } |
212 | 212 | ||
@@ -228,7 +228,7 @@ namespace OpenGrid.Framework.UserManagement | |||
228 | } | 228 | } |
229 | catch (Exception e) | 229 | catch (Exception e) |
230 | { | 230 | { |
231 | OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")"); | 231 | OpenSim.Framework.Console.MainLog.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")"); |
232 | } | 232 | } |
233 | } | 233 | } |
234 | 234 | ||
@@ -251,7 +251,7 @@ namespace OpenGrid.Framework.UserManagement | |||
251 | } | 251 | } |
252 | catch (Exception e) | 252 | catch (Exception e) |
253 | { | 253 | { |
254 | OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")"); | 254 | OpenSim.Framework.Console.MainLog.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")"); |
255 | } | 255 | } |
256 | } | 256 | } |
257 | 257 | ||
@@ -336,7 +336,7 @@ namespace OpenGrid.Framework.UserManagement | |||
336 | /// <returns>Authenticated?</returns> | 336 | /// <returns>Authenticated?</returns> |
337 | public bool AuthenticateUser(ref UserProfileData profile, string password) | 337 | public bool AuthenticateUser(ref UserProfileData profile, string password) |
338 | { | 338 | { |
339 | OpenSim.Framework.Console.MainConsole.Instance.Verbose( | 339 | OpenSim.Framework.Console.MainLog.Instance.Verbose( |
340 | "Authenticating " + profile.username + " " + profile.surname); | 340 | "Authenticating " + profile.username + " " + profile.surname); |
341 | 341 | ||
342 | password = password.Remove(0, 3); //remove $1$ | 342 | password = password.Remove(0, 3); //remove $1$ |