[jboss-cvs] JBossAS SVN: r99618 - branches/JBPAPP_5_0/build.

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

Author: fnasser at redhat.com
Date: 2010-01-19 16:28:40 -0500 (Tue, 19 Jan 2010)
New Revision: 99618

Modified:
   branches/JBPAPP_5_0/build/build.xml
Log:
JBPAPP-3230 - Define configuration changes for EWP (HA part)

Modified: branches/JBPAPP_5_0/build/build.xml
===================================================================
--- branches/JBPAPP_5_0/build/build.xml	2010-01-19 21:24:30 UTC (rev 99617)
+++ branches/JBPAPP_5_0/build/build.xml	2010-01-19 21:28:40 UTC (rev 99618)
@@ -832,15 +832,19 @@
 
     <!-- default is not clustered, do not deploy cluster stuff -->
     <delete dir="${install.default}/deploy/cluster"/>	
+    <delete dir="${install.default}/deploy-hasingleton"/>	
+    <delete dir="${install.default}/farm"/>	
     <delete file="${install.default}/lib/jgroups.jar"/>
     <delete file="${install.default}/lib/jbosscache-core.jar"/>
     <delete file="${install.default}/lib/jbosscache-pojo.jar"/>
     <delete file="${install.default}/lib/hibernate-jbosscache2.jar"/>
 
-    <!-- Nor use this config as the beanns will not work -->
+    <!-- Nor use this config as the beans will not work -->
     <delete file="${install.default}/deployers/clustering-deployer-jboss-beans.xml"/>	
-    <delete file="${install.production}/deployers/clustering-deployer-jboss-beans.xml"/>	
 
+    <!-- Nor use this config as it is not correct (see JBPAPP-3230) -->
+    <delete file="${install.production}/farm/cluster-examples-service.xml"/>	
+
     <!-- end delete client and deployers litter -->
 
     <!-- Change some defauls in the production config -->
@@ -1094,7 +1098,6 @@
         <exclude name="jbosscache-core.jar"/>
         <exclude name="jbosscache-pojo.jar"/>
         <exclude name="jgroups.jar"/>
-        <exclude name="jcip-annotations.jar"/>
         <exclude name="bsf.jar"/>
         <exclude name="bsh.jar"/>
         <exclude name="jboss-iiop.jar"/>
@@ -1113,14 +1116,11 @@
     <copy todir="${install.default}">
       <fileset dir="${install.all}">
         <exclude name="data/**"/>
-        <exclude name="deploy-hasingleton/**"/>
-        <exclude name="farm/**"/>
         <exclude name="lib/**"/>
         <exclude name="log/**"/>
         <exclude name="tmp/**"/>
         <exclude name="work/**"/>
         <exclude name="conf/jacorb.properties"/>
-        <exclude name="deploy/cluster/**"/>
         <exclude name="deploy/iiop-service.xml"/>
         <exclude name="deploy/deploy.last/**"/>
         <exclude name="deploy/httpha-invoker.sar/**"/>
@@ -1144,6 +1144,8 @@
       <fileset dir="${install.default}">
         <include name="conf/**"/>
         <include name="deploy/**"/>
+        <include name="deploy-hasingleton/**"/>
+        <include name="farm/**"/>
         <exclude name="deploy/messaging/**"/>
         <exclude name="deploy/management/**"/>
         <exclude name="deploy/sqlexception-service.xml"/>