Committing the interface change and the addition to the modules to get

the ball rolling on replacable modules. No user functionality yet
trunk
Melanie Thielker 2009-07-10 20:17:13 +00:00
parent 2ff08c84f5
commit 8ecfc9a717
37 changed files with 195 additions and 0 deletions

View File

@ -110,6 +110,11 @@ namespace OpenSim.Client.Linden
} }
public Type ReplacableInterface
{
get { return null; }
}
public string Name public string Name
{ {
get { return "LLClientStackModule"; } get { return "LLClientStackModule"; }

View File

@ -125,6 +125,11 @@ namespace OpenSim.Client.Linden
} }
public Type ReplacableInterface
{
get { return null; }
}
public string Name public string Name
{ {
get { return "LLProxyLoginModule"; } get { return "LLProxyLoginModule"; }

View File

@ -155,6 +155,11 @@ namespace OpenSim.Client.Linden
} }
} }
public Type ReplacableInterface
{
get { return null; }
}
public string Name public string Name
{ {
get { return "LLStandaloneLoginModule"; } get { return "LLStandaloneLoginModule"; }

View File

@ -81,6 +81,11 @@ namespace OpenSim.Region.CoreModules.Agent.Capabilities
get { return "Capabilities Module"; } get { return "Capabilities Module"; }
} }
public Type ReplacableInterface
{
get { return null; }
}
public void AddCapsHandler(UUID agentId) public void AddCapsHandler(UUID agentId)
{ {
if (m_scene.RegionInfo.EstateSettings.IsBanned(agentId)) if (m_scene.RegionInfo.EstateSettings.IsBanned(agentId))

View File

@ -290,6 +290,11 @@ namespace OpenSim.Region.CoreModules.Asset
get { return "CenomeMemoryAssetCache"; } get { return "CenomeMemoryAssetCache"; }
} }
public Type ReplacableInterface
{
get { return null; }
}
/// <summary> /// <summary>
/// New region is being added to server. /// New region is being added to server.
/// </summary> /// </summary>

View File

@ -54,6 +54,11 @@ namespace OpenSim.Region.CoreModules.Asset
get { return "CoreAssetCache"; } get { return "CoreAssetCache"; }
} }
public Type ReplacableInterface
{
get { return null; }
}
public void Initialise(IConfigSource source) public void Initialise(IConfigSource source)
{ {
IConfig moduleConfig = source.Configs["Modules"]; IConfig moduleConfig = source.Configs["Modules"];

View File

@ -146,6 +146,11 @@ namespace Flotsam.RegionModules.AssetCache
m_InvalidChars.AddRange(Path.GetInvalidFileNameChars()); m_InvalidChars.AddRange(Path.GetInvalidFileNameChars());
} }
public Type ReplacableInterface
{
get { return null; }
}
public string Name public string Name
{ {
get { return m_ModuleName; } get { return m_ModuleName; }

View File

@ -51,6 +51,11 @@ namespace OpenSim.Region.CoreModules.Asset
// Instrumentation // Instrumentation
private uint m_DebugRate = 0; private uint m_DebugRate = 0;
public Type ReplacableInterface
{
get { return null; }
}
public string Name public string Name
{ {
get { return "GlynnTuckerAssetCache"; } get { return "GlynnTuckerAssetCache"; }

View File

@ -125,6 +125,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
{ {
} }
public Type ReplacableInterface
{
get { return null; }
}
public virtual string Name public virtual string Name
{ {
get { return "ChatModule"; } get { return "ChatModule"; }

View File

@ -74,6 +74,11 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
private IHttpServer m_HttpServer = null; private IHttpServer m_HttpServer = null;
public Type ReplacableInterface
{
get { return null; }
}
public string Name public string Name
{ {
get { return "UrlModule"; } get { return "UrlModule"; }

View File

@ -77,6 +77,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Asset
{ {
} }
public Type ReplacableInterface
{
get { return null; }
}
public string Name public string Name
{ {
get { return "RegionAssetService"; } get { return "RegionAssetService"; }

View File

@ -81,6 +81,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Authentication
{ {
} }
public Type ReplacableInterface
{
get { return null; }
}
public string Name public string Name
{ {
get { return "HGAuthServiceInConnectorModule"; } get { return "HGAuthServiceInConnectorModule"; }

View File

@ -77,6 +77,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Inventory
{ {
} }
public Type ReplacableInterface
{
get { return null; }
}
public string Name public string Name
{ {
get { return "RegionInventoryService"; } get { return "RegionInventoryService"; }

View File

@ -81,6 +81,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Land
{ {
} }
public Type ReplacableInterface
{
get { return null; }
}
public string Name public string Name
{ {
get { return "LandServiceInConnectorModule"; } get { return "LandServiceInConnectorModule"; }

View File

@ -81,6 +81,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Neighbour
{ {
} }
public Type ReplacableInterface
{
get { return null; }
}
public string Name public string Name
{ {
get { return "NeighbourServiceInConnectorModule"; } get { return "NeighbourServiceInConnectorModule"; }

View File

@ -77,6 +77,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Simulation
{ {
} }
public Type ReplacableInterface
{
get { return null; }
}
public string Name public string Name
{ {
get { return "SimulationService"; } get { return "SimulationService"; }

View File

@ -52,6 +52,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
private bool m_Enabled = false; private bool m_Enabled = false;
public Type ReplacableInterface
{
get { return null; }
}
public string Name public string Name
{ {
get { return "HGAssetBroker"; } get { return "HGAssetBroker"; }

View File

@ -51,6 +51,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
private bool m_Enabled = false; private bool m_Enabled = false;
public Type ReplacableInterface
{
get { return null; }
}
public string Name public string Name
{ {
get { return "LocalAssetServicesConnector"; } get { return "LocalAssetServicesConnector"; }

View File

@ -48,6 +48,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
private bool m_Enabled = false; private bool m_Enabled = false;
private IImprovedAssetCache m_Cache; private IImprovedAssetCache m_Cache;
public Type ReplacableInterface
{
get { return null; }
}
public string Name public string Name
{ {
get { return "RemoteAssetServicesConnector"; } get { return "RemoteAssetServicesConnector"; }

View File

@ -56,6 +56,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
private ISessionAuthInventoryService m_HGService; private ISessionAuthInventoryService m_HGService;
private string m_LocalGridInventoryURI = string.Empty; private string m_LocalGridInventoryURI = string.Empty;
public Type ReplacableInterface
{
get { return null; }
}
public string Name public string Name
{ {
get { return "HGInventoryBroker"; } get { return "HGInventoryBroker"; }

View File

@ -53,6 +53,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
private bool m_Enabled = false; private bool m_Enabled = false;
private bool m_Initialized = false; private bool m_Initialized = false;
public Type ReplacableInterface
{
get { return null; }
}
public string Name public string Name
{ {
get { return "LocalInventoryServicesConnector"; } get { return "LocalInventoryServicesConnector"; }

View File

@ -50,6 +50,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
private Scene m_Scene; private Scene m_Scene;
private InventoryServicesConnector m_RemoteConnector; private InventoryServicesConnector m_RemoteConnector;
public Type ReplacableInterface
{
get { return null; }
}
public string Name public string Name
{ {
get { return "RemoteInventoryServicesConnector"; } get { return "RemoteInventoryServicesConnector"; }

View File

@ -60,6 +60,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Land
#region ISharedRegionModule #region ISharedRegionModule
public Type ReplacableInterface
{
get { return null; }
}
public string Name public string Name
{ {
get { return "LocalLandServicesConnector"; } get { return "LocalLandServicesConnector"; }

View File

@ -49,6 +49,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Land
private bool m_Enabled = false; private bool m_Enabled = false;
private LocalLandServicesConnector m_LocalService; private LocalLandServicesConnector m_LocalService;
public Type ReplacableInterface
{
get { return null; }
}
public string Name public string Name
{ {
get { return "RemoteLandServicesConnector"; } get { return "RemoteLandServicesConnector"; }

View File

@ -60,6 +60,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Neighbour
#region ISharedRegionModule #region ISharedRegionModule
public Type ReplacableInterface
{
get { return null; }
}
public string Name public string Name
{ {
get { return "LocalNeighbourServicesConnector"; } get { return "LocalNeighbourServicesConnector"; }

View File

@ -51,6 +51,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Neighbour
private string serviceDll; private string serviceDll;
private List<Scene> m_Scenes = new List<Scene>(); private List<Scene> m_Scenes = new List<Scene>();
public Type ReplacableInterface
{
get { return null; }
}
public string Name public string Name
{ {
get { return "RemoteNeighbourServicesConnector"; } get { return "RemoteNeighbourServicesConnector"; }

View File

@ -46,6 +46,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.User
private bool m_Enabled = false; private bool m_Enabled = false;
public Type ReplacableInterface
{
get { return null; }
}
public string Name public string Name
{ {
get { return "LocalUserServicesConnector"; } get { return "LocalUserServicesConnector"; }

View File

@ -25,6 +25,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
using System;
using Nini.Config; using Nini.Config;
using log4net; using log4net;
using System.Reflection; using System.Reflection;
@ -44,6 +45,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.User
private bool m_Enabled = false; private bool m_Enabled = false;
public Type ReplacableInterface
{
get { return null; }
}
public string Name public string Name
{ {
get { return "RemoteUserServicesConnector"; } get { return "RemoteUserServicesConnector"; }

View File

@ -159,6 +159,11 @@ namespace OpenSim.Region.CoreModules.World.Terrain
{ {
} }
public Type ReplacableInterface
{
get { return null; }
}
public string Name public string Name
{ {
get { return "TerrainModule"; } get { return "TerrainModule"; }

View File

@ -128,6 +128,11 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
{ {
} }
public Type ReplacableInterface
{
get { return null; }
}
public virtual string Name public virtual string Name
{ {
get { return "WorldMapModule"; } get { return "WorldMapModule"; }

View File

@ -39,6 +39,20 @@ namespace OpenSim.Region.Framework.Interfaces
/// </value> /// </value>
string Name { get; } string Name { get; }
/// <summary>
/// If this returns non-null, it is the type of an interface that
/// this module intends to register.
/// This will cause the loader to defer loading of this module
/// until all other modules have been loaded. If no other module
/// has registered the interface by then, this module will be
/// activated, else it will remain inactive, letting the other module
/// take over. This should return non-null ONLY in modules that are
/// intended to be easily replacable, e.g. stub implementations
/// that the developer expects to be replaced by third party provided
/// modules.
/// </summary>
Type ReplacableInterface { get; }
/// <summary> /// <summary>
/// This is called to initialize the region module. For shared modules, this is called /// This is called to initialize the region module. For shared modules, this is called
/// exactly once, after creating the single (shared) instance. For non-shared modules, /// exactly once, after creating the single (shared) instance. For non-shared modules,

View File

@ -54,6 +54,11 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat
#region INonSharedRegionModule Members #region INonSharedRegionModule Members
public Type ReplacableInterface
{
get { return null; }
}
public string Name public string Name
{ {
get { return "IRCBridgeModule"; } get { return "IRCBridgeModule"; }

View File

@ -214,6 +214,11 @@ namespace OpenSim.Region.OptionalModules.Avatar.Concierge
{ {
} }
public Type ReplacableInterface
{
get { return null; }
}
public override string Name public override string Name
{ {
get { return "ConciergeModule"; } get { return "ConciergeModule"; }

View File

@ -177,6 +177,11 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
m_msgTransferModule = null; m_msgTransferModule = null;
} }
public Type ReplacableInterface
{
get { return null; }
}
public string Name public string Name
{ {
get { return "XmlRpcGroupsMessaging"; } get { return "XmlRpcGroupsMessaging"; }

View File

@ -222,6 +222,11 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
m_clientRequestIDFlushTimer.Stop(); m_clientRequestIDFlushTimer.Stop();
} }
public Type ReplacableInterface
{
get { return null; }
}
public string Name public string Name
{ {
get { return "XmlRpcGroupsModule"; } get { return "XmlRpcGroupsModule"; }

View File

@ -207,6 +207,11 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
{ {
} }
public Type ReplacableInterface
{
get { return null; }
}
public string Name public string Name
{ {
get { return "Common." + ScriptEngineName; } get { return "Common." + ScriptEngineName; }

View File

@ -402,6 +402,11 @@ namespace OpenSim.Region.ScriptEngine.XEngine
return 0; return 0;
} }
public Type ReplacableInterface
{
get { return null; }
}
public string Name public string Name
{ {
get { return "XEngine"; } get { return "XEngine"; }