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

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

Author: bstansberry at jboss.com
Date: 2007-09-15 22:41:54 -0400 (Sat, 15 Sep 2007)
New Revision: 65427

Modified:
   trunk/testsuite/imports/server-config.xml
Log:
[JBAS-4709] Organize clustering artifacts in deploy

Modified: trunk/testsuite/imports/server-config.xml
===================================================================
--- trunk/testsuite/imports/server-config.xml	2007-09-16 02:37:54 UTC (rev 65426)
+++ trunk/testsuite/imports/server-config.xml	2007-09-16 02:41:54 UTC (rev 65427)
@@ -759,7 +759,7 @@
             <param name="file_" value="${jboss.dist}/server/@{conf}/deploy/deploy.last/farm-beans.xml"/>
         </antcall>
         <antcall target="modify-ejb3-repl_sync">
-             <param name="file_" value="${jboss.dist}/server/@{conf}/deploy/ejb3-clustered-sfsbcache-beans.xml"/>
+             <param name="file_" value="${jboss.dist}/server/@{conf}/deploy/cluster/ejb3-clustered-sfsbcache-beans.xml"/>
         </antcall>
       </sequential>
    </macrodef>
@@ -988,11 +988,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 jboss-web-cluster/jboss-web-cluster-beans.xml -->
-         <replace file="${jboss.dist}/server/@{conf}/deploy/jboss-web-cluster/jboss-web-cluster-beans.xml"
+         <!-- Switch from sync to async mode in cluster/jbossweb-cluster-beans.xml -->
+         <replace file="${jboss.dist}/server/@{conf}/deploy/cluster/jbossweb-cluster-beans.xml"
            token="&quot;cacheModeString&quot;&gt;REPL_ASYNC" value="&quot;cacheModeString&quot;&gt;REPL_SYNC"/>
-      	 <!-- Toggle buddy replication in jboss-web-cluster-beans.xml -->
-      	 <replace file="${jboss.dist}/server/@{conf}/deploy/jboss-web-cluster/jboss-web-cluster-beans.xml"
+      	 <!-- Toggle buddy replication in jbossweb-cluster-beans.xml -->
+      	 <replace file="${jboss.dist}/server/@{conf}/deploy/cluster/jbossweb-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"
@@ -1012,11 +1012,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 jboss-web-cluster/jboss-web-cluster-beans.xml -->
-         <replace file="@{jboss.dist}/server/@{conf}/deploy/jboss-web-cluster/jboss-web-cluster-beans.xml"
+         <!-- Switch on marshalling in cluster/jbossweb-cluster-beans.xml -->
+         <replace file="@{jboss.dist}/server/@{conf}/deploy/cluster/jbossweb-cluster-beans.xml"
            token="&quot;useRegionBasedMarshalling&quot;&gt;false" value="&quot;useRegionBasedMarshalling&quot;&gt;true"/>
-         <!-- 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"
+         <!-- Inactivate on startup in cluster/jbossweb-cluster-beans.xml -->
+         <replace file="@{jboss.dist}/server/@{conf}/deploy/cluster/jbossweb-cluster-beans.xml"
            token="&quot;inactiveOnStartup&quot;&gt;false" value="&quot;inactiveOnStartup&quot;&gt;true"/>
       </sequential>
    </macrodef>