Author: orudyy
Date: Thu Jun 26 08:25:56 2014
New Revision: 1605697
URL: http://svn.apache.org/r1605697
Log:
QPID-5851: [Java Broker] Introduce new test profiles for JSON configuration
store and persistent message store
Added:
qpid/trunk/qpid/java/test-profiles/JavaJsonExcludes
Modified:
qpid/trunk/qpid/java/pom.xml
qpid/trunk/qpid/java/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
qpid/trunk/qpid/java/systests/etc/config-systests.json
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SplitStoreTest.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/VirtualHostRestTest.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
qpid/trunk/qpid/java/test-profiles/CPPExcludes
Modified: qpid/trunk/qpid/java/pom.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/pom.xml?rev=1605697&r1=1605696&r2=1605697&view=diff
==============================================================================
--- qpid/trunk/qpid/java/pom.xml (original)
+++ qpid/trunk/qpid/java/pom.xml Thu Jun 26 08:25:56 2014
@@ -47,7 +47,7 @@
<properties>
<!-- enforcer plugin config properties -->
-
<supported-test-profiles-regex>(java-mms.0-9|java-mms.0-9-1|java-mms.0-10|java-bdb.0-9|java-bdb.0-9-1|java-bdb.0-10|java-dby.0-9|java-dby.0-9-1|java-dby.0-10|java-dby-mem.0-9|java-dby-mem.0-9-1|java-dby-mem.0-10|cpp)</supported-test-profiles-regex>
+
<supported-test-profiles-regex>(java-mms.0-9|java-mms.0-9-1|java-mms.0-10|java-bdb.0-9|java-bdb.0-9-1|java-bdb.0-10|java-dby.0-9|java-dby.0-9-1|java-dby.0-10|java-dby-mem.0-9|java-dby-mem.0-9-1|java-dby-mem.0-10|cpp|java-json.0-9-1|java-json.0-10)</supported-test-profiles-regex>
<!-- test profile properties and defaults-->
<qpid.home>${basedir}</qpid.home> <!-- override for broker tests -->
@@ -60,15 +60,17 @@
<profile.broker.type>internal</profile.broker.type>
<profile.broker.stopped>Exception</profile.broker.stopped>
<profile.broker.ready>BRK-1004</profile.broker.ready>
-
<profile.broker.command>${qpid.home}${file.separator}bin${file.separator}qpid-server
-sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE</profile.broker.command>
-
<profile.broker.command.windows>${qpid.home}${file.separator}bin${file.separator}qpid-server.bat
-sp @STORE_PATH -st @STORE_TYPE -l
@LOG_CONFIG_FILE</profile.broker.command.windows>
+
<profile.broker.command>${qpid.home}${file.separator}bin${file.separator}qpid-server
-sp ${at.sign}STORE_PATH -st ${at.sign}STORE_TYPE -l
${at.sign}LOG_CONFIG_FILE</profile.broker.command>
+
<profile.broker.command.windows>${qpid.home}${file.separator}bin${file.separator}qpid-server.bat
-sp ${at.sign}STORE_PATH -st ${at.sign}STORE_TYPE -l
${at.sign}LOG_CONFIG_FILE</profile.broker.command.windows>
<profile.test.excludes>Excludes JavaExcludes ${profile}.excludes
${profile.specific.excludes}</profile.test.excludes>
<profile.specific.excludes>JavaTransientExcludes
Java010Excludes</profile.specific.excludes>
<profile.broker.version>v0_10</profile.broker.version>
<profile.qpid.broker_default_amqp_protocol_excludes>AMQP_1_0</profile.qpid.broker_default_amqp_protocol_excludes>
<profile.broker.persistent>false</profile.broker.persistent>
- <profile.messagestore.type>Memory</profile.messagestore.type>
+ <profile.virtualhostnode.type>Memory</profile.virtualhostnode.type>
<profile.broker.clean.between.tests>true</profile.broker.clean.between.tests>
+ <dollar.sign>$</dollar.sign>
+ <at.sign>@</at.sign>
</properties>
<modules>
@@ -172,7 +174,8 @@
<echo>[profile.broker.version] ${profile.broker.version}</echo>
<echo>[profile.qpid.broker_default_amqp_protocol_excludes]
${profile.qpid.broker_default_amqp_protocol_excludes}</echo>
<echo>[profile.broker.persistent]
${profile.broker.persistent}</echo>
- <echo>[profile.messagestore.type]
${profile.messagestore.type}</echo>
+ <echo>[profile.virtualhostnode.type]
${profile.virtualhostnode.type}</echo>
+ <echo>[profile.virtualhostnode.context.blueprint]
${profile.virtualhostnode.context.blueprint}</echo>
</target>
</configuration>
</execution>
@@ -238,7 +241,8 @@
<broker.version>${profile.broker.version}</broker.version>
<qpid.broker_default_amqp_protocol_excludes>${profile.qpid.broker_default_amqp_protocol_excludes}</qpid.broker_default_amqp_protocol_excludes>
<broker.persistent>${profile.broker.persistent}</broker.persistent>
- <messagestore.type>${profile.messagestore.type}</messagestore.type>
+
<virtualhostnode.type>${profile.virtualhostnode.type}</virtualhostnode.type>
+
<virtualhostnode.context.blueprint>${profile.virtualhostnode.context.blueprint}</virtualhostnode.context.blueprint>
<broker.clean.between.tests>${profile.broker.clean.between.tests}</broker.clean.between.tests>
<!-- This must be a child of qpid home currently due to the
horrible mechanics of QBTC -->
@@ -396,7 +400,8 @@
<profile.broker.version>v0_10</profile.broker.version>
<profile.qpid.broker_default_amqp_protocol_excludes>AMQP_1_0</profile.qpid.broker_default_amqp_protocol_excludes>
<profile.broker.persistent>false</profile.broker.persistent>
- <profile.messagestore.type>Memory</profile.messagestore.type>
+ <profile.virtualhostnode.type>Memory</profile.virtualhostnode.type>
+
<profile.virtualhostnode.context.blueprint>{"type":"ProvidedStore"}</profile.virtualhostnode.context.blueprint>
</properties>
</profile>
@@ -414,7 +419,8 @@
<profile.broker.version>v0_9_1</profile.broker.version>
<profile.qpid.broker_default_amqp_protocol_excludes>AMQP_1_0,AMQP_0_10</profile.qpid.broker_default_amqp_protocol_excludes>
<profile.broker.persistent>false</profile.broker.persistent>
- <profile.messagestore.type>Memory</profile.messagestore.type>
+ <profile.virtualhostnode.type>Memory</profile.virtualhostnode.type>
+
<profile.virtualhostnode.context.blueprint>{"type":"ProvidedStore"}</profile.virtualhostnode.context.blueprint>
</properties>
</profile>
@@ -432,7 +438,8 @@
<profile.broker.version>v0_9</profile.broker.version>
<profile.qpid.broker_default_amqp_protocol_excludes>AMQP_1_0,AMQP_0_10,AMQP_0_9_1</profile.qpid.broker_default_amqp_protocol_excludes>
<profile.broker.persistent>false</profile.broker.persistent>
- <profile.messagestore.type>Memory</profile.messagestore.type>
+ <profile.virtualhostnode.type>Memory</profile.virtualhostnode.type>
+
<profile.virtualhostnode.context.blueprint>{"type":"ProvidedStore"}</profile.virtualhostnode.context.blueprint>
</properties>
</profile>
@@ -450,7 +457,8 @@
<profile.broker.version>v0_10</profile.broker.version>
<profile.qpid.broker_default_amqp_protocol_excludes>AMQP_1_0</profile.qpid.broker_default_amqp_protocol_excludes>
<profile.broker.persistent>true</profile.broker.persistent>
- <profile.messagestore.type>BDB</profile.messagestore.type>
+ <profile.virtualhostnode.type>BDB</profile.virtualhostnode.type>
+
<profile.virtualhostnode.context.blueprint>{"type":"ProvidedStore"}</profile.virtualhostnode.context.blueprint>
</properties>
</profile>
@@ -468,7 +476,8 @@
<profile.broker.version>v0_9_1</profile.broker.version>
<profile.qpid.broker_default_amqp_protocol_excludes>AMQP_1_0,AMQP_0_10</profile.qpid.broker_default_amqp_protocol_excludes>
<profile.broker.persistent>true</profile.broker.persistent>
- <profile.messagestore.type>BDB</profile.messagestore.type>
+ <profile.virtualhostnode.type>BDB</profile.virtualhostnode.type>
+
<profile.virtualhostnode.context.blueprint>{"type":"ProvidedStore"}</profile.virtualhostnode.context.blueprint>
</properties>
</profile>
@@ -486,7 +495,8 @@
<profile.broker.version>v0_9</profile.broker.version>
<profile.qpid.broker_default_amqp_protocol_excludes>AMQP_1_0,AMQP_0_10,AMQP_0_9_1</profile.qpid.broker_default_amqp_protocol_excludes>
<profile.broker.persistent>true</profile.broker.persistent>
- <profile.messagestore.type>BDB</profile.messagestore.type>
+ <profile.virtualhostnode.type>BDB</profile.virtualhostnode.type>
+
<profile.virtualhostnode.context.blueprint>{"type":"ProvidedStore"}</profile.virtualhostnode.context.blueprint>
</properties>
</profile>
@@ -504,7 +514,8 @@
<profile.broker.version>v0_10</profile.broker.version>
<profile.qpid.broker_default_amqp_protocol_excludes>AMQP_1_0</profile.qpid.broker_default_amqp_protocol_excludes>
<profile.broker.persistent>true</profile.broker.persistent>
- <profile.messagestore.type>DERBY</profile.messagestore.type>
+ <profile.virtualhostnode.type>DERBY</profile.virtualhostnode.type>
+
<profile.virtualhostnode.context.blueprint>{"type":"ProvidedStore"}</profile.virtualhostnode.context.blueprint>
</properties>
</profile>
@@ -522,7 +533,8 @@
<profile.broker.version>v0_9_1</profile.broker.version>
<profile.qpid.broker_default_amqp_protocol_excludes>AMQP_1_0,AMQP_0_10</profile.qpid.broker_default_amqp_protocol_excludes>
<profile.broker.persistent>true</profile.broker.persistent>
- <profile.messagestore.type>DERBY</profile.messagestore.type>
+ <profile.virtualhostnode.type>DERBY</profile.virtualhostnode.type>
+
<profile.virtualhostnode.context.blueprint>{"type":"ProvidedStore"}</profile.virtualhostnode.context.blueprint>
</properties>
</profile>
@@ -540,7 +552,8 @@
<profile.broker.version>v0_9</profile.broker.version>
<profile.qpid.broker_default_amqp_protocol_excludes>AMQP_1_0,AMQP_0_10,AMQP_0_9_1</profile.qpid.broker_default_amqp_protocol_excludes>
<profile.broker.persistent>true</profile.broker.persistent>
- <profile.messagestore.type>DERBY</profile.messagestore.type>
+ <profile.virtualhostnode.type>DERBY</profile.virtualhostnode.type>
+
<profile.virtualhostnode.context.blueprint>{"type":"ProvidedStore"}</profile.virtualhostnode.context.blueprint>
</properties>
</profile>
@@ -557,9 +570,9 @@
<profile.specific.excludes>JavaPersistentExcludes JavaDerbyExcludes
Java010Excludes</profile.specific.excludes>
<profile.broker.version>v0_10</profile.broker.version>
<profile.qpid.broker_default_amqp_protocol_excludes>AMQP_1_0</profile.qpid.broker_default_amqp_protocol_excludes>
-
<profile.broker.virtualhosts-config>${QPID_HOME}${file.separator}etc${file.separator}virtualhosts-systests-derby.xml</profile.broker.virtualhosts-config>
<profile.broker.persistent>true</profile.broker.persistent>
- <profile.messagestore.type>DERBY</profile.messagestore.type>
+ <profile.virtualhostnode.type>DERBY</profile.virtualhostnode.type>
+
<profile.virtualhostnode.context.blueprint>{"type":"ProvidedStore"}</profile.virtualhostnode.context.blueprint>
</properties>
</profile>
@@ -576,9 +589,9 @@
<profile.specific.excludes>JavaPersistentExcludes JavaDerbyExcludes
XAExcludes JavaPre010Excludes</profile.specific.excludes>
<profile.broker.version>v0_9_1</profile.broker.version>
<profile.qpid.broker_default_amqp_protocol_excludes>AMQP_1_0,AMQP_0_10</profile.qpid.broker_default_amqp_protocol_excludes>
-
<profile.broker.virtualhosts-config>${QPID_HOME}${file.separator}etc${file.separator}virtualhosts-systests-derby.xml</profile.broker.virtualhosts-config>
<profile.broker.persistent>true</profile.broker.persistent>
- <profile.messagestore.type>DERBY</profile.messagestore.type>
+ <profile.virtualhostnode.type>DERBY</profile.virtualhostnode.type>
+
<profile.virtualhostnode.context.blueprint>{"type":"ProvidedStore"}</profile.virtualhostnode.context.blueprint>
</properties>
</profile>
@@ -595,13 +608,56 @@
<profile.specific.excludes>JavaPersistentExcludes JavaDerbyExcludes
XAExcludes JavaPre010Excludes</profile.specific.excludes>
<profile.broker.version>v0_9</profile.broker.version>
<profile.qpid.broker_default_amqp_protocol_excludes>AMQP_1_0,AMQP_0_10,AMQP_0_9_1</profile.qpid.broker_default_amqp_protocol_excludes>
-
<profile.broker.virtualhosts-config>${QPID_HOME}${file.separator}etc${file.separator}virtualhosts-systests-derby.xml</profile.broker.virtualhosts-config>
<profile.broker.persistent>true</profile.broker.persistent>
- <profile.messagestore.type>DERBY</profile.messagestore.type>
+ <profile.virtualhostnode.type>DERBY</profile.virtualhostnode.type>
+
<profile.virtualhostnode.context.blueprint>{"type":"ProvidedStore"}</profile.virtualhostnode.context.blueprint>
</properties>
</profile>
+ <!--
+ Split store profiles.
+ Virtual host configuration can be overridden by setting blueprint property
like below
+
-Dprofile.virtualhostnode.context.blueprint='{"type":"BDB","messageStoreSettings":{"storePath":"${QPID_WORK}/${this:name}/bdb"}}'
+ -->
<profile>
+ <id>java-json.0-9-1</id>
+ <activation>
+ <property>
+ <name>profile</name>
+ <value>java-json.0-9-1</value>
+ </property>
+ </activation>
+ <properties>
+ <profile>java-json.0-9-1</profile>
+ <profile.specific.excludes>JavaPersistentExcludes JavaJsonExcludes
XAExcludes JavaPre010Excludes</profile.specific.excludes>
+ <profile.broker.version>v0_9_1</profile.broker.version>
+
<profile.qpid.broker_default_amqp_protocol_excludes>AMQP_1_0,AMQP_0_10</profile.qpid.broker_default_amqp_protocol_excludes>
+ <profile.broker.persistent>true</profile.broker.persistent>
+ <profile.virtualhostnode.type>JSON</profile.virtualhostnode.type>
+
<profile.virtualhostnode.context.blueprint>{"type":"DERBY","messageStoreSettings":{"storePath":"${dollar.sign}{QPID_WORK}/${dollar.sign}{this:name}/derby"}}</profile.virtualhostnode.context.blueprint>
+ </properties>
+ </profile>
+
+ <profile>
+ <id>java-json.0-10</id>
+ <activation>
+ <property>
+ <name>profile</name>
+ <value>java-json.0-10</value>
+ </property>
+ </activation>
+ <properties>
+ <profile>java-json.0-10</profile>
+ <profile.specific.excludes>JavaPersistentExcludes
JavaJsonExcludes XAExcludes Java010Excludes</profile.specific.excludes>
+ <profile.broker.version>v0_10</profile.broker.version>
+
<profile.qpid.broker_default_amqp_protocol_excludes>AMQP_1_0</profile.qpid.broker_default_amqp_protocol_excludes>
+ <profile.broker.persistent>true</profile.broker.persistent>
+ <profile.virtualhostnode.type>JSON</profile.virtualhostnode.type>
+
<profile.virtualhostnode.context.blueprint>{"type":"DERBY","messageStoreSettings":{"storePath":"${dollar.sign}{QPID_WORK}/${dollar.sign}{this:name}/derby"}}</profile.virtualhostnode.context.blueprint>
+ </properties>
+ </profile>
+
+ <profile>
<id>cpp</id>
<activation>
<property>
@@ -615,7 +671,7 @@
<profile.broker.type>spawned</profile.broker.type>
<profile.broker.stopped>Exception constructed</profile.broker.stopped>
<profile.broker.ready>Listening on TCP</profile.broker.ready>
- <profile.broker.command>${cpp-broker-dir}/qpidd -p @PORT --data-dir
${qpid.work}/@PORT -t --auth no --no-module-dir</profile.broker.command>
+ <profile.broker.command>${cpp-broker-dir}/qpidd -p ${at.sign}PORT
--data-dir ${qpid.work}/${at.sign}PORT -t --auth no
--no-module-dir</profile.broker.command>
<profile.broker.command.windows />
<profile.test.excludes>Excludes CPPExcludes ${profile}.excludes
${profile.specific.excludes} cpp.excludes</profile.test.excludes>
<profile.specific.excludes>CPPPrefetchExcludes
CPPTransientExcludes</profile.specific.excludes>
Modified:
qpid/trunk/qpid/java/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java?rev=1605697&r1=1605696&r2=1605697&view=diff
==============================================================================
---
qpid/trunk/qpid/java/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
(original)
+++
qpid/trunk/qpid/java/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
Thu Jun 26 08:25:56 2014
@@ -35,12 +35,13 @@ import junit.framework.TestResult;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
-
public class QpidTestCase extends TestCase
{
private static final String TEST_EXCLUDES = "test.excludes";
private static final String TEST_EXCLUDELIST = "test.excludelist";
private static final String TEST_EXCLUDEFILES = "test.excludefiles";
+ private static final String VIRTUAL_HOST_NODE_TYPE =
"virtualhostnode.type";
+ private static final String VIRTUAL_HOST_NODE_CONTEXT_BLUEPRINT =
"virtualhostnode.context.blueprint";
public static final String QPID_HOME = System.getProperty("QPID_HOME");
public static final String TEST_RESOURCES_DIR = QPID_HOME +
"/../test-profiles/test_resources/";
public static final String TEST_PROFILES_DIR = QPID_HOME +
"/../test-profiles/";
@@ -124,8 +125,6 @@ public class QpidTestCase extends TestCa
}
}
- protected static final String MESSAGE_STORE_TYPE = "messagestore.type";
-
private static List<String> _exclusionList;
public QpidTestCase()
@@ -148,17 +147,21 @@ public class QpidTestCase extends TestCa
}
}
- public String getTestProfileMessageStoreType()
+ public String getTestProfileVirtualHostNodeType()
{
- final String storeType = System.getProperty(MESSAGE_STORE_TYPE);
- _logger.debug(MESSAGE_STORE_TYPE + "=" + storeType);
+ final String storeType = System.getProperty(VIRTUAL_HOST_NODE_TYPE);
+
+ if (_logger.isDebugEnabled())
+ {
+ _logger.debug(VIRTUAL_HOST_NODE_TYPE + "=" + storeType);
+ }
return storeType != null ? storeType : "TestMemory";
}
- public String getTestProfileVirtualHostNodeType()
+ public String getTestProfileVirtualHostNodeBlueprint()
{
- return getTestProfileMessageStoreType();
+ return System.getProperty(VIRTUAL_HOST_NODE_CONTEXT_BLUEPRINT);
}
public static final int MIN_PORT_NUMBER = 1;
Modified: qpid/trunk/qpid/java/systests/etc/config-systests.json
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/etc/config-systests.json?rev=1605697&r1=1605696&r2=1605697&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/etc/config-systests.json (original)
+++ qpid/trunk/qpid/java/systests/etc/config-systests.json Thu Jun 26 08:25:56
2014
@@ -59,10 +59,10 @@
}],
"virtualhostnodes" : [ {
"name" : "test",
- "type" : "${messagestore.type}",
+ "type" : "${virtualhostnode.type}",
"storePath" : "${QPID_WORK}/${test.port}/test/config",
"context" : {
- "virtualhostBlueprint" : "{ \"type\" : \"ProvidedStore\" }"
+ "virtualhostBlueprint" : "${virtualhostnode.context.blueprint}"
}
} ]
}
Modified:
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SplitStoreTest.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SplitStoreTest.java?rev=1605697&r1=1605696&r2=1605697&view=diff
==============================================================================
---
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SplitStoreTest.java
(original)
+++
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SplitStoreTest.java
Thu Jun 26 08:25:56 2014
@@ -76,12 +76,12 @@ public class SplitStoreTest extends Qpid
public void testJsonConfigurationStoreWithPersistentMessageStore() throws
Exception
{
- doTest(JsonFileConfigStore.TYPE, getTestProfileMessageStoreType());
+ doTest(JsonFileConfigStore.TYPE, getTestProfileVirtualHostNodeType());
}
public void testSeparateConfigurationAndMessageStoresOfTheSameType()
throws Exception
{
- doTest(getTestProfileVirtualHostNodeType(),
getTestProfileMessageStoreType());
+ doTest(getTestProfileVirtualHostNodeType(),
getTestProfileVirtualHostNodeType());
}
private void configureAndStartBroker(String virtualHostNodeType, String
virtualHostType) throws Exception
Modified:
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java?rev=1605697&r1=1605696&r2=1605697&view=diff
==============================================================================
---
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java
(original)
+++
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java
Thu Jun 26 08:25:56 2014
@@ -24,6 +24,7 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import java.io.File;
+import java.io.IOException;
import java.security.PrivilegedAction;
import java.util.ArrayList;
import java.util.Collection;
@@ -71,10 +72,13 @@ import org.apache.qpid.server.queue.Stan
import org.apache.qpid.server.txn.AutoCommitTransaction;
import org.apache.qpid.server.txn.ServerTransaction;
import org.apache.qpid.server.util.BrokerTestHelper;
+import org.apache.qpid.server.virtualhost.TestMemoryVirtualHost;
import org.apache.qpid.server.virtualhost.VirtualHostImpl;
+import org.apache.qpid.server.virtualhostnode.AbstractStandardVirtualHostNode;
import org.apache.qpid.server.virtualhostnode.FileBasedVirtualHostNode;
import org.apache.qpid.test.utils.QpidTestCase;
import org.apache.qpid.util.FileUtils;
+import org.codehaus.jackson.map.ObjectMapper;
/**
*
@@ -136,12 +140,21 @@ public class VirtualHostMessageStoreTest
nodeAttributes.put(ConfiguredObject.TYPE,
getTestProfileVirtualHostNodeType());
nodeAttributes.put(FileBasedVirtualHostNode.STORE_PATH, _storePath);
nodeAttributes.put(VirtualHostNode.NAME, nodeName);
+
_node = factory.create(VirtualHostNode.class, nodeAttributes, broker);
_node.start();
final Map<String,Object> virtualHostAttributes = new HashMap<>();
virtualHostAttributes.put(VirtualHost.NAME, hostName);
-
+ virtualHostAttributes.put(VirtualHost.NAME, hostName);
+ String bluePrint = getTestProfileVirtualHostNodeBlueprint();
+ if (bluePrint == null)
+ {
+ bluePrint = "{type=\"" + TestMemoryVirtualHost.VIRTUAL_HOST_TYPE +
"\"}";
+ }
+ ObjectMapper objectMapper = new ObjectMapper();
+ Map<String, Object> attrs = objectMapper.readValue(bluePrint,
Map.class);
+ virtualHostAttributes.putAll(attrs);
_node.createChild(VirtualHost.class, virtualHostAttributes, _node);
_virtualHost = (VirtualHostImpl<?,?,?>)_node.getVirtualHost();
Modified:
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/VirtualHostRestTest.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/VirtualHostRestTest.java?rev=1605697&r1=1605696&r2=1605697&view=diff
==============================================================================
---
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/VirtualHostRestTest.java
(original)
+++
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/VirtualHostRestTest.java
Thu Jun 26 08:25:56 2014
@@ -30,6 +30,7 @@ import java.util.Map;
import javax.jms.Session;
import javax.servlet.http.HttpServletResponse;
+import org.apache.qpid.server.virtualhost.TestMemoryVirtualHost;
import org.codehaus.jackson.JsonGenerationException;
import org.codehaus.jackson.map.JsonMappingException;
@@ -42,7 +43,6 @@ import org.apache.qpid.server.queue.Last
import org.apache.qpid.server.queue.PriorityQueue;
import org.apache.qpid.server.queue.SortedQueue;
import org.apache.qpid.server.virtualhost.AbstractVirtualHost;
-import org.apache.qpid.server.virtualhost.ProvidedStoreVirtualHost;
import org.apache.qpid.server.virtualhostnode.FileBasedVirtualHostNode;
import org.apache.qpid.util.FileUtils;
@@ -540,7 +540,7 @@ public class VirtualHostRestTest extends
Map<String, Object> virtualhostData = new HashMap<>();
virtualhostData.put(VirtualHost.NAME, virtualHostName);
- virtualhostData.put(VirtualHost.TYPE,
ProvidedStoreVirtualHost.VIRTUAL_HOST_TYPE);
+ virtualhostData.put(VirtualHost.TYPE,
TestMemoryVirtualHost.VIRTUAL_HOST_TYPE);
getRestTestHelper().submitRequest("virtualhost/" + virtualHostName +
"/" + virtualHostName,
"PUT",
Modified:
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java?rev=1605697&r1=1605696&r2=1605697&view=diff
==============================================================================
---
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
(original)
+++
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
Thu Jun 26 08:25:56 2014
@@ -70,7 +70,6 @@ import org.apache.qpid.server.model.Prot
import org.apache.qpid.server.model.VirtualHostNode;
import org.apache.qpid.server.store.DurableConfigurationStore;
import org.apache.qpid.server.store.MemoryConfigurationStore;
-import org.apache.qpid.server.virtualhost.ProvidedStoreVirtualHost;
import org.apache.qpid.server.virtualhostnode.AbstractStandardVirtualHostNode;
import org.apache.qpid.server.virtualhostnode.FileBasedVirtualHostNode;
import org.apache.qpid.url.URLSyntaxException;
@@ -561,8 +560,8 @@ public class QpidBrokerTestCase extends
setSystemProperty("test.port.ssl");
setSystemProperty("test.port.alt");
setSystemProperty("test.port.alt.ssl");
- setSystemProperty("messagestore.type");
-
+ setSystemProperty("virtualhostnode.type");
+ setSystemProperty("virtualhostnode.context.blueprint");
// Add all the specified system properties to QPID_OPTS
if (!_propertiesSetForBroker.isEmpty())
@@ -872,7 +871,7 @@ public class QpidBrokerTestCase extends
{
attributes.put(FileBasedVirtualHostNode.STORE_PATH, storeDir);
}
- final String blueprint = String.format("{ \"type\" : \"%s\" } }",
ProvidedStoreVirtualHost.VIRTUAL_HOST_TYPE);
+ final String blueprint = getTestProfileVirtualHostNodeBlueprint();
attributes.put(ConfiguredObject.CONTEXT,
Collections.singletonMap(AbstractStandardVirtualHostNode.VIRTUALHOST_BLUEPRINT_CONTEXT_VAR,
blueprint));
Modified: qpid/trunk/qpid/java/test-profiles/CPPExcludes
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/CPPExcludes?rev=1605697&r1=1605696&r2=1605697&view=diff
==============================================================================
--- qpid/trunk/qpid/java/test-profiles/CPPExcludes (original)
+++ qpid/trunk/qpid/java/test-profiles/CPPExcludes Thu Jun 26 08:25:56 2014
@@ -93,6 +93,7 @@ org.apache.qpid.server.store.VirtualHost
org.apache.qpid.server.store.VirtualHostMessageStoreTest#testDurableQueueRemoval
org.apache.qpid.server.store.VirtualHostMessageStoreTest#testExchangePersistence
org.apache.qpid.server.store.VirtualHostMessageStoreTest#testDurableExchangeRemoval
+org.apache.qpid.server.store.VirtualHostMessageStoreTest#testQueueExchangeAndBindingCreation
org.apache.qpid.server.store.DurableConfigurationStoreTest#*
// CPP Broker does not follow the same Logging convention as the Java broker
Added: qpid/trunk/qpid/java/test-profiles/JavaJsonExcludes
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/JavaJsonExcludes?rev=1605697&view=auto
==============================================================================
--- qpid/trunk/qpid/java/test-profiles/JavaJsonExcludes (added)
+++ qpid/trunk/qpid/java/test-profiles/JavaJsonExcludes Thu Jun 26 08:25:56 2014
@@ -0,0 +1,24 @@
+//
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+
+org.apache.qpid.server.store.berkeleydb.*
+org.apache.qpid.server.store.berkeleydb.replication.*
+org.apache.qpid.server.store.SplitStoreTest#*
+org.apache.qpid.systest.rest.VirtualHostNodeRestTest#testCreateAndDeleteVirtualHostNode
+org.apache.qpid.server.BrokerStartupTest#testStartupWithNoConfig
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
