* Reverted the AssetServer fix, apparently something was dependent on IAssetDataPlugin being in OpenSim.Data

9 files changed, 230 insertions, 180 deletions

diff --git a/OpenSim/Data/IAssetData.cs b/OpenSim/Data/IAssetData.cs
index 0fd5143..47e25f3 100644
--- a/OpenSim/Data/IAssetData.cs
+++ b/OpenSim/Data/IAssetData.cs
@@ -30,6 +30,15 @@ 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 91e8720..7bb2ab9 100644
--- a/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
@@ -30,6 +30,7 @@ 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 1306ef4..5274288 100644
--- a/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs
+++ b/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs
@@ -28,6 +28,7 @@
 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
deleted file mode 100644
index 6bb8574..0000000
--- a/OpenSim/Framework/IAssetDataPlugin.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-/*

- * 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/Framework/Servers/PostAssetStreamHandler.cs b/OpenSim/Framework/Servers/PostAssetStreamHandler.cs
deleted file mode 100644
index a62f2b0..0000000
--- a/OpenSim/Framework/Servers/PostAssetStreamHandler.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-using System.IO;

-using System.Reflection;

-using System.Xml.Serialization;

-using log4net;

-using OpenMetaverse;

-using OpenSim.Framework;

-using OpenSim.Framework.Servers;

-

-namespace OpenSim.Framework.Servers

-{

-    public class PostAssetStreamHandler : BaseStreamHandler

-    {

-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);

-

-        // private OpenAsset_Main m_assetManager;

-        private IAssetDataPlugin m_assetProvider;

-

-        public override byte[] Handle(string path, Stream request,

-                                      OSHttpRequest httpRequest, OSHttpResponse httpResponse)

-        {

-            string param = GetParam(path);

-

-            UUID assetId;

-            if (param.Length > 0)

-                UUID.TryParse(param, out assetId);

-            // byte[] txBuffer = new byte[4096];

-

-            XmlSerializer xs = new XmlSerializer(typeof (AssetBase));

-            AssetBase asset = (AssetBase) xs.Deserialize(request);

-

-            m_log.InfoFormat("[REST]: Creating asset {0}", asset.FullID);

-            m_assetProvider.CreateAsset(asset);

-

-            return new byte[] {};

-        }

-

-        public PostAssetStreamHandler(IAssetDataPlugin assetProvider)

-            : base("POST", "/assets")

-        {

-            // m_assetManager = assetManager;

-            m_assetProvider = assetProvider;

-        }

-    }

-}
\ No newline at end of file
diff --git a/OpenSim/Framework/Servers/GetAssetStreamHandler.cs b/OpenSim/Grid/AssetServer/RestService.cs
index 093461d..1e01c44 100644
--- a/OpenSim/Framework/Servers/GetAssetStreamHandler.cs
+++ b/OpenSim/Grid/AssetServer/RestService.cs
@@ -1,94 +1,156 @@
-using System;

-using System.IO;

-using System.Reflection;

-using System.Text;

-using System.Xml;

-using System.Xml.Serialization;

-using log4net;

-using OpenMetaverse;

-using OpenSim.Framework;

-using OpenSim.Framework.Servers;

-using OpenSim.Framework.Statistics;

-

-namespace OpenSim.Framework.Servers

-{

-    public class GetAssetStreamHandler : BaseStreamHandler

-    {

-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);

-

-        // private OpenAsset_Main m_assetManager;

-        private IAssetDataPlugin m_assetProvider;

-

-        /// <summary>

-        /// Constructor.

-        /// </summary>

-        /// <param name="assetManager"></param>

-        /// <param name="assetProvider"></param>

-        public GetAssetStreamHandler(IAssetDataPlugin assetProvider)

-            : base("GET", "/assets")

-        {

-            m_log.Info("[REST]: In Get Request");

-            // m_assetManager = assetManager;

-            m_assetProvider = assetProvider;

-        }

-

-        public override byte[] Handle(string path, Stream request,

-                                      OSHttpRequest httpRequest, OSHttpResponse httpResponse)

-        {

-            string param = GetParam(path);

-            byte[] result = new byte[] {};

-

-            string[] p = param.Split(new char[] {'/', '?', '&'}, StringSplitOptions.RemoveEmptyEntries);

-

-            if (p.Length > 0)

-            {

-                UUID assetID = UUID.Zero;

-

-                if (!UUID.TryParse(p[0], out assetID))

-                {

-                    m_log.InfoFormat(

-                        "[REST]: GET:/asset ignoring request with malformed UUID {0}", p[0]);

-                    return result;

-                }

-

-                if (StatsManager.AssetStats != null)

-                    StatsManager.AssetStats.AddRequest();

-

-                AssetBase asset = m_assetProvider.FetchAsset(assetID);

-                if (asset != null)

-                {

-                    XmlSerializer xs = new XmlSerializer(typeof (AssetBase));

-                    MemoryStream ms = new MemoryStream();

-                    XmlTextWriter xw = new XmlTextWriter(ms, Encoding.UTF8);

-                    xw.Formatting = Formatting.Indented;

-                    xs.Serialize(xw, asset);

-                    xw.Flush();

-

-                    ms.Seek(0, SeekOrigin.Begin);

-                    //StreamReader sr = new StreamReader(ms);

-

-                    result = ms.GetBuffer();

-

-//Ckrinke 1/11/09 Commenting out the succesful REST message as under heavy use there

-//are multiple messages in a second and that is usually (in my experience) meaning

-//the logging itself is slowing down the program. Leaving the unsuccesful message

-//as we need to know about that path.

-//                    m_log.InfoFormat(

-//                        "[REST]: GET:/asset found {0} with name {1}, size {2} bytes",

-//                        assetID, asset.Name, result.Length);

-

-                    Array.Resize<byte>(ref result, (int) ms.Length);

-                }

-                else

-                {

-                    if (StatsManager.AssetStats != null)

-                        StatsManager.AssetStats.AddNotFoundRequest();

-

-                    m_log.InfoFormat("[REST]: GET:/asset failed to find {0}", assetID);

-                }

-            }

-

-            return result;

-        }

-    }

-}
\ No newline at end of file
+/*
+ * 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 System;
+using System.IO;
+using System.Reflection;
+using System.Text;
+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;
+
+namespace OpenSim.Grid.AssetServer
+{
+    public class GetAssetStreamHandler : BaseStreamHandler
+    {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        // private OpenAsset_Main m_assetManager;
+        private IAssetDataPlugin m_assetProvider;
+
+        /// <summary>
+        /// Constructor.
+        /// </summary>
+        /// <param name="assetManager"></param>
+        /// <param name="assetProvider"></param>
+        public GetAssetStreamHandler(IAssetDataPlugin assetProvider)
+            : base("GET", "/assets")
+        {
+            m_log.Info("[REST]: In Get Request");
+            // m_assetManager = assetManager;
+            m_assetProvider = assetProvider;
+        }
+
+        public override byte[] Handle(string path, Stream request,
+                                      OSHttpRequest httpRequest, OSHttpResponse httpResponse)
+        {
+            string param = GetParam(path);
+            byte[] result = new byte[] {};
+
+            string[] p = param.Split(new char[] {'/', '?', '&'}, StringSplitOptions.RemoveEmptyEntries);
+
+            if (p.Length > 0)
+            {
+                UUID assetID = UUID.Zero;
+
+                if (!UUID.TryParse(p[0], out assetID))
+                {
+                    m_log.InfoFormat(
+                        "[REST]: GET:/asset ignoring request with malformed UUID {0}", p[0]);
+                    return result;
+                }
+
+                if (StatsManager.AssetStats != null)
+                    StatsManager.AssetStats.AddRequest();
+
+                AssetBase asset = m_assetProvider.FetchAsset(assetID);
+                if (asset != null)
+                {
+                    XmlSerializer xs = new XmlSerializer(typeof (AssetBase));
+                    MemoryStream ms = new MemoryStream();
+                    XmlTextWriter xw = new XmlTextWriter(ms, Encoding.UTF8);
+                    xw.Formatting = Formatting.Indented;
+                    xs.Serialize(xw, asset);
+                    xw.Flush();
+
+                    ms.Seek(0, SeekOrigin.Begin);
+                    //StreamReader sr = new StreamReader(ms);
+
+                    result = ms.GetBuffer();
+
+//Ckrinke 1/11/09 Commenting out the succesful REST message as under heavy use there
+//are multiple messages in a second and that is usually (in my experience) meaning
+//the logging itself is slowing down the program. Leaving the unsuccesful message
+//as we need to know about that path.
+//                    m_log.InfoFormat(
+//                        "[REST]: GET:/asset found {0} with name {1}, size {2} bytes",
+//                        assetID, asset.Name, result.Length);
+
+                    Array.Resize<byte>(ref result, (int) ms.Length);
+                }
+                else
+                {
+                    if (StatsManager.AssetStats != null)
+                        StatsManager.AssetStats.AddNotFoundRequest();
+
+                    m_log.InfoFormat("[REST]: GET:/asset failed to find {0}", assetID);
+                }
+            }
+
+            return result;
+        }
+    }
+
+    public class PostAssetStreamHandler : BaseStreamHandler
+    {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        // private OpenAsset_Main m_assetManager;
+        private IAssetDataPlugin m_assetProvider;
+
+        public override byte[] Handle(string path, Stream request,
+                                      OSHttpRequest httpRequest, OSHttpResponse httpResponse)
+        {
+            string param = GetParam(path);
+
+            UUID assetId;
+            if (param.Length > 0)
+                UUID.TryParse(param, out assetId);
+            // byte[] txBuffer = new byte[4096];
+
+            XmlSerializer xs = new XmlSerializer(typeof (AssetBase));
+            AssetBase asset = (AssetBase) xs.Deserialize(request);
+
+            m_log.InfoFormat("[REST]: Creating asset {0}", asset.FullID);
+            m_assetProvider.CreateAsset(asset);
+
+            return new byte[] {};
+        }
+
+        public PostAssetStreamHandler(IAssetDataPlugin assetProvider)
+            : base("POST", "/assets")
+        {
+            // m_assetManager = assetManager;
+            m_assetProvider = assetProvider;
+        }
+    }
+}
diff --git a/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneAssetService.cs b/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneAssetService.cs
index 369052c..7caa786 100644
--- a/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneAssetService.cs
+++ b/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneAssetService.cs
@@ -30,10 +30,12 @@ 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;
 using OpenSim.Framework.Servers;
+using OpenSim.Grid.AssetServer;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 
diff --git a/OpenSim/Tests/Common/Mock/TestAssetDataPlugin.cs b/OpenSim/Tests/Common/Mock/TestAssetDataPlugin.cs
index 94604d2..fc84eac 100644
--- a/OpenSim/Tests/Common/Mock/TestAssetDataPlugin.cs
+++ b/OpenSim/Tests/Common/Mock/TestAssetDataPlugin.cs
@@ -27,6 +27,7 @@
 
 using OpenMetaverse;
 using OpenSim.Framework;
+using OpenSim.Data;
 
 namespace OpenSim.Tests.Common.Mock
 {
diff --git a/prebuild.xml b/prebuild.xml
index 283511a..70b5984 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<Prebuild xmlns="http://dnpb.sourceforge.net/schemas/prebuild-1.7.xsd" version="1.7">
+<Prebuild version="1.7">
   <Solution name="OpenSim" activeConfig="Debug" path="./" version="0.5.0-$Rev$">
     <Configuration name="Debug">
       <Options>
@@ -572,6 +572,7 @@
       <Reference name="OpenSim.Framework.Servers"/>
       <Reference name="OpenSim.Framework.Statistics"/>
       <Reference name="OpenSim.Region.Physics.Manager"/>
+      <Reference name="OpenSim.Grid.AssetServer"/>
 
       <!-- For scripting in funny languages by default -->
       <Reference name="Microsoft.JScript"/>
@@ -985,6 +986,7 @@
       <Reference name="OpenSim.Framework.Servers"/>
       <Reference name="OpenSim.Framework.Statistics"/>
       <Reference name="OpenSim.Region.Physics.Manager"/>
+      <Reference name="OpenSim.Grid.AssetServer"/>
 
       <!-- For scripting in funny languages by default -->
       <Reference name="Microsoft.JScript"/>
@@ -1058,6 +1060,7 @@
       <Reference name="OpenSim.Framework.Servers"/>
       <Reference name="OpenSim.Framework.Statistics"/>
       <Reference name="OpenSim.Region.Physics.Manager"/>
+      <Reference name="OpenSim.Grid.AssetServer"/>
 
       <!-- For scripting in funny languages by default -->
       <Reference name="Microsoft.JScript"/>
@@ -2335,6 +2338,7 @@
       <Reference name="OpenSim.Framework.Servers"/>
       <Reference name="OpenSim.Framework.Statistics"/>
       <Reference name="OpenSim.Region.Physics.Manager"/>
+      <Reference name="OpenSim.Grid.AssetServer"/>
       <Reference name="Mono.Data.SqliteClient"/>
 
       <!-- For scripting in funny languages by default -->
@@ -2870,6 +2874,61 @@
 <!-- /////////////////// END OF INSERTION ///////////////////////////// -->
 
   </Solution>
+
+  <!-- Prebuild tool -->
+  <Solution name="Prebuild" path="Prebuild/" >
+    <Configuration name="Debug">
+      <Options>
+        <CompilerDefines>DEBUG;TRACE</CompilerDefines>
+        <OptimizeCode>false</OptimizeCode>
+        <OutputPath>bin/Debug</OutputPath>
+        <DebugInformation>true</DebugInformation>
+        <SuppressWarnings>1595</SuppressWarnings>
+      </Options>
+    </Configuration>
+    <Configuration name="Release">
+      <Options>
+        <CompilerDefines>TRACE</CompilerDefines>
+        <OutputPath>bin/Release</OutputPath>
+        <OptimizeCode>true</OptimizeCode>
+        <DebugInformation>false</DebugInformation>
+        <SuppressWarnings>1595</SuppressWarnings>
+      </Options>
+    </Configuration>
+
+    <Project name="Prebuild" path="src/" language="C#" assemblyName="Prebuild" icon="App.ico" type="Exe" rootNamespace="Prebuild" startupObject="Prebuild.Prebuild">
+      <Configuration name="Debug">
+        <Options>
+          <CompilerDefines>DEBUG;TRACE</CompilerDefines>
+          <OptimizeCode>false</OptimizeCode>
+          <OutputPath>..\..\bin\</OutputPath>
+          <DebugInformation>true</DebugInformation>
+          <KeyFile>Prebuild.snk</KeyFile>
+          <SuppressWarnings>1595</SuppressWarnings>
+        </Options>
+      </Configuration>
+      <Configuration name="Release">
+        <Options>
+          <CompilerDefines>TRACE</CompilerDefines>
+          <OutputPath>..\..\bin\</OutputPath>
+          <OptimizeCode>true</OptimizeCode>
+          <DebugInformation>false</DebugInformation>
+          <KeyFile>Prebuild.snk</KeyFile>
+          <SuppressWarnings>1595</SuppressWarnings>
+        </Options>
+      </Configuration>
+      <ReferencePath>../../bin/</ReferencePath>
+      <Reference name="System.EnterpriseServices" />
+      <Reference name="System.Xml" />
+      <Reference name="System" />
+      <Files>
+        <Match pattern="App.ico" buildAction="EmbeddedResource"/>
+        <Match path="data" pattern="prebuild-1.7.xsd" buildAction="EmbeddedResource"/>
+        <Match pattern="*.cs" recurse="true"/>
+      </Files>
+    </Project>
+
+  </Solution>
 </Prebuild>