You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2016/11/04 15:15:32 UTC
svn commit: r1768049 [3/3] - in /qpid/java/branches/remove-queue-runner: ./
bdbstore/src/main/java/org/apache/qpid/server/
bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/
bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkele...
Modified: qpid/java/branches/remove-queue-runner/broker-core/src/test/java/org/apache/qpid/server/queue/LastValueQueueListTest.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker-core/src/test/java/org/apache/qpid/server/queue/LastValueQueueListTest.java?rev=1768049&r1=1768048&r2=1768049&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/broker-core/src/test/java/org/apache/qpid/server/queue/LastValueQueueListTest.java (original)
+++ qpid/java/branches/remove-queue-runner/broker-core/src/test/java/org/apache/qpid/server/queue/LastValueQueueListTest.java Fri Nov 4 15:15:32 2016
@@ -40,6 +40,7 @@ import org.apache.qpid.server.model.Conf
import org.apache.qpid.server.model.Queue;
import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.store.TransactionLogResource;
+import org.apache.qpid.server.virtualhost.QueueManagingVirtualHost;
import org.apache.qpid.test.utils.QpidTestCase;
public class LastValueQueueListTest extends QpidTestCase
@@ -61,7 +62,7 @@ public class LastValueQueueListTest exte
queueAttributes.put(Queue.ID, UUID.randomUUID());
queueAttributes.put(Queue.NAME, getName());
queueAttributes.put(LastValueQueue.LVQ_KEY, CONFLATION_KEY);
- final VirtualHost virtualHost = mock(VirtualHost.class);
+ final QueueManagingVirtualHost virtualHost = mock(QueueManagingVirtualHost.class);
when(virtualHost.getEventLogger()).thenReturn(new EventLogger());
ConfiguredObjectFactory factory = new ConfiguredObjectFactoryImpl(BrokerModel.getInstance());
when(virtualHost.getObjectFactory()).thenReturn(factory);
Modified: qpid/java/branches/remove-queue-runner/broker-core/src/test/java/org/apache/qpid/server/queue/PriorityQueueListTest.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker-core/src/test/java/org/apache/qpid/server/queue/PriorityQueueListTest.java?rev=1768049&r1=1768048&r2=1768049&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/broker-core/src/test/java/org/apache/qpid/server/queue/PriorityQueueListTest.java (original)
+++ qpid/java/branches/remove-queue-runner/broker-core/src/test/java/org/apache/qpid/server/queue/PriorityQueueListTest.java Fri Nov 4 15:15:32 2016
@@ -36,12 +36,12 @@ import org.apache.qpid.server.message.AM
import org.apache.qpid.server.message.MessageReference;
import org.apache.qpid.server.message.ServerMessage;
import org.apache.qpid.server.model.BrokerModel;
+import org.apache.qpid.server.model.BrokerTestHelper;
import org.apache.qpid.server.model.ConfiguredObjectFactory;
import org.apache.qpid.server.model.ConfiguredObjectFactoryImpl;
import org.apache.qpid.server.model.Queue;
-import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.store.TransactionLogResource;
-import org.apache.qpid.server.model.BrokerTestHelper;
+import org.apache.qpid.server.virtualhost.QueueManagingVirtualHost;
import org.apache.qpid.test.utils.QpidTestCase;
public class PriorityQueueListTest extends QpidTestCase
@@ -62,7 +62,7 @@ public class PriorityQueueListTest exten
queueAttributes.put(Queue.ID, UUID.randomUUID());
queueAttributes.put(Queue.NAME, getName());
queueAttributes.put(PriorityQueue.PRIORITIES, 10);
- final VirtualHost virtualHost = mock(VirtualHost.class);
+ final QueueManagingVirtualHost virtualHost = mock(QueueManagingVirtualHost.class);
when(virtualHost.getEventLogger()).thenReturn(new EventLogger());
ConfiguredObjectFactory factory = new ConfiguredObjectFactoryImpl(BrokerModel.getInstance());
when(virtualHost.getObjectFactory()).thenReturn(factory);
Modified: qpid/java/branches/remove-queue-runner/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryImplTestBase.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryImplTestBase.java?rev=1768049&r1=1768048&r2=1768049&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryImplTestBase.java (original)
+++ qpid/java/branches/remove-queue-runner/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryImplTestBase.java Fri Nov 4 15:15:32 2016
@@ -45,9 +45,9 @@ import org.apache.qpid.server.model.Brok
import org.apache.qpid.server.model.ConfiguredObjectFactory;
import org.apache.qpid.server.model.ConfiguredObjectFactoryImpl;
import org.apache.qpid.server.model.Queue;
-import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.store.TransactionLogResource;
import org.apache.qpid.server.util.StateChangeListener;
+import org.apache.qpid.server.virtualhost.QueueManagingVirtualHost;
import org.apache.qpid.test.utils.QpidTestCase;
/**
@@ -285,7 +285,7 @@ public abstract class QueueEntryImplTest
Map<String,Object> queueAttributes = new HashMap<String, Object>();
queueAttributes.put(Queue.ID, UUID.randomUUID());
queueAttributes.put(Queue.NAME, getName());
- final VirtualHost virtualHost = mock(VirtualHost.class);
+ final QueueManagingVirtualHost virtualHost = mock(QueueManagingVirtualHost.class);
when(virtualHost.getEventLogger()).thenReturn(new EventLogger());
ConfiguredObjectFactory factory = new ConfiguredObjectFactoryImpl(BrokerModel.getInstance());
Modified: qpid/java/branches/remove-queue-runner/broker-core/src/test/java/org/apache/qpid/server/queue/QueueMessageRecoveryTest.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker-core/src/test/java/org/apache/qpid/server/queue/QueueMessageRecoveryTest.java?rev=1768049&r1=1768048&r2=1768049&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/broker-core/src/test/java/org/apache/qpid/server/queue/QueueMessageRecoveryTest.java (original)
+++ qpid/java/branches/remove-queue-runner/broker-core/src/test/java/org/apache/qpid/server/queue/QueueMessageRecoveryTest.java Fri Nov 4 15:15:32 2016
@@ -33,18 +33,18 @@ import java.util.UUID;
import org.apache.qpid.server.message.MessageInstance;
import org.apache.qpid.server.message.MessageReference;
import org.apache.qpid.server.message.ServerMessage;
+import org.apache.qpid.server.model.BrokerTestHelper;
import org.apache.qpid.server.model.Queue;
-import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.store.MessageEnqueueRecord;
import org.apache.qpid.server.store.StoredMessage;
import org.apache.qpid.server.store.TransactionLogResource;
import org.apache.qpid.server.util.Action;
-import org.apache.qpid.server.model.BrokerTestHelper;
+import org.apache.qpid.server.virtualhost.QueueManagingVirtualHost;
import org.apache.qpid.test.utils.QpidTestCase;
public class QueueMessageRecoveryTest extends QpidTestCase
{
- VirtualHost<?> _vhost;
+ QueueManagingVirtualHost<?> _vhost;
@Override
public void setUp() throws Exception
@@ -195,7 +195,7 @@ public class QueueMessageRecoveryTest ex
private final List<ServerMessage<?>> _messageList;
protected TestQueue(final Map<String, Object> attributes,
- final VirtualHost<?> virtualHost,
+ final QueueManagingVirtualHost<?> virtualHost,
final List<ServerMessage<?>> messageList)
{
super(attributes, virtualHost);
Modified: qpid/java/branches/remove-queue-runner/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleQueueEntryImplTest.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleQueueEntryImplTest.java?rev=1768049&r1=1768048&r2=1768049&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleQueueEntryImplTest.java (original)
+++ qpid/java/branches/remove-queue-runner/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleQueueEntryImplTest.java Fri Nov 4 15:15:32 2016
@@ -38,8 +38,8 @@ import org.apache.qpid.server.model.Brok
import org.apache.qpid.server.model.ConfiguredObjectFactory;
import org.apache.qpid.server.model.ConfiguredObjectFactoryImpl;
import org.apache.qpid.server.model.Queue;
-import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.store.TransactionLogResource;
+import org.apache.qpid.server.virtualhost.QueueManagingVirtualHost;
public class SimpleQueueEntryImplTest extends QueueEntryImplTestBase
{
@@ -52,7 +52,7 @@ public class SimpleQueueEntryImplTest ex
Map<String,Object> queueAttributes = new HashMap<String, Object>();
queueAttributes.put(Queue.ID, UUID.randomUUID());
queueAttributes.put(Queue.NAME, "SimpleQueueEntryImplTest");
- final VirtualHost virtualHost = mock(VirtualHost.class);
+ final QueueManagingVirtualHost virtualHost = mock(QueueManagingVirtualHost.class);
when(virtualHost.getEventLogger()).thenReturn(new EventLogger());
ConfiguredObjectFactory factory = new ConfiguredObjectFactoryImpl(BrokerModel.getInstance());
when(virtualHost.getObjectFactory()).thenReturn(factory);
Modified: qpid/java/branches/remove-queue-runner/broker-core/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryListTest.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker-core/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryListTest.java?rev=1768049&r1=1768048&r2=1768049&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/broker-core/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryListTest.java (original)
+++ qpid/java/branches/remove-queue-runner/broker-core/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryListTest.java Fri Nov 4 15:15:32 2016
@@ -42,8 +42,8 @@ import org.apache.qpid.server.model.Conf
import org.apache.qpid.server.model.ConfiguredObjectFactoryImpl;
import org.apache.qpid.server.model.LifetimePolicy;
import org.apache.qpid.server.model.Queue;
-import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.store.TransactionLogResource;
+import org.apache.qpid.server.virtualhost.QueueManagingVirtualHost;
public class SortedQueueEntryListTest extends QueueEntryListTestBase
{
@@ -90,7 +90,7 @@ public class SortedQueueEntryListTest ex
attributes.put(SortedQueue.SORT_KEY, "KEY");
// Create test list
- final VirtualHost virtualHost = mock(VirtualHost.class);
+ final QueueManagingVirtualHost virtualHost = mock(QueueManagingVirtualHost.class);
when(virtualHost.getEventLogger()).thenReturn(new EventLogger());
ConfiguredObjectFactory factory = new ConfiguredObjectFactoryImpl(BrokerModel.getInstance());
when(virtualHost.getObjectFactory()).thenReturn(factory);
Modified: qpid/java/branches/remove-queue-runner/broker-core/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryTest.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker-core/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryTest.java?rev=1768049&r1=1768048&r2=1768049&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/broker-core/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryTest.java (original)
+++ qpid/java/branches/remove-queue-runner/broker-core/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryTest.java Fri Nov 4 15:15:32 2016
@@ -41,8 +41,8 @@ import org.apache.qpid.server.model.Conf
import org.apache.qpid.server.model.ConfiguredObjectFactoryImpl;
import org.apache.qpid.server.model.LifetimePolicy;
import org.apache.qpid.server.model.Queue;
-import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.store.TransactionLogResource;
+import org.apache.qpid.server.virtualhost.QueueManagingVirtualHost;
public class SortedQueueEntryTest extends QueueEntryImplTestBase
{
@@ -61,7 +61,7 @@ public class SortedQueueEntryTest extend
attributes.put(Queue.LIFETIME_POLICY, LifetimePolicy.PERMANENT);
attributes.put(SortedQueue.SORT_KEY, "KEY");
- final VirtualHost virtualHost = mock(VirtualHost.class);
+ final QueueManagingVirtualHost virtualHost = mock(QueueManagingVirtualHost.class);
when(virtualHost.getEventLogger()).thenReturn(new EventLogger());
ConfiguredObjectFactory factory = new ConfiguredObjectFactoryImpl(BrokerModel.getInstance());
when(virtualHost.getObjectFactory()).thenReturn(factory);
Modified: qpid/java/branches/remove-queue-runner/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueEntryListTest.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueEntryListTest.java?rev=1768049&r1=1768048&r2=1768049&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueEntryListTest.java (original)
+++ qpid/java/branches/remove-queue-runner/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueEntryListTest.java Fri Nov 4 15:15:32 2016
@@ -39,8 +39,8 @@ import org.apache.qpid.server.message.Se
import org.apache.qpid.server.model.BrokerModel;
import org.apache.qpid.server.model.ConfiguredObjectFactoryImpl;
import org.apache.qpid.server.model.Queue;
-import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.store.TransactionLogResource;
+import org.apache.qpid.server.virtualhost.QueueManagingVirtualHost;
public class StandardQueueEntryListTest extends QueueEntryListTestBase
{
@@ -60,7 +60,7 @@ public class StandardQueueEntryListTest
Map<String,Object> queueAttributes = new HashMap<String, Object>();
queueAttributes.put(Queue.ID, UUID.randomUUID());
queueAttributes.put(Queue.NAME, getName());
- final VirtualHost virtualHost = mock(VirtualHost.class);
+ final QueueManagingVirtualHost virtualHost = mock(QueueManagingVirtualHost.class);
when(virtualHost.getEventLogger()).thenReturn(new EventLogger());
_factory = new ConfiguredObjectFactoryImpl(BrokerModel.getInstance());
when(virtualHost.getObjectFactory()).thenReturn(_factory);
@@ -113,7 +113,7 @@ public class StandardQueueEntryListTest
Map<String,Object> queueAttributes = new HashMap<String, Object>();
queueAttributes.put(Queue.ID, UUID.randomUUID());
queueAttributes.put(Queue.NAME, getName());
- final VirtualHost virtualHost = mock(VirtualHost.class);
+ final QueueManagingVirtualHost virtualHost = mock(QueueManagingVirtualHost.class);
when(virtualHost.getEventLogger()).thenReturn(new EventLogger());
when(virtualHost.getObjectFactory()).thenReturn(_factory);
when(virtualHost.getModel()).thenReturn(_factory.getModel());
Modified: qpid/java/branches/remove-queue-runner/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueTest.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueTest.java?rev=1768049&r1=1768048&r2=1768049&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueTest.java (original)
+++ qpid/java/branches/remove-queue-runner/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueTest.java Fri Nov 4 15:15:32 2016
@@ -35,9 +35,9 @@ import org.apache.qpid.server.message.Me
import org.apache.qpid.server.message.ServerMessage;
import org.apache.qpid.server.model.LifetimePolicy;
import org.apache.qpid.server.model.Queue;
-import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.store.MessageDurability;
import org.apache.qpid.server.store.MessageEnqueueRecord;
+import org.apache.qpid.server.virtualhost.QueueManagingVirtualHost;
public class StandardQueueTest extends AbstractQueueTestBase
{
@@ -259,7 +259,7 @@ public class StandardQueueTest extends A
private QueueEntryList _entries = new DequeuedQueueEntryList(this);
- public DequeuedQueue(VirtualHost<?> virtualHost)
+ public DequeuedQueue(QueueManagingVirtualHost<?> virtualHost)
{
super(attributes(), virtualHost);
}
Modified: qpid/java/branches/remove-queue-runner/broker-core/src/test/java/org/apache/qpid/server/virtualhost/AsynchronousMessageStoreRecovererTest.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker-core/src/test/java/org/apache/qpid/server/virtualhost/AsynchronousMessageStoreRecovererTest.java?rev=1768049&r1=1768048&r2=1768049&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/broker-core/src/test/java/org/apache/qpid/server/virtualhost/AsynchronousMessageStoreRecovererTest.java (original)
+++ qpid/java/branches/remove-queue-runner/broker-core/src/test/java/org/apache/qpid/server/virtualhost/AsynchronousMessageStoreRecovererTest.java Fri Nov 4 15:15:32 2016
@@ -33,7 +33,6 @@ import com.google.common.util.concurrent
import org.apache.qpid.server.logging.EventLogger;
import org.apache.qpid.server.model.Queue;
-import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.store.MessageStore;
import org.apache.qpid.server.store.TransactionLogResource;
import org.apache.qpid.server.store.handler.MessageInstanceHandler;
@@ -42,7 +41,7 @@ import org.apache.qpid.test.utils.QpidTe
public class AsynchronousMessageStoreRecovererTest extends QpidTestCase
{
- private VirtualHost _virtualHost;
+ private QueueManagingVirtualHost _virtualHost;
private MessageStore _store;
private MessageStore.MessageStoreReader _storeReader;
@@ -51,7 +50,7 @@ public class AsynchronousMessageStoreRec
{
super.setUp();
- _virtualHost = mock(VirtualHost.class);
+ _virtualHost = mock(QueueManagingVirtualHost.class);
_store = mock(MessageStore.class);
_storeReader = mock(MessageStore.MessageStoreReader.class);
Modified: qpid/java/branches/remove-queue-runner/broker-core/src/test/java/org/apache/qpid/server/virtualhost/SynchronousMessageStoreRecovererTest.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker-core/src/test/java/org/apache/qpid/server/virtualhost/SynchronousMessageStoreRecovererTest.java?rev=1768049&r1=1768048&r2=1768049&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/broker-core/src/test/java/org/apache/qpid/server/virtualhost/SynchronousMessageStoreRecovererTest.java (original)
+++ qpid/java/branches/remove-queue-runner/broker-core/src/test/java/org/apache/qpid/server/virtualhost/SynchronousMessageStoreRecovererTest.java Fri Nov 4 15:15:32 2016
@@ -32,15 +32,13 @@ import static org.mockito.Mockito.when;
import java.util.UUID;
-import org.apache.qpid.server.model.Queue;
-import org.apache.qpid.server.model.VirtualHost;
-import org.apache.qpid.test.utils.QpidTestCase;
import org.mockito.ArgumentMatcher;
import org.apache.qpid.server.logging.EventLogger;
import org.apache.qpid.server.message.EnqueueableMessage;
import org.apache.qpid.server.message.MessageInstance;
import org.apache.qpid.server.message.ServerMessage;
+import org.apache.qpid.server.model.Queue;
import org.apache.qpid.server.queue.QueueEntry;
import org.apache.qpid.server.store.MessageDurability;
import org.apache.qpid.server.store.MessageEnqueueRecord;
@@ -58,18 +56,19 @@ import org.apache.qpid.server.store.hand
import org.apache.qpid.server.txn.DtxBranch;
import org.apache.qpid.server.txn.DtxRegistry;
import org.apache.qpid.server.util.Action;
+import org.apache.qpid.test.utils.QpidTestCase;
import org.apache.qpid.transport.Xid;
public class SynchronousMessageStoreRecovererTest extends QpidTestCase
{
- private VirtualHost<?> _virtualHost;
+ private QueueManagingVirtualHost<?> _virtualHost;
@Override
protected void setUp() throws Exception
{
super.setUp();
- _virtualHost = mock(VirtualHost.class);
+ _virtualHost = mock(QueueManagingVirtualHost.class);
when(_virtualHost.getEventLogger()).thenReturn(new EventLogger());
}
Modified: qpid/java/branches/remove-queue-runner/broker-core/src/test/java/org/apache/qpid/server/virtualhost/VirtualHostQueueCreationTest.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker-core/src/test/java/org/apache/qpid/server/virtualhost/VirtualHostQueueCreationTest.java?rev=1768049&r1=1768048&r2=1768049&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/broker-core/src/test/java/org/apache/qpid/server/virtualhost/VirtualHostQueueCreationTest.java (original)
+++ qpid/java/branches/remove-queue-runner/broker-core/src/test/java/org/apache/qpid/server/virtualhost/VirtualHostQueueCreationTest.java Fri Nov 4 15:15:32 2016
@@ -182,7 +182,7 @@ public class VirtualHostQueueCreationTes
{
String queueName = "testDeadLetterQueueEnabled";
- String dlExchangeName = queueName + VirtualHost.DEFAULT_DLE_NAME_SUFFIX;
+ String dlExchangeName = queueName + QueueManagingVirtualHost.DEFAULT_DLE_NAME_SUFFIX;
String dlQueueName = queueName + AbstractVirtualHost.DEFAULT_DLQ_NAME_SUFFIX;
assertNull("The DLQ should not yet exist", _virtualHost.getChildByName(Queue.class, dlQueueName));
@@ -222,7 +222,7 @@ public class VirtualHostQueueCreationTes
{
String queueName = "testDeadLetterQueueEnabled";
- String dlExchangeName = queueName + VirtualHost.DEFAULT_DLE_NAME_SUFFIX;
+ String dlExchangeName = queueName + QueueManagingVirtualHost.DEFAULT_DLE_NAME_SUFFIX;
String dlQueueName = queueName + AbstractVirtualHost.DEFAULT_DLQ_NAME_SUFFIX;
assertNull("The DLQ should not yet exist", _virtualHost.getChildByName(Queue.class, dlQueueName));
@@ -265,7 +265,7 @@ public class VirtualHostQueueCreationTes
String queueName = "testDeadLetterQueueDisabled";
- String dlExchangeName = queueName + VirtualHost.DEFAULT_DLE_NAME_SUFFIX;
+ String dlExchangeName = queueName + QueueManagingVirtualHost.DEFAULT_DLE_NAME_SUFFIX;
String dlQueueName = queueName + AbstractVirtualHost.DEFAULT_DLQ_NAME_SUFFIX;
assertNull("The DLQ should not yet exist", _virtualHost.getChildByName(Queue.class, dlQueueName));
@@ -295,7 +295,7 @@ public class VirtualHostQueueCreationTes
{
String queueName = "testDeadLetterQueueNotCreatedForAutodeleteQueues";
- String dlExchangeName = queueName + VirtualHost.DEFAULT_DLE_NAME_SUFFIX;
+ String dlExchangeName = queueName + QueueManagingVirtualHost.DEFAULT_DLE_NAME_SUFFIX;
String dlQueueName = queueName + AbstractVirtualHost.DEFAULT_DLQ_NAME_SUFFIX;
assertNull("The DLQ should not yet exist", _virtualHost.getChildByName(Queue.class, dlQueueName));
@@ -391,8 +391,8 @@ public class VirtualHostQueueCreationTes
try
{
// change DLQ name to make its length bigger than exchange name
- setTestSystemProperty(VirtualHost.PROPERTY_DEAD_LETTER_EXCHANGE_SUFFIX, "_DLE");
- setTestSystemProperty(VirtualHost.PROPERTY_DEAD_LETTER_QUEUE_SUFFIX, "_DLQUEUE");
+ setTestSystemProperty(QueueManagingVirtualHost.PROPERTY_DEAD_LETTER_EXCHANGE_SUFFIX, "_DLE");
+ setTestSystemProperty(QueueManagingVirtualHost.PROPERTY_DEAD_LETTER_QUEUE_SUFFIX, "_DLQUEUE");
Map<String,Object> attributes = new HashMap<String, Object>();
attributes.put(Queue.ID, UUID.randomUUID());
@@ -421,8 +421,8 @@ public class VirtualHostQueueCreationTes
try
{
// change DLQ name to make its length bigger than exchange name
- setTestSystemProperty(VirtualHost.PROPERTY_DEAD_LETTER_EXCHANGE_SUFFIX, "_DLEXCHANGE");
- setTestSystemProperty(VirtualHost.PROPERTY_DEAD_LETTER_QUEUE_SUFFIX, "_DLQ");
+ setTestSystemProperty(QueueManagingVirtualHost.PROPERTY_DEAD_LETTER_EXCHANGE_SUFFIX, "_DLEXCHANGE");
+ setTestSystemProperty(QueueManagingVirtualHost.PROPERTY_DEAD_LETTER_QUEUE_SUFFIX, "_DLQ");
Map<String,Object> attributes = new HashMap<String, Object>();
attributes.put(Queue.ID, UUID.randomUUID());
Modified: qpid/java/branches/remove-queue-runner/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/RuleBasedVirtualHostAccessControlProviderImpl.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/RuleBasedVirtualHostAccessControlProviderImpl.java?rev=1768049&r1=1768048&r2=1768049&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/RuleBasedVirtualHostAccessControlProviderImpl.java (original)
+++ qpid/java/branches/remove-queue-runner/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/RuleBasedVirtualHostAccessControlProviderImpl.java Fri Nov 4 15:15:32 2016
@@ -26,13 +26,13 @@ import java.util.Set;
import org.apache.qpid.server.model.ConfiguredObject;
import org.apache.qpid.server.model.ManagedObjectFactoryConstructor;
-import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.model.VirtualHostAccessControlProvider;
import org.apache.qpid.server.security.access.config.ObjectType;
import org.apache.qpid.server.util.urlstreamhandler.data.Handler;
+import org.apache.qpid.server.virtualhost.QueueManagingVirtualHost;
public class RuleBasedVirtualHostAccessControlProviderImpl
- extends AbstractCommonRuleBasedAccessControlProvider<RuleBasedVirtualHostAccessControlProviderImpl, VirtualHost<?>, VirtualHostAccessControlProvider<?>>
+ extends AbstractCommonRuleBasedAccessControlProvider<RuleBasedVirtualHostAccessControlProviderImpl, QueueManagingVirtualHost<?>, VirtualHostAccessControlProvider<?>>
implements RuleBasedVirtualHostAccessControlProvider<RuleBasedVirtualHostAccessControlProviderImpl>
{
private static final EnumSet<ObjectType> ALLOWED_OBJECT_TYPES = EnumSet.of(ObjectType.ALL,
@@ -49,7 +49,7 @@ public class RuleBasedVirtualHostAccessC
@ManagedObjectFactoryConstructor
- public RuleBasedVirtualHostAccessControlProviderImpl(Map<String, Object> attributes, VirtualHost<?> virtualHost)
+ public RuleBasedVirtualHostAccessControlProviderImpl(Map<String, Object> attributes, QueueManagingVirtualHost<?> virtualHost)
{
super(attributes, virtualHost);
}
Modified: qpid/java/branches/remove-queue-runner/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSession.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSession.java?rev=1768049&r1=1768048&r2=1768049&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSession.java (original)
+++ qpid/java/branches/remove-queue-runner/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSession.java Fri Nov 4 15:15:32 2016
@@ -65,6 +65,7 @@ import org.apache.qpid.server.logging.su
import org.apache.qpid.server.message.InstanceProperties;
import org.apache.qpid.server.message.MessageDestination;
import org.apache.qpid.server.message.MessageInstance;
+import org.apache.qpid.server.model.AbstractConfigurationChangeListener;
import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.model.ConfigurationChangeListener;
import org.apache.qpid.server.model.ConfiguredObject;
@@ -1296,7 +1297,7 @@ public class ServerSession extends Sessi
}
}
- private class ConsumerClosedListener implements ConfigurationChangeListener
+ private class ConsumerClosedListener extends AbstractConfigurationChangeListener
{
@Override
public void stateChanged(final ConfiguredObject object, final org.apache.qpid.server.model.State oldState, final org.apache.qpid.server.model.State newState)
@@ -1306,38 +1307,5 @@ public class ServerSession extends Sessi
consumerRemoved((Consumer<?>)object);
}
}
-
- @Override
- public void childAdded(final ConfiguredObject object, final ConfiguredObject child)
- {
-
- }
-
- @Override
- public void childRemoved(final ConfiguredObject object, final ConfiguredObject child)
- {
-
- }
-
- @Override
- public void attributeSet(final ConfiguredObject object,
- final String attributeName,
- final Object oldAttributeValue,
- final Object newAttributeValue)
- {
-
- }
-
- @Override
- public void bulkChangeStart(final ConfiguredObject<?> object)
- {
-
- }
-
- @Override
- public void bulkChangeEnd(final ConfiguredObject<?> object)
- {
-
- }
}
}
Modified: qpid/java/branches/remove-queue-runner/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java?rev=1768049&r1=1768048&r2=1768049&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java (original)
+++ qpid/java/branches/remove-queue-runner/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java Fri Nov 4 15:15:32 2016
@@ -79,6 +79,7 @@ import org.apache.qpid.server.message.Me
import org.apache.qpid.server.message.MessageReference;
import org.apache.qpid.server.message.MessageSource;
import org.apache.qpid.server.message.ServerMessage;
+import org.apache.qpid.server.model.AbstractConfigurationChangeListener;
import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.model.ConfigurationChangeListener;
import org.apache.qpid.server.model.ConfiguredObject;
@@ -1966,7 +1967,7 @@ public class AMQChannel
return Collections.unmodifiableCollection(_consumers);
}
- private class ConsumerClosedListener implements ConfigurationChangeListener
+ private class ConsumerClosedListener extends AbstractConfigurationChangeListener
{
@Override
public void stateChanged(final ConfiguredObject object, final State oldState, final State newState)
@@ -1976,39 +1977,6 @@ public class AMQChannel
consumerRemoved((Consumer<?>)object);
}
}
-
- @Override
- public void childAdded(final ConfiguredObject object, final ConfiguredObject child)
- {
-
- }
-
- @Override
- public void childRemoved(final ConfiguredObject object, final ConfiguredObject child)
- {
-
- }
-
- @Override
- public void attributeSet(final ConfiguredObject object,
- final String attributeName,
- final Object oldAttributeValue,
- final Object newAttributeValue)
- {
-
- }
-
- @Override
- public void bulkChangeStart(final ConfiguredObject<?> object)
- {
-
- }
-
- @Override
- public void bulkChangeEnd(final ConfiguredObject<?> object)
- {
-
- }
}
private void consumerAdded(final Consumer<?> consumer)
Modified: qpid/java/branches/remove-queue-runner/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQChannelTest.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQChannelTest.java?rev=1768049&r1=1768048&r2=1768049&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQChannelTest.java (original)
+++ qpid/java/branches/remove-queue-runner/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQChannelTest.java Fri Nov 4 15:15:32 2016
@@ -63,13 +63,14 @@ import org.apache.qpid.server.store.Stor
import org.apache.qpid.server.store.StoredMemoryMessage;
import org.apache.qpid.server.txn.ServerTransaction;
import org.apache.qpid.server.util.Action;
+import org.apache.qpid.server.virtualhost.QueueManagingVirtualHost;
import org.apache.qpid.test.utils.QpidTestCase;
public class AMQChannelTest extends QpidTestCase
{
public static final AMQShortString ROUTING_KEY = AMQShortString.valueOf("routingKey");
- private VirtualHost<?> _virtualHost;
+ private QueueManagingVirtualHost<?> _virtualHost;
private AMQPConnection_0_8 _amqConnection;
private MessageStore _messageStore;
private AmqpPort<?> _port;
@@ -90,7 +91,7 @@ public class AMQChannelTest extends Qpid
_messageStore = mock(MessageStore.class);
- _virtualHost = mock(VirtualHost.class);
+ _virtualHost = mock(QueueManagingVirtualHost.class);
when(_virtualHost.getContextValue(Integer.class, Broker.MESSAGE_COMPRESSION_THRESHOLD_SIZE)).thenReturn(1);
when(_virtualHost.getContextValue(Long.class, Connection.MAX_UNCOMMITTED_IN_MEMORY_SIZE)).thenReturn(1l);
when(_virtualHost.getContextValue(Boolean.class, Broker.BROKER_MSG_AUTH)).thenReturn(false);
Modified: qpid/java/branches/remove-queue-runner/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8Test.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8Test.java?rev=1768049&r1=1768048&r2=1768049&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8Test.java (original)
+++ qpid/java/branches/remove-queue-runner/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8Test.java Fri Nov 4 15:15:32 2016
@@ -51,17 +51,18 @@ import org.apache.qpid.server.model.Tran
import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.model.VirtualHostNode;
import org.apache.qpid.server.model.port.AmqpPort;
-import org.apache.qpid.server.security.*;
+import org.apache.qpid.server.security.SubjectCreator;
import org.apache.qpid.server.security.auth.AuthenticatedPrincipal;
import org.apache.qpid.server.security.auth.AuthenticationResult;
import org.apache.qpid.server.security.auth.SubjectAuthenticationResult;
import org.apache.qpid.server.security.auth.UsernamePrincipal;
import org.apache.qpid.server.transport.AMQPConnection;
+import org.apache.qpid.server.transport.AggregateTicker;
import org.apache.qpid.server.transport.ServerNetworkConnection;
+import org.apache.qpid.server.virtualhost.QueueManagingVirtualHost;
import org.apache.qpid.server.virtualhost.VirtualHostPrincipal;
import org.apache.qpid.test.utils.QpidTestCase;
import org.apache.qpid.transport.ByteBufferSender;
-import org.apache.qpid.server.transport.AggregateTicker;
public class AMQPConnection_0_8Test extends QpidTestCase
{
@@ -73,7 +74,7 @@ public class AMQPConnection_0_8Test exte
private TaskExecutorImpl _taskExecutor;
private Broker _broker;
private VirtualHostNode _virtualHostNode;
- private VirtualHost _virtualHost;
+ private QueueManagingVirtualHost _virtualHost;
private AmqpPort _port;
private ServerNetworkConnection _network;
private Transport _transport;
@@ -111,7 +112,7 @@ public class AMQPConnection_0_8Test exte
when(_virtualHostNode.getTaskExecutor()).thenReturn(_taskExecutor);
when(_virtualHostNode.getChildExecutor()).thenReturn(_taskExecutor);
- _virtualHost = mock(VirtualHost.class);
+ _virtualHost = mock(QueueManagingVirtualHost.class);
VirtualHostPrincipal virtualHostPrincipal = new VirtualHostPrincipal(_virtualHost);
when(_virtualHost.getParent(VirtualHostNode.class)).thenReturn(_virtualHostNode);
when(_virtualHost.getModel()).thenReturn(model);
Modified: qpid/java/branches/remove-queue-runner/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java?rev=1768049&r1=1768048&r2=1768049&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java (original)
+++ qpid/java/branches/remove-queue-runner/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java Fri Nov 4 15:15:32 2016
@@ -45,7 +45,24 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.qpid.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.protocol.AMQConstant;
+import org.apache.qpid.server.connection.SessionPrincipal;
+import org.apache.qpid.server.consumer.ConsumerImpl;
+import org.apache.qpid.server.consumer.ConsumerTarget;
+import org.apache.qpid.server.logging.LogSubject;
+import org.apache.qpid.server.message.MessageDestination;
+import org.apache.qpid.server.message.MessageSource;
+import org.apache.qpid.server.model.AbstractConfigurationChangeListener;
+import org.apache.qpid.server.model.ConfigurationChangeListener;
+import org.apache.qpid.server.model.ConfiguredObject;
+import org.apache.qpid.server.model.Consumer;
+import org.apache.qpid.server.model.Exchange;
import org.apache.qpid.server.model.NamedAddressSpace;
+import org.apache.qpid.server.model.Queue;
+import org.apache.qpid.server.model.Session;
+import org.apache.qpid.server.protocol.AMQSessionModel;
+import org.apache.qpid.server.protocol.ConsumerListener;
+import org.apache.qpid.server.protocol.LinkRegistry;
import org.apache.qpid.server.protocol.v1_0.framing.OversizeFrameException;
import org.apache.qpid.server.protocol.v1_0.type.AmqpErrorException;
import org.apache.qpid.server.protocol.v1_0.type.Binary;
@@ -75,22 +92,6 @@ import org.apache.qpid.server.protocol.v
import org.apache.qpid.server.protocol.v1_0.type.transport.LinkError;
import org.apache.qpid.server.protocol.v1_0.type.transport.Role;
import org.apache.qpid.server.protocol.v1_0.type.transport.Transfer;
-import org.apache.qpid.protocol.AMQConstant;
-import org.apache.qpid.server.connection.SessionPrincipal;
-import org.apache.qpid.server.consumer.ConsumerImpl;
-import org.apache.qpid.server.consumer.ConsumerTarget;
-import org.apache.qpid.server.logging.LogSubject;
-import org.apache.qpid.server.message.MessageDestination;
-import org.apache.qpid.server.message.MessageSource;
-import org.apache.qpid.server.model.ConfigurationChangeListener;
-import org.apache.qpid.server.model.ConfiguredObject;
-import org.apache.qpid.server.model.Consumer;
-import org.apache.qpid.server.model.Exchange;
-import org.apache.qpid.server.model.Queue;
-import org.apache.qpid.server.model.Session;
-import org.apache.qpid.server.protocol.AMQSessionModel;
-import org.apache.qpid.server.protocol.ConsumerListener;
-import org.apache.qpid.server.protocol.LinkRegistry;
import org.apache.qpid.server.security.SecurityToken;
import org.apache.qpid.server.transport.AMQPConnection;
import org.apache.qpid.server.txn.AutoCommitTransaction;
@@ -1615,7 +1616,7 @@ public class Session_1_0 implements AMQS
}
}
- private class ConsumerClosedListener implements ConfigurationChangeListener
+ private class ConsumerClosedListener extends AbstractConfigurationChangeListener
{
@Override
public void stateChanged(final ConfiguredObject object, final org.apache.qpid.server.model.State oldState, final org.apache.qpid.server.model.State newState)
@@ -1625,39 +1626,6 @@ public class Session_1_0 implements AMQS
consumerRemoved((Consumer<?>)object);
}
}
-
- @Override
- public void childAdded(final ConfiguredObject object, final ConfiguredObject child)
- {
-
- }
-
- @Override
- public void childRemoved(final ConfiguredObject object, final ConfiguredObject child)
- {
-
- }
-
- @Override
- public void attributeSet(final ConfiguredObject object,
- final String attributeName,
- final Object oldAttributeValue,
- final Object newAttributeValue)
- {
-
- }
-
- @Override
- public void bulkChangeStart(final ConfiguredObject<?> object)
- {
-
- }
-
- @Override
- public void bulkChangeEnd(final ConfiguredObject<?> object)
- {
-
- }
}
@Override
Modified: qpid/java/branches/remove-queue-runner/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/virtualhost/derby/DerbyVirtualHost.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/virtualhost/derby/DerbyVirtualHost.java?rev=1768049&r1=1768048&r2=1768049&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/virtualhost/derby/DerbyVirtualHost.java (original)
+++ qpid/java/branches/remove-queue-runner/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/virtualhost/derby/DerbyVirtualHost.java Fri Nov 4 15:15:32 2016
@@ -20,11 +20,13 @@
package org.apache.qpid.server.virtualhost.derby;
import org.apache.qpid.server.model.ManagedAttribute;
-import org.apache.qpid.server.model.ManagedOperation;
-import org.apache.qpid.server.model.VirtualHost;
+import org.apache.qpid.server.store.FileBasedSettings;
import org.apache.qpid.server.store.SizeMonitoringSettings;
+import org.apache.qpid.server.virtualhost.QueueManagingVirtualHost;
-public interface DerbyVirtualHost<X extends DerbyVirtualHost<X>> extends VirtualHost<X>, org.apache.qpid.server.store.FileBasedSettings, SizeMonitoringSettings
+public interface DerbyVirtualHost<X extends DerbyVirtualHost<X>> extends QueueManagingVirtualHost<X>,
+ FileBasedSettings,
+ SizeMonitoringSettings
{
String STORE_PATH = "storePath";
@@ -37,6 +39,4 @@ public interface DerbyVirtualHost<X exte
@ManagedAttribute(mandatory = true, defaultValue = "0")
Long getStoreOverfullSize();
- @ManagedOperation(description = "Resets statistics on this object and all child objects", changesConfiguredObjectState = false, nonModifying = true)
- void resetStatistics();
}
Modified: qpid/java/branches/remove-queue-runner/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/virtualhost/jdbc/JDBCVirtualHost.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/virtualhost/jdbc/JDBCVirtualHost.java?rev=1768049&r1=1768048&r2=1768049&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/virtualhost/jdbc/JDBCVirtualHost.java (original)
+++ qpid/java/branches/remove-queue-runner/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/virtualhost/jdbc/JDBCVirtualHost.java Fri Nov 4 15:15:32 2016
@@ -20,12 +20,11 @@
package org.apache.qpid.server.virtualhost.jdbc;
import org.apache.qpid.server.model.ManagedAttribute;
-import org.apache.qpid.server.model.ManagedOperation;
-import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.store.jdbc.DefaultConnectionProviderFactory;
import org.apache.qpid.server.store.jdbc.JDBCSettings;
+import org.apache.qpid.server.virtualhost.QueueManagingVirtualHost;
-public interface JDBCVirtualHost<X extends JDBCVirtualHost<X>> extends VirtualHost<X>,
+public interface JDBCVirtualHost<X extends JDBCVirtualHost<X>> extends QueueManagingVirtualHost<X>,
JDBCSettings
{
@ManagedAttribute(mandatory=true)
@@ -41,6 +40,4 @@ public interface JDBCVirtualHost<X exten
@ManagedAttribute(secure=true)
String getPassword();
- @ManagedOperation(description = "Resets statistics on this object and all child objects", changesConfiguredObjectState = false, nonModifying = true)
- void resetStatistics();
}
Modified: qpid/java/branches/remove-queue-runner/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/AbstractLogger.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/AbstractLogger.java?rev=1768049&r1=1768048&r2=1768049&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/AbstractLogger.java (original)
+++ qpid/java/branches/remove-queue-runner/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/AbstractLogger.java Fri Nov 4 15:15:32 2016
@@ -36,9 +36,9 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.qpid.server.logging.LogInclusionRule;
+import org.apache.qpid.server.model.AbstractConfigurationChangeListener;
import org.apache.qpid.server.model.AbstractConfiguredObject;
import org.apache.qpid.server.model.BrokerLogInclusionRule;
-import org.apache.qpid.server.model.ConfigurationChangeListener;
import org.apache.qpid.server.model.ConfiguredObject;
import org.apache.qpid.server.model.ConfiguredObjectTypeRegistry;
import org.apache.qpid.server.model.ManagedObject;
@@ -149,7 +149,7 @@ public abstract class AbstractLogger<X e
}
}
- private class LogInclusionRuleListener implements ConfigurationChangeListener
+ private class LogInclusionRuleListener extends AbstractConfigurationChangeListener
{
@Override
@@ -169,29 +169,6 @@ public abstract class AbstractLogger<X e
removeLogInclusionRule((LogBackLogInclusionRule) child);
}
}
-
- @Override
- public void stateChanged(final ConfiguredObject<?> object, final State oldState, final State newState)
- {
- }
-
- @Override
- public void attributeSet(final ConfiguredObject<?> object,
- final String attributeName,
- final Object oldAttributeValue,
- final Object newAttributeValue)
- {
- }
-
- @Override
- public void bulkChangeStart(final ConfiguredObject<?> object)
- {
- }
-
- @Override
- public void bulkChangeEnd(final ConfiguredObject<?> object)
- {
- }
}
public static Map<String, Collection<String>> getSupportedVirtualHostLoggerChildTypes()
Modified: qpid/java/branches/remove-queue-runner/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/VirtualHostLoggerTest.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/VirtualHostLoggerTest.java?rev=1768049&r1=1768048&r2=1768049&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/VirtualHostLoggerTest.java (original)
+++ qpid/java/branches/remove-queue-runner/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/VirtualHostLoggerTest.java Fri Nov 4 15:15:32 2016
@@ -33,23 +33,17 @@ import java.util.Map;
import ch.qos.logback.classic.spi.ILoggingEvent;
import ch.qos.logback.core.Appender;
-
-import org.apache.qpid.server.logging.EventLogger;
-import org.apache.qpid.server.logging.LogFileDetails;
-import org.apache.qpid.server.logging.logback.VirtualHostFileLogger;
-import org.apache.qpid.server.logging.logback.VirtualHostFileLoggerImpl;
-import org.apache.qpid.server.model.BrokerTestHelper;
-import org.apache.qpid.server.security.AccessControl;
-import org.apache.qpid.server.store.DurableConfigurationStore;
-import org.apache.qpid.server.store.preferences.PreferenceStore;
-import org.apache.qpid.util.FileUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.qpid.server.configuration.updater.TaskExecutor;
import org.apache.qpid.server.configuration.updater.TaskExecutorImpl;
+import org.apache.qpid.server.logging.EventLogger;
+import org.apache.qpid.server.logging.LogFileDetails;
+import org.apache.qpid.server.model.AbstractConfiguredObject;
import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.model.BrokerModel;
+import org.apache.qpid.server.model.BrokerTestHelper;
import org.apache.qpid.server.model.ConfiguredObject;
import org.apache.qpid.server.model.Model;
import org.apache.qpid.server.model.State;
@@ -57,8 +51,12 @@ import org.apache.qpid.server.model.Syst
import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.model.VirtualHostLogger;
import org.apache.qpid.server.model.VirtualHostNode;
+import org.apache.qpid.server.security.AccessControl;
+import org.apache.qpid.server.store.DurableConfigurationStore;
+import org.apache.qpid.server.store.preferences.PreferenceStore;
import org.apache.qpid.server.virtualhost.TestMemoryVirtualHost;
import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.util.FileUtils;
public class VirtualHostLoggerTest extends QpidTestCase
{
@@ -185,7 +183,7 @@ public class VirtualHostLoggerTest exte
public void testLoggersRemovedOnVirtualHostStop()
{
VirtualHostLogger logger = createVirtualHostLogger();
- _virtualHost.stop();
+ ((AbstractConfiguredObject<?>)_virtualHost).stop();
Appender<ILoggingEvent> appender = ((ch.qos.logback.classic.Logger) LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME))
.getAppender(logger.getName());
Modified: qpid/java/branches/remove-queue-runner/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java?rev=1768049&r1=1768048&r2=1768049&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java (original)
+++ qpid/java/branches/remove-queue-runner/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java Fri Nov 4 15:15:32 2016
@@ -53,7 +53,7 @@ import org.apache.qpid.server.message.Me
import org.apache.qpid.server.message.ServerMessage;
import org.apache.qpid.server.message.internal.InternalMessage;
import org.apache.qpid.server.message.internal.InternalMessageHeader;
-import org.apache.qpid.server.model.ConfigurationChangeListener;
+import org.apache.qpid.server.model.AbstractConfigurationChangeListener;
import org.apache.qpid.server.model.ConfiguredObject;
import org.apache.qpid.server.model.ManagedObject;
import org.apache.qpid.server.model.NamedAddressSpace;
@@ -1269,7 +1269,7 @@ class ManagementNode implements MessageS
}
}
- private class ModelObjectListener implements ConfigurationChangeListener
+ private class ModelObjectListener extends AbstractConfigurationChangeListener
{
@Override
public void stateChanged(final ConfiguredObject object, final State oldState, final State newState)
@@ -1322,27 +1322,6 @@ class ManagementNode implements MessageS
_entities.get(entityType).remove(child.getName());
}
}
-
- @Override
- public void attributeSet(final ConfiguredObject object,
- final String attributeName,
- final Object oldAttributeValue,
- final Object newAttributeValue)
- {
-
- }
-
- @Override
- public void bulkChangeStart(final ConfiguredObject<?> object)
- {
-
- }
-
- @Override
- public void bulkChangeEnd(final ConfiguredObject<?> object)
- {
-
- }
}
private static class MutableMessageHeader implements AMQMessageHeader
Modified: qpid/java/branches/remove-queue-runner/broker-plugins/management-http/src/main/java/resources/js/qpid/management/TrustStore.js
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker-plugins/management-http/src/main/java/resources/js/qpid/management/TrustStore.js?rev=1768049&r1=1768048&r2=1768049&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/broker-plugins/management-http/src/main/java/resources/js/qpid/management/TrustStore.js (original)
+++ qpid/java/branches/remove-queue-runner/broker-plugins/management-http/src/main/java/resources/js/qpid/management/TrustStore.js Fri Nov 4 15:15:32 2016
@@ -178,7 +178,7 @@ define(["dojo/dom",
TrustStore.prototype.deleteKeyStore = function ()
{
- if (confirm("Are you sure you want to delete trust store '" + this.keyStoreName + "'?"))
+ if (confirm("Are you sure you want to delete trust store '" + this.name + "'?"))
{
var that = this;
this.management.remove(this.modelObj)
Modified: qpid/java/branches/remove-queue-runner/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/base64md5passwordfile/add.js
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/base64md5passwordfile/add.js?rev=1768049&r1=1768048&r2=1768049&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/base64md5passwordfile/add.js (original)
+++ qpid/java/branches/remove-queue-runner/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/base64md5passwordfile/add.js Fri Nov 4 15:15:32 2016
@@ -18,25 +18,16 @@
* under the License.
*
*/
-define(["dojo/query", "dijit/registry", "qpid/common/util", "dojo/dom-class"], function (query, registry, util, domClass)
+define(["dojo/query", "dijit/registry", "qpid/common/util"], function (query, registry, util)
{
return {
show: function (data)
{
util.parseHtmlIntoDiv(data.containerNode, "authenticationprovider/filebased/add.html", function ()
{
- var path = registry.byNode(query(".path", data.containerNode)[0]);
- if (data.data && data.data.id)
- {
- path.set("value", data.data.path);
- path.set("readOnly", true);
- domClass.add(path.domNode, "readOnly")
- }
- else
- {
- path.set("readOnly", false);
- domClass.remove(path.domNode, "readOnly")
- }
+ var pathWidget = registry.byNode(query(".path", data.containerNode)[0]);
+ pathWidget.set("disabled", data.data && data.data.id ? true : false);
+ pathWidget.set("value", data.data ? data.data.path : "");
});
}
};
Modified: qpid/java/branches/remove-queue-runner/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/plainpasswordfile/add.js
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/plainpasswordfile/add.js?rev=1768049&r1=1768048&r2=1768049&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/plainpasswordfile/add.js (original)
+++ qpid/java/branches/remove-queue-runner/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/plainpasswordfile/add.js Fri Nov 4 15:15:32 2016
@@ -18,25 +18,16 @@
* under the License.
*
*/
-define(["dojo/query", "dijit/registry", "qpid/common/util", "dojo/dom-class"], function (query, registry, util, domClass)
+define(["dojo/query", "dijit/registry", "qpid/common/util"], function (query, registry, util)
{
return {
show: function (data)
{
util.parseHtmlIntoDiv(data.containerNode, "authenticationprovider/filebased/add.html", function ()
{
- var path = registry.byNode(query(".path", data.containerNode)[0]);
- if (data.data && data.data.id)
- {
- path.set("value", data.data.path);
- path.set("readOnly", true);
- domClass.add(path.domNode, "readOnly")
- }
- else
- {
- path.set("readOnly", false);
- domClass.remove(path.domNode, "readOnly")
- }
+ var pathWidget = registry.byNode(query(".path", data.containerNode)[0]);
+ pathWidget.set("disabled", data.data && data.data.id ? true : false);
+ pathWidget.set("value", data.data ? data.data.path : "");
});
}
};
Modified: qpid/java/branches/remove-queue-runner/broker-plugins/management-http/src/main/java/resources/js/qpid/management/groupprovider/groupfile/add.js
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker-plugins/management-http/src/main/java/resources/js/qpid/management/groupprovider/groupfile/add.js?rev=1768049&r1=1768048&r2=1768049&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/broker-plugins/management-http/src/main/java/resources/js/qpid/management/groupprovider/groupfile/add.js (original)
+++ qpid/java/branches/remove-queue-runner/broker-plugins/management-http/src/main/java/resources/js/qpid/management/groupprovider/groupfile/add.js Fri Nov 4 15:15:32 2016
@@ -32,11 +32,9 @@ define(["dojo/dom",
var that = this;
util.parse(data.containerNode, template, function ()
{
- if (data.data)
- {
- var pathWidget = registry.byNode(query(".addGroupProviderPath", data.containerNode)[0]);
- pathWidget.set("value", data.data.path);
- }
+ var pathWidget = registry.byNode(query(".addGroupProviderPath", data.containerNode)[0]);
+ pathWidget.set("disabled", data.data && data.data.id ? true : false);
+ pathWidget.set("value", data.data ? data.data.path : "");
});
}
};
Modified: qpid/java/branches/remove-queue-runner/doc/java-broker/src/docbkx/runtime/Java-Broker-Runtime-Memory.xml
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/doc/java-broker/src/docbkx/runtime/Java-Broker-Runtime-Memory.xml?rev=1768049&r1=1768048&r2=1768049&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/doc/java-broker/src/docbkx/runtime/Java-Broker-Runtime-Memory.xml (original)
+++ qpid/java/branches/remove-queue-runner/doc/java-broker/src/docbkx/runtime/Java-Broker-Runtime-Memory.xml Fri Nov 4 15:15:32 2016
@@ -214,12 +214,14 @@
<para>
<informalequation>
<mathphrase>
- memory<subscript>heap</subscript> = 15 MB + 15 kB * N<subscript>sessions</subscript> + 1 kB * N<subscript>messages</subscript> + 17 kB * N<subscript>connections</subscript>
+ memory<subscript>heap</subscript> = 15 MB + 15 kB * N<subscript>sessions</subscript> + 1.5 kB * N<subscript>messages</subscript> + 17 kB * N<subscript>connections</subscript>
</mathphrase>
</informalequation>
+ </para>
+ <para>
<informalequation>
<mathphrase>
- memory<subscript>direct</subscript> = 2 MB + (200 B + averageSize<subscript>msg</subscript> *2)* N<subscript>messages</subscript> + 512 kB * N<subscript>connections</subscript>
+ memory<subscript>direct</subscript> = 2 MB + (200 B + averageSize<subscript>msg</subscript> *2)* N<subscript>messages</subscript> + 1MB * N<subscript>connections</subscript>
</mathphrase>
</informalequation>
Where <mathphrase>N</mathphrase> denotes the total number of connections/sessions/messages on the broker. Furthermore, for direct memory only the messages that have not been flown to disk are relevant.
Modified: qpid/java/branches/remove-queue-runner/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java?rev=1768049&r1=1768048&r2=1768049&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java (original)
+++ qpid/java/branches/remove-queue-runner/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java Fri Nov 4 15:15:32 2016
@@ -49,6 +49,7 @@ import org.apache.qpid.server.model.Virt
import org.apache.qpid.server.queue.LastValueQueue;
import org.apache.qpid.server.queue.PriorityQueue;
import org.apache.qpid.server.queue.SortedQueue;
+import org.apache.qpid.server.virtualhost.QueueManagingVirtualHost;
import org.apache.qpid.test.utils.TestBrokerConfiguration;
public class Asserts
@@ -75,9 +76,9 @@ public class Asserts
ConfiguredObject.DESCRIPTION,
ConfiguredObject.CONTEXT,
ConfiguredObject.DESIRED_STATE,
- VirtualHost.ENABLED_CONNECTION_VALIDATORS,
- VirtualHost.DISABLED_CONNECTION_VALIDATORS,
- VirtualHost.GLOBAL_ADDRESS_DOMAINS,
+ QueueManagingVirtualHost.ENABLED_CONNECTION_VALIDATORS,
+ QueueManagingVirtualHost.DISABLED_CONNECTION_VALIDATORS,
+ QueueManagingVirtualHost.GLOBAL_ADDRESS_DOMAINS,
VirtualHost.TYPE,
VirtualHost.PREFERENCE_STORE_ATTRIBUTES);
@@ -91,8 +92,8 @@ public class Asserts
virtualHost.get(VirtualHost.DURABLE));
assertEquals("Unexpected value of attribute " + VirtualHost.LIFETIME_POLICY, LifetimePolicy.PERMANENT.name(),
virtualHost.get(VirtualHost.LIFETIME_POLICY));
- assertEquals("Unexpected value of attribute " + VirtualHost.QUEUE_DEAD_LETTER_QUEUE_ENABLED, Boolean.FALSE,
- virtualHost.get(VirtualHost.QUEUE_DEAD_LETTER_QUEUE_ENABLED));
+ assertEquals("Unexpected value of attribute " + QueueManagingVirtualHost.QUEUE_DEAD_LETTER_QUEUE_ENABLED, Boolean.FALSE,
+ virtualHost.get(QueueManagingVirtualHost.QUEUE_DEAD_LETTER_QUEUE_ENABLED));
@SuppressWarnings("unchecked")
Map<String, Object> statistics = (Map<String, Object>) virtualHost.get(STATISTICS_ATTRIBUTE);
Modified: qpid/java/branches/remove-queue-runner/systests/src/test/java/org/apache/qpid/server/queue/NodeAutoCreationPolicyTest.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/systests/src/test/java/org/apache/qpid/server/queue/NodeAutoCreationPolicyTest.java?rev=1768049&r1=1768048&r2=1768049&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/systests/src/test/java/org/apache/qpid/server/queue/NodeAutoCreationPolicyTest.java (original)
+++ qpid/java/branches/remove-queue-runner/systests/src/test/java/org/apache/qpid/server/queue/NodeAutoCreationPolicyTest.java Fri Nov 4 15:15:32 2016
@@ -38,9 +38,9 @@ import javax.jms.Topic;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.qpid.server.model.Exchange;
-import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.model.VirtualHostNode;
import org.apache.qpid.server.virtualhost.NodeAutoCreationPolicy;
+import org.apache.qpid.server.virtualhost.QueueManagingVirtualHost;
import org.apache.qpid.test.utils.QpidBrokerTestCase;
import org.apache.qpid.test.utils.TestBrokerConfiguration;
@@ -126,7 +126,7 @@ public class NodeAutoCreationPolicyTest
}
};
- blueprintMap.put(VirtualHost.NODE_AUTO_CREATION_POLICIES, Arrays.asList(policies));
+ blueprintMap.put(QueueManagingVirtualHost.NODE_AUTO_CREATION_POLICIES, Arrays.asList(policies));
String newprint = mapper.writeValueAsString(blueprintMap);
return newprint;
}
Modified: qpid/java/branches/remove-queue-runner/systests/src/test/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/systests/src/test/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java?rev=1768049&r1=1768048&r2=1768049&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/systests/src/test/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java (original)
+++ qpid/java/branches/remove-queue-runner/systests/src/test/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java Fri Nov 4 15:15:32 2016
@@ -70,6 +70,7 @@ import org.apache.qpid.server.transport.
import org.apache.qpid.server.txn.AutoCommitTransaction;
import org.apache.qpid.server.txn.ServerTransaction;
import org.apache.qpid.server.model.BrokerTestHelper;
+import org.apache.qpid.server.virtualhost.QueueManagingVirtualHost;
import org.apache.qpid.server.virtualhost.TestMemoryVirtualHost;
import org.apache.qpid.server.virtualhost.berkeleydb.BDBVirtualHost;
import org.apache.qpid.server.virtualhostnode.JsonVirtualHostNode;
@@ -112,7 +113,7 @@ public class VirtualHostMessageStoreTest
private String queueOwner = "MST";
- private VirtualHost<?> _virtualHost;
+ private QueueManagingVirtualHost<?> _virtualHost;
private String _storePath;
private VirtualHostNode<?> _node;
private TaskExecutor _taskExecutor;
@@ -155,7 +156,7 @@ public class VirtualHostMessageStoreTest
virtualHostAttributes.putAll(attrs);
_node.createChild(VirtualHost.class, virtualHostAttributes, _node);
- _virtualHost = (VirtualHost<?>)_node.getVirtualHost();
+ _virtualHost = (QueueManagingVirtualHost<?>)_node.getVirtualHost();
}
@@ -188,7 +189,7 @@ public class VirtualHostMessageStoreTest
_node.start();
currentState = _node.getState();
assertEquals("Virtual host node is not active", State.ACTIVE, currentState);
- _virtualHost = _node.getVirtualHost();
+ _virtualHost = (QueueManagingVirtualHost<?>) _node.getVirtualHost();
}
public void testQueueExchangeAndBindingCreation() throws Exception
Modified: qpid/java/branches/remove-queue-runner/systests/src/test/java/org/apache/qpid/systest/rest/VirtualHostRestTest.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/systests/src/test/java/org/apache/qpid/systest/rest/VirtualHostRestTest.java?rev=1768049&r1=1768048&r2=1768049&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/systests/src/test/java/org/apache/qpid/systest/rest/VirtualHostRestTest.java (original)
+++ qpid/java/branches/remove-queue-runner/systests/src/test/java/org/apache/qpid/systest/rest/VirtualHostRestTest.java Fri Nov 4 15:15:32 2016
@@ -46,6 +46,7 @@ import org.apache.qpid.server.queue.Prio
import org.apache.qpid.server.queue.SortedQueue;
import org.apache.qpid.server.virtualhost.AbstractVirtualHost;
import org.apache.qpid.server.virtualhost.NodeAutoCreationPolicy;
+import org.apache.qpid.server.virtualhost.QueueManagingVirtualHost;
import org.apache.qpid.server.virtualhost.derby.DerbyVirtualHostImpl;
import org.apache.qpid.server.virtualhostnode.JsonVirtualHostNodeImpl;
@@ -278,12 +279,12 @@ public class VirtualHostRestTest extends
}
}
};
- Map<String, Object> newAttributes = Collections.<String, Object>singletonMap(VirtualHost.NODE_AUTO_CREATION_POLICIES,
+ Map<String, Object> newAttributes = Collections.<String, Object>singletonMap(QueueManagingVirtualHost.NODE_AUTO_CREATION_POLICIES,
Arrays.asList(policies));
getRestTestHelper().submitRequest(restHostUrl, "POST", newAttributes, HttpServletResponse.SC_OK);
Map<String, Object> rereadHostDetails = getRestTestHelper().getJsonAsSingletonList(restHostUrl);
- Object retrievedPolicies = rereadHostDetails.get(VirtualHost.NODE_AUTO_CREATION_POLICIES);
+ Object retrievedPolicies = rereadHostDetails.get(QueueManagingVirtualHost.NODE_AUTO_CREATION_POLICIES);
assertNotNull("Retrieved node policies are null", retrievedPolicies);
assertTrue("Retrieved node policies are not of expected type", retrievedPolicies instanceof List);
List retrievedPoliciesList = (List) retrievedPolicies;
@@ -344,13 +345,13 @@ public class VirtualHostRestTest extends
}
}
};
- Map<String, Object> newAttributes = Collections.<String, Object>singletonMap(VirtualHost.NODE_AUTO_CREATION_POLICIES,
+ Map<String, Object> newAttributes = Collections.<String, Object>singletonMap(QueueManagingVirtualHost.NODE_AUTO_CREATION_POLICIES,
Arrays.asList(policies));
getRestTestHelper().submitRequest(restHostUrl, "POST", newAttributes, 422);
Map<String, Object> rereadHostDetails = getRestTestHelper().getJsonAsSingletonList(restHostUrl);
- Object retrievedPolicies = rereadHostDetails.get(VirtualHost.NODE_AUTO_CREATION_POLICIES);
+ Object retrievedPolicies = rereadHostDetails.get(QueueManagingVirtualHost.NODE_AUTO_CREATION_POLICIES);
assertNotNull("Retrieved node policies are null", retrievedPolicies);
assertTrue("Retrieved node policies are not of expected type", retrievedPolicies instanceof List);
assertTrue("Retrieved node policies is not empty", ((List)retrievedPolicies).isEmpty());
Modified: qpid/java/branches/remove-queue-runner/tck/pom.xml
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/tck/pom.xml?rev=1768049&r1=1768048&r2=1768049&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/tck/pom.xml (original)
+++ qpid/java/branches/remove-queue-runner/tck/pom.xml Fri Nov 4 15:15:32 2016
@@ -29,7 +29,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>qpid-tck</artifactId>
- <name>Apache Qpid JMX TCK Configuration</name>
+ <name>Apache Qpid JMS TCK Configuration</name>
<description>Configuration for Oracle JMS TCK</description>
<properties>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org