commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jo...@apache.org
Subject svn commit: r490420 - /jakarta/commons/proper/transaction/trunk/build.xml
Date Wed, 27 Dec 2006 00:54:19 GMT
Author: joerg
Date: Tue Dec 26 16:54:19 2006
New Revision: 490420

URL: http://svn.apache.org/viewvc?view=rev&rev=490420
Log:
bugfix: Both j2ee and servlet jar are JDK 1.4 compiled. So even checking for existance with
JDK 1.3 fails with UnsupportedClassVersionError.

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=490420&r1=490419&r2=490420
==============================================================================
--- jakarta/commons/proper/transaction/trunk/build.xml (original)
+++ jakarta/commons/proper/transaction/trunk/build.xml Tue Dec 26 16:54:19 2006
@@ -75,14 +75,24 @@
   <target name="detect" depends="detect.display,detect.fail" description="Display configuration
and conditional compilation flags"/>
 
   <target name="detect.display">
-    <available property="j2ee.present" classname="javax.resource.cci.Connection" classpath="${j2ee.jar}"/>
-    <available property="servlet.present" classname="javax.servlet.Servlet" classpath="${servlet.jar}"/>
     <condition property="jvm14.present">
       <or>
         <equals arg1="${ant.java.version}" arg2="1.4"/>
         <equals arg1="${ant.java.version}" arg2="1.5"/>
         <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>
     <echo message="+-------------------------------------------------------"/>
     <echo message="| Build environment for ${name} ${version}"/>



---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org


Mime
View raw message