aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors/Simulation
diff options
context:
space:
mode:
authorJohn Hurliman2010-09-12 14:20:26 -0700
committerJohn Hurliman2010-09-12 14:20:26 -0700
commit0db1ed0b5a6f5bd104c6008f142d173c84263ce5 (patch)
tree05b1b67544242755ef0150d8134d549a1a0fcbe3 /OpenSim/Services/Connectors/Simulation
parentAdded a stub for OpenSim.Services.Connectors.Simulation.SimulationDataService... (diff)
downloadopensim-SC_OLD-0db1ed0b5a6f5bd104c6008f142d173c84263ce5.zip
opensim-SC_OLD-0db1ed0b5a6f5bd104c6008f142d173c84263ce5.tar.gz
opensim-SC_OLD-0db1ed0b5a6f5bd104c6008f142d173c84263ce5.tar.bz2
opensim-SC_OLD-0db1ed0b5a6f5bd104c6008f142d173c84263ce5.tar.xz
* 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
Diffstat (limited to 'OpenSim/Services/Connectors/Simulation')
-rw-r--r--OpenSim/Services/Connectors/Simulation/EstateDataService.cs112
-rw-r--r--OpenSim/Services/Connectors/Simulation/SimulationDataService.cs (renamed from OpenSim/Services/Connectors/Simulation/SimulationDataServiceConnector.cs)69
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 @@
1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSimulator Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28using System;
29using System.Collections.Generic;
30using OpenMetaverse;
31using log4net;
32using Mono.Addins;
33using Nini.Config;
34using System.Reflection;
35using OpenSim.Services.Base;
36using OpenSim.Services.Interfaces;
37using OpenSim.Data;
38using OpenSim.Framework;
39using OpenSim.Region.Framework.Interfaces;
40using OpenSim.Region.Framework.Scenes;
41
42namespace OpenSim.Services.Connectors
43{
44 public class EstateDataService : ServiceBase, IEstateDataService
45 {
46 private static readonly ILog m_log =
47 LogManager.GetLogger(
48 MethodBase.GetCurrentMethod().DeclaringType);
49
50 protected IEstateDataStore m_database;
51
52 public EstateDataService(IConfigSource config)
53 : base(config)
54 {
55 string dllName = String.Empty;
56 string connString = String.Empty;
57
58 // Try reading the [DatabaseService] section, if it exists
59 IConfig dbConfig = config.Configs["DatabaseService"];
60 if (dbConfig != null)
61 {
62 dllName = dbConfig.GetString("StorageProvider", String.Empty);
63 connString = dbConfig.GetString("EstateConnectionString", String.Empty);
64 if (String.IsNullOrEmpty(connString))
65 connString = dbConfig.GetString("ConnectionString", String.Empty);
66 }
67
68 // We tried, but this doesn't exist. We can't proceed
69 if (dllName == String.Empty)
70 throw new Exception("No StorageProvider configured");
71
72 m_database = LoadPlugin<IEstateDataStore>(dllName, new Object[] { connString });
73 if (m_database == null)
74 throw new Exception("Could not find a storage interface in the given module");
75 }
76
77 public EstateSettings LoadEstateSettings(UUID regionID, bool create)
78 {
79 return m_database.LoadEstateSettings(regionID, create);
80 }
81
82 public EstateSettings LoadEstateSettings(int estateID)
83 {
84 return m_database.LoadEstateSettings(estateID);
85 }
86
87 public void StoreEstateSettings(EstateSettings es)
88 {
89 m_database.StoreEstateSettings(es);
90 }
91
92 public List<int> GetEstates(string search)
93 {
94 return m_database.GetEstates(search);
95 }
96
97 public bool LinkRegion(UUID regionID, int estateID)
98 {
99 return m_database.LinkRegion(regionID, estateID);
100 }
101
102 public List<UUID> GetRegions(int estateID)
103 {
104 return m_database.GetRegions(estateID);
105 }
106
107 public bool DeleteEstate(int estateID)
108 {
109 return m_database.DeleteEstate(estateID);
110 }
111 }
112}
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 @@
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Reflection; 30using OpenMetaverse;
31using log4net; 31using log4net;
32using Mono.Addins;
32using Nini.Config; 33using Nini.Config;
33using OpenMetaverse; 34using System.Reflection;
35using OpenSim.Services.Base;
36using OpenSim.Services.Interfaces;
37using OpenSim.Data;
34using OpenSim.Framework; 38using OpenSim.Framework;
35using OpenSim.Region.Framework.Interfaces; 39using OpenSim.Region.Framework.Interfaces;
36using OpenSim.Region.Framework.Scenes; 40using OpenSim.Region.Framework.Scenes;
37using OpenSim.Server.Base;
38 41
39namespace OpenSim.Services.Connectors.Simulation 42namespace OpenSim.Services.Connectors
40{ 43{
41 public class SimulationDataServiceConnector : ISimulationDataService 44 public class SimulationDataService : ServiceBase, ISimulationDataService
42 { 45 {
43 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 46 private static readonly ILog m_log =
47 LogManager.GetLogger(
48 MethodBase.GetCurrentMethod().DeclaringType);
44 49
45 private ISimulationDataStore m_simDataStore; 50 protected ISimulationDataStore m_database;
46 51
47 public SimulationDataServiceConnector() 52 public SimulationDataService(IConfigSource config)
53 : base(config)
48 { 54 {
49 } 55 string dllName = String.Empty;
56 string connString = String.Empty;
50 57
51 public SimulationDataServiceConnector(IConfigSource config) 58 // Try reading the [DatabaseService] section, if it exists
52 { 59 IConfig dbConfig = config.Configs["DatabaseService"];
53 Initialise(config); 60 if (dbConfig != null)
54 } 61 {
55 62 dllName = dbConfig.GetString("StorageProvider", String.Empty);
56 public virtual void Initialise(IConfigSource config) 63 connString = dbConfig.GetString("ConnectionString", String.Empty);
57 { 64 }
58 IConfig serverConfig = config.Configs["SimulationDataStore"];
59 if (serverConfig == null)
60 throw new Exception("No section 'SimulationDataStore' in config file");
61 65
62 string simDataStore = serverConfig.GetString("StoreModule", String.Empty); 66 // We tried, but this doesn't exist. We can't proceed
67 if (dllName == String.Empty)
68 throw new Exception("No StorageProvider configured");
63 69
64 Object[] args = new Object[] { config }; 70 m_database = LoadPlugin<ISimulationDataStore>(dllName, new Object[] { connString });
65 m_simDataStore = ServerUtils.LoadPlugin<ISimulationDataStore>(simDataStore, args); 71 if (m_database == null)
72 throw new Exception("Could not find a storage interface in the given module");
66 } 73 }
67 74
68 public void StoreObject(SceneObjectGroup obj, UUID regionUUID) 75 public void StoreObject(SceneObjectGroup obj, UUID regionUUID)
69 { 76 {
77 m_database.StoreObject(obj, regionUUID);
70 } 78 }
71 79
72 public void RemoveObject(UUID uuid, UUID regionUUID) 80 public void RemoveObject(UUID uuid, UUID regionUUID)
73 { 81 {
82 m_database.RemoveObject(uuid, regionUUID);
74 } 83 }
75 84
76 public void StorePrimInventory(UUID primID, ICollection<TaskInventoryItem> items) 85 public void StorePrimInventory(UUID primID, ICollection<TaskInventoryItem> items)
77 { 86 {
87 m_database.StorePrimInventory(primID, items);
78 } 88 }
79 89
80 public List<SceneObjectGroup> LoadObjects(UUID regionUUID) 90 public List<SceneObjectGroup> LoadObjects(UUID regionUUID)
81 { 91 {
82 return new List<SceneObjectGroup>(0); 92 return m_database.LoadObjects(regionUUID);
83 } 93 }
84 94
85 public void StoreTerrain(double[,] terrain, UUID regionID) 95 public void StoreTerrain(double[,] terrain, UUID regionID)
86 { 96 {
97 m_database.StoreTerrain(terrain, regionID);
87 } 98 }
88 99
89 public double[,] LoadTerrain(UUID regionID) 100 public double[,] LoadTerrain(UUID regionID)
90 { 101 {
91 return new double[Constants.RegionSize, Constants.RegionSize]; 102 return m_database.LoadTerrain(regionID);
92 } 103 }
93 104
94 public void StoreLandObject(ILandObject Parcel) 105 public void StoreLandObject(ILandObject Parcel)
95 { 106 {
107 m_database.StoreLandObject(Parcel);
96 } 108 }
97 109
98 public void RemoveLandObject(UUID globalID) 110 public void RemoveLandObject(UUID globalID)
99 { 111 {
112 m_database.RemoveLandObject(globalID);
100 } 113 }
101 114
102 public List<LandData> LoadLandObjects(UUID regionUUID) 115 public List<LandData> LoadLandObjects(UUID regionUUID)
103 { 116 {
104 return new List<LandData>(0); 117 return m_database.LoadLandObjects(regionUUID);
105 } 118 }
106 119
107 public void StoreRegionSettings(RegionSettings rs) 120 public void StoreRegionSettings(RegionSettings rs)
108 { 121 {
122 m_database.StoreRegionSettings(rs);
109 } 123 }
110 124
111 public RegionSettings LoadRegionSettings(UUID regionUUID) 125 public RegionSettings LoadRegionSettings(UUID regionUUID)
112 { 126 {
113 return null; 127 return m_database.LoadRegionSettings(regionUUID);
114 } 128 }
115 129
116 public RegionLightShareData LoadRegionWindlightSettings(UUID regionUUID) 130 public RegionLightShareData LoadRegionWindlightSettings(UUID regionUUID)
117 { 131 {
118 return null; 132 return m_database.LoadRegionWindlightSettings(regionUUID);
119 } 133 }
120 134
121 public void StoreRegionWindlightSettings(RegionLightShareData wl) 135 public void StoreRegionWindlightSettings(RegionLightShareData wl)
122 { 136 {
137 m_database.StoreRegionWindlightSettings(wl);
123 } 138 }
124 } 139 }
125} 140}