- moved data plugin loading code from various places to

  OpenSim/Data/DataPluginFactory.cs
- removed dependencies on a few executable assemblies in
  bin/OpenSim.Data.addin.xml
- trim trailing whitespace

2 files changed, 18 insertions, 23 deletions

diff --git a/OpenSim/Framework/Communications/InventoryServiceBase.cs b/OpenSim/Framework/Communications/InventoryServiceBase.cs
index ec5c493..a031bdf 100644
--- a/OpenSim/Framework/Communications/InventoryServiceBase.cs
+++ b/OpenSim/Framework/Communications/InventoryServiceBase.cs
@@ -59,20 +59,18 @@ namespace OpenSim.Framework.Communications
         }
 
         /// <summary>
-        /// Adds a new inventory data plugin - plugins will be requested in the order they were loaded.
+        /// Adds a list of inventory data plugins, as described by `provider'
+        /// and `connect', to `m_plugins'.
         /// </summary>
-        /// <param name="provider">The filename of the inventory server plugin DLL</param>
+        /// <param name="provider">
+        /// The filename of the inventory server plugin DLL.
+        /// </param>
+        /// <param name="connect">
+        /// The connection string for the storage backend.
+        /// </param>
         public void AddPlugin(string provider, string connect)
         {
-            PluginLoader<IInventoryDataPlugin> loader =
-                new PluginLoader<IInventoryDataPlugin> (new InventoryDataInitialiser(connect));
-
-            // loader will try to load all providers (MySQL, MSSQL, etc)
-            // unless it is constrainted to the correct "Provider" entry in the addin.xml
-            loader.Add ("/OpenSim/InventoryData", new PluginProviderFilter(provider));
-            loader.Load();
-
-            m_plugins.AddRange(loader.Plugins);
+            m_plugins.AddRange(DataPluginFactory.LoadInventoryDataPlugins(provider, connect));
         }
 
         #endregion
diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs
index b12abb3..886900d 100644
--- a/OpenSim/Framework/Communications/UserManagerBase.cs
+++ b/OpenSim/Framework/Communications/UserManagerBase.cs
@@ -74,21 +74,18 @@ namespace OpenSim.Framework.Communications
         }
 
         /// <summary>
-        /// Add a new user data plugin - plugins will be requested in the order they were added.
+        /// Adds a list of user data plugins, as described by `provider' and
+        /// `connect', to `_plugins'.
         /// </summary>
-        /// <param name="provider">The filename to the user data plugin DLL</param>
-        /// <param name="connect"></param>
+        /// <param name="provider">
+        /// The filename of the inventory server plugin DLL.
+        /// </param>
+        /// <param name="connect">
+        /// The connection string for the storage backend.
+        /// </param>
         public void AddPlugin(string provider, string connect)
         {
-            PluginLoader<IUserDataPlugin> loader =
-                new PluginLoader<IUserDataPlugin>(new UserDataInitialiser(connect));
-
-            // loader will try to load all providers (MySQL, MSSQL, etc)
-            // unless it is constrainted to the correct "Provider" entry in the addin.xml
-            loader.Add("/OpenSim/UserData", new PluginProviderFilter(provider));
-            loader.Load();
-
-            _plugins.AddRange(loader.Plugins);
+            _plugins.AddRange(DataPluginFactory.LoadUserDataPlugins(provider, connect));
         }
 
         #region Get UserProfile