From 780f57d5514ec27014171bc4b920db9accf2639a Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Mon, 4 May 2009 18:32:01 +0000
Subject: * Initial infrastructure for ospa only uuid hashing of retrieved
 inventory items

---
 .../CreateCommsManager/CreateCommsManagerPlugin.cs | 29 +++++++++++++++++-----
 1 file changed, 23 insertions(+), 6 deletions(-)

(limited to 'OpenSim/ApplicationPlugins/CreateCommsManager')

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(
-- 
cgit v1.1