From 6abffedab5646c0c9d76a308cb9d7a722613fe14 Mon Sep 17 00:00:00 2001 From: diva Date: Sun, 14 Jun 2009 19:44:56 +0000 Subject: [PATCH] Renamed Region/CoreModules/ServiceConnectors to Region/CoreModules/ServiceConnectorsOut. No functional changes. --- .../Resources/CoreModulePlugin.addin.xml | 25 ++++++++++--------- .../Asset/HGAssetBroker.cs | 2 +- .../Asset/LocalAssetServiceConnector.cs | 2 +- .../Asset/RemoteAssetServiceConnector.cs | 2 +- .../Interregion/LocalInterregionComms.cs | 2 +- .../Interregion/RESTInterregionComms.cs | 2 +- .../Inventory/HGInventoryBroker.cs | 2 +- .../LocalInventoryServiceConnector.cs | 2 +- .../RemoteInventoryServiceConnector.cs | 2 +- .../LocalNeighbourServiceConnector.cs | 2 +- .../RemoteNeighourServiceConnector.cs | 2 +- .../User/LocalUserServiceConnector.cs | 2 +- .../User/RemoteUserServiceConnector.cs | 2 +- .../Scenes/Tests/ScenePresenceTests.cs | 2 +- .../Scenes/Tests/StandaloneTeleportTests.cs | 2 +- .../Tests/Common/Setup/SceneSetupHelpers.cs | 4 +-- 16 files changed, 29 insertions(+), 28 deletions(-) rename OpenSim/Region/CoreModules/{ServiceConnectors => ServiceConnectorsOut}/Asset/HGAssetBroker.cs (99%) rename OpenSim/Region/CoreModules/{ServiceConnectors => ServiceConnectorsOut}/Asset/LocalAssetServiceConnector.cs (99%) rename OpenSim/Region/CoreModules/{ServiceConnectors => ServiceConnectorsOut}/Asset/RemoteAssetServiceConnector.cs (98%) rename OpenSim/Region/CoreModules/{ServiceConnectors => ServiceConnectorsOut}/Interregion/LocalInterregionComms.cs (99%) rename OpenSim/Region/CoreModules/{ServiceConnectors => ServiceConnectorsOut}/Interregion/RESTInterregionComms.cs (99%) rename OpenSim/Region/CoreModules/{ServiceConnectors => ServiceConnectorsOut}/Inventory/HGInventoryBroker.cs (99%) rename OpenSim/Region/CoreModules/{ServiceConnectors => ServiceConnectorsOut}/Inventory/LocalInventoryServiceConnector.cs (99%) rename OpenSim/Region/CoreModules/{ServiceConnectors => ServiceConnectorsOut}/Inventory/RemoteInventoryServiceConnector.cs (99%) rename OpenSim/Region/CoreModules/{ServiceConnectors => ServiceConnectorsOut}/Neighbour/LocalNeighbourServiceConnector.cs (95%) rename OpenSim/Region/CoreModules/{ServiceConnectors => ServiceConnectorsOut}/Neighbour/RemoteNeighourServiceConnector.cs (96%) rename OpenSim/Region/CoreModules/{ServiceConnectors => ServiceConnectorsOut}/User/LocalUserServiceConnector.cs (98%) rename OpenSim/Region/CoreModules/{ServiceConnectors => ServiceConnectorsOut}/User/RemoteUserServiceConnector.cs (97%) diff --git a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml index bb67794cc4..d779f29c84 100644 --- a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml +++ b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml @@ -12,21 +12,22 @@ - - - - - + + - - - - - - - + + + + + + + + + + + diff --git a/OpenSim/Region/CoreModules/ServiceConnectors/Asset/HGAssetBroker.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs similarity index 99% rename from OpenSim/Region/CoreModules/ServiceConnectors/Asset/HGAssetBroker.cs rename to OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs index 4025fa627b..a9e9dc25b8 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectors/Asset/HGAssetBroker.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs @@ -37,7 +37,7 @@ using OpenSim.Region.Framework.Scenes; using OpenSim.Services.Interfaces; using OpenMetaverse; -namespace OpenSim.Region.CoreModules.ServiceConnectors.Asset +namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset { public class HGAssetBroker : ISharedRegionModule, IAssetService diff --git a/OpenSim/Region/CoreModules/ServiceConnectors/Asset/LocalAssetServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs similarity index 99% rename from OpenSim/Region/CoreModules/ServiceConnectors/Asset/LocalAssetServiceConnector.cs rename to OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs index 8f390adda1..13c4b52204 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectors/Asset/LocalAssetServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs @@ -36,7 +36,7 @@ using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Scenes; using OpenSim.Services.Interfaces; -namespace OpenSim.Region.CoreModules.ServiceConnectors.Asset +namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset { public class LocalAssetServicesConnector : ISharedRegionModule, IAssetService diff --git a/OpenSim/Region/CoreModules/ServiceConnectors/Asset/RemoteAssetServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/RemoteAssetServiceConnector.cs similarity index 98% rename from OpenSim/Region/CoreModules/ServiceConnectors/Asset/RemoteAssetServiceConnector.cs rename to OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/RemoteAssetServiceConnector.cs index d6e5ea2c0a..e554c6831c 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectors/Asset/RemoteAssetServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/RemoteAssetServiceConnector.cs @@ -36,7 +36,7 @@ using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Scenes; using OpenSim.Services.Interfaces; -namespace OpenSim.Region.CoreModules.ServiceConnectors.Asset +namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset { public class RemoteAssetServicesConnector : AssetServicesConnector, ISharedRegionModule, IAssetService diff --git a/OpenSim/Region/CoreModules/ServiceConnectors/Interregion/LocalInterregionComms.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/LocalInterregionComms.cs similarity index 99% rename from OpenSim/Region/CoreModules/ServiceConnectors/Interregion/LocalInterregionComms.cs rename to OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/LocalInterregionComms.cs index d2af2db0b3..9c3751deff 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectors/Interregion/LocalInterregionComms.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/LocalInterregionComms.cs @@ -34,7 +34,7 @@ using OpenSim.Framework; using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Scenes; -namespace OpenSim.Region.CoreModules.ServiceConnectors.Interregion +namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Interregion { public class LocalInterregionComms : IRegionModule, IInterregionCommsOut, IInterregionCommsIn { diff --git a/OpenSim/Region/CoreModules/ServiceConnectors/Interregion/RESTInterregionComms.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/RESTInterregionComms.cs similarity index 99% rename from OpenSim/Region/CoreModules/ServiceConnectors/Interregion/RESTInterregionComms.cs rename to OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/RESTInterregionComms.cs index 37305d5c53..05cc824578 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectors/Interregion/RESTInterregionComms.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/RESTInterregionComms.cs @@ -43,7 +43,7 @@ using OpenSim.Region.Framework.Scenes; using OpenSim.Region.Framework.Scenes.Hypergrid; using OpenSim.Region.Framework.Scenes.Serialization; -namespace OpenSim.Region.CoreModules.ServiceConnectors.Interregion +namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Interregion { public class RESTInterregionComms : IRegionModule, IInterregionCommsOut { diff --git a/OpenSim/Region/CoreModules/ServiceConnectors/Inventory/HGInventoryBroker.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs similarity index 99% rename from OpenSim/Region/CoreModules/ServiceConnectors/Inventory/HGInventoryBroker.cs rename to OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs index ac2eaedaaa..9f6c1a238d 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectors/Inventory/HGInventoryBroker.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs @@ -39,7 +39,7 @@ using OpenSim.Services.Interfaces; using OpenSim.Services.Connectors; using OpenMetaverse; -namespace OpenSim.Region.CoreModules.ServiceConnectors.Inventory +namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory { public class HGInventoryBroker : ISharedRegionModule, IInventoryService { diff --git a/OpenSim/Region/CoreModules/ServiceConnectors/Inventory/LocalInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs similarity index 99% rename from OpenSim/Region/CoreModules/ServiceConnectors/Inventory/LocalInventoryServiceConnector.cs rename to OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs index 750f1cbe00..8f0402505c 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectors/Inventory/LocalInventoryServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs @@ -40,7 +40,7 @@ using OpenSim.Services.Interfaces; using OpenMetaverse; -namespace OpenSim.Region.CoreModules.ServiceConnectors.Inventory +namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory { public class LocalInventoryServicesConnector : ISharedRegionModule, IInventoryService { diff --git a/OpenSim/Region/CoreModules/ServiceConnectors/Inventory/RemoteInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs similarity index 99% rename from OpenSim/Region/CoreModules/ServiceConnectors/Inventory/RemoteInventoryServiceConnector.cs rename to OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs index 5a31f23e8b..9b51da7065 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectors/Inventory/RemoteInventoryServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs @@ -38,7 +38,7 @@ using OpenSim.Region.Framework.Scenes; using OpenSim.Services.Interfaces; using OpenMetaverse; -namespace OpenSim.Region.CoreModules.ServiceConnectors.Inventory +namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory { public class RemoteInventoryServicesConnector : ISharedRegionModule, IInventoryService { diff --git a/OpenSim/Region/CoreModules/ServiceConnectors/Neighbour/LocalNeighbourServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/LocalNeighbourServiceConnector.cs similarity index 95% rename from OpenSim/Region/CoreModules/ServiceConnectors/Neighbour/LocalNeighbourServiceConnector.cs rename to OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/LocalNeighbourServiceConnector.cs index cfebba341a..6f2b354f04 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectors/Neighbour/LocalNeighbourServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/LocalNeighbourServiceConnector.cs @@ -36,7 +36,7 @@ using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Scenes; using OpenSim.Services.Interfaces; -namespace OpenSim.Region.CoreModules.ServiceConnectors.Neighbour +namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Neighbour { public class LocalNeighbourServicesConnector : ISharedRegionModule, INeighbourService diff --git a/OpenSim/Region/CoreModules/ServiceConnectors/Neighbour/RemoteNeighourServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/RemoteNeighourServiceConnector.cs similarity index 96% rename from OpenSim/Region/CoreModules/ServiceConnectors/Neighbour/RemoteNeighourServiceConnector.cs rename to OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/RemoteNeighourServiceConnector.cs index 8ea4ca7c49..9145d118eb 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectors/Neighbour/RemoteNeighourServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/RemoteNeighourServiceConnector.cs @@ -37,7 +37,7 @@ using OpenSim.Region.Framework.Scenes; using OpenSim.Services.Interfaces; using OpenSim.Server.Base; -namespace OpenSim.Region.CoreModules.ServiceConnectors.Neighbour +namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Neighbour { public class RemoteNeighbourServicesConnector : NeighbourServicesConnector, ISharedRegionModule, INeighbourService diff --git a/OpenSim/Region/CoreModules/ServiceConnectors/User/LocalUserServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/User/LocalUserServiceConnector.cs similarity index 98% rename from OpenSim/Region/CoreModules/ServiceConnectors/User/LocalUserServiceConnector.cs rename to OpenSim/Region/CoreModules/ServiceConnectorsOut/User/LocalUserServiceConnector.cs index daf7a38ffa..f364999c21 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectors/User/LocalUserServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/User/LocalUserServiceConnector.cs @@ -34,7 +34,7 @@ using OpenSim.Region.Framework.Scenes; using OpenSim.Server.Base; using OpenSim.Services.Interfaces; -namespace OpenSim.Region.CoreModules.ServiceConnectors.User +namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.User { public class LocalUserServicesConnector : ISharedRegionModule { diff --git a/OpenSim/Region/CoreModules/ServiceConnectors/User/RemoteUserServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/User/RemoteUserServiceConnector.cs similarity index 97% rename from OpenSim/Region/CoreModules/ServiceConnectors/User/RemoteUserServiceConnector.cs rename to OpenSim/Region/CoreModules/ServiceConnectorsOut/User/RemoteUserServiceConnector.cs index 68f598e1ca..00a2478b3c 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectors/User/RemoteUserServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/User/RemoteUserServiceConnector.cs @@ -30,7 +30,7 @@ using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Scenes; using OpenSim.Services.Interfaces; -namespace OpenSim.Region.CoreModules.ServiceConnectors.User +namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.User { public class RemoteUserServicesConnector : ISharedRegionModule { diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs index 5b828c5472..f0c31d0deb 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs @@ -40,7 +40,7 @@ using OpenSim.Framework; using OpenSim.Framework.Communications; using OpenSim.Region.Framework.Scenes; using OpenSim.Region.Framework.Interfaces; -using OpenSim.Region.CoreModules.ServiceConnectors.Interregion; +using OpenSim.Region.CoreModules.ServiceConnectorsOut.Interregion; using OpenSim.Region.CoreModules.World.Serialiser; using OpenSim.Tests.Common; using OpenSim.Tests.Common.Mock; diff --git a/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs b/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs index 2d286af862..1be22854f8 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs @@ -34,7 +34,7 @@ using OpenMetaverse; using OpenSim.Framework; using OpenSim.Framework.Communications; using OpenSim.Region.Framework.Interfaces; -using OpenSim.Region.CoreModules.ServiceConnectors.Interregion; +using OpenSim.Region.CoreModules.ServiceConnectorsOut.Interregion; using OpenSim.Tests.Common; using OpenSim.Tests.Common.Mock; using OpenSim.Tests.Common.Setup; diff --git a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs index e7bdf38d43..621966dd1c 100644 --- a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs +++ b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs @@ -40,8 +40,8 @@ using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Scenes; using OpenSim.Region.CoreModules.Agent.Capabilities; using OpenSim.Region.CoreModules.Avatar.Gods; -using OpenSim.Region.CoreModules.ServiceConnectors.Asset; -using OpenSim.Region.CoreModules.ServiceConnectors.Inventory; +using OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset; +using OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory; using OpenSim.Services.Interfaces; using OpenSim.Tests.Common.Mock;