[jboss-svn-commits] JBL Code SVN: r10693 - in labs/jbosstm/trunk: ArjunaCore and 5 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Apr 2 11:14:37 EDT 2007
Author: jhalliday
Date: 2007-04-02 11:14:37 -0400 (Mon, 02 Apr 2007)
New Revision: 10693
Modified:
labs/jbosstm/trunk/ArjunaCore/build.xml
labs/jbosstm/trunk/ArjunaJTA/build.xml
labs/jbosstm/trunk/ArjunaJTS/build.xml
labs/jbosstm/trunk/ArjunaJTS/jtax/build.xml
labs/jbosstm/trunk/atsintegration/build.xml
labs/jbosstm/trunk/build.xml
labs/jbosstm/trunk/common/build.xml
Log:
Changes to support building on either 1.4 or 1.5
Modified: labs/jbosstm/trunk/ArjunaCore/build.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/build.xml 2007-04-02 12:56:51 UTC (rev 10692)
+++ labs/jbosstm/trunk/ArjunaCore/build.xml 2007-04-02 15:14:37 UTC (rev 10693)
@@ -1,20 +1,20 @@
<!--
JBoss, Home of Professional Open Source
- Copyright 2006, Red Hat Middleware LLC, and individual contributors
- as indicated by the @author tags.
+ Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ as indicated by the @author tags.
See the copyright.txt in the distribution for a
- full listing of individual contributors.
+ full listing of individual contributors.
This copyrighted material is made available to anyone wishing to use,
modify, copy, or redistribute it subject to the terms and conditions
of the GNU Lesser General Public License, v. 2.1.
- This program is distributed in the hope that it will be useful, but WITHOUT A
- WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ This program is distributed in the hope that it will be useful, but WITHOUT A
+ WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License,
v.2.1 along with this distribution; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
MA 02110-1301, USA.
-
+
(C) 2005-2006,
@author JBoss Inc.
-->
@@ -29,15 +29,15 @@
<!-- Load Build Properties File -->
<property file="${com.hp.mw.ts.properties}"/>
-
+
<!-- configure dependencies -->
<property name="com.arjuna.buildsystem.dir" location="${buildsystem.dir}"/>
<property name="com.arjuna.common.dir" location="${common.dir}"/>
-
+
<property name="com.arjuna.ext.dir" location="${ext.dir}"/>
<property name="com.arjuna.buildsystem.build.lib" location="${com.arjuna.buildsystem.dir}/build/lib"/>
-
+
<property name="com.arjuna.common.build.lib" location="${com.arjuna.common.dir}/build/lib"/>
<!-- Set external property defaults -->
@@ -57,17 +57,20 @@
<target name="com.hp.mwlabs.ts.product.init">
<!-- Define default build properties -->
<tstamp>
- <format property="com.hp.mw.date" pattern="yyyy/MMM/dd HH:mm"/>
- </tstamp>
+ <format property="com.hp.mw.date" pattern="yyyy/MMM/dd HH:mm"/>
+ </tstamp>
- <condition property="JDK_1.4">
- <equals arg1="${java.specification.version}" arg2="1.4"/>
+ <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_1.4">
- The ArjunaJTS build currently requires jdk1.4 to build.
- </fail>
-
+ <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"/>
@@ -86,7 +89,7 @@
<fileset dir="${com.arjuna.buildsystem.build.lib}"/>
</path>
<property name="com.arjuna.buildsystem.classpath" refid="com.arjuna.buildsystem.classpath"/>
-
+
<!-- Tests -->
<property name="com.hp.mw.ts.arjuna.tests.compile" value="${com.hp.mw.alltests.build}"/>
<property name="com.hp.mw.ts.txoj.tests.compile" value="${com.hp.mw.alltests.build}"/>
@@ -168,7 +171,15 @@
</fileset>
</module-to-product>
- <mkdir dir="${com.hp.mwlabs.ts.product.services.jar.dest}"/>
+ <touch file="built_using_java_${java.specification.version}"/>
+ <jar destfile="${com.hp.mwlabs.ts.product.jar.dest}/${com.hp.mw.ts.module.name.lowercase}.jar" update="true">
+ <fileset dir=".">
+ <filename name="built_using_java_${java.specification.version}"/>
+ </fileset>
+ </jar>
+ <delete file="built_using_java_${java.specification.version}"/>
+
+ <mkdir dir="${com.hp.mwlabs.ts.product.services.jar.dest}"/>
<module-to-product destdir="${com.hp.mwlabs.ts.product.services.jar.dest}" destfile="${com.hp.mw.ts.module.name.lowercase}-services">
<fileset dir=".">
<include name="arjuna/lib/services/*.jar"/>
@@ -239,7 +250,11 @@
if="com.hp.mwlabs.ts.build.core">
<echo message="Installation directory : ${com.hp.mwlabs.installationdirectory}"/>
+
<mkdir dir="${com.hp.mwlabs.installationdirectory}/lib"/>
+
+ <touch file="${com.hp.mwlabs.installationdirectory}/lib/built_using_java_${java.specification.version}"/>
+
<copy todir="${com.hp.mwlabs.installationdirectory}/lib">
<fileset dir="${com.hp.mwlabs.ts.product.jar.dest}" includes="${com.hp.mw.ts.module.name.lowercase}.jar"/>
</copy>
Modified: labs/jbosstm/trunk/ArjunaJTA/build.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/build.xml 2007-04-02 12:56:51 UTC (rev 10692)
+++ labs/jbosstm/trunk/ArjunaJTA/build.xml 2007-04-02 15:14:37 UTC (rev 10693)
@@ -1,20 +1,20 @@
<!--
JBoss, Home of Professional Open Source
- Copyright 2006, Red Hat Middleware LLC, and individual contributors
- as indicated by the @author tags.
+ Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ as indicated by the @author tags.
See the copyright.txt in the distribution for a
- full listing of individual contributors.
+ full listing of individual contributors.
This copyrighted material is made available to anyone wishing to use,
modify, copy, or redistribute it subject to the terms and conditions
of the GNU Lesser General Public License, v. 2.1.
- This program is distributed in the hope that it will be useful, but WITHOUT A
- WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ This program is distributed in the hope that it will be useful, but WITHOUT A
+ WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License,
v.2.1 along with this distribution; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
MA 02110-1301, USA.
-
+
(C) 2005-2006,
@author JBoss Inc.
-->
@@ -29,15 +29,15 @@
<!-- Load Build Properties File -->
<property file="${com.hp.mw.ts.properties}"/>
-
+
<!-- configure dependencies -->
<property name="com.arjuna.buildsystem.dir" location="${buildsystem.dir}"/>
<property name="com.arjuna.ext.dir" location="${ext.dir}"/>
<property name="com.arjuna.common.dir" location="${common.dir}"/>
<property name="com.arjuna.arjunacore.dir" location="${core.dir}"/>
-
+
<property name="com.arjuna.buildsystem.build.lib" location="${com.arjuna.buildsystem.dir}/build/lib"/>
-
+
<property name="com.arjuna.common.build.lib" location="${com.arjuna.common.dir}/build/lib"/>
<property name="com.arjuna.arjunacore.build.lib" location="${com.arjuna.arjunacore.dir}/lib"/>
@@ -61,14 +61,17 @@
<format property="com.hp.mw.date" pattern="yyyy/MMM/dd HH:mm"/>
</tstamp>
- <condition property="JDK_1.4">
- <equals arg1="${java.specification.version}" arg2="1.4"/>
+ <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_1.4">
- The ArjunaJTS build currently requires jdk1.4 to build.
- </fail>
-
+ <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"/>
@@ -82,7 +85,7 @@
<echo message="Builder = ${com.hp.mw.builder}"/>
<echo message="Date = ${com.hp.mw.date}"/>
<echo message="Notes = ${com.hp.mw.notes}"/>
-
+
<path id="com.arjuna.buildsystem.classpath">
<fileset dir="${com.arjuna.buildsystem.build.lib}"/>
</path>
@@ -166,6 +169,15 @@
<include name="jdbc/lib/*.jar"/>
</fileset>
</module-to-product>
+
+ <touch file="built_using_java_${java.specification.version}"/>
+ <jar destfile="${com.hp.mwlabs.ts.product.jar.dest}/${com.hp.mw.ts.module.name.lowercase}.jar" update="true">
+ <fileset dir=".">
+ <filename name="built_using_java_${java.specification.version}"/>
+ </fileset>
+ </jar>
+ <delete file="built_using_java_${java.specification.version}"/>
+
</target>
<target name="com.hp.mw.ts.product.tests.dojar">
@@ -227,6 +239,9 @@
<echo message="Installation directory : ${com.hp.mwlabs.installationdirectory}"/>
<mkdir dir="${com.hp.mwlabs.installationdirectory}/lib"/>
+
+ <touch file="${com.hp.mwlabs.installationdirectory}/lib/built_using_java_${java.specification.version}"/>
+
<copy todir="${com.hp.mwlabs.installationdirectory}/lib">
<fileset dir="${com.hp.mwlabs.ts.product.jar.dest}" includes="${com.hp.mw.ts.module.name.lowercase}.jar"/>
</copy>
Modified: labs/jbosstm/trunk/ArjunaJTS/build.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/build.xml 2007-04-02 12:56:51 UTC (rev 10692)
+++ labs/jbosstm/trunk/ArjunaJTS/build.xml 2007-04-02 15:14:37 UTC (rev 10693)
@@ -64,13 +64,16 @@
<format property="com.hp.mw.date" pattern="yyyy/MMM/dd HH:mm"/>
</tstamp>
- <condition property="JDK_1.4">
- <equals arg1="${java.specification.version}" arg2="1.4"/>
+ <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_1.4">
- The ArjunaJTS build currently requires jdk1.4 to build.
- </fail>
+ <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"/>
@@ -180,7 +183,21 @@
</fileset>
</module-to-product>
- <mkdir dir="${com.hp.mwlabs.ts.product.services.jar.dest}"/>
+ <touch file="built_using_java_${java.specification.version}"/>
+ <jar destfile="${com.hp.mwlabs.ts.product.jar.dest}/${com.hp.mw.ts.product.name.lowercase}.jar" update="true">
+ <fileset dir=".">
+ <filename name="built_using_java_${java.specification.version}"/>
+ </fileset>
+ </jar>
+ <!-- TODO: clean ugly hardcoding of orb name -->
+ <jar destfile="${com.hp.mwlabs.ts.product.jar.dest}/${com.hp.mw.ts.product.name.lowercase}-jacorb.jar" update="true">
+ <fileset dir=".">
+ <filename name="built_using_java_${java.specification.version}"/>
+ </fileset>
+ </jar>
+ <delete file="built_using_java_${java.specification.version}"/>
+
+ <mkdir dir="${com.hp.mwlabs.ts.product.services.jar.dest}"/>
<module-to-product destdir="${com.hp.mwlabs.ts.product.services.jar.dest}" destfile="${com.hp.mw.ts.product.name}-services" ignoreorb="true">
<fileset dir="${com.arjuna.arjunacore.dir}/services"/>
<fileset dir=".">
@@ -257,6 +274,9 @@
<echo message="Installation directory : ${com.hp.mwlabs.installationdirectory}"/>
<mkdir dir="${com.hp.mwlabs.installationdirectory}/lib"/>
+
+ <touch file="${com.hp.mwlabs.installationdirectory}/lib/built_using_java_${java.specification.version}"/>
+
<copy todir="${com.hp.mwlabs.installationdirectory}/lib">
<fileset dir="${com.hp.mwlabs.ts.product.jar.dest}" excludes="*-tests.jar"/>
</copy>
Modified: labs/jbosstm/trunk/ArjunaJTS/jtax/build.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jtax/build.xml 2007-04-02 12:56:51 UTC (rev 10692)
+++ labs/jbosstm/trunk/ArjunaJTS/jtax/build.xml 2007-04-02 15:14:37 UTC (rev 10693)
@@ -1,20 +1,20 @@
<!--
JBoss, Home of Professional Open Source
Copyright 2006, Red Hat Middleware LLC, and individual contributors
- as indicated by the @author tags.
- See the copyright.txt in the distribution for a full listing
+ as indicated by the @author tags.
+ See the copyright.txt in the distribution for a full listing
of individual contributors.
This copyrighted material is made available to anyone wishing to use,
modify, copy, or redistribute it subject to the terms and conditions
of the GNU General Public License, v. 2.0.
- This program is distributed in the hope that it will be useful, but WITHOUT A
- WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ This program is distributed in the hope that it will be useful, but WITHOUT A
+ WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
PARTICULAR PURPOSE. See the GNU General Public License for more details.
You should have received a copy of the GNU General Public License,
v. 2.0 along with this distribution; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
MA 02110-1301, USA.
-
+
(C) 2005-2006,
@author JBoss Inc.
-->
@@ -139,7 +139,7 @@
<!-- Default build target -->
<target name="com.hp.mw.ts.jtax.build" depends="com.hp.mwlabs.jtax.generateresourcebundle,com.hp.mw.ts.jtax.jar, com.hp.mwlabs.ts.jtax.tests.jar"/>
-
+
<!-- Compilation targets -->
<target name="com.hp.mw.ts.jtax.compile"
depends="com.hp.mwlabs.ts.jtax.compile,com.hp.mwlabs.jtax.generateresourcebundle">
@@ -288,6 +288,7 @@
<target name="com.hp.mw.ts.jtax.clean" depends="com.hp.mwlabs.ts.jtax.tests.clean">
<echo message="Cleaning module"/>
+ <delete dir="${com.hp.mwlabs.ts.jtax.buildroot}"/>
<delete dir="${com.hp.mwlabs.ts.jtax.destroot}"/>
<delete dir="${com.hp.mwlabs.ts.jtax.jar.dest}"/>
<delete dir="${com.hp.mwlabs.ts.jtax.tests.dest}"/>
Modified: labs/jbosstm/trunk/atsintegration/build.xml
===================================================================
--- labs/jbosstm/trunk/atsintegration/build.xml 2007-04-02 12:56:51 UTC (rev 10692)
+++ labs/jbosstm/trunk/atsintegration/build.xml 2007-04-02 15:14:37 UTC (rev 10693)
@@ -129,9 +129,11 @@
<property name="jboss.server.libs" value="${jboss.server.jta.libs}"/>
<!-- Classpath -->
<path id="build.classpath">
- <fileset dir="${com.arjuna.mwlabs.installation.lib.directory}"
- includes="**/*.jar"/>
- <filelist dir="${jboss.lib.dir}" files="${jboss.libs}"/>
+ <fileset dir="${com.arjuna.mwlabs.installation.lib.directory}">
+ <include name="**/*.jar"/>
+ <include name="**/*.zip"/>
+ </fileset>
+ <filelist dir="${jboss.lib.dir}" files="${jboss.libs}"/>
<filelist dir="${jboss.server.lib.dir}" files="${jboss.server.libs}"/>
</path>
<property name="build.classpath" refid="build.classpath"/>
@@ -160,8 +162,10 @@
classpathref="build.classpath"
/>
- </target>
+ <touch file="${com.arjuna.mwlabs.ts.jbossatx.dest}/built_using_java_${java.specification.version}"/>
+ </target>
+
<!-- Jar targets -->
<target name="com.arjuna.mw.ts.jbossatx.jar"
depends="com.arjuna.mwlabs.ts.jbossatx.service.compile">
Modified: labs/jbosstm/trunk/build.xml
===================================================================
--- labs/jbosstm/trunk/build.xml 2007-04-02 12:56:51 UTC (rev 10692)
+++ labs/jbosstm/trunk/build.xml 2007-04-02 15:14:37 UTC (rev 10693)
@@ -1,20 +1,20 @@
<!--
JBoss, Home of Professional Open Source
- Copyright 2006, Red Hat Middleware LLC, and individual contributors
- as indicated by the @author tags.
+ Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ as indicated by the @author tags.
See the copyright.txt in the distribution for a
- full listing of individual contributors.
+ full listing of individual contributors.
This copyrighted material is made available to anyone wishing to use,
modify, copy, or redistribute it subject to the terms and conditions
of the GNU Lesser General Public License, v. 2.1.
- This program is distributed in the hope that it will be useful, but WITHOUT A
- WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ This program is distributed in the hope that it will be useful, but WITHOUT A
+ WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License,
v.2.1 along with this distribution; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
MA 02110-1301, USA.
-
+
(C) 2005-2006,
@author JBoss Inc.
-->
@@ -30,7 +30,7 @@
<property name="jta.dir" location="ArjunaJTA"/>
<property name="jts.dir" location="ArjunaJTS"/>
<property name="integration.dir" location="atsintegration"/>
-
+
<property name="jboss.eula" location="JBossORG-EULA.txt"/>
<property name="jboss.libdir" location="jboss"/>
<property name="jboss.install.libdir" location="${com.hp.mw.installationdirectory}/jboss"/>
@@ -211,14 +211,17 @@
<format property="com.hp.mw.date" pattern="yyyy/MMM/dd HH:mm"/>
</tstamp>
- <condition property="JDK_1.4">
- <equals arg1="${java.specification.version}" arg2="1.4"/>
+ <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_1.4">
- The JBossJTS build currently requires jdk1.4 to build.
+ <fail unless="JDK_VERSION_OK">
+ JBossTS currently requires jdk1.4 or jdk1.5 to build.
</fail>
-
+
<property name="com.hp.mw.ts.product.propertyfile" value="${com.hp.mw.ts.product.name.lowercase}-properties.xml"/>
<property name="com.hp.mw.sourceid" value="unknown"/>
Modified: labs/jbosstm/trunk/common/build.xml
===================================================================
--- labs/jbosstm/trunk/common/build.xml 2007-04-02 12:56:51 UTC (rev 10692)
+++ labs/jbosstm/trunk/common/build.xml 2007-04-02 15:14:37 UTC (rev 10693)
@@ -162,7 +162,9 @@
</classpath>
</javac>
- <!-- Process the properties -->
+ <touch file="${com.hp.mwlabs.ts.common.dest}/built_using_java_${java.specification.version}"/>
+
+ <!-- Process the properties -->
<property name="property.file" value="common.properties"/>
<propertyfile file="${com.hp.mwlabs.ts.common.dest}/${property.file}">
<entry key="MODULE" value="${com.arjuna.common.modulename}"/>
More information about the jboss-svn-commits
mailing list