You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@abdera.apache.org by jm...@apache.org on 2007/08/28 20:56:23 UTC
svn commit: r570523 - /incubator/abdera/java/trunk/build/build.xml
Author: jmsnell
Date: Tue Aug 28 11:56:23 2007
New Revision: 570523
URL: http://svn.apache.org/viewvc?rev=570523&view=rev
Log:
Fix build bug in trunk caused by removing the empty test directory in extensions/wsse
Modified:
incubator/abdera/java/trunk/build/build.xml
Modified: incubator/abdera/java/trunk/build/build.xml
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/build/build.xml?rev=570523&r1=570522&r2=570523&view=diff
==============================================================================
--- incubator/abdera/java/trunk/build/build.xml (original)
+++ incubator/abdera/java/trunk/build/build.xml Tue Aug 28 11:56:23 2007
@@ -687,7 +687,9 @@
<mkdir dir="${extensions.work}/${ext}" />
<mkdir dir="${extensions.work}/${ext}/META-INF" />
<javac srcdir="${extensions}/${ext}/src/main/java" destdir="${extensions.work}/${ext}" classpathref="jar.dependencies" classpath="${core.work};${parser.work};${client.work};${protocol.work}" debug="${debug}" />
- <javac srcdir="${extensions}/${ext}/src/test/java" destdir="${test}" classpathref="jar.dependencies" classpath="${core.work};${parser.work};${extensions.work}/${ext};${client.work};${protocol.work}" debug="${debug}" />
+
+ <available file="${extensions}/${ext}/src/test/java" property="is.available.${ext}.test" />
+
<copy todir="${extensions.work}/${ext}/META-INF">
<fileset dir="${basedir}">
<include name="LICENSE" />
@@ -697,9 +699,18 @@
<copy todir="${extensions.work}/${ext}">
<fileset dir="${extensions}/${ext}/src/main/resources" includes="**/*" />
</copy>
- <copy todir="${test}">
- <fileset dir="${extensions}/${ext}/src/test/resources" includes="**/*" />
- </copy>
+
+ <antcall target="compile.extension.test">
+ <param name="ext" value="${ext}"/>
+ </antcall>
+ </target>
+
+ <target name="compile.extension.test" if="is.available.${ext}.test">
+ <echo>Compiling tests for extension ${ext}...</echo>
+ <javac srcdir="${extensions}/${ext}/src/test/java" destdir="${test}" classpathref="jar.dependencies" classpath="${core.work};${parser.work};${extensions.work}/${ext};${client.work};${protocol.work}" debug="${debug}" />
+ <copy todir="${test}">
+ <fileset dir="${extensions}/${ext}/src/test/resources" includes="**/*" />
+ </copy>
</target>
<target name="dist.extensions">
Re: svn commit: r570523 - /incubator/abdera/java/trunk/build/build.xml
Posted by James M Snell <ja...@gmail.com>.
No problem at all :-)
Stephen Duncan wrote:
> Whoops, sorry about that.
>
> -Stephen
>
> On 8/28/07, jmsnell@apache.org <jm...@apache.org> wrote:
>> Author: jmsnell
>> Date: Tue Aug 28 11:56:23 2007
>> New Revision: 570523
>>
>> URL: http://svn.apache.org/viewvc?rev=570523&view=rev
>> Log:
>> Fix build bug in trunk caused by removing the empty test directory in
>> extensions/wsse
>>
>> Modified:
>> incubator/abdera/java/trunk/build/build.xml
>>
>> Modified: incubator/abdera/java/trunk/build/build.xml
>> URL:
>> http://svn.apache.org/viewvc/incubator/abdera/java/trunk/build/build.xml?rev=570523&r1=570522&r2=570523&view=diff
>>
>> ==============================================================================
>> --- incubator/abdera/java/trunk/build/build.xml (original)
>> +++ incubator/abdera/java/trunk/build/build.xml Tue Aug 28 11:56:23 2007
>> @@ -687,7 +687,9 @@
>> <mkdir dir="${extensions.work}/${ext}" />
>> <mkdir dir="${extensions.work}/${ext}/META-INF" />
>> <javac srcdir="${extensions}/${ext}/src/main/java" destdir="${
>> extensions.work}/${ext}" classpathref="jar.dependencies" classpath="${
>> core.work};${parser.work};${client.work};${protocol.work}"
>> debug="${debug}" />
>> - <javac srcdir="${extensions}/${ext}/src/test/java" destdir="${test}"
>> classpathref="jar.dependencies" classpath="${core.work};${parser.work};${
>> extensions.work}/${ext};${client.work};${protocol.work}" debug="${debug}"
>> />
>> +
>> + <available file="${extensions}/${ext}/src/test/java" property="
>> is.available.${ext}.test" />
>> +
>> <copy todir="${extensions.work}/${ext}/META-INF">
>> <fileset dir="${basedir}">
>> <include name="LICENSE" />
>> @@ -697,9 +699,18 @@
>> <copy todir="${extensions.work}/${ext}">
>> <fileset dir="${extensions}/${ext}/src/main/resources"
>> includes="**/*" />
>> </copy>
>> - <copy todir="${test}">
>> - <fileset dir="${extensions}/${ext}/src/test/resources"
>> includes="**/*" />
>> - </copy>
>> +
>> + <antcall target="compile.extension.test">
>> + <param name="ext" value="${ext}"/>
>> + </antcall>
>> + </target>
>> +
>> + <target name="compile.extension.test" if="is.available.${ext}.test">
>> + <echo>Compiling tests for extension ${ext}...</echo>
>> + <javac srcdir="${extensions}/${ext}/src/test/java" destdir="${test}"
>> classpathref="jar.dependencies" classpath="${core.work};${parser.work};${
>> extensions.work}/${ext};${client.work};${protocol.work}" debug="${debug}"
>> />
>> + <copy todir="${test}">
>> + <fileset dir="${extensions}/${ext}/src/test/resources"
>> includes="**/*" />
>> + </copy>
>> </target>
>>
>> <target name="dist.extensions">
>>
>>
>>
>
>
Re: svn commit: r570523 - /incubator/abdera/java/trunk/build/build.xml
Posted by Stephen Duncan <st...@gmail.com>.
Whoops, sorry about that.
-Stephen
On 8/28/07, jmsnell@apache.org <jm...@apache.org> wrote:
>
> Author: jmsnell
> Date: Tue Aug 28 11:56:23 2007
> New Revision: 570523
>
> URL: http://svn.apache.org/viewvc?rev=570523&view=rev
> Log:
> Fix build bug in trunk caused by removing the empty test directory in
> extensions/wsse
>
> Modified:
> incubator/abdera/java/trunk/build/build.xml
>
> Modified: incubator/abdera/java/trunk/build/build.xml
> URL:
> http://svn.apache.org/viewvc/incubator/abdera/java/trunk/build/build.xml?rev=570523&r1=570522&r2=570523&view=diff
>
> ==============================================================================
> --- incubator/abdera/java/trunk/build/build.xml (original)
> +++ incubator/abdera/java/trunk/build/build.xml Tue Aug 28 11:56:23 2007
> @@ -687,7 +687,9 @@
> <mkdir dir="${extensions.work}/${ext}" />
> <mkdir dir="${extensions.work}/${ext}/META-INF" />
> <javac srcdir="${extensions}/${ext}/src/main/java" destdir="${
> extensions.work}/${ext}" classpathref="jar.dependencies" classpath="${
> core.work};${parser.work};${client.work};${protocol.work}"
> debug="${debug}" />
> - <javac srcdir="${extensions}/${ext}/src/test/java" destdir="${test}"
> classpathref="jar.dependencies" classpath="${core.work};${parser.work};${
> extensions.work}/${ext};${client.work};${protocol.work}" debug="${debug}"
> />
> +
> + <available file="${extensions}/${ext}/src/test/java" property="
> is.available.${ext}.test" />
> +
> <copy todir="${extensions.work}/${ext}/META-INF">
> <fileset dir="${basedir}">
> <include name="LICENSE" />
> @@ -697,9 +699,18 @@
> <copy todir="${extensions.work}/${ext}">
> <fileset dir="${extensions}/${ext}/src/main/resources"
> includes="**/*" />
> </copy>
> - <copy todir="${test}">
> - <fileset dir="${extensions}/${ext}/src/test/resources"
> includes="**/*" />
> - </copy>
> +
> + <antcall target="compile.extension.test">
> + <param name="ext" value="${ext}"/>
> + </antcall>
> + </target>
> +
> + <target name="compile.extension.test" if="is.available.${ext}.test">
> + <echo>Compiling tests for extension ${ext}...</echo>
> + <javac srcdir="${extensions}/${ext}/src/test/java" destdir="${test}"
> classpathref="jar.dependencies" classpath="${core.work};${parser.work};${
> extensions.work}/${ext};${client.work};${protocol.work}" debug="${debug}"
> />
> + <copy todir="${test}">
> + <fileset dir="${extensions}/${ext}/src/test/resources"
> includes="**/*" />
> + </copy>
> </target>
>
> <target name="dist.extensions">
>
>
>
--
Stephen Duncan Jr
www.stephenduncanjr.com