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

---
 .../Resources/LoadRegionsPlugin.addin.xml     | 11 +++++++++
 .../Resources/RemoteAdminPlugin.addin.xml     | 11 +++++++++
 .../Inventory/Resources/RestHandler.addin.xml | 11 +++++++++
 .../Resources/RestRegionPlugin.addin.xml      | 11 +++++++++
 .../Resources/OpenSim.Data.MSSQL.addin.xml    | 23 +++++++++++++++++++
 .../Resources/OpenSim.Data.MySQL.addin.xml    | 23 +++++++++++++++++++
 .../Resources/OpenSim.Data.SQLite.addin.xml   | 20 ++++++++++++++++
 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 ---------
 prebuild.xml                                  |  7 ++++++
 15 files changed, 117 insertions(+), 110 deletions(-)
 create mode 100644 OpenSim/ApplicationPlugins/LoadRegions/Resources/LoadRegionsPlugin.addin.xml
 create mode 100644 OpenSim/ApplicationPlugins/RemoteController/Resources/RemoteAdminPlugin.addin.xml
 create mode 100644 OpenSim/ApplicationPlugins/Rest/Inventory/Resources/RestHandler.addin.xml
 create mode 100644 OpenSim/ApplicationPlugins/Rest/Regions/Resources/RestRegionPlugin.addin.xml
 create mode 100644 OpenSim/Data/MSSQL/Resources/OpenSim.Data.MSSQL.addin.xml
 create mode 100644 OpenSim/Data/MySQL/Resources/OpenSim.Data.MySQL.addin.xml
 create mode 100644 OpenSim/Data/SQLite/Resources/OpenSim.Data.SQLite.addin.xml

diff --git a/OpenSim/ApplicationPlugins/LoadRegions/Resources/LoadRegionsPlugin.addin.xml b/OpenSim/ApplicationPlugins/LoadRegions/Resources/LoadRegionsPlugin.addin.xml
new file mode 100644
index 0000000000..37222b7359
--- /dev/null
+++ b/OpenSim/ApplicationPlugins/LoadRegions/Resources/LoadRegionsPlugin.addin.xml
@@ -0,0 +1,11 @@
+<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/OpenSim/ApplicationPlugins/RemoteController/Resources/RemoteAdminPlugin.addin.xml b/OpenSim/ApplicationPlugins/RemoteController/Resources/RemoteAdminPlugin.addin.xml
new file mode 100644
index 0000000000..d68f2e42ec
--- /dev/null
+++ b/OpenSim/ApplicationPlugins/RemoteController/Resources/RemoteAdminPlugin.addin.xml
@@ -0,0 +1,11 @@
+<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/OpenSim/ApplicationPlugins/Rest/Inventory/Resources/RestHandler.addin.xml b/OpenSim/ApplicationPlugins/Rest/Inventory/Resources/RestHandler.addin.xml
new file mode 100644
index 0000000000..777a2dc27f
--- /dev/null
+++ b/OpenSim/ApplicationPlugins/Rest/Inventory/Resources/RestHandler.addin.xml
@@ -0,0 +1,11 @@
+<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/OpenSim/ApplicationPlugins/Rest/Regions/Resources/RestRegionPlugin.addin.xml b/OpenSim/ApplicationPlugins/Rest/Regions/Resources/RestRegionPlugin.addin.xml
new file mode 100644
index 0000000000..94eca48371
--- /dev/null
+++ b/OpenSim/ApplicationPlugins/Rest/Regions/Resources/RestRegionPlugin.addin.xml
@@ -0,0 +1,11 @@
+<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>
diff --git a/OpenSim/Data/MSSQL/Resources/OpenSim.Data.MSSQL.addin.xml b/OpenSim/Data/MSSQL/Resources/OpenSim.Data.MSSQL.addin.xml
new file mode 100644
index 0000000000..15fd29e57c
--- /dev/null
+++ b/OpenSim/Data/MSSQL/Resources/OpenSim.Data.MSSQL.addin.xml
@@ -0,0 +1,23 @@
+<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/OpenSim/Data/MySQL/Resources/OpenSim.Data.MySQL.addin.xml b/OpenSim/Data/MySQL/Resources/OpenSim.Data.MySQL.addin.xml
new file mode 100644
index 0000000000..9e995479d0
--- /dev/null
+++ b/OpenSim/Data/MySQL/Resources/OpenSim.Data.MySQL.addin.xml
@@ -0,0 +1,23 @@
+<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/OpenSim/Data/SQLite/Resources/OpenSim.Data.SQLite.addin.xml b/OpenSim/Data/SQLite/Resources/OpenSim.Data.SQLite.addin.xml
new file mode 100644
index 0000000000..e6764facbd
--- /dev/null
+++ b/OpenSim/Data/SQLite/Resources/OpenSim.Data.SQLite.addin.xml
@@ -0,0 +1,20 @@
+<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/LoadRegionsPlugin.addin.xml b/bin/LoadRegionsPlugin.addin.xml
index 37222b7359..e69de29bb2 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 15fd29e57c..e69de29bb2 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 9e995479d0..e69de29bb2 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 e6764facbd..e69de29bb2 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 d68f2e42ec..e69de29bb2 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 777a2dc27f..e69de29bb2 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 94eca48371..e69de29bb2 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>
diff --git a/prebuild.xml b/prebuild.xml
index 8e91e01d2e..400ec002a6 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -1093,6 +1093,7 @@
 
       <Files>
         <Match pattern="*.cs" recurse="true"/>
+        <Match pattern="*.addin.xml" path="Resources" buildAction="EmbeddedResource" recurse="true"/>
       </Files>
     </Project>
 
@@ -1126,6 +1127,7 @@
 
       <Files>
         <Match pattern="*.cs" recurse="true"/>
+        <Match pattern="*.addin.xml" path="Resources" buildAction="EmbeddedResource" recurse="true"/>
       </Files>
     </Project>
 
@@ -1196,6 +1198,7 @@
 
       <Files>
         <Match pattern="*.cs" recurse="true"/>
+        <Match pattern="*.addin.xml" path="Resources" buildAction="EmbeddedResource" recurse="true"/>
       </Files>
     </Project>
 
@@ -1231,6 +1234,7 @@
 
       <Files>
         <Match pattern="*.cs" recurse="true"/>
+        <Match pattern="*.addin.xml" path="Resources" buildAction="EmbeddedResource" recurse="true"/>
       </Files>
     </Project>
 
@@ -1323,6 +1327,7 @@
       <Files>
         <Match pattern="*.cs" recurse="true"/>
         <Match path="Resources" pattern="*.sql" buildAction="EmbeddedResource"/>
+        <Match pattern="*.addin.xml" path="Resources" buildAction="EmbeddedResource" recurse="true"/>
       </Files>
     </Project>
 
@@ -1353,6 +1358,7 @@
       <Files>
         <Match pattern="*.cs" recurse="true"/>
         <Match path="Resources" pattern="*.sql" buildAction="EmbeddedResource"/>
+        <Match pattern="*.addin.xml" path="Resources" buildAction="EmbeddedResource" recurse="true"/>
       </Files>
     </Project>
 
@@ -1385,6 +1391,7 @@
       <Files>
         <Match pattern="*.cs" recurse="true"/>
         <Match path="Resources" pattern="*.sql" buildAction="EmbeddedResource"/>
+        <Match pattern="*.addin.xml" path="Resources" buildAction="EmbeddedResource" recurse="true"/>
       </Files>
     </Project>