[jboss-svn-commits] JBL Code SVN: r37074 - labs/jbossesb/trunk/product/rosetta.

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

Author: tcunning
Date: 2011-06-08 06:42:42 -0400 (Wed, 08 Jun 2011)
New Revision: 37074

Modified:
   labs/jbossesb/trunk/product/rosetta/build.xml
Log:
JBESB-2760
Only compile AS6 if the JVM is 1.6 - the VFS JARs are causing class
file version errors.


Modified: labs/jbossesb/trunk/product/rosetta/build.xml
===================================================================
--- labs/jbossesb/trunk/product/rosetta/build.xml	2011-06-07 16:31:45 UTC (rev 37073)
+++ labs/jbossesb/trunk/product/rosetta/build.xml	2011-06-08 10:42:42 UTC (rev 37074)
@@ -95,7 +95,15 @@
         <ant inheritAll="true" dir="tests" target="org.jboss.esb.rosetta.tests.compile"/>
     </target>
 
-    <target name="as6.dependencies.get">
+    <target name="java.6.check">
+	<echo>Checking java.version....</echo>
+	<echo>ant.java.version=${ant.java.version}</echo>
+	<condition property="java6.set">
+            <equals arg1="${ant.java.version}" arg2="1.6" />
+        </condition>
+    </target>
+
+    <target name="as6.dependencies.get" depends="java.6.check" if="java6.set">
         <ant antfile="${org.jboss.esb.rosetta.as6.dir}/ivy-build.xml"/>
 	<property name="as6.jar.files" refid="org.jboss.esb.rosetta.as6.classpath"/>
         <echo>as6.jar.files=${as6.jar.files}</echo>
@@ -107,7 +115,7 @@
     </target>
     
     <target name="as6.compile" depends="org.jboss.esb.rosetta.prepare, as6.dependencies.get"
-        description="Compile the AS6 deployer">
+        description="Compile the AS6 deployer" if="java6.set">
         <javac
             destdir="${org.jboss.esb.rosetta.classes.dir}"
             classpathref="org.jboss.esb.rosetta.as6.classpath"