Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

OpenSim/Framework/Servers/HttpServer/SynchronousRestObjectRequester.cs

@@ -62,7 +62,7 @@ namespace OpenSim.Framework.Servers.HttpServer
             WebRequest request = WebRequest.Create(requestUrl);
             request.Method = verb;
 
-            if (verb == "POST")
+            if ((verb == "POST") || (verb == "PUT"))
             {
                 request.ContentType = "text/xml";
 

OpenSim/Grid/MessagingServer/Main.cs

@@ -65,6 +65,7 @@ namespace OpenSim.Grid.MessagingServer
         {
             ArgvConfigSource argvSource = new ArgvConfigSource(args);
             argvSource.AddSwitch("Startup", "console", "c");
+            argvSource.AddSwitch("Startup", "xmlfile", "x");
 
             IConfig startupConfig = argvSource.Configs["Startup"];
             if (startupConfig != null)

OpenSim/Server/Handlers/Inventory/InventoryServerInConnector.cs

@@ -143,6 +143,9 @@ namespace OpenSim.Server.Handlers.Inventory
             m_httpServer.AddStreamHandler(
                 new RestDeserialiseSecureHandler<List<InventoryItemBase>, bool>(
                     "POST", "/MoveItems/", MoveItems, CheckAuthSession));
+
+            m_httpServer.AddStreamHandler(new InventoryServerMoveItemsHandler(m_InventoryService));
+
             
             // for persistent active gestures
             m_httpServer.AddStreamHandler(

OpenSim/Server/Handlers/Inventory/InventoryServerMoveItemsHandler.cs

@@ -0,0 +1,81 @@
+/*
+ * 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 Nini.Config;
+using log4net;
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using System.IO;
+using System.Net;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Xml;
+using System.Xml.Serialization;
+using OpenSim.Server.Base;
+using OpenSim.Services.Interfaces;
+using OpenSim.Framework;
+using OpenSim.Framework.Servers.HttpServer;
+using OpenMetaverse;
+
+namespace OpenSim.Server.Handlers.Inventory
+{
+    public class InventoryServerMoveItemsHandler : BaseStreamHandler
+    {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        private IInventoryService m_InventoryService;
+
+        public InventoryServerMoveItemsHandler(IInventoryService service) :
+                base("PUT", "/inventory")
+        {
+            m_InventoryService = service;
+        }
+
+        public override byte[] Handle(string path, Stream request,
+                OSHttpRequest httpRequest, OSHttpResponse httpResponse)
+        {
+            XmlSerializer xs = new XmlSerializer(typeof (List<InventoryItemBase>));
+            List<InventoryItemBase> items = (List<InventoryItemBase>)xs.Deserialize(request);
+
+            bool result = false;
+            string[] p = SplitParams(path);
+
+            if (p.Length > 0)
+            {
+                UUID ownerID = UUID.Zero;
+                UUID.TryParse(p[0], out ownerID);
+                result = m_InventoryService.MoveItems(ownerID, items);
+            }
+            else
+                m_log.WarnFormat("[MOVEITEMS HANDLER]: ownerID not provided in request. Unable to serve.");
+
+            xs = new XmlSerializer(typeof(bool));
+            return ServerUtils.SerializeResult(xs, result);
+        }
+    }
+}

OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs

@@ -397,13 +397,28 @@ namespace OpenSim.Services.Connectors
 
         private void MoveItemsAsync(string userID, List<InventoryItemBase> items, UUID sessionID)
         {
+            if (items == null)
+            {
+                m_log.WarnFormat("[INVENTORY CONNECTOR]: request to move items got a null list.");
+                return;
+            }
+
             try
             {
-                SynchronousRestSessionObjectPoster<List<InventoryItemBase>, bool>.BeginPostObject(
+                //SynchronousRestSessionObjectPoster<List<InventoryItemBase>, bool>.BeginPostObject(
-                    "POST", m_ServerURI + "/MoveItems/", items, sessionID.ToString(), userID.ToString());
+                //    "POST", m_ServerURI + "/MoveItems/", items, sessionID.ToString(), userID.ToString());
+
+                //// Success
+                //return;
+                string uri = m_ServerURI + "/inventory/" + userID;
+                if (SynchronousRestObjectRequester.
+                        MakeRequest<List<InventoryItemBase>, bool>("PUT", uri, items))
+                    m_log.DebugFormat("[INVENTORY CONNECTOR]: move {0} items poster succeeded {1}", items.Count, uri);
+                else
+                    m_log.DebugFormat("[INVENTORY CONNECTOR]: move {0} items poster failed {1}", items.Count, uri); ;
 
-                // Success
                 return;
+
             }
             catch (Exception e)
             {