[jboss-svn-commits] JBL Code SVN: r28892 - in labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP: ArjunaCore and 5 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Aug 10 13:16:19 EDT 2009
Author: jhalliday
Date: 2009-08-10 13:16:19 -0400 (Mon, 10 Aug 2009)
New Revision: 28892
Modified:
labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/ArjunaCore/build.xml
labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/ArjunaJTA/build.xml
labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/ArjunaJTS/build.xml
labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/build.xml
labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/build.xml
labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/build.xml
labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/build-jta.xml
labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/build-jts.xml
Log:
Update build process to allow building on Java 1.6, without the JDBC module. JBTM-604
Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/ArjunaCore/build.xml
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/ArjunaCore/build.xml 2009-08-10 15:47:54 UTC (rev 28891)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/ArjunaCore/build.xml 2009-08-10 17:16:19 UTC (rev 28892)
@@ -60,17 +60,6 @@
<format property="com.hp.mw.date" pattern="yyyy/MMM/dd HH:mm"/>
</tstamp>
- <condition property="JDK_VERSION_OK">
- <or>
- <equals arg1="${java.specification.version}" arg2="1.4"/>
- <equals arg1="${java.specification.version}" arg2="1.5"/>
- </or>
- </condition>
-
- <fail unless="JDK_VERSION_OK">
- JBossTS Core currently requires jdk1.4 or jdk1.5 to build.
- </fail>
-
<property name="com.hp.mw.installationdirectory" location="install"/>
<property name="com.hp.mw.sourceid" value="unknown"/>
<property name="com.hp.mw.version" value="unknown"/>
Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/ArjunaJTA/build.xml
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/ArjunaJTA/build.xml 2009-08-10 15:47:54 UTC (rev 28891)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/ArjunaJTA/build.xml 2009-08-10 17:16:19 UTC (rev 28892)
@@ -61,17 +61,10 @@
<format property="com.hp.mw.date" pattern="yyyy/MMM/dd HH:mm"/>
</tstamp>
- <condition property="JDK_VERSION_OK">
- <or>
- <equals arg1="${java.specification.version}" arg2="1.4"/>
- <equals arg1="${java.specification.version}" arg2="1.5"/>
- </or>
+ <condition property="SKIP_JDBC3">
+ <equals arg1="${java.specification.version}" arg2="1.6"/>
</condition>
- <fail unless="JDK_VERSION_OK">
- JBossTS JTA currently requires jdk1.4 or jdk1.5 to build.
- </fail>
-
<property name="com.hp.mw.installationdirectory" location="install"/>
<property name="com.hp.mw.sourceid" value="unknown"/>
<property name="com.hp.mw.version" value="unknown"/>
@@ -313,7 +306,7 @@
<ant dir="jta" target="com.hp.mw.ts.jta.install"/>
</target>
- <target name="com.hp.mwlabs.ts.product.jdbc.install">
+ <target name="com.hp.mwlabs.ts.product.jdbc.install" unless="SKIP_JDBC3">
<ant dir="jdbc" target="com.hp.mw.ts.jdbc.install"/>
</target>
Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/ArjunaJTS/build.xml
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/ArjunaJTS/build.xml 2009-08-10 15:47:54 UTC (rev 28891)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/ArjunaJTS/build.xml 2009-08-10 17:16:19 UTC (rev 28892)
@@ -65,17 +65,6 @@
<format property="com.hp.mw.date" pattern="yyyy/MMM/dd HH:mm"/>
</tstamp>
- <condition property="JDK_VERSION_OK">
- <or>
- <equals arg1="${java.specification.version}" arg2="1.4"/>
- <equals arg1="${java.specification.version}" arg2="1.5"/>
- </or>
- </condition>
-
- <fail unless="JDK_VERSION_OK">
- JBossTS JTS currently requires jdk1.4 or jdk1.5 to build.
- </fail>
-
<property name="com.hp.mw.installationdirectory" location="install"/>
<property name="com.hp.mw.sourceid" value="unknown"/>
<property name="com.hp.mw.version" value="unknown"/>
Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/build.xml
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/build.xml 2009-08-10 15:47:54 UTC (rev 28891)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/build.xml 2009-08-10 17:16:19 UTC (rev 28892)
@@ -106,17 +106,6 @@
<format property="com.arjuna.mw.date" pattern="yyyy/MMM/dd HH:mm"/>
</tstamp>
- <condition property="JDK_VERSION_OK">
- <or>
- <equals arg1="${java.specification.version}" arg2="1.5"/>
- </or>
- </condition>
-
- <!-- jaxws-api pre-req is not available in a jdk1.4 flavor -->
- <fail unless="JDK_VERSION_OK">
- JBossTS XTS currently requires jdk1.5 to build.
- </fail>
-
<property name="com.arjuna.mw.installationdirectory" location="xts-install"/>
<property name="com.arjuna.mw.sourceid" value="unknown"/>
<property name="com.arjuna.mw.version" value="unknown"/>
Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/build.xml
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/build.xml 2009-08-10 15:47:54 UTC (rev 28891)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/build.xml 2009-08-10 17:16:19 UTC (rev 28892)
@@ -227,17 +227,6 @@
<format property="com.hp.mw.date" pattern="yyyy/MMM/dd HH:mm"/>
</tstamp>
- <condition property="JDK_VERSION_OK">
- <or>
- <equals arg1="${java.specification.version}" arg2="1.4"/>
- <equals arg1="${java.specification.version}" arg2="1.5"/>
- </or>
- </condition>
-
- <fail unless="JDK_VERSION_OK">
- JBossTS currently requires jdk1.4 or jdk1.5 to build.
- </fail>
-
<!-- starting from 4.6 we change from ${com.hp.mw.ts.product.name.lowercase}-properties.xml
to a common name of jbossts-properties.xml to facilitate using the JTS binaries for either
JTA or JTS. The actual content of the config file is not affected. -->
Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/build.xml
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/build.xml 2009-08-10 15:47:54 UTC (rev 28891)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/build.xml 2009-08-10 17:16:19 UTC (rev 28892)
@@ -130,7 +130,16 @@
<fail unless="env.JBOSS_HOME" message="Please set the JBOSS_HOME environment variable" if="integration.build" />
- <available file="${driver.home}" property="have.dbdrivers" value="true"/>
+ <condition property="have.jdbc" value="true">
+ <and>
+ <available file="${driver.home}"/>
+ <not>
+ <equals arg1="${java.specification.version}" arg2="1.6"/>
+ </not>
+ </and>
+ </condition>
+
+
</target>
<target name="dist.as" depends="buildtype" if="dist.as">
@@ -183,7 +192,7 @@
<fileset file="tests/build/java.policy"/>
<fileset file="${org.jboss.jbossts.qa.server_manager_location}"/>
</copy>
- <copy todir="${org.jboss.jbossts.qa.dist.buildroot}/qa/lib/all_dbdrivers/" failonerror="${have.dbdrivers}">
+ <copy todir="${org.jboss.jbossts.qa.dist.buildroot}/qa/lib/all_dbdrivers/" failonerror="${have.jdbc}">
<fileset refid="oracle.drivers"/>
<fileset refid="mssql.drivers"/>
<fileset refid="pgsql.drivers"/>
Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/build-jta.xml
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/build-jta.xml 2009-08-10 15:47:54 UTC (rev 28891)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/build-jta.xml 2009-08-10 17:16:19 UTC (rev 28892)
@@ -94,6 +94,16 @@
<exclude name="**/astests/**"/>
<exclude name="**/JNDIManager.java"/>
+ <exclude name="**/Hammer*/**"/>
+ <exclude name="**/JDBC*/**"/>
+ <exclude name="**/CrashRecovery09*/**"/>
+ <exclude name="**/CrashRecovery10*/**"/>
+ <exclude name="**/CrashRecovery11*/**"/>
+ <exclude name="**/CrashRecovery13*/**"/>
+ <exclude name="**/EnlistDelistEnlist01*/**"/>
+ <exclude name="**/Issues0001*/**"/>
+ <exclude name="**/report.java"/>
+
<classpath>
<path refid="jta.classpath"/>
<pathelement location="${org.jboss.jbossts.qa.build.classes}"/>
@@ -102,11 +112,14 @@
</javac>
</target>
- <target name="jdbc-compile" depends="org.jboss.jbossts.qa.clean, org.jboss.jbossts.qa.init" if="have.dbdrivers">
+ <target name="jdbc-compile" depends="org.jboss.jbossts.qa.clean, org.jboss.jbossts.qa.init" if="have.jdbc">
<javac srcdir="${org.jboss.jbossts.qa.src}"
destdir="${org.jboss.jbossts.qa.build.classes}"
- debug="on" includes="**/JNDIManager.java">
+ debug="on">
+ <include name="**/JNDIManager.java"/>
+ <include name="**/org/jboss/jbossts/qa/JDBCLocals*/*.java"/>
+
<classpath>
<path refid="jta.classpath"/>
<pathelement location="${org.jboss.jbossts.qa.build.classes}"/>
Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/build-jts.xml
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/build-jts.xml 2009-08-10 15:47:54 UTC (rev 28891)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/build-jts.xml 2009-08-10 17:16:19 UTC (rev 28892)
@@ -252,6 +252,16 @@
<exclude name="**/${astest.dir}/**/*.java" />
<exclude name="**/JNDIManager.java"/>
+ <exclude name="**/Hammer*/**"/>
+ <exclude name="**/JDBC*/**"/>
+ <exclude name="**/CrashRecovery09*/**"/>
+ <exclude name="**/CrashRecovery10*/**"/>
+ <exclude name="**/CrashRecovery11*/**"/>
+ <exclude name="**/CrashRecovery13*/**"/>
+ <exclude name="**/EnlistDelistEnlist01*/**"/>
+ <exclude name="**/Issues0001*/**"/>
+ <exclude name="**/report.java"/>
+
<classpath>
<path refid="jts.classpath"/>
<pathelement location="${org.jboss.jbossts.qa.build.classes}"/>
@@ -260,11 +270,22 @@
</javac>
</target>
- <target name="jdbc-compile" depends="org.jboss.jbossts.qa.clean, org.jboss.jbossts.qa.init" if="have.dbdrivers">
+ <target name="jdbc-compile" depends="org.jboss.jbossts.qa.clean, org.jboss.jbossts.qa.init" if="have.jdbc">
<javac srcdir="${org.jboss.jbossts.qa.src}"
destdir="${org.jboss.jbossts.qa.build.classes}"
- debug="on" deprecation="on" includes="**/JNDIManager.java">
+ debug="on" deprecation="on">
+ <include name="**/JNDIManager.java"/>
+ <include name="**/Hammer*/**"/>
+ <include name="**/JDBC*/**"/>
+ <include name="**/CrashRecovery09*/**"/>
+ <include name="**/CrashRecovery10*/**"/>
+ <include name="**/CrashRecovery11*/**"/>
+ <include name="**/CrashRecovery13*/**"/>
+ <include name="**/EnlistDelistEnlist01*/**"/>
+ <include name="**/Issues0001*/**"/>
+ <include name="**/report.java"/>
+
<classpath>
<path refid="jts.classpath"/>
<pathelement location="${org.jboss.jbossts.qa.build.classes}"/>
More information about the jboss-svn-commits
mailing list