diff options
author | Dr Scofield | 2008-07-28 12:18:48 +0000 |
---|---|---|
committer | Dr Scofield | 2008-07-28 12:18:48 +0000 |
commit | 03efaff60e2c4204bfac33de22e69377ba28be7c (patch) | |
tree | 711c9515a16d241b87857093876ebeafa91ae4cf /OpenSim/Grid | |
parent | Add Shared/LSL_Types* tests to Bamboo. (diff) | |
download | opensim-SC-03efaff60e2c4204bfac33de22e69377ba28be7c.zip opensim-SC-03efaff60e2c4204bfac33de22e69377ba28be7c.tar.gz opensim-SC-03efaff60e2c4204bfac33de22e69377ba28be7c.tar.bz2 opensim-SC-03efaff60e2c4204bfac33de22e69377ba28be7c.tar.xz |
moving GridInfo application plugin into a common standalone/grid
service, adding a plain REST GET handler returning XML (no LLSD),
adding appropriate add handler calls to OpenSimBase and UserServer.
Diffstat (limited to 'OpenSim/Grid')
-rw-r--r-- | OpenSim/Grid/UserServer/Main.cs | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs index 1338d68..a9b4a4f 100644 --- a/OpenSim/Grid/UserServer/Main.cs +++ b/OpenSim/Grid/UserServer/Main.cs | |||
@@ -39,6 +39,7 @@ using OpenSim.Framework.Communications.Cache; | |||
39 | using OpenSim.Framework.Console; | 39 | using OpenSim.Framework.Console; |
40 | using OpenSim.Framework.Servers; | 40 | using OpenSim.Framework.Servers; |
41 | using OpenSim.Framework.Statistics; | 41 | using OpenSim.Framework.Statistics; |
42 | using OpenSim.Common.Communications; | ||
42 | using OpenSim.Grid.Communications.OGS1; | 43 | using OpenSim.Grid.Communications.OGS1; |
43 | 44 | ||
44 | namespace OpenSim.Grid.UserServer | 45 | namespace OpenSim.Grid.UserServer |
@@ -53,6 +54,7 @@ namespace OpenSim.Grid.UserServer | |||
53 | 54 | ||
54 | public UserManager m_userManager; | 55 | public UserManager m_userManager; |
55 | public UserLoginService m_loginService; | 56 | public UserLoginService m_loginService; |
57 | public GridInfoService m_gridInfoService; | ||
56 | public MessageServersConnector m_messagesService; | 58 | public MessageServersConnector m_messagesService; |
57 | protected IInterServiceInventoryServices m_interServiceInventoryService; | 59 | protected IInterServiceInventoryServices m_interServiceInventoryService; |
58 | 60 | ||
@@ -100,6 +102,8 @@ namespace OpenSim.Grid.UserServer | |||
100 | m_userManager._config = Cfg; | 102 | m_userManager._config = Cfg; |
101 | m_userManager.AddPlugin(Cfg.DatabaseProvider, Cfg.DatabaseConnect); | 103 | m_userManager.AddPlugin(Cfg.DatabaseProvider, Cfg.DatabaseConnect); |
102 | 104 | ||
105 | m_gridInfoService = new GridInfoService(); | ||
106 | |||
103 | m_interServiceInventoryService = new OGS1InterServiceInventoryService(m_userManager._config.InventoryUrl); | 107 | m_interServiceInventoryService = new OGS1InterServiceInventoryService(m_userManager._config.InventoryUrl); |
104 | 108 | ||
105 | m_loginService = new UserLoginService( | 109 | m_loginService = new UserLoginService( |
@@ -148,6 +152,9 @@ namespace OpenSim.Grid.UserServer | |||
148 | m_httpServer.AddXmlRPCHandler("agent_change_region", m_messagesService.XmlRPCUserMovedtoRegion); | 152 | m_httpServer.AddXmlRPCHandler("agent_change_region", m_messagesService.XmlRPCUserMovedtoRegion); |
149 | m_httpServer.AddXmlRPCHandler("deregister_messageserver", m_messagesService.XmlRPCDeRegisterMessageServer); | 153 | m_httpServer.AddXmlRPCHandler("deregister_messageserver", m_messagesService.XmlRPCDeRegisterMessageServer); |
150 | 154 | ||
155 | m_httpServer.AddStreamHandler(new RestStreamHandler("GET", "/get_grid_info", m_gridInfoService.RestGetGridInfoMethod)); | ||
156 | m_httpServer.AddXmlRPCHandler("get_grid_info", m_gridInfoService.XmlRpcGridInfoMethod); | ||
157 | |||
151 | 158 | ||
152 | m_httpServer.AddStreamHandler( | 159 | m_httpServer.AddStreamHandler( |
153 | new RestStreamHandler("DELETE", "/usersessions/", m_userManager.RestDeleteUserSessionMethod)); | 160 | new RestStreamHandler("DELETE", "/usersessions/", m_userManager.RestDeleteUserSessionMethod)); |