Index: trunk/config/bwbuild/jboss-postgresql/activemq-broker-config.xml
===================================================================
--- trunk/config/bwbuild/jboss-postgresql/activemq-broker-config.xml (revision 2976)
+++ trunk/config/bwbuild/jboss-postgresql/activemq-broker-config.xml (revision 2978)
@@ -198,4 +198,5 @@
       <transportConnector name="bedework" uri="tcp://localhost:61616" />
       <!--
+      <transportConnector name="bedework" uri="tcp://localhost:61616" />
         According to the book we shouldn't specify a discoveryUri - can lead to
         multiple activemq brokers eating each others messages, At the very least
Index: trunk/config/bwbuild/jboss-postgresql/activemq-jms-ds.xml
===================================================================
--- trunk/config/bwbuild/jboss-postgresql/activemq-jms-ds.xml (revision 2977)
+++ trunk/config/bwbuild/jboss-postgresql/activemq-jms-ds.xml (revision 2978)
@@ -14,7 +14,7 @@
       <connection-definition>javax.jms.QueueConnectionFactory</connection-definition>
 
-      <ServerUrl>failover:(tcp://primary:61616)</ServerUrl>
+      <ServerUrl>failover:(tcp://localhost:61616)?timeout=3000</ServerUrl>
       <!-- 
-      <ServerUrl>failover:(tcp://primary:61616)?timeout=3000</ServerUrl>
+      <ServerUrl>failover:(tcp://localhost:61616)?timeout=3000</ServerUrl>
       -->      
       <!--
@@ -34,5 +34,6 @@
       <rar-name>activemq-rar-5.3.0.rar</rar-name>
       <connection-definition>javax.jms.QueueConnectionFactory</connection-definition>
-      <ServerUrl>tcp://localhost:61616</ServerUrl>
+
+      <ServerUrl>failover:(tcp://localhost:61616)?timeout=3000</ServerUrl>
       <!--
       <UserName>sa</UserName>
@@ -51,5 +52,6 @@
       <rar-name>activemq-rar-5.3.0.rar</rar-name>
       <connection-definition>javax.jms.TopicConnectionFactory</connection-definition>
-      <ServerUrl>tcp://localhost:61616</ServerUrl>
+
+      <ServerUrl>failover:(tcp://localhost:61616)?timeout=3000</ServerUrl>
       <!--
       <UserName>sa</UserName>
Index: trunk/config/bwbuild/jboss-postgresql/sysevents.properties
===================================================================
--- trunk/config/bwbuild/jboss-postgresql/sysevents.properties (revision 2877)
+++ trunk/config/bwbuild/jboss-postgresql/sysevents.properties (revision 2978)
@@ -6,4 +6,5 @@
 # use the following property to configure the default connector
 java.naming.provider.url = tcp://localhost:61616?trace=true
+#java.naming.provider.url = vm://localhost?trace=true
 
 // Allows us to handle container differences