7 files changed, 167 insertions, 274 deletions

diff --git a/OpenSim/Framework/Communications/XMPP/XmppSerializer.cs b/OpenSim/Framework/Communications/XMPP/XmppSerializer.cs
deleted file mode 100644
index e37ef28..0000000
--- a/OpenSim/Framework/Communications/XMPP/XmppSerializer.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * 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 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.
- *
- * 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.Collections.Generic;
-using System.Xml;
-using System.Xml.Serialization;
-
-namespace OpenSim.Framework.Communications.XMPP
-{
-    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> _serializerForType = new Dictionary<Type, XmlSerializer>();
-        private Dictionary<string, XmlSerializer> _serializerForName = new Dictionary<string, XmlSerializer>();
-        private XmlSerializerNamespaces _xmlNs;
-        private string _defaultNS;
-
-        public XmppSerializer(bool server)
-        {
-            _xmlNs = new XmlSerializerNamespaces();
-            _xmlNs.Add(String.Empty, String.Empty);
-            if (server) 
-                _defaultNS = "jabber:server";
-            else
-                _defaultNS = "jabber:client";
-
-            // TODO: do this via reflection
-            _serializerForType[typeof(XmppMessageStanza)] = _serializerForName["message"] = 
-                new XmlSerializer(typeof(XmppMessageStanza), _defaultNS);
-        }
-
-        public void Serialize(XmlWriter xw, object o)
-        {
-            if (!_serializerForType.ContainsKey(o.GetType())) 
-                throw new ArgumentException(String.Format("no serializer available for type {0}", o.GetType()));
-
-            _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);
-        }
-    }
-}
diff --git a/OpenSim/Framework/Communications/XMPP/XmppMessageStanza.cs b/OpenSim/Framework/DOMap.cs
index 1e8c33e..f5b650b 100644
--- a/OpenSim/Framework/Communications/XMPP/XmppMessageStanza.cs
+++ b/OpenSim/Framework/DOMap.cs
@@ -25,69 +25,74 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+using System.Xml;
+using System.Xml.Schema;
 using System.Xml.Serialization;
+using OpenMetaverse;
+using OpenMetaverse.StructuredData;
 
-namespace OpenSim.Framework.Communications.XMPP
+namespace OpenSim.Framework
 {
     /// <summary>
-    /// Message types.
+    /// This class stores and retrieves dynamic objects.
     /// </summary>
-    public enum XmppMessageType
+    /// <remarks>
+    /// Experimental - DO NOT USE.  Does not yet have namespace support.
+    /// </remarks>
+    public class DOMap
     {
-        [XmlEnum("chat")] chat,
-        [XmlEnum("error")] error,
-        [XmlEnum("groupchat")] groupchat,
-        [XmlEnum("headline")] headline,
-        [XmlEnum("normal")] normal,
-    }
-
-    /// <summary>
-    /// Message body.
-    /// </summary>
-    public class XmppMessageBody
-    {
-        [XmlText]
-        public string Text;
-
-        public XmppMessageBody()
+        private IDictionary<string, object> m_map;
+        
+        public void Add(string ns, string objName, object dynObj)
         {
-        }
+            DAMap.ValidateNamespace(ns);
 
-        public XmppMessageBody(string message)
-        {
-            Text = message;
+            lock (this)
+            {
+                if (m_map == null)
+                    m_map = new Dictionary<string, object>();
+
+                m_map.Add(objName, dynObj);
+            }
         }
 
-        new public string ToString()
+        public bool ContainsKey(string key)
         {
-            return Text;
+            return Get(key) != null;
         }
-    }
 
-    [XmlRoot("message")]
-    public class XmppMessageStanza: XmppStanza
-    {
         /// <summary>
-        /// IQ type: one of set, get, result, error
+        /// Get a dynamic object
         /// </summary>
-        [XmlAttribute("type")]
-        public XmppMessageType MessageType;
-
-        // [XmlAttribute("error")]
-        // public XmppError Error;
-
-        [XmlElement("body")]
-        public XmppMessageBody Body;
-
-        public XmppMessageStanza() : base()
+        /// <remarks>
+        /// Not providing an index method so that users can't casually overwrite each other's objects.
+        /// </remarks>
+        /// <param name='key'></param>
+        public object Get(string key)
         {
+            lock (this)
+            {
+                if (m_map == null)
+                    return null;
+                else
+                    return m_map[key];
+            }
         }
 
-        public XmppMessageStanza(string fromJid, string toJid, XmppMessageType mType, string message) :
-            base(fromJid, toJid)
+        public bool Remove(string key)
         {
-            MessageType = mType;
-            Body = new XmppMessageBody(message);
+            lock (this)
+            {
+                if (m_map == null)
+                    return false;
+                else
+                    return m_map.Remove(key);
+            }
         }
     }
-}
+}
\ No newline at end of file
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
diff --git a/OpenSim/Framework/Communications/XMPP/XmppStanza.cs b/OpenSim/Region/CoreModules/World/Terrain/ITerrainFeature.cs
index 5312a31..78a43db 100644
--- a/OpenSim/Framework/Communications/XMPP/XmppStanza.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/ITerrainFeature.cs
@@ -26,45 +26,35 @@
  */
 
 using System;
