Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix up xml tests, xbean in a required test dep. fix up ref to removed master/slave.xml 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1430380 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Gary Tully 2013-01-08 16:52:52 +00:00
parent 69ff572f88
commit 55fef7200a
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
activemq-core/pom.xml
View File

@ -177,11 +177,6 @@
</dependency> </dependency>
<!-- for XML parsing --> <!-- for XML parsing -->
<dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-spring</artifactId>
<optional>true</optional>
</dependency>
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId> <artifactId>spring-context</artifactId>
@ -204,6 +199,12 @@
<!-- =============================== --> <!-- =============================== -->
<!-- Testing Dependencies --> <!-- Testing Dependencies -->
<!-- =============================== --> <!-- =============================== -->
<dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-spring</artifactId>
<scope>test</scope>
</dependency>
<dependency> <dependency>
<groupId>${project.groupId}</groupId> <groupId>${project.groupId}</groupId>
<artifactId>activemq-broker</artifactId> <artifactId>activemq-broker</artifactId>

7
activemq-core/src/test/java/org/apache/activemq/transport/failover/ConnectionHangOnStartupTest.java
View File

@ -75,11 +75,11 @@ public class ConnectionHangOnStartupTest {
} }
protected String getSlaveXml() { protected String getSlaveXml() {
return "org/apache/activemq/broker/ft/slave.xml"; return "org/apache/activemq/broker/ft/sharedFileSlave.xml";
} }
protected String getMasterXml() { protected String getMasterXml() {
return "org/apache/activemq/broker/ft/master.xml"; return "org/apache/activemq/broker/ft/sharedFileMaster.xml";
} }
@Test(timeout=60000) @Test(timeout=60000)
@ -101,7 +101,8 @@ public class ConnectionHangOnStartupTest {
}; };
t.start(); t.start();
createMaster(); createMaster();
createSlave(); // slave will never start unless the master dies!
//createSlave();
conn.get().stop(); conn.get().stop();
} }