3 files changed, 119 insertions, 7 deletions

diff --git a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
index 9ecb9ff..84e5db5 100644
--- a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
+++ b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
@@ -26,6 +26,7 @@
  */
 
 using System;
+using System.Collections.Generic;
 using System.Reflection;
 using log4net;
 using OpenSim.Data;
@@ -33,6 +34,7 @@ using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Services;
 using OpenSim.Framework.Communications.Cache;
+using OpenSim.Framework.Communications.Osp;
 using OpenSim.Framework.Servers;
 using OpenSim.Region.Communications.Hypergrid;
 using OpenSim.Region.Communications.Local;
@@ -164,8 +166,16 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager
         protected virtual void InitialiseStandaloneServices(LibraryRootFolder libraryRootFolder)
         {
             LocalInventoryService inventoryService = new LocalInventoryService();
-            inventoryService.AddPlugin(m_openSim.ConfigurationSettings.StandaloneInventoryPlugin,
-                                       m_openSim.ConfigurationSettings.StandaloneInventorySource);
+            List<IInventoryDataPlugin> plugins 
+                = DataPluginFactory.LoadDataPlugins<IInventoryDataPlugin>(
+                    m_openSim.ConfigurationSettings.StandaloneInventoryPlugin, 
+                    m_openSim.ConfigurationSettings.StandaloneInventorySource);
+
+            foreach (IInventoryDataPlugin plugin in plugins)
+            {
+                // Using the OSP wrapper plugin for database plugins should be made configurable at some point
+                inventoryService.AddPlugin(new OspInventoryWrapperPlugin(plugin));
+            }
 
             LocalBackEndServices backendService = new LocalBackEndServices();
 
@@ -186,7 +196,7 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager
 
             m_httpServer.AddStreamHandler(new OpenSim.SimStatusHandler());
             m_httpServer.AddStreamHandler(new OpenSim.XSimStatusHandler(m_openSim));
-            if(m_openSim.userStatsURI != String.Empty )
+            if (m_openSim.userStatsURI != String.Empty )
                 m_httpServer.AddStreamHandler(new OpenSim.UXSimStatusHandler(m_openSim));
         }
 
@@ -196,9 +206,16 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager
 
             HGInventoryServiceClient inventoryService 
                 = new HGInventoryServiceClient(m_openSim.NetServersInfo.InventoryURL, null, false);
-            inventoryService.AddPlugin(
-                m_openSim.ConfigurationSettings.StandaloneInventoryPlugin, 
-                m_openSim.ConfigurationSettings.StandaloneInventorySource);         
+            List<IInventoryDataPlugin> plugins 
+                = DataPluginFactory.LoadDataPlugins<IInventoryDataPlugin>(
+                    m_openSim.ConfigurationSettings.StandaloneInventoryPlugin, 
+                    m_openSim.ConfigurationSettings.StandaloneInventorySource);
+
+            foreach (IInventoryDataPlugin plugin in plugins)
+            {
+                // Using the OSP wrapper plugin should be made configurable at some point
+                inventoryService.AddPlugin(new OspInventoryWrapperPlugin(plugin));
+            }        
 
             HGGridServicesStandalone gridService 
                 = new HGGridServicesStandalone(
diff --git a/OpenSim/Framework/Communications/InventoryServiceBase.cs b/OpenSim/Framework/Communications/InventoryServiceBase.cs
index 0909a52..010429d 100644
--- a/OpenSim/Framework/Communications/InventoryServiceBase.cs
+++ b/OpenSim/Framework/Communications/InventoryServiceBase.cs
@@ -67,7 +67,7 @@ namespace OpenSim.Framework.Communications
         public void AddPlugin(string provider, string connect)
         {
             m_plugins.AddRange(DataPluginFactory.LoadDataPlugins<IInventoryDataPlugin>(provider, connect));
-        }
+        }        
 
         #endregion
 
