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

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

Author: bstansberry at jboss.com
Date: 2007-03-16 17:54:50 -0400 (Fri, 16 Mar 2007)
New Revision: 61387

Modified:
   trunk/testsuite/imports/server-config.xml
Log:
Use "jboss-web" in names instead of "tc6"

Modified: trunk/testsuite/imports/server-config.xml
===================================================================
--- trunk/testsuite/imports/server-config.xml	2007-03-16 21:48:56 UTC (rev 61386)
+++ trunk/testsuite/imports/server-config.xml	2007-03-16 21:54:50 UTC (rev 61387)
@@ -642,10 +642,9 @@
          <copy todir="${jboss.dist}/server/@{conf}">
             <fileset dir="${jboss.dist}/server/all">
                <include name="conf/**"/>
-               <include name="lib/**"/>
                <include name="deployers/**"/>
-               <include name="deploy/ear-deployer.xml"/>
-               <include name="deploy/ejb-deployer.xml"/>
+               <include name="deploy/ROOT.war/**"/>
+               <include name="lib/**"/>
                <include name="deploy/jbossjca-service.xml"/>
                <include name="deploy/jboss-aop.deployer/**"/>
                <include name="deploy/jboss-jdbc-metadata.sar"/>
@@ -659,12 +658,9 @@
                <include name="deploy/jboss-local-jdbc.rar"/>
                <include name="deploy/jboss-jca.sar"/>
                <include name="deploy/transaction-service.xml"/>
-               <include name="deploy/tc6-cluster/**"/>
-               <include name="deploy/jboss-aop*.deployer/**"/>
+               <include name="deploy/jboss-web-cluster/**"/>
                <include name="deploy/ejb3-*.xml"/>
-               <include name="deploy/ejb3.deployer/**"/>
                <include name="deploy/jbossws*.sar/**"/>
-               <include name="deploy/ROOT.war/**"/>
                <include name="deploy/deploy.last/farm-beans.xml"/>
             </fileset>
         </copy>
@@ -732,17 +728,17 @@
 	      newconf-src="tomcat-sso-cluster">
 	      <patternset>
             <include name="conf/**"/>
+            <include name="deployers/**"/>
+            <include name="deploy/ROOT.war/**"/>
+            <include name="lib/**"/>
             <include name="deploy/jmx-invoker-service.xml"/>
             <include name="deploy/hsqldb-ds.xml"/>
             <include name="deploy/jbossjca-service.xml"/>
             <include name="deploy/jboss-local-jdbc.rar"/>
             <include name="deploy/jboss-jdbc-metadata.sar"/>
-            <include name="deploy/tc6-cluster/**"/>
+            <include name="deploy/jboss-web-cluster/**"/>
             <include name="deploy/jgroups-multiplexer.sar/**"/>
             <include name="deploy/jbossws*.sar/**"/>
-            <include name="deploy/ROOT.war/**"/>
-            <include name="deployers/**"/>
-            <include name="lib/**"/>
 	      </patternset>
 	    </create-config>
     </sequential>
@@ -869,11 +865,11 @@
  	  <attribute name="useBuddyRepl" default="false"/>
       <sequential>
          <echo message="Giving a name to the Tomcat instance under ${jboss.dist}/server/@{conf}"/>
-         <!-- Switch from sync to async mode in tc6-cluster/tc6-cluster-beans.xml -->
-         <replace file="${jboss.dist}/server/@{conf}/deploy/tc6-cluster/tc6-cluster-beans.xml"
+         <!-- Switch from sync to async mode in jboss-web-cluster/jboss-web-cluster-beans.xml -->
+         <replace file="${jboss.dist}/server/@{conf}/deploy/jboss-web-cluster/jboss-web-cluster-beans.xml"
            token="&quot;cacheModeString&quot;&gt;REPL_ASYNC" value="&quot;cacheModeString&quot;&gt;REPL_SYNC"/>
-      	 <!-- Toggle buddy replication in tc6-cluster-beans.xml -->
-      	 <replace file="${jboss.dist}/server/@{conf}/deploy/tc6-cluster/tc6-cluster-beans.xml"
+      	 <!-- Toggle buddy replication in jboss-web-cluster-beans.xml -->
+      	 <replace file="${jboss.dist}/server/@{conf}/deploy/jboss-web-cluster/jboss-web-cluster-beans.xml"
       	   token="&lt;property name=&quot;enabled&quot;&gt;true" value="&lt;property name=&quot;enabled&quot;&gt;@{useBuddyRepl}"/>
       	 <!-- Added jvmRoute in server.xml -->
          <replace file="${jboss.dist}/server/@{conf}/deployers/jbossweb.deployer/server.xml"
@@ -893,11 +889,11 @@
          description="The jboss dist root directory" />
       <sequential>
          <echo message="Configuring the Tomcat instance under ${jboss.dist}/server/@{conf} for FIELD granularity"/>
-         <!-- Switch on marshalling in tc6-cluster/tc6-cluster-beans.xml -->
-         <replace file="@{jboss.dist}/server/@{conf}/deploy/tc6-cluster/tc6-cluster-beans.xml"
+         <!-- Switch on marshalling in jboss-web-cluster/jboss-web-cluster-beans.xml -->
+         <replace file="@{jboss.dist}/server/@{conf}/deploy/jboss-web-cluster/jboss-web-cluster-beans.xml"
            token="&quot;useRegionBasedMarshalling&quot;&gt;false" value="&quot;useRegionBasedMarshalling&quot;&gt;true"/>
-         <!-- Inactivate on startup in tc6-cluster/tc6-cluster-beans.xml -->
-         <replace file="@{jboss.dist}/server/@{conf}/deploy/tc6-cluster/tc6-cluster-beans.xml"
+         <!-- Inactivate on startup in jboss-web-cluster/jboss-web-cluster-beans.xml -->
+         <replace file="@{jboss.dist}/server/@{conf}/deploy/jboss-web-cluster/jboss-web-cluster-beans.xml"
            token="&quot;inactiveOnStartup&quot;&gt;false" value="&quot;inactiveOnStartup&quot;&gt;true"/>
       </sequential>
    </macrodef>