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

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

Author: bstansberry at jboss.com
Date: 2007-01-02 17:52:20 -0500 (Tue, 02 Jan 2007)
New Revision: 59294

Modified:
   trunk/testsuite/imports/server-config.xml
Log:
Move tc6-cluster elements out of a sar into a simple dir

Modified: trunk/testsuite/imports/server-config.xml
===================================================================
--- trunk/testsuite/imports/server-config.xml	2007-01-02 22:51:27 UTC (rev 59293)
+++ trunk/testsuite/imports/server-config.xml	2007-01-02 22:52:20 UTC (rev 59294)
@@ -447,7 +447,7 @@
                <include name="deploy/jboss-local-jdbc.rar"/>
                <include name="deploy/jboss-jca.sar"/>
                <include name="deploy/transaction-service.xml"/>
-               <include name="deploy/tc6-cluster.sar/**"/>
+               <include name="deploy/tc6-cluster/**"/>
                <include name="deploy/jboss-aop*.deployer/**"/>
                <include name="deploy/ejb3-*.xml"/>
                <include name="deploy/ejb3.deployer/**"/>
@@ -531,7 +531,7 @@
             <include name="deploy/jboss-jdbc-metadata.sar"/>
          	<!-- Whichever AOP Deployer they built -->
             <include name="deploy/jboss-aop*.deployer/**"/>
-            <include name="deploy/tc6-cluster.sar/**"/>
+            <include name="deploy/tc6-cluster/**"/>
             <include name="deploy/jgroups-multiplexer.sar/**"/>
             <include name="deploy/jbossws*.sar/**"/>
             <include name="deploy/ROOT.war/**"/>
@@ -663,11 +663,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.sar/META-INF/tc6-cluster-beans.xml -->
-         <replace file="${jboss.dist}/server/@{conf}/deploy/tc6-cluster.sar/META-INF/tc6-cluster-beans.xml"
+         <!-- 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"
            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.sar/META-INF/tc6-cluster-beans.xml"
+      	 <replace file="${jboss.dist}/server/@{conf}/deploy/tc6-cluster/tc6-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"
@@ -687,11 +687,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.sar/META-INF/tc6-cluster-beans.xml -->
-         <replace file="@{jboss.dist}/server/@{conf}/deploy/tc6-cluster.sar/META-INF/tc6-cluster-beans.xml"
+         <!-- Switch on marshalling in tc6-cluster/tc6-cluster-beans.xml -->
+         <replace file="@{jboss.dist}/server/@{conf}/deploy/tc6-cluster/tc6-cluster-beans.xml"
            token="&quot;useRegionBasedMarshalling&quot;&gt;false" value="&quot;useRegionBasedMarshalling&quot;&gt;true"/>
-         <!-- Inactivate on startup in tc6-cluster.sar/META-INF/tc6-cluster-beans.xml -->
-         <replace file="@{jboss.dist}/server/@{conf}/deploy/tc6-cluster.sar/META-INF/tc6-cluster-beans.xml"
+         <!-- Inactivate on startup in tc6-cluster/tc6-cluster-beans.xml -->
+         <replace file="@{jboss.dist}/server/@{conf}/deploy/tc6-cluster/tc6-cluster-beans.xml"
            token="&quot;inactiveOnStartup&quot;&gt;false" value="&quot;inactiveOnStartup&quot;&gt;true"/>
       </sequential>
    </macrodef>