1 files changed, 94 insertions, 155 deletions
diff --git a/OpenSim/Grid/AssetServer/RestService.cs b/OpenSim/Grid/AssetServer/GetAssetStreamHandler.cs
index a9519ec..56cd52b 100644
--- a/OpenSim/Grid/AssetServer/RestService.cs
+++ b/OpenSim/Grid/AssetServer/GetAssetStreamHandler.cs
@@ -1,155 +1,94 @@
-/*
+using System;
- * Copyright (c) Contributors, http://opensimulator.org/
+using System.IO;
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
+using System.Reflection;
- *
+using System.Text;
- * Redistribution and use in source and binary forms, with or without
+using System.Xml;
- * modification, are permitted provided that the following conditions are met:
+using System.Xml.Serialization;
- *     * Redistributions of source code must retain the above copyright
+using log4net;
- *       notice, this list of conditions and the following disclaimer.
+using OpenMetaverse;
- *     * Redistributions in binary form must reproduce the above copyright
+using OpenSim.Framework;
- *       notice, this list of conditions and the following disclaimer in the
+using OpenSim.Framework.Servers;
- *       documentation and/or other materials provided with the distribution.
+using OpenSim.Framework.Statistics;
- *     * Neither the name of the OpenSim Project nor the
- *       names of its contributors may be used to endorse or promote products
+namespace OpenSim.Grid.AssetServer
- *       derived from this software without specific prior written permission.
+{
- *
+    public class GetAssetStreamHandler : BaseStreamHandler
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+    {
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+        // private OpenAsset_Main m_assetManager;
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+        private IAssetDataPlugin m_assetProvider;
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+        /// <summary>
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+        /// Constructor.
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+        /// </summary>
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+        /// <param name="assetManager"></param>
- */
+        /// <param name="assetProvider"></param>
+        public GetAssetStreamHandler(IAssetDataPlugin assetProvider)
-using System;
+            : base("GET", "/assets")
-using System.IO;
+        {
-using System.Reflection;
+            m_log.Info("[REST]: In Get Request");
-using System.Text;
+            // m_assetManager = assetManager;
-using System.Xml;
+            m_assetProvider = assetProvider;
-using System.Xml.Serialization;
+        }
-using log4net;
-using OpenMetaverse;
+        public override byte[] Handle(string path, Stream request,
-using OpenSim.Framework;
+                                      OSHttpRequest httpRequest, OSHttpResponse httpResponse)
-using OpenSim.Framework.Servers;
+        {
-using OpenSim.Framework.Statistics;
+            string param = GetParam(path);
+            byte[] result = new byte[] {};
-namespace OpenSim.Grid.AssetServer
-{
+            string[] p = param.Split(new char[] {'/', '?', '&'}, StringSplitOptions.RemoveEmptyEntries);
-    public class GetAssetStreamHandler : BaseStreamHandler
-    {
+            if (p.Length > 0)
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+            {
+                UUID assetID = UUID.Zero;
-        // private OpenAsset_Main m_assetManager;
-        private IAssetDataPlugin m_assetProvider;
+                if (!UUID.TryParse(p[0], out assetID))
+                {
-        /// <summary>
+                    m_log.InfoFormat(
-        /// Constructor.
+                        "[REST]: GET:/asset ignoring request with malformed UUID {0}", p[0]);
-        /// </summary>
+                    return result;
-        /// <param name="assetManager"></param>
+                }
-        /// <param name="assetProvider"></param>
-        public GetAssetStreamHandler(IAssetDataPlugin assetProvider)
+                if (StatsManager.AssetStats != null)
-            : base("GET", "/assets")
+                    StatsManager.AssetStats.AddRequest();
-        {
-            m_log.Info("[REST]: In Get Request");
+                AssetBase asset = m_assetProvider.FetchAsset(assetID);
-            // m_assetManager = assetManager;
+                if (asset != null)
-            m_assetProvider = assetProvider;
+                {
-        }
+                    XmlSerializer xs = new XmlSerializer(typeof (AssetBase));
+                    MemoryStream ms = new MemoryStream();
-        public override byte[] Handle(string path, Stream request,
+                    XmlTextWriter xw = new XmlTextWriter(ms, Encoding.UTF8);
-                                      OSHttpRequest httpRequest, OSHttpResponse httpResponse)
+                    xw.Formatting = Formatting.Indented;
-        {
+                    xs.Serialize(xw, asset);
-            string param = GetParam(path);
+                    xw.Flush();
-            byte[] result = new byte[] {};
+                    ms.Seek(0, SeekOrigin.Begin);
-            string[] p = param.Split(new char[] {'/', '?', '&'}, StringSplitOptions.RemoveEmptyEntries);
+                    //StreamReader sr = new StreamReader(ms);
-            if (p.Length > 0)
+                    result = ms.GetBuffer();
-            {
-                UUID assetID = UUID.Zero;
+//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
-                if (!UUID.TryParse(p[0], out assetID))
+//the logging itself is slowing down the program. Leaving the unsuccesful message
-                {
+//as we need to know about that path.
-                    m_log.InfoFormat(
+//                    m_log.InfoFormat(
-                        "[REST]: GET:/asset ignoring request with malformed UUID {0}", p[0]);
+//                        "[REST]: GET:/asset found {0} with name {1}, size {2} bytes",
-                    return result;
+//                        assetID, asset.Name, result.Length);
-                }
+                    Array.Resize<byte>(ref result, (int) ms.Length);
-                if (StatsManager.AssetStats != null)
+                }
-                    StatsManager.AssetStats.AddRequest();
+                else
+                {
-                AssetBase asset = m_assetProvider.FetchAsset(assetID);
+                    if (StatsManager.AssetStats != null)
-                if (asset != null)
+                        StatsManager.AssetStats.AddNotFoundRequest();
-                {
-                    XmlSerializer xs = new XmlSerializer(typeof (AssetBase));
+                    m_log.InfoFormat("[REST]: GET:/asset failed to find {0}", assetID);
-                    MemoryStream ms = new MemoryStream();
+                }
-                    XmlTextWriter xw = new XmlTextWriter(ms, Encoding.UTF8);
+            }
-                    xw.Formatting = Formatting.Indented;
-                    xs.Serialize(xw, asset);
+            return result;
-                    xw.Flush();
+        }
+    }
-                    ms.Seek(0, SeekOrigin.Begin);
+}
+\ No newline at end of file
-                    //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/Grid/AssetServer/RestService.cs b/OpenSim/Grid/AssetServer/GetAssetStreamHandler.cs index a9519ec..56cd52b 100644 --- a/OpenSim/Grid/AssetServer/RestService.cs +++ b/OpenSim/Grid/AssetServer/GetAssetStreamHandler.cs
@@ -1,155 +1,94 @@
1	/*	1	using System;
2	* Copyright (c) Contributors, http://opensimulator.org/	2	using System.IO;
3	* See CONTRIBUTORS.TXT for a full list of copyright holders.	3	using System.Reflection;
4	*	4	using System.Text;
5	* Redistribution and use in source and binary forms, with or without	5	using System.Xml;
6	* modification, are permitted provided that the following conditions are met:	6	using System.Xml.Serialization;
7	* * Redistributions of source code must retain the above copyright	7	using log4net;
8	* notice, this list of conditions and the following disclaimer.	8	using OpenMetaverse;
9	* * Redistributions in binary form must reproduce the above copyright	9	using OpenSim.Framework;
10	* notice, this list of conditions and the following disclaimer in the	10	using OpenSim.Framework.Servers;
11	* documentation and/or other materials provided with the distribution.	11	using OpenSim.Framework.Statistics;
12	* * Neither the name of the OpenSim Project nor the	12
13	* names of its contributors may be used to endorse or promote products	13	namespace OpenSim.Grid.AssetServer
14	* derived from this software without specific prior written permission.	14	{
15	*	15	public class GetAssetStreamHandler : BaseStreamHandler
16	* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY	16	{
17	* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED	17	private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
18	* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE	18
19	* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY	19	// private OpenAsset_Main m_assetManager;
20	* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES	20	private IAssetDataPlugin m_assetProvider;
21	* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;	21
22	* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND	22	/// <summary>
23	* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT	23	/// Constructor.
24	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS	24	/// </summary>
25	* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.	25	/// <param name="assetManager"></param>
26	*/	26	/// <param name="assetProvider"></param>
27		27	public GetAssetStreamHandler(IAssetDataPlugin assetProvider)
28	using System;	28	: base("GET", "/assets")
29	using System.IO;	29	{
30	using System.Reflection;	30	m_log.Info("[REST]: In Get Request");
31	using System.Text;	31	// m_assetManager = assetManager;
32	using System.Xml;	32	m_assetProvider = assetProvider;
33	using System.Xml.Serialization;	33	}
34	using log4net;	34
35	using OpenMetaverse;	35	public override byte[] Handle(string path, Stream request,
36	using OpenSim.Framework;	36	OSHttpRequest httpRequest, OSHttpResponse httpResponse)
37	using OpenSim.Framework.Servers;	37	{
38	using OpenSim.Framework.Statistics;	38	string param = GetParam(path);
39		39	byte[] result = new byte[] {};
40	namespace OpenSim.Grid.AssetServer	40
41	{	41	string[] p = param.Split(new char[] {'/', '?', '&'}, StringSplitOptions.RemoveEmptyEntries);
42	public class GetAssetStreamHandler : BaseStreamHandler	42
43	{	43	if (p.Length > 0)
44	private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);	44	{
45		45	UUID assetID = UUID.Zero;
46	// private OpenAsset_Main m_assetManager;	46
47	private IAssetDataPlugin m_assetProvider;	47	if (!UUID.TryParse(p[0], out assetID))
48		48	{
49	/// <summary>	49	m_log.InfoFormat(
50	/// Constructor.	50	"[REST]: GET:/asset ignoring request with malformed UUID {0}", p[0]);
51	/// </summary>	51	return result;
52	/// <param name="assetManager"></param>	52	}
53	/// <param name="assetProvider"></param>	53
54	public GetAssetStreamHandler(IAssetDataPlugin assetProvider)	54	if (StatsManager.AssetStats != null)
55	: base("GET", "/assets")	55	StatsManager.AssetStats.AddRequest();
56	{	56
57	m_log.Info("[REST]: In Get Request");	57	AssetBase asset = m_assetProvider.FetchAsset(assetID);
58	// m_assetManager = assetManager;	58	if (asset != null)
59	m_assetProvider = assetProvider;	59	{
60	}	60	XmlSerializer xs = new XmlSerializer(typeof (AssetBase));
61		61	MemoryStream ms = new MemoryStream();
62	public override byte[] Handle(string path, Stream request,	62	XmlTextWriter xw = new XmlTextWriter(ms, Encoding.UTF8);
63	OSHttpRequest httpRequest, OSHttpResponse httpResponse)	63	xw.Formatting = Formatting.Indented;
64	{	64	xs.Serialize(xw, asset);
65	string param = GetParam(path);	65	xw.Flush();
66	byte[] result = new byte[] {};	66
67		67	ms.Seek(0, SeekOrigin.Begin);
68	string[] p = param.Split(new char[] {'/', '?', '&'}, StringSplitOptions.RemoveEmptyEntries);	68	//StreamReader sr = new StreamReader(ms);
69		69
70	if (p.Length > 0)	70	result = ms.GetBuffer();
71	{	71
72	UUID assetID = UUID.Zero;	72	//Ckrinke 1/11/09 Commenting out the succesful REST message as under heavy use there
73		73	//are multiple messages in a second and that is usually (in my experience) meaning
74	if (!UUID.TryParse(p[0], out assetID))	74	//the logging itself is slowing down the program. Leaving the unsuccesful message
75	{	75	//as we need to know about that path.
76	m_log.InfoFormat(	76	// m_log.InfoFormat(
77	"[REST]: GET:/asset ignoring request with malformed UUID {0}", p[0]);	77	// "[REST]: GET:/asset found {0} with name {1}, size {2} bytes",
78	return result;	78	// assetID, asset.Name, result.Length);
79	}	79
80		80	Array.Resize<byte>(ref result, (int) ms.Length);
81	if (StatsManager.AssetStats != null)	81	}
82	StatsManager.AssetStats.AddRequest();	82	else
83		83	{
84	AssetBase asset = m_assetProvider.FetchAsset(assetID);	84	if (StatsManager.AssetStats != null)
85	if (asset != null)	85	StatsManager.AssetStats.AddNotFoundRequest();
86	{	86
87	XmlSerializer xs = new XmlSerializer(typeof (AssetBase));	87	m_log.InfoFormat("[REST]: GET:/asset failed to find {0}", assetID);
88	MemoryStream ms = new MemoryStream();	88	}
89	XmlTextWriter xw = new XmlTextWriter(ms, Encoding.UTF8);	89	}
90	xw.Formatting = Formatting.Indented;	90
91	xs.Serialize(xw, asset);	91	return result;
92	xw.Flush();	92	}
93		93	}
94	ms.Seek(0, SeekOrigin.Begin);	94	} \ No newline at end of file
95	//StreamReader sr = new StreamReader(ms);
96
97	result = ms.GetBuffer();
98
99	//Ckrinke 1/11/09 Commenting out the succesful REST message as under heavy use there
100	//are multiple messages in a second and that is usually (in my experience) meaning
101	//the logging itself is slowing down the program. Leaving the unsuccesful message
102	//as we need to know about that path.
103	// m_log.InfoFormat(
104	// "[REST]: GET:/asset found {0} with name {1}, size {2} bytes",
105	// assetID, asset.Name, result.Length);
106
107	Array.Resize<byte>(ref result, (int) ms.Length);
108	}
109	else
110	{
111	if (StatsManager.AssetStats != null)
112	StatsManager.AssetStats.AddNotFoundRequest();
113
114	m_log.InfoFormat("[REST]: GET:/asset failed to find {0}", assetID);
115	}
116	}
117
118	return result;
119	}
120	}
121
122	public class PostAssetStreamHandler : BaseStreamHandler
123	{
124	private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
125
126	// private OpenAsset_Main m_assetManager;
127	private IAssetDataPlugin m_assetProvider;
128
129	public override byte[] Handle(string path, Stream request,
130	OSHttpRequest httpRequest, OSHttpResponse httpResponse)
131	{
132	string param = GetParam(path);
133
134	UUID assetId;
135	if (param.Length > 0)
136	UUID.TryParse(param, out assetId);
137	// byte[] txBuffer = new byte[4096];
138
139	XmlSerializer xs = new XmlSerializer(typeof (AssetBase));
140	AssetBase asset = (AssetBase) xs.Deserialize(request);
141
142	m_log.InfoFormat("[REST]: Creating asset {0}", asset.FullID);
143	m_assetProvider.CreateAsset(asset);
144
145	return new byte[] {};
146	}
147
148	public PostAssetStreamHandler(IAssetDataPlugin assetProvider)
149	: base("POST", "/assets")
150	{
151	// m_assetManager = assetManager;
152	m_assetProvider = assetProvider;
153	}
154	}
155	}