Copied: qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCSettings.java (from r1605697, qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/JsonFileConfigStoreConfigurationTest.java) URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCSettings.java?p2=qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCSettings.java&p1=qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/JsonFileConfigStoreConfigurationTest.java&r1=1605697&r2=1605737&rev=1605737&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/JsonFileConfigStoreConfigurationTest.java (original) +++ qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCSettings.java Thu Jun 26 11:19:54 2014 @@ -1,5 +1,4 @@ /* - * * 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 @@ -16,15 +15,15 @@ * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. - * */ -package org.apache.qpid.server.store; -public class JsonFileConfigStoreConfigurationTest extends AbstractDurableConfigurationStoreTestCase +package org.apache.qpid.server.store.jdbc; + +import org.apache.qpid.server.store.Settings; + +public interface JDBCSettings extends Settings { - @Override - protected DurableConfigurationStore createConfigStore() throws Exception - { - return new JsonFileConfigStore(); - } + String getConnectionUrl(); + + String getConnectionPoolType(); }
Modified: qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/virtualhost/jdbc/JDBCVirtualHost.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/virtualhost/jdbc/JDBCVirtualHost.java?rev=1605737&r1=1605736&r2=1605737&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/virtualhost/jdbc/JDBCVirtualHost.java (original) +++ qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/virtualhost/jdbc/JDBCVirtualHost.java Thu Jun 26 11:19:54 2014 @@ -1,5 +1,4 @@ /* - * * 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 @@ -16,35 +15,24 @@ * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. - * */ -package org.apache.qpid.server.virtualhost.jdbc; -import java.util.Map; +package org.apache.qpid.server.virtualhost.jdbc; -import org.apache.qpid.server.model.ManagedObject; -import org.apache.qpid.server.model.ManagedObjectFactoryConstructor; -import org.apache.qpid.server.model.VirtualHostNode; -import org.apache.qpid.server.store.MessageStore; -import org.apache.qpid.server.store.jdbc.GenericJDBCMessageStore; -import org.apache.qpid.server.virtualhost.AbstractVirtualHost; +import org.apache.qpid.server.exchange.ExchangeImpl; +import org.apache.qpid.server.model.ManagedAttribute; +import org.apache.qpid.server.queue.AMQQueue; +import org.apache.qpid.server.store.jdbc.DefaultConnectionProviderFactory; +import org.apache.qpid.server.store.jdbc.JDBCSettings; +import org.apache.qpid.server.virtualhost.VirtualHostImpl; -@ManagedObject(category = false, type = JDBCVirtualHost.VIRTUAL_HOST_TYPE) -public class JDBCVirtualHost extends AbstractVirtualHost<JDBCVirtualHost> +public interface JDBCVirtualHost<X extends JDBCVirtualHost<X>> extends VirtualHostImpl<X, AMQQueue<?>, ExchangeImpl<?>>, + JDBCSettings { - public static final String VIRTUAL_HOST_TYPE = "JDBC"; - - @ManagedObjectFactoryConstructor - public JDBCVirtualHost(final Map<String, Object> attributes, - final VirtualHostNode<?> virtualHostNode) - { - super(attributes, virtualHostNode); - } + @ManagedAttribute(mandatory=true) + String getConnectionUrl(); + @ManagedAttribute(defaultValue= DefaultConnectionProviderFactory.TYPE) + String getConnectionPoolType(); - @Override - protected MessageStore createMessageStore() - { - return new GenericJDBCMessageStore(); - } } Copied: qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/virtualhost/jdbc/JDBCVirtualHostImpl.java (from r1605697, qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/virtualhost/jdbc/JDBCVirtualHost.java) URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/virtualhost/jdbc/JDBCVirtualHostImpl.java?p2=qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/virtualhost/jdbc/JDBCVirtualHostImpl.java&p1=qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/virtualhost/jdbc/JDBCVirtualHost.java&r1=1605697&r2=1605737&rev=1605737&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/virtualhost/jdbc/JDBCVirtualHost.java (original) +++ qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/virtualhost/jdbc/JDBCVirtualHostImpl.java Thu Jun 26 11:19:54 2014 @@ -20,8 +20,7 @@ */ package org.apache.qpid.server.virtualhost.jdbc; -import java.util.Map; - +import org.apache.qpid.server.model.ManagedAttributeField; import org.apache.qpid.server.model.ManagedObject; import org.apache.qpid.server.model.ManagedObjectFactoryConstructor; import org.apache.qpid.server.model.VirtualHostNode; @@ -29,22 +28,41 @@ import org.apache.qpid.server.store.Mess import org.apache.qpid.server.store.jdbc.GenericJDBCMessageStore; import org.apache.qpid.server.virtualhost.AbstractVirtualHost; -@ManagedObject(category = false, type = JDBCVirtualHost.VIRTUAL_HOST_TYPE) -public class JDBCVirtualHost extends AbstractVirtualHost<JDBCVirtualHost> +import java.util.Map; + +@ManagedObject(category = false, type = JDBCVirtualHostImpl.VIRTUAL_HOST_TYPE) +public class JDBCVirtualHostImpl extends AbstractVirtualHost<JDBCVirtualHostImpl> implements JDBCVirtualHost<JDBCVirtualHostImpl> { public static final String VIRTUAL_HOST_TYPE = "JDBC"; + @ManagedAttributeField + private String _connectionUrl; + + @ManagedAttributeField + private String _connectionPoolType; + @ManagedObjectFactoryConstructor - public JDBCVirtualHost(final Map<String, Object> attributes, - final VirtualHostNode<?> virtualHostNode) + public JDBCVirtualHostImpl(final Map<String, Object> attributes, + final VirtualHostNode<?> virtualHostNode) { super(attributes, virtualHostNode); } - @Override protected MessageStore createMessageStore() { return new GenericJDBCMessageStore(); } + + @Override + public String getConnectionUrl() + { + return _connectionUrl; + } + + @Override + public String getConnectionPoolType() + { + return _connectionPoolType; + } } Modified: qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/virtualhostnode/jdbc/JDBCVirtualHostNode.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/virtualhostnode/jdbc/JDBCVirtualHostNode.java?rev=1605737&r1=1605736&r2=1605737&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/virtualhostnode/jdbc/JDBCVirtualHostNode.java (original) +++ qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/virtualhostnode/jdbc/JDBCVirtualHostNode.java Thu Jun 26 11:19:54 2014 @@ -23,8 +23,9 @@ package org.apache.qpid.server.virtualho import org.apache.qpid.server.model.ManagedAttribute; import org.apache.qpid.server.model.VirtualHostNode; import org.apache.qpid.server.store.jdbc.DefaultConnectionProviderFactory; +import org.apache.qpid.server.store.jdbc.JDBCSettings; -public interface JDBCVirtualHostNode<X extends JDBCVirtualHostNode<X>> extends VirtualHostNode<X> +public interface JDBCVirtualHostNode<X extends JDBCVirtualHostNode<X>> extends VirtualHostNode<X>, JDBCSettings { //TODO: Split this attribute into connectionUrl, username and password. Make the password attribute secure. @ManagedAttribute(mandatory=true) @@ -33,4 +34,5 @@ public interface JDBCVirtualHostNode<X e @ManagedAttribute(defaultValue=DefaultConnectionProviderFactory.TYPE) String getConnectionPoolType(); + //add username and passwd managed attrs } Modified: qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/virtualhostnode/jdbc/JDBCVirtualHostNodeImpl.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/virtualhostnode/jdbc/JDBCVirtualHostNodeImpl.java?rev=1605737&r1=1605736&r2=1605737&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/virtualhostnode/jdbc/JDBCVirtualHostNodeImpl.java (original) +++ qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/virtualhostnode/jdbc/JDBCVirtualHostNodeImpl.java Thu Jun 26 11:19:54 2014 @@ -48,6 +48,11 @@ public class JDBCVirtualHostNodeImpl ext } @Override + protected void writeLocationEventLog() + { + } + + @Override protected DurableConfigurationStore createConfigurationStore() { return new GenericJDBCConfigurationStore(); Modified: qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/test/java/org/apache/qpid/server/store/jdbc/JDBCMessageStoreTest.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/test/java/org/apache/qpid/server/store/jdbc/JDBCMessageStoreTest.java?rev=1605737&r1=1605736&r2=1605737&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/test/java/org/apache/qpid/server/store/jdbc/JDBCMessageStoreTest.java (original) +++ qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/test/java/org/apache/qpid/server/store/jdbc/JDBCMessageStoreTest.java Thu Jun 26 11:19:54 2014 @@ -20,18 +20,21 @@ */ package org.apache.qpid.server.store.jdbc; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + import java.sql.Connection; import java.sql.DatabaseMetaData; import java.sql.DriverManager; import java.sql.ResultSet; import java.sql.SQLException; -import java.util.HashMap; import java.util.HashSet; -import java.util.Map; import java.util.Set; +import org.apache.qpid.server.model.VirtualHost; import org.apache.qpid.server.store.MessageStore; import org.apache.qpid.server.store.MessageStoreTestCase; +import org.apache.qpid.server.virtualhost.jdbc.JDBCVirtualHost; public class JDBCMessageStoreTest extends MessageStoreTestCase { @@ -61,12 +64,13 @@ public class JDBCMessageStoreTest extend } @Override - protected Map<String, Object> getStoreSettings() + protected VirtualHost createVirtualHost() { _connectionURL = "jdbc:derby:memory:/" + getTestName() + ";create=true"; - Map<String, Object> messageStoreSettings = new HashMap<String, Object>(); - messageStoreSettings.put(GenericJDBCMessageStore.CONNECTION_URL, _connectionURL); - return messageStoreSettings; + + final JDBCVirtualHost jdbcVirtualHost = mock(JDBCVirtualHost.class); + when(jdbcVirtualHost.getConnectionUrl()).thenReturn(_connectionURL); + return jdbcVirtualHost; } Modified: qpid/trunk/qpid/java/broker-plugins/memory-store/src/main/java/org/apache/qpid/server/virtualhostnode/memory/MemoryVirtualHostNode.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/memory-store/src/main/java/org/apache/qpid/server/virtualhostnode/memory/MemoryVirtualHostNode.java?rev=1605737&r1=1605736&r2=1605737&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/memory-store/src/main/java/org/apache/qpid/server/virtualhostnode/memory/MemoryVirtualHostNode.java (original) +++ qpid/trunk/qpid/java/broker-plugins/memory-store/src/main/java/org/apache/qpid/server/virtualhostnode/memory/MemoryVirtualHostNode.java Thu Jun 26 11:19:54 2014 @@ -41,6 +41,11 @@ public class MemoryVirtualHostNode exten } @Override + protected void writeLocationEventLog() + { + } + + @Override protected DurableConfigurationStore createConfigurationStore() { return new MemoryConfigurationStore(); Modified: qpid/trunk/qpid/java/pom.xml URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/pom.xml?rev=1605737&r1=1605736&r2=1605737&view=diff ============================================================================== --- qpid/trunk/qpid/java/pom.xml (original) +++ qpid/trunk/qpid/java/pom.xml Thu Jun 26 11:19:54 2014 @@ -617,7 +617,7 @@ <!-- 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"}}' + -Dprofile.virtualhostnode.context.blueprint='{"type":"BDB","storePath":"${QPID_WORK}/${this:name}/bdb"}' --> <profile> <id>java-json.0-9-1</id> @@ -634,7 +634,7 @@ <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> + <profile.virtualhostnode.context.blueprint>{"type":"DERBY","storePath":"${dollar.sign}{QPID_WORK}/${dollar.sign}{this:name}/derby"}</profile.virtualhostnode.context.blueprint> </properties> </profile> @@ -653,7 +653,7 @@ <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> + <profile.virtualhostnode.context.blueprint>{"type":"DERBY","storePath":"${dollar.sign}{QPID_WORK}/${dollar.sign}{this:name}/derby"}</profile.virtualhostnode.context.blueprint> </properties> </profile> 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=1605737&r1=1605736&r2=1605737&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 11:19:54 2014 @@ -22,7 +22,6 @@ package org.apache.qpid.server.store; import java.io.File; import java.util.Collections; -import java.util.HashMap; import java.util.Map; import javax.jms.Connection; @@ -34,7 +33,8 @@ import javax.jms.Session; import org.apache.qpid.configuration.ClientProperties; import org.apache.qpid.server.model.VirtualHostNode; import org.apache.qpid.server.virtualhostnode.AbstractStandardVirtualHostNode; -import org.apache.qpid.server.virtualhostnode.FileBasedVirtualHostNode; +import org.apache.qpid.server.virtualhostnode.JsonVirtualHostNode; +import org.apache.qpid.server.virtualhostnode.JsonVirtualHostNodeImpl; import org.apache.qpid.test.utils.QpidBrokerTestCase; import org.apache.qpid.test.utils.TestBrokerConfiguration; import org.apache.qpid.test.utils.TestFileUtils; @@ -76,7 +76,7 @@ public class SplitStoreTest extends Qpid public void testJsonConfigurationStoreWithPersistentMessageStore() throws Exception { - doTest(JsonFileConfigStore.TYPE, getTestProfileVirtualHostNodeType()); + doTest(JsonVirtualHostNodeImpl.VIRTUAL_HOST_NODE_TYPE, getTestProfileVirtualHostNodeType()); } public void testSeparateConfigurationAndMessageStoresOfTheSameType() throws Exception @@ -87,14 +87,14 @@ public class SplitStoreTest extends Qpid private void configureAndStartBroker(String virtualHostNodeType, String virtualHostType) throws Exception { final String blueprint = String.format( - "{ \"type\" : \"%s\", \"messageStoreSettings\" : { \"storePath\" : \"%s\" } }", virtualHostType, _messageStorePath); + "{ \"type\" : \"%s\", \"storePath\" : \"%s\" }", virtualHostType, _messageStorePath); final Map<String, String> contextMap = Collections.singletonMap(AbstractStandardVirtualHostNode.VIRTUALHOST_BLUEPRINT_CONTEXT_VAR, blueprint); TestBrokerConfiguration config = getBrokerConfiguration(); config.setObjectAttribute(VirtualHostNode.class, TestBrokerConfiguration.ENTRY_NAME_VIRTUAL_HOST, VirtualHostNode.TYPE, virtualHostNodeType); config.setObjectAttribute(VirtualHostNode.class, TestBrokerConfiguration.ENTRY_NAME_VIRTUAL_HOST, VirtualHostNode.CONTEXT, contextMap); - config.setObjectAttribute(VirtualHostNode.class, TestBrokerConfiguration.ENTRY_NAME_VIRTUAL_HOST, FileBasedVirtualHostNode.STORE_PATH, _configStorePath); + config.setObjectAttribute(VirtualHostNode.class, TestBrokerConfiguration.ENTRY_NAME_VIRTUAL_HOST, JsonVirtualHostNode.STORE_PATH, _configStorePath); super.startBroker(); } 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=1605737&r1=1605736&r2=1605737&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 11:19:54 2014 @@ -74,8 +74,7 @@ import org.apache.qpid.server.txn.Server 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.server.virtualhostnode.JsonVirtualHostNode; import org.apache.qpid.test.utils.QpidTestCase; import org.apache.qpid.util.FileUtils; import org.codehaus.jackson.map.ObjectMapper; @@ -138,7 +137,7 @@ public class VirtualHostMessageStoreTest ConfiguredObjectFactory factory = broker.getObjectFactory(); Map<String, Object> nodeAttributes = new HashMap<>(); nodeAttributes.put(ConfiguredObject.TYPE, getTestProfileVirtualHostNodeType()); - nodeAttributes.put(FileBasedVirtualHostNode.STORE_PATH, _storePath); + nodeAttributes.put(JsonVirtualHostNode.STORE_PATH, _storePath); nodeAttributes.put(VirtualHostNode.NAME, nodeName); _node = factory.create(VirtualHostNode.class, nodeAttributes, broker); Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/MBeanLifeCycleTest.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/MBeanLifeCycleTest.java?rev=1605737&r1=1605736&r2=1605737&view=diff ============================================================================== --- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/MBeanLifeCycleTest.java (original) +++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/MBeanLifeCycleTest.java Thu Jun 26 11:19:54 2014 @@ -36,7 +36,7 @@ import org.apache.qpid.server.model.Virt import org.apache.qpid.server.model.State; import org.apache.qpid.server.model.VirtualHostNode; import org.apache.qpid.server.security.auth.manager.AnonymousAuthenticationManager; -import org.apache.qpid.server.virtualhost.ProvidedStoreVirtualHost; +import org.apache.qpid.server.virtualhost.ProvidedStoreVirtualHostImpl; import org.apache.qpid.server.virtualhostnode.memory.MemoryVirtualHostNode; import org.apache.qpid.systest.rest.QpidRestTestCase; import org.apache.qpid.test.utils.JMXTestUtils; @@ -97,7 +97,7 @@ public class MBeanLifeCycleTest extends Map<String, Object> virtualhostData = new HashMap<>(); virtualhostData.put(VirtualHost.NAME, nodeName); - virtualhostData.put(VirtualHost.TYPE, ProvidedStoreVirtualHost.VIRTUAL_HOST_TYPE); + virtualhostData.put(VirtualHost.TYPE, ProvidedStoreVirtualHostImpl.VIRTUAL_HOST_TYPE); getRestTestHelper().submitRequest("virtualhost/" + nodeName + "/" + hostName, "PUT", virtualhostData, Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java?rev=1605737&r1=1605736&r2=1605737&view=diff ============================================================================== --- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java (original) +++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java Thu Jun 26 11:19:54 2014 @@ -77,8 +77,7 @@ public class Asserts ConfiguredObject.CONTEXT, ConfiguredObject.DESIRED_STATE, VirtualHost.SUPPORTED_QUEUE_TYPES, - VirtualHost.TYPE, - VirtualHost.MESSAGE_STORE_SETTINGS); + VirtualHost.TYPE); assertEquals("Unexpected value of attribute " + VirtualHost.NAME, virtualHostName, Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/VirtualHostNodeRestTest.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/VirtualHostNodeRestTest.java?rev=1605737&r1=1605736&r2=1605737&view=diff ============================================================================== --- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/VirtualHostNodeRestTest.java (original) +++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/VirtualHostNodeRestTest.java Thu Jun 26 11:19:54 2014 @@ -31,7 +31,7 @@ import javax.servlet.http.HttpServletRes import org.apache.qpid.server.model.ConfiguredObject; import org.apache.qpid.server.model.VirtualHostNode; -import org.apache.qpid.server.virtualhostnode.FileBasedVirtualHostNode; +import org.apache.qpid.server.virtualhostnode.JsonVirtualHostNode; import org.apache.qpid.test.utils.TestBrokerConfiguration; /** @@ -149,7 +149,7 @@ public class VirtualHostNodeRestTest ex Map<String, Object> nodeData = new HashMap<String, Object>(); nodeData.put(VirtualHostNode.NAME, nodeName); nodeData.put(VirtualHostNode.TYPE, storeType); - nodeData.put(FileBasedVirtualHostNode.STORE_PATH, configStorePath); + nodeData.put(JsonVirtualHostNode.STORE_PATH, configStorePath); getRestTestHelper().submitRequest("virtualhostnode/" + nodeName, "PUT", 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=1605737&r1=1605736&r2=1605737&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 11:19:54 2014 @@ -30,10 +30,11 @@ 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; +import org.apache.qpid.server.virtualhost.ProvidedStoreVirtualHostImpl; +import org.apache.qpid.server.virtualhostnode.JsonVirtualHostNode; import org.apache.qpid.client.AMQConnection; import org.apache.qpid.server.model.Exchange; import org.apache.qpid.server.model.Queue; @@ -43,7 +44,7 @@ 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.virtualhostnode.FileBasedVirtualHostNode; + import org.apache.qpid.util.FileUtils; public class VirtualHostRestTest extends QpidRestTestCase @@ -534,13 +535,13 @@ public class VirtualHostRestTest extends Map<String, Object> nodeData = new HashMap<>(); nodeData.put(VirtualHostNode.NAME, virtualHostName); nodeData.put(VirtualHostNode.TYPE, virtualHostNodeType); - nodeData.put(FileBasedVirtualHostNode.STORE_PATH, storePath); + nodeData.put(JsonVirtualHostNode.STORE_PATH, storePath); getRestTestHelper().submitRequest("virtualhostnode/" + virtualHostName, "PUT", nodeData, HttpServletResponse.SC_CREATED); Map<String, Object> virtualhostData = new HashMap<>(); virtualhostData.put(VirtualHost.NAME, virtualHostName); - virtualhostData.put(VirtualHost.TYPE, TestMemoryVirtualHost.VIRTUAL_HOST_TYPE); + virtualhostData.put(VirtualHost.TYPE, ProvidedStoreVirtualHostImpl.VIRTUAL_HOST_TYPE); getRestTestHelper().submitRequest("virtualhost/" + virtualHostName + "/" + virtualHostName, "PUT", Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/BrokerACLTest.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/BrokerACLTest.java?rev=1605737&r1=1605736&r2=1605737&view=diff ============================================================================== --- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/BrokerACLTest.java (original) +++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/BrokerACLTest.java Thu Jun 26 11:19:54 2014 @@ -27,6 +27,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import org.apache.qpid.server.virtualhostnode.JsonVirtualHostNode; import org.codehaus.jackson.JsonGenerationException; import org.codehaus.jackson.map.JsonMappingException; import org.apache.qpid.server.management.plugin.HttpManagement; @@ -49,7 +50,6 @@ import org.apache.qpid.server.security.a import org.apache.qpid.server.security.acl.AbstractACLTestCase; import org.apache.qpid.server.security.auth.manager.AnonymousAuthenticationManager; import org.apache.qpid.server.security.auth.manager.PlainPasswordDatabaseAuthenticationManager; -import org.apache.qpid.server.virtualhostnode.FileBasedVirtualHostNode; import org.apache.qpid.systest.rest.QpidRestTestCase; import org.apache.qpid.test.utils.TestBrokerConfiguration; import org.apache.qpid.test.utils.TestFileUtils; @@ -982,7 +982,7 @@ public class BrokerACLTest extends QpidR Map<String, Object> data = new HashMap<String, Object>(); data.put(VirtualHostNode.NAME, virtualHostNodeName); data.put(VirtualHostNode.TYPE, getTestProfileVirtualHostNodeType()); - data.put(FileBasedVirtualHostNode.STORE_PATH, getStoreLocation(virtualHostNodeName)); + data.put(JsonVirtualHostNode.STORE_PATH, getStoreLocation(virtualHostNodeName)); return getRestTestHelper().submitRequest("virtualhostnode/" + virtualHostNodeName, "PUT", data); } 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=1605737&r1=1605736&r2=1605737&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 11:19:54 2014 @@ -68,10 +68,9 @@ import org.apache.qpid.server.model.Conf import org.apache.qpid.server.model.Port; import org.apache.qpid.server.model.Protocol; 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.virtualhostnode.AbstractStandardVirtualHostNode; -import org.apache.qpid.server.virtualhostnode.FileBasedVirtualHostNode; +import org.apache.qpid.server.virtualhostnode.JsonVirtualHostNode; import org.apache.qpid.url.URLSyntaxException; import org.apache.qpid.util.FileUtils; import org.apache.qpid.util.SystemUtils; @@ -251,7 +250,7 @@ public class QpidBrokerTestCase extends configuration.setObjectAttribute(Port.class, TestBrokerConfiguration.ENTRY_NAME_JMX_PORT, Port.PORT, getManagementPort(actualPort) + JMXPORT_CONNECTORSERVER_OFFSET); String workDir = System.getProperty("QPID_WORK") + File.separator + TestBrokerConfiguration.ENTRY_NAME_VIRTUAL_HOST + File.separator + actualPort; - configuration.setObjectAttribute(VirtualHostNode.class, TestBrokerConfiguration.ENTRY_NAME_VIRTUAL_HOST, DurableConfigurationStore.STORE_PATH, workDir); + configuration.setObjectAttribute(VirtualHostNode.class, TestBrokerConfiguration.ENTRY_NAME_VIRTUAL_HOST, JsonVirtualHostNode.STORE_PATH, workDir); } return configuration; @@ -869,9 +868,11 @@ public class QpidBrokerTestCase extends attributes.put(VirtualHostNode.TYPE, storeType); if (storeDir != null) { - attributes.put(FileBasedVirtualHostNode.STORE_PATH, storeDir); + attributes.put(JsonVirtualHostNode.STORE_PATH, storeDir); } + final String blueprint = getTestProfileVirtualHostNodeBlueprint(); + attributes.put(ConfiguredObject.CONTEXT, Collections.singletonMap(AbstractStandardVirtualHostNode.VIRTUALHOST_BLUEPRINT_CONTEXT_VAR, blueprint)); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
