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

more refactoring

afrisby
MW 2007-10-03 07:50:07 +00:00
parent 9b1eefbcde
commit 652654176a
5 changed files with 166 additions and 173 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
OpenSim/Region/Application/OpenSimMain.cs
View File

@ -159,17 +159,24 @@ namespace OpenSim
if (m_sandbox) if (m_sandbox)
{ {
CommunicationsLocal.LocalSettings settings = new CommunicationsLocal.LocalSettings(standaloneWelcomeMessage, standaloneAuthenticate);
LocalInventoryService inventoryService = new LocalInventoryService(); LocalInventoryService inventoryService = new LocalInventoryService();
inventoryService.AddPlugin(standaloneInventoryPlugin); inventoryService.AddPlugin(standaloneInventoryPlugin);
LocalUserServices userService = new LocalUserServices(m_networkServersInfo, m_networkServersInfo.DefaultHomeLocX, m_networkServersInfo.DefaultHomeLocY, inventoryService ); LocalUserServices userService = new LocalUserServices(m_networkServersInfo, m_networkServersInfo.DefaultHomeLocX, m_networkServersInfo.DefaultHomeLocY, inventoryService );
userService.AddPlugin( standaloneUserPlugin ); userService.AddPlugin( standaloneUserPlugin );
CommunicationsLocal localComms = new CommunicationsLocal(m_networkServersInfo, m_httpServer, m_assetCache, settings, userService, inventoryService); LocalBackEndServices backendService = new LocalBackEndServices();
CommunicationsLocal localComms = new CommunicationsLocal(m_networkServersInfo, m_httpServer, m_assetCache, userService, inventoryService, backendService, backendService);
m_commsManager = localComms; m_commsManager = localComms;
LocalLoginService loginService = new LocalLoginService(userService, standaloneWelcomeMessage, localComms, m_networkServersInfo, standaloneAuthenticate);
loginService.OnLoginToRegion += backendService.AddNewSession;
m_httpServer.AddXmlRPCHandler("login_to_simulator", loginService.XmlRpcLoginMethod);
if (standaloneAuthenticate) if (standaloneAuthenticate)
{ {
this.CreateAccount = localComms.doCreate; this.CreateAccount = localComms.doCreate;

26
OpenSim/Region/Communications/Local/CommunicationsLocal.cs
View File

@ -39,34 +39,14 @@ namespace OpenSim.Region.Communications.Local
{ {
public class CommunicationsLocal : CommunicationsManager public class CommunicationsLocal : CommunicationsManager
{ {
public CommunicationsLocal(NetworkServersInfo serversInfo, BaseHttpServer httpServer, AssetCache assetCache, LocalSettings settings, LocalUserServices userService, LocalInventoryService inventoryService) public CommunicationsLocal(NetworkServersInfo serversInfo, BaseHttpServer httpServer, AssetCache assetCache, LocalUserServices userService, LocalInventoryService inventoryService, IInterRegionCommunications interRegionService, IGridServices gridService)
: base(serversInfo, httpServer, assetCache) : base(serversInfo, httpServer, assetCache)
{ {
m_inventoryService = inventoryService; m_inventoryService = inventoryService;
m_userService = userService; m_userService = userService;
m_gridService = gridService;
m_interRegion = interRegionService;
LocalBackEndServices backendService = new LocalBackEndServices();
m_gridService = backendService;
m_interRegion = backendService;
LocalLoginService loginService = new LocalLoginService(userService, settings.WelcomeMessage, this, serversInfo, settings.AccountAuthentication);
loginService.OnLoginToRegion += backendService.AddNewSession;
httpServer.AddXmlRPCHandler("login_to_simulator", loginService.XmlRpcLoginMethod);
}
public class LocalSettings
{
public string WelcomeMessage;
public bool AccountAuthentication = false;
public LocalSettings(string welcomeMessage, bool accountsAuthenticate)
{
WelcomeMessage = welcomeMessage;
AccountAuthentication = accountsAuthenticate;
}
} }
} }

1
OpenSim/Region/Communications/Local/LocalUserServices.cs
View File

@ -22,6 +22,7 @@ namespace OpenSim.Region.Communications.Local
m_defaultHomeY = defaultHomeLocY; m_defaultHomeY = defaultHomeLocY;
m_inventoryService = inventoryService; m_inventoryService = inventoryService;
} }
public override UserProfileData SetupMasterUser(string firstName, string lastName) public override UserProfileData SetupMasterUser(string firstName, string lastName)

284
OpenSim/Region/Environment/ModuleLoader.cs
View File

@ -6,151 +6,151 @@ using OpenSim.Region.Environment.Interfaces;
using OpenSim.Region.Environment.Modules; using OpenSim.Region.Environment.Modules;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Environment.Scenes;
namespace OpenSim.Region.Environment namespace OpenSim.Region.Environment
{ {
public class ModuleLoader public class ModuleLoader
{ {
public Dictionary<string, Assembly> LoadedAssemblys = new Dictionary<string, Assembly>(); public Dictionary<string, Assembly> LoadedAssemblys = new Dictionary<string, Assembly>();
public List<IRegionModule> LoadedModules = new List<IRegionModule>(); public List<IRegionModule> LoadedModules = new List<IRegionModule>();
public Dictionary<string, IRegionModule> LoadedSharedModules = new Dictionary<string, IRegionModule>(); public Dictionary<string, IRegionModule> LoadedSharedModules = new Dictionary<string, IRegionModule>();
public ModuleLoader() public ModuleLoader()
{ {
} }
/// <summary> /// <summary>
/// Should have a module factory? /// Should have a module factory?
/// </summary> /// </summary>
/// <param name="scene"></param> /// <param name="scene"></param>
public void CreateDefaultModules(Scene scene, string exceptModules) public void CreateDefaultModules(Scene scene, string exceptModules)
{ {
IRegionModule module = new XferModule(); IRegionModule module = new XferModule();
InitialiseModule(module, scene); InitialiseModule(module, scene);
module = new ChatModule(); module = new ChatModule();
InitialiseModule(module, scene); InitialiseModule(module, scene);
module = new AvatarProfilesModule(); module = new AvatarProfilesModule();
InitialiseModule(module, scene); InitialiseModule(module, scene);
LoadRegionModule("OpenSim.Region.ExtensionsScriptModule.dll", "ExtensionsScriptingModule", scene); LoadRegionModule("OpenSim.Region.ExtensionsScriptModule.dll", "ExtensionsScriptingModule", scene);
string lslPath = Path.Combine("ScriptEngines", "OpenSim.Region.ScriptEngine.DotNetEngine.dll"); string lslPath = Path.Combine("ScriptEngines", "OpenSim.Region.ScriptEngine.DotNetEngine.dll");
LoadRegionModule(lslPath, "LSLScriptingModule", scene); LoadRegionModule(lslPath, "LSLScriptingModule", scene);
} }
public void LoadDefaultSharedModules(string exceptModules) public void LoadDefaultSharedModules(string exceptModules)
{ {
DynamicTextureModule dynamicModule = new DynamicTextureModule(); DynamicTextureModule dynamicModule = new DynamicTextureModule();
LoadedSharedModules.Add(dynamicModule.GetName(), dynamicModule); LoadedSharedModules.Add(dynamicModule.GetName(), dynamicModule);
} }
public void InitialiseSharedModules(Scene scene) public void InitialiseSharedModules(Scene scene)
{ {
foreach (IRegionModule module in LoadedSharedModules.Values) foreach (IRegionModule module in LoadedSharedModules.Values)
{ {
module.Initialise(scene); module.Initialise(scene);
scene.AddModule(module.GetName(), module); //should be doing this? scene.AddModule(module.GetName(), module); //should be doing this?
} }
} }
private void InitialiseModule(IRegionModule module, Scene scene) private void InitialiseModule(IRegionModule module, Scene scene)
{ {
module.Initialise(scene); module.Initialise(scene);
scene.AddModule(module.GetName(), module); scene.AddModule(module.GetName(), module);
LoadedModules.Add(module); LoadedModules.Add(module);
} }
/// <summary> /// <summary>
/// Loads/initialises a Module instance that can be used by mutliple Regions /// Loads/initialises a Module instance that can be used by mutliple Regions
/// </summary> /// </summary>
/// <param name="dllName"></param> /// <param name="dllName"></param>
/// <param name="moduleName"></param> /// <param name="moduleName"></param>
/// <param name="scene"></param> /// <param name="scene"></param>
public void LoadSharedModule(string dllName, string moduleName) public void LoadSharedModule(string dllName, string moduleName)
{ {
IRegionModule module = LoadModule(dllName, moduleName); IRegionModule module = LoadModule(dllName, moduleName);
if (module != null) if (module != null)
{ {
LoadedSharedModules.Add(module.GetName(), module); LoadedSharedModules.Add(module.GetName(), module);
} }
} }
public void LoadRegionModule(string dllName, string moduleName, Scene scene) public void LoadRegionModule(string dllName, string moduleName, Scene scene)
{ {
IRegionModule module = LoadModule(dllName, moduleName); IRegionModule module = LoadModule(dllName, moduleName);
if (module != null) if (module != null)
{ {
InitialiseModule(module, scene); InitialiseModule(module, scene);
} }
} }
/// <summary> /// <summary>
/// Loads a external Module (if not already loaded) and creates a new instance of it. /// Loads a external Module (if not already loaded) and creates a new instance of it.
/// </summary> /// </summary>
/// <param name="dllName"></param> /// <param name="dllName"></param>
/// <param name="moduleName"></param> /// <param name="moduleName"></param>
/// <param name="scene"></param> /// <param name="scene"></param>
public IRegionModule LoadModule(string dllName, string moduleName) public IRegionModule LoadModule(string dllName, string moduleName)
{ {
Assembly pluginAssembly = null; Assembly pluginAssembly = null;
if (LoadedAssemblys.ContainsKey(dllName)) if (LoadedAssemblys.ContainsKey(dllName))
{ {
pluginAssembly = LoadedAssemblys[dllName]; pluginAssembly = LoadedAssemblys[dllName];
} }
else else
{ {
pluginAssembly = Assembly.LoadFrom(dllName); pluginAssembly = Assembly.LoadFrom(dllName);
LoadedAssemblys.Add(dllName, pluginAssembly); LoadedAssemblys.Add(dllName, pluginAssembly);
} }
IRegionModule module = null; IRegionModule module = null;
foreach (Type pluginType in pluginAssembly.GetTypes()) foreach (Type pluginType in pluginAssembly.GetTypes())
{ {
if (pluginType.IsPublic) if (pluginType.IsPublic)
{ {
if (!pluginType.IsAbstract) if (!pluginType.IsAbstract)
{ {
Type typeInterface = pluginType.GetInterface("IRegionModule", true); Type typeInterface = pluginType.GetInterface("IRegionModule", true);
if (typeInterface != null) if (typeInterface != null)
{ {
module = module =
(IRegionModule) Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); (IRegionModule) Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
break; break;
} }
typeInterface = null; typeInterface = null;
} }
} }
} }
pluginAssembly = null; pluginAssembly = null;
if ((module != null) || (module.GetName() == moduleName)) if ((module != null) || (module.GetName() == moduleName))
{ {
return module; return module;
} }
return null; return null;
} }
public void PostInitialise() public void PostInitialise()
{ {
foreach (IRegionModule module in LoadedSharedModules.Values) foreach (IRegionModule module in LoadedSharedModules.Values)
{ {
module.PostInitialise(); module.PostInitialise();
} }
foreach (IRegionModule module in LoadedModules) foreach (IRegionModule module in LoadedModules)
{ {
module.PostInitialise(); module.PostInitialise();
} }
} }
public void ClearCache() public void ClearCache()
{ {
LoadedAssemblys.Clear(); LoadedAssemblys.Clear();
} }
} }
} }

13
OpenSim/Region/Examples/SimpleApp/Program.cs
View File

@ -40,13 +40,18 @@ namespace SimpleApp
public void Run() public void Run()
{ {
base.StartUp(); base.StartUp();
CommunicationsLocal.LocalSettings settings = new CommunicationsLocal.LocalSettings("", false);
LocalInventoryService inventoryService = new LocalInventoryService(); LocalInventoryService inventoryService = new LocalInventoryService();
LocalUserServices userService = new LocalUserServices(m_networkServersInfo, m_networkServersInfo.DefaultHomeLocX, m_networkServersInfo.DefaultHomeLocY, inventoryService); LocalUserServices userService = new LocalUserServices(m_networkServersInfo, m_networkServersInfo.DefaultHomeLocX, m_networkServersInfo.DefaultHomeLocY, inventoryService);
LocalBackEndServices backendService = new LocalBackEndServices();
m_commsManager = new CommunicationsLocal(m_networkServersInfo, m_httpServer, m_assetCache, settings, userService, inventoryService ); CommunicationsLocal localComms = new CommunicationsLocal(m_networkServersInfo, m_httpServer, m_assetCache, userService, inventoryService, backendService, backendService);
m_commsManager = localComms;
LocalLoginService loginService = new LocalLoginService(userService, "", localComms, m_networkServersInfo, false);
loginService.OnLoginToRegion += backendService.AddNewSession;
m_httpServer.AddXmlRPCHandler("login_to_simulator", loginService.XmlRpcLoginMethod);
m_log.Notice(m_log.LineInfo); m_log.Notice(m_log.LineInfo);