From c9fca5315c3c77fb972c3e931cb936284586e2a7 Mon Sep 17 00:00:00 2001
From: Mike Mazur <mmazur@gmail.com>
Date: Wed, 23 Jul 2008 04:32:09 +0000
Subject: [PATCH] Remove duplicate definitions in addin.xml files. How'd that
 happen anyway?

---
 bin/LoadRegionsPlugin.addin.xml       | 11 -----------
 bin/OpenSim.Data.MySQL.addin.xml      | 14 --------------
 bin/OpenSim.Data.addin.xml            | 12 ------------
 bin/OpenSim.Grid.GridServer.addin.xml |  8 --------
 bin/OpenSim.addin.xml                 |  8 --------
 bin/RemoteAdminPlugin.addin.xml       | 11 -----------
 bin/RestHandler.addin.xml             | 11 -----------
 bin/RestRegionPlugin.addin.xml        | 11 -----------
 8 files changed, 86 deletions(-)

diff --git a/bin/LoadRegionsPlugin.addin.xml b/bin/LoadRegionsPlugin.addin.xml
index f2bb2c9e03..2bbffa6357 100644
--- a/bin/LoadRegionsPlugin.addin.xml
+++ b/bin/LoadRegionsPlugin.addin.xml
@@ -9,14 +9,3 @@
         <Type type="OpenSim.ApplicationPlugins.LoadRegions.LoadRegionsPlugin" />
     </Extension>
 </Addin>
-<Addin>
-    <Runtime>
-        <Import assembly="OpenSim.ApplicationPlugins.LoadRegions.dll"/>
-    </Runtime>
-    <Dependencies>
-        <Addin id="OpenSim" version="0.5" />
-    </Dependencies>
-    <Extension path = "/OpenSim/Startup">
-        <Type type="OpenSim.ApplicationPlugins.LoadRegions.LoadRegionsPlugin" />
-    </Extension>
-</Addin>
diff --git a/bin/OpenSim.Data.MySQL.addin.xml b/bin/OpenSim.Data.MySQL.addin.xml
index 70a26d7230..ad861ea739 100644
--- a/bin/OpenSim.Data.MySQL.addin.xml
+++ b/bin/OpenSim.Data.MySQL.addin.xml
@@ -12,17 +12,3 @@
         <Type type="OpenSim.Data.MySQL.MySQLLogData" />
     </Extension>
 </Addin>
-<Addin>
-    <Runtime>
-        <Import assembly="OpenSim.Data.MySQL.dll"/>
-    </Runtime>
-    <Dependencies>
-        <Addin id="OpenSim.Data" version="0.5" />
-    </Dependencies>
-    <Extension path = "/OpenSim/GridData">
-        <Type type="OpenSim.Data.MySQL.MySQLGridData" />
-    </Extension>
-    <Extension path = "/OpenSim/LogData">
-        <Type type="OpenSim.Data.MySQL.MySQLLogData" />
-    </Extension>
-</Addin>
diff --git a/bin/OpenSim.Data.addin.xml b/bin/OpenSim.Data.addin.xml
index d2cc6bb5fb..c70c3f7576 100644
--- a/bin/OpenSim.Data.addin.xml
+++ b/bin/OpenSim.Data.addin.xml
@@ -10,15 +10,3 @@
         <ExtensionNode objectType="OpenSim.Data.ILogDataPlugin"/>
     </ExtensionPoint>
 </Addin>
-<Addin id="OpenSim.Data" isroot="true" version="0.5">
-    <Runtime>
-        <Import assembly="OpenSim.Grid.GridServer.exe"/>
-        <Import assembly="OpenSim.Data.dll"/>
-    </Runtime>
-    <ExtensionPoint path = "/OpenSim/GridData">
-        <ExtensionNode objectType="OpenSim.Data.IGridDataPlugin"/>
-    </ExtensionPoint>
-    <ExtensionPoint path = "/OpenSim/LogData">
-        <ExtensionNode objectType="OpenSim.Data.ILogDataPlugin"/>
-    </ExtensionPoint>
-</Addin>
diff --git a/bin/OpenSim.Grid.GridServer.addin.xml b/bin/OpenSim.Grid.GridServer.addin.xml
index ae993d275e..0d440826ee 100644
--- a/bin/OpenSim.Grid.GridServer.addin.xml
+++ b/bin/OpenSim.Grid.GridServer.addin.xml
@@ -6,11 +6,3 @@
         <ExtensionNode objectType="OpenSim.Grid.GridServer.IGridPlugin"/>
     </ExtensionPoint>
 </Addin>
-<Addin id="OpenSim.Grid.GridServer" isroot="true" version="0.5">
-    <Runtime>
-        <Import assembly="OpenSim.Grid.GridServer.exe"/>
-    </Runtime>
-    <ExtensionPoint path = "/OpenSim/GridServer">
-        <ExtensionNode objectType="OpenSim.Grid.GridServer.IGridPlugin"/>
-    </ExtensionPoint>
-</Addin>
diff --git a/bin/OpenSim.addin.xml b/bin/OpenSim.addin.xml
index 48bd744ec2..ffa48b399e 100644
--- a/bin/OpenSim.addin.xml
+++ b/bin/OpenSim.addin.xml
@@ -6,11 +6,3 @@
         <ExtensionNode objectType="OpenSim.Region.Application.IApplicationPlugin"/>
     </ExtensionPoint>
 </Addin>
-<Addin id="OpenSim" isroot="true" version="0.5">
-    <Runtime>
-        <Import assembly="OpenSim.exe"/>
-    </Runtime>
-    <ExtensionPoint path = "/OpenSim/Startup">
-        <ExtensionNode objectType="OpenSim.Region.Application.IApplicationPlugin"/>
-    </ExtensionPoint>
-</Addin>
diff --git a/bin/RemoteAdminPlugin.addin.xml b/bin/RemoteAdminPlugin.addin.xml
index 7dc79c602b..b3fae6ca00 100644
--- a/bin/RemoteAdminPlugin.addin.xml
+++ b/bin/RemoteAdminPlugin.addin.xml
@@ -9,14 +9,3 @@
         <Type type="OpenSim.ApplicationPlugins.RemoteController.RemoteAdminPlugin" />
     </Extension>
 </Addin>
-<Addin>
-    <Runtime>
-        <Import assembly="OpenSim.ApplicationPlugins.RemoteController.dll"/>
-    </Runtime>
-    <Dependencies>
-        <Addin id="OpenSim" version="0.5" />
-    </Dependencies>
-    <Extension path = "/OpenSim/Startup">
-        <Type type="OpenSim.ApplicationPlugins.RemoteController.RemoteAdminPlugin" />
-    </Extension>
-</Addin>
diff --git a/bin/RestHandler.addin.xml b/bin/RestHandler.addin.xml
index fd2f692119..1e33193a77 100644
--- a/bin/RestHandler.addin.xml
+++ b/bin/RestHandler.addin.xml
@@ -9,14 +9,3 @@
         <Type type="OpenSim.ApplicationPlugins.Rest.Inventory.RestHandler" />
     </Extension>
 </Addin>
-<Addin>
-    <Runtime>
-        <Import assembly="OpenSim.ApplicationPlugins.Rest.Inventory.dll"/>
-    </Runtime>
-    <Dependencies>
-        <Addin id="OpenSim" version="0.5" />
-    </Dependencies>
-    <Extension path = "/OpenSim/Startup">
-        <Type type="OpenSim.ApplicationPlugins.Rest.Inventory.RestHandler" />
-    </Extension>
-</Addin>
diff --git a/bin/RestRegionPlugin.addin.xml b/bin/RestRegionPlugin.addin.xml
index 1b7305b401..c0851928bd 100644
--- a/bin/RestRegionPlugin.addin.xml
+++ b/bin/RestRegionPlugin.addin.xml
@@ -9,14 +9,3 @@
         <Type type="OpenSim.ApplicationPlugins.Rest.Regions.RestRegionPlugin" />
     </Extension>
 </Addin>
-<Addin>
-    <Runtime>
-        <Import assembly="OpenSim.ApplicationPlugins.Rest.Regions.dll"/>
-    </Runtime>
-    <Dependencies>
-        <Addin id="OpenSim" version="0.5" />
-    </Dependencies>
-    <Extension path = "/OpenSim/Startup">
-        <Type type="OpenSim.ApplicationPlugins.Rest.Regions.RestRegionPlugin" />
-    </Extension>
-</Addin>