From 67dee6410dcb982b899ec0bb9644d5afa4a8e2d1 Mon Sep 17 00:00:00 2001
From: Dr Scofield
Date: Wed, 4 Jun 2008 13:06:24 +0000
Subject: * fleshing out XMPP entities, adding XmppWriter and XmppSerializer
having spent the last couple of days wrestling with .NET XmlSerializer
and trying to get it to do what is required by XMPP (RFC 3920 & 3921)
this is the preliminary result of that wrestling (you should see the
other guy!): XmppSerializer allows us to serialize Xmpp stanza (and
theoretically deserialize [or reify] them), XmppWriter helps avoiding
various gratuitous crap added in by off-the-shelf XmlSerializer.
this is currently not used anywhere but the plan is to use it for
at least an XMPPBridgeModule.
---
.../Communications/XMPP/XmppMessageStanza.cs | 90 ++++++++++++++++++++++
1 file changed, 90 insertions(+)
create mode 100644 OpenSim/Framework/Communications/XMPP/XmppMessageStanza.cs
(limited to 'OpenSim/Framework/Communications/XMPP/XmppMessageStanza.cs')
diff --git a/OpenSim/Framework/Communications/XMPP/XmppMessageStanza.cs b/OpenSim/Framework/Communications/XMPP/XmppMessageStanza.cs
new file mode 100644
index 0000000..e80c0aa
--- /dev/null
+++ b/OpenSim/Framework/Communications/XMPP/XmppMessageStanza.cs
@@ -0,0 +1,90 @@
+/*
+ * 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
+{
+ ///
+ /// Message types.
+ ///
+ public enum XmppMessageType
+ {
+ [XmlEnum("chat")] chat,
+ [XmlEnum("error")] error,
+ [XmlEnum("groupchat")] groupchat,
+ [XmlEnum("headline")] headline,
+ [XmlEnum("normal")] normal,
+ }
+
+ ///
+ /// Message body.
+ ///
+ public class XmppMessageBody
+ {
+ [XmlText]
+ public string Text;
+
+ public XmppMessageBody()
+ {
+ }
+
+ public XmppMessageBody(string message)
+ {
+ Text = message;
+ }
+ }
+
+ [XmlRoot("message")]
+ public class XmppMessageStanza: XmppStanza
+ {
+ ///
+ /// IQ type: one of set, get, result, error
+ ///
+ [XmlAttribute("type")]
+ public XmppMessageType MessageType;
+
+ // [XmlAttribute("error")]
+ // public XmppError Error;
+
+ [XmlElement("body")]
+ public XmppMessageBody Body;
+
+ public XmppMessageStanza() : base()
+ {
+ }
+
+ public XmppMessageStanza(string fromJid, string toJid, XmppMessageType mType, string message) :
+ base(fromJid, toJid)
+ {
+ MessageType = mType;
+ Body = new XmppMessageBody(message);
+ }
+ }
+}
--
cgit v1.1
From caee0288fbf5fdc2abfbaa0890d3de62110de324 Mon Sep 17 00:00:00 2001
From: Dr Scofield
Date: Wed, 4 Jun 2008 18:09:55 +0000
Subject: * 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)
---
OpenSim/Framework/Communications/XMPP/XmppMessageStanza.cs | 5 +++++
1 file changed, 5 insertions(+)
(limited to 'OpenSim/Framework/Communications/XMPP/XmppMessageStanza.cs')
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")]
--
cgit v1.1
From cea6e03ae0aaea3acba6b844f173ee08259fe101 Mon Sep 17 00:00:00 2001
From: Dr Scofield
Date: Fri, 27 Jun 2008 16:18:56 +0000
Subject: dr scofield's warning safari: hunting down those little buggers
---
OpenSim/Framework/Communications/XMPP/XmppMessageStanza.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'OpenSim/Framework/Communications/XMPP/XmppMessageStanza.cs')
diff --git a/OpenSim/Framework/Communications/XMPP/XmppMessageStanza.cs b/OpenSim/Framework/Communications/XMPP/XmppMessageStanza.cs
index b221459..fd4cd5f 100644
--- a/OpenSim/Framework/Communications/XMPP/XmppMessageStanza.cs
+++ b/OpenSim/Framework/Communications/XMPP/XmppMessageStanza.cs
@@ -60,7 +60,7 @@ namespace OpenSim.Framework.Communications.XMPP
Text = message;
}
- public string ToString()
+ new public string ToString()
{
return Text;
}
--
cgit v1.1
From 801da4346aeb3c08969c4845f5c595135a64470a Mon Sep 17 00:00:00 2001
From: lbsa71
Date: Thu, 12 Feb 2009 09:53:12 +0000
Subject: * optimized usings.
---
OpenSim/Framework/Communications/XMPP/XmppMessageStanza.cs | 2 --
1 file changed, 2 deletions(-)
(limited to 'OpenSim/Framework/Communications/XMPP/XmppMessageStanza.cs')
diff --git a/OpenSim/Framework/Communications/XMPP/XmppMessageStanza.cs b/OpenSim/Framework/Communications/XMPP/XmppMessageStanza.cs
index fd4cd5f..d150708 100644
--- a/OpenSim/Framework/Communications/XMPP/XmppMessageStanza.cs
+++ b/OpenSim/Framework/Communications/XMPP/XmppMessageStanza.cs
@@ -25,8 +25,6 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-using System;
-using System.Xml;
using System.Xml.Serialization;
namespace OpenSim.Framework.Communications.XMPP
--
cgit v1.1
From 840de6c036570d559ec6924cd8405d3f34a99fdd Mon Sep 17 00:00:00 2001
From: Jeff Ames
Date: Mon, 1 Jun 2009 06:37:14 +0000
Subject: Minor: Change OpenSim to OpenSimulator in older copyright headers and
LICENSE.txt.
---
OpenSim/Framework/Communications/XMPP/XmppMessageStanza.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'OpenSim/Framework/Communications/XMPP/XmppMessageStanza.cs')
diff --git a/OpenSim/Framework/Communications/XMPP/XmppMessageStanza.cs b/OpenSim/Framework/Communications/XMPP/XmppMessageStanza.cs
index d150708..1e8c33e 100644
--- a/OpenSim/Framework/Communications/XMPP/XmppMessageStanza.cs
+++ b/OpenSim/Framework/Communications/XMPP/XmppMessageStanza.cs
@@ -9,7 +9,7 @@
* * 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
+ * * Neither the name of the OpenSimulator Project nor the
* names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission.
*
--
cgit v1.1