You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ta...@apache.org on 2015/01/29 20:26:06 UTC
[1/2] qpid-jms git commit: Only configure a KahaDBStore if we are
going to be persistent.
Repository: qpid-jms
Updated Branches:
refs/heads/master 11f3106a7 -> e16ea04a9
Only configure a KahaDBStore if we are going to be persistent.
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/e16ea04a
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/e16ea04a
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/e16ea04a
Branch: refs/heads/master
Commit: e16ea04a95224c598553fe74e58392854f525526
Parents: 7f11f1e
Author: Timothy Bish <ta...@gmail.com>
Authored: Thu Jan 29 14:25:02 2015 -0500
Committer: Timothy Bish <ta...@gmail.com>
Committed: Thu Jan 29 14:26:02 2015 -0500
----------------------------------------------------------------------
.../java/org/apache/qpid/jms/support/QpidJmsTestSupport.java | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/e16ea04a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/support/QpidJmsTestSupport.java
----------------------------------------------------------------------
diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/support/QpidJmsTestSupport.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/support/QpidJmsTestSupport.java
index 0e47992..5f7dc1e 100644
--- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/support/QpidJmsTestSupport.java
+++ b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/support/QpidJmsTestSupport.java
@@ -152,8 +152,6 @@ public class QpidJmsTestSupport {
}
protected BrokerService createBroker(String name, boolean deleteAllMessages, Map<String, Integer> portMap) throws Exception {
- KahaDBStore kaha = new KahaDBStore();
- kaha.setDirectory(new File(KAHADB_DIRECTORY + "/" + name));
BrokerService brokerService = new BrokerService();
brokerService.setBrokerName(name);
@@ -163,7 +161,11 @@ public class QpidJmsTestSupport {
brokerService.setUseJmx(true);
brokerService.getManagementContext().setCreateConnector(false);
brokerService.setDataDirectory("target/" + name);
- brokerService.setPersistenceAdapter(kaha);
+ if (isPersistent()) {
+ KahaDBStore kaha = new KahaDBStore();
+ kaha.setDirectory(new File(KAHADB_DIRECTORY + "/" + name));
+ brokerService.setPersistenceAdapter(kaha);
+ }
brokerService.setStoreOpenWireVersion(10);
configureBrokerPolicies(brokerService);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[2/2] qpid-jms git commit: Don't create the RMI server,
we only need the registry for AdminView
Posted by ta...@apache.org.
Don't create the RMI server, we only need the registry for AdminView
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/7f11f1e6
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/7f11f1e6
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/7f11f1e6
Branch: refs/heads/master
Commit: 7f11f1e6f3263049188c5b583d1429d863c5a6a4
Parents: 11f3106
Author: Timothy Bish <ta...@gmail.com>
Authored: Thu Jan 29 14:17:21 2015 -0500
Committer: Timothy Bish <ta...@gmail.com>
Committed: Thu Jan 29 14:26:02 2015 -0500
----------------------------------------------------------------------
.../test/java/org/apache/qpid/jms/support/QpidJmsTestSupport.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/7f11f1e6/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/support/QpidJmsTestSupport.java
----------------------------------------------------------------------
diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/support/QpidJmsTestSupport.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/support/QpidJmsTestSupport.java
index e1f07d5..0e47992 100644
--- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/support/QpidJmsTestSupport.java
+++ b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/support/QpidJmsTestSupport.java
@@ -161,6 +161,7 @@ public class QpidJmsTestSupport {
brokerService.setAdvisorySupport(isAdvisorySupport());
brokerService.setDeleteAllMessagesOnStartup(deleteAllMessages);
brokerService.setUseJmx(true);
+ brokerService.getManagementContext().setCreateConnector(false);
brokerService.setDataDirectory("target/" + name);
brokerService.setPersistenceAdapter(kaha);
brokerService.setStoreOpenWireVersion(10);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org