You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by jo...@apache.org on 2007/01/07 00:54:34 UTC
svn commit: r493604 - /jakarta/commons/proper/transaction/trunk/build.xml
Author: joerg
Date: Sat Jan 6 15:54:33 2007
New Revision: 493604
URL: http://svn.apache.org/viewvc?view=rev&rev=493604
Log:
finally the fixed build.xml
Modified:
jakarta/commons/proper/transaction/trunk/build.xml
Modified: jakarta/commons/proper/transaction/trunk/build.xml
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/transaction/trunk/build.xml?view=diff&rev=493604&r1=493603&r2=493604
==============================================================================
--- jakarta/commons/proper/transaction/trunk/build.xml (original)
+++ jakarta/commons/proper/transaction/trunk/build.xml Sat Jan 6 15:54:33 2007
@@ -34,6 +34,7 @@
<property name="src.dir" value="${basedir}/src"/>
<property name="java.dir" value="${src.dir}/java"/>
+ <property name="java14.dir" value="${src.dir}/java1.4"/>
<property name="test.dir" value="${src.dir}/test"/>
<property name="lib.dir" value="${basedir}/lib"/>
<property name="conf.dir" value="${src.dir}/conf"/>
@@ -57,12 +58,14 @@
<property name="dist.lib" value="${dist.dir}/lib"/>
<property name="dist.deploy" value="${dist.dir}/deploy"/>
- <property name="j2ee.jar" value="${lib.dir}/geronimo-spec-j2ee-1.4-rc4.jar"/>
- <property name="servlet.jar" value="${lib.dir}/geronimo-spec-servlet-2.4-rc4.jar"/>
+ <property name="jta.jar" value="${lib.dir}/geronimo-jta_1.0.1B_spec-1.1.jar"/>
+ <property name="jca.jar" value="${lib.dir}/geronimo-j2ee-connector_1.5_spec-1.1.jar"/>
+ <property name="servlet.jar" value="${lib.dir}/geronimo-servlet_2.4_spec-1.1.jar"/>
<path id="classpath">
<pathelement location="${build.classes}" />
- <pathelement location="${j2ee.jar}"/>
+ <pathelement location="${jta.jar}"/>
+ <pathelement location="${jca.jar}"/>
<pathelement location="${servlet.jar}"/>
<fileset dir="${lib.dir}"/>
</path>
@@ -82,18 +85,9 @@
<equals arg1="${ant.java.version}" arg2="1.6"/>
</or>
</condition>
- <condition property="j2ee.present">
- <and>
- <isset property="jvm14.present"/>
- <available property="j2ee.present" classname="javax.resource.cci.Connection" classpath="${j2ee.jar}"/>
- </and>
- </condition>
- <condition property="servlet.present">
- <and>
- <isset property="jvm14.present"/>
- <available property="j2ee.present" classname="javax.servlet.Servlet" classpath="${servlet.jar}"/>
- </and>
- </condition>
+ <available property="jta.present" classname="javax.transaction.Status" classpath="${jta.jar}"/>
+ <available property="jca.present" classname="javax.resource.cci.Connection" classpath="${jca.jar}"/>
+ <available property="servlet.present" classname="javax.servlet.Servlet" classpath="${servlet.jar}"/>
<echo message="+-------------------------------------------------------"/>
<echo message="| Build environment for ${name} ${version}"/>
<echo message="| "/>
@@ -103,35 +97,36 @@
<echo message="+-------------------------------------------------------"/>
<echo message=""/>
<echo message="Environment:"/>
- <echo message=" Java home ${java.home}"/>
- <echo message=" Java version ${ant.java.version}"/>
+ <echo message=" Java home ${java.home}"/>
+ <echo message=" Java version ${ant.java.version}"/>
<echo message=""/>
<echo message="Build options:"/>
- <echo message=" Generate debugging info ${compile.debug}"/>
- <echo message=" Display deprecation info ${compile.deprecation}"/>
- <echo message=" Optimize ${compile.optimize}"/>
+ <echo message=" Generate debugging info ${compile.debug}"/>
+ <echo message=" Display deprecation info ${compile.deprecation}"/>
+ <echo message=" Optimize ${compile.optimize}"/>
<echo message=""/>
<echo message="Directories:"/>
- <echo message=" Build directory ${build.dir}"/>
- <echo message=" Distribution directory ${dist.dir}"/>
- <echo message=" JBoss deploy directory ${jboss.deploy.dir}"/>
+ <echo message=" Build directory ${build.dir}"/>
+ <echo message=" Distribution directory ${dist.dir}"/>
+ <echo message=" JBoss deploy directory ${jboss.deploy.dir}"/>
<echo message=""/>
<echo message="Optional Libraries:"/>
- <echo message=" J2EE API ${j2ee.present}"/>
- <echo message=" Servlet API ${servlet.present}"/>
- <echo message=" JVM 14 ${jvm14.present}"/>
+ <echo message=" Java Transaction API ${jta.present}"/>
+ <echo message=" J2EE Connection Architecture API ${jca.present}"/>
+ <echo message=" Servlet API ${servlet.present}"/>
+ <echo message=" JVM 14 ${jvm14.present}"/>
<echo message=""/>
- <property name="required.present" value="true"/>
- <!--condition property="required.present">
+ <condition property="required.present">
<and>
- <equals arg1="${j2ee.present}" arg2="true"/>
+ <equals arg1="${jta.present}" arg2="true"/>
+ <equals arg1="${jca.present}" arg2="true"/>
<equals arg1="${servlet.present}" arg2="true"/>
</and>
- </condition-->
+ </condition>
</target>
<target name="detect.fail" unless="required.present">
- <fail message="Failed dependancy">
+ <fail message="Failed dependency">
One or more required libraries could not be found.
Please check your build.propertes file.
</fail>
@@ -177,15 +172,12 @@
debug="${compile.debug}"
deprecation="${compile.deprecation}"
optimize="${compile.optimize}" >
- <exclude name="**/jca/**"/>
- <exclude name="**/JDK14URLEncodeIdMapper.java" unless="jvm14.present"/>
- <exclude name="**/Jdk14Logger.java" unless="jvm14.present"/>
<src path="${java.dir}"/>
<classpath refid="classpath" />
</javac>
</target>
- <target name="build-test" depends="detect,build" if="jvm14.present">
+ <target name="build-test" depends="detect,build">
<javac destdir="${build.classes}"
target="${compile.target}"
debug="${compile.debug}"
@@ -196,19 +188,18 @@
</javac>
</target>
- <target name="build-jca" depends="build" if="j2ee.present">
+ <target name="build-jca" depends="build" if="jvm14.present">
<javac destdir="${build.classes}"
target="${compile.target}"
debug="${compile.debug}"
deprecation="${compile.deprecation}"
optimize="${compile.optimize}" >
- <include name="**/jca/**"/>
- <src path="${java.dir}"/>
+ <src path="${java14.dir}"/>
<classpath refid="classpath" />
</javac>
</target>
- <target name="build-map-example" depends="build-jca" if="servlet.present">
+ <target name="build-map-example" depends="build-jca" if="jvm14.present">
<javac destdir="${build.classes}"
target="${compile.target}"
debug="${compile.debug}"
@@ -349,7 +340,7 @@
author="true"
windowtitle="Commons Transaction API"
doctitle="Commons Transaction"
- bottom="Copyright © 2004 The Apache Software Foundation. All Rights Reserved."
+ bottom="Copyright © 2007 The Apache Software Foundation. All Rights Reserved."
classpathref="classpath">
<link href="http://java.sun.com/j2ee/sdk_1.3/techdocs/api/"/>
<link href="http://java.sun.com/j2se/1.4.2/docs/api/"/>
@@ -364,7 +355,7 @@
===================================================================
-->
- <target name="test" depends="detect, build-test" description="Exectutes JUnit tests" if="jvm14.present">
+ <target name="test" depends="detect, build-test" description="Exectutes JUnit tests">
<mkdir dir="tmp"/>
<junit printsummary="yes" haltonfailure="yes">
<classpath refid="classpath" />
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org