You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2017/07/30 19:49:16 UTC
[5/6] qpid-broker-j git commit: NO-JIRA: Switch JSON split store
profiles to test BDB rather than Derby
NO-JIRA: Switch JSON split store profiles to test BDB rather than Derby
Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/90e22516
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/90e22516
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/90e22516
Branch: refs/heads/master
Commit: 90e225163ff3d60019c972e8763bf9433d4d698b
Parents: 47ac14c
Author: Keith Wall <kw...@apache.org>
Authored: Fri Jul 28 14:35:27 2017 +0100
Committer: Keith Wall <kw...@apache.org>
Committed: Sun Jul 30 18:07:22 2017 +0100
----------------------------------------------------------------------
pom.xml | 16 ++++++++--------
.../qpid/client/TemporaryQueuePrefixTest.java | 8 --------
2 files changed, 8 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/90e22516/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 13b1f48..ef7279f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1198,6 +1198,11 @@
</properties>
</profile>
+ <!--
+ Split store profiles.
+ Virtual host configuration can be overridden by setting blueprint property like below
+ -Dprofile.virtualhostnode.context.blueprint='{"type":"BDB","storePath":"${qpid.work_dir}/${this:name}/bdb"}'
+ -->
<profile>
<id>java-json.1-0</id>
<activation>
@@ -1213,16 +1218,11 @@
<profile.test.amqp_port_protocols>["AMQP_1_0"]</profile.test.amqp_port_protocols>
<profile.broker.persistent>true</profile.broker.persistent>
<profile.virtualhostnode.type>JSON</profile.virtualhostnode.type>
- <profile.virtualhostnode.context.blueprint>{"type":"DERBY","globalAddressDomains":"${dollar.sign}{qpid.globalAddressDomains}"}</profile.virtualhostnode.context.blueprint>
+ <profile.virtualhostnode.context.blueprint>{"type":"BDB","globalAddressDomains":"${dollar.sign}{qpid.globalAddressDomains}"}</profile.virtualhostnode.context.blueprint>
<profile.java.naming.factory.initial>org.apache.qpid.jms.jndi.JmsInitialContextFactory</profile.java.naming.factory.initial>
<profile.java.naming.provider.url>test-profiles${file.separator}test-provider-1-0.properties</profile.java.naming.provider.url>
</properties>
</profile>
- <!--
- Split store profiles.
- Virtual host configuration can be overridden by setting blueprint property like below
- -Dprofile.virtualhostnode.context.blueprint='{"type":"BDB","storePath":"${qpid.work_dir}/${this:name}/bdb"}'
- -->
<profile>
<id>java-json.0-9-1</id>
<activation>
@@ -1238,7 +1238,7 @@
<profile.test.amqp_port_protocols>["AMQP_0_8","AMQP_0_9","AMQP_0_9_1"]</profile.test.amqp_port_protocols>
<profile.broker.persistent>true</profile.broker.persistent>
<profile.virtualhostnode.type>JSON</profile.virtualhostnode.type>
- <profile.virtualhostnode.context.blueprint>{"type":"DERBY","storePath":"${dollar.sign}{json:qpid.work_dir}${dollar.sign}{json:file.separator}${dollar.sign}{this:name}${dollar.sign}{json:file.separator}derby","globalAddressDomains":"${dollar.sign}{qpid.globalAddressDomains}"}</profile.virtualhostnode.context.blueprint>
+ <profile.virtualhostnode.context.blueprint>{"type":"BDB","globalAddressDomains":"${dollar.sign}{qpid.globalAddressDomains}"}</profile.virtualhostnode.context.blueprint>
</properties>
</profile>
@@ -1257,7 +1257,7 @@
<profile.test.amqp_port_protocols>["AMQP_0_8","AMQP_0_9","AMQP_0_9_1","AMQP_0_10"]</profile.test.amqp_port_protocols>
<profile.broker.persistent>true</profile.broker.persistent>
<profile.virtualhostnode.type>JSON</profile.virtualhostnode.type>
- <profile.virtualhostnode.context.blueprint>{"type":"DERBY","storePath":"${dollar.sign}{json:qpid.work_dir}${dollar.sign}{json:file.separator}${dollar.sign}{this:name}${dollar.sign}{json:file.separator}derby","globalAddressDomains":"${dollar.sign}{qpid.globalAddressDomains}"}</profile.virtualhostnode.context.blueprint>
+ <profile.virtualhostnode.context.blueprint>{"type":"BDB","globalAddressDomains":"${dollar.sign}{qpid.globalAddressDomains}"}</profile.virtualhostnode.context.blueprint>
</properties>
</profile>
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/90e22516/systests/src/test/java/org/apache/qpid/client/TemporaryQueuePrefixTest.java
----------------------------------------------------------------------
diff --git a/systests/src/test/java/org/apache/qpid/client/TemporaryQueuePrefixTest.java b/systests/src/test/java/org/apache/qpid/client/TemporaryQueuePrefixTest.java
index ec57351..f71f45d 100644
--- a/systests/src/test/java/org/apache/qpid/client/TemporaryQueuePrefixTest.java
+++ b/systests/src/test/java/org/apache/qpid/client/TemporaryQueuePrefixTest.java
@@ -29,14 +29,6 @@ import javax.jms.TemporaryQueue;
public class TemporaryQueuePrefixTest extends QpidBrokerTestCase
{
@Override
- protected void setUp() throws Exception
- {
- super.setUp();
- // FIXME: This seems to be necessary to run this test from IntelliJ. Otherwise the context var ${qpid.globalAddressDomains} in the blueprint will be expanded. Not sure why.
- setTestSystemProperty("virtualhostnode.context.blueprint", "{\"type\":\"ProvidedStore\",\"globalAddressDomains\":\"${qpid.globalAddressDomains}\"}");
- }
-
- @Override
public void startDefaultBroker() throws Exception
{
// deliberately don't start broker
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org