* adding XmppPresenceStanza and deserialization/reification support

  having reached the intermediate level of .NET's XmlSudoku, i've
  now figured out how to do deserialization using different 
  XmlSerializers (this stuff begins to grow on me, sigh).

  [still not used code, work-in-progress]

* adding convenience property on OSHttpRequest.cs (from awebb)

3 files changed, 100 insertions, 6 deletions

diff --git a/OpenSim/Framework/Communications/XMPP/XmppMessageStanza.cs b/OpenSim/Framework/Communications/XMPP/XmppMessageStanza.cs
index e80c0aa..b221459 100644
--- a/OpenSim/Framework/Communications/XMPP/XmppMessageStanza.cs
+++ b/OpenSim/Framework/Communications/XMPP/XmppMessageStanza.cs
@@ -59,6 +59,11 @@ namespace OpenSim.Framework.Communications.XMPP
         {
             Text = message;
         }
+
+        public string ToString()
+        {
+            return Text;
+        }
     }
 
     [XmlRoot("message")]
diff --git a/OpenSim/Framework/Communications/XMPP/XmppPresenceStanza.cs b/OpenSim/Framework/Communications/XMPP/XmppPresenceStanza.cs
new file mode 100644
index 0000000..d63a0d1
--- /dev/null
+++ b/OpenSim/Framework/Communications/XMPP/XmppPresenceStanza.cs
@@ -0,0 +1,71 @@
+/*
+ * 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.Xml;
+using System.Xml.Serialization;
+
+namespace OpenSim.Framework.Communications.XMPP
+{
+    /// <summary>
+    /// Message types.
+    /// </summary>
+    public enum XmppPresenceType
+    {
+        [XmlEnum("unavailable")]  unavailable,
+        [XmlEnum("subscribe")]    subscribe,
+        [XmlEnum("subscribed")]   subscribed,
+        [XmlEnum("unsubscribe")]  unsubscribe,
+        [XmlEnum("unsubscribed")] unsubscribed,
+        [XmlEnum("probe")]        probe,
+        [XmlEnum("error")]        error,
+    }
+
+
+    [XmlRoot("message")]
+    public class XmppPresenceStanza: XmppStanza
+    {
+        /// <summary>
+        /// IQ type: one of set, get, result, error
+        /// </summary>
+        [XmlAttribute("type")]
+        public XmppPresenceType PresenceType;
+
+        // [XmlAttribute("error")]
+        // public XmppError Error;
+
+        public XmppPresenceStanza() : base()
+        {
+        }
+
+        public XmppPresenceStanza(string fromJid, string toJid, XmppPresenceType pType) :
+            base(fromJid, toJid)
+        {
+            PresenceType = pType;
+        }
+    }
+}
diff --git a/OpenSim/Framework/Communications/XMPP/XmppSerializer.cs b/OpenSim/Framework/Communications/XMPP/XmppSerializer.cs
index f0d2cd5..30a9eac 100644
--- a/OpenSim/Framework/Communications/XMPP/XmppSerializer.cs
+++ b/OpenSim/Framework/Communications/XMPP/XmppSerializer.cs
@@ -28,21 +28,27 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Reflection;
 using System.Text;
 using System.Xml;
 using System.Xml.Serialization;
+using log4net;
 
 namespace OpenSim.Framework.Communications.XMPP
 {
-    public class XMPPSerializer
+    public class XmppSerializer
     {
+        private static readonly ILog _log = 
+            LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
         // need to do it this way, as XmlSerializer(type, extratypes)
         // does not work on mono (at least).
-        private Dictionary<Type, XmlSerializer> _serializers = new Dictionary<Type, XmlSerializer>();
+        private Dictionary<Type, XmlSerializer> _serializerForType = new Dictionary<Type, XmlSerializer>();
+        private Dictionary<string, XmlSerializer> _serializerForName = new Dictionary<string, XmlSerializer>();
         private XmlSerializerNamespaces _xmlNs;
         private string _defaultNS;
 
-        public XMPPSerializer(bool server)
+        public XmppSerializer(bool server)
         {
             _xmlNs = new XmlSerializerNamespaces();
             _xmlNs.Add(String.Empty, String.Empty);
@@ -51,15 +57,27 @@ namespace OpenSim.Framework.Communications.XMPP
             else
                 _defaultNS = "jabber:client";
 
-            _serializers[typeof(XmppMessageStanza)] = new XmlSerializer(typeof(XmppMessageStanza), _defaultNS);
+            // TODO: do this via reflection
+            _serializerForType[typeof(XmppMessageStanza)] = _serializerForName["message"] = 
+                new XmlSerializer(typeof(XmppMessageStanza), _defaultNS);
         }
 
         public void Serialize(XmlWriter xw, object o)
         {
-            if (!_serializers.ContainsKey(o.GetType())) 
+            if (!_serializerForType.ContainsKey(o.GetType())) 
                 throw new ArgumentException(String.Format("no serializer available for type {0}", o.GetType()));
 
-            _serializers[o.GetType()].Serialize(xw, o, _xmlNs);
+            _serializerForType[o.GetType()].Serialize(xw, o, _xmlNs);
+        }
+
+        public object Deserialize(XmlReader xr)
+        {
+            // position on next element
+            xr.Read();
+            if (!_serializerForName.ContainsKey(xr.LocalName))
+                throw new ArgumentException(String.Format("no serializer available for name {0}", xr.LocalName));
+
+            return _serializerForName[xr.LocalName].Deserialize(xr);
         }
     }
 }