From 16d782eaa25e73e39b8aaa02383592ac4813a109 Mon Sep 17 00:00:00 2001
From: John Hurliman
Date: Sun, 12 Sep 2010 00:30:13 -0700
Subject: Added a stub for
OpenSim.Services.Connectors.Simulation.SimulationDataServiceConnector
---
.../Framework/Interfaces/ISimulationDataService.cs | 98 ++++++++++++++++
OpenSim/Region/Framework/StorageManager.cs | 24 +---
.../Simulation/SimulationDataServiceConnector.cs | 125 +++++++++++++++++++++
3 files changed, 227 insertions(+), 20 deletions(-)
create mode 100644 OpenSim/Region/Framework/Interfaces/ISimulationDataService.cs
create mode 100644 OpenSim/Services/Connectors/Simulation/SimulationDataServiceConnector.cs
diff --git a/OpenSim/Region/Framework/Interfaces/ISimulationDataService.cs b/OpenSim/Region/Framework/Interfaces/ISimulationDataService.cs
new file mode 100644
index 0000000..edaa07c
--- /dev/null
+++ b/OpenSim/Region/Framework/Interfaces/ISimulationDataService.cs
@@ -0,0 +1,98 @@
+/*
+ * 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 OpenSim.Framework;
+using OpenSim.Region.Framework.Scenes;
+
+namespace OpenSim.Region.Framework.Interfaces
+{
+ public interface ISimulationDataService
+ {
+ /// <summary>
+ /// Stores all object's details apart from inventory
+ /// </summary>
+ /// <param name="obj"></param>
+ /// <param name="regionUUID"></param>
+ void StoreObject(SceneObjectGroup obj, UUID regionUUID);
+
+ /// <summary>
+ /// Entirely removes the object, including inventory
+ /// </summary>
+ /// <param name="uuid"></param>
+ /// <param name="regionUUID"></param>
+ /// <returns></returns>
+ void RemoveObject(UUID uuid, UUID regionUUID);
+
+ /// <summary>
+ /// Store a prim's inventory
+ /// </summary>
+ /// <returns></returns>
+ void StorePrimInventory(UUID primID, ICollection<TaskInventoryItem> items);
+
+ /// <summary>
+ /// Load persisted objects from region storage.
+ /// </summary>
+ /// <param name="regionUUID">the Region UUID</param>
+ /// <returns>List of loaded groups</returns>
+ List<SceneObjectGroup> LoadObjects(UUID regionUUID);
+
+ /// <summary>
+ /// Store a terrain revision in region storage
+ /// </summary>
+ /// <param name="ter">HeightField data</param>
+ /// <param name="regionID">region UUID</param>
+ void StoreTerrain(double[,] terrain, UUID regionID);
+
+ /// <summary>
+ /// Load the latest terrain revision from region storage
+ /// </summary>
+ /// <param name="regionID">the region UUID</param>
+ /// <returns>Heightfield data</returns>
+ double[,] LoadTerrain(UUID regionID);
+
+ void StoreLandObject(ILandObject Parcel);
+
+ /// <summary>
+ /// <list type="bullet">
+ /// <item>delete from land where UUID=globalID</item>
+ /// <item>delete from landaccesslist where LandUUID=globalID</item>
+ /// </list>
+ /// </summary>
+ /// <param name="globalID"></param>
+ void RemoveLandObject(UUID globalID);
+
+ List<LandData> LoadLandObjects(UUID regionUUID);
+
+ void StoreRegionSettings(RegionSettings rs);
+ RegionSettings LoadRegionSettings(UUID regionUUID);
+ RegionLightShareData LoadRegionWindlightSettings(UUID regionUUID);
+ void StoreRegionWindlightSettings(RegionLightShareData wl);
+ }
+}
diff --git a/OpenSim/Region/Framework/StorageManager.cs b/OpenSim/Region/Framework/StorageManager.cs
index 47db2b3..c858d56 100644
--- a/OpenSim/Region/Framework/StorageManager.cs
+++ b/OpenSim/Region/Framework/StorageManager.cs
@@ -36,24 +36,8 @@ namespace OpenSim.Region.Framework
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
- protected ISimulationDataStore m_dataStore;
-
- public ISimulationDataStore DataStore
- {
- get { return m_dataStore; }
- }
-
- private IEstateDataStore m_estateDataStore;
-
- public IEstateDataStore EstateDataStore
- {
- get { return m_estateDataStore; }
- }
-
- public StorageManager(ISimulationDataStore storage)
- {
- m_dataStore = storage;
- }
+ public readonly ISimulationDataStore DataStore;
+ public readonly IEstateDataStore EstateDataStore;
public StorageManager(string dllName, string connectionstring, string estateconnectionstring)
{
@@ -72,7 +56,7 @@ namespace OpenSim.Region.Framework
(ISimulationDataStore)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
plug.Initialise(connectionstring);
- m_dataStore = plug;
+ DataStore = plug;
m_log.Info("[DATASTORE]: Added ISimulationDataStore Interface");
}
@@ -85,7 +69,7 @@ namespace OpenSim.Region.Framework
(IEstateDataStore) Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
estPlug.Initialise(estateconnectionstring);
- m_estateDataStore = estPlug;
+ EstateDataStore = estPlug;
}
}
}
diff --git a/OpenSim/Services/Connectors/Simulation/SimulationDataServiceConnector.cs b/OpenSim/Services/Connectors/Simulation/SimulationDataServiceConnector.cs
new file mode 100644
index 0000000..93147d4
--- /dev/null
+++ b/OpenSim/Services/Connectors/Simulation/SimulationDataServiceConnector.cs
@@ -0,0 +1,125 @@
+/*
+ * 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 System.Reflection;
+using log4net;
+using Nini.Config;
+using OpenMetaverse;
+using OpenSim.Framework;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Server.Base;
+
+namespace OpenSim.Services.Connectors.Simulation
+{
+ public class SimulationDataServiceConnector : ISimulationDataService
+ {
+ private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+ private ISimulationDataStore m_simDataStore;
+
+ public SimulationDataServiceConnector()
+ {
+ }
+
+ 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");
+
+ string simDataStore = serverConfig.GetString("StoreModule", String.Empty);
+
+ Object[] args = new Object[] { config };
+ m_simDataStore = ServerUtils.LoadPlugin<ISimulationDataStore>(simDataStore, args);
+ }
+
+ public void StoreObject(SceneObjectGroup obj, UUID regionUUID)
+ {
+ }
+
+ public void RemoveObject(UUID uuid, UUID regionUUID)
+ {
+ }
+
+ public void StorePrimInventory(UUID primID, ICollection<TaskInventoryItem> items)
+ {
+ }
+
+ public List<SceneObjectGroup> LoadObjects(UUID regionUUID)
+ {
+ return new List<SceneObjectGroup>(0);
+ }
+
+ public void StoreTerrain(double[,] terrain, UUID regionID)
+ {
+ }
+
+ public double[,] LoadTerrain(UUID regionID)
+ {
+ return new double[Constants.RegionSize, Constants.RegionSize];
+ }
+
+ public void StoreLandObject(ILandObject Parcel)
+ {
+ }
+
+ public void RemoveLandObject(UUID globalID)
+ {
+ }
+
+ public List<LandData> LoadLandObjects(UUID regionUUID)
+ {
+ return new List<LandData>(0);
+ }
+
+ public void StoreRegionSettings(RegionSettings rs)
+ {
+ }
+
+ public RegionSettings LoadRegionSettings(UUID regionUUID)
+ {
+ return null;
+ }
+
+ public RegionLightShareData LoadRegionWindlightSettings(UUID regionUUID)
+ {
+ return null;
+ }
+
+ public void StoreRegionWindlightSettings(RegionLightShareData wl)
+ {
+ }
+ }
+}
--
cgit v1.1