[jboss-cvs] JBossAS SVN: r81660 - branches/JBPAPP_4_2_0_GA_CP/build.

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

Author: fnasser at redhat.com
Date: 2008-11-26 15:22:58 -0500 (Wed, 26 Nov 2008)
New Revision: 81660

Modified:
   branches/JBPAPP_4_2_0_GA_CP/build/build-thirdparty.xml
Log:
Add fp01 build switch

Modified: branches/JBPAPP_4_2_0_GA_CP/build/build-thirdparty.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/build/build-thirdparty.xml	2008-11-26 20:20:30 UTC (rev 81659)
+++ branches/JBPAPP_4_2_0_GA_CP/build/build-thirdparty.xml	2008-11-26 20:22:58 UTC (rev 81660)
@@ -29,11 +29,28 @@
   <setproxy proxyhost="<your.proxy.host>" proxyport="<your.proxy.port>"/>
   -->
 
+  <!-- Check if we need to build the fp01 -->
+  <condition property="build.fp01.bits" value="true">
+    <equals arg1="${build.fp01}" arg2="true"/>
+  </condition>
+
   <!-- Check if we need to build soa -->
   <condition property="build.soa.bits" value="true">
-    <equals arg1="${build.soa}" arg2="true"/>
+    <or>
+      <equals arg1="${build.soa}" arg2="true"/>
+      <equals arg1="${build.fp01}" arg2="true"/>
+    </or>
   </condition>
 
+  <!-- set Hibernate ANN and EM component versions depending on whether we are building the fp01 or not -->
+  <condition property="ann.version" value="3.3.1.GA-brew" else="3.2.1.GA_CP03-brew">
+    <isset property="build.fp01.bits"/>
+  </condition>
+
+  <condition property="em.version" value="3.3.2.GA-brew" else="3.2.1.GA_CP04-brew">
+    <isset property="build.fp01.bits"/>
+  </condition>
+
   <!-- set jbossws component name/version depending on whether we are building 4.2 or 4.3 -->
   <condition property="jbws.version" value="2.0.1.SP2_CP04-brew" else="1.2.1.GA_CP03-brew">
     <isset property="build.soa.bits"/>
@@ -87,8 +104,8 @@
     <componentref name="glassfish/jsf" version="1.2_09-brew"/>
     <componentref name="gnu-getopt" version="1.0.12-brew"/>
     <componentref name="hibernate" version="3.2.4.SP1_CP06-brew"/>
-    <componentref name="hibernate-annotations" version="3.2.1.GA_CP03-brew"/>
-    <componentref name="hibernate-entitymanager" version="3.2.1.GA_CP04-brew"/>
+    <componentref name="hibernate-annotations" version="${ann.version}"/>
+    <componentref name="hibernate-entitymanager" version="${em.version}"/>
     <componentref name="hsqldb" version="1.8.0.8.patch01-brew"/>
     <componentref name="jacorb" version="2.3.0jboss.patch5-brew"/>
     <componentref name="javassist" version="3.8.0.GA-brew"/>
@@ -129,7 +146,11 @@
     <componentref name="trove" version="1.0.2-brew"/>
     <componentref name="woodstox" version="3.1.1-brew"/>
     <componentref name="xdoclet" version="1.2.3-brew"/>
+    <!-- Note: JBoss Messaging is only needed by the 4.3 build -->
     <componentref name="jboss/messaging" version="1.4.0.SP3_CP04-brew"/>
+    <!-- Note: The ones below are only needed by the fp01 build -->
+    <componentref name="hibernate-commons-annotations" version="3.0.0.GA-brew"/>
+    <componentref name="hibernate-validator" version="3.0.0.GA-brew"/>
   </build>
 
   <synchronizeinfo/>