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

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

Author: dimitris at jboss.org
Date: 2007-01-21 15:06:12 -0500 (Sun, 21 Jan 2007)
New Revision: 59892

Modified:
   branches/Branch_4_2/testsuite/imports/server-config.xml
Log:
tomcat -> JBossWeb

Modified: branches/Branch_4_2/testsuite/imports/server-config.xml
===================================================================
--- branches/Branch_4_2/testsuite/imports/server-config.xml	2007-01-21 20:05:26 UTC (rev 59891)
+++ branches/Branch_4_2/testsuite/imports/server-config.xml	2007-01-21 20:06:12 UTC (rev 59892)
@@ -433,7 +433,7 @@
                <include name="deploy/jboss-aop*.deployer/**"/>
                <include name="deploy/jbossjca-service.xml"/>
                <include name="deploy/jboss-jdbc-metadata.sar"/>
-               <include name="deploy/jbossweb-*.sar/**"/>
+               <include name="deploy/jboss-web.deployer/**"/>
                <include name="deploy/jmx-console.war/**"/>
                <include name="deploy/jmx-invoker-service.xml"/>
                <include name="deploy/cluster-service.xml"/>
@@ -442,7 +442,7 @@
                <include name="deploy/jboss-local-jdbc.rar"/>
                <include name="deploy/jboss-jca.sar"/>
                <include name="deploy/transaction-service.xml"/>
-               <include name="deploy/tc5-cluster.sar/**"/>
+               <include name="deploy/jboss-web-cluster.sar/**"/>
                <include name="deploy/deploy.last/farm-service.xml"/>
                <include name="deploy/jbossws*.sar/**"/>
             </fileset>
@@ -455,7 +455,7 @@
             <param name="host_" value="@{host}"/>
          </antcall>
          <antcall target="modify-cluster-stack">
-            <param name="file_" value="@{jboss.dist}/server/@{conf}/deploy/tc5-cluster.sar/META-INF/jboss-service.xml"/>
+            <param name="file_" value="@{jboss.dist}/server/@{conf}/deploy/jboss-web-cluster.sar/META-INF/jboss-service.xml"/>
             <param name="host_" value="@{host}"/>
          </antcall>
       </sequential>
@@ -504,7 +504,7 @@
 	      newconf-src="tomcat-sso-cluster">
 	      <patternset>
 	        <include name="conf/**"/>
-	        <include name="deploy/jbossweb*.sar/**"/>
+	        <include name="deploy/jboss-web.deployer/**"/>
 	        <include name="deploy/jmx-invoker-service.xml"/>
 	        <include name="deploy/ear-deployer.xml"/>
 	        <include name="deploy/ejb-deployer.xml"/>
@@ -513,7 +513,7 @@
 	        <include name="deploy/jboss-local-jdbc.rar"/>
 	        <include name="deploy/jboss-jdbc-metadata.sar"/>
 	        <include name="deploy/jboss-aop*.deployer/**"/>
-	        <include name="deploy/tc5-cluster.sar/**"/>
+	        <include name="deploy/jboss-web-cluster.sar/**"/>
 	        <include name="lib/**"/>
 	      </patternset>
 	    </create-config>
@@ -559,11 +559,11 @@
    	  <attribute name="useBuddyRepl" default="false"/>
       <sequential>
          <echo message="Configuring the Tomcat instance under @{jboss.dist}/server/@{conf} for REPL_SYNC and UseJK"/>
-         <!-- Switch from sync to async mode in tc5-cluster-service.xml -->
-         <replace file="@{jboss.dist}/server/@{conf}/deploy/tc5-cluster.sar/META-INF/jboss-service.xml"
+         <!-- Switch from sync to async mode in jboss-web-cluster-service.xml -->
+         <replace file="@{jboss.dist}/server/@{conf}/deploy/jboss-web-cluster.sar/META-INF/jboss-service.xml"
            token="&quot;CacheMode&quot;&gt;REPL_ASYNC" value="&quot;CacheMode&quot;&gt;REPL_SYNC"/>
-      	 <!-- Toggle buddy replication in tc5-cluster-service.xml -->
-      	 <replace file="@{jboss.dist}/server/@{conf}/deploy/tc5-cluster.sar/META-INF/jboss-service.xml"
+      	 <!-- Toggle buddy replication in jboss-web-cluster-service.xml -->
+      	 <replace file="@{jboss.dist}/server/@{conf}/deploy/jboss-web-cluster.sar/META-INF/jboss-service.xml"
       	   token="buddyReplicationEnabled&gt;false" value="buddyReplicationEnabled&gt;@{useBuddyRepl}"/>
       	 <!-- Added jvmRoute in server.xml -->
          <replace file="@{jboss.dist}/server/@{conf}/deploy/jboss-web.deployer/server.xml"
@@ -583,13 +583,13 @@
          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 tc5-cluster-service.xml -->
-         <replace file="@{jboss.dist}/server/@{conf}/deploy/tc5-cluster.sar/META-INF/jboss-service.xml"
+         <!-- Switch on marshalling in jboss-web-cluster-service.xml -->
+         <replace file="@{jboss.dist}/server/@{conf}/deploy/jboss-web-cluster.sar/META-INF/jboss-service.xml"
            token="&quot;UseMarshalling&quot;&gt;false" value="&quot;UseMarshalling&quot;&gt;true"/>
-         <replace file="@{jboss.dist}/server/@{conf}/deploy/tc5-cluster.sar/META-INF/jboss-service.xml"
+         <replace file="@{jboss.dist}/server/@{conf}/deploy/jboss-web-cluster.sar/META-INF/jboss-service.xml"
            token="&quot;UseRegionBasedMarshalling&quot;&gt;false" value="&quot;UseRegionBasedMarshalling&quot;&gt;true"/>
-         <!-- Inactivate on startup in tc5-cluster-service.xml -->
-         <replace file="@{jboss.dist}/server/@{conf}/deploy/tc5-cluster.sar/META-INF/jboss-service.xml"
+         <!-- Inactivate on startup in jboss-web-cluster-service.xml -->
+         <replace file="@{jboss.dist}/server/@{conf}/deploy/jboss-web-cluster.sar/META-INF/jboss-service.xml"
            token="&quot;InactiveOnStartup&quot;&gt;false" value="&quot;InactiveOnStartup&quot;&gt;true"/>
       </sequential>
    </macrodef>