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

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

Author: permaine
Date: 2009-06-01 17:31:46 -0400 (Mon, 01 Jun 2009)
New Revision: 89627

Modified:
   branches/JBPAPP_4_2_0_GA_CP/build/build-distr.xml
   branches/JBPAPP_4_2_0_GA_CP/build/build-thirdparty.xml
Log:
Remove fp01 build switch as the same build can be used for 4.3 CP and FP01

Modified: branches/JBPAPP_4_2_0_GA_CP/build/build-distr.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/build/build-distr.xml	2009-06-01 21:13:28 UTC (rev 89626)
+++ branches/JBPAPP_4_2_0_GA_CP/build/build-distr.xml	2009-06-01 21:31:46 UTC (rev 89627)
@@ -1441,6 +1441,10 @@
        </fileset>
        <!-- hibernate annotations -->
        <fileset dir="${hibernate.annotations.lib}" includes="*.jar"/>
+       <!-- hibernate commons annotations -->
+       <fileset dir="${hibernate.commons.annotations.lib}" includes="*.jar"/>
+       <!-- hibernate validator -->
+       <fileset dir="${hibernate.validator.lib}" includes="*.jar"/>
        <!-- antlr jar -->
        <fileset dir="${antlr.antlr.lib}" includes="antlr.jar"/>
        <!-- commons collections -->
@@ -1455,6 +1459,8 @@
     <copy todir="${install.client}" filtering="no">
       <fileset dir="${antlr.antlr.lib}" includes="antlr.jar" />
       <fileset dir="${hibernate.annotations.lib}" includes="*.jar"/>
+      <fileset dir="${hibernate.commons.annotations.lib}" includes="*.jar"/>
+      <fileset dir="${hibernate.validator.lib}" includes="*.jar"/>
     </copy>
 
   </target>

Modified: branches/JBPAPP_4_2_0_GA_CP/build/build-thirdparty.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/build/build-thirdparty.xml	2009-06-01 21:13:28 UTC (rev 89626)
+++ branches/JBPAPP_4_2_0_GA_CP/build/build-thirdparty.xml	2009-06-01 21:31:46 UTC (rev 89627)
@@ -29,28 +29,11 @@
   <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">
-    <or>
-      <equals arg1="${build.soa}" arg2="true"/>
-      <equals arg1="${build.fp01}" arg2="true"/>
-    </or>
+    <equals arg1="${build.soa}" arg2="true"/>
   </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_CP06-brew" else="1.2.1.GA_CP05-brew">
     <isset property="build.soa.bits"/>
@@ -104,8 +87,10 @@
     <componentref name="glassfish/jsf" version="1.2_10-brew"/>
     <componentref name="gnu-getopt" version="1.0.12-brew"/>
     <componentref name="hibernate" version="3.2.4.SP1_CP07-brew"/>
-    <componentref name="hibernate-annotations" version="${ann.version}"/>
-    <componentref name="hibernate-entitymanager" version="${em.version}"/>
+    <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-commons-annotations" version="3.0.0.GA-brew"/>
+    <componentref name="hibernate-validator" version="3.0.0.GA-brew"/>
     <componentref name="hsqldb" version="1.8.0.8.patch02-brew"/>
     <componentref name="jacorb" version="2.3.0jboss.patch6-brew"/>
     <componentref name="javassist" version="3.8.0.GA-brew"/>
@@ -148,9 +133,6 @@
     <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_CP08-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/>