Simplify database setup and remove migration problems by moving all sqlite config-include settings to a separate file for standalone

Update information in StandaloneCommon.ini.example to reflect this
Remove ISharedRegionModule interfaces from all SimianGrid connector classes temporarily since this stopped standalone from working (due to absence of AssetURI settings, etc.).
Solution here may be to create separate region module connectors as done by local/grid/hypergrid so that loading can be controlled via include files
Or otherwise work out how to stop these modules from being loaded for all OpenSim invocations

11 files changed, 13 insertions, 9 deletions

diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
index 9fb7723..201bc70 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
@@ -46,7 +46,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
     /// Connects to the SimianGrid asset service
     /// </summary>
     [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
-    public class SimianAssetServiceConnector : IAssetService, ISharedRegionModule
+    public class SimianAssetServiceConnector : IAssetService
     {
         private static readonly ILog m_log =
                 LogManager.GetLogger(
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs
index ec66341..25e04d7 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs
@@ -44,7 +44,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
     /// Connects authentication/authorization to the SimianGrid backend
     /// </summary>
     [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
-    public class SimianAuthenticationServiceConnector : IAuthenticationService, ISharedRegionModule
+    public class SimianAuthenticationServiceConnector : IAuthenticationService
     {
         private static readonly ILog m_log =
                 LogManager.GetLogger(
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs
index 220f143..08403b9 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs
@@ -48,7 +48,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
     /// Connects avatar appearance data to the SimianGrid backend
     /// </summary>
     [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
-    public class SimianAvatarServiceConnector : IAvatarService, ISharedRegionModule
+    public class SimianAvatarServiceConnector : IAvatarService
     {
         private static readonly ILog m_log =
                 LogManager.GetLogger(
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianFriendsServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianFriendsServiceConnector.cs
index 3952a8c..856381d 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianFriendsServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianFriendsServiceConnector.cs
@@ -47,7 +47,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
     /// Stores and retrieves friend lists from the SimianGrid backend
     /// </summary>
     [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
-    public class SimianFriendsServiceConnector : IFriendsService, ISharedRegionModule
+    public class SimianFriendsServiceConnector : IFriendsService
     {
         private static readonly ILog m_log =
                 LogManager.GetLogger(
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs
index 16819d1..c375076 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs
@@ -51,7 +51,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
     /// backend
     /// </summary>
     [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
-    public class SimianGridServiceConnector : IGridService, ISharedRegionModule
+    public class SimianGridServiceConnector : IGridService
     {
         private static readonly ILog m_log =
                 LogManager.GetLogger(
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs
index c812899..9879295 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs
@@ -61,7 +61,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
     /// Connects avatar inventories to the SimianGrid backend
     /// </summary>
     [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
-    public class SimianInventoryServiceConnector : IInventoryService, ISharedRegionModule
+    public class SimianInventoryServiceConnector : IInventoryService
     {
         private static readonly ILog m_log =
                 LogManager.GetLogger(
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs
index 65de1c5..45d1824 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs
@@ -51,7 +51,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
     /// message routing) to the SimianGrid backend
     /// </summary>
     [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
-    public class SimianPresenceServiceConnector : IPresenceService, ISharedRegionModule
+    public class SimianPresenceServiceConnector : IPresenceService
     {
         private static readonly ILog m_log =
                 LogManager.GetLogger(
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs b/OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs
index 1e19982..32f17ae 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs
@@ -60,7 +60,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
     /// backend
     /// </summary>
     [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
-    public class SimianProfiles : INonSharedRegionModule
+    public class SimianProfiles
     {
         private static readonly ILog m_log =
                 LogManager.GetLogger(
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs
index 14097d0..708ced3 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs
@@ -47,7 +47,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
     /// users) to the SimianGrid backend
     /// </summary>
     [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
-    public class SimianUserAccountServiceConnector : IUserAccountService, ISharedRegionModule
+    public class SimianUserAccountServiceConnector : IUserAccountService
     {
         private static readonly ILog m_log =
                 LogManager.GetLogger(
diff --git a/OpenSim/Tests/Common/Mock/MockUserAccountService.cs b/OpenSim/Tests/Common/Mock/MockUserAccountService.cs
index f5d758a..0769c7a 100644
--- a/OpenSim/Tests/Common/Mock/MockUserAccountService.cs
+++ b/OpenSim/Tests/Common/Mock/MockUserAccountService.cs
@@ -34,6 +34,7 @@ namespace OpenSim.Tests.Common.Mock
 {        
     public class MockUserAccountService : IUserAccountService
     {        
+
         public MockUserAccountService(IConfigSource config) {}
         
         public UserAccount GetUserAccount(UUID scopeID, UUID userID) { return new UserAccount(); }
diff --git a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
index ab3e7cb..864e2aa 100644
--- a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
+++ b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
@@ -215,6 +215,9 @@ namespace OpenSim.Tests.Common.Setup
             testScene.PhysicsScene
                 = physicsPluginManager.GetPhysicsScene("basicphysics", "ZeroMesher",   new IniConfigSource(), "test");
 
+            // It's really not a good idea to use static variables as they carry over between tests, leading to
+            // problems that are extremely hard to debug.  Really, these static fields need to be eliminated -
+            // tests using multiple regions that need to share modules need to find another solution.
             m_assetService = null;
             m_inventoryService = null;
             m_gridService = null;