diff --git a/OpenSim/Framework/Communications/Osp/OspInventoryWrapperPlugin.cs b/OpenSim/Framework/Communications/Osp/OspInventoryWrapperPlugin.cs
new file mode 100644
index 0000000..3a692ae
--- /dev/null
+++ b/OpenSim/Framework/Communications/Osp/OspInventoryWrapperPlugin.cs
@@ -0,0 +1,95 @@
+/*
+ * 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.Collections.Generic;
+using OpenSim.Data;
+using OpenMetaverse;
+
+namespace OpenSim.Framework.Communications.Osp
+{
+    /// <summary>
+    /// Wrap other inventory data plugins so that we can perform OSP related post processing for items
+    /// </summary>
+    public class OspInventoryWrapperPlugin : IInventoryDataPlugin
+    {
+        protected IInventoryDataPlugin m_wrappedPlugin;
+
+        public OspInventoryWrapperPlugin(IInventoryDataPlugin wrappedPlugin)
+        {
+            m_wrappedPlugin = wrappedPlugin;
+        }
+            
+        public string Name { get { return "OspInventoryWrapperPlugin"; } }
+        public string Version { get { return "0.1"; } }
+        public void Initialise() {}       
+        public void Initialise(string connect) {}
+        public void Dispose() {}
+
+        public InventoryItemBase getInventoryItem(UUID item)
+        {
+            return m_wrappedPlugin.getInventoryItem(item);
+
+            // TODO: Need to post process here
+        }
+
+        // XXX: Why on earth does this exist as it appears to duplicate getInventoryItem?
+        public InventoryItemBase queryInventoryItem(UUID item)
+        {
+            return m_wrappedPlugin.queryInventoryItem(item);
+
+            // TODO: Need to post process here
+        }
+        
+        public List<InventoryItemBase> getInventoryInFolder(UUID folderID)
+        {
+            return m_wrappedPlugin.getInventoryInFolder(folderID);
+            
+            // TODO: Need to post process here
+        }
+
+        public List<InventoryItemBase> fetchActiveGestures(UUID avatarID)
+        {
+            return m_wrappedPlugin.fetchActiveGestures(avatarID);
+
+            // Presuming that no post processing is needed here as gestures don't refer to creator information (?)
+        }
+        
+        public List<InventoryFolderBase> getFolderHierarchy(UUID parentID) { return m_wrappedPlugin.getFolderHierarchy(parentID); }
+        public List<InventoryFolderBase> getUserRootFolders(UUID user) { return m_wrappedPlugin.getUserRootFolders(user); }
+        public InventoryFolderBase getUserRootFolder(UUID user) { return m_wrappedPlugin.getUserRootFolder(user); }
+        public List<InventoryFolderBase> getInventoryFolders(UUID parentID) { return m_wrappedPlugin.getInventoryFolders(parentID); }
+        public InventoryFolderBase getInventoryFolder(UUID folder) { return m_wrappedPlugin.getInventoryFolder(folder); }
+        public void addInventoryItem(InventoryItemBase item) { m_wrappedPlugin.addInventoryItem(item); }
+        public void updateInventoryItem(InventoryItemBase item) { m_wrappedPlugin.updateInventoryItem(item); }
+        public void deleteInventoryItem(UUID item) { m_wrappedPlugin.deleteInventoryItem(item); }
+        public InventoryFolderBase queryInventoryFolder(UUID folder) { return m_wrappedPlugin.queryInventoryFolder(folder); }
+        public void addInventoryFolder(InventoryFolderBase folder) { m_wrappedPlugin.addInventoryFolder(folder); }
+        public void updateInventoryFolder(InventoryFolderBase folder) { m_wrappedPlugin.updateInventoryFolder(folder); }
+        public void moveInventoryFolder(InventoryFolderBase folder) { m_wrappedPlugin.moveInventoryFolder(folder); }
+        public void deleteInventoryFolder(UUID folder) { m_wrappedPlugin.deleteInventoryFolder(folder); }
+    }
+}