[jboss-cvs] JBossAS SVN: r65426 - trunk/build.

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

Author: bstansberry at jboss.com
Date: 2007-09-15 22:37:54 -0400 (Sat, 15 Sep 2007)
New Revision: 65426

Modified:
   trunk/build/build-distr.xml
Log:
[JBAS-4709] Organize clustering artifacts in deploy
[JBAS-4711] Rename jgroups-multiplexer.sar to jgroups-channelfactory.sar

Modified: trunk/build/build-distr.xml
===================================================================
--- trunk/build/build-distr.xml	2007-09-16 02:36:40 UTC (rev 65425)
+++ trunk/build/build-distr.xml	2007-09-16 02:37:54 UTC (rev 65426)
@@ -141,13 +141,19 @@
     <copy todir="${install.server}/all/deploy" filtering="no">
       <fileset dir="${_module.output}/lib">
         <include name="ejb3-interceptors-aop.xml"/>
-        <include name="ejb3-entity-cache-beans.xml"/>
-        <include name="ejb3-clustered-sfsbcache-beans.xml"/>
         <include name="ejb3-timer-service.xml"/>
         <include name="ejb3-connectors-service.xml"/>
       </fileset>
     </copy>
 
+    <mkdir dir="${install.server}/all/deploy/cluster"/>
+    <copy todir="${install.server}/all/deploy/cluster" filtering="no">
+     <fileset dir="${_module.output}/lib">
+       <include name="ejb3-entity-cache-beans.xml"/>
+       <include name="ejb3-clustered-sfsbcache-beans.xml"/>
+     </fileset>
+   </copy>
+
     <copy todir="${install.server}/all/deployers" filtering="no">
       <fileset dir="${_module.output}/lib">
         <include name="ejb3.deployer/**"/>
@@ -991,16 +997,16 @@
     <!-- Default server config -->
 
     <!-- Copy the deployables -->
-    <mkdir dir="${install.server}/all/deploy"/>
-    <copy todir="${install.server}/all/deploy" filtering="no">
+    <mkdir dir="${install.server}/all/deploy/cluster"/>
+    <copy todir="${install.server}/all/deploy/cluster" filtering="no">
       <fileset dir="${_module.output}/etc">
         <include name="cluster-beans.xml"/>
         <include name="deploy-hasingleton-beans.xml"/>
       </fileset>
     </copy>
-    <mkdir dir="${install.server}/all/deploy/jgroups-multiplexer.sar"/>
-    <copy todir="${install.server}/all/deploy/jgroups-multiplexer.sar" filtering="no">
-      <fileset dir="${_module.output}/resources/jgroups-multiplexer.sar">
+    <mkdir dir="${install.server}/all/deploy/cluster/jgroups-channelfactory.sar"/>
+    <copy todir="${install.server}/all/deploy/cluster/jgroups-channelfactory.sar" filtering="no">
+      <fileset dir="${_module.output}/resources/jgroups-channelfactory.sar">
         <include name="**/*"/>
       </fileset>
     </copy>
@@ -1279,10 +1285,10 @@
         <include name="ROOT.war/**"/>
       </fileset>
     </copy>
-    <!-- Copy the tc6 clustering service elements -->
+    <!-- Copy the clustering service elements -->
     <copy todir="${install.server}/all/deploy">
       <fileset dir="${_module.output}/deploy">
-        <include name="jboss-web-cluster/**"/>
+        <include name="cluster/**"/>
       </fileset>
     </copy>