[jboss-cvs] JBossAS SVN: r71400 - trunk/testsuite.

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

Author: bstansberry at jboss.com
Date: 2008-03-28 17:08:12 -0400 (Fri, 28 Mar 2008)
New Revision: 71400

Modified:
   trunk/testsuite/build.xml
Log:
Bring the tomcat-federation config in line with current AS structure

Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml	2008-03-28 21:07:05 UTC (rev 71399)
+++ trunk/testsuite/build.xml	2008-03-28 21:08:12 UTC (rev 71400)
@@ -1096,9 +1096,11 @@
          <patternset>
             <include name="conf/**"/>
             <include name="deployers/**"/>
+            <include name="deploy/**"/>
+            <include name="lib/**"/>
+            <!-- Previous broken and fragile detailed listing of deploy content
             <include name="deploy/jbossweb.sar/**"/>
             <include name="deploy/ROOT.war/**"/>
-            <include name="lib/**"/>
             <include name="deploy/jmx-console.war/**"/>
             <include name="deploy/jmx-invoker-service.xml"/>
             <include name="deploy/hsqldb-ds.xml"/>
@@ -1106,11 +1108,12 @@
             <include name="deploy/jboss-local-jdbc.rar"/>
             <include name="deploy/jboss-jdbc-metadata.sar"/>
             <include name="deploy/security*"/>
+            -->
          </patternset>
       </create-config>
-      <copy file="${source.resources}/web/federation/authext/jboss-service.xml" overwrite="true" todir="${jboss.dist}/server/tomcat-federation/deploy/jbossweb-tomcat6.sar/META-INF" />
-      <copy file="${source.resources}/web/federation/authext/server.xml" overwrite="true" todir="${jboss.dist}/server/tomcat-federation/deploy/jbossweb-tomcat6.sar" />
-      <copy file="${build.lib}/header-auth.jar" overwrite="true" todir="${jboss.dist}/server/tomcat-federation/deploy/jbossweb-tomcat6.sar" />
+      <copy file="${source.resources}/web/federation/authext/war-deployers-beans.xml" overwrite="true" todir="${jboss.dist}/server/tomcat-federation/deployers/jbossweb.deployer/META-INF" />
+      <copy file="${source.resources}/web/federation/authext/server.xml" overwrite="true" todir="${jboss.dist}/server/tomcat-federation/deploy/jbossweb.sar" />
+      <copy file="${build.lib}/header-auth.jar" overwrite="true" todir="${jboss.dist}/server/tomcat-federation/deploy/jbossweb.sar" />
       <server:start name="tomcat-federation"/>
       <run-junit junit.patternset="tc-federation.includes"
 	junit.configuration="tomcat-federation" />