Apache/activemq
1
0
Fork 0
mirror of https://github.com/apache/activemq.git synced 2025-02-16 23:16:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

update clean plugin settings to remove more test stores.

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1492874 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Timothy A. Bish 2013-06-13 21:25:58 +00:00
parent 6ee4c66fc3
commit 8ab1934520
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
activemq-unit-tests/pom.xml
View File

@ -442,6 +442,9 @@
<filesets> <filesets>
<fileset> <fileset>
<directory>${basedir}/activemq-data</directory> <directory>${basedir}/activemq-data</directory>
<directory>${basedir}/KahaDB</directory>
<directory>${basedir}/LeveDB</directory>
<directory>${basedir}/shared</directory>
</fileset> </fileset>
</filesets> </filesets>
</configuration> </configuration>

16
activemq-unit-tests/src/test/java/org/apache/activemq/broker/ft/QueueMasterSlaveSingleUrlTest.java
View File

@ -35,10 +35,12 @@ public class QueueMasterSlaveSingleUrlTest extends QueueMasterSlaveTestSupport {
super.setUp(); super.setUp();
} }
@Override
protected ActiveMQConnectionFactory createConnectionFactory() throws Exception { protected ActiveMQConnectionFactory createConnectionFactory() throws Exception {
return new ActiveMQConnectionFactory(singleUriString); return new ActiveMQConnectionFactory(singleUriString);
} }
@Override
protected void createMaster() throws Exception { protected void createMaster() throws Exception {
master = new BrokerService(); master = new BrokerService();
master.setBrokerName("shared-master"); master.setBrokerName("shared-master");
@ -46,25 +48,27 @@ public class QueueMasterSlaveSingleUrlTest extends QueueMasterSlaveTestSupport {
master.addConnector(brokerUrl); master.addConnector(brokerUrl);
master.start(); master.start();
} }
private void configureSharedPersistenceAdapter(BrokerService broker) throws Exception { private void configureSharedPersistenceAdapter(BrokerService broker) throws Exception {
LevelDBStore adapter = new LevelDBStore(); LevelDBStore adapter = new LevelDBStore();
adapter.setDirectory(new File("shared")); adapter.setDirectory(new File("shared"));
broker.setPersistenceAdapter(adapter); broker.setPersistenceAdapter(adapter);
} }
protected void createSlave() throws Exception { @Override
protected void createSlave() throws Exception {
new Thread(new Runnable() { new Thread(new Runnable() {
@Override
public void run() { public void run() {
try { try {
BrokerService broker = new BrokerService(); BrokerService broker = new BrokerService();
broker.setBrokerName("shared-slave"); broker.setBrokerName("shared-slave");
configureSharedPersistenceAdapter(broker); configureSharedPersistenceAdapter(broker);
// add transport as a service so that it is bound on start, after store started // add transport as a service so that it is bound on start, after store started
final TransportConnector tConnector = new TransportConnector(); final TransportConnector tConnector = new TransportConnector();
tConnector.setUri(new URI(brokerUrl)); tConnector.setUri(new URI(brokerUrl));
broker.addConnector(tConnector); broker.addConnector(tConnector);
broker.start(); broker.start();
slave.set(broker); slave.set(broker);
slaveStarted.countDown(); slaveStarted.countDown();
@ -75,5 +79,5 @@ public class QueueMasterSlaveSingleUrlTest extends QueueMasterSlaveTestSupport {
}).start(); }).start();
} }
} }