1 files changed, 36 insertions, 50 deletions

diff --git a/OpenSim/Grid/AssetInventoryServer/Plugins/NullAuthenticationPlugin.cs b/OpenSim/Server/Handlers/Inventory/InventoryServerMoveItemsHandler.cs
index 026b3c8..850bf14 100644
--- a/OpenSim/Grid/AssetInventoryServer/Plugins/NullAuthenticationPlugin.cs
+++ b/OpenSim/Server/Handlers/Inventory/InventoryServerMoveItemsHandler.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) Contributors, http://opensimulator.org/
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
@@ -25,71 +25,57 @@
  * 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 OpenMetaverse;
+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 log4net;
+using OpenSim.Framework.Servers.HttpServer;
+using OpenMetaverse;
 
-namespace OpenSim.Grid.AssetInventoryServer.Plugins
+namespace OpenSim.Server.Handlers.Inventory
 {
-    public class NullAuthenticationPlugin : IAuthenticationProvider
+    public class InventoryServerMoveItemsHandler : BaseStreamHandler
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        //private AssetInventoryServer m_server;
-
-        public NullAuthenticationPlugin()
-        {
-        }
-
-        #region IPlugin implementation
-
-        public void Initialise(AssetInventoryServer server)
-        {
-            //m_server = server;
-
-            m_log.Info("[NULLAUTHENTICATION]: Null Authentication loaded.");
-        }
 
-        /// <summary>
-        /// <para>Initialises asset interface</para>
-        /// </summary>
-        public void Initialise()
-        {
-            m_log.InfoFormat("[NULLAUTHENTICATION]: {0} cannot be default-initialized!", Name);
-            throw new PluginNotInitialisedException(Name);
-        }
-
-        public void Dispose()
-        {
-        }
+        private IInventoryService m_InventoryService;
 
-        public string Version
+        public InventoryServerMoveItemsHandler(IInventoryService service) :
+                base("PUT", "/inventory")
         {
-            // TODO: this should be something meaningful and not hardcoded?
-            get { return "0.1"; }
+            m_InventoryService = service;
         }
 
-        public string Name
+        public override byte[] Handle(string path, Stream request,
+                OSHttpRequest httpRequest, OSHttpResponse httpResponse)
         {
-            get { return "NullAuthentication"; }
-        }
+            XmlSerializer xs = new XmlSerializer(typeof (List<InventoryItemBase>));
+            List<InventoryItemBase> items = (List<InventoryItemBase>)xs.Deserialize(request);
 
-        #endregion IPlugin implementation
+            bool result = false;
+            string[] p = SplitParams(path);
 
-        public void AddIdentifier(UUID authToken, Uri identifier)
-        {
-        }
-
-        public bool RemoveIdentifier(UUID authToken)
-        {
-            return true;
-        }
+            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.");
 
-        public bool TryGetIdentifier(UUID authToken, out Uri identifier)
-        {
-            identifier = null;
-            return true;
+            xs = new XmlSerializer(typeof(bool));
+            return ServerUtils.SerializeResult(xs, result);
         }
     }
 }