Moved OpenSim/Framework/Communications/Capabilities up to OpenSim/Framework/Capabilities. Didn't change the namespace because VC# is not helping, and this would imply manually changing more than 50 files. So the namespace is still OpenSim.Framework.Communications.Capabilities, to be cleaned up later by someone with more energy.

author: diva 2009-06-18 00:48:39 +0000
committer: diva 2009-06-18 00:48:39 +0000
commit: 913bc3bdb380cebebd11b657966486448962ab47 (patch)
tree: f41837093cd692b9fe42a21c9cb1473ef81dd0f1 /OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs
parent: Fix an uninitialized data block. Thanks, jhurliman (diff)
download: opensim-SC_OLD-913bc3bdb380cebebd11b657966486448962ab47.zip
opensim-SC_OLD-913bc3bdb380cebebd11b657966486448962ab47.tar.gz
opensim-SC_OLD-913bc3bdb380cebebd11b657966486448962ab47.tar.bz2
opensim-SC_OLD-913bc3bdb380cebebd11b657966486448962ab47.tar.xz
1 files changed, 70 insertions, 70 deletions
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs b/OpenSim/Framework/Capabilities/LLSDStreamHandler.cs
index a55b86d..18f0a2a 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs
+++ b/OpenSim/Framework/Capabilities/LLSDStreamHandler.cs
@@ -1,70 +1,70 @@
-/*
+/*
- * Copyright (c) Contributors, http://opensimulator.org/
+ * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
+ *
- * Redistribution and use in source and binary forms, with or without
+ * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
+ *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
+ *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
+ *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
+ *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
+ *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
+ *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
+ *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
+ *       derived from this software without specific prior written permission.
- *
+ *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * 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
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+ */
-using System.Collections;
+using System.Collections;
-using System.IO;
+using System.IO;
-using System.Text;
+using System.Text;
-using OpenSim.Framework.Servers;
+using OpenSim.Framework.Servers;
-using OpenSim.Framework.Servers.HttpServer;
+using OpenSim.Framework.Servers.HttpServer;
-namespace OpenSim.Framework.Communications.Capabilities
+namespace OpenSim.Framework.Communications.Capabilities
-{
+{
-    public class LLSDStreamhandler<TRequest, TResponse> : BaseStreamHandler
+    public class LLSDStreamhandler<TRequest, TResponse> : BaseStreamHandler
-        where TRequest : new()
+        where TRequest : new()
-    {
+    {
-        private LLSDMethod<TRequest, TResponse> m_method;
+        private LLSDMethod<TRequest, TResponse> m_method;
-        public LLSDStreamhandler(string httpMethod, string path, LLSDMethod<TRequest, TResponse> method)
+        public LLSDStreamhandler(string httpMethod, string path, LLSDMethod<TRequest, TResponse> method)
-            : base(httpMethod, path)
+            : base(httpMethod, path)
-        {
+        {
-            m_method = method;
+            m_method = method;
-        }
+        }
-        public override byte[] Handle(string path, Stream request,
+        public override byte[] Handle(string path, Stream request,
-                                      OSHttpRequest httpRequest, OSHttpResponse httpResponse)
+                                      OSHttpRequest httpRequest, OSHttpResponse httpResponse)
-        {
+        {
-            //Encoding encoding = Encoding.UTF8;
+            //Encoding encoding = Encoding.UTF8;
-            //StreamReader streamReader = new StreamReader(request, false);
+            //StreamReader streamReader = new StreamReader(request, false);
-            //string requestBody = streamReader.ReadToEnd();
+            //string requestBody = streamReader.ReadToEnd();
-            //streamReader.Close();
+            //streamReader.Close();
-            // OpenMetaverse.StructuredData.OSDMap hash = (OpenMetaverse.StructuredData.OSDMap)
+            // OpenMetaverse.StructuredData.OSDMap hash = (OpenMetaverse.StructuredData.OSDMap)
-            //    OpenMetaverse.StructuredData.LLSDParser.DeserializeXml(new XmlTextReader(request));
+            //    OpenMetaverse.StructuredData.LLSDParser.DeserializeXml(new XmlTextReader(request));
-            Hashtable hash = (Hashtable) LLSD.LLSDDeserialize(request);
+            Hashtable hash = (Hashtable) LLSD.LLSDDeserialize(request);
-            TRequest llsdRequest = new TRequest();
+            TRequest llsdRequest = new TRequest();
-            LLSDHelpers.DeserialiseOSDMap(hash, llsdRequest);
+            LLSDHelpers.DeserialiseOSDMap(hash, llsdRequest);
-            TResponse response = m_method(llsdRequest);
+            TResponse response = m_method(llsdRequest);
-            Encoding encoding = new UTF8Encoding(false);
+            Encoding encoding = new UTF8Encoding(false);
-            return encoding.GetBytes(LLSDHelpers.SerialiseLLSDReply(response));
+            return encoding.GetBytes(LLSDHelpers.SerialiseLLSDReply(response));
-        }
+        }
-    }
+    }
-}
+}
author	diva	2009-06-18 00:48:39 +0000
committer	diva	2009-06-18 00:48:39 +0000
commit	913bc3bdb380cebebd11b657966486448962ab47 (patch)
tree	f41837093cd692b9fe42a21c9cb1473ef81dd0f1 /OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs
parent	Fix an uninitialized data block. Thanks, jhurliman (diff)
download	opensim-SC_OLD-913bc3bdb380cebebd11b657966486448962ab47.zip opensim-SC_OLD-913bc3bdb380cebebd11b657966486448962ab47.tar.gz opensim-SC_OLD-913bc3bdb380cebebd11b657966486448962ab47.tar.bz2 opensim-SC_OLD-913bc3bdb380cebebd11b657966486448962ab47.tar.xz

diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs b/OpenSim/Framework/Capabilities/LLSDStreamHandler.cs index a55b86d..18f0a2a 100644 --- a/OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs +++ b/OpenSim/Framework/Capabilities/LLSDStreamHandler.cs
@@ -1,70 +1,70 @@
1	/*	1	/*
2	* Copyright (c) Contributors, http://opensimulator.org/	2	* Copyright (c) Contributors, http://opensimulator.org/
3	* See CONTRIBUTORS.TXT for a full list of copyright holders.	3	* See CONTRIBUTORS.TXT for a full list of copyright holders.
4	*	4	*
5	* Redistribution and use in source and binary forms, with or without	5	* Redistribution and use in source and binary forms, with or without
6	* modification, are permitted provided that the following conditions are met:	6	* modification, are permitted provided that the following conditions are met:
7	* * Redistributions of source code must retain the above copyright	7	* * Redistributions of source code must retain the above copyright
8	* notice, this list of conditions and the following disclaimer.	8	* notice, this list of conditions and the following disclaimer.
9	* * Redistributions in binary form must reproduce the above copyright	9	* * Redistributions in binary form must reproduce the above copyright
10	* notice, this list of conditions and the following disclaimer in the	10	* notice, this list of conditions and the following disclaimer in the
11	* documentation and/or other materials provided with the distribution.	11	* documentation and/or other materials provided with the distribution.
12	* * Neither the name of the OpenSimulator Project nor the	12	* * Neither the name of the OpenSimulator Project nor the
13	* names of its contributors may be used to endorse or promote products	13	* names of its contributors may be used to endorse or promote products
14	* derived from this software without specific prior written permission.	14	* derived from this software without specific prior written permission.
15	*	15	*
16	* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY	16	* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17	* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED	17	* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18	* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE	18	* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19	* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY	19	* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20	* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES	20	* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21	* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;	21	* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22	* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND	22	* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23	* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT	23	* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS	24	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25	* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.	25	* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26	*/	26	*/
27		27
28	using System.Collections;	28	using System.Collections;
29	using System.IO;	29	using System.IO;
30	using System.Text;	30	using System.Text;
31	using OpenSim.Framework.Servers;	31	using OpenSim.Framework.Servers;
32	using OpenSim.Framework.Servers.HttpServer;	32	using OpenSim.Framework.Servers.HttpServer;
33		33
34	namespace OpenSim.Framework.Communications.Capabilities	34	namespace OpenSim.Framework.Communications.Capabilities
35	{	35	{
36	public class LLSDStreamhandler<TRequest, TResponse> : BaseStreamHandler	36	public class LLSDStreamhandler<TRequest, TResponse> : BaseStreamHandler
37	where TRequest : new()	37	where TRequest : new()
38	{	38	{
39	private LLSDMethod<TRequest, TResponse> m_method;	39	private LLSDMethod<TRequest, TResponse> m_method;
40		40
41	public LLSDStreamhandler(string httpMethod, string path, LLSDMethod<TRequest, TResponse> method)	41	public LLSDStreamhandler(string httpMethod, string path, LLSDMethod<TRequest, TResponse> method)
42	: base(httpMethod, path)	42	: base(httpMethod, path)
43	{	43	{
44	m_method = method;	44	m_method = method;
45	}	45	}
46		46
47	public override byte[] Handle(string path, Stream request,	47	public override byte[] Handle(string path, Stream request,
48	OSHttpRequest httpRequest, OSHttpResponse httpResponse)	48	OSHttpRequest httpRequest, OSHttpResponse httpResponse)
49	{	49	{
50	//Encoding encoding = Encoding.UTF8;	50	//Encoding encoding = Encoding.UTF8;
51	//StreamReader streamReader = new StreamReader(request, false);	51	//StreamReader streamReader = new StreamReader(request, false);
52		52
53	//string requestBody = streamReader.ReadToEnd();	53	//string requestBody = streamReader.ReadToEnd();
54	//streamReader.Close();	54	//streamReader.Close();
55		55
56	// OpenMetaverse.StructuredData.OSDMap hash = (OpenMetaverse.StructuredData.OSDMap)	56	// OpenMetaverse.StructuredData.OSDMap hash = (OpenMetaverse.StructuredData.OSDMap)
57	// OpenMetaverse.StructuredData.LLSDParser.DeserializeXml(new XmlTextReader(request));	57	// OpenMetaverse.StructuredData.LLSDParser.DeserializeXml(new XmlTextReader(request));
58		58
59	Hashtable hash = (Hashtable) LLSD.LLSDDeserialize(request);	59	Hashtable hash = (Hashtable) LLSD.LLSDDeserialize(request);
60	TRequest llsdRequest = new TRequest();	60	TRequest llsdRequest = new TRequest();
61	LLSDHelpers.DeserialiseOSDMap(hash, llsdRequest);	61	LLSDHelpers.DeserialiseOSDMap(hash, llsdRequest);
62		62
63	TResponse response = m_method(llsdRequest);	63	TResponse response = m_method(llsdRequest);
64		64
65	Encoding encoding = new UTF8Encoding(false);	65	Encoding encoding = new UTF8Encoding(false);
66		66
67	return encoding.GetBytes(LLSDHelpers.SerialiseLLSDReply(response));	67	return encoding.GetBytes(LLSDHelpers.SerialiseLLSDReply(response));
68	}	68	}
69	}	69	}
70	}	70	}