Initial update to OpenSim 0.8.2.1 source code.

1 files changed, 19 insertions, 28 deletions

diff --git a/OpenSim/Framework/Communications/XMPP/XmppPresenceStanza.cs b/OpenSim/Framework/Servers/HttpServer/BaseOutputStreamHandler.cs
index 4d45ac0..72b3065 100644
--- a/OpenSim/Framework/Communications/XMPP/XmppPresenceStanza.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseOutputStreamHandler.cs
@@ -25,45 +25,36 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System.Xml.Serialization;
+using System.IO;
 
-namespace OpenSim.Framework.Communications.XMPP
+namespace OpenSim.Framework.Servers.HttpServer
 {
     /// <summary>
-    /// Message types.
+    /// Base handler for writing to an output stream
     /// </summary>
-    public enum XmppPresenceType
+    /// <remarks>
+    /// Inheriting classes should override ProcessRequest() rather than Handle()
+    /// </remarks>
+    public abstract class BaseOutputStreamHandler : BaseRequestHandler, IRequestHandler
     {
-        [XmlEnum("unavailable")]  unavailable,
-        [XmlEnum("subscribe")]    subscribe,
-        [XmlEnum("subscribed")]   subscribed,
-        [XmlEnum("unsubscribe")]  unsubscribe,
-        [XmlEnum("unsubscribed")] unsubscribed,
-        [XmlEnum("probe")]        probe,
-        [XmlEnum("error")]        error,
-    }
+        protected BaseOutputStreamHandler(string httpMethod, string path) : this(httpMethod, path, null, null) {}
 
+        protected BaseOutputStreamHandler(string httpMethod, string path, string name, string description)
+            : base(httpMethod, path, name, description) {}
 
-    [XmlRoot("message")]
-    public class XmppPresenceStanza: XmppStanza
-    {
-        /// <summary>
-        /// IQ type: one of set, get, result, error
-        /// </summary>
-        [XmlAttribute("type")]
-        public XmppPresenceType PresenceType;
+        public virtual void Handle(
+            string path, Stream request, Stream response, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
+        {
+            RequestsReceived++;
 
-        // [XmlAttribute("error")]
-        // public XmppError Error;
+            ProcessRequest(path, request, response, httpRequest, httpResponse);
 
-        public XmppPresenceStanza() : base()
-        {
+            RequestsHandled++;
         }
 
-        public XmppPresenceStanza(string fromJid, string toJid, XmppPresenceType pType) :
-            base(fromJid, toJid)
+        protected virtual void ProcessRequest(
+            string path, Stream request, Stream response, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
         {
-            PresenceType = pType;
         }
     }
-}
+}
\ No newline at end of file