From 2f8acdbe5073c21ab49ac0865eecd10db401eb32 Mon Sep 17 00:00:00 2001
From: Adam Frisby
Date: Wed, 30 Jul 2008 08:17:19 +0000
Subject: * Applying Mantis #1852 - Plugin Provider refactoring. Courtesy of
 Ryan/Sempuki.

---
 bin/GridInfoPlugin.addin.xml          | 2 +-
 bin/LoadRegionsPlugin.addin.xml       | 2 +-
 bin/OpenSim.Data.MSSQL.addin.xml      | 4 ++--
 bin/OpenSim.Data.MySQL.addin.xml      | 4 ++--
 bin/OpenSim.Data.SQLite.addin.xml     | 2 +-
 bin/OpenSim.Data.addin.xml            | 5 +++--
 bin/OpenSim.Grid.GridServer.addin.xml | 3 ++-
 bin/OpenSim.addin.xml                 | 3 ++-
 bin/RemoteAdminPlugin.addin.xml       | 2 +-
 bin/RestHandler.addin.xml             | 2 +-
 bin/RestRegionPlugin.addin.xml        | 2 +-
 11 files changed, 17 insertions(+), 14 deletions(-)

(limited to 'bin')

diff --git a/bin/GridInfoPlugin.addin.xml b/bin/GridInfoPlugin.addin.xml
index ee75817..67cf604 100644
--- a/bin/GridInfoPlugin.addin.xml
+++ b/bin/GridInfoPlugin.addin.xml
@@ -6,6 +6,6 @@
         <Addin id="OpenSim" version="0.5" />
     </Dependencies>
     <Extension path = "/OpenSim/Startup">
-        <Type type="OpenSim.ApplicationPlugins.GridInfo.GridInfoPlugin" />
+        <Plugin type="OpenSim.ApplicationPlugins.GridInfo.GridInfoPlugin" />
     </Extension>
 </Addin>
diff --git a/bin/LoadRegionsPlugin.addin.xml b/bin/LoadRegionsPlugin.addin.xml
index 7fc3876..a12f91a 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">
-        <Type type="OpenSim.ApplicationPlugins.LoadRegions.LoadRegionsPlugin" />
+        <Plugin type="OpenSim.ApplicationPlugins.LoadRegions.LoadRegionsPlugin" />
     </Extension>
 </Addin>
diff --git a/bin/OpenSim.Data.MSSQL.addin.xml b/bin/OpenSim.Data.MSSQL.addin.xml
index b85c792..9b05e59 100644
--- a/bin/OpenSim.Data.MSSQL.addin.xml
+++ b/bin/OpenSim.Data.MSSQL.addin.xml
@@ -6,9 +6,9 @@
         <Addin id="OpenSim.Data" version="0.5" />
     </Dependencies>
     <Extension path = "/OpenSim/GridData">
-        <Type id="OpenSim.Data.MSSQL.dll" type="OpenSim.Data.MSSQL.MSSQLGridData" />
+        <Plugin provider="OpenSim.Data.MSSQL.dll" type="OpenSim.Data.MSSQL.MSSQLGridData" />
     </Extension>
     <Extension path = "/OpenSim/LogData">
-        <Type id="OpenSim.Data.MSSQL.dll" type="OpenSim.Data.MSSQL.MSSQLLogData" />
+        <Plugin provider="OpenSim.Data.MSSQL.dll" type="OpenSim.Data.MSSQL.MSSQLLogData" />
     </Extension>
 </Addin>
diff --git a/bin/OpenSim.Data.MySQL.addin.xml b/bin/OpenSim.Data.MySQL.addin.xml
index 6dd4d75..f7372e6 100644
--- a/bin/OpenSim.Data.MySQL.addin.xml
+++ b/bin/OpenSim.Data.MySQL.addin.xml
@@ -6,9 +6,9 @@
         <Addin id="OpenSim.Data" version="0.5" />
     </Dependencies>
     <Extension path = "/OpenSim/GridData">
-        <Type id="OpenSim.Data.MySQL.dll" type="OpenSim.Data.MySQL.MySQLGridData" />
+        <Plugin provider="OpenSim.Data.MySQL.dll" type="OpenSim.Data.MySQL.MySQLGridData" />
     </Extension>
     <Extension path = "/OpenSim/LogData">
-        <Type id="OpenSim.Data.MySQL.dll" type="OpenSim.Data.MySQL.MySQLLogData" />
+        <Plugin provider="OpenSim.Data.MySQL.dll" type="OpenSim.Data.MySQL.MySQLLogData" />
     </Extension>
 </Addin>
diff --git a/bin/OpenSim.Data.SQLite.addin.xml b/bin/OpenSim.Data.SQLite.addin.xml
index ef254dc..1d2f29e 100644
--- a/bin/OpenSim.Data.SQLite.addin.xml
+++ b/bin/OpenSim.Data.SQLite.addin.xml
@@ -6,6 +6,6 @@
         <Addin id="OpenSim.Data" version="0.5" />
     </Dependencies>
     <Extension path = "/OpenSim/GridData">
