OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Moving the LoginAuth service up, so that it can be shared among standalones and the User Server.

0.6.5-rc1
diva 2009-03-22 04:39:16 +00:00
parent 09732b4d5d
commit 9489ad57f9
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
OpenSim/Region/CoreModules/Hypergrid/Login/HGStandaloneLoginService.cs → OpenSim/Framework/Communications/HGLoginAuthService.cs
View File

@ -32,12 +32,9 @@ using System.Net;
using System.Reflection; using System.Reflection;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Framework.Communications;
using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Communications.Cache;
using OpenSim.Framework.Communications.Capabilities; using OpenSim.Framework.Communications.Capabilities;
using OpenSim.Framework.Servers; using OpenSim.Framework.Servers;
using OpenSim.Region.Framework.Scenes;
using OpenSim.Region.Framework.Interfaces;
using OpenMetaverse; using OpenMetaverse;
@ -45,9 +42,9 @@ using log4net;
using Nini.Config; using Nini.Config;
using Nwc.XmlRpc; using Nwc.XmlRpc;
namespace OpenSim.Region.CoreModules.Hypergrid namespace OpenSim.Framework.Communications
{ {
public class HGStandaloneLoginService : LoginService public class HGLoginAuthService : LoginService
{ {
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@ -65,7 +62,7 @@ namespace OpenSim.Region.CoreModules.Hypergrid
protected ILoginServiceToRegionsConnector m_regionsConnector; protected ILoginServiceToRegionsConnector m_regionsConnector;
public HGStandaloneLoginService( public HGLoginAuthService(
UserManagerBase userManager, string welcomeMess, UserManagerBase userManager, string welcomeMess,
IInterServiceInventoryServices interServiceInventoryService, IInterServiceInventoryServices interServiceInventoryService,
NetworkServersInfo serversInfo, NetworkServersInfo serversInfo,

4
OpenSim/Region/CoreModules/Hypergrid/Login/HGStandaloneLoginModule.cs → OpenSim/Region/CoreModules/Hypergrid/HGStandaloneLoginModule.cs
View File

@ -69,7 +69,7 @@ namespace OpenSim.Region.CoreModules.Hypergrid
} }
} }
protected HGStandaloneLoginService m_loginService; protected HGLoginAuthService m_loginService;
#region IRegionModule Members #region IRegionModule Members
@ -103,7 +103,7 @@ namespace OpenSim.Region.CoreModules.Hypergrid
IHttpServer httpServer = m_firstScene.CommsManager.HttpServer; IHttpServer httpServer = m_firstScene.CommsManager.HttpServer;
//TODO: fix the casting of the user service, maybe by registering the userManagerBase with scenes, or refactoring so we just need a IUserService reference //TODO: fix the casting of the user service, maybe by registering the userManagerBase with scenes, or refactoring so we just need a IUserService reference
m_loginService = new HGStandaloneLoginService((UserManagerBase)m_firstScene.CommsManager.UserService, welcomeMessage, m_firstScene.CommsManager.InterServiceInventoryService, m_firstScene.CommsManager.NetworkServersInfo, authenticate, rootFolder, this); m_loginService = new HGLoginAuthService((UserManagerBase)m_firstScene.CommsManager.UserService, welcomeMessage, m_firstScene.CommsManager.InterServiceInventoryService, m_firstScene.CommsManager.NetworkServersInfo, authenticate, rootFolder, this);
httpServer.AddXmlRPCHandler("hg_login", m_loginService.XmlRpcLoginMethod); httpServer.AddXmlRPCHandler("hg_login", m_loginService.XmlRpcLoginMethod);
httpServer.AddXmlRPCHandler("hg_new_auth_key", m_loginService.XmlRpcGenerateKeyMethod); httpServer.AddXmlRPCHandler("hg_new_auth_key", m_loginService.XmlRpcGenerateKeyMethod);