- add OpenSim.Grid.AssetServer.Plugins.OpenSim as a dependency for OpenSim.Data.*.addin.xml

- remove OpenSim.Grid.NewAssetServer.exe from bin/OpenSim.Data.addin.xml
- add prebuild.xml section for OpenSim.Grid.AssetServer.Plugins.OpenSim.dll

5 files changed, 36 insertions, 2 deletions

diff --git a/OpenSim/Data/MSSQL/Resources/OpenSim.Data.MSSQL.addin.xml b/OpenSim/Data/MSSQL/Resources/OpenSim.Data.MSSQL.addin.xml
index 15fd29e..3509034 100644
--- a/OpenSim/Data/MSSQL/Resources/OpenSim.Data.MSSQL.addin.xml
+++ b/OpenSim/Data/MSSQL/Resources/OpenSim.Data.MSSQL.addin.xml
@@ -4,6 +4,7 @@
     </Runtime>
     <Dependencies>
         <Addin id="OpenSim.Data" version="0.5" />
+        <Addin id="OpenSim.Grid.AssetServer.Plugins.OpenSim" version="0.1" />
     </Dependencies>
     <Extension path = "/OpenSim/GridData">
         <Plugin id="MSSQLGridData" provider="OpenSim.Data.MSSQL.dll" type="OpenSim.Data.MSSQL.MSSQLGridData" />
diff --git a/OpenSim/Data/MySQL/Resources/OpenSim.Data.MySQL.addin.xml b/OpenSim/Data/MySQL/Resources/OpenSim.Data.MySQL.addin.xml
index 9e99547..9f583a2 100644
--- a/OpenSim/Data/MySQL/Resources/OpenSim.Data.MySQL.addin.xml
+++ b/OpenSim/Data/MySQL/Resources/OpenSim.Data.MySQL.addin.xml
@@ -4,6 +4,7 @@
     </Runtime>
     <Dependencies>
         <Addin id="OpenSim.Data" version="0.5" />
+        <Addin id="OpenSim.Grid.AssetServer.Plugins.OpenSim" version="0.1" />
     </Dependencies>
     <Extension path = "/OpenSim/GridData">
         <Plugin id="MySQLGridData" provider="OpenSim.Data.MySQL.dll" type="OpenSim.Data.MySQL.MySQLGridData" />
diff --git a/OpenSim/Data/NHibernate/Resources/OpenSim.Data.NHibernate.addin.xml b/OpenSim/Data/NHibernate/Resources/OpenSim.Data.NHibernate.addin.xml
index 37b23cb..6b8e87b 100644
--- a/OpenSim/Data/NHibernate/Resources/OpenSim.Data.NHibernate.addin.xml
+++ b/OpenSim/Data/NHibernate/Resources/OpenSim.Data.NHibernate.addin.xml
@@ -4,6 +4,7 @@
     </Runtime>
     <Dependencies>
         <Addin id="OpenSim.Data" version="0.5" />
+        <Addin id="OpenSim.Grid.AssetServer.Plugins.OpenSim" version="0.1" />
     </Dependencies>
     <Extension path = "/OpenSim/GridData">
         <Plugin id="NHibernateGridData" provider="OpenSim.Data.NHibernate.dll" type="OpenSim.Data.NHibernate.NHibernateGridData" />
diff --git a/OpenSim/Data/SQLite/Resources/OpenSim.Data.SQLite.addin.xml b/OpenSim/Data/SQLite/Resources/OpenSim.Data.SQLite.addin.xml
index e6764fa..256ef41 100644
--- a/OpenSim/Data/SQLite/Resources/OpenSim.Data.SQLite.addin.xml
+++ b/OpenSim/Data/SQLite/Resources/OpenSim.Data.SQLite.addin.xml
@@ -4,6 +4,7 @@
     </Runtime>
     <Dependencies>
         <Addin id="OpenSim.Data" version="0.5" />
+        <Addin id="OpenSim.Grid.AssetServer.Plugins.OpenSim" version="0.1" />
     </Dependencies>
     <Extension path = "/OpenSim/GridData">
         <Plugin id="SQLiteGridData" provider="OpenSim.Data.SQLite.dll" type="OpenSim.Data.SQLite.SQLiteGridData" />
diff --git a/prebuild.xml b/prebuild.xml
index b74b9ab..c157cdf 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -779,8 +779,38 @@
       <Files>
         <Match pattern="*.cs" recurse="false"/>
         <Match path="Extensions" pattern="*.cs" recurse="false"/>
-        <Match path="Plugins" pattern="*.cs" recurse="false"/>
-        <Match pattern="*.addin.xml" path="Resources" buildAction="EmbeddedResource" recurse="true"/>
+        <!--Match path="Resources" pattern="*.addin.xml" buildAction="EmbeddedResource" recurse="true"/-->
+      </Files>
+    </Project>
+
+    <Project name="OpenSim.Grid.AssetServer.Plugins.OpenSim" path="OpenSim/Grid/NewAssetServer/Plugins/OpenSim" type="Library">
+      <Configuration name="Debug">
+        <Options>
+          <OutputPath>../../../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+      <Configuration name="Release">
+        <Options>
+          <OutputPath>../../../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+
+      <ReferencePath>../../../../../bin/</ReferencePath>
+      <Reference name="System" />
+      <Reference name="System.Data" />
+      <Reference name="OpenSim.Framework" />
+      <Reference name="OpenSim.Grid.NewAssetServer" />
+      <Reference name="OpenMetaverseTypes"/>
+      <Reference name="OpenMetaverse.StructuredData2" />
+      <Reference name="HttpServer2"/>
+
+      <!-- Remove these eventually -->
+      <Reference name="MySql.Data" />
+      <Reference name="ExtensionLoader" />
+
+      <Files>
+        <Match pattern="*.cs" recurse="false" />
+        <Match path="Resources" pattern="*.addin.xml" buildAction="EmbeddedResource" recurse="true" />
       </Files>
     </Project>