[jboss-svn-commits] JBL Code SVN: r37139 - in labs/jbossesb/trunk/product: rosetta and 1 other directory.

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

Author: tcunning
Date: 2011-06-23 11:22:40 -0400 (Thu, 23 Jun 2011)
New Revision: 37139

Modified:
   labs/jbossesb/trunk/product/build.xml
   labs/jbossesb/trunk/product/rosetta/build.xml
Log:
JBESB-2760
Only compile AS6 bits if we are using java 1.6.


Modified: labs/jbossesb/trunk/product/build.xml
===================================================================
--- labs/jbossesb/trunk/product/build.xml	2011-06-23 15:02:50 UTC (rev 37138)
+++ labs/jbossesb/trunk/product/build.xml	2011-06-23 15:22:40 UTC (rev 37139)
@@ -100,6 +100,7 @@
 					<sysproperty key="ant.home" value="${ant.home}"/>
 					<sysproperty key="ant.library.dir" value="${ant.library.dir}"/>
 					<sysproperty key="org.jboss.esb.properties" value="${org.jboss.esb.properties}"/>
+					<sysproperty key="parent.java.version" value="${ant.java.version}"/>
 					<jvmarg line="${org.jboss.esb.jvmarg}"/>
 					<arg value="-cp"/>
 					<arg value="${junit.jar}"/>

Modified: labs/jbossesb/trunk/product/rosetta/build.xml
===================================================================
--- labs/jbossesb/trunk/product/rosetta/build.xml	2011-06-23 15:02:50 UTC (rev 37138)
+++ labs/jbossesb/trunk/product/rosetta/build.xml	2011-06-23 15:22:40 UTC (rev 37139)
@@ -7,7 +7,7 @@
     <property name="org.jboss.esb.rosetta.distrib.dir" location="${org.jboss.esb.internal.dest}/jbossesb"/>
     <property name="org.jboss.esb.rosetta.classes.dir" location="${org.jboss.esb.internal.dest}/classes/rosetta"/>
 
-    <property name="uddi.webservices.jar" value="uddi-ws-3.1.0-SNAPSHOT-jaxws21.jar"/>
+    <property name="uddi.webservices.jar" value="uddi-ws-3.1.0-SNAPSHOT.jar"/>
     <property name="juddi.v3.war" value="juddiv3-310-SNAPSHOT.war"/>
     <property name="juddi.v3.wsdl.location" value="org/jboss/internal/soa/esb/registry/client/wsdl"/>
     <property name="juddi.v3.wsdl.dir" location="juddiv3.wsdl"/>
@@ -91,11 +91,34 @@
 	<delete dir="${org.jboss.esb.rosetta.as6.build.dir}"/>
     </target>
 
-    <target name="org.jboss.esb.rosetta.compile" depends="generate-config-model, org.jboss.esb.rosetta.internal.compile, as6.compile, war">
+    <target name="org.jboss.esb.rosetta.compile" depends="generate-config-model, org.jboss.esb.rosetta.internal.compile, as6.java.check, as6.warning, as6.compile, war">
         <ant inheritAll="true" dir="tests" target="org.jboss.esb.rosetta.tests.compile"/>
     </target>
 
-    <target name="as6.dependencies.get">
+    <target name="as6.java.check">
+	<echo>ant.java.version = ${ant.java.version}</echo>
+	<echo>parent.java.version = ${parent.java.version}</echo>
+	<condition property="as6.java.version.check">	
+		<and>
+			<equals arg1="${ant.java.version}" arg2="1.6"/>
+			<equals arg1="${parent.java.version}" arg2="1.6"/>
+		</and> 
+	</condition>
+	<echo>as6.java.version.check=${as6.java.version.check}</echo>
+    </target>
+
+    <target name="as6.warning" unless="as6.java.version.check">
+	<echo/>
+	<echo/>
+	<echo>Will not build the AS6 parts since we have detected a 1.5 VM</echo>
+	<echo>The current VM is ${parent.java.version} and the runant VM is</echo>
+	<echo>${ant.java.version}.  Please use a 1.6 Java in order to compile</echo>
+	<echo>the AS6 parts.</echo>
+	<echo/>
+	<echo/>
+    </target>
+
+    <target name="as6.dependencies.get" if="as6.java.version.check">
         <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>
@@ -106,8 +129,7 @@
 
     </target>
     
-    <target name="as6.compile" depends="org.jboss.esb.rosetta.prepare, as6.dependencies.get"
-        description="Compile the AS6 deployer">
+    <target name="as6.compile" depends="org.jboss.esb.rosetta.prepare, as6.dependencies.get" if="as6.java.version.check" description="Compile the AS6 deployer">
         <javac
             destdir="${org.jboss.esb.rosetta.classes.dir}"
             classpathref="org.jboss.esb.rosetta.as6.classpath"