aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authordiva2009-03-22 04:39:16 +0000
committerdiva2009-03-22 04:39:16 +0000
commit9489ad57f98e13c61725fe157eacf2e56053abe6 (patch)
tree08f22bd1eae20197e0e53a9300904608d45805b4 /OpenSim
parentInitial support for authentication/authorization keys in UserManagerBase, and... (diff)
downloadopensim-SC_OLD-9489ad57f98e13c61725fe157eacf2e56053abe6.zip
opensim-SC_OLD-9489ad57f98e13c61725fe157eacf2e56053abe6.tar.gz
opensim-SC_OLD-9489ad57f98e13c61725fe157eacf2e56053abe6.tar.bz2
opensim-SC_OLD-9489ad57f98e13c61725fe157eacf2e56053abe6.tar.xz
Moving the LoginAuth service up, so that it can be shared among standalones and the User Server.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Framework/Communications/HGLoginAuthService.cs (renamed from OpenSim/Region/CoreModules/Hypergrid/Login/HGStandaloneLoginService.cs)9
-rw-r--r--OpenSim/Region/CoreModules/Hypergrid/HGStandaloneLoginModule.cs (renamed from OpenSim/Region/CoreModules/Hypergrid/Login/HGStandaloneLoginModule.cs)4
2 files changed, 5 insertions, 8 deletions
diff --git a/OpenSim/Region/CoreModules/Hypergrid/Login/HGStandaloneLoginService.cs b/OpenSim/Framework/Communications/HGLoginAuthService.cs
index 5ac50f1..d12b73b 100644
--- a/OpenSim/Region/CoreModules/Hypergrid/Login/HGStandaloneLoginService.cs
+++ b/OpenSim/Framework/Communications/HGLoginAuthService.cs
@@ -32,12 +32,9 @@ using System.Net;
32using System.Reflection; 32using System.Reflection;
33using System.Text.RegularExpressions; 33using System.Text.RegularExpressions;
34using OpenSim.Framework; 34using OpenSim.Framework;
35using OpenSim.Framework.Communications;
36using OpenSim.Framework.Communications.Cache; 35using OpenSim.Framework.Communications.Cache;
37using OpenSim.Framework.Communications.Capabilities; 36using OpenSim.Framework.Communications.Capabilities;
38using OpenSim.Framework.Servers; 37using OpenSim.Framework.Servers;
39using OpenSim.Region.Framework.Scenes;
40using OpenSim.Region.Framework.Interfaces;
41 38
42using OpenMetaverse; 39using OpenMetaverse;
43 40
@@ -45,9 +42,9 @@ using log4net;
45using Nini.Config; 42using Nini.Config;
46using Nwc.XmlRpc; 43using Nwc.XmlRpc;
47 44
48namespace OpenSim.Region.CoreModules.Hypergrid 45namespace OpenSim.Framework.Communications
49{ 46{
50 public class HGStandaloneLoginService : LoginService 47 public class HGLoginAuthService : LoginService
51 { 48 {
52 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 49 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
53 50
@@ -65,7 +62,7 @@ namespace OpenSim.Region.CoreModules.Hypergrid
65 protected ILoginServiceToRegionsConnector m_regionsConnector; 62 protected ILoginServiceToRegionsConnector m_regionsConnector;
66 63
67 64
68 public HGStandaloneLoginService( 65 public HGLoginAuthService(
69 UserManagerBase userManager, string welcomeMess, 66 UserManagerBase userManager, string welcomeMess,
70 IInterServiceInventoryServices interServiceInventoryService, 67 IInterServiceInventoryServices interServiceInventoryService,
71 NetworkServersInfo serversInfo, 68 NetworkServersInfo serversInfo,
diff --git a/OpenSim/Region/CoreModules/Hypergrid/Login/HGStandaloneLoginModule.cs b/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneLoginModule.cs
index 4b74ed5..3f4d875 100644
--- a/OpenSim/Region/CoreModules/Hypergrid/Login/HGStandaloneLoginModule.cs
+++ b/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneLoginModule.cs
@@ -69,7 +69,7 @@ namespace OpenSim.Region.CoreModules.Hypergrid
69 } 69 }
70 } 70 }
71 71
72 protected HGStandaloneLoginService m_loginService; 72 protected HGLoginAuthService m_loginService;
73 73
74 #region IRegionModule Members 74 #region IRegionModule Members
75 75
@@ -103,7 +103,7 @@ namespace OpenSim.Region.CoreModules.Hypergrid
103 IHttpServer httpServer = m_firstScene.CommsManager.HttpServer; 103 IHttpServer httpServer = m_firstScene.CommsManager.HttpServer;
104 104
105 //TODO: fix the casting of the user service, maybe by registering the userManagerBase with scenes, or refactoring so we just need a IUserService reference 105 //TODO: fix the casting of the user service, maybe by registering the userManagerBase with scenes, or refactoring so we just need a IUserService reference
106 m_loginService = new HGStandaloneLoginService((UserManagerBase)m_firstScene.CommsManager.UserService, welcomeMessage, m_firstScene.CommsManager.InterServiceInventoryService, m_firstScene.CommsManager.NetworkServersInfo, authenticate, rootFolder, this); 106 m_loginService = new HGLoginAuthService((UserManagerBase)m_firstScene.CommsManager.UserService, welcomeMessage, m_firstScene.CommsManager.InterServiceInventoryService, m_firstScene.CommsManager.NetworkServersInfo, authenticate, rootFolder, this);
107 107
108 httpServer.AddXmlRPCHandler("hg_login", m_loginService.XmlRpcLoginMethod); 108 httpServer.AddXmlRPCHandler("hg_login", m_loginService.XmlRpcLoginMethod);
109 httpServer.AddXmlRPCHandler("hg_new_auth_key", m_loginService.XmlRpcGenerateKeyMethod); 109 httpServer.AddXmlRPCHandler("hg_new_auth_key", m_loginService.XmlRpcGenerateKeyMethod);