-using System.Xml.Serialization;
+using OpenSim.Region.Framework.Interfaces;
 
-namespace OpenSim.Framework.Communications.XMPP
+namespace OpenSim.Region.CoreModules.World.Terrain
 {
-    public abstract class XmppStanza
+    public interface ITerrainFeature
     {
         /// <summary>
-        /// counter used for generating ID
+        /// Creates the feature.
         /// </summary>
-        [XmlIgnore]
-        private static ulong _ctr = 0;
+        /// <returns>
+        /// Empty string if successful, otherwise error message.
+        /// </returns>
+        /// <param name='map'>
+        /// ITerrainChannel holding terrain data.
+        /// </param>
+        /// <param name='args'>
+        /// command-line arguments from console.
+        /// </param>
+        string CreateFeature(ITerrainChannel map, string[] args);
 
         /// <summary>
-        /// recipient JID
+        /// Gets a string describing the usage.
         /// </summary>
-        [XmlAttribute("to")]
-        public string ToJid;
-
-        /// <summary>
-        /// sender JID
-        /// </summary>
-        [XmlAttribute("from")]
-        public string FromJid;
-
-        /// <summary>
-        /// unique ID.
-        /// </summary>
-        [XmlAttribute("id")]
-        public string MessageId;
-
-        public XmppStanza()
-        {
-        }
-
-        public XmppStanza(string fromJid, string toJid)
-        {
-            ToJid = toJid;
-            FromJid = fromJid;
-            MessageId = String.Format("OpenSim_{0}{1}", DateTime.UtcNow.Ticks, _ctr++);
-        }
+        /// <returns>
+        /// A string describing parameters for creating the feature.
+        /// Format is "feature-name <arg1> <arg2> ..."
+        /// </returns>
+        string GetUsage();
     }
+
 }
+
diff --git a/OpenSim/Framework/Communications/XMPP/XmppIqStanza.cs b/OpenSim/Region/Framework/Interfaces/IExternalCapsModule.cs
index 12263f4..a730cfd 100644
--- a/OpenSim/Framework/Communications/XMPP/XmppIqStanza.cs
+++ b/OpenSim/Region/Framework/Interfaces/IExternalCapsModule.cs
@@ -25,36 +25,24 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System.Xml.Serialization;
+using System;
+using OpenMetaverse;
+using OpenSim.Framework;
+using Caps=OpenSim.Framework.Capabilities.Caps;
 
