[jboss-cvs] JBossAS SVN: r106185 - in branches/Branch_No_Multicast/testsuite: imports and 1 other directory.

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

Author: smarlow at redhat.com
Date: 2010-06-18 20:05:59 -0400 (Fri, 18 Jun 2010)
New Revision: 106185

Modified:
   branches/Branch_No_Multicast/testsuite/build.xml
   branches/Branch_No_Multicast/testsuite/imports/server-config.xml
Log:
 binding service is working with ec2

Modified: branches/Branch_No_Multicast/testsuite/build.xml
===================================================================
--- branches/Branch_No_Multicast/testsuite/build.xml	2010-06-18 21:58:08 UTC (rev 106184)
+++ branches/Branch_No_Multicast/testsuite/build.xml	2010-06-19 00:05:59 UTC (rev 106185)
@@ -1661,11 +1661,10 @@
 		<property name="conf" value="cluster-ec2"/>
 		<property name="baseconf" value="cluster-ec2"/>
 
-<!--    Need to figure out why AS doesn't startup correctly for binding manager test (error initializing S3_PING)
-        <antcall target="tests-binding-manager"/>
--->
         <antcall target="tests-jbossmessaging"/>
 
+        <antcall target="tests-binding-manager"/>
+
 <!-- Temporarily disabling, doesn't work with hornetq, need to conditionally run this target only for jboss messaging
       <antcall target="tests-jbossmessaging-cluster"/>
 -->

Modified: branches/Branch_No_Multicast/testsuite/imports/server-config.xml
===================================================================
--- branches/Branch_No_Multicast/testsuite/imports/server-config.xml	2010-06-18 21:58:08 UTC (rev 106184)
+++ branches/Branch_No_Multicast/testsuite/imports/server-config.xml	2010-06-19 00:05:59 UTC (rev 106185)
@@ -986,6 +986,11 @@
          <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
          <sysproperty key="jboss.messaging.ServerPeerID" value="0" /> 
          <sysproperty key="xb.builder.useUnorderedSequence" value="true" />
+         <!-- Allow this config to be used to test the cluster-ec2 profile -->
+         <sysproperty key="jboss.jgroups.s3_ping.access_key" value="${s3_ping.access_key}" />
+         <sysproperty key="jboss.jgroups.s3_ping.secret_access_key" value="${s3_ping.secret_access_key}" />
+         <sysproperty key="jboss.jgroups.s3_ping.bucket" value="${s3_ping.bucket}" />
+
       </server>
       <server name="binding-manager2" host="${node0}" httpPort="8280" rmiPort="1299">
          <jvmarg value="-Xms128m" />
@@ -997,6 +1002,10 @@
          <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
          <sysproperty key="jboss.messaging.ServerPeerID" value="1" /> 
          <sysproperty key="xb.builder.useUnorderedSequence" value="true" />
+         <!-- Allow this config to be used to test the cluster-ec2 profile -->
+         <sysproperty key="jboss.jgroups.s3_ping.access_key" value="${s3_ping.access_key}" />
+         <sysproperty key="jboss.jgroups.s3_ping.secret_access_key" value="${s3_ping.secret_access_key}" />
+         <sysproperty key="jboss.jgroups.s3_ping.bucket" value="${s3_ping.bucket}" />
       </server>
       <server name="jrmp-invoker" host="${node0}">
         <jvmarg value="-Xms128m" />    
@@ -1202,6 +1211,10 @@
            <sysproperty key="java.net.preferIPv4Stack" value="true" />
            <sysproperty key="xb.builder.useUnorderedSequence" value="true" />
            <sysproperty key="jboss.default.jgroups.stack" value="${jboss.default.jgroups.stack}" />
+           <!-- Allow this config to be used to test the cluster-ec2 profile -->
+           <sysproperty key="jboss.jgroups.s3_ping.access_key" value="${s3_ping.access_key}" />
+           <sysproperty key="jboss.jgroups.s3_ping.secret_access_key" value="${s3_ping.secret_access_key}" />
+           <sysproperty key="jboss.jgroups.s3_ping.bucket" value="${s3_ping.bucket}" />
       </server>
        	
       <server name="jbm-cluster2" host="${node1}">
@@ -1217,6 +1230,10 @@
     	   <sysproperty key="jboss.messaging.ServerPeerID" value="1" />
          <sysproperty key="xb.builder.useUnorderedSequence" value="true" />
          <sysproperty key="jboss.default.jgroups.stack" value="${jboss.default.jgroups.stack}" />
+         <!-- Allow this config to be used to test the cluster-ec2 profile -->
+         <sysproperty key="jboss.jgroups.s3_ping.access_key" value="${s3_ping.access_key}" />
+         <sysproperty key="jboss.jgroups.s3_ping.secret_access_key" value="${s3_ping.secret_access_key}" />
+         <sysproperty key="jboss.jgroups.s3_ping.bucket" value="${s3_ping.bucket}" />
       </server>
 
       <server name="web" host="${node0}" serverUrl="${node0.jndi.http.url}">