From d367f0bf0ccd3ea83c727a6459171b34170ed5f6 Mon Sep 17 00:00:00 2001
From: Mike Mazur
Date: Wed, 6 Aug 2008 01:20:31 +0000
Subject: Thanks, zaki, for a patch that embeds plugin manifest files into
 plugin dlls. Fix issue 1876.

---
 bin/LoadRegionsPlugin.addin.xml   | 11 -----------
 bin/OpenSim.Data.MSSQL.addin.xml  | 23 -----------------------
 bin/OpenSim.Data.MySQL.addin.xml  | 23 -----------------------
 bin/OpenSim.Data.SQLite.addin.xml | 20 --------------------
 bin/RemoteAdminPlugin.addin.xml   | 11 -----------
 bin/RestHandler.addin.xml         | 11 -----------
 bin/RestRegionPlugin.addin.xml    | 11 -----------
 7 files changed, 110 deletions(-)

(limited to 'bin')

diff --git a/bin/LoadRegionsPlugin.addin.xml b/bin/LoadRegionsPlugin.addin.xml
index 37222b7..e69de29 100644
--- a/bin/LoadRegionsPlugin.addin.xml
+++ b/bin/LoadRegionsPlugin.addin.xml
@@ -1,11 +0,0 @@
-<Addin id="OpenSim.ApplicationPlugins.LoadRegions" version="0.1">
-    <Runtime>
-        <Import assembly="OpenSim.ApplicationPlugins.LoadRegions.dll"/>
-    </Runtime>
-    <Dependencies>
-        <Addin id="OpenSim" version="0.5" />
-    </Dependencies>
-    <Extension path = "/OpenSim/Startup">
-        <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 15fd29e..e69de29 100644
--- a/bin/OpenSim.Data.MSSQL.addin.xml
+++ b/bin/OpenSim.Data.MSSQL.addin.xml
@@ -1,23 +0,0 @@
-<Addin id="OpenSim.Data.MSSQL" version="0.1">
-    <Runtime>
-        <Import assembly="OpenSim.Data.MSSQL.dll"/>
-    </Runtime>
-    <Dependencies>
-        <Addin id="OpenSim.Data" version="0.5" />
-    </Dependencies>
-    <Extension path = "/OpenSim/GridData">
-        <Plugin id="MSSQLGridData" provider="OpenSim.Data.MSSQL.dll" type="OpenSim.Data.MSSQL.MSSQLGridData" />
-    </Extension>
-    <Extension path = "/OpenSim/LogData">
-        <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 9e99547..e69de29 100644
--- a/bin/OpenSim.Data.MySQL.addin.xml
+++ b/bin/OpenSim.Data.MySQL.addin.xml
@@ -1,23 +0,0 @@
-<Addin id="OpenSim.Data.MySQL" version="0.1">
-    <Runtime>
-        <Import assembly="OpenSim.Data.MySQL.dll"/>
-    </Runtime>
-    <Dependencies>
-        <Addin id="OpenSim.Data" version="0.5" />
-    </Dependencies>
-    <Extension path = "/OpenSim/GridData">
-        <Plugin id="MySQLGridData" provider="OpenSim.Data.MySQL.dll" type="OpenSim.Data.MySQL.MySQLGridData" />
-    </Extension>
-    <Extension path = "/OpenSim/LogData">
-        <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 e6764fa..e69de29 100644
--- a/bin/OpenSim.Data.SQLite.addin.xml
+++ b/bin/OpenSim.Data.SQLite.addin.xml
@@ -1,20 +0,0 @@
-<Addin id="OpenSim.Data.SQLite" version="0.1">
-    <Runtime>
-        <Import assembly="OpenSim.Data.SQLite.dll"/>
-    </Runtime>
-    <Dependencies>
-        <Addin id="OpenSim.Data" version="0.5" />
-    </Dependencies>
-    <Extension path = "/OpenSim/GridData">
-        <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/RemoteAdminPlugin.addin.xml b/bin/RemoteAdminPlugin.addin.xml
index d68f2e4..e69de29 100644
--- a/bin/RemoteAdminPlugin.addin.xml
+++ b/bin/RemoteAdminPlugin.addin.xml
@@ -1,11 +0,0 @@
-<Addin id="OpenSim.ApplicationPlugins.RemoteController" version="0.1">
-    <Runtime>
-        <Import assembly="OpenSim.ApplicationPlugins.RemoteController.dll"/>
-    </Runtime>
-    <Dependencies>
-        <Addin id="OpenSim" version="0.5" />
-    </Dependencies>
-    <Extension path = "/OpenSim/Startup">
-        <Plugin id="RemoteController" type="OpenSim.ApplicationPlugins.RemoteController.RemoteAdminPlugin" />
-    </Extension>
-</Addin>
diff --git a/bin/RestHandler.addin.xml b/bin/RestHandler.addin.xml
index 777a2dc..e69de29 100644
--- a/bin/RestHandler.addin.xml
+++ b/bin/RestHandler.addin.xml
@@ -1,11 +0,0 @@
-<Addin id="OpenSim.ApplicationPlugins.Rest.Inventory" version="0.1">
-    <Runtime>
-        <Import assembly="OpenSim.ApplicationPlugins.Rest.Inventory.dll"/>
-    </Runtime>
-    <Dependencies>
-        <Addin id="OpenSim" version="0.5" />
-    </Dependencies>
-    <Extension path = "/OpenSim/Startup">
-        <Plugin id="RestInventory" type="OpenSim.ApplicationPlugins.Rest.Inventory.RestHandler" />
-    </Extension>
-</Addin>
diff --git a/bin/RestRegionPlugin.addin.xml b/bin/RestRegionPlugin.addin.xml
index 94eca48..e69de29 100644
--- a/bin/RestRegionPlugin.addin.xml
+++ b/bin/RestRegionPlugin.addin.xml
@@ -1,11 +0,0 @@
-<Addin id="OpenSim.ApplicationPlugins.Rest.Regions" version="0.1">
-    <Runtime>
-        <Import assembly="OpenSim.ApplicationPlugins.Rest.Regions.dll"/>
-    </Runtime>
-    <Dependencies>
-        <Addin id="OpenSim" version="0.5" />
-    </Dependencies>
-    <Extension path = "/OpenSim/Startup">
-        <Plugin id="RestRegions" type="OpenSim.ApplicationPlugins.Rest.Regions.RestRegionPlugin" />
-    </Extension>
-</Addin>
-- 
cgit v1.1