* Another stab at removing AssetServer.exe dependencies

4 files changed, 141 insertions, 161 deletions

diff --git a/OpenSim/Grid/AssetServer/RestService.cs b/OpenSim/Framework/Servers/GetAssetStreamHandler.cs
index 1e01c44..d278a05 100644
--- a/OpenSim/Grid/AssetServer/RestService.cs
+++ b/OpenSim/Framework/Servers/GetAssetStreamHandler.cs
@@ -1,156 +1,95 @@
-/*
- * 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;
-        }
-    }
-}
+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.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
diff --git a/OpenSim/Framework/Servers/PostAssetStreamHandler.cs b/OpenSim/Framework/Servers/PostAssetStreamHandler.cs
new file mode 100644
index 0000000..6e96361
--- /dev/null
+++ b/OpenSim/Framework/Servers/PostAssetStreamHandler.cs
@@ -0,0 +1,45 @@
+using System.IO;

+using System.Reflection;

+using System.Xml.Serialization;

+using log4net;

+using OpenMetaverse;

+using OpenSim.Data;

+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/Region/CoreModules/Hypergrid/HGStandaloneAssetService.cs b/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneAssetService.cs
index 7caa786..f8c7c79 100644
--- a/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneAssetService.cs
+++ b/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneAssetService.cs
@@ -35,7 +35,6 @@ 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/prebuild.xml b/prebuild.xml
index 2dd241d..13d4c33 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -300,6 +300,7 @@
       <ReferencePath>../../../bin/</ReferencePath>
       <Reference name="System"/>
       <Reference name="System.Xml"/>
+      <Reference name="OpenSim.Data"/>
       <Reference name="OpenSim.Framework"/>
       <Reference name="OpenSim.Framework.Console"/>
       <Reference name="OpenSim.Framework.Statistics"/>
@@ -572,7 +573,6 @@
       <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"/>
@@ -986,7 +986,6 @@
       <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"/>
@@ -1060,7 +1059,6 @@
       <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"/>
@@ -2338,7 +2336,6 @@
       <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 -->