[jboss-cvs] JBossAS SVN: r59815 - branches/Branch_4_2/testsuite.

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

Author: dimitris at jboss.org
Date: 2007-01-19 06:14:53 -0500 (Fri, 19 Jan 2007)
New Revision: 59815

Modified:
   branches/Branch_4_2/testsuite/build.xml
Log:
JBAS-3398, rename jbossweb-tomcat55.sar to jboss-web.deployer

Modified: branches/Branch_4_2/testsuite/build.xml
===================================================================
--- branches/Branch_4_2/testsuite/build.xml	2007-01-19 11:14:03 UTC (rev 59814)
+++ branches/Branch_4_2/testsuite/build.xml	2007-01-19 11:14:53 UTC (rev 59815)
@@ -878,9 +878,9 @@
       <patternset>
         <include name="conf/**"/>
         <include name="lib/**"/>
-        <include name="deploy/jbossweb-tomcat55.sar/**"/>
+        <include name="deploy/jboss-web.deployer/**"/>
         <include name="deploy/jmx-invoker-service.xml"/>
-        <exclude name="deploy/jbossweb-tomcat55.sar/ROOT.war/**"/>
+        <exclude name="deploy/jboss-web.deployer/ROOT.war/**"/>
       </patternset>
     </create-config>
     <property name="netboot.deploy" value="${jboss.dist}/server/netboot/deploy/ROOT.war"/>
@@ -893,7 +893,7 @@
         <include name="conf/**"/>
         <include name="lib/**"/>
         <include name="deploy/**"/>
-        <exclude name="deploy/jbossweb-tomcat55.sar/**"/>
+        <exclude name="deploy/jboss-web.deployer/**"/>
         <exclude name="deploy/http-invoker.sar/**"/>
         <exclude name="deploy/jmx-console.war/**"/>
         <exclude name="deploy/jboss-aop.deployer/**"/>
@@ -903,7 +903,7 @@
         <exclude name="deploy/jms/jbossmq-httpil.sar/**"/>
       </fileset>
     </copy>
-    <jar basedir="${jboss.dist}/server/default/deploy/jbossweb-tomcat55.sar" destfile="${netboot.deploy}/server/default/deploy/jbossweb-tomcat55.sar"/>
+    <jar basedir="${jboss.dist}/server/default/deploy/jboss-web.deployer" destfile="${netboot.deploy}/server/default/deploy/jboss-web.deployer"/>
     <start-jboss conf="netboot"/>
     <wait-on-host port="18080"/>
     <!-- Start the netboot instance -->
@@ -1280,8 +1280,8 @@
       </patternset>
     </create-config>
     <copy file="${source.resources}/web/federation/authext/jboss-service.xml" overwrite="true"
-      todir="${jboss.dist}/server/tomcat-federation/deploy/jbossweb-tomcat55.sar/META-INF"/>
-    <copy file="${build.lib}/header-auth.jar" overwrite="true" todir="${jboss.dist}/server/tomcat-federation/deploy/jbossweb-tomcat55.sar"/>
+      todir="${jboss.dist}/server/tomcat-federation/deploy/jboss-web.deployer/META-INF"/>
+    <copy file="${build.lib}/header-auth.jar" overwrite="true" todir="${jboss.dist}/server/tomcat-federation/deploy/jboss-web.deployer"/>
     <server:start name="tomcat-federation"/>
     <run-junit junit.patternset="tc-federation.includes" junit.configuration="tomcat-federation"/>
     <server:stop name="tomcat-federation"/>
@@ -1307,7 +1307,7 @@
     <create-config baseconf="default" newconf="deployment-service">
       <patternset>
         <include name="conf/**"/>
-        <include name="deploy/jbossweb-tomcat55.sar/**"/>
+        <include name="deploy/jboss-web.deployer/**"/>
         <include name="deploy/jmx-console.war/**"/>
         <include name="deploy/jbossjca-service.xml"/>
         <include name="deploy/jboss-local-jdbc.rar"/>
@@ -1670,8 +1670,8 @@
       </patternset>
     </create-config>
     <!-- -->
-    <unzip dest="${jboss.dist}/server/jacc-securitymgr/deploy/jbossweb-tomcat55.sar">
-      <fileset dir="${jboss.dist}/server/jacc-securitymgr/deploy/jbossweb-tomcat55.sar">
+    <unzip dest="${jboss.dist}/server/jacc-securitymgr/deploy/jboss-web.deployer">
+      <fileset dir="${jboss.dist}/server/jacc-securitymgr/deploy/jboss-web.deployer">
         <patternset>
           <exclude name="META-INF/*"/>
         </patternset>
@@ -1732,8 +1732,8 @@
       </patternset>
     </create-config>
     <!-- -->
-    <unzip dest="${jboss.dist}/server/jacc-security-external/deploy/jbossweb-tomcat55.sar">
-      <fileset dir="${jboss.dist}/server/jacc-security-external/deploy/jbossweb-tomcat55.sar">
+    <unzip dest="${jboss.dist}/server/jacc-security-external/deploy/jboss-web.deployer">
+      <fileset dir="${jboss.dist}/server/jacc-security-external/deploy/jboss-web.deployer">
         <patternset>
           <exclude name="META-INF/*"/>
         </patternset>
@@ -1744,7 +1744,7 @@
     <!-- Copy the jacc securityconstraint provider jar -->
     <copy todir="${jboss.dist}/server/jacc-security-external/lib" file="${build.lib}/jacc-securityconstraint.jar"/>
     <!-- Append extra attributes to the JACCAuthorizationRealm -->
-    <replace file="${jboss.dist}/server/jacc-security-external/deploy/jbossweb-tomcat55.sar/server.xml">
+    <replace file="${jboss.dist}/server/jacc-security-external/deploy/jboss-web.deployer/server.xml">
       <replacetoken><![CDATA[className="org.jboss.web.tomcat.security.JaccAuthorizationRealm"]]>
       </replacetoken>
       <replacevalue>