[jboss-cvs] JBossAS SVN: r76995 - in trunk/testsuite: imports and 1 other directory.

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

Author: bstansberry at jboss.com
Date: 2008-08-12 14:29:31 -0400 (Tue, 12 Aug 2008)
New Revision: 76995

Modified:
   trunk/testsuite/build.xml
   trunk/testsuite/imports/server-config.xml
Log:
[JBAS-5192] Update the ServiceBindingManager test infrastructure

Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml	2008-08-12 18:15:31 UTC (rev 76994)
+++ trunk/testsuite/build.xml	2008-08-12 18:29:31 UTC (rev 76995)
@@ -917,7 +917,7 @@
       <antcall target="tomcat-sso-clustered-tests"/>
       <antcall target="tomcat-webctx-tests"/>
       <antcall target="tomcat-federation-tests"/>
-      <!-- <antcall target="test-example-binding-manager"/> -->
+      <!-- <antcall target="tests-binding-manager"/> -->
       <antcall target="tests-jacc-security"/>
       <antcall target="tests-jacc-securitymgr"/>
 <!--
@@ -1139,16 +1139,16 @@
       <server:stop name="tomcat-federation"/>
    </target>
 
-   <target name="test-example-binding-manager"
-     description="Test the example binding configuration"
-    >
-     <create-all-cluster-node conf="binding-manager1" ports="ports-01"/>
-     <create-all-cluster-node conf="binding-manager2" ports="ports-02"/>
+   <target name="tests-binding-manager"
+     description="Test for clean startup with service binding manager">
+   	
+     <create-binding-manager-node conf="binding-manager1" recovery-port="4712"/>
+     <create-binding-manager-node conf="binding-manager2" recovery-port="4812"/>
      <server:start name="binding-manager1"/>
      <server:start name="binding-manager2"/>
 
      <run-junit junit.patternset="binding-manager.includes"
-	junit.configuration="binding-manager" />
+	            junit.configuration="binding-manager" />
 
      <server:stop name="binding-manager1"/>
      <server:stop name="binding-manager2"/>
@@ -3238,8 +3238,8 @@
       <server:stop name="tomcat-webctx"/>
 
       <!-- Test the example binding configuration -->
-      <create-all-cluster-node conf="binding-manager1" ports="ports-01"/>
-      <create-all-cluster-node conf="binding-manager2" ports="ports-02"/>
+      <create-binding-manager-node conf="binding-manager1" recovery-port="4712"/>
+      <create-binding-manager-node conf="binding-manager2" recovery-port="4812"/>
       <server:start name="binding-manager1"/>
       <server:start name="binding-manager2"/>
 

Modified: trunk/testsuite/imports/server-config.xml
===================================================================
--- trunk/testsuite/imports/server-config.xml	2008-08-12 18:15:31 UTC (rev 76994)
+++ trunk/testsuite/imports/server-config.xml	2008-08-12 18:29:31 UTC (rev 76995)
@@ -579,12 +579,22 @@
          <sysproperty key="jboss.messaging.ServerPeerID" value="1" /> 
       </server>
       <server name="binding-manager1" host="${node0}" httpPort="8180" rmiPort="1199">
+         <jvmarg value="-Xms128m" />
+         <jvmarg value="-Xmx512m" />
+         <jvmarg value="-XX:MaxPermSize=512m" />    
+         <sysproperty key="jboss.service.binding.set" value="ports-01" />
          <sysproperty key="java.net.preferIPv4Stack" value="true" />
-        <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
+         <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
+         <sysproperty key="jboss.messaging.ServerPeerID" value="0" /> 
       </server>
       <server name="binding-manager2" host="${node0}" httpPort="8280" rmiPort="1299">
+         <jvmarg value="-Xms128m" />
+         <jvmarg value="-Xmx512m" />
+         <jvmarg value="-XX:MaxPermSize=512m" />    
+         <sysproperty key="jboss.service.binding.set" value="ports-02" />
          <sysproperty key="java.net.preferIPv4Stack" value="true" />
-        <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
+         <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
+         <sysproperty key="jboss.messaging.ServerPeerID" value="1" /> 
       </server>
       <server name="jrmp-invoker" host="${node0}">
         <jvmarg value="-Xmx128m" />      
@@ -819,11 +829,14 @@
       </sequential>
    </macrodef>
 
-   <!-- A macro for creating a test cluster config that uses the ServiceBindingManager -->
-   <macrodef name="create-all-cluster-node"
+   <!-- A macro for creating a test cluster config that uses the ServiceBindingManager.
+        Once the transaction manager supports SBM, this can be removed and 
+        replaced with a simple call to create-cluster-node.
+   -->	
+   <macrodef name="create-binding-manager-node"
       description="Create a full cluster configuration">
       <attribute name="conf"/>
-      <attribute name="ports"/>
+      <attribute name="recovery-port"/>
       <sequential>
          <delete dir="${jboss.dist}/server/@{conf}" failonerror="false"/>
          <echo message="creating @{conf} config, jboss.dist=${jboss.dist}"/>
@@ -836,18 +849,10 @@
                <include name="deploy-hasingleton/**"/>
             </fileset>
          </copy>
-         <replace file="${jboss.dist}/server/@{conf}/conf/jboss-service.xml">
-            <replacetoken><![CDATA[<!-- @TESTSUITE_CLUSTER_CONFIG@ -->]]></replacetoken>
-            <replacevalue><![CDATA[
-   <mbean code="org.jboss.services.binding.ServiceBindingManager"
-     name="jboss.system:service=ServiceBindingManager">
-     <attribute name="ServerName">]]>@{ports}<![CDATA[</attribute>
-     <attribute name="StoreURL">../docs/examples/binding-manager/sample-bindings.xml</attribute>
-     <attribute name="StoreFactoryClassName">
-       org.jboss.services.binding.XMLServicesStoreFactory
-     </attribute>
-   </mbean>
-            ]]></replacevalue>
+      	 <!-- Modify the transaction manager config that SBM can't handle -->
+         <replace file="${jboss.dist}/server/@{conf}/conf/jbossjta-properties.xml">
+            <replacetoken>4712</replacetoken>
+            <replacevalue>@{recovery-port}</replacevalue>
          </replace>
       </sequential>
    </macrodef>