From 28fac2e692ceb53c87e52bd5f9146dd3af1ebc27 Mon Sep 17 00:00:00 2001
From: Arjen Poutsma <apoutsma@vmware.com>
Date: Sun, 20 May 2007 11:39:48 +0000
Subject: [PATCH] Ant build now notices maven.test.skip

---
 oxm/build-maven2.xml | 11 +++++++----
 oxm/pom.xml          |  2 ++
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/oxm/build-maven2.xml b/oxm/build-maven2.xml
index e9480c61..c275f8f9 100644
--- a/oxm/build-maven2.xml
+++ b/oxm/build-maven2.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0"?>
 <project name="spring-oxm-maven2-targets" default="generate-test-sources">
+    <condition property="skip">
+        <equals arg1="${maven.test.skip}" arg2="true"/>
+    </condition>
 
     <property name="schema" value="${basedir}/src/test/resources/org/springframework/oxm/flight.xsd"/>
     <property name="generate.target.directory" value="${basedir}/target/generated-sources/test/java"/>
@@ -16,19 +19,19 @@
         <mkdir dir="${generate.target.directory}"/>
     </target>
 
-    <target name="generate-test-jaxb" depends="generate-test-init">
+    <target name="generate-test-jaxb" depends="generate-test-init" unless="skip">
         <taskdef name="xjc" classname="com.sun.tools.xjc.XJCTask" classpathref="maven.test.classpath"/>
         <xjc target="${generate.target.directory}" package="org.springframework.oxm.jaxb1" schema="${schema}">
             <produces dir="${generate.target.directory}" includes="**/jaxb1/**/*.java"/>
         </xjc>
     </target>
 
-    <target name="generate-test-xmlbeans">
+    <target name="generate-test-xmlbeans" unless="skip">
         <taskdef name="xmlbean" classname="org.apache.xmlbeans.impl.tool.XMLBean" classpathref="maven.test.classpath"/>
         <xmlbean schema="${schema}" classgendir="${basedir}/target/test-classes" classpathref="maven.test.classpath"/>
     </target>
 
-    <target name="generate-test-castor" depends="generate-test-init">
+    <target name="generate-test-castor" depends="generate-test-init" unless="skip">
         <taskdef name="castor-srcgen" classname="org.exolab.castor.tools.ant.taskdefs.CastorSourceGenTask"
                  classpathref="maven.test.classpath"/>
         <castor-srcgen types="j2" warnings="false" file="${schema}" todir="${generate.target.directory}"
@@ -37,7 +40,7 @@
 
     <target name="test-compile" depends="test-compile-jibx"/>
 
-    <target name="test-compile-jibx">
+    <target name="test-compile-jibx" unless="skip">
         <taskdef name="jibx-bind" classname="org.jibx.binding.ant.CompileTask" classpathref="maven.test.classpath"/>
         <jibx-bind load="true" binding="${basedir}/src/test/resources/org/springframework/oxm/jibx/binding.xml">
             <classpathset dir="${basedir}/target/test-classes">
diff --git a/oxm/pom.xml b/oxm/pom.xml
index fc21931b..803207bb 100644
--- a/oxm/pom.xml
+++ b/oxm/pom.xml
@@ -30,6 +30,7 @@
                         <configuration>
                             <tasks>
                                 <ant antfile="${basedir}/build-maven2.xml" inheritRefs="true">
+                                    <property name="maven.test.skip" value="${maven.test.skip}"/>
                                     <target name="generate-test-sources"/>
                                 </ant>
                             </tasks>
@@ -45,6 +46,7 @@
                         <configuration>
                             <tasks>
                                 <ant antfile="${basedir}/build-maven2.xml" inheritRefs="true">
+                                    <property name="maven.test.skip" value="${maven.test.skip}"/>
                                     <target name="test-compile"/>
                                 </ant>
                             </tasks>