From 2270b252656146d9d74b84665a7ace6c3139db30 Mon Sep 17 00:00:00 2001
From: Mike Mazur
Date: Thu, 31 Jul 2008 09:24:28 +0000
Subject: Thanks, sempuki, for a patch that moves all Grid Server's plugins to
 PluginLoader. Fix issue 1871.

---
 bin/LoadRegionsPlugin.addin.xml   |  2 +-
 bin/OpenSim.Data.MSSQL.addin.xml  | 13 +++++++++++--
 bin/OpenSim.Data.MySQL.addin.xml  | 13 +++++++++++--
 bin/OpenSim.Data.SQLite.addin.xml | 11 ++++++++++-
 bin/OpenSim.Data.addin.xml        | 12 ++++++++++++
 bin/RemoteAdminPlugin.addin.xml   |  2 +-
 bin/RestHandler.addin.xml         |  2 +-
 bin/RestRegionPlugin.addin.xml    |  2 +-
 8 files changed, 48 insertions(+), 9 deletions(-)

(limited to 'bin')

diff --git a/bin/LoadRegionsPlugin.addin.xml b/bin/LoadRegionsPlugin.addin.xml
index a12f91a..37222b7 100644
--- a/bin/LoadRegionsPlugin.addin.xml
+++ b/bin/LoadRegionsPlugin.addin.xml
@@ -6,6 +6,6 @@
         <Addin id="OpenSim" version="0.5" />
     </Dependencies>
     <Extension path = "/OpenSim/Startup">
-        <Plugin type="OpenSim.ApplicationPlugins.LoadRegions.LoadRegionsPlugin" />
+        <Plugin id="LoadRegions" type="OpenSim.ApplicationPlugins.LoadRegions.LoadRegionsPlugin" />
     </Extension>
 </Addin>
diff --git a/bin/OpenSim.Data.MSSQL.addin.xml b/bin/OpenSim.Data.MSSQL.addin.xml
index 9b05e59..15fd29e 100644
--- a/bin/OpenSim.Data.MSSQL.addin.xml
+++ b/bin/OpenSim.Data.MSSQL.addin.xml
@@ -6,9 +6,18 @@
         <Addin id="OpenSim.Data" version="0.5" />
     </Dependencies>
     <Extension path = "/OpenSim/GridData">
-        <Plugin provider="OpenSim.Data.MSSQL.dll" type="OpenSim.Data.MSSQL.MSSQLGridData" />
+        <Plugin id="MSSQLGridData" provider="OpenSim.Data.MSSQL.dll" type="OpenSim.Data.MSSQL.MSSQLGridData" />
     </Extension>
     <Extension path = "/OpenSim/LogData">
-        <Plugin provider="OpenSim.Data.MSSQL.dll" type="OpenSim.Data.MSSQL.MSSQLLogData" />
+        <Plugin id="MSSQLLogData" provider="OpenSim.Data.MSSQL.dll" type="OpenSim.Data.MSSQL.MSSQLLogData" />
+    </Extension>
+    <Extension path = "/OpenSim/AssetData">
+        <Plugin id="MSSQLAssetData" provider="OpenSim.Data.MSSQL.dll" type="OpenSim.Data.MSSQL.MSSQLAssetData" />
+    </Extension>
+    <Extension path = "/OpenSim/InventoryData">
+        <Plugin id="MSSQLInventoryData" provider="OpenSim.Data.MSSQL.dll" type="OpenSim.Data.MSSQL.MSSQLInventoryData" />
+    </Extension>
+    <Extension path = "/OpenSim/UserData">
+        <Plugin id="MSSQLUserData" provider="OpenSim.Data.MSSQL.dll" type="OpenSim.Data.MSSQL.MSSQLUserData" />
     </Extension>
 </Addin>
diff --git a/bin/OpenSim.Data.MySQL.addin.xml b/bin/OpenSim.Data.MySQL.addin.xml
index f7372e6..9e99547 100644
--- a/bin/OpenSim.Data.MySQL.addin.xml
+++ b/bin/OpenSim.Data.MySQL.addin.xml
@@ -6,9 +6,18 @@
         <Addin id="OpenSim.Data" version="0.5" />
     </Dependencies>
     <Extension path = "/OpenSim/GridData">
-        <Plugin provider="OpenSim.Data.MySQL.dll" type="OpenSim.Data.MySQL.MySQLGridData" />
+        <Plugin id="MySQLGridData" provider="OpenSim.Data.MySQL.dll" type="OpenSim.Data.MySQL.MySQLGridData" />
     </Extension>
     <Extension path = "/OpenSim/LogData">
-        <Plugin provider="OpenSim.Data.MySQL.dll" type="OpenSim.Data.MySQL.MySQLLogData" />
+        <Plugin id="MySQLLogData" provider="OpenSim.Data.MySQL.dll" type="OpenSim.Data.MySQL.MySQLLogData" />
+    </Extension>
+    <Extension path = "/OpenSim/AssetData">
+        <Plugin id="MySQLAssetData" provider="OpenSim.Data.MySQL.dll" type="OpenSim.Data.MySQL.MySQLAssetData" />
+    </Extension>
+    <Extension path = "/OpenSim/InventoryData">
+        <Plugin id="MySQLInventoryData" provider="OpenSim.Data.MySQL.dll" type="OpenSim.Data.MySQL.MySQLInventoryData" />
+    </Extension>
+    <Extension path = "/OpenSim/UserData">
+        <Plugin id="MySQLUserData" provider="OpenSim.Data.MySQL.dll" type="OpenSim.Data.MySQL.MySQLUserData" />
     </Extension>
 </Addin>
