* Added ISimulationDataService and IEstateDataService

* Removed StorageManager
* CONFIG CHANGE: There are no more database settings in OpenSim.ini. Check the config-include configuration files for region store and estate store database settings

2 files changed, 154 insertions, 27 deletions

diff --git a/OpenSim/Services/Connectors/Simulation/EstateDataService.cs b/OpenSim/Services/Connectors/Simulation/EstateDataService.cs
new file mode 100644
index 0000000..87c49d3
--- /dev/null
+++ b/OpenSim/Services/Connectors/Simulation/EstateDataService.cs
@@ -0,0 +1,112 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections.Generic;
+using OpenMetaverse;
+using log4net;
+using Mono.Addins;
+using Nini.Config;
+using System.Reflection;
+using OpenSim.Services.Base;
+using OpenSim.Services.Interfaces;
+using OpenSim.Data;
+using OpenSim.Framework;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
+
+namespace OpenSim.Services.Connectors
+{
+    public class EstateDataService : ServiceBase, IEstateDataService
+    {
+        private static readonly ILog m_log =
+                LogManager.GetLogger(
+                MethodBase.GetCurrentMethod().DeclaringType);
+
+        protected IEstateDataStore m_database;
+
+        public EstateDataService(IConfigSource config)
+            : base(config)
+        {
+            string dllName = String.Empty;
+            string connString = String.Empty;
+
+            // Try reading the [DatabaseService] section, if it exists
+            IConfig dbConfig = config.Configs["DatabaseService"];
+            if (dbConfig != null)
+            {
+                dllName = dbConfig.GetString("StorageProvider", String.Empty);
+                connString = dbConfig.GetString("EstateConnectionString", String.Empty);
+                if (String.IsNullOrEmpty(connString))
+                    connString = dbConfig.GetString("ConnectionString", String.Empty);
+            }
+
+            // We tried, but this doesn't exist. We can't proceed
+            if (dllName == String.Empty)
+                throw new Exception("No StorageProvider configured");
+
+            m_database = LoadPlugin<IEstateDataStore>(dllName, new Object[] { connString });
+            if (m_database == null)
+                throw new Exception("Could not find a storage interface in the given module");
+        }
+
+        public EstateSettings LoadEstateSettings(UUID regionID, bool create)
+        {
+            return m_database.LoadEstateSettings(regionID, create);
+        }
+
+        public EstateSettings LoadEstateSettings(int estateID)
+        {
+            return m_database.LoadEstateSettings(estateID);
+        }
+
+        public void StoreEstateSettings(EstateSettings es)
+        {
+            m_database.StoreEstateSettings(es);
+        }
+
+        public List<int> GetEstates(string search)
+        {
+            return m_database.GetEstates(search);
+        }
+
+        public bool LinkRegion(UUID regionID, int estateID)
+        {
+            return m_database.LinkRegion(regionID, estateID);
+        }
+
+        public List<UUID> GetRegions(int estateID)
+        {
+            return m_database.GetRegions(estateID);
+        }
+
+        public bool DeleteEstate(int estateID)
+        {
+            return m_database.DeleteEstate(estateID);
+        }
+    }
+}
diff --git a/OpenSim/Services/Connectors/Simulation/SimulationDataServiceConnector.cs b/OpenSim/Services/Connectors/Simulation/SimulationDataService.cs
index 93147d4..946f7e4 100644
--- a/OpenSim/Services/Connectors/Simulation/SimulationDataServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Simulation/SimulationDataService.cs
@@ -27,99 +27,114 @@
 
 using System;
 using System.Collections.Generic;
-using System.Reflection;
+using OpenMetaverse;
 using log4net;
+using Mono.Addins;
 using Nini.Config;
-using OpenMetaverse;
+using System.Reflection;
+using OpenSim.Services.Base;
+using OpenSim.Services.Interfaces;
+using OpenSim.Data;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
-using OpenSim.Server.Base;
 