-        <Type id="OpenSim.Data.SQLite.dll" type="OpenSim.Data.SQLite.SQLiteGridData" />
+        <Plugin provider="OpenSim.Data.SQLite.dll" type="OpenSim.Data.SQLite.SQLiteGridData" />
     </Extension>
 </Addin>
diff --git a/bin/OpenSim.Data.addin.xml b/bin/OpenSim.Data.addin.xml
index c70c3f7..991f652 100644
--- a/bin/OpenSim.Data.addin.xml
+++ b/bin/OpenSim.Data.addin.xml
@@ -2,11 +2,12 @@
     <Runtime>
         <Import assembly="OpenSim.Grid.GridServer.exe"/>
         <Import assembly="OpenSim.Data.dll"/>
+        <Import assembly="OpenSim.Framework.dll"/>
     </Runtime>
     <ExtensionPoint path = "/OpenSim/GridData">
-        <ExtensionNode objectType="OpenSim.Data.IGridDataPlugin"/>
+        <ExtensionNode name="Plugin" type="OpenSim.Framework.PluginExtensionNode" objectType="OpenSim.Data.IGridDataPlugin"/>
     </ExtensionPoint>
     <ExtensionPoint path = "/OpenSim/LogData">
-        <ExtensionNode objectType="OpenSim.Data.ILogDataPlugin"/>
+        <ExtensionNode name="Plugin" type="OpenSim.Framework.PluginExtensionNode" objectType="OpenSim.Data.ILogDataPlugin"/>
     </ExtensionPoint>
 </Addin>
diff --git a/bin/OpenSim.Grid.GridServer.addin.xml b/bin/OpenSim.Grid.GridServer.addin.xml
index 0d44082..85742a1 100644
--- a/bin/OpenSim.Grid.GridServer.addin.xml
+++ b/bin/OpenSim.Grid.GridServer.addin.xml
@@ -1,8 +1,9 @@
 <Addin id="OpenSim.Grid.GridServer" isroot="true" version="0.5">
     <Runtime>
         <Import assembly="OpenSim.Grid.GridServer.exe"/>
+        <Import assembly="OpenSim.Framework.dll"/>
     </Runtime>
     <ExtensionPoint path = "/OpenSim/GridServer">
-        <ExtensionNode objectType="OpenSim.Grid.GridServer.IGridPlugin"/>
+        <ExtensionNode name="Plugin" type="OpenSim.Framework.PluginExtensionNode" objectType="OpenSim.Grid.GridServer.IGridPlugin"/>
     </ExtensionPoint>
 </Addin>
diff --git a/bin/OpenSim.addin.xml b/bin/OpenSim.addin.xml
index 7f8b258..122a1a8 100644
--- a/bin/OpenSim.addin.xml
+++ b/bin/OpenSim.addin.xml
@@ -1,8 +1,9 @@
 <Addin id="OpenSim" isroot="true" version="0.5">
     <Runtime>
         <Import assembly="OpenSim.exe"/>
+        <Import assembly="OpenSim.Framework.dll"/>
     </Runtime>
     <ExtensionPoint path = "/OpenSim/Startup">
-        <ExtensionNode objectType="OpenSim.IApplicationPlugin"/>
+        <ExtensionNode name="Plugin" type="OpenSim.Framework.PluginExtensionNode" objectType="OpenSim.IApplicationPlugin"/>
     </ExtensionPoint>
 </Addin>
diff --git a/bin/RemoteAdminPlugin.addin.xml b/bin/RemoteAdminPlugin.addin.xml
index cb82ee0..a0b8bee 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">
-        <Type type="OpenSim.ApplicationPlugins.RemoteController.RemoteAdminPlugin" />
+        <Plugin type="OpenSim.ApplicationPlugins.RemoteController.RemoteAdminPlugin" />
     </Extension>
 </Addin>
diff --git a/bin/RestHandler.addin.xml b/bin/RestHandler.addin.xml
index 1727c3b..33a1484 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">
-        <Type type="OpenSim.ApplicationPlugins.Rest.Inventory.RestHandler" />
+        <Plugin type="OpenSim.ApplicationPlugins.Rest.Inventory.RestHandler" />
     </Extension>
 </Addin>
diff --git a/bin/RestRegionPlugin.addin.xml b/bin/RestRegionPlugin.addin.xml
index 91a6dd6..9fc8e6b 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">
-        <Type type="OpenSim.ApplicationPlugins.Rest.Regions.RestRegionPlugin" />
+        <Plugin type="OpenSim.ApplicationPlugins.Rest.Regions.RestRegionPlugin" />
     </Extension>
 </Addin>
-- 
cgit v1.1