[jboss-cvs] JBossAS SVN: r59812 - branches/Branch_4_2/build.

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

Author: dimitris at jboss.org
Date: 2007-01-19 06:09:37 -0500 (Fri, 19 Jan 2007)
New Revision: 59812

Modified:
   branches/Branch_4_2/build/build-distr.xml
   branches/Branch_4_2/build/build.xml
Log:
JBAS-3398, rename jboss-web.sar, jboss-web.deployer so it starts earlier

Modified: branches/Branch_4_2/build/build-distr.xml
===================================================================
--- branches/Branch_4_2/build/build-distr.xml	2007-01-19 07:52:55 UTC (rev 59811)
+++ branches/Branch_4_2/build/build-distr.xml	2007-01-19 11:09:37 UTC (rev 59812)
@@ -930,14 +930,14 @@
       file="${jboss.web.lib}/servlet-api.jar"/>
 
     <!-- Copy the deployables -->
-    <mkdir dir="${install.server}/all/deploy/jboss-web.sar"/>
-    <copy todir="${install.server}/all/deploy/jboss-web.sar">
-      <fileset dir="${_module.output}/deploy/jboss-web.sar"
+    <mkdir dir="${install.server}/all/deploy/jboss-web.deployer"/>
+    <copy todir="${install.server}/all/deploy/jboss-web.deployer">
+      <fileset dir="${_module.output}/deploy/jboss-web.deployer"
                excludes="**/jboss-service.xml"/>
     </copy>
-    <copy tofile="${install.server}/all/deploy/jboss-web.sar/META-INF/jboss-service.xml"
+    <copy tofile="${install.server}/all/deploy/jboss-web.deployer/META-INF/jboss-service.xml"
       file="${project.root}/${_module.name}/src/resources/jboss-service-all.xml"/>
-    <copy todir="${install.server}/all/deploy/jboss-web.sar/META-INF"
+    <copy todir="${install.server}/all/deploy/jboss-web.deployer/META-INF"
       file="${project.root}/${_module.name}/src/resources/webserver-xmbean.xml"/>
 
     <!-- Copy the tc5 clustering service sar -->

Modified: branches/Branch_4_2/build/build.xml
===================================================================
--- branches/Branch_4_2/build/build.xml	2007-01-19 07:52:55 UTC (rev 59811)
+++ branches/Branch_4_2/build/build.xml	2007-01-19 11:09:37 UTC (rev 59812)
@@ -670,7 +670,7 @@
         <exclude name="deploy/jboss-web-cluster.sar/**"/>
       </fileset>
     </copy>
-     <copy tofile="${install.default}/deploy/jboss-web.sar/META-INF/jboss-service.xml"
+     <copy tofile="${install.default}/deploy/jboss-web.deployer/META-INF/jboss-service.xml"
       file="${project.root}/tomcat/src/resources/jboss-service.xml" overwrite="true"/>
      <copy todir="${install.default}/deploy/jms" overwrite="true">
        <fileset dir="${install.all}/deploy-hasingleton/jms" />