-namespace OpenSim.Services.Connectors.Simulation
+namespace OpenSim.Services.Connectors
 {
-    public class SimulationDataServiceConnector : ISimulationDataService
+    public class SimulationDataService : ServiceBase, ISimulationDataService
     {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly ILog m_log =
+                LogManager.GetLogger(
+                MethodBase.GetCurrentMethod().DeclaringType);
 
-        private ISimulationDataStore m_simDataStore;
+        protected ISimulationDataStore m_database;
 
-        public SimulationDataServiceConnector()
+        public SimulationDataService(IConfigSource config)
+            : base(config)
         {
-        }
+            string dllName = String.Empty;
+            string connString = String.Empty;
 
-        public SimulationDataServiceConnector(IConfigSource config)
-        {
-            Initialise(config);
-        }
-
-        public virtual void Initialise(IConfigSource config)
-        {
-            IConfig serverConfig = config.Configs["SimulationDataStore"];
-            if (serverConfig == null)
-                throw new Exception("No section 'SimulationDataStore' in config file");
+            // Try reading the [DatabaseService] section, if it exists
+            IConfig dbConfig = config.Configs["DatabaseService"];
+            if (dbConfig != null)
+            {
+                dllName = dbConfig.GetString("StorageProvider", String.Empty);
+                connString = dbConfig.GetString("ConnectionString", String.Empty);
+            }
 
-            string simDataStore = serverConfig.GetString("StoreModule", String.Empty);
+            // We tried, but this doesn't exist. We can't proceed
+            if (dllName == String.Empty)
+                throw new Exception("No StorageProvider configured");
 
-            Object[] args = new Object[] { config };
-            m_simDataStore = ServerUtils.LoadPlugin<ISimulationDataStore>(simDataStore, args);
+            m_database = LoadPlugin<ISimulationDataStore>(dllName, new Object[] { connString });
+            if (m_database == null)
+                throw new Exception("Could not find a storage interface in the given module");
         }
 
         public void StoreObject(SceneObjectGroup obj, UUID regionUUID)
         {
+            m_database.StoreObject(obj, regionUUID);
         }
 
         public void RemoveObject(UUID uuid, UUID regionUUID)
         {
+            m_database.RemoveObject(uuid, regionUUID);
         }
 
         public void StorePrimInventory(UUID primID, ICollection<TaskInventoryItem> items)
         {
+            m_database.StorePrimInventory(primID, items);
         }
 
         public List<SceneObjectGroup> LoadObjects(UUID regionUUID)
         {
-            return new List<SceneObjectGroup>(0);
+            return m_database.LoadObjects(regionUUID);
         }
 
         public void StoreTerrain(double[,] terrain, UUID regionID)
         {
+            m_database.StoreTerrain(terrain, regionID);
         }
 
         public double[,] LoadTerrain(UUID regionID)
         {
-            return new double[Constants.RegionSize, Constants.RegionSize];
+            return m_database.LoadTerrain(regionID);
         }
 
         public void StoreLandObject(ILandObject Parcel)
         {
+            m_database.StoreLandObject(Parcel);
         }
 
         public void RemoveLandObject(UUID globalID)
         {
+            m_database.RemoveLandObject(globalID);
         }
 
         public List<LandData> LoadLandObjects(UUID regionUUID)
         {
-            return new List<LandData>(0);
+            return m_database.LoadLandObjects(regionUUID);
         }
 
         public void StoreRegionSettings(RegionSettings rs)
         {
+            m_database.StoreRegionSettings(rs);
         }
 
         public RegionSettings LoadRegionSettings(UUID regionUUID)
         {
-            return null;
+            return m_database.LoadRegionSettings(regionUUID);
         }
 
         public RegionLightShareData LoadRegionWindlightSettings(UUID regionUUID)
         {
-            return null;
+            return m_database.LoadRegionWindlightSettings(regionUUID);
         }
 
         public void StoreRegionWindlightSettings(RegionLightShareData wl)
         {
+            m_database.StoreRegionWindlightSettings(wl);
         }
     }
 }