From b5502ef3c322e787640a8a9b3cb474b2f8abaaaa Mon Sep 17 00:00:00 2001
From: lbsa71
Date: Thu, 19 Feb 2009 18:40:32 +0000
Subject: * 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.

---
 OpenSim/Data/IAssetData.cs                         |  9 -----
 .../Communications/Cache/AssetServerBase.cs        |  1 -
 .../Communications/Cache/SQLAssetServer.cs         |  1 -
 OpenSim/Framework/IAssetDataPlugin.cs              | 41 ++++++++++++++++++++++
 OpenSim/Grid/AssetServer/RestService.cs            |  1 -
 .../Hypergrid/HGStandaloneAssetService.cs          |  1 -
 OpenSim/Tests/Common/Mock/TestAssetDataPlugin.cs   |  1 -
 7 files changed, 41 insertions(+), 14 deletions(-)
 create mode 100644 OpenSim/Framework/IAssetDataPlugin.cs

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;
 
 namespace OpenSim.Data
 {
-    public interface IAssetDataPlugin : IPlugin
-    {
-        AssetBase FetchAsset(UUID uuid);
-        void CreateAsset(AssetBase asset);
-        void UpdateAsset(AssetBase asset);
-        bool ExistsAsset(UUID uuid);
-        void Initialise(string connect);
-    }
-
     public class AssetDataInitialiser : PluginInitialiserBase
     {
         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;
 using System.Threading;
 using log4net;
 using OpenMetaverse;
-using OpenSim.Data;
 using OpenSim.Framework.AssetLoader.Filesystem;
 using OpenSim.Framework.Statistics;
 
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 @@
 using System;
 using System.Reflection;
 using log4net;
-using OpenSim.Data;
 
 namespace OpenSim.Framework.Communications.Cache
 {
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 @@
+/*
+ * 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 OpenSim 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 OpenMetaverse;
+using OpenSim.Framework;
+
+namespace OpenSim.Framework
+{
+    public interface IAssetDataPlugin : IPlugin
+    {
+        AssetBase FetchAsset(UUID uuid);
+        void CreateAsset(AssetBase asset);
+        void UpdateAsset(AssetBase asset);
+        bool ExistsAsset(UUID uuid);
+        void Initialise(string connect);
+    }
+}
\ 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;
 using System.Xml.Serialization;
 using log4net;
 using OpenMetaverse;
-using OpenSim.Data;
 using OpenSim.Framework;
 using OpenSim.Framework.Servers;
 using 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;
 using log4net;
 using Nini.Config;
 using OpenMetaverse;
-using OpenSim.Data;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using 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 @@
 
 using OpenMetaverse;
 using OpenSim.Framework;
-using OpenSim.Data;
 
 namespace OpenSim.Tests.Common.Mock
 {
-- 
cgit v1.1