diff --git a/bin/OpenSim.Data.SQLite.addin.xml b/bin/OpenSim.Data.SQLite.addin.xml
index 1d2f29e..e6764fa 100644
--- a/bin/OpenSim.Data.SQLite.addin.xml
+++ b/bin/OpenSim.Data.SQLite.addin.xml
@@ -6,6 +6,15 @@
         <Addin id="OpenSim.Data" version="0.5" />
     </Dependencies>
     <Extension path = "/OpenSim/GridData">
-        <Plugin provider="OpenSim.Data.SQLite.dll" type="OpenSim.Data.SQLite.SQLiteGridData" />
+        <Plugin id="SQLiteGridData" provider="OpenSim.Data.SQLite.dll" type="OpenSim.Data.SQLite.SQLiteGridData" />
+    </Extension>
+    <Extension path = "/OpenSim/AssetData">
+        <Plugin id="SQLiteAssetData" provider="OpenSim.Data.SQLite.dll" type="OpenSim.Data.SQLite.SQLiteAssetData" />
+    </Extension>
+    <Extension path = "/OpenSim/InventoryData">
+        <Plugin id="SQLiteInventoryData" provider="OpenSim.Data.SQLite.dll" type="OpenSim.Data.SQLite.SQLiteInventoryStore" />
+    </Extension>
+    <Extension path = "/OpenSim/UserData">
+        <Plugin id="SQLiteUserData" provider="OpenSim.Data.SQLite.dll" type="OpenSim.Data.SQLite.SQLiteUserData" />
     </Extension>
 </Addin>
diff --git a/bin/OpenSim.Data.addin.xml b/bin/OpenSim.Data.addin.xml
index 991f652..9530c16 100644
--- a/bin/OpenSim.Data.addin.xml
+++ b/bin/OpenSim.Data.addin.xml
@@ -1,6 +1,9 @@
 <Addin id="OpenSim.Data" isroot="true" version="0.5">
     <Runtime>
+        <Import assembly="OpenSim.Grid.UserServer.exe"/>
         <Import assembly="OpenSim.Grid.GridServer.exe"/>
+        <Import assembly="OpenSim.Grid.AssetServer.exe"/>
+        <Import assembly="OpenSim.Grid.InventoryServer.exe"/>
         <Import assembly="OpenSim.Data.dll"/>
         <Import assembly="OpenSim.Framework.dll"/>
     </Runtime>
@@ -10,4 +13,13 @@
     <ExtensionPoint path = "/OpenSim/LogData">
         <ExtensionNode name="Plugin" type="OpenSim.Framework.PluginExtensionNode" objectType="OpenSim.Data.ILogDataPlugin"/>
     </ExtensionPoint>
+    <ExtensionPoint path = "/OpenSim/AssetData">
+        <ExtensionNode name="Plugin" type="OpenSim.Framework.PluginExtensionNode" objectType="OpenSim.Framework.IAssetProviderPlugin"/>
+    </ExtensionPoint>
+    <ExtensionPoint path = "/OpenSim/InventoryData">
+        <ExtensionNode name="Plugin" type="OpenSim.Framework.PluginExtensionNode" objectType="OpenSim.Framework.IInventoryDataPlugin"/>
+    </ExtensionPoint>
+    <ExtensionPoint path = "/OpenSim/UserData">
+        <ExtensionNode name="Plugin" type="OpenSim.Framework.PluginExtensionNode" objectType="OpenSim.Framework.IUserData"/>
+    </ExtensionPoint>
 </Addin>
diff --git a/bin/RemoteAdminPlugin.addin.xml b/bin/RemoteAdminPlugin.addin.xml
index a0b8bee..d68f2e4 100644
--- a/bin/RemoteAdminPlugin.addin.xml
+++ b/bin/RemoteAdminPlugin.addin.xml
@@ -6,6 +6,6 @@
         <Addin id="OpenSim" version="0.5" />
     </Dependencies>
     <Extension path = "/OpenSim/Startup">
-        <Plugin type="OpenSim.ApplicationPlugins.RemoteController.RemoteAdminPlugin" />
+        <Plugin id="RemoteController" type="OpenSim.ApplicationPlugins.RemoteController.RemoteAdminPlugin" />
     </Extension>
 </Addin>
diff --git a/bin/RestHandler.addin.xml b/bin/RestHandler.addin.xml
index 33a1484..777a2dc 100644
--- a/bin/RestHandler.addin.xml
+++ b/bin/RestHandler.addin.xml
@@ -6,6 +6,6 @@
         <Addin id="OpenSim" version="0.5" />
     </Dependencies>
     <Extension path = "/OpenSim/Startup">
-        <Plugin type="OpenSim.ApplicationPlugins.Rest.Inventory.RestHandler" />
+        <Plugin id="RestInventory" type="OpenSim.ApplicationPlugins.Rest.Inventory.RestHandler" />
     </Extension>
 </Addin>
diff --git a/bin/RestRegionPlugin.addin.xml b/bin/RestRegionPlugin.addin.xml
index 9fc8e6b..94eca48 100644
--- a/bin/RestRegionPlugin.addin.xml
+++ b/bin/RestRegionPlugin.addin.xml
@@ -6,6 +6,6 @@
         <Addin id="OpenSim" version="0.5" />
     </Dependencies>
     <Extension path = "/OpenSim/Startup">
-        <Plugin type="OpenSim.ApplicationPlugins.Rest.Regions.RestRegionPlugin" />
+        <Plugin id="RestRegions" type="OpenSim.ApplicationPlugins.Rest.Regions.RestRegionPlugin" />
     </Extension>
 </Addin>
-- 
cgit v1.1