[jboss-cvs] JBossAS SVN: r58436 - trunk/build

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

Author: scott.stark at jboss.org
Date: 2006-11-15 23:25:49 -0500 (Wed, 15 Nov 2006)
New Revision: 58436

Modified:
   trunk/build/build-distr.xml
   trunk/build/build.xml
Log:
Drop the tomcat6 suffix from the jbossweb deployer


Modified: trunk/build/build-distr.xml
===================================================================
--- trunk/build/build-distr.xml	2006-11-16 04:18:12 UTC (rev 58435)
+++ trunk/build/build-distr.xml	2006-11-16 04:25:49 UTC (rev 58436)
@@ -1267,12 +1267,12 @@
        file="${jboss.web.lib}/el-api.jar" />
 
     <!-- Copy the deployables -->
-    <mkdir dir="${install.server}/all/deployers/jbossweb-tomcat6.deployer"/>
-    <copy todir="${install.server}/all/deployers/jbossweb-tomcat6.deployer">
-      <fileset dir="${_module.output}/deploy/jbossweb-tomcat6.deployer" />
+    <mkdir dir="${install.server}/all/deployers/jbossweb.deployer"/>
+    <copy todir="${install.server}/all/deployers/jbossweb.deployer">
+      <fileset dir="${_module.output}/deploy/jbossweb.deployer" />
     </copy>
     <!-- Use the all war deployers descriptor -->
-    <copy tofile="${install.server}/all/deployers/jbossweb-tomcat6.deployer/META-INF/war-deployers-beans.xml"
+    <copy tofile="${install.server}/all/deployers/jbossweb.deployer/META-INF/war-deployers-beans.xml"
       file="${project.root}/${_module.name}/src/resources/war-deployers-all-beans.xml" overwrite="true"/>
 
     <!-- Copy the ROOT.war -->

Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml	2006-11-16 04:18:12 UTC (rev 58435)
+++ trunk/build/build.xml	2006-11-16 04:25:49 UTC (rev 58436)
@@ -708,7 +708,7 @@
     <copy todir="${install.default.conf}"
           file="${project.root}/server/output/etc/conf/default/jndi.properties" overwrite="true"/>
     <!-- Update to the non-clustered beans descriptor -->      
-     <copy tofile="${install.default.deployers}/jbossweb-tomcat6.deployer/META-INF/war-deployers-beans.xml"
+     <copy tofile="${install.default.deployers}/jbossweb.deployer/META-INF/war-deployers-beans.xml"
           file="${project.root}/tomcat/src/resources/war-deployers-beans.xml" overwrite="true"/>
 <!--
     <copy todir="${install.default.deploy}">