-namespace OpenSim.Framework.Communications.XMPP
+namespace OpenSim.Region.Framework.Interfaces
 {
-    /// <summary>
-    /// An IQ needs to have one of the follow types set.
-    /// </summary>
-    public enum XmppIqType
-    {
-        [XmlEnum("set")] set,
-        [XmlEnum("get")] get,
-        [XmlEnum("result")] result,
-        [XmlEnum("error")] error,
-    }
-
-    /// <summary>
-    /// XmppIqStanza needs to be subclassed as the query content is
-    /// specific to the query type.
-    /// </summary>
-    [XmlRoot("iq")]
-    public abstract class XmppIqStanza: XmppStanza
+    public interface IExternalCapsModule
     {
         /// <summary>
-        /// IQ type: one of set, get, result, error
+        /// This function extends the simple URL configuration in the caps handlers
+        /// to facilitate more interesting computation when an external handler is
+        /// sent to the viewer. 
         /// </summary>
-        [XmlAttribute("type")]
-        public XmppIqType Type;
-
-        public XmppIqStanza(): base()
-        {
-        }
+        /// <param name="agentID">New user UUID</param>
+        /// <param name="caps">Internal caps registry, where the external handler will be registered</param>
+        /// <param name="capName">Name of the specific cap we are registering</param>
+        /// <param name="urlSkel">The skeleton URL provided in the caps configuration</param>
+        bool RegisterExternalUserCapsHandler(UUID agentID, Caps caps, String capName, String urlSkel);
     }
 }
diff --git a/OpenSim/Framework/Communications/XMPP/XmppWriter.cs b/OpenSim/Region/PhysicsModules/BulletS/Tests/BulletSimTests.cs
index 415d808..0be1f4c 100644..100755
--- a/OpenSim/Framework/Communications/XMPP/XmppWriter.cs
+++ b/OpenSim/Region/PhysicsModules/BulletS/Tests/BulletSimTests.cs
@@ -1,57 +1,56 @@
-/*
- * 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 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.
- *
- * 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.IO;
-using System.Text;
-using System.Xml;
-using IOStream = System.IO.Stream;
-
-namespace OpenSim.Framework.Communications.XMPP
-{
-    public class XMPPWriter: XmlTextWriter
-    {
-        public XMPPWriter(TextWriter textWriter) : base(textWriter)
-        {
-        }
-
-        public XMPPWriter(IOStream stream) : this(stream, Util.UTF8)
-        {
-        }
-
-        public XMPPWriter(IOStream stream, Encoding enc) : base(stream, enc)
-        {
-        }
-
-        public override void WriteStartDocument()
-        {
-        }
-
-        public override void WriteStartDocument(bool standalone)
-        {
-        }
-    }
-}
+/*

+ * 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 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.

+ *

+ * 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.Collections.Generic;

+using System.Linq;

+using System.Text;

+

+using NUnit.Framework;

+using log4net;

+

+using OpenSim.Tests.Common;

+

+namespace OpenSim.Region.PhysicsModule.BulletS.Tests

+{

+[TestFixture]

+public class BulletSimTests : OpenSimTestCase

+{

+    // Documentation on attributes: http://www.nunit.org/index.php?p=attributes&r=2.6.1

+    // Documentation on assertions: http://www.nunit.org/index.php?p=assertions&r=2.6.1

+

+    [TestFixtureSetUp]

+    public void Init()

+    {

+    }

+

+    [TestFixtureTearDown]

+    public void TearDown()

+    {

+    }

+}

+}

diff --git a/OpenSim/Framework/Communications/XMPP/XmppError.cs b/OpenSim/Services/Interfaces/IBakedTextureService.cs
index 3d36e9c..69df4a0 100644
--- a/OpenSim/Framework/Communications/XMPP/XmppError.cs
+++ b/OpenSim/Services/Interfaces/IBakedTextureService.cs
@@ -25,15 +25,14 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System.Xml.Serialization;
+using System;
+using Nini.Config;
 
-namespace OpenSim.Framework.Communications.XMPP
+namespace OpenSim.Services.Interfaces
 {
-    [XmlRoot("error")]
-    public class XmppErrorStanza
+    public interface IBakedTextureService
     {
-        public XmppErrorStanza()
-        {
-        }
+        string Get(string id);
+        void Store(string id, string data);
     }
 }