Donation of robust network connectors for estate service, as promised. This allows to have one central database for estates without having to open the MySql port. This is off by default, so not to disturb everyone's existing installations. To use it, see GridCommon.ini.example [EstateDataStore] section and Robust*.ini.example's new additions.

Note that I also made things consistent by removing both the EstateDataService and the SimulationService into their own dlls, just like all other services. They really didn't belong in Services.Connectors, since everything in that component is about network connectors to robust backends. We may have too many dlls, and at some point it might not be a bad idea to merge all services into one single dll, since they all have more or less the same dependencies.

1 files changed, 136 insertions, 0 deletions

diff --git a/OpenSim/Services/EstateService/EstateDataService.cs b/OpenSim/Services/EstateService/EstateDataService.cs
new file mode 100644
index 0000000..f6a8654
--- /dev/null
+++ b/OpenSim/Services/EstateService/EstateDataService.cs
@@ -0,0 +1,136 @@
+/*
+ * 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 Nini.Config;
+using System.Reflection;
+using OpenSim.Services.Base;
+using OpenSim.Services.Interfaces;
+using OpenSim.Data;
+using OpenSim.Framework;
+
+namespace OpenSim.Services.EstateService
+{
+    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("ConnectionString", String.Empty);
+                connString = dbConfig.GetString("EstateConnectionString", connString);
+            }
+
+            // Try reading the [EstateDataStore] section, if it exists
+            IConfig estConfig = config.Configs["EstateDataStore"];
+            if (estConfig != null)
+            {
+                dllName = estConfig.GetString("StorageProvider", dllName);
+                connString = estConfig.GetString("ConnectionString", connString);
+            }
+
+            // 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 EstateSettings CreateNewEstate()
+        {
+            return m_database.CreateNewEstate();
+        }
+        
+        public List<EstateSettings> LoadEstateSettingsAll()
+        {
+            return m_database.LoadEstateSettingsAll();            
+        }        
+
+        public void StoreEstateSettings(EstateSettings es)
+        {
+            m_database.StoreEstateSettings(es);
+        }
+
+        public List<int> GetEstates(string search)
+        {
+            return m_database.GetEstates(search);
+        }
+        
+        public List<int> GetEstatesAll()
+        {
+            return m_database.GetEstatesAll();
+        }
+
+        public List<int> GetEstatesByOwner(UUID ownerID)
+        {
+            return m_database.GetEstatesByOwner(ownerID);
+        }
+
+        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);
+        }
+    }
+}