From 8ecfc9a717c259fd238312888f6178b3f86c008a Mon Sep 17 00:00:00 2001 From: Melanie Thielker Date: Fri, 10 Jul 2009 20:17:13 +0000 Subject: Committing the interface change and the addition to the modules to get the ball rolling on replacable modules. No user functionality yet --- .../Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs | 5 +++++ .../ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs | 5 +++++ .../ServiceConnectorsOut/Asset/RemoteAssetServiceConnector.cs | 5 +++++ .../CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs | 5 +++++ .../Inventory/LocalInventoryServiceConnector.cs | 5 +++++ .../Inventory/RemoteInventoryServiceConnector.cs | 5 +++++ .../ServiceConnectorsOut/Land/LocalLandServiceConnector.cs | 5 +++++ .../ServiceConnectorsOut/Land/RemoteLandServiceConnector.cs | 5 +++++ .../Neighbour/LocalNeighbourServiceConnector.cs | 5 +++++ .../Neighbour/RemoteNeighourServiceConnector.cs | 5 +++++ .../ServiceConnectorsOut/User/LocalUserServiceConnector.cs | 5 +++++ .../ServiceConnectorsOut/User/RemoteUserServiceConnector.cs | 6 ++++++ 12 files changed, 61 insertions(+) (limited to 'OpenSim/Region/CoreModules/ServiceConnectorsOut') diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs index a9e9dc2..2990299 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs @@ -52,6 +52,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset private bool m_Enabled = false; + public Type ReplacableInterface + { + get { return null; } + } + public string Name { get { return "HGAssetBroker"; } diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs index 13c4b52..cda205b 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs @@ -51,6 +51,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset private bool m_Enabled = false; + public Type ReplacableInterface + { + get { return null; } + } + public string Name { get { return "LocalAssetServicesConnector"; } diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/RemoteAssetServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/RemoteAssetServiceConnector.cs index e554c68..a603173 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/RemoteAssetServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/RemoteAssetServiceConnector.cs @@ -48,6 +48,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset private bool m_Enabled = false; private IImprovedAssetCache m_Cache; + public Type ReplacableInterface + { + get { return null; } + } + public string Name { get { return "RemoteAssetServicesConnector"; } diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs index 9f6c1a2..1b3d815 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs @@ -56,6 +56,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory private ISessionAuthInventoryService m_HGService; private string m_LocalGridInventoryURI = string.Empty; + public Type ReplacableInterface + { + get { return null; } + } + public string Name { get { return "HGInventoryBroker"; } diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs index 8f04025..a304357 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs @@ -53,6 +53,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory private bool m_Enabled = false; private bool m_Initialized = false; + public Type ReplacableInterface + { + get { return null; } + } + public string Name { get { return "LocalInventoryServicesConnector"; } diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs index 9b51da7..31f4032 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs @@ -50,6 +50,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory private Scene m_Scene; private InventoryServicesConnector m_RemoteConnector; + public Type ReplacableInterface + { + get { return null; } + } + public string Name { get { return "RemoteInventoryServicesConnector"; } diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/LocalLandServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/LocalLandServiceConnector.cs index 73d12e5..2b7f7e8 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/LocalLandServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/LocalLandServiceConnector.cs @@ -60,6 +60,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Land #region ISharedRegionModule + public Type ReplacableInterface + { + get { return null; } + } + public string Name { get { return "LocalLandServicesConnector"; } diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/RemoteLandServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/RemoteLandServiceConnector.cs index 27f811c..f50cef9 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/RemoteLandServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/RemoteLandServiceConnector.cs @@ -49,6 +49,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Land private bool m_Enabled = false; private LocalLandServicesConnector m_LocalService; + public Type ReplacableInterface + { + get { return null; } + } + public string Name { get { return "RemoteLandServicesConnector"; } diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/LocalNeighbourServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/LocalNeighbourServiceConnector.cs index f16bc46..0d4a09f 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/LocalNeighbourServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/LocalNeighbourServiceConnector.cs @@ -60,6 +60,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Neighbour #region ISharedRegionModule + public Type ReplacableInterface + { + get { return null; } + } + public string Name { get { return "LocalNeighbourServicesConnector"; } diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/RemoteNeighourServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/RemoteNeighourServiceConnector.cs index dc876e3..01c95d7 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/RemoteNeighourServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/RemoteNeighourServiceConnector.cs @@ -51,6 +51,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Neighbour private string serviceDll; private List m_Scenes = new List(); + public Type ReplacableInterface + { + get { return null; } + } + public string Name { get { return "RemoteNeighbourServicesConnector"; } diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/User/LocalUserServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/User/LocalUserServiceConnector.cs index 1efb8f6..c8703ee 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/User/LocalUserServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/User/LocalUserServiceConnector.cs @@ -46,6 +46,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.User private bool m_Enabled = false; + public Type ReplacableInterface + { + get { return null; } + } + public string Name { get { return "LocalUserServicesConnector"; } diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/User/RemoteUserServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/User/RemoteUserServiceConnector.cs index 2e9739b..41d360f 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/User/RemoteUserServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/User/RemoteUserServiceConnector.cs @@ -25,6 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +using System; using Nini.Config; using log4net; using System.Reflection; @@ -44,6 +45,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.User private bool m_Enabled = false; + public Type ReplacableInterface + { + get { return null; } + } + public string Name { get { return "RemoteUserServicesConnector"; } -- cgit v1.1