diff options
Moved the Initialisation of the CommunicationsManager to a ApplicationPlugin.
Also in that plugin it registers the IUserService with all the Scenes (as they are created). So now we can start changing over all uses of IUserService, that currently access it from the CommunicationsManager to accessing it from the Scene.RequestModuleInterface call.
Once that is done we can move the UserService creation out to its own plugin and remove all references to it from the CommunicationsManager. Then we can take the next CommunicationsManager interface and repeat.
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/Application/HGOpenSimNode.cs | 74 | ||||
| -rw-r--r-- | OpenSim/Region/Application/OpenSimBase.cs | 125 |
2 files changed, 98 insertions, 101 deletions
diff --git a/OpenSim/Region/Application/HGOpenSimNode.cs b/OpenSim/Region/Application/HGOpenSimNode.cs index 1130c70..b0be40d 100644 --- a/OpenSim/Region/Application/HGOpenSimNode.cs +++ b/OpenSim/Region/Application/HGOpenSimNode.cs | |||
| @@ -73,57 +73,57 @@ namespace OpenSim | |||
| 73 | 73 | ||
| 74 | } | 74 | } |
| 75 | 75 | ||
| 76 | protected override void InitialiseStandaloneServices(LibraryRootFolder libraryRootFolder) | 76 | //protected override void InitialiseStandaloneServices(LibraryRootFolder libraryRootFolder) |
| 77 | { | 77 | //{ |
| 78 | // Standalone mode | 78 | // // Standalone mode |
| 79 | 79 | ||
| 80 | HGInventoryService inventoryService = new HGInventoryService(m_networkServersInfo.InventoryURL, null, false); | 80 | // HGInventoryService inventoryService = new HGInventoryService(m_networkServersInfo.InventoryURL, null, false); |
| 81 | inventoryService.AddPlugin(m_configSettings.StandaloneInventoryPlugin, m_configSettings.StandaloneInventorySource); | 81 | // inventoryService.AddPlugin(m_configSettings.StandaloneInventoryPlugin, m_configSettings.StandaloneInventorySource); |
| 82 | 82 | ||
| 83 | LocalUserServices userService = | 83 | // LocalUserServices userService = |
| 84 | new LocalUserServices( | 84 | // new LocalUserServices( |
| 85 | m_networkServersInfo.DefaultHomeLocX, m_networkServersInfo.DefaultHomeLocY, inventoryService); | 85 | // m_networkServersInfo.DefaultHomeLocX, m_networkServersInfo.DefaultHomeLocY, inventoryService); |
| 86 | userService.AddPlugin(m_configSettings.StandaloneUserPlugin, m_configSettings.StandaloneUserSource); | 86 | // userService.AddPlugin(m_configSettings.StandaloneUserPlugin, m_configSettings.StandaloneUserSource); |
| 87 | 87 | ||
| 88 | //LocalBackEndServices backendService = new LocalBackEndServices(); | 88 | // //LocalBackEndServices backendService = new LocalBackEndServices(); |
| 89 | HGGridServicesStandalone gridService = new HGGridServicesStandalone(m_networkServersInfo, m_httpServer, m_assetCache, m_sceneManager); | 89 | // HGGridServicesStandalone gridService = new HGGridServicesStandalone(m_networkServersInfo, m_httpServer, m_assetCache, m_sceneManager); |
| 90 | 90 | ||
| 91 | LocalLoginService loginService = | 91 | // LocalLoginService loginService = |
| 92 | new LocalLoginService( | 92 | // new LocalLoginService( |
| 93 | userService, m_configSettings.StandaloneWelcomeMessage, inventoryService, gridService.LocalBackend, m_networkServersInfo, | 93 | // userService, m_configSettings.StandaloneWelcomeMessage, inventoryService, gridService.LocalBackend, m_networkServersInfo, |
| 94 | m_configSettings.StandaloneAuthenticate, libraryRootFolder); | 94 | // m_configSettings.StandaloneAuthenticate, libraryRootFolder); |
| 95 | 95 | ||
| 96 | 96 | ||
| 97 | m_commsManager = new HGCommunicationsStandalone(m_networkServersInfo, m_httpServer, m_assetCache, | 97 | // m_commsManager = new HGCommunicationsStandalone(m_networkServersInfo, m_httpServer, m_assetCache, |
| 98 | userService, userService, inventoryService, gridService, userService, libraryRootFolder, m_configSettings.DumpAssetsToFile); | 98 | // userService, userService, inventoryService, gridService, userService, libraryRootFolder, m_configSettings.DumpAssetsToFile); |
| 99 | 99 | ||
| 100 | inventoryService.UserProfileCache = m_commsManager.UserProfileCacheService; | 100 | // inventoryService.UserProfileCache = m_commsManager.UserProfileCacheService; |
| 101 | HGServices = gridService; | 101 | // HGServices = gridService; |
| 102 | 102 | ||
| 103 | // set up XMLRPC handler for client's initial login request message | 103 | // // set up XMLRPC handler for client's initial login request message |
| 104 | m_httpServer.AddXmlRPCHandler("login_to_simulator", loginService.XmlRpcLoginMethod); | 104 | // m_httpServer.AddXmlRPCHandler("login_to_simulator", loginService.XmlRpcLoginMethod); |
| 105 | 105 | ||
| 106 | // provides the web form login | 106 | // // provides the web form login |
| 107 | m_httpServer.AddHTTPHandler("login", loginService.ProcessHTMLLogin); | 107 | // m_httpServer.AddHTTPHandler("login", loginService.ProcessHTMLLogin); |
| 108 | 108 | ||
| 109 | // Provides the LLSD login | 109 | // // Provides the LLSD login |
| 110 | m_httpServer.SetDefaultLLSDHandler(loginService.LLSDLoginMethod); | 110 | // m_httpServer.SetDefaultLLSDHandler(loginService.LLSDLoginMethod); |
| 111 | 111 | ||
| 112 | // provide grid info | 112 | // // provide grid info |
| 113 | // m_gridInfoService = new GridInfoService(m_config.Source.Configs["Startup"].GetString("inifile", Path.Combine(Util.configDir(), "OpenSim.ini"))); | 113 | // // m_gridInfoService = new GridInfoService(m_config.Source.Configs["Startup"].GetString("inifile", Path.Combine(Util.configDir(), "OpenSim.ini"))); |
| 114 | m_gridInfoService = new GridInfoService(m_config.Source); | 114 | // m_gridInfoService = new GridInfoService(m_config.Source); |
| 115 | m_httpServer.AddXmlRPCHandler("get_grid_info", m_gridInfoService.XmlRpcGridInfoMethod); | 115 | // m_httpServer.AddXmlRPCHandler("get_grid_info", m_gridInfoService.XmlRpcGridInfoMethod); |
| 116 | m_httpServer.AddStreamHandler(new RestStreamHandler("GET", "/get_grid_info", m_gridInfoService.RestGetGridInfoMethod)); | 116 | // m_httpServer.AddStreamHandler(new RestStreamHandler("GET", "/get_grid_info", m_gridInfoService.RestGetGridInfoMethod)); |
| 117 | } | 117 | //} |
| 118 | 118 | ||
| 119 | protected override void InitialiseGridServices(LibraryRootFolder libraryRootFolder) | 119 | //protected override void InitialiseGridServices(LibraryRootFolder libraryRootFolder) |
| 120 | { | 120 | //{ |
| 121 | m_commsManager = new HGCommunicationsGridMode(m_networkServersInfo, m_httpServer, m_assetCache, m_sceneManager, libraryRootFolder); | 121 | // m_commsManager = new HGCommunicationsGridMode(m_networkServersInfo, m_httpServer, m_assetCache, m_sceneManager, libraryRootFolder); |
| 122 | 122 | ||
| 123 | HGServices = ((HGCommunicationsGridMode)m_commsManager).HGServices; | 123 | // HGServices = ((HGCommunicationsGridMode)m_commsManager).HGServices; |
| 124 | 124 | ||
| 125 | m_httpServer.AddStreamHandler(new SimStatusHandler()); | 125 | // m_httpServer.AddStreamHandler(new SimStatusHandler()); |
| 126 | } | 126 | //} |
| 127 | 127 | ||
| 128 | protected override Scene CreateScene(RegionInfo regionInfo, StorageManager storageManager, | 128 | protected override Scene CreateScene(RegionInfo regionInfo, StorageManager storageManager, |
| 129 | AgentCircuitManager circuitManager) | 129 | AgentCircuitManager circuitManager) |
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index 6045dc0..3f7c757 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs | |||
| @@ -186,28 +186,25 @@ namespace OpenSim | |||
| 186 | 186 | ||
| 187 | LibraryRootFolder libraryRootFolder = new LibraryRootFolder(m_configSettings.LibrariesXMLFile); | 187 | LibraryRootFolder libraryRootFolder = new LibraryRootFolder(m_configSettings.LibrariesXMLFile); |
| 188 | 188 | ||
| 189 | // Standalone mode is determined by !startupConfig.GetBoolean("gridmode", false) | 189 | //// Standalone mode is determined by !startupConfig.GetBoolean("gridmode", false) |
| 190 | if (m_configSettings.Standalone) | 190 | //if (m_configSettings.Standalone) |
| 191 | { | 191 | //{ |
| 192 | InitialiseStandaloneServices(libraryRootFolder); | 192 | // InitialiseStandaloneServices(libraryRootFolder); |
| 193 | } | 193 | //} |
| 194 | else | 194 | //else |
| 195 | { | 195 | //{ |
| 196 | // We are in grid mode | 196 | // // We are in grid mode |
| 197 | InitialiseGridServices(libraryRootFolder); | 197 | // InitialiseGridServices(libraryRootFolder); |
| 198 | } | 198 | //} |
| 199 | 199 | ||
| 200 | // Create a ModuleLoader instance | 200 | // Create a ModuleLoader instance |
| 201 | m_moduleLoader = new ModuleLoader(m_config.Source); | 201 | m_moduleLoader = new ModuleLoader(m_config.Source); |
| 202 | 202 | ||
| 203 | LoadPlugins(); | 203 | LoadPlugins(); |
| 204 | |||
| 205 | |||
| 206 | foreach (IApplicationPlugin plugin in m_plugins) | 204 | foreach (IApplicationPlugin plugin in m_plugins) |
| 207 | { | 205 | { |
| 208 | plugin.PostInitialise(); | 206 | plugin.PostInitialise(); |
| 209 | } | 207 | } |
| 210 | |||
| 211 | 208 | ||
| 212 | // Only enable logins to the regions once we have completely finished starting up (apart from scripts) | 209 | // Only enable logins to the regions once we have completely finished starting up (apart from scripts) |
| 213 | if ((m_commsManager != null) && (m_commsManager.GridService != null)) | 210 | if ((m_commsManager != null) && (m_commsManager.GridService != null)) |
| @@ -272,56 +269,56 @@ namespace OpenSim | |||
| 272 | m_console.Notice(moduleCommander.Help); | 269 | m_console.Notice(moduleCommander.Help); |
| 273 | } | 270 | } |
| 274 | 271 | ||
| 275 | /// <summary> | 272 | ///// <summary> |
| 276 | /// Initialises the backend services for standalone mode, and registers some http handlers | 273 | ///// Initialises the backend services for standalone mode, and registers some http handlers |
| 277 | /// </summary> | 274 | ///// </summary> |
| 278 | /// <param name="libraryRootFolder"></param> | 275 | ///// <param name="libraryRootFolder"></param> |
| 279 | protected virtual void InitialiseStandaloneServices(LibraryRootFolder libraryRootFolder) | 276 | //protected virtual void InitialiseStandaloneServices(LibraryRootFolder libraryRootFolder) |
| 280 | { | 277 | //{ |
| 281 | LocalInventoryService inventoryService = new LocalInventoryService(); | 278 | // LocalInventoryService inventoryService = new LocalInventoryService(); |
| 282 | inventoryService.AddPlugin(m_configSettings.StandaloneInventoryPlugin, m_configSettings.StandaloneInventorySource); | 279 | // inventoryService.AddPlugin(m_configSettings.StandaloneInventoryPlugin, m_configSettings.StandaloneInventorySource); |
| 283 | 280 | ||
| 284 | LocalUserServices userService = | 281 | // LocalUserServices userService = |
| 285 | new LocalUserServices( | 282 | // new LocalUserServices( |
| 286 | m_networkServersInfo.DefaultHomeLocX, m_networkServersInfo.DefaultHomeLocY, inventoryService); | 283 | // m_networkServersInfo.DefaultHomeLocX, m_networkServersInfo.DefaultHomeLocY, inventoryService); |
| 287 | userService.AddPlugin(m_configSettings.StandaloneUserPlugin, m_configSettings.StandaloneUserSource); | 284 | // userService.AddPlugin(m_configSettings.StandaloneUserPlugin, m_configSettings.StandaloneUserSource); |
| 288 | 285 | ||
| 289 | LocalBackEndServices backendService = new LocalBackEndServices(); | 286 | // LocalBackEndServices backendService = new LocalBackEndServices(); |
| 290 | 287 | ||
| 291 | LocalLoginService loginService = | 288 | // LocalLoginService loginService = |
| 292 | new LocalLoginService( | 289 | // new LocalLoginService( |
| 293 | userService, m_configSettings.StandaloneWelcomeMessage, inventoryService, backendService, m_networkServersInfo, | 290 | // userService, m_configSettings.StandaloneWelcomeMessage, inventoryService, backendService, m_networkServersInfo, |
| 294 | m_configSettings.StandaloneAuthenticate, libraryRootFolder); | 291 | // m_configSettings.StandaloneAuthenticate, libraryRootFolder); |
| 295 | 292 | ||
| 296 | m_commsManager | 293 | // m_commsManager |
| 297 | = new CommunicationsLocal( | 294 | // = new CommunicationsLocal( |
| 298 | m_networkServersInfo, m_httpServer, m_assetCache, userService, userService, | 295 | // m_networkServersInfo, m_httpServer, m_assetCache, userService, userService, |
| 299 | inventoryService, backendService, userService, | 296 | // inventoryService, backendService, userService, |
| 300 | libraryRootFolder, m_configSettings.DumpAssetsToFile); | 297 | // libraryRootFolder, m_configSettings.DumpAssetsToFile); |
| 301 | 298 | ||
| 302 | // set up XMLRPC handler for client's initial login request message | 299 | // // set up XMLRPC handler for client's initial login request message |
| 303 | m_httpServer.AddXmlRPCHandler("login_to_simulator", loginService.XmlRpcLoginMethod); | 300 | // m_httpServer.AddXmlRPCHandler("login_to_simulator", loginService.XmlRpcLoginMethod); |
| 304 | 301 | ||
| 305 | // provides the web form login | 302 | // // provides the web form login |
| 306 | m_httpServer.AddHTTPHandler("login", loginService.ProcessHTMLLogin); | 303 | // m_httpServer.AddHTTPHandler("login", loginService.ProcessHTMLLogin); |
| 307 | 304 | ||
| 308 | // Provides the LLSD login | 305 | // // Provides the LLSD login |
| 309 | m_httpServer.SetDefaultLLSDHandler(loginService.LLSDLoginMethod); | 306 | // m_httpServer.SetDefaultLLSDHandler(loginService.LLSDLoginMethod); |
| 310 | 307 | ||
| 311 | // provide grid info | 308 | // // provide grid info |
| 312 | // m_gridInfoService = new GridInfoService(m_config.Source.Configs["Startup"].GetString("inifile", Path.Combine(Util.configDir(), "OpenSim.ini"))); | 309 | // // m_gridInfoService = new GridInfoService(m_config.Source.Configs["Startup"].GetString("inifile", Path.Combine(Util.configDir(), "OpenSim.ini"))); |
| 313 | m_gridInfoService = new GridInfoService(m_config.Source); | 310 | // m_gridInfoService = new GridInfoService(m_config.Source); |
| 314 | m_httpServer.AddXmlRPCHandler("get_grid_info", m_gridInfoService.XmlRpcGridInfoMethod); | 311 | // m_httpServer.AddXmlRPCHandler("get_grid_info", m_gridInfoService.XmlRpcGridInfoMethod); |
| 315 | m_httpServer.AddStreamHandler(new RestStreamHandler("GET", "/get_grid_info", m_gridInfoService.RestGetGridInfoMethod)); | 312 | // m_httpServer.AddStreamHandler(new RestStreamHandler("GET", "/get_grid_info", m_gridInfoService.RestGetGridInfoMethod)); |
| 316 | } | 313 | //} |
| 317 | 314 | ||
| 318 | protected virtual void InitialiseGridServices(LibraryRootFolder libraryRootFolder) | 315 | //protected virtual void InitialiseGridServices(LibraryRootFolder libraryRootFolder) |
| 319 | { | 316 | //{ |
| 320 | m_commsManager | 317 | // m_commsManager |
| 321 | = new CommunicationsOGS1(m_networkServersInfo, m_httpServer, m_assetCache, libraryRootFolder); | 318 | // = new CommunicationsOGS1(m_networkServersInfo, m_httpServer, m_assetCache, libraryRootFolder); |
| 322 | 319 | ||
| 323 | m_httpServer.AddStreamHandler(new SimStatusHandler()); | 320 | // m_httpServer.AddStreamHandler(new SimStatusHandler()); |
| 324 | } | 321 | //} |
| 325 | 322 | ||
| 326 | protected override void Initialize() | 323 | protected override void Initialize() |
| 327 | { | 324 | { |