Updated Branches: refs/heads/trunk 4c38b03d1 -> 314b6e1fd
Use better test KahaDB location in configuration. Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/314b6e1f Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/314b6e1f Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/314b6e1f Branch: refs/heads/trunk Commit: 314b6e1fd703902cf1b3e14759dfd4db58ca7afa Parents: 4c38b03 Author: Timothy Bish <[email protected]> Authored: Mon Feb 10 18:23:02 2014 -0500 Committer: Timothy Bish <[email protected]> Committed: Mon Feb 10 18:23:02 2014 -0500 ---------------------------------------------------------------------- .../src/test/java/org/apache/activemq/bugs/AMQ5035Test.java | 1 + .../test/resources/org/apache/activemq/bugs/amq5035/activemq.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/314b6e1f/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ5035Test.java ---------------------------------------------------------------------- diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ5035Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ5035Test.java index a253bc8..13ddd30 100644 --- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ5035Test.java +++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ5035Test.java @@ -48,6 +48,7 @@ public class AMQ5035Test { public void setUp() throws Exception { brokerService = BrokerFactory.createBroker(xbean + confBase + "/activemq.xml"); connectionUri = brokerService.getTransportConnectorByScheme("tcp").getPublishableConnectString(); + brokerService.setDeleteAllMessagesOnStartup(true); brokerService.start(); brokerService.waitUntilStarted(); } http://git-wip-us.apache.org/repos/asf/activemq/blob/314b6e1f/activemq-unit-tests/src/test/resources/org/apache/activemq/bugs/amq5035/activemq.xml ---------------------------------------------------------------------- diff --git a/activemq-unit-tests/src/test/resources/org/apache/activemq/bugs/amq5035/activemq.xml b/activemq-unit-tests/src/test/resources/org/apache/activemq/bugs/amq5035/activemq.xml index 1bd5a42..28acca4 100644 --- a/activemq-unit-tests/src/test/resources/org/apache/activemq/bugs/amq5035/activemq.xml +++ b/activemq-unit-tests/src/test/resources/org/apache/activemq/bugs/amq5035/activemq.xml @@ -64,7 +64,7 @@ http://activemq.apache.org/persistence.html --> <persistenceAdapter> - <kahaDB directory="${activemq.data}/kahadb"/> + <kahaDB directory="target/activemq-data/KahaDB"/> </persistenceAdapter>
