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.GenericGridServerConcept
MW
parent
c89a4d9eb6
commit
e2d30a0244
|
|
@ -0,0 +1,253 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) Contributors, http://opensimulator.org/
|
||||||
|
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
||||||
|
*
|
||||||
|
* Redistribution and use in source and binary forms, with or without
|
||||||
|
* modification, are permitted provided that the following conditions are met:
|
||||||
|
* * Redistributions of source code must retain the above copyright
|
||||||
|
* notice, this list of conditions and the following disclaimer.
|
||||||
|
* * Redistributions in binary form must reproduce the above copyright
|
||||||
|
* notice, this list of conditions and the following disclaimer in the
|
||||||
|
* documentation and/or other materials provided with the distribution.
|
||||||
|
* * Neither the name of the OpenSim Project nor the
|
||||||
|
* names of its contributors may be used to endorse or promote products
|
||||||
|
* derived from this software without specific prior written permission.
|
||||||
|
*
|
||||||
|
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
||||||
|
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||||
|
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||||
|
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
||||||
|
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||||
|
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||||
|
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
||||||
|
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||||
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||||
|
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
*/
|
||||||
|
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Reflection;
|
||||||
|
using System.Threading;
|
||||||
|
using log4net;
|
||||||
|
using OpenSim.Framework;
|
||||||
|
using OpenSim.Framework.RegionLoader.Filesystem;
|
||||||
|
using OpenSim.Framework.RegionLoader.Web;
|
||||||
|
using OpenSim.Region.CoreModules.Agent.AssetTransaction;
|
||||||
|
using OpenSim.Region.CoreModules.Avatar.InstantMessage;
|
||||||
|
using OpenSim.Region.CoreModules.Scripting.DynamicTexture;
|
||||||
|
using OpenSim.Region.CoreModules.Scripting.LoadImageURL;
|
||||||
|
using OpenSim.Region.CoreModules.Scripting.XMLRPC;
|
||||||
|
using OpenSim.Framework.Communications;
|
||||||
|
using OpenSim.Framework.Communications.Cache;
|
||||||
|
using OpenSim.Region.Communications.Hypergrid;
|
||||||
|
using OpenSim.Region.Communications.Local;
|
||||||
|
using OpenSim.Region.Communications.OGS1;
|
||||||
|
using OpenSim.Framework.Servers;
|
||||||
|
using OpenSim.ApplicationPlugins.LoadRegions;
|
||||||
|
|
||||||
|
namespace OpenSim.ApplicationPlugins.CreateCommsManager
|
||||||
|
{
|
||||||
|
public class CreateCommsManagerPlugin : IApplicationPlugin
|
||||||
|
{
|
||||||
|
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
|
||||||
|
|
||||||
|
#region IApplicationPlugin Members
|
||||||
|
|
||||||
|
// TODO: required by IPlugin, but likely not at all right
|
||||||
|
string m_name = "CreateCommsManagerPlugin";
|
||||||
|
string m_version = "0.0";
|
||||||
|
|
||||||
|
public string Version { get { return m_version; } }
|
||||||
|
public string Name { get { return m_name; } }
|
||||||
|
|
||||||
|
protected OpenSimBase m_openSim;
|
||||||
|
|
||||||
|
protected BaseHttpServer m_httpServer;
|
||||||
|
protected CommunicationsManager m_commsManager;
|
||||||
|
protected GridInfoService m_gridInfoService;
|
||||||
|
protected IHyperlink HGServices = null;
|
||||||
|
|
||||||
|
protected LoadRegionsPlugin m_loadRegionsPlugin;
|
||||||
|
|
||||||
|
public void Initialise()
|
||||||
|
{
|
||||||
|
m_log.Info("[LOADREGIONS]: " + Name + " cannot be default-initialized!");
|
||||||
|
throw new PluginNotInitialisedException(Name);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Initialise(OpenSimBase openSim)
|
||||||
|
{
|
||||||
|
m_openSim = openSim;
|
||||||
|
m_httpServer = openSim.HttpServer;
|
||||||
|
|
||||||
|
InitialiseCommsManager(openSim);
|
||||||
|
if (m_commsManager != null)
|
||||||
|
{
|
||||||
|
m_openSim.ApplicationRegistry.RegisterInterface<IUserService>(m_commsManager.UserService);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void PostInitialise()
|
||||||
|
{
|
||||||
|
if (m_openSim.ApplicationRegistry.TryGet<LoadRegionsPlugin>(out m_loadRegionsPlugin))
|
||||||
|
{
|
||||||
|
m_loadRegionsPlugin.OnNewRegionCreated += RegionCreated;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Dispose()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
private void RegionCreated(IScene scene)
|
||||||
|
{
|
||||||
|
if (m_commsManager != null)
|
||||||
|
{
|
||||||
|
scene.RegisterModuleInterface<IUserService>(m_commsManager.UserService);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void InitialiseCommsManager(OpenSimBase openSim)
|
||||||
|
{
|
||||||
|
LibraryRootFolder libraryRootFolder = new LibraryRootFolder(m_openSim.ConfigurationSettings.LibrariesXMLFile);
|
||||||
|
|
||||||
|
if ((openSim is OpenSim) || (openSim is OpenSimBackground))
|
||||||
|
{
|
||||||
|
// Standalone mode is determined by !startupConfig.GetBoolean("gridmode", false)
|
||||||
|
if (m_openSim.ConfigurationSettings.Standalone)
|
||||||
|
{
|
||||||
|
InitialiseStandaloneServices(libraryRootFolder);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// We are in grid mode
|
||||||
|
InitialiseGridServices(libraryRootFolder);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if (openSim is HGOpenSimNode)
|
||||||
|
{
|
||||||
|
HGOpenSimNode hgNode = (HGOpenSimNode)openSim;
|
||||||
|
|
||||||
|
// Standalone mode is determined by !startupConfig.GetBoolean("gridmode", false)
|
||||||
|
if (m_openSim.ConfigurationSettings.Standalone)
|
||||||
|
{
|
||||||
|
InitialiseHGStandaloneServices(libraryRootFolder);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// We are in grid mode
|
||||||
|
InitialiseHGGridServices(libraryRootFolder);
|
||||||
|
}
|
||||||
|
hgNode.HGServices = HGServices;
|
||||||
|
}
|
||||||
|
|
||||||
|
openSim.CommunicationsManager = m_commsManager;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Initialises the backend services for standalone mode, and registers some http handlers
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="libraryRootFolder"></param>
|
||||||
|
protected virtual void InitialiseStandaloneServices(LibraryRootFolder libraryRootFolder)
|
||||||
|
{
|
||||||
|
LocalInventoryService inventoryService = new LocalInventoryService();
|
||||||
|
inventoryService.AddPlugin(m_openSim.ConfigurationSettings.StandaloneInventoryPlugin, m_openSim.ConfigurationSettings.StandaloneInventorySource);
|
||||||
|
|
||||||
|
LocalUserServices userService =
|
||||||
|
new LocalUserServices(
|
||||||
|
m_openSim.NetServersInfo.DefaultHomeLocX, m_openSim.NetServersInfo.DefaultHomeLocY, inventoryService);
|
||||||
|
userService.AddPlugin(m_openSim.ConfigurationSettings.StandaloneUserPlugin, m_openSim.ConfigurationSettings.StandaloneUserSource);
|
||||||
|
|
||||||
|
LocalBackEndServices backendService = new LocalBackEndServices();
|
||||||
|
|
||||||
|
LocalLoginService loginService =
|
||||||
|
new LocalLoginService(
|
||||||
|
userService, m_openSim.ConfigurationSettings.StandaloneWelcomeMessage, inventoryService, backendService, m_openSim.NetServersInfo,
|
||||||
|
m_openSim.ConfigurationSettings.StandaloneAuthenticate, libraryRootFolder);
|
||||||
|
|
||||||
|
m_commsManager
|
||||||
|
= new CommunicationsLocal(
|
||||||
|
m_openSim.NetServersInfo, m_httpServer, m_openSim.AssetCache, userService, userService,
|
||||||
|
inventoryService, backendService, userService,
|
||||||
|
libraryRootFolder, m_openSim.ConfigurationSettings.DumpAssetsToFile);
|
||||||
|
|
||||||
|
// set up XMLRPC handler for client's initial login request message
|
||||||
|
m_httpServer.AddXmlRPCHandler("login_to_simulator", loginService.XmlRpcLoginMethod);
|
||||||
|
|
||||||
|
// provides the web form login
|
||||||
|
m_httpServer.AddHTTPHandler("login", loginService.ProcessHTMLLogin);
|
||||||
|
|
||||||
|
// Provides the LLSD login
|
||||||
|
m_httpServer.SetDefaultLLSDHandler(loginService.LLSDLoginMethod);
|
||||||
|
|
||||||
|
// provide grid info
|
||||||
|
// m_gridInfoService = new GridInfoService(m_config.Source.Configs["Startup"].GetString("inifile", Path.Combine(Util.configDir(), "OpenSim.ini")));
|
||||||
|
m_gridInfoService = new GridInfoService(m_openSim.ConfigSource.Source);
|
||||||
|
m_httpServer.AddXmlRPCHandler("get_grid_info", m_gridInfoService.XmlRpcGridInfoMethod);
|
||||||
|
m_httpServer.AddStreamHandler(new RestStreamHandler("GET", "/get_grid_info", m_gridInfoService.RestGetGridInfoMethod));
|
||||||
|
}
|
||||||
|
|
||||||
|
protected virtual void InitialiseGridServices(LibraryRootFolder libraryRootFolder)
|
||||||
|
{
|
||||||
|
m_commsManager
|
||||||
|
= new CommunicationsOGS1(m_openSim.NetServersInfo, m_httpServer, m_openSim.AssetCache, libraryRootFolder);
|
||||||
|
|
||||||
|
m_httpServer.AddStreamHandler(new OpenSim.SimStatusHandler());
|
||||||
|
}
|
||||||
|
|
||||||
|
protected virtual void InitialiseHGStandaloneServices(LibraryRootFolder libraryRootFolder)
|
||||||
|
{
|
||||||
|
// Standalone mode
|
||||||
|
|
||||||
|
HGInventoryService inventoryService = new HGInventoryService(m_openSim.NetServersInfo.InventoryURL, null, false);
|
||||||
|
inventoryService.AddPlugin(m_openSim.ConfigurationSettings.StandaloneInventoryPlugin, m_openSim.ConfigurationSettings.StandaloneInventorySource);
|
||||||
|
|
||||||
|
LocalUserServices userService =
|
||||||
|
new LocalUserServices(
|
||||||
|
m_openSim.NetServersInfo.DefaultHomeLocX, m_openSim.NetServersInfo.DefaultHomeLocY, inventoryService);
|
||||||
|
userService.AddPlugin(m_openSim.ConfigurationSettings.StandaloneUserPlugin, m_openSim.ConfigurationSettings.StandaloneUserSource);
|
||||||
|
|
||||||
|
//LocalBackEndServices backendService = new LocalBackEndServices();
|
||||||
|
HGGridServicesStandalone gridService = new HGGridServicesStandalone(m_openSim.NetServersInfo, m_httpServer, m_openSim.AssetCache, m_openSim.SceneManager);
|
||||||
|
|
||||||
|
LocalLoginService loginService =
|
||||||
|
new LocalLoginService(
|
||||||
|
userService, m_openSim.ConfigurationSettings.StandaloneWelcomeMessage, inventoryService, gridService.LocalBackend, m_openSim.NetServersInfo,
|
||||||
|
m_openSim.ConfigurationSettings.StandaloneAuthenticate, libraryRootFolder);
|
||||||
|
|
||||||
|
|
||||||
|
m_commsManager = new HGCommunicationsStandalone(m_openSim.NetServersInfo, m_httpServer, m_openSim.AssetCache,
|
||||||
|
userService, userService, inventoryService, gridService, userService, libraryRootFolder, m_openSim.ConfigurationSettings.DumpAssetsToFile);
|
||||||
|
|
||||||
|
inventoryService.UserProfileCache = m_commsManager.UserProfileCacheService;
|
||||||
|
HGServices = gridService;
|
||||||
|
|
||||||
|
// set up XMLRPC handler for client's initial login request message
|
||||||
|
m_httpServer.AddXmlRPCHandler("login_to_simulator", loginService.XmlRpcLoginMethod);
|
||||||
|
|
||||||
|
// provides the web form login
|
||||||
|
m_httpServer.AddHTTPHandler("login", loginService.ProcessHTMLLogin);
|
||||||
|
|
||||||
|
// Provides the LLSD login
|
||||||
|
m_httpServer.SetDefaultLLSDHandler(loginService.LLSDLoginMethod);
|
||||||
|
|
||||||
|
// provide grid info
|
||||||
|
// m_gridInfoService = new GridInfoService(m_config.Source.Configs["Startup"].GetString("inifile", Path.Combine(Util.configDir(), "OpenSim.ini")));
|
||||||
|
m_gridInfoService = new GridInfoService(m_openSim.ConfigSource.Source);
|
||||||
|
m_httpServer.AddXmlRPCHandler("get_grid_info", m_gridInfoService.XmlRpcGridInfoMethod);
|
||||||
|
m_httpServer.AddStreamHandler(new RestStreamHandler("GET", "/get_grid_info", m_gridInfoService.RestGetGridInfoMethod));
|
||||||
|
}
|
||||||
|
|
||||||
|
protected virtual void InitialiseHGGridServices(LibraryRootFolder libraryRootFolder)
|
||||||
|
{
|
||||||
|
m_commsManager = new HGCommunicationsGridMode(m_openSim.NetServersInfo, m_httpServer, m_openSim.AssetCache, m_openSim.SceneManager, libraryRootFolder);
|
||||||
|
|
||||||
|
HGServices = ((HGCommunicationsGridMode)m_commsManager).HGServices;
|
||||||
|
|
||||||
|
m_httpServer.AddStreamHandler(new OpenSim.SimStatusHandler());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,11 @@
|
||||||
|
<Addin id="OpenSim.ApplicationPlugins.CreateCommsManager" version="0.1">
|
||||||
|
<Runtime>
|
||||||
|
<Import assembly="OpenSim.ApplicationPlugins.CreateCommsManager.dll"/>
|
||||||
|
</Runtime>
|
||||||
|
<Dependencies>
|
||||||
|
<Addin id="OpenSim" version="0.5" />
|
||||||
|
</Dependencies>
|
||||||
|
<Extension path = "/OpenSim/Startup">
|
||||||
|
<Plugin id="CreateCommsManager" type="OpenSim.ApplicationPlugins.CreateCommsManager.CreateCommsManagerPlugin" />
|
||||||
|
</Extension>
|
||||||
|
</Addin>
|
||||||
|
|
@ -89,6 +89,9 @@ namespace OpenSim.Framework
|
||||||
T RequestModuleInterface<T>();
|
T RequestModuleInterface<T>();
|
||||||
T[] RequestModuleInterfaces<T>();
|
T[] RequestModuleInterfaces<T>();
|
||||||
|
|
||||||
|
void RegisterModuleInterface<M>(M mod);
|
||||||
|
void StackModuleInterface<M>(M mod);
|
||||||
|
|
||||||
void AddCommand(object module, string command, string shorthelp, string longhelp, CommandDelegate callback);
|
void AddCommand(object module, string command, string shorthelp, string longhelp, CommandDelegate callback);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -73,57 +73,57 @@ namespace OpenSim
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override void InitialiseStandaloneServices(LibraryRootFolder libraryRootFolder)
|
//protected override void InitialiseStandaloneServices(LibraryRootFolder libraryRootFolder)
|
||||||
{
|
//{
|
||||||
// Standalone mode
|
// // Standalone mode
|
||||||
|
|
||||||
HGInventoryService inventoryService = new HGInventoryService(m_networkServersInfo.InventoryURL, null, false);
|
// HGInventoryService inventoryService = new HGInventoryService(m_networkServersInfo.InventoryURL, null, false);
|
||||||
inventoryService.AddPlugin(m_configSettings.StandaloneInventoryPlugin, m_configSettings.StandaloneInventorySource);
|
// inventoryService.AddPlugin(m_configSettings.StandaloneInventoryPlugin, m_configSettings.StandaloneInventorySource);
|
||||||
|
|
||||||
LocalUserServices userService =
|
// LocalUserServices userService =
|
||||||
new LocalUserServices(
|
// new LocalUserServices(
|
||||||
m_networkServersInfo.DefaultHomeLocX, m_networkServersInfo.DefaultHomeLocY, inventoryService);
|
// m_networkServersInfo.DefaultHomeLocX, m_networkServersInfo.DefaultHomeLocY, inventoryService);
|
||||||
userService.AddPlugin(m_configSettings.StandaloneUserPlugin, m_configSettings.StandaloneUserSource);
|
// userService.AddPlugin(m_configSettings.StandaloneUserPlugin, m_configSettings.StandaloneUserSource);
|
||||||
|
|
||||||
//LocalBackEndServices backendService = new LocalBackEndServices();
|
// //LocalBackEndServices backendService = new LocalBackEndServices();
|
||||||
HGGridServicesStandalone gridService = new HGGridServicesStandalone(m_networkServersInfo, m_httpServer, m_assetCache, m_sceneManager);
|
// HGGridServicesStandalone gridService = new HGGridServicesStandalone(m_networkServersInfo, m_httpServer, m_assetCache, m_sceneManager);
|
||||||
|
|
||||||
LocalLoginService loginService =
|
// LocalLoginService loginService =
|
||||||
new LocalLoginService(
|
// new LocalLoginService(
|
||||||
userService, m_configSettings.StandaloneWelcomeMessage, inventoryService, gridService.LocalBackend, m_networkServersInfo,
|
// userService, m_configSettings.StandaloneWelcomeMessage, inventoryService, gridService.LocalBackend, m_networkServersInfo,
|
||||||
m_configSettings.StandaloneAuthenticate, libraryRootFolder);
|
// m_configSettings.StandaloneAuthenticate, libraryRootFolder);
|
||||||
|
|
||||||
|
|
||||||
m_commsManager = new HGCommunicationsStandalone(m_networkServersInfo, m_httpServer, m_assetCache,
|
// m_commsManager = new HGCommunicationsStandalone(m_networkServersInfo, m_httpServer, m_assetCache,
|
||||||
userService, userService, inventoryService, gridService, userService, libraryRootFolder, m_configSettings.DumpAssetsToFile);
|
// userService, userService, inventoryService, gridService, userService, libraryRootFolder, m_configSettings.DumpAssetsToFile);
|
||||||
|
|
||||||
inventoryService.UserProfileCache = m_commsManager.UserProfileCacheService;
|
// inventoryService.UserProfileCache = m_commsManager.UserProfileCacheService;
|
||||||
HGServices = gridService;
|
// HGServices = gridService;
|
||||||
|
|
||||||
// set up XMLRPC handler for client's initial login request message
|
// // set up XMLRPC handler for client's initial login request message
|
||||||
m_httpServer.AddXmlRPCHandler("login_to_simulator", loginService.XmlRpcLoginMethod);
|
// m_httpServer.AddXmlRPCHandler("login_to_simulator", loginService.XmlRpcLoginMethod);
|
||||||
|
|
||||||
// provides the web form login
|
// // provides the web form login
|
||||||
m_httpServer.AddHTTPHandler("login", loginService.ProcessHTMLLogin);
|
// m_httpServer.AddHTTPHandler("login", loginService.ProcessHTMLLogin);
|
||||||
|
|
||||||
// Provides the LLSD login
|
// // Provides the LLSD login
|
||||||
m_httpServer.SetDefaultLLSDHandler(loginService.LLSDLoginMethod);
|
// m_httpServer.SetDefaultLLSDHandler(loginService.LLSDLoginMethod);
|
||||||
|
|
||||||
// provide grid info
|
// // provide grid info
|
||||||
// m_gridInfoService = new GridInfoService(m_config.Source.Configs["Startup"].GetString("inifile", Path.Combine(Util.configDir(), "OpenSim.ini")));
|
// // m_gridInfoService = new GridInfoService(m_config.Source.Configs["Startup"].GetString("inifile", Path.Combine(Util.configDir(), "OpenSim.ini")));
|
||||||
m_gridInfoService = new GridInfoService(m_config.Source);
|
// m_gridInfoService = new GridInfoService(m_config.Source);
|
||||||
m_httpServer.AddXmlRPCHandler("get_grid_info", m_gridInfoService.XmlRpcGridInfoMethod);
|
// m_httpServer.AddXmlRPCHandler("get_grid_info", m_gridInfoService.XmlRpcGridInfoMethod);
|
||||||
m_httpServer.AddStreamHandler(new RestStreamHandler("GET", "/get_grid_info", m_gridInfoService.RestGetGridInfoMethod));
|
// m_httpServer.AddStreamHandler(new RestStreamHandler("GET", "/get_grid_info", m_gridInfoService.RestGetGridInfoMethod));
|
||||||
}
|
//}
|
||||||
|
|
||||||
protected override void InitialiseGridServices(LibraryRootFolder libraryRootFolder)
|
//protected override void InitialiseGridServices(LibraryRootFolder libraryRootFolder)
|
||||||
{
|
//{
|
||||||
m_commsManager = new HGCommunicationsGridMode(m_networkServersInfo, m_httpServer, m_assetCache, m_sceneManager, libraryRootFolder);
|
// m_commsManager = new HGCommunicationsGridMode(m_networkServersInfo, m_httpServer, m_assetCache, m_sceneManager, libraryRootFolder);
|
||||||
|
|
||||||
HGServices = ((HGCommunicationsGridMode)m_commsManager).HGServices;
|
// HGServices = ((HGCommunicationsGridMode)m_commsManager).HGServices;
|
||||||
|
|
||||||
m_httpServer.AddStreamHandler(new SimStatusHandler());
|
// m_httpServer.AddStreamHandler(new SimStatusHandler());
|
||||||
}
|
//}
|
||||||
|
|
||||||
protected override Scene CreateScene(RegionInfo regionInfo, StorageManager storageManager,
|
protected override Scene CreateScene(RegionInfo regionInfo, StorageManager storageManager,
|
||||||
AgentCircuitManager circuitManager)
|
AgentCircuitManager circuitManager)
|
||||||
|
|
|
||||||
|
|
@ -186,28 +186,25 @@ namespace OpenSim
|
||||||
|
|
||||||
LibraryRootFolder libraryRootFolder = new LibraryRootFolder(m_configSettings.LibrariesXMLFile);
|
LibraryRootFolder libraryRootFolder = new LibraryRootFolder(m_configSettings.LibrariesXMLFile);
|
||||||
|
|
||||||
// Standalone mode is determined by !startupConfig.GetBoolean("gridmode", false)
|
//// Standalone mode is determined by !startupConfig.GetBoolean("gridmode", false)
|
||||||
if (m_configSettings.Standalone)
|
//if (m_configSettings.Standalone)
|
||||||
{
|
//{
|
||||||
InitialiseStandaloneServices(libraryRootFolder);
|
// InitialiseStandaloneServices(libraryRootFolder);
|
||||||
}
|
//}
|
||||||
else
|
//else
|
||||||
{
|
//{
|
||||||
// We are in grid mode
|
// // We are in grid mode
|
||||||
InitialiseGridServices(libraryRootFolder);
|
// InitialiseGridServices(libraryRootFolder);
|
||||||
}
|
//}
|
||||||
|
|
||||||
// Create a ModuleLoader instance
|
// Create a ModuleLoader instance
|
||||||
m_moduleLoader = new ModuleLoader(m_config.Source);
|
m_moduleLoader = new ModuleLoader(m_config.Source);
|
||||||
|
|
||||||
LoadPlugins();
|
LoadPlugins();
|
||||||
|
|
||||||
|
|
||||||
foreach (IApplicationPlugin plugin in m_plugins)
|
foreach (IApplicationPlugin plugin in m_plugins)
|
||||||
{
|
{
|
||||||
plugin.PostInitialise();
|
plugin.PostInitialise();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// Only enable logins to the regions once we have completely finished starting up (apart from scripts)
|
// Only enable logins to the regions once we have completely finished starting up (apart from scripts)
|
||||||
if ((m_commsManager != null) && (m_commsManager.GridService != null))
|
if ((m_commsManager != null) && (m_commsManager.GridService != null))
|
||||||
|
|
@ -272,56 +269,56 @@ namespace OpenSim
|
||||||
m_console.Notice(moduleCommander.Help);
|
m_console.Notice(moduleCommander.Help);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
///// <summary>
|
||||||
/// Initialises the backend services for standalone mode, and registers some http handlers
|
///// Initialises the backend services for standalone mode, and registers some http handlers
|
||||||
/// </summary>
|
///// </summary>
|
||||||
/// <param name="libraryRootFolder"></param>
|
///// <param name="libraryRootFolder"></param>
|
||||||
protected virtual void InitialiseStandaloneServices(LibraryRootFolder libraryRootFolder)
|
//protected virtual void InitialiseStandaloneServices(LibraryRootFolder libraryRootFolder)
|
||||||
{
|
//{
|
||||||
LocalInventoryService inventoryService = new LocalInventoryService();
|
// LocalInventoryService inventoryService = new LocalInventoryService();
|
||||||
inventoryService.AddPlugin(m_configSettings.StandaloneInventoryPlugin, m_configSettings.StandaloneInventorySource);
|
// inventoryService.AddPlugin(m_configSettings.StandaloneInventoryPlugin, m_configSettings.StandaloneInventorySource);
|
||||||
|
|
||||||
LocalUserServices userService =
|
// LocalUserServices userService =
|
||||||
new LocalUserServices(
|
// new LocalUserServices(
|
||||||
m_networkServersInfo.DefaultHomeLocX, m_networkServersInfo.DefaultHomeLocY, inventoryService);
|
// m_networkServersInfo.DefaultHomeLocX, m_networkServersInfo.DefaultHomeLocY, inventoryService);
|
||||||
userService.AddPlugin(m_configSettings.StandaloneUserPlugin, m_configSettings.StandaloneUserSource);
|
// userService.AddPlugin(m_configSettings.StandaloneUserPlugin, m_configSettings.StandaloneUserSource);
|
||||||
|
|
||||||
LocalBackEndServices backendService = new LocalBackEndServices();
|
// LocalBackEndServices backendService = new LocalBackEndServices();
|
||||||
|
|
||||||
LocalLoginService loginService =
|
// LocalLoginService loginService =
|
||||||
new LocalLoginService(
|
// new LocalLoginService(
|
||||||
userService, m_configSettings.StandaloneWelcomeMessage, inventoryService, backendService, m_networkServersInfo,
|
// userService, m_configSettings.StandaloneWelcomeMessage, inventoryService, backendService, m_networkServersInfo,
|
||||||
m_configSettings.StandaloneAuthenticate, libraryRootFolder);
|
// m_configSettings.StandaloneAuthenticate, libraryRootFolder);
|
||||||
|
|
||||||
m_commsManager
|
// m_commsManager
|
||||||
= new CommunicationsLocal(
|
// = new CommunicationsLocal(
|
||||||
m_networkServersInfo, m_httpServer, m_assetCache, userService, userService,
|
// m_networkServersInfo, m_httpServer, m_assetCache, userService, userService,
|
||||||
inventoryService, backendService, userService,
|
// inventoryService, backendService, userService,
|
||||||
libraryRootFolder, m_configSettings.DumpAssetsToFile);
|
// libraryRootFolder, m_configSettings.DumpAssetsToFile);
|
||||||
|
|
||||||
// set up XMLRPC handler for client's initial login request message
|
// // set up XMLRPC handler for client's initial login request message
|
||||||
m_httpServer.AddXmlRPCHandler("login_to_simulator", loginService.XmlRpcLoginMethod);
|
// m_httpServer.AddXmlRPCHandler("login_to_simulator", loginService.XmlRpcLoginMethod);
|
||||||
|
|
||||||
// provides the web form login
|
// // provides the web form login
|
||||||
m_httpServer.AddHTTPHandler("login", loginService.ProcessHTMLLogin);
|
// m_httpServer.AddHTTPHandler("login", loginService.ProcessHTMLLogin);
|
||||||
|
|
||||||
// Provides the LLSD login
|
// // Provides the LLSD login
|
||||||
m_httpServer.SetDefaultLLSDHandler(loginService.LLSDLoginMethod);
|
// m_httpServer.SetDefaultLLSDHandler(loginService.LLSDLoginMethod);
|
||||||
|
|
||||||
// provide grid info
|
// // provide grid info
|
||||||
// m_gridInfoService = new GridInfoService(m_config.Source.Configs["Startup"].GetString("inifile", Path.Combine(Util.configDir(), "OpenSim.ini")));
|
// // m_gridInfoService = new GridInfoService(m_config.Source.Configs["Startup"].GetString("inifile", Path.Combine(Util.configDir(), "OpenSim.ini")));
|
||||||
m_gridInfoService = new GridInfoService(m_config.Source);
|
// m_gridInfoService = new GridInfoService(m_config.Source);
|
||||||
m_httpServer.AddXmlRPCHandler("get_grid_info", m_gridInfoService.XmlRpcGridInfoMethod);
|
// m_httpServer.AddXmlRPCHandler("get_grid_info", m_gridInfoService.XmlRpcGridInfoMethod);
|
||||||
m_httpServer.AddStreamHandler(new RestStreamHandler("GET", "/get_grid_info", m_gridInfoService.RestGetGridInfoMethod));
|
// m_httpServer.AddStreamHandler(new RestStreamHandler("GET", "/get_grid_info", m_gridInfoService.RestGetGridInfoMethod));
|
||||||
}
|
//}
|
||||||
|
|
||||||
protected virtual void InitialiseGridServices(LibraryRootFolder libraryRootFolder)
|
//protected virtual void InitialiseGridServices(LibraryRootFolder libraryRootFolder)
|
||||||
{
|
//{
|
||||||
m_commsManager
|
// m_commsManager
|
||||||
= new CommunicationsOGS1(m_networkServersInfo, m_httpServer, m_assetCache, libraryRootFolder);
|
// = new CommunicationsOGS1(m_networkServersInfo, m_httpServer, m_assetCache, libraryRootFolder);
|
||||||
|
|
||||||
m_httpServer.AddStreamHandler(new SimStatusHandler());
|
// m_httpServer.AddStreamHandler(new SimStatusHandler());
|
||||||
}
|
//}
|
||||||
|
|
||||||
protected override void Initialize()
|
protected override void Initialize()
|
||||||
{
|
{
|
||||||
|
|
|
||||||
42
prebuild.xml
42
prebuild.xml
|
|
@ -1429,6 +1429,48 @@
|
||||||
</Files>
|
</Files>
|
||||||
</Project>
|
</Project>
|
||||||
|
|
||||||
|
<Project name="OpenSim.ApplicationPlugins.CreateCommsManager" path="OpenSim/ApplicationPlugins/CreateCommsManager" type="Library">
|
||||||
|
<Configuration name="Debug">
|
||||||
|
<Options>
|
||||||
|
<OutputPath>../../../bin/</OutputPath>
|
||||||
|
</Options>
|
||||||
|
</Configuration>
|
||||||
|
<Configuration name="Release">
|
||||||
|
<Options>
|
||||||
|
<OutputPath>../../../bin/</OutputPath>
|
||||||
|
</Options>
|
||||||
|
</Configuration>
|
||||||
|
|
||||||
|
<ReferencePath>../../../bin/</ReferencePath>
|
||||||
|
<Reference name="Mono.Addins.dll" />
|
||||||
|
<Reference name="System"/>
|
||||||
|
<Reference name="System.Xml"/>
|
||||||
|
<Reference name="OpenMetaverseTypes.dll" />
|
||||||
|
<Reference name="OpenMetaverse.StructuredData.dll"/>
|
||||||
|
<Reference name="Nini.dll" />
|
||||||
|
<Reference name="OpenSim"/>
|
||||||
|
<Reference name="OpenSim.Region.ClientStack"/>
|
||||||
|
<Reference name="OpenSim.Region.CoreModules"/>
|
||||||
|
<Reference name="OpenSim.Region.Framework"/>
|
||||||
|
<Reference name="OpenSim.Framework"/>
|
||||||
|
<Reference name="OpenSim.Framework.Console"/>
|
||||||
|
<Reference name="OpenSim.Framework.RegionLoader.Filesystem"/>
|
||||||
|
<Reference name="OpenSim.Framework.RegionLoader.Web"/>
|
||||||
|
<Reference name="OpenSim.Framework.Servers"/>
|
||||||
|
<Reference name="log4net.dll"/>
|
||||||
|
<Reference name="OpenSim.Region.Communications.OGS1"/>
|
||||||
|
<Reference name="XMLRPC.dll"/>
|
||||||
|
<Reference name="OpenSim.Region.Communications.Local"/>
|
||||||
|
<Reference name="OpenSim.Region.Communications.Hypergrid"/>
|
||||||
|
<Reference name="OpenSim.Framework.Communications"/>
|
||||||
|
<Reference name="OpenSim.ApplicationPlugins.LoadRegions"/>
|
||||||
|
|
||||||
|
<Files>
|
||||||
|
<Match pattern="*.cs" recurse="true"/>
|
||||||
|
<Match pattern="*.addin.xml" path="Resources" buildAction="EmbeddedResource" recurse="true"/>
|
||||||
|
</Files>
|
||||||
|
</Project>
|
||||||
|
|
||||||
<Project name="OpenSim.ApplicationPlugins.RemoteController" path="OpenSim/ApplicationPlugins/RemoteController" type="Library">
|
<Project name="OpenSim.ApplicationPlugins.RemoteController" path="OpenSim/ApplicationPlugins/RemoteController" type="Library">
|
||||||
<Configuration name="Debug">
|
<Configuration name="Debug">
|
||||||
<Options>
|
<Options>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue