Author: jgomes
Date: Tue Nov 11 15:37:14 2008
New Revision: 713221
URL: http://svn.apache.org/viewvc?rev=713221&view=rev
Log:
Refactor vendor assemblies to stage into the lib directory rather than staging
directly on top of the vendor directory.
Removed:
activemq/activemq-dotnet/Apache.NMS.EMS/trunk/lib/
activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/lib/
activemq/activemq-dotnet/Apache.NMS.WCF/trunk/lib/
Modified:
activemq/activemq-dotnet/Apache.NMS.EMS/trunk/ (props changed)
activemq/activemq-dotnet/Apache.NMS.EMS/trunk/nant-common.xml
activemq/activemq-dotnet/Apache.NMS.EMS/trunk/nant.build
activemq/activemq-dotnet/Apache.NMS.EMS/trunk/vendor/ (props changed)
activemq/activemq-dotnet/Apache.NMS.EMS/trunk/vs2008-ems-test.csproj
activemq/activemq-dotnet/Apache.NMS.EMS/trunk/vs2008-ems.csproj
activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/ (props changed)
activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/nant-common.xml
activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/nant.build
activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/vendor/ (props changed)
activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/vs2008-msmq-test.csproj
activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/vs2008-msmq.csproj
activemq/activemq-dotnet/Apache.NMS.WCF/trunk/ (props changed)
activemq/activemq-dotnet/Apache.NMS.WCF/trunk/nant-common.xml
activemq/activemq-dotnet/Apache.NMS.WCF/trunk/nant.build
activemq/activemq-dotnet/Apache.NMS.WCF/trunk/vendor/ (props changed)
activemq/activemq-dotnet/Apache.NMS.WCF/trunk/vs2008-nms-wcf.csproj
Propchange: activemq/activemq-dotnet/Apache.NMS.EMS/trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Nov 11 15:37:14 2008
@@ -1,4 +1,4 @@
build
obj
*.suo
-vendor
+lib
Modified: activemq/activemq-dotnet/Apache.NMS.EMS/trunk/nant-common.xml
URL:
http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.EMS/trunk/nant-common.xml?rev=713221&r1=713220&r2=713221&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.EMS/trunk/nant-common.xml (original)
+++ activemq/activemq-dotnet/Apache.NMS.EMS/trunk/nant-common.xml Tue Nov 11
15:37:14 2008
@@ -391,16 +391,25 @@
<property name="vendor.version"
value="${property::get-value(current.vendor + '.version')}"/>
<property name="vendor.filenames"
value="${property::get-value(current.vendor + '.filenames')}"/>
- <property name="local.repo.vendor.path"
value="${vendor.group}/${vendor.name}/${vendor.version}/${vendor.build.framework}/${vendor.build.config}"/>
- <property name="vendor.repo"
value="vendor/${vendor.name}/${vendor.build.framework}" />
-
+ <property name="local.repo.vendor.path"
value="${nant.local.repo}/${vendor.group}/${vendor.name}/${vendor.version}/${vendor.build.framework}/${vendor.build.config}"/>
+ <property name="vendor.path"
value="vendor/${vendor.name}/${vendor.build.framework}" />
+ <property name="lib.path"
value="lib/${vendor.name}/${vendor.build.framework}" />
+
+ <!--
+ Update the LIB folder with the latest version of the file. By
default, the file from the
+ VENDOR folder will be used. However, if there is a newer version
installed in the local
+ repository, then that version will be copied into the LIB folder.
+ -->
<foreach item="String" in="${vendor.filenames}" delim=","
property="repo.task.artifact">
- <property name="repo.task.src"
value="${nant.local.repo}/${local.repo.vendor.path}/${repo.task.artifact}"/>
- <property name="repo.task.dest"
value="${vendor.repo}/${repo.task.artifact}"/>
+ <property name="lib.task.dest"
value="${lib.path}/${repo.task.artifact}"/>
+ <mkdir dir="${directory::get-parent-directory(lib.task.dest)}" />
+
+ <property name="vendor.task.src"
value="${vendor.path}/${repo.task.artifact}"/>
+ <property name="repo.task.src"
value="${local.repo.vendor.path}/${repo.task.artifact}"/>
- <if test="${file::exists(repo.task.src) and not
file::up-to-date(repo.task.src, repo.task.dest)}">
- <mkdir dir="${directory::get-parent-directory(repo.task.dest)}" />
- <get src="${repo.task.src}" dest="${repo.task.dest}" />
+ <copy file="${repo.task.src}" tofile="${lib.task.dest}"
if="${file::exists(repo.task.src)}"/>
+ <if test="${not file::exists(repo.task.src)}">
+ <copy file="${vendor.task.src}" tofile="${lib.task.dest}"
if="${file::exists(vendor.task.src)}"/>
</if>
</foreach>
</foreach>
@@ -444,7 +453,7 @@
</in>
<do>
<property name="repo.task.dest"
value="${path::get-file-name(deploy.filename)}"/>
- <copy file="${deploy.filename}" todir="${repo.dir}" if="${not
file::up-to-date(deploy.filename, '${repo.dir}/${repo.task.dest}')}" />
+ <copy file="${deploy.filename}" todir="${repo.dir}"
unless="${file::up-to-date(deploy.filename, '${repo.dir}/${repo.task.dest}')}"
/>
</do>
</foreach>
@@ -460,6 +469,7 @@
</if>
<delete dir="build" if="${directory::exists('build')}" />
<delete dir="obj" if="${directory::exists('obj')}" />
+ <delete dir="lib" if="${directory::exists('lib')}" />
</target>
<target name="doc" depends="compile">
Modified: activemq/activemq-dotnet/Apache.NMS.EMS/trunk/nant.build
URL:
http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.EMS/trunk/nant.build?rev=713221&r1=713220&r2=713221&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.EMS/trunk/nant.build (original)
+++ activemq/activemq-dotnet/Apache.NMS.EMS/trunk/nant.build Tue Nov 11
15:37:14 2008
@@ -32,12 +32,11 @@
<!-- Repository organized as: organization/module/version/plaform/artifact,
platform might be something like 'all' or 'net-2.0/release' -->
<property name="nunit.dll"
value="${basedir}/lib/${current.build.framework}/nunit.framework.dll"
dynamic="true"/>
<property name="nunit.extensions.dll"
value="${basedir}/lib/${current.build.framework}/nunit.framework.extensions.dll"
dynamic="true"/>
- <property name="Apache.NMS.dll"
value="${basedir}/vendor/Apache.NMS/${current.build.framework}//Apache.NMS.dll"
dynamic="true"/>
- <property name="Apache.NMS.pdb"
value="${basedir}/vendor/Apache.NMS/${current.build.framework}//Apache.NMS.pdb"
dynamic="true"/>
- <property name="Apache.NMS.xml"
value="${basedir}/vendor/Apache.NMS/${current.build.framework}/Apache.NMS.xml"
dynamic="true"/>
- <property name="Apache.NMS.Test.dll"
value="${basedir}/vendor/Apache.NMS/${current.build.framework}/Apache.NMS.Test.dll"
dynamic="true"/>
- <property name="Apache.NMS.Test.pdb"
value="${basedir}/vendor/Apache.NMS/${current.build.framework}/Apache.NMS.Test.pdb"
dynamic="true"/>
- <property name="Apache.NMS.Test.xml"
value="${basedir}/vendor/Apache.NMS/${current.build.framework}/Apache.NMS.Test.xml"
dynamic="true"/>
+ <property name="Apache.NMS.dll"
value="${basedir}/lib/Apache.NMS/${current.build.framework}/Apache.NMS.dll"
dynamic="true"/>
+ <property name="Apache.NMS.pdb"
value="${basedir}/lib/Apache.NMS/${current.build.framework}/Apache.NMS.pdb"
dynamic="true"/>
+ <property name="Apache.NMS.Test.dll"
value="${basedir}/lib/Apache.NMS/${current.build.framework}//Apache.NMS.Test.dll"
dynamic="true"/>
+ <property name="Apache.NMS.Test.pdb"
value="${basedir}/lib/Apache.NMS/${current.build.framework}/Apache.NMS.Test.pdb"
dynamic="true"/>
+ <property name="TIBCO.EMS.dll"
value="${basedir}/lib/TIBCO.EMS/${current.build.framework}/TIBCO.EMS.dll"
dynamic="true"/>
<!-- Skip certain frameworks, since TIBCO client is not supported on those
platforms. -->
<property name="build.net-1.1.skip" value="true"/>
@@ -48,7 +47,7 @@
<!-- Vendor specific info. The prefix of 'vendor.apache.org' is taken
from the property
'vendor.fileset.names'. This comma-delimited list is iterated, and
properties with
well-known suffixes are used to access and copy down vendor file
dependencies. -->
- <property name="vendor.fileset.names" value="vendor.apache.org"/>
+ <property name="vendor.fileset.names"
value="vendor.apache.org,vendor.nunit.org,vendor.tibco.org"/>
<!-- Property grouping for 'vendor.apache.org' -->
<property name="vendor.apache.org.name" value="Apache.NMS"/>
@@ -56,6 +55,20 @@
<property name="vendor.apache.org.version" value="1.1.0"/>
<property name="vendor.apache.org.filenames"
value="Apache.NMS.dll,Apache.NMS.pdb,Apache.NMS.dll.mdb,Apache.NMS.Test.dll,Apache.NMS.Test.pdb,Apache.NMS.Test.dll.mdb"
/>
+
+ <!-- Property grouping for 'vendor.nunit.org' -->
+ <property name="vendor.nunit.org.name" value="NUnit"/>
+ <property name="vendor.nunit.org.group" value="org.nunit"/>
+ <property name="vendor.nunit.org.version" value="2.4.8"/>
+ <property name="vendor.nunit.org.filenames"
+ value="nunit.framework.dll,nunit.framework.extensions.dll" />
+
+ <!-- Property grouping for 'vendor.tibco.org' -->
+ <property name="vendor.nunit.org.name" value="TIBCO.EMS"/>
+ <property name="vendor.nunit.org.group" value="org.tibco.ems"/>
+ <property name="vendor.nunit.org.version" value="4.1.0"/>
+ <property name="vendor.nunit.org.filenames"
+ value="TIBCO.EMS.dll" />
</target>
<target name="dependency-init" description="Initializes build dependencies">
@@ -68,7 +81,7 @@
<include name="mscorlib.dll" asis="true"/>
<include name="System.dll" asis="true"/>
<include name="System.Xml.dll" asis="true"/>
- <include name="${lib.dir}/TIBCO.EMS.dll"/>
+ <include name="${TIBCO.EMS.dll}"/>
<include name="${Apache.NMS.dll}"/>
</assemblyfileset>
@@ -76,7 +89,7 @@
<include name="mscorlib.dll" asis="true"/>
<include name="System.dll" asis="true"/>
<include name="System.Xml.dll" asis="true"/>
- <include name="${lib.dir}/TIBCO.EMS.dll"/>
+ <include name="${TIBCO.EMS.dll}"/>
<include name="${Apache.NMS.dll}"/>
<include name="${Apache.NMS.Test.dll}"/>
<include name="${build.bin.dir}/${project.name}.dll"/>
@@ -88,7 +101,7 @@
<include name="LICENSE.txt"/>
<include name="NOTICE.txt"/>
<include name="nmsprovider-*.config"/>
- <include name="${lib.dir}/TIBCO.EMS.dll"/>
+ <include name="${TIBCO.EMS.dll}"/>
<include name="${Apache.NMS.dll}"/>
<include name="${Apache.NMS.pdb}"/>
<include name="${Apache.NMS.Test.dll}"/>
Propchange: activemq/activemq-dotnet/Apache.NMS.EMS/trunk/vendor/
------------------------------------------------------------------------------
--- svn:externals (original)
+++ svn:externals Tue Nov 11 15:37:14 2008
@@ -1 +1,2 @@
-Apache.NMS
https://svn.apache.org/repos/asf/activemq/activemq-dotnet/Apache.NMS/trunk/deploy
+^/activemq/activemq-dotnet/Apache.NMS/trunk/deploy Apache.NMS
+^/activemq/activemq-dotnet/vendor/NUnit/2.4.8 NUnit
Modified: activemq/activemq-dotnet/Apache.NMS.EMS/trunk/vs2008-ems-test.csproj
URL:
http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.EMS/trunk/vs2008-ems-test.csproj?rev=713221&r1=713220&r2=713221&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.EMS/trunk/vs2008-ems-test.csproj
(original)
+++ activemq/activemq-dotnet/Apache.NMS.EMS/trunk/vs2008-ems-test.csproj Tue
Nov 11 15:37:14 2008
@@ -59,19 +59,19 @@
<ItemGroup>
<Reference Include="Apache.NMS, Version=1.1.0.0, Culture=neutral,
PublicKeyToken=2a329723af30bc8d, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>vendor\Apache.NMS\net-3.5\Apache.NMS.dll</HintPath>
+ <HintPath>lib\Apache.NMS\net-2.0\Apache.NMS.dll</HintPath>
</Reference>
<Reference Include="Apache.NMS.Test, Version=1.1.0.0, Culture=neutral,
PublicKeyToken=2a329723af30bc8d, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>vendor\Apache.NMS\net-3.5\Apache.NMS.Test.dll</HintPath>
+ <HintPath>lib\Apache.NMS\net-2.0\Apache.NMS.Test.dll</HintPath>
</Reference>
<Reference Include="nunit.framework, Version=2.4.8.0, Culture=neutral,
PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>lib\net-3.5\nunit.framework.dll</HintPath>
+ <HintPath>lib\NUnit\net-2.0\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="nunit.framework.extensions, Version=2.4.8.0,
Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>lib\net-3.5\nunit.framework.extensions.dll</HintPath>
+ <HintPath>lib\NUnit\net-2.0\nunit.framework.extensions.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Xml" />
Modified: activemq/activemq-dotnet/Apache.NMS.EMS/trunk/vs2008-ems.csproj
URL:
http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.EMS/trunk/vs2008-ems.csproj?rev=713221&r1=713220&r2=713221&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.EMS/trunk/vs2008-ems.csproj (original)
+++ activemq/activemq-dotnet/Apache.NMS.EMS/trunk/vs2008-ems.csproj Tue Nov 11
15:37:14 2008
@@ -58,13 +58,13 @@
<ItemGroup>
<Reference Include="Apache.NMS, Version=1.1.0.0, Culture=neutral,
PublicKeyToken=2a329723af30bc8d, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>vendor\Apache.NMS\net-3.5\Apache.NMS.dll</HintPath>
+ <HintPath>lib\Apache.NMS\net-2.0\Apache.NMS.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Xml" />
<Reference Include="TIBCO.EMS, Version=1.0.0.0, Culture=neutral,
PublicKeyToken=5b83db8ff05c64ba">
<SpecificVersion>False</SpecificVersion>
- <HintPath>lib\TIBCO.EMS.dll</HintPath>
+ <HintPath>lib\TIBCO.EMS\net-2.0\TIBCO.EMS.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Propchange: activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Nov 11 15:37:14 2008
@@ -1,4 +1,4 @@
build
obj
*.suo
-vendor
+lib
Modified: activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/nant-common.xml
URL:
http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/nant-common.xml?rev=713221&r1=713220&r2=713221&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/nant-common.xml (original)
+++ activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/nant-common.xml Tue Nov 11
15:37:14 2008
@@ -391,16 +391,25 @@
<property name="vendor.version"
value="${property::get-value(current.vendor + '.version')}"/>
<property name="vendor.filenames"
value="${property::get-value(current.vendor + '.filenames')}"/>
- <property name="local.repo.vendor.path"
value="${vendor.group}/${vendor.name}/${vendor.version}/${vendor.build.framework}/${vendor.build.config}"/>
- <property name="vendor.repo"
value="vendor/${vendor.name}/${vendor.build.framework}" />
-
+ <property name="local.repo.vendor.path"
value="${nant.local.repo}/${vendor.group}/${vendor.name}/${vendor.version}/${vendor.build.framework}/${vendor.build.config}"/>
+ <property name="vendor.path"
value="vendor/${vendor.name}/${vendor.build.framework}" />
+ <property name="lib.path"
value="lib/${vendor.name}/${vendor.build.framework}" />
+
+ <!--
+ Update the LIB folder with the latest version of the file. By
default, the file from the
+ VENDOR folder will be used. However, if there is a newer version
installed in the local
+ repository, then that version will be copied into the LIB folder.
+ -->
<foreach item="String" in="${vendor.filenames}" delim=","
property="repo.task.artifact">
- <property name="repo.task.src"
value="${nant.local.repo}/${local.repo.vendor.path}/${repo.task.artifact}"/>
- <property name="repo.task.dest"
value="${vendor.repo}/${repo.task.artifact}"/>
+ <property name="lib.task.dest"
value="${lib.path}/${repo.task.artifact}"/>
+ <mkdir dir="${directory::get-parent-directory(lib.task.dest)}" />
+
+ <property name="vendor.task.src"
value="${vendor.path}/${repo.task.artifact}"/>
+ <property name="repo.task.src"
value="${local.repo.vendor.path}/${repo.task.artifact}"/>
- <if test="${file::exists(repo.task.src) and not
file::up-to-date(repo.task.src, repo.task.dest)}">
- <mkdir dir="${directory::get-parent-directory(repo.task.dest)}" />
- <get src="${repo.task.src}" dest="${repo.task.dest}" />
+ <copy file="${repo.task.src}" tofile="${lib.task.dest}"
if="${file::exists(repo.task.src)}"/>
+ <if test="${not file::exists(repo.task.src)}">
+ <copy file="${vendor.task.src}" tofile="${lib.task.dest}"
if="${file::exists(vendor.task.src)}"/>
</if>
</foreach>
</foreach>
@@ -444,7 +453,7 @@
</in>
<do>
<property name="repo.task.dest"
value="${path::get-file-name(deploy.filename)}"/>
- <copy file="${deploy.filename}" todir="${repo.dir}" if="${not
file::up-to-date(deploy.filename, '${repo.dir}/${repo.task.dest}')}" />
+ <copy file="${deploy.filename}" todir="${repo.dir}"
unless="${file::up-to-date(deploy.filename, '${repo.dir}/${repo.task.dest}')}"
/>
</do>
</foreach>
@@ -460,6 +469,7 @@
</if>
<delete dir="build" if="${directory::exists('build')}" />
<delete dir="obj" if="${directory::exists('obj')}" />
+ <delete dir="lib" if="${directory::exists('lib')}" />
</target>
<target name="doc" depends="compile">
Modified: activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/nant.build
URL:
http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/nant.build?rev=713221&r1=713220&r2=713221&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/nant.build (original)
+++ activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/nant.build Tue Nov 11
15:37:14 2008
@@ -22,19 +22,18 @@
<!--
============================================================================================
-->
<property name="basedir" value="${project::get-base-directory()}"/>
<property name="project.name" value="Apache.NMS.MSMQ"/>
- <property name="project.group" value="org.apache.activemq"/>
+ <property name="project.group" value="org.apache.activemq"/>
<property name="project.version" value="1.1.0"
unless="${property::exists('project.version')}"/>
<property name="project.short_description" value="Apache NMS for MSMQ Class
Library"/>
<property name="project.description" value="Apache NMS for MSMQ Class
Library (.Net Messaging Library Implementation): An implementation of the NMS
API for MSMQ"/>
<!-- Repository organized as: organization/module/version/plaform/artifact,
platform might be something like 'all' or 'net-2.0/release' -->
- <property name="nunit.dll"
value="${basedir}/lib/${current.build.framework}/nunit.framework.dll"
dynamic="true"/>
- <property name="Apache.NMS.dll"
value="${basedir}/vendor/Apache.NMS/${current.build.framework}/Apache.NMS.dll"
dynamic="true"/>
- <property name="Apache.NMS.pdb"
value="${basedir}/vendor/Apache.NMS/${current.build.framework}/Apache.NMS.pdb"
dynamic="true"/>
- <property name="Apache.NMS.xml"
value="${basedir}/vendor/Apache.NMS/${current.build.framework}/Apache.NMS.xml"
dynamic="true"/>
- <property name="Apache.NMS.Test.dll"
value="${basedir}/vendor/Apache.NMS/${current.build.framework}/Apache.NMS.Test.dll"
dynamic="true"/>
- <property name="Apache.NMS.Test.pdb"
value="${basedir}/vendor/Apache.NMS/${current.build.framework}/Apache.NMS.Test.pdb"
dynamic="true"/>
- <property name="Apache.NMS.Test.xml"
value="${basedir}/vendor/Apache.NMS/${current.build.framework}/Apache.NMS.Test.xml"
dynamic="true"/>
+ <property name="nunit.dll"
value="${basedir}/lib/NUnit/${current.build.framework}/nunit.framework.dll"
dynamic="true"/>
+ <property name="nunit.extensions.dll"
value="${basedir}/lib/NUnit/${current.build.framework}/nunit.framework.extensions.dll"
dynamic="true"/>
+ <property name="Apache.NMS.dll"
value="${basedir}/lib/Apache.NMS/${current.build.framework}/Apache.NMS.dll"
dynamic="true"/>
+ <property name="Apache.NMS.pdb"
value="${basedir}/lib/Apache.NMS/${current.build.framework}/Apache.NMS.pdb"
dynamic="true"/>
+ <property name="Apache.NMS.Test.dll"
value="${basedir}/lib/Apache.NMS/${current.build.framework}//Apache.NMS.Test.dll"
dynamic="true"/>
+ <property name="Apache.NMS.Test.pdb"
value="${basedir}/lib/Apache.NMS/${current.build.framework}/Apache.NMS.Test.pdb"
dynamic="true"/>
<!-- Skip certain frameworks, since MSMQ is not supported on those
platforms. -->
<property name="build.netcf-2.0.skip" value="true"/>
@@ -44,7 +43,7 @@
<!-- Vendor specific info. The prefix of 'vendor.apache.org' is taken
from the property
'vendor.fileset.names'. This comma-delimited list is iterated, and
properties with
well-known suffixes are used to access and copy down vendor file
dependencies. -->
- <property name="vendor.fileset.names" value="vendor.apache.org"/>
+ <property name="vendor.fileset.names"
value="vendor.apache.org,vendor.nunit.org"/>
<!-- Property grouping for 'vendor.apache.org' -->
<property name="vendor.apache.org.name" value="Apache.NMS"/>
@@ -52,6 +51,13 @@
<property name="vendor.apache.org.version" value="1.1.0"/>
<property name="vendor.apache.org.filenames"
value="Apache.NMS.dll,Apache.NMS.pdb,Apache.NMS.dll.mdb,Apache.NMS.Test.dll,Apache.NMS.Test.pdb,Apache.NMS.Test.dll.mdb"
/>
+
+ <!-- Property grouping for 'vendor.nunit.org' -->
+ <property name="vendor.nunit.org.name" value="NUnit"/>
+ <property name="vendor.nunit.org.group" value="org.nunit"/>
+ <property name="vendor.nunit.org.version" value="2.4.8"/>
+ <property name="vendor.nunit.org.filenames"
+ value="nunit.framework.dll,nunit.framework.extensions.dll" />
</target>
<target name="dependency-init" description="Initializes build dependencies">
@@ -77,6 +83,7 @@
<include name="${Apache.NMS.Test.dll}"/>
<include name="${build.bin.dir}/${project.name}.dll"/>
<include name="${nunit.dll}"/>
+ <include name="${nunit.extensions.dll}"/>
</assemblyfileset>
<fileset id="content.filenames">
@@ -87,6 +94,8 @@
<include name="${Apache.NMS.pdb}"/>
<include name="${Apache.NMS.Test.dll}"/>
<include name="${Apache.NMS.Test.pdb}"/>
+ <include name="${nunit.dll}"/>
+ <include name="${nunit.extensions.dll}"/>
</fileset>
<fileset id="install.filenames">
Propchange: activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/vendor/
------------------------------------------------------------------------------
--- svn:externals (original)
+++ svn:externals Tue Nov 11 15:37:14 2008
@@ -1 +1,2 @@
-Apache.NMS
https://svn.apache.org/repos/asf/activemq/activemq-dotnet/Apache.NMS/trunk/deploy
+^/activemq/activemq-dotnet/Apache.NMS/trunk/deploy Apache.NMS
+^/activemq/activemq-dotnet/vendor/NUnit/2.4.8 NUnit
Modified: activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/vs2008-msmq-test.csproj
URL:
http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/vs2008-msmq-test.csproj?rev=713221&r1=713220&r2=713221&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/vs2008-msmq-test.csproj
(original)
+++ activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/vs2008-msmq-test.csproj Tue
Nov 11 15:37:14 2008
@@ -59,19 +59,19 @@
<ItemGroup>
<Reference Include="Apache.NMS, Version=1.1.0.0, Culture=neutral,
PublicKeyToken=2a329723af30bc8d, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>vendor\Apache.NMS\net-3.5\Apache.NMS.dll</HintPath>
+ <HintPath>lib\Apache.NMS\net-2.0\Apache.NMS.dll</HintPath>
</Reference>
<Reference Include="Apache.NMS.Test, Version=1.1.0.0, Culture=neutral,
PublicKeyToken=2a329723af30bc8d, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>vendor\Apache.NMS\net-3.5\Apache.NMS.Test.dll</HintPath>
+ <HintPath>lib\Apache.NMS\net-2.0\Apache.NMS.Test.dll</HintPath>
</Reference>
<Reference Include="nunit.framework, Version=2.4.8.0, Culture=neutral,
PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>lib\net-3.5\nunit.framework.dll</HintPath>
+ <HintPath>lib\NUnit\net-3.5\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="nunit.framework.extensions, Version=2.4.8.0,
Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>lib\net-3.5\nunit.framework.extensions.dll</HintPath>
+ <HintPath>lib\NUnit\net-3.5\nunit.framework.extensions.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Messaging" />
Modified: activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/vs2008-msmq.csproj
URL:
http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/vs2008-msmq.csproj?rev=713221&r1=713220&r2=713221&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/vs2008-msmq.csproj (original)
+++ activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/vs2008-msmq.csproj Tue Nov
11 15:37:14 2008
@@ -59,7 +59,7 @@
<ItemGroup>
<Reference Include="Apache.NMS, Version=1.1.0.0, Culture=neutral,
PublicKeyToken=2a329723af30bc8d, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>vendor\Apache.NMS\net-3.5\Apache.NMS.dll</HintPath>
+ <HintPath>lib\Apache.NMS\net-2.0\Apache.NMS.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Messaging" />
Propchange: activemq/activemq-dotnet/Apache.NMS.WCF/trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Nov 11 15:37:14 2008
@@ -1 +1,4 @@
-vendor
+build
+obj
+*.suo
+lib
Modified: activemq/activemq-dotnet/Apache.NMS.WCF/trunk/nant-common.xml
URL:
http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.WCF/trunk/nant-common.xml?rev=713221&r1=713220&r2=713221&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.WCF/trunk/nant-common.xml (original)
+++ activemq/activemq-dotnet/Apache.NMS.WCF/trunk/nant-common.xml Tue Nov 11
15:37:14 2008
@@ -391,16 +391,25 @@
<property name="vendor.version"
value="${property::get-value(current.vendor + '.version')}"/>
<property name="vendor.filenames"
value="${property::get-value(current.vendor + '.filenames')}"/>
- <property name="local.repo.vendor.path"
value="${vendor.group}/${vendor.name}/${vendor.version}/${vendor.build.framework}/${vendor.build.config}"/>
- <property name="vendor.repo"
value="vendor/${vendor.name}/${vendor.build.framework}" />
-
+ <property name="local.repo.vendor.path"
value="${nant.local.repo}/${vendor.group}/${vendor.name}/${vendor.version}/${vendor.build.framework}/${vendor.build.config}"/>
+ <property name="vendor.path"
value="vendor/${vendor.name}/${vendor.build.framework}" />
+ <property name="lib.path"
value="lib/${vendor.name}/${vendor.build.framework}" />
+
+ <!--
+ Update the LIB folder with the latest version of the file. By
default, the file from the
+ VENDOR folder will be used. However, if there is a newer version
installed in the local
+ repository, then that version will be copied into the LIB folder.
+ -->
<foreach item="String" in="${vendor.filenames}" delim=","
property="repo.task.artifact">
- <property name="repo.task.src"
value="${nant.local.repo}/${local.repo.vendor.path}/${repo.task.artifact}"/>
- <property name="repo.task.dest"
value="${vendor.repo}/${repo.task.artifact}"/>
+ <property name="lib.task.dest"
value="${lib.path}/${repo.task.artifact}"/>
+ <mkdir dir="${directory::get-parent-directory(lib.task.dest)}" />
+
+ <property name="vendor.task.src"
value="${vendor.path}/${repo.task.artifact}"/>
+ <property name="repo.task.src"
value="${local.repo.vendor.path}/${repo.task.artifact}"/>
- <if test="${file::exists(repo.task.src) and not
file::up-to-date(repo.task.src, repo.task.dest)}">
- <mkdir dir="${directory::get-parent-directory(repo.task.dest)}" />
- <get src="${repo.task.src}" dest="${repo.task.dest}" />
+ <copy file="${repo.task.src}" tofile="${lib.task.dest}"
if="${file::exists(repo.task.src)}"/>
+ <if test="${not file::exists(repo.task.src)}">
+ <copy file="${vendor.task.src}" tofile="${lib.task.dest}"
if="${file::exists(vendor.task.src)}"/>
</if>
</foreach>
</foreach>
@@ -444,7 +453,7 @@
</in>
<do>
<property name="repo.task.dest"
value="${path::get-file-name(deploy.filename)}"/>
- <copy file="${deploy.filename}" todir="${repo.dir}" if="${not
file::up-to-date(deploy.filename, '${repo.dir}/${repo.task.dest}')}" />
+ <copy file="${deploy.filename}" todir="${repo.dir}"
unless="${file::up-to-date(deploy.filename, '${repo.dir}/${repo.task.dest}')}"
/>
</do>
</foreach>
@@ -460,6 +469,7 @@
</if>
<delete dir="build" if="${directory::exists('build')}" />
<delete dir="obj" if="${directory::exists('obj')}" />
+ <delete dir="lib" if="${directory::exists('lib')}" />
</target>
<target name="doc" depends="compile">
Modified: activemq/activemq-dotnet/Apache.NMS.WCF/trunk/nant.build
URL:
http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.WCF/trunk/nant.build?rev=713221&r1=713220&r2=713221&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.WCF/trunk/nant.build (original)
+++ activemq/activemq-dotnet/Apache.NMS.WCF/trunk/nant.build Tue Nov 11
15:37:14 2008
@@ -28,12 +28,12 @@
<property name="project.description" value="WCF Provider for ActiveMQ
Class Library (.Net Messaging Library Implementation): An implementation of
Windows Communications Framework API for ActiveMQ"/>
<!-- Repository organized as:
organization/module/version/plaform/artifact, platform might be something like
'all' or 'net-2.0/release' -->
- <property name="nunit.dll"
value="${basedir}/lib/${current.build.framework}/nunit.framework.dll"
dynamic="true"/>
- <property name="nunit.extensions.dll"
value="${basedir}/lib/${current.build.framework}/nunit.framework.extensions.dll"
dynamic="true"/>
- <property name="Apache.NMS.dll"
value="${basedir}/vendor/Apache.NMS/${current.build.framework}/Apache.NMS.dll"
dynamic="true"/>
- <property name="Apache.NMS.pdb"
value="${basedir}/vendor/Apache.NMS/${current.build.framework}/Apache.NMS.pdb"
dynamic="true"/>
- <property name="Apache.NMS.Test.dll"
value="${basedir}/vendor/Apache.NMS/${current.build.framework}//Apache.NMS.Test.dll"
dynamic="true"/>
- <property name="Apache.NMS.Test.pdb"
value="${basedir}/vendor/Apache.NMS/${current.build.framework}/Apache.NMS.Test.pdb"
dynamic="true"/>
+ <property name="nunit.dll"
value="${basedir}/lib/NUnit/${current.build.framework}/nunit.framework.dll"
dynamic="true"/>
+ <property name="nunit.extensions.dll"
value="${basedir}/lib/NUnit/${current.build.framework}/nunit.framework.extensions.dll"
dynamic="true"/>
+ <property name="Apache.NMS.dll"
value="${basedir}/lib/Apache.NMS/${current.build.framework}/Apache.NMS.dll"
dynamic="true"/>
+ <property name="Apache.NMS.pdb"
value="${basedir}/lib/Apache.NMS/${current.build.framework}/Apache.NMS.pdb"
dynamic="true"/>
+ <property name="Apache.NMS.Test.dll"
value="${basedir}/lib/Apache.NMS/${current.build.framework}//Apache.NMS.Test.dll"
dynamic="true"/>
+ <property name="Apache.NMS.Test.pdb"
value="${basedir}/lib/Apache.NMS/${current.build.framework}/Apache.NMS.Test.pdb"
dynamic="true"/>
<!-- Skip certain frameworks, since ActiveMQ.NET Client is not
supported on those platforms. -->
<property name="build.net-1.1.skip" value="true"/>
@@ -45,7 +45,7 @@
<!-- Vendor specific info. The prefix of 'vendor.apache.org'
is taken from the property
'vendor.fileset.names'. This comma-delimited list is
iterated, and properties with
well-known suffixes are used to access and copy down
vendor file dependencies. -->
- <property name="vendor.fileset.names"
value="vendor.apache.org"/>
+ <property name="vendor.fileset.names"
value="vendor.apache.org,vendor.nunit.org"/>
<!-- Property grouping for 'vendor.apache.org' -->
<property name="vendor.apache.org.name" value="Apache.NMS"/>
@@ -53,6 +53,13 @@
<property name="vendor.apache.org.version" value="1.1.0"/>
<property name="vendor.apache.org.filenames"
value="Apache.NMS.dll,Apache.NMS.pdb,Apache.NMS.dll.mdb,Apache.NMS.Test.dll,Apache.NMS.Test.pdb,Apache.NMS.Test.dll.mdb"
/>
+
+ <!-- Property grouping for 'vendor.nunit.org' -->
+ <property name="vendor.nunit.org.name" value="NUnit"/>
+ <property name="vendor.nunit.org.group" value="org.nunit"/>
+ <property name="vendor.nunit.org.version" value="2.4.8"/>
+ <property name="vendor.nunit.org.filenames"
+
value="nunit.framework.dll,nunit.framework.extensions.dll" />
</target>
<target name="dependency-init" description="Initializes build
dependencies">
Propchange: activemq/activemq-dotnet/Apache.NMS.WCF/trunk/vendor/
------------------------------------------------------------------------------
--- svn:externals (original)
+++ svn:externals Tue Nov 11 15:37:14 2008
@@ -1 +1,2 @@
-Apache.NMS
https://svn.apache.org/repos/asf/activemq/activemq-dotnet/Apache.NMS/trunk/deploy
+^/activemq/activemq-dotnet/Apache.NMS/trunk/deploy Apache.NMS
+^/activemq/activemq-dotnet/vendor/NUnit/2.4.8 NUnit
Modified: activemq/activemq-dotnet/Apache.NMS.WCF/trunk/vs2008-nms-wcf.csproj
URL:
http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.WCF/trunk/vs2008-nms-wcf.csproj?rev=713221&r1=713220&r2=713221&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.WCF/trunk/vs2008-nms-wcf.csproj
(original)
+++ activemq/activemq-dotnet/Apache.NMS.WCF/trunk/vs2008-nms-wcf.csproj Tue Nov
11 15:37:14 2008
@@ -68,7 +68,7 @@
<ItemGroup>
<Reference Include="Apache.NMS, Version=1.1.0.0, Culture=neutral,
processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>vendor\Apache.NMS\net-3.5\Apache.NMS.dll</HintPath>
+ <HintPath>lib\Apache.NMS\net-3.5\Apache.NMS.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.configuration" />
