* Another stab at removing AssetServer.exe dependencies

OpenSim/Framework/Servers/GetAssetStreamHandler.cs

@@ -1,30 +1,3 @@
-/*
- * 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;
@@ -38,7 +11,7 @@ using OpenSim.Framework;
 using OpenSim.Framework.Servers;
 using OpenSim.Framework.Statistics;
 
-namespace OpenSim.Grid.AssetServer
+namespace OpenSim.Framework.Servers
 {
     public class GetAssetStreamHandler : BaseStreamHandler
     {
@@ -119,38 +92,4 @@ namespace OpenSim.Grid.AssetServer
             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;
-        }
-    }
 }

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;
+        }
+    }
+}

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;
 

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 -->