[Jboss-cvs] JBossAS SVN: r54907 - trunk/tools/etc/cruisecontrol/scripts

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

Author: rrajesh
Date: 2006-07-30 15:48:29 -0400 (Sun, 30 Jul 2006)
New Revision: 54907

Modified:
   trunk/tools/etc/cruisecontrol/scripts/build-jboss-common.xml
   trunk/tools/etc/cruisecontrol/scripts/cruisecontrol.properties
Log:
Updated jbossas builds to use jrockit

Modified: trunk/tools/etc/cruisecontrol/scripts/build-jboss-common.xml
===================================================================
--- trunk/tools/etc/cruisecontrol/scripts/build-jboss-common.xml	2006-07-30 19:40:19 UTC (rev 54906)
+++ trunk/tools/etc/cruisecontrol/scripts/build-jboss-common.xml	2006-07-30 19:48:29 UTC (rev 54907)
@@ -2,7 +2,6 @@
 
     <property name="jdk131" value="/opt/jdk1.3.1_13/"/>
     <property name="jdk142" value="/opt/j2sdk1.4.2_09/"/>
-    <property name="bea-jdk142" value="/opt/jrockit-j2sdk1.4.2_11"/>    
     <property name="jdk15" value="/opt/jdk1.5.0_03/"/>
     <property name="jdk16" value="/opt/i586/jdk1.6.0-beta/"/>
     <property name="java.home.dir" value="${jdk142}"/>
@@ -256,15 +255,15 @@
     </target>
     
     <target name="build-testsuite" depends="checkout">
-      <property name="jboss-3.2-testsuite-jdk" value="${jdk142}"/>
+      <property name="jboss-3.2-testsuite-jdk" value="${bea-jdk14}"/>
       <property name="jboss-4.0.4.SP-testsuite-jdk" value="${jdk142}"/>
-      <property name="jboss-4.0-testsuite-1.4-jdk" value="${bea-jdk142}"/>
-      <property name="jboss-4.0-testsuite-1.5-jdk" value="${jdk15}"/>
+      <property name="jboss-4.0-testsuite-1.4-jdk" value="${bea-jdk14}"/>
+      <property name="jboss-4.0-testsuite-1.5-jdk" value="${bea-jdk15}"/>
       <property name="jboss-4.0-testsuite-1.6-jdk" value="${jdk16}"/>
-      <property name="jboss-3.2-compatibility-matrix-jdk" value="${jdk142}"/>
-      <property name="jboss-4.0-compatibility-matrix-jdk" value="${jdk142}"/>
-      <property name="jboss-head-testsuite-1.4-jdk" value="${jdk142}"/>
-      <property name="jboss-head-testsuite-1.5-jdk" value="${jdk15}"/>
+      <property name="jboss-3.2-compatibility-matrix-jdk" value="${bea-jdk14}"/>
+      <property name="jboss-4.0-compatibility-matrix-jdk" value="${bea-jdk14}"/>
+      <property name="jboss-head-testsuite-1.4-jdk" value="${bea-jdk14}"/>
+      <property name="jboss-head-testsuite-1.5-jdk" value="${bea-jdk15}"/>
       <property name="jboss-head-testsuite-1.6-jdk" value="${jdk16}"/>
       <propertycopy name="jdk.version" from="${jboss.dir}-jdk"/>
 

Modified: trunk/tools/etc/cruisecontrol/scripts/cruisecontrol.properties
===================================================================
--- trunk/tools/etc/cruisecontrol/scripts/cruisecontrol.properties	2006-07-30 19:40:19 UTC (rev 54906)
+++ trunk/tools/etc/cruisecontrol/scripts/cruisecontrol.properties	2006-07-30 19:48:29 UTC (rev 54907)
@@ -6,4 +6,7 @@
 java15=/opt/jdk1.5.0_05
 java14=/opt/j2sdk1.4.2_09
 
+bea-jdk14=/opt/jrockit-j2sdk1.4.2_11
+bea-jdk15=/opt/jrockit-jdk1.5.0_06
+
 ant-ws=/opt/apache-ant-1.6.5-ws
\ No newline at end of file