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

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

Author: dimitris at jboss.org
Date: 2007-01-11 07:25:07 -0500 (Thu, 11 Jan 2007)
New Revision: 59522

Modified:
   branches/Branch_4_2/testsuite/imports/server-config.xml
Log:
try to fix the unified tests

Modified: branches/Branch_4_2/testsuite/imports/server-config.xml
===================================================================
--- branches/Branch_4_2/testsuite/imports/server-config.xml	2007-01-11 12:03:36 UTC (rev 59521)
+++ branches/Branch_4_2/testsuite/imports/server-config.xml	2007-01-11 12:25:07 UTC (rev 59522)
@@ -360,21 +360,21 @@
       <sequential>
          <delete dir="@{jboss.dist}/server/@{conf}" failonerror="false"/>
          <echo message="creating @{conf} config, jboss.dist=@{jboss.dist}"/>
-          <create-config baseconf="default" newconf="@{conf}">
-              <patternset>
-                <include name="**/*"/>
-              </patternset>
-          </create-config>
-
-      	<replace file="@{jboss.dist}/server/@{conf}/conf/standardjboss.xml">
-      		<replacefilter token="&lt;invoker-mbean&gt;jboss:service=invoker,type=jrmp&lt;/invoker-mbean&gt;" value="&lt;invoker-mbean&gt;jboss:service=invoker,type=unified&lt;/invoker-mbean&gt;"/>
-      		<replacefilter token="&lt;invoker-mbean&gt;jboss:service=invoker,type=jrmpha&lt;/invoker-mbean&gt;" value="&lt;invoker-mbean&gt;jboss:service=invoker,type=unifiedha&lt;/invoker-mbean&gt;"/>
-      	</replace>
-
-        <replace file="@{jboss.dist}/server/@{conf}/conf/jboss-service.xml">
-           <replacetoken><![CDATA[<!-- @TESTSUITE_CLUSTER_CONFIG@ -->]]></replacetoken>
-           <replacevalue><![CDATA[
-           	<!-- configuration generated for UnifiedInvokers tests -->
+         <create-config baseconf="default" newconf="@{conf}">
+            <patternset>
+               <include name="**/*"/>
+             </patternset>
+         </create-config>
+         <!-- Unified config is now the default in 4.2.x 
+      	 <replace file="@{jboss.dist}/server/@{conf}/conf/standardjboss.xml">
+            <replacefilter token="&lt;invoker-mbean&gt;jboss:service=invoker,type=jrmp&lt;/invoker-mbean&gt;" value="&lt;invoker-mbean&gt;jboss:service=invoker,type=unified&lt;/invoker-mbean&gt;"/>
+      	    <replacefilter token="&lt;invoker-mbean&gt;jboss:service=invoker,type=jrmpha&lt;/invoker-mbean&gt;" value="&lt;invoker-mbean&gt;jboss:service=invoker,type=unifiedha&lt;/invoker-mbean&gt;"/>
+      	 </replace>
+        
+         <replace file="@{jboss.dist}/server/@{conf}/conf/jboss-service.xml">
+            <replacetoken><![CDATA[<!- - @TESTSUITE_CLUSTER_CONFIG@ - ->]]></replacetoken>
+            <replacevalue><![CDATA[
+           	<!- - configuration generated for UnifiedInvokers tests - ->
             <mbean code="org.jboss.invocation.unified.server.UnifiedInvoker"
                name="jboss:service=invoker,type=unified">
                <depends>jboss:service=TransactionManager</depends>
@@ -406,8 +406,9 @@
                </attribute>
                <depends>jboss.remoting:service=NetworkRegistry</depends>
             </mbean>
-           ]]></replacevalue>
-        </replace>
+            ]]></replacevalue>
+         </replace>
+         -->
       </sequential>
    </macrodef>