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

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

Author: remy.maucherat at jboss.com
Date: 2007-03-15 22:24:51 -0400 (Thu, 15 Mar 2007)
New Revision: 61356

Modified:
   trunk/build/build-distr.xml
   trunk/build/build.xml
Log:
- Port package renaming from JBoss 4.2.
- Switch deployment2 with deployment (the deployment2 class is now the old deployment class).
- Move the AOP marker to the new package (incompatible change).

Modified: trunk/build/build-distr.xml
===================================================================
--- trunk/build/build-distr.xml	2007-03-16 02:23:53 UTC (rev 61355)
+++ trunk/build/build-distr.xml	2007-03-16 02:24:51 UTC (rev 61356)
@@ -1264,7 +1264,7 @@
     <!-- Copy the deployables -->
     <mkdir dir="${install.server}/all/deployers/jbossweb.deployer"/>
     <copy todir="${install.server}/all/deployers/jbossweb.deployer">
-      <fileset dir="${_module.output}/deploy/jbossweb.deployer"/>
+      <fileset dir="${_module.output}/deploy/jboss-web.deployer"/>
     </copy>
     <!-- Use the all war deployers descriptor -->
     <copy tofile="${install.server}/all/deployers/jbossweb.deployer/META-INF/war-deployers-beans.xml"
@@ -1279,7 +1279,7 @@
     <!-- Copy the tc6 clustering service elements -->
     <copy todir="${install.server}/all/deploy">
       <fileset dir="${_module.output}/deploy">
-        <include name="tc6-cluster/**"/>
+        <include name="jboss-web-cluster/**"/>
       </fileset>
     </copy>
 

Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml	2007-03-16 02:23:53 UTC (rev 61355)
+++ trunk/build/build.xml	2007-03-16 02:24:51 UTC (rev 61356)
@@ -715,7 +715,7 @@
         <exclude name="deploy/ejb3-entity-cache-beans.xml"/>
         <exclude name="farm/**"/>
         <exclude name="deploy/juddi-service.sar/**"/>
-        <exclude name="deploy/tc6-cluster/**"/>
+        <exclude name="deploy/jboss-web-cluster/**"/>
         <exclude name="deploy/messaging/**"/>
         <exclude name="deploy/jms-ds.xml"/>
       </fileset>