You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ta...@apache.org on 2013/06/13 23:25:58 UTC
svn commit: r1492874 - in /activemq/trunk/activemq-unit-tests: pom.xml
src/test/java/org/apache/activemq/broker/ft/QueueMasterSlaveSingleUrlTest.java
Author: tabish
Date: Thu Jun 13 21:25:58 2013
New Revision: 1492874
URL: http://svn.apache.org/r1492874
Log:
update clean plugin settings to remove more test stores.
Modified:
activemq/trunk/activemq-unit-tests/pom.xml
activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/broker/ft/QueueMasterSlaveSingleUrlTest.java
Modified: activemq/trunk/activemq-unit-tests/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-unit-tests/pom.xml?rev=1492874&r1=1492873&r2=1492874&view=diff
==============================================================================
--- activemq/trunk/activemq-unit-tests/pom.xml (original)
+++ activemq/trunk/activemq-unit-tests/pom.xml Thu Jun 13 21:25:58 2013
@@ -442,6 +442,9 @@
<filesets>
<fileset>
<directory>${basedir}/activemq-data</directory>
+ <directory>${basedir}/KahaDB</directory>
+ <directory>${basedir}/LeveDB</directory>
+ <directory>${basedir}/shared</directory>
</fileset>
</filesets>
</configuration>
Modified: activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/broker/ft/QueueMasterSlaveSingleUrlTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/broker/ft/QueueMasterSlaveSingleUrlTest.java?rev=1492874&r1=1492873&r2=1492874&view=diff
==============================================================================
--- activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/broker/ft/QueueMasterSlaveSingleUrlTest.java (original)
+++ activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/broker/ft/QueueMasterSlaveSingleUrlTest.java Thu Jun 13 21:25:58 2013
@@ -35,10 +35,12 @@ public class QueueMasterSlaveSingleUrlTe
super.setUp();
}
+ @Override
protected ActiveMQConnectionFactory createConnectionFactory() throws Exception {
return new ActiveMQConnectionFactory(singleUriString);
}
+ @Override
protected void createMaster() throws Exception {
master = new BrokerService();
master.setBrokerName("shared-master");
@@ -46,25 +48,27 @@ public class QueueMasterSlaveSingleUrlTe
master.addConnector(brokerUrl);
master.start();
}
-
+
private void configureSharedPersistenceAdapter(BrokerService broker) throws Exception {
LevelDBStore adapter = new LevelDBStore();
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() {
+ @Override
public void run() {
try {
BrokerService broker = new BrokerService();
broker.setBrokerName("shared-slave");
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();
tConnector.setUri(new URI(brokerUrl));
broker.addConnector(tConnector);
-
+
broker.start();
slave.set(broker);
slaveStarted.countDown();
@@ -75,5 +79,5 @@ public class QueueMasterSlaveSingleUrlTe
}).start();
}
-
+
}