[seam-commits] Seam SVN: r9581 - in trunk: examples and 3 other directories.
seam-commits at lists.jboss.org
seam-commits at lists.jboss.org
Mon Nov 17 01:51:56 EST 2008
Author: dan.j.allen
Date: 2008-11-17 01:51:56 -0500 (Mon, 17 Nov 2008)
New Revision: 9581
Modified:
trunk/build/gen.pom.xml
trunk/examples/build.xml
trunk/seam-gen/build-scripts/build-war.xml
trunk/seam-gen/build-scripts/build.xml
trunk/seam-gen/build.xml
trunk/seam-gen/icefaces/build-scripts/build-war.xml
trunk/seam-gen/icefaces/build-scripts/build.xml
Log:
JBSEAM-3642
Modified: trunk/build/gen.pom.xml
===================================================================
--- trunk/build/gen.pom.xml 2008-11-17 06:37:27 UTC (rev 9580)
+++ trunk/build/gen.pom.xml 2008-11-17 06:51:56 UTC (rev 9581)
@@ -70,12 +70,6 @@
<scope>runtime</scope>
</dependency>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <scope>runtime</scope>
- </dependency>
-
</dependencies>
Modified: trunk/examples/build.xml
===================================================================
--- trunk/examples/build.xml 2008-11-17 06:37:27 UTC (rev 9580)
+++ trunk/examples/build.xml 2008-11-17 06:51:56 UTC (rev 9581)
@@ -992,6 +992,13 @@
</target>
<target name="test" depends="buildtest, copyjbossembedded,getemma" description="Run the tests">
+ <condition property="incompatible.jdk">
+ <and>
+ <equals arg1="${ant.java.version}" arg2="1.6"/>
+ <not><available classname="javax.xml.bind.JAXB"/></not>
+ </and>
+ </condition>
+ <fail if="incompatible.jdk">You are using an incompatible JDK 6. Please use Sun JDK 6 Update 4 (1.6.0_04) or newer or use Open JDK 6.</fail>
<taskdef resource="testngtasks" classpathref="test.classpath" />
<testng outputdir="${test-report.dir}">
<jvmarg line="-Xmx800M" />
Modified: trunk/seam-gen/build-scripts/build-war.xml
===================================================================
--- trunk/seam-gen/build-scripts/build-war.xml 2008-11-17 06:37:27 UTC (rev 9580)
+++ trunk/seam-gen/build-scripts/build-war.xml 2008-11-17 06:51:56 UTC (rev 9581)
@@ -382,6 +382,13 @@
</target>
<target name="test" depends="buildtest" description="Run the tests">
+ <condition property="incompatible.jdk">
+ <and>
+ <equals arg1="${ant.java.version}" arg2="1.6"/>
+ <not><available classname="javax.xml.bind.JAXB"/></not>
+ </and>
+ </condition>
+ <fail if="incompatible.jdk">You are using an incompatible JDK 6. Please use Sun JDK 6 Update 4 (1.6.0_04) or newer or use Open JDK 6.</fail>
<taskdef resource="testngtasks" classpath="${testng.jar}" />
<path id="test.path">
<path path="${test.dir}" />
Modified: trunk/seam-gen/build-scripts/build.xml
===================================================================
--- trunk/seam-gen/build-scripts/build.xml 2008-11-17 06:37:27 UTC (rev 9580)
+++ trunk/seam-gen/build-scripts/build.xml 2008-11-17 06:51:56 UTC (rev 9581)
@@ -395,6 +395,13 @@
</target>
<target name="test" depends="buildtest" description="Run the tests">
+ <condition property="incompatible.jdk">
+ <and>
+ <equals arg1="${ant.java.version}" arg2="1.6"/>
+ <not><available classname="javax.xml.bind.JAXB"/></not>
+ </and>
+ </condition>
+ <fail if="incompatible.jdk">You are using an incompatible JDK 6. Please use Sun JDK 6 Update 4 (1.6.0_04) or newer or use Open JDK 6.</fail>
<taskdef resource="testngtasks" classpath="${testng.jar}"/>
<path id="test.path">
<path path="${test.dir}"/>
Modified: trunk/seam-gen/build.xml
===================================================================
--- trunk/seam-gen/build.xml 2008-11-17 06:37:27 UTC (rev 9580)
+++ trunk/seam-gen/build.xml 2008-11-17 06:51:56 UTC (rev 9581)
@@ -618,9 +618,6 @@
<fileset file="${driver.jar}"/>
</copy>
- <!-- we must use an endorsed jars directory containing JAXB 2.1 for running SeamTest under Java 6 -->
- <copy todir="${project.home}/lib/endorsed" file="${seam.dir}/lib/gen/jaxb-api.jar" overwrite="true"/>
-
<echo message="Copying JBoss Embedded configuration to the ${project.home}/bootstrap directory..."/>
<copy todir="${project.home}/bootstrap" overwrite="true">
<fileset dir="${seam.dir}/bootstrap"/>
Modified: trunk/seam-gen/icefaces/build-scripts/build-war.xml
===================================================================
--- trunk/seam-gen/icefaces/build-scripts/build-war.xml 2008-11-17 06:37:27 UTC (rev 9580)
+++ trunk/seam-gen/icefaces/build-scripts/build-war.xml 2008-11-17 06:51:56 UTC (rev 9581)
@@ -376,6 +376,13 @@
</target>
<target name="test" depends="buildtest" description="Run the tests">
+ <condition property="incompatible.jdk">
+ <and>
+ <equals arg1="${ant.java.version}" arg2="1.6"/>
+ <not><available classname="javax.xml.bind.JAXB"/></not>
+ </and>
+ </condition>
+ <fail if="incompatible.jdk">You are using an incompatible JDK 6. Please use Sun JDK 6 Update 4 (1.6.0_04) or newer or use Open JDK 6.</fail>
<taskdef resource="testngtasks" classpath="${testng.jar}" />
<path id="test.path">
<path path="${test.dir}" />
Modified: trunk/seam-gen/icefaces/build-scripts/build.xml
===================================================================
--- trunk/seam-gen/icefaces/build-scripts/build.xml 2008-11-17 06:37:27 UTC (rev 9580)
+++ trunk/seam-gen/icefaces/build-scripts/build.xml 2008-11-17 06:51:56 UTC (rev 9581)
@@ -390,6 +390,13 @@
</target>
<target name="test" depends="buildtest" description="Run the tests">
+ <condition property="incompatible.jdk">
+ <and>
+ <equals arg1="${ant.java.version}" arg2="1.6"/>
+ <not><available classname="javax.xml.bind.JAXB"/></not>
+ </and>
+ </condition>
+ <fail if="incompatible.jdk">You are using an incompatible JDK 6. Please use Sun JDK 6 Update 4 (1.6.0_04) or newer or use Open JDK 6.</fail>
<taskdef resource="testngtasks" classpath="${testng.jar}"/>
<path id="test.path">
<path path="${test.dir}"/>
More information about the seam-commits
mailing list