activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gtu...@apache.org
Subject svn commit: r1430380 - in /activemq/trunk/activemq-core: pom.xml src/test/java/org/apache/activemq/transport/failover/ConnectionHangOnStartupTest.java
Date Tue, 08 Jan 2013 16:52:53 GMT
Author: gtully
Date: Tue Jan  8 16:52:52 2013
New Revision: 1430380

URL: http://svn.apache.org/viewvc?rev=1430380&view=rev
Log:
fix up xml tests, xbean in a required test dep. fix up ref to removed master/slave.xml

Modified:
    activemq/trunk/activemq-core/pom.xml
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/failover/ConnectionHangOnStartupTest.java

Modified: activemq/trunk/activemq-core/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/pom.xml?rev=1430380&r1=1430379&r2=1430380&view=diff
==============================================================================
--- activemq/trunk/activemq-core/pom.xml (original)
+++ activemq/trunk/activemq-core/pom.xml Tue Jan  8 16:52:52 2013
@@ -178,11 +178,6 @@
 
     <!-- for XML parsing -->
     <dependency>
-      <groupId>org.apache.xbean</groupId>
-      <artifactId>xbean-spring</artifactId>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
     </dependency>
@@ -205,6 +200,12 @@
     <!-- Testing Dependencies            -->
     <!-- =============================== -->
     <dependency>
+       <groupId>org.apache.xbean</groupId>
+       <artifactId>xbean-spring</artifactId>
+       <scope>test</scope>
+    </dependency>
+
+    <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>activemq-broker</artifactId>
       <type>test-jar</type>

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/failover/ConnectionHangOnStartupTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/failover/ConnectionHangOnStartupTest.java?rev=1430380&r1=1430379&r2=1430380&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/failover/ConnectionHangOnStartupTest.java
(original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/failover/ConnectionHangOnStartupTest.java
Tue Jan  8 16:52:52 2013
@@ -75,11 +75,11 @@ public class ConnectionHangOnStartupTest
     }
 
     protected String getSlaveXml() {
-        return "org/apache/activemq/broker/ft/slave.xml";
+        return "org/apache/activemq/broker/ft/sharedFileSlave.xml";
     }
 
     protected String getMasterXml() {
-        return "org/apache/activemq/broker/ft/master.xml";
+        return "org/apache/activemq/broker/ft/sharedFileMaster.xml";
     }
 
     @Test(timeout=60000)
@@ -101,7 +101,8 @@ public class ConnectionHangOnStartupTest
         };
         t.start();
         createMaster();
-        createSlave();
+        // slave will never start unless the master dies!
+        //createSlave();
 
         conn.get().stop();
     }



Mime
View raw message