aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorlbsa712009-02-19 18:40:32 +0000
committerlbsa712009-02-19 18:40:32 +0000
commitb5502ef3c322e787640a8a9b3cb474b2f8abaaaa (patch)
tree89e4aa04da533f3db8619801bcde24e7627e3323
parent* Apply http://opensimulator.org/mantis/view.php?id=3151 (diff)
downloadopensim-SC_OLD-b5502ef3c322e787640a8a9b3cb474b2f8abaaaa.zip
opensim-SC_OLD-b5502ef3c322e787640a8a9b3cb474b2f8abaaaa.tar.gz
opensim-SC_OLD-b5502ef3c322e787640a8a9b3cb474b2f8abaaaa.tar.bz2
opensim-SC_OLD-b5502ef3c322e787640a8a9b3cb474b2f8abaaaa.tar.xz
* Extracted IAssetData and moved it to OpenSim.Framework to prepare to get rid of ugly CoreModules dependency on AssetServer.exe
* And yes, the IAssetDataPlugin is misnomed, which became apparent on extracting it.
-rw-r--r--OpenSim/Data/IAssetData.cs9
-rw-r--r--OpenSim/Framework/Communications/Cache/AssetServerBase.cs1
-rw-r--r--OpenSim/Framework/Communications/Cache/SQLAssetServer.cs1
-rw-r--r--OpenSim/Framework/IAssetDataPlugin.cs41
-rw-r--r--OpenSim/Grid/AssetServer/RestService.cs1
-rw-r--r--OpenSim/Region/CoreModules/Hypergrid/HGStandaloneAssetService.cs1
-rw-r--r--OpenSim/Tests/Common/Mock/TestAssetDataPlugin.cs1
7 files changed, 41 insertions, 14 deletions
diff --git a/OpenSim/Data/IAssetData.cs b/OpenSim/Data/IAssetData.cs
index 47e25f3..0fd5143 100644
--- a/OpenSim/Data/IAssetData.cs
+++ b/OpenSim/Data/IAssetData.cs
@@ -30,15 +30,6 @@ using OpenSim.Framework;
30 30
31namespace OpenSim.Data 31namespace OpenSim.Data
32{ 32{
33 public interface IAssetDataPlugin : IPlugin
34 {
35 AssetBase FetchAsset(UUID uuid);
36 void CreateAsset(AssetBase asset);
37 void UpdateAsset(AssetBase asset);
38 bool ExistsAsset(UUID uuid);
39 void Initialise(string connect);
40 }
41
42 public class AssetDataInitialiser : PluginInitialiserBase 33 public class AssetDataInitialiser : PluginInitialiserBase
43 { 34 {
44 private string connect; 35 private string connect;
diff --git a/OpenSim/Framework/Communications/Cache/AssetServerBase.cs b/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
index 7bb2ab9..91e8720 100644
--- a/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
@@ -30,7 +30,6 @@ using System.Reflection;
30using System.Threading; 30using System.Threading;
31using log4net; 31using log4net;
32using OpenMetaverse; 32using OpenMetaverse;
33using OpenSim.Data;
34using OpenSim.Framework.AssetLoader.Filesystem; 33using OpenSim.Framework.AssetLoader.Filesystem;
35using OpenSim.Framework.Statistics; 34using OpenSim.Framework.Statistics;
36 35
diff --git a/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs b/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs
index 5274288..1306ef4 100644
--- a/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs
+++ b/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs
@@ -28,7 +28,6 @@
28using System; 28using System;
29using System.Reflection; 29using System.Reflection;
30using log4net; 30using log4net;
31using OpenSim.Data;
32 31
33namespace OpenSim.Framework.Communications.Cache 32namespace OpenSim.Framework.Communications.Cache
34{ 33{
diff --git a/OpenSim/Framework/IAssetDataPlugin.cs b/OpenSim/Framework/IAssetDataPlugin.cs
new file mode 100644
index 0000000..6bb8574
--- /dev/null
+++ b/OpenSim/Framework/IAssetDataPlugin.cs
@@ -0,0 +1,41 @@
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 OpenSim 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 OpenMetaverse;
29using OpenSim.Framework;
30
31namespace OpenSim.Framework
32{
33 public interface IAssetDataPlugin : IPlugin
34 {
35 AssetBase FetchAsset(UUID uuid);
36 void CreateAsset(AssetBase asset);
37 void UpdateAsset(AssetBase asset);
38 bool ExistsAsset(UUID uuid);
39 void Initialise(string connect);
40 }
41} \ No newline at end of file
diff --git a/OpenSim/Grid/AssetServer/RestService.cs b/OpenSim/Grid/AssetServer/RestService.cs
index 1e01c44..a9519ec 100644
--- a/OpenSim/Grid/AssetServer/RestService.cs
+++ b/OpenSim/Grid/AssetServer/RestService.cs
@@ -33,7 +33,6 @@ using System.Xml;
33using System.Xml.Serialization; 33using System.Xml.Serialization;
34using log4net; 34using log4net;
35using OpenMetaverse; 35using OpenMetaverse;
36using OpenSim.Data;
37using OpenSim.Framework; 36using OpenSim.Framework;
38using OpenSim.Framework.Servers; 37using OpenSim.Framework.Servers;
39using OpenSim.Framework.Statistics; 38using OpenSim.Framework.Statistics;
diff --git a/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneAssetService.cs b/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneAssetService.cs
index 7caa786..58c6758 100644
--- a/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneAssetService.cs
+++ b/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneAssetService.cs
@@ -30,7 +30,6 @@ using System.Reflection;
30using log4net; 30using log4net;
31using Nini.Config; 31using Nini.Config;
32using OpenMetaverse; 32using OpenMetaverse;
33using OpenSim.Data;
34using OpenSim.Framework; 33using OpenSim.Framework;
35using OpenSim.Framework.Communications; 34using OpenSim.Framework.Communications;
36using OpenSim.Framework.Communications.Cache; 35using OpenSim.Framework.Communications.Cache;
diff --git a/OpenSim/Tests/Common/Mock/TestAssetDataPlugin.cs b/OpenSim/Tests/Common/Mock/TestAssetDataPlugin.cs
index fc84eac..94604d2 100644
--- a/OpenSim/Tests/Common/Mock/TestAssetDataPlugin.cs
+++ b/OpenSim/Tests/Common/Mock/TestAssetDataPlugin.cs
@@ -27,7 +27,6 @@
27 27
28using OpenMetaverse; 28using OpenMetaverse;
29using OpenSim.Framework; 29using OpenSim.Framework;
30using OpenSim.Data;
31 30
32namespace OpenSim.Tests.Common.Mock 31namespace OpenSim.Tests.Common.Mock
33{ 32{