[jboss-remoting-commits] JBoss Remoting SVN: r4030 - remoting2/branches/2.x.

[jboss-remoting-commits at lists.jboss.org]

Author: ron.sigal at jboss.com
Date: 2008-04-21 19:13:05 -0400 (Mon, 21 Apr 2008)
New Revision: 4030

Modified:
   remoting2/branches/2.x/build.xml
Log:
JBREM-920: Uses ${java.runtime.version} instead of ${ant.java.version}.

Modified: remoting2/branches/2.x/build.xml
===================================================================
--- remoting2/branches/2.x/build.xml	2008-04-20 04:52:55 UTC (rev 4029)
+++ remoting2/branches/2.x/build.xml	2008-04-21 23:13:05 UTC (rev 4030)
@@ -1464,16 +1464,16 @@
       </junit>
    </target>
 
-   <!-- check to see if running jdk1.5 -->
+   <!-- check to see if running jdk1.6/jdk1.5/jdk1.4 -->
    <target name="get-jvm">
       <condition property="isJDK6">
-         <equals arg1="${ant.java.version}" arg2="1.6"/>
+         <contains string="${java.runtime.version}" substring="1.6"/>
       </condition>      
       <condition property="isJDK5">
-         <equals arg1="${ant.java.version}" arg2="1.5"/>
+         <contains string="${java.runtime.version}" substring="1.5"/>
       </condition>
       <condition property="isJDK4">
-         <equals arg1="${ant.java.version}" arg2="1.4"/>
+         <contains string="${java.runtime.version}" substring="1.4"/>
       </condition>
    </target>