From 1bcc489f5b4fa2ba945258777840eb980caab489 Mon Sep 17 00:00:00 2001
From: lbsa71
Date: Thu, 19 Feb 2009 19:04:51 +0000
Subject: * Moved the AssetStreamHandlers to OpenSim.Framework.Servers * And
there, all refs to OpenSim.Grid.AssetServer.exe gone.
/me takes a bow.
---
OpenSim/Framework/Servers/GetAssetStreamHandler.cs | 94 ++++++++++++++++++++++
.../Framework/Servers/PostAssetStreamHandler.cs | 44 ++++++++++
OpenSim/Grid/AssetServer/GetAssetStreamHandler.cs | 94 ----------------------
OpenSim/Grid/AssetServer/PostAssetStreamHandler.cs | 44 ----------
prebuild.xml | 4 -
5 files changed, 138 insertions(+), 142 deletions(-)
create mode 100644 OpenSim/Framework/Servers/GetAssetStreamHandler.cs
create mode 100644 OpenSim/Framework/Servers/PostAssetStreamHandler.cs
delete mode 100644 OpenSim/Grid/AssetServer/GetAssetStreamHandler.cs
delete mode 100644 OpenSim/Grid/AssetServer/PostAssetStreamHandler.cs
diff --git a/OpenSim/Framework/Servers/GetAssetStreamHandler.cs b/OpenSim/Framework/Servers/GetAssetStreamHandler.cs
new file mode 100644
index 0000000..093461d
--- /dev/null
+++ b/OpenSim/Framework/Servers/GetAssetStreamHandler.cs
@@ -0,0 +1,94 @@
+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;
+
+ ///
+ /// Constructor.
+ ///
+ ///
+ ///
+ 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(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..a62f2b0
--- /dev/null
+++ b/OpenSim/Framework/Servers/PostAssetStreamHandler.cs
@@ -0,0 +1,44 @@
+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/Grid/AssetServer/GetAssetStreamHandler.cs b/OpenSim/Grid/AssetServer/GetAssetStreamHandler.cs
deleted file mode 100644
index 093461d..0000000
--- a/OpenSim/Grid/AssetServer/GetAssetStreamHandler.cs
+++ /dev/null
@@ -1,94 +0,0 @@
-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;
-
- ///
- /// Constructor.
- ///
- ///
- ///
- 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(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/Grid/AssetServer/PostAssetStreamHandler.cs b/OpenSim/Grid/AssetServer/PostAssetStreamHandler.cs
deleted file mode 100644
index a62f2b0..0000000
--- a/OpenSim/Grid/AssetServer/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/prebuild.xml b/prebuild.xml
index 59c114e..283511a 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -572,7 +572,6 @@
-
@@ -986,7 +985,6 @@
-
@@ -1060,7 +1058,6 @@
-
@@ -2338,7 +2335,6 @@
-
--
cgit v1.1