You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2012/03/13 16:56:54 UTC
svn commit: r1300204 [8/8] - in
/qpid/branches/java-config-and-management/qpid/java: ./
broker-plugins/experimental/shutdown/src/main/java/org/apache/qpid/shutdown/
broker-plugins/extras/src/main/java/org/apache/qpid/extras/exchanges/diagnostic/
broker...
Modified: qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/AMQBrokerManagerMBeanTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/AMQBrokerManagerMBeanTest.java?rev=1300204&r1=1300203&r2=1300204&view=diff
==============================================================================
--- qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/AMQBrokerManagerMBeanTest.java (original)
+++ qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/AMQBrokerManagerMBeanTest.java Tue Mar 13 15:56:45 2012
@@ -30,6 +30,8 @@ import org.apache.qpid.server.exchange.E
import org.apache.qpid.server.logging.SystemOutMessageLogger;
import org.apache.qpid.server.logging.actors.CurrentActor;
import org.apache.qpid.server.logging.actors.TestLogActor;
+import org.apache.qpid.server.management.AMQBrokerManagerMBean;
+import org.apache.qpid.server.management.VirtualHostMBean;
import org.apache.qpid.server.queue.AMQPriorityQueue;
import org.apache.qpid.server.queue.AMQQueue;
import org.apache.qpid.server.queue.AMQQueueFactory;
@@ -39,7 +41,6 @@ import org.apache.qpid.server.registry.I
import org.apache.qpid.server.store.TestableMemoryMessageStore;
import org.apache.qpid.server.util.TestApplicationRegistry;
import org.apache.qpid.server.virtualhost.VirtualHost;
-import org.apache.qpid.server.virtualhost.VirtualHostImpl;
import org.apache.qpid.test.utils.QpidTestCase;
import java.util.HashMap;
@@ -62,7 +63,7 @@ public class AMQBrokerManagerMBeanTest e
assertTrue(_exchangeRegistry.getExchange(new AMQShortString(exchange3)) == null);
- ManagedBroker mbean = new AMQBrokerManagerMBean((VirtualHostImpl.VirtualHostMBean) _vHost.getManagedObject());
+ ManagedBroker mbean = new AMQBrokerManagerMBean((VirtualHostMBean) _vHost.getManagedObject());
mbean.createNewExchange(exchange1, "direct", false);
mbean.createNewExchange(exchange2, "topic", false);
mbean.createNewExchange(exchange3, "headers", false);
@@ -84,7 +85,7 @@ public class AMQBrokerManagerMBeanTest e
{
String queueName = "testQueue_" + System.currentTimeMillis();
- ManagedBroker mbean = new AMQBrokerManagerMBean((VirtualHostImpl.VirtualHostMBean) _vHost.getManagedObject());
+ ManagedBroker mbean = new AMQBrokerManagerMBean((VirtualHostMBean) _vHost.getManagedObject());
assertTrue(_queueRegistry.getQueue(new AMQShortString(queueName)) == null);
@@ -99,7 +100,7 @@ public class AMQBrokerManagerMBeanTest e
{
String queueName = "testQueue_" + System.currentTimeMillis();
- ManagedBroker mbean = new AMQBrokerManagerMBean((VirtualHostImpl.VirtualHostMBean) _vHost.getManagedObject());
+ ManagedBroker mbean = new AMQBrokerManagerMBean((VirtualHostMBean) _vHost.getManagedObject());
ExchangeRegistry exReg = _vHost.getExchangeRegistry();
Exchange defaultExchange = exReg.getDefaultExchange();
@@ -124,7 +125,7 @@ public class AMQBrokerManagerMBeanTest e
assertNull("The queue should not yet exist", qReg.getQueue(queueName));
- final ManagedBroker mbean = new AMQBrokerManagerMBean((VirtualHostImpl.VirtualHostMBean) _vHost.getManagedObject());
+ final ManagedBroker mbean = new AMQBrokerManagerMBean((VirtualHostMBean) _vHost.getManagedObject());
mbean.createNewQueue(queueName.asString(), "test", false, args);
final AMQQueue createdQueue = qReg.getQueue(queueName);
@@ -148,7 +149,7 @@ public class AMQBrokerManagerMBeanTest e
assertNull("The queue should not yet exist", qReg.getQueue(queueName));
- ManagedBroker mbean = new AMQBrokerManagerMBean((VirtualHostImpl.VirtualHostMBean) _vHost.getManagedObject());
+ ManagedBroker mbean = new AMQBrokerManagerMBean((VirtualHostMBean) _vHost.getManagedObject());
mbean.createNewQueue(queueName.asString(), "test", false, args);
AMQQueue queue = qReg.getQueue(queueName);
Modified: qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/ExchangeMBeanTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/ExchangeMBeanTest.java?rev=1300204&r1=1300203&r2=1300204&view=diff
==============================================================================
--- qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/ExchangeMBeanTest.java (original)
+++ qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/ExchangeMBeanTest.java Tue Mar 13 15:56:45 2012
@@ -59,7 +59,6 @@ public class ExchangeMBeanTest extends
// test general exchange properties
assertEquals("Unexpected exchange name", "amq.direct", mbean.getName());
assertEquals("Unexpected exchange type", "direct", mbean.getExchangeType());
- assertEquals("Unexpected ticket number", Integer.valueOf(0), mbean.getTicketNo());
assertFalse("Unexpected durable flag", mbean.isDurable());
assertTrue("Unexpected auto delete flag", mbean.isAutoDelete());
}
Modified: qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/management/LoggingManagementMBeanTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/management/LoggingManagementMBeanTest.java?rev=1300204&r1=1300203&r2=1300204&view=diff
==============================================================================
--- qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/management/LoggingManagementMBeanTest.java (original)
+++ qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/management/LoggingManagementMBeanTest.java Tue Mar 13 15:56:45 2012
@@ -23,6 +23,7 @@ package org.apache.qpid.server.logging.m
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
+import org.apache.qpid.server.management.LoggingManagementMBean;
import org.apache.qpid.server.util.InternalBrokerBaseCase;
import static org.apache.qpid.management.common.mbeans.LoggingManagement.LOGGER_LEVEL;
Modified: qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/management/AMQUserManagementMBeanTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/management/AMQUserManagementMBeanTest.java?rev=1300204&r1=1300203&r2=1300204&view=diff
==============================================================================
--- qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/management/AMQUserManagementMBeanTest.java (original)
+++ qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/management/AMQUserManagementMBeanTest.java Tue Mar 13 15:56:45 2012
@@ -23,7 +23,7 @@ package org.apache.qpid.server.managemen
import org.apache.qpid.management.common.mbeans.UserManagement;
import org.apache.qpid.server.security.auth.database.PlainPasswordFilePrincipalDatabase;
-import org.apache.qpid.server.security.auth.management.AMQUserManagementMBean;
+import org.apache.qpid.server.management.AMQUserManagementMBean;
import org.apache.qpid.server.util.InternalBrokerBaseCase;
import javax.management.openmbean.CompositeData;
Added: qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/model/impl/AbstractConfiguredObjectImplTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/model/impl/AbstractConfiguredObjectImplTest.java?rev=1300204&view=auto
==============================================================================
--- qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/model/impl/AbstractConfiguredObjectImplTest.java (added)
+++ qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/model/impl/AbstractConfiguredObjectImplTest.java Tue Mar 13 15:56:45 2012
@@ -0,0 +1,176 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+package org.apache.qpid.server.model.impl;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+import junit.framework.TestCase;
+
+import org.apache.qpid.server.model.ConfigurationChangeListener;
+import org.apache.qpid.server.model.ConfiguredObject;
+import org.apache.qpid.server.model.LifetimePolicy;
+import org.apache.qpid.server.model.State;
+import org.apache.qpid.server.model.Statistics;
+
+public class AbstractConfiguredObjectImplTest extends TestCase
+{
+
+ private ConfiguredObject _concreteObject;
+ private UUID _uuid = UUID.randomUUID();
+ private ConfigurationChangeListener _configurationStateChangeListener = mock(ConfigurationChangeListener.class);
+
+ @Override
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+ _concreteObject = createParentConfiguredObject();
+ }
+
+ public void testInitialState()
+ {
+ assertEquals(State.INITIALISING, _concreteObject.getDesiredState());
+ }
+
+ public void testStateNotifications()
+ {
+ _concreteObject.addChangeListener(_configurationStateChangeListener);
+
+ _concreteObject.setDesiredState(State.INITIALISING, State.ACTIVE);
+
+ verify(_configurationStateChangeListener, times(1)).stateChanged(_concreteObject, State.INITIALISING, State.ACTIVE);
+
+ _concreteObject.setDesiredState(State.ACTIVE, State.ACTIVE);
+
+ verify(_configurationStateChangeListener, times(0)).stateChanged(_concreteObject, State.ACTIVE, State.ACTIVE);
+
+ verifyNoMoreInteractions(_configurationStateChangeListener);
+ }
+
+ public void testSetGetAttribute()
+ {
+ assertNull(_concreteObject.getAttribute("test-attribute"));
+
+ assertEquals(Integer.valueOf(1), _concreteObject.setAttribute("test-attribute", null, Integer.valueOf(1)));
+ assertEquals(Integer.valueOf(1), _concreteObject.getAttribute("test-attribute"));
+
+ assertNull(_concreteObject.setAttribute("test-attribute", Integer.valueOf(1), null));
+ assertNull(_concreteObject.getAttribute("test-attribute"));
+ }
+
+ public void testSetAttributeWhenCurrentNotMatched()
+ {
+ assertEquals(Integer.valueOf(1), _concreteObject.setAttribute("test-attribute", null, Integer.valueOf(1)));
+ assertEquals(Integer.valueOf(1), _concreteObject.getAttribute("test-attribute"));
+
+ assertEquals(Integer.valueOf(1), _concreteObject.setAttribute("test-attribute", Integer.valueOf(2), Integer.valueOf(3)));
+ assertEquals("Expected no change", Integer.valueOf(1), _concreteObject.getAttribute("test-attribute"));
+ }
+
+ public void testParentage()
+ {
+ TestParentCO parentCO = createParentConfiguredObject();
+ assertNull("Parent should have no parent", parentCO.getParent(TestParentCO.class));
+
+ Map<Class<? extends ConfiguredObject>, ConfiguredObject> parent = new HashMap<Class<? extends ConfiguredObject>, ConfiguredObject>();
+ parent.put(TestParentCO.class, parentCO);
+ TestChildCO childCO = createChildConfiguredObject(parent);
+
+ assertEquals("Child should have its parent", parentCO, childCO.getParent(TestParentCO.class));
+
+ TestParentCO stranger = createParentConfiguredObject();
+ assertNotSame("Child should not have stranger as its parent", stranger, childCO.getParent(TestParentCO.class));
+
+ }
+
+ private TestParentCO createParentConfiguredObject()
+ {
+ return new TestParentCO(_uuid, "parent1", State.INITIALISING, true, LifetimePolicy.PERMANENT, 0l, AbstractConfiguredObject.EMPTY_ATTRIBUTE_MAP);
+ }
+
+ private TestChildCO createChildConfiguredObject(Map<Class<? extends ConfiguredObject>, ConfiguredObject> parents)
+ {
+ return new TestChildCO(_uuid, "parent1", State.INITIALISING, true, LifetimePolicy.PERMANENT, 0l, AbstractConfiguredObject.EMPTY_ATTRIBUTE_MAP, parents);
+ }
+
+ private final class TestParentCO extends AbstractConfiguredObject
+ {
+ private TestParentCO(UUID id, String name, State state, boolean durable, LifetimePolicy lifetimePolicy,
+ long timeToLive, Map<String, Object> attributes)
+ {
+ super(id, name, state, durable, lifetimePolicy, timeToLive, attributes, EMPTY_PARENT_MAP);
+ }
+
+ @Override
+ public State getActualState()
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ protected Object getLock()
+ {
+ return this;
+ }
+
+ @Override
+ public Statistics getStatistics()
+ {
+ return null;
+ }
+ }
+
+ private final class TestChildCO extends AbstractConfiguredObject
+ {
+ private TestChildCO(UUID id, String name, State state, boolean durable, LifetimePolicy lifetimePolicy,
+ long timeToLive, Map<String, Object> attributes,
+ Map<Class<? extends ConfiguredObject>, ConfiguredObject> parents)
+ {
+ super(id, name, state, durable, lifetimePolicy, timeToLive, attributes, parents);
+ }
+
+ @Override
+ public State getActualState()
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ protected Object getLock()
+ {
+ return this;
+ }
+
+ @Override
+ public Statistics getStatistics()
+ {
+ return null;
+ }
+ }
+
+}
Added: qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/model/impl/BrokerImplTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/model/impl/BrokerImplTest.java?rev=1300204&view=auto
==============================================================================
--- qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/model/impl/BrokerImplTest.java (added)
+++ qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/model/impl/BrokerImplTest.java Tue Mar 13 15:56:45 2012
@@ -0,0 +1,106 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+package org.apache.qpid.server.model.impl;
+
+import static org.apache.qpid.server.model.impl.AbstractConfiguredObject.EMPTY_ATTRIBUTE_MAP;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+
+import java.util.UUID;
+
+import junit.framework.TestCase;
+
+import org.apache.qpid.server.model.Broker;
+import org.apache.qpid.server.model.ConfigurationChangeListener;
+import org.apache.qpid.server.model.LifetimePolicy;
+import org.apache.qpid.server.model.State;
+import org.apache.qpid.server.model.VirtualHost;
+
+public class BrokerImplTest extends TestCase
+{
+ private Broker _broker;
+ private UUID _brokerUuid = UUID.randomUUID();
+ private ConfigurationChangeListener _childAddedRemovedListener = mock(ConfigurationChangeListener.class);
+
+ @Override
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+ createBroker();
+ }
+
+ public void testVirtualHostChildAddedAndDeletedNotifications()
+ {
+ _broker.addChangeListener(_childAddedRemovedListener);
+
+ VirtualHost createdVirtualHost = _broker.createVirtualHost("vhost", State.INITIALISING, true, LifetimePolicy.PERMANENT, 0, EMPTY_ATTRIBUTE_MAP);
+
+ verify(_childAddedRemovedListener).childAdded(_broker, createdVirtualHost);
+ verifyNoMoreInteractions(_childAddedRemovedListener);
+
+ _broker.deleteVirtualHost(createdVirtualHost);
+ verify(_childAddedRemovedListener).childRemoved(_broker, createdVirtualHost);
+
+ verifyNoMoreInteractions(_childAddedRemovedListener);
+ }
+
+ public void testVirtualHostDeleteUnknownDisallowed()
+ {
+ try
+ {
+ _broker.deleteVirtualHost(mock(VirtualHost.class));
+ fail("Exception not thrown");
+ }
+ catch (IllegalArgumentException iae)
+ {
+ // PASS
+ }
+ }
+
+ public void testVirtualHostDeletedTwiceDisallowed()
+ {
+ VirtualHost createdVirtualHost = _broker.createVirtualHost("vhost", State.INITIALISING, true, LifetimePolicy.PERMANENT, 0, EMPTY_ATTRIBUTE_MAP);
+ _broker.deleteVirtualHost(createdVirtualHost);
+
+ try
+ {
+ _broker.deleteVirtualHost(createdVirtualHost);
+ fail("Exception not thrown");
+ }
+ catch (IllegalArgumentException iae)
+ {
+ // PASS
+ }
+ }
+
+ private void createBroker()
+ {
+ _broker = new BrokerImpl(_brokerUuid,
+ "broker1",
+ State.INITIALISING,
+ true,
+ LifetimePolicy.PERMANENT,
+ 0l,
+ EMPTY_ATTRIBUTE_MAP);
+ }
+}
Added: qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/model/impl/VirtualHostImplTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/model/impl/VirtualHostImplTest.java?rev=1300204&view=auto
==============================================================================
--- qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/model/impl/VirtualHostImplTest.java (added)
+++ qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/model/impl/VirtualHostImplTest.java Tue Mar 13 15:56:45 2012
@@ -0,0 +1,108 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+package org.apache.qpid.server.model.impl;
+
+import static org.apache.qpid.server.model.impl.AbstractConfiguredObject.EMPTY_ATTRIBUTE_MAP;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+
+import java.util.UUID;
+
+import junit.framework.TestCase;
+
+import org.apache.qpid.server.model.Broker;
+import org.apache.qpid.server.model.ConfigurationChangeListener;
+import org.apache.qpid.server.model.Exchange;
+import org.apache.qpid.server.model.LifetimePolicy;
+import org.apache.qpid.server.model.Queue;
+import org.apache.qpid.server.model.State;
+import org.apache.qpid.server.model.VirtualHost;
+
+public class VirtualHostImplTest extends TestCase
+{
+ private VirtualHost _virtualHost;
+ private UUID _brokerUuid = UUID.randomUUID();
+ private ConfigurationChangeListener _childAddedRemovedListener = mock(ConfigurationChangeListener.class);
+
+ @Override
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+ createVirtualHost();
+ }
+
+ public void testQueueChildAddedAndDeletedNotifications()
+ {
+ _virtualHost.addChangeListener(_childAddedRemovedListener);
+
+ Queue queue = _virtualHost.createQueue("queue", State.INITIALISING, true, LifetimePolicy.PERMANENT, 0, EMPTY_ATTRIBUTE_MAP);
+
+ verify(_childAddedRemovedListener).childAdded(_virtualHost, queue);
+ verifyNoMoreInteractions(_childAddedRemovedListener);
+
+ _virtualHost.deleteQueue(queue);
+
+ verify(_childAddedRemovedListener).childRemoved(_virtualHost, queue);
+ verifyNoMoreInteractions(_childAddedRemovedListener);
+ }
+
+ public void testExchangeChildAddedNotifications()
+ {
+ _virtualHost.addChangeListener(_childAddedRemovedListener);
+
+ Exchange exchange = _virtualHost.createExchange("exchange", State.INITIALISING, true, LifetimePolicy.PERMANENT, 0L, "direct", EMPTY_ATTRIBUTE_MAP);
+
+ verify(_childAddedRemovedListener).childAdded(_virtualHost, exchange);
+ verifyNoMoreInteractions(_childAddedRemovedListener);
+ }
+
+ public void testQueueDeletedTwiceDisallowed()
+ {
+ Queue queue = _virtualHost.createQueue("queue", State.INITIALISING, true, LifetimePolicy.PERMANENT, 0, EMPTY_ATTRIBUTE_MAP);
+
+ _virtualHost.deleteQueue(queue);
+
+ try
+ {
+ _virtualHost.deleteQueue(queue);
+ fail("Exception not thrown");
+ }
+ catch (IllegalArgumentException iae)
+ {
+ // PASS
+ }
+ }
+
+ private void createVirtualHost()
+ {
+ Broker broker = new BrokerImpl(_brokerUuid,
+ "broker1",
+ State.INITIALISING,
+ true,
+ LifetimePolicy.PERMANENT,
+ 0l,
+ EMPTY_ATTRIBUTE_MAP);
+
+ _virtualHost = broker.createVirtualHost("vhost1", State.INITIALISING, true, LifetimePolicy.PERMANENT, 0, EMPTY_ATTRIBUTE_MAP);
+ }
+}
Modified: qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBeanTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBeanTest.java?rev=1300204&r1=1300203&r2=1300204&view=diff
==============================================================================
--- qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBeanTest.java (original)
+++ qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBeanTest.java Tue Mar 13 15:56:45 2012
@@ -26,6 +26,7 @@ import org.apache.qpid.AMQException;
import org.apache.qpid.framing.AMQShortString;
import org.apache.qpid.management.common.mbeans.ManagedConnection;
import org.apache.qpid.server.AMQChannel;
+import org.apache.qpid.server.management.AMQProtocolSessionMBean;
import org.apache.qpid.server.queue.AMQQueue;
import org.apache.qpid.server.queue.AMQQueueFactory;
import org.apache.qpid.server.registry.ApplicationRegistry;
Modified: qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueAlertTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueAlertTest.java?rev=1300204&r1=1300203&r2=1300204&view=diff
==============================================================================
--- qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueAlertTest.java (original)
+++ qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueAlertTest.java Tue Mar 13 15:56:45 2012
@@ -27,6 +27,7 @@ import org.apache.qpid.framing.ContentHe
import org.apache.qpid.framing.abstraction.ContentChunk;
import org.apache.qpid.framing.abstraction.MessagePublishInfo;
import org.apache.qpid.server.AMQChannel;
+import org.apache.qpid.server.management.AMQQueueMBean;
import org.apache.qpid.server.message.AMQMessage;
import org.apache.qpid.server.message.MessageMetaData;
import org.apache.qpid.server.protocol.InternalTestProtocolSession;
Modified: qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java?rev=1300204&r1=1300203&r2=1300204&view=diff
==============================================================================
--- qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java (original)
+++ qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java Tue Mar 13 15:56:45 2012
@@ -31,6 +31,7 @@ import org.apache.qpid.framing.abstracti
import org.apache.qpid.framing.abstraction.MessagePublishInfo;
import org.apache.qpid.management.common.mbeans.ManagedQueue;
import org.apache.qpid.server.AMQChannel;
+import org.apache.qpid.server.management.AMQQueueMBean;
import org.apache.qpid.server.message.AMQMessage;
import org.apache.qpid.server.message.MessageMetaData;
import org.apache.qpid.server.protocol.InternalTestProtocolSession;
Modified: qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java?rev=1300204&r1=1300203&r2=1300204&view=diff
==============================================================================
--- qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java (original)
+++ qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java Tue Mar 13 15:56:45 2012
@@ -36,6 +36,8 @@ import org.apache.qpid.server.security.A
import org.apache.qpid.server.subscription.Subscription;
import org.apache.qpid.server.virtualhost.VirtualHost;
+import java.util.Collection;
+import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -98,7 +100,7 @@ public class MockAMQQueue implements AMQ
return "[MockAMQQueue]";
}
- };
+ };
}
public ConfigStore getConfigStore()
@@ -219,12 +221,17 @@ public class MockAMQQueue implements AMQ
public void registerSubscription(Subscription subscription, boolean exclusive) throws AMQException
{
-
+
}
public void unregisterSubscription(Subscription subscription) throws AMQException
{
-
+
+ }
+
+ public Collection<Subscription> getConsumers()
+ {
+ return Collections.emptyList();
}
public int getConsumerCount()
@@ -283,7 +290,7 @@ public class MockAMQQueue implements AMQ
}
public int delete() throws AMQException
- {
+ {
_deleted = true;
return getMessageCount();
}
@@ -358,17 +365,17 @@ public class MockAMQQueue implements AMQ
public void moveMessagesToAnotherQueue(long fromMessageId, long toMessageId, String queueName)
{
-
+
}
public void copyMessagesToAnotherQueue(long fromMessageId, long toMessageId, String queueName)
{
-
+
}
public void removeMessagesFromQueue(long fromMessageId, long toMessageId)
{
-
+
}
public long getMaximumMessageSize()
@@ -378,7 +385,7 @@ public class MockAMQQueue implements AMQ
public void setMaximumMessageSize(long value)
{
-
+
}
public long getMaximumMessageCount()
@@ -388,7 +395,7 @@ public class MockAMQQueue implements AMQ
public void setMaximumMessageCount(long value)
{
-
+
}
public long getMaximumQueueDepth()
@@ -398,7 +405,7 @@ public class MockAMQQueue implements AMQ
public void setMaximumQueueDepth(long value)
{
-
+
}
public long getMaximumMessageAge()
@@ -408,7 +415,7 @@ public class MockAMQQueue implements AMQ
public void setMaximumMessageAge(long maximumMessageAge)
{
-
+
}
public long getMinimumAlertRepeatGap()
@@ -418,7 +425,7 @@ public class MockAMQQueue implements AMQ
public void deleteMessageFromTop()
{
-
+
}
public long clearQueue()
@@ -429,7 +436,7 @@ public class MockAMQQueue implements AMQ
public void checkMessageStatus() throws AMQException
{
-
+
}
public Set<NotificationCheck> getNotificationChecks()
@@ -439,22 +446,22 @@ public class MockAMQQueue implements AMQ
public void flushSubscription(Subscription sub) throws AMQException
{
-
+
}
public void deliverAsync(Subscription sub)
{
-
+
}
public void deliverAsync()
{
-
+
}
public void stop()
{
-
+
}
public boolean isExclusive()
@@ -469,7 +476,7 @@ public class MockAMQQueue implements AMQ
public void setAlternateExchange(Exchange exchange)
{
-
+
}
public Map<String, Object> getArguments()
@@ -503,7 +510,7 @@ public class MockAMQQueue implements AMQ
public void setCapacity(long capacity)
{
-
+
}
public long getFlowResumeCapacity()
@@ -513,7 +520,7 @@ public class MockAMQQueue implements AMQ
public void setFlowResumeCapacity(long flowResumeCapacity)
{
-
+
}
public void configure(ConfigurationPlugin config)
Modified: qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/transport/ServerConnectionMBeanTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/transport/ServerConnectionMBeanTest.java?rev=1300204&r1=1300203&r2=1300204&view=diff
==============================================================================
--- qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/transport/ServerConnectionMBeanTest.java (original)
+++ qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/transport/ServerConnectionMBeanTest.java Tue Mar 13 15:56:45 2012
@@ -22,6 +22,7 @@ package org.apache.qpid.server.transport
import org.apache.qpid.management.common.mbeans.ManagedConnection;
import org.apache.qpid.server.configuration.MockConnectionConfig;
+import org.apache.qpid.server.management.ServerConnectionMBean;
import org.apache.qpid.server.registry.ApplicationRegistry;
import org.apache.qpid.server.util.InternalBrokerBaseCase;
import org.apache.qpid.server.virtualhost.VirtualHost;
Modified: qpid/branches/java-config-and-management/qpid/java/build.deps
URL: http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/build.deps?rev=1300204&r1=1300203&r2=1300204&view=diff
==============================================================================
--- qpid/branches/java-config-and-management/qpid/java/build.deps (original)
+++ qpid/branches/java-config-and-management/qpid/java/build.deps Tue Mar 13 15:56:45 2012
@@ -43,9 +43,20 @@ slf4j-log4j=lib/slf4j-log4j12-1.6.1.jar
xalan=lib/xalan-2.7.0.jar
+jetty=lib/jetty-6.1.14.jar
+jetty-util=lib/jetty-util-6.1.14.jar
+jetty-servlet-tester=lib/jetty-servlet-tester-6.1.14.jar
+servlet-api=lib/servlet-api.jar
+
+osgi-core=lib/org.osgi.core-1.0.0.jar
felix-main=lib/org.apache.felix.main-2.0.5.jar
-felix.libs=${felix-main}
+felix.libs=${osgi-core} ${felix-main}
+
+jackson-core=lib/jackson-core-asl-1.9.0.jar
+jackson-mapper=lib/jackson-mapper-asl-1.9.0.jar
+
+mockito=lib/mockito-all-1.9.0.jar
commons-configuration.libs = ${commons-beanutils-core} ${commons-digester} \
${commons-codec} ${commons-lang} ${commons-collections} ${commons-configuration}
@@ -56,10 +67,11 @@ tools.libs=${commons-configuration.libs}
broker.libs=${commons-cli} ${commons-logging} ${log4j} ${slf4j-log4j} \
${xalan} ${felix.libs} ${derby-db} ${commons-configuration.libs}
+broker-plugins-management.libs=${jetty} ${jetty-util} ${servlet-api} ${jackson-core} ${jackson-mapper}
broker-plugins.libs=${felix.libs} ${log4j} ${commons-configuration.libs}
junit-toolkit.libs=${log4j} ${junit} ${slf4j-api}
-test.libs=${slf4j-log4j} ${junit-toolkit.libs}
+test.libs=${slf4j-log4j} ${junit-toolkit.libs} ${mockito}
ibm-icu=lib/com.ibm.icu_3.8.1.v20080530.jar
ecl-core-jface=lib/org.eclipse.jface_3.4.1.M20080827-2000.jar
Added: qpid/branches/java-config-and-management/qpid/java/lib/jackson-core-asl-1.9.0.jar
URL: http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/lib/jackson-core-asl-1.9.0.jar?rev=1300204&view=auto
==============================================================================
Files qpid/branches/java-config-and-management/qpid/java/lib/jackson-core-asl-1.9.0.jar (added) and qpid/branches/java-config-and-management/qpid/java/lib/jackson-core-asl-1.9.0.jar Tue Mar 13 15:56:45 2012 differ
Added: qpid/branches/java-config-and-management/qpid/java/lib/jackson-mapper-asl-1.9.0.jar
URL: http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/lib/jackson-mapper-asl-1.9.0.jar?rev=1300204&view=auto
==============================================================================
Files qpid/branches/java-config-and-management/qpid/java/lib/jackson-mapper-asl-1.9.0.jar (added) and qpid/branches/java-config-and-management/qpid/java/lib/jackson-mapper-asl-1.9.0.jar Tue Mar 13 15:56:45 2012 differ
Added: qpid/branches/java-config-and-management/qpid/java/lib/jetty-6.1.14.jar
URL: http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/lib/jetty-6.1.14.jar?rev=1300204&view=auto
==============================================================================
Files qpid/branches/java-config-and-management/qpid/java/lib/jetty-6.1.14.jar (added) and qpid/branches/java-config-and-management/qpid/java/lib/jetty-6.1.14.jar Tue Mar 13 15:56:45 2012 differ
Added: qpid/branches/java-config-and-management/qpid/java/lib/jetty-util-6.1.14.jar
URL: http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/lib/jetty-util-6.1.14.jar?rev=1300204&view=auto
==============================================================================
Files qpid/branches/java-config-and-management/qpid/java/lib/jetty-util-6.1.14.jar (added) and qpid/branches/java-config-and-management/qpid/java/lib/jetty-util-6.1.14.jar Tue Mar 13 15:56:45 2012 differ
Added: qpid/branches/java-config-and-management/qpid/java/lib/mockito-all-1.9.0.jar
URL: http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/lib/mockito-all-1.9.0.jar?rev=1300204&view=auto
==============================================================================
Files qpid/branches/java-config-and-management/qpid/java/lib/mockito-all-1.9.0.jar (added) and qpid/branches/java-config-and-management/qpid/java/lib/mockito-all-1.9.0.jar Tue Mar 13 15:56:45 2012 differ
Added: qpid/branches/java-config-and-management/qpid/java/lib/servlet-api.jar
URL: http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/lib/servlet-api.jar?rev=1300204&view=auto
==============================================================================
Files qpid/branches/java-config-and-management/qpid/java/lib/servlet-api.jar (added) and qpid/branches/java-config-and-management/qpid/java/lib/servlet-api.jar Tue Mar 13 15:56:45 2012 differ
Modified: qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java?rev=1300204&r1=1300203&r2=1300204&view=diff
==============================================================================
--- qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java (original)
+++ qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java Tue Mar 13 15:56:45 2012
@@ -341,7 +341,8 @@ public interface ManagedQueue
* Sets the Alternate Exchange for the queue, for use in dead letter queue functionality.
*
* @since Qpid JMX API 2.4
- * @param the name of the exchange to use. Specifying null or the empty string will clear the alternate exchange.
+ * @param exchangeName the name of the exchange to use. Specifying null or the empty string will clear the
+ * alternate exchange.
* @throws IOException
*/
void setAlternateExchange(String exchangeName) throws IOException;
Modified: qpid/branches/java-config-and-management/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/ViewUtility.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/ViewUtility.java?rev=1300204&r1=1300203&r2=1300204&view=diff
==============================================================================
--- qpid/branches/java-config-and-management/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/ViewUtility.java (original)
+++ qpid/branches/java-config-and-management/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/ViewUtility.java Tue Mar 13 15:56:45 2012
@@ -404,13 +404,8 @@ public class ViewUtility
private static void convertByteArray(FormToolkit toolkit, Composite compositeHolder, CompositeData data, String itemName, String encoding)
{
- Byte[] arrayItems = (Byte[])data.get(itemName);
- byte[] byteArray = new byte[arrayItems.length];
+ byte[] byteArray = getByteArray(data, itemName);
- for (int i = 0; i < arrayItems.length; i++)
- {
- byteArray[i] = arrayItems[i];
- }
try
{
String textMessage = new String(byteArray, encoding);
@@ -427,6 +422,27 @@ public class ViewUtility
}
}
+ private static byte[] getByteArray(CompositeData data, String itemName)
+ {
+ byte[] byteArray;
+ Object binaryData = data.get(itemName);
+
+ if(binaryData instanceof byte[])
+ {
+ byteArray = (byte[]) binaryData;
+ }
+ else
+ {
+ Byte[] objectArray = (Byte[]) binaryData;
+ byteArray = new byte[objectArray.length];
+ for(int i = 0; i < objectArray.length; i++)
+ {
+ byteArray[i] = objectArray[i];
+ }
+ }
+ return byteArray;
+ }
+
private static Shell getShell()
{
Shell shell = Display.getCurrent().getActiveShell();
@@ -462,13 +478,8 @@ public class ViewUtility
private static void handleBinaryMessageContent(FormToolkit toolkit, Composite compositeHolder, CompositeData data, String itemName, String encoding)
{
final String thisEncoding = encoding;
- final Byte[] arrayItems = (Byte[]) data.get(itemName);
- final byte[] byteArray = new byte[arrayItems.length];
- for (int i = 0; i < arrayItems.length; i++)
- {
- byteArray[i] = arrayItems[i];
- }
+ final byte[] byteArray = getByteArray(data, itemName);
try
{
Modified: qpid/branches/java-config-and-management/qpid/java/management/eclipse-plugin/src/test/java/org/apache/qpid/management/ui/ManagementConsoleTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/management/eclipse-plugin/src/test/java/org/apache/qpid/management/ui/ManagementConsoleTest.java?rev=1300204&r1=1300203&r2=1300204&view=diff
==============================================================================
--- qpid/branches/java-config-and-management/qpid/java/management/eclipse-plugin/src/test/java/org/apache/qpid/management/ui/ManagementConsoleTest.java (original)
+++ qpid/branches/java-config-and-management/qpid/java/management/eclipse-plugin/src/test/java/org/apache/qpid/management/ui/ManagementConsoleTest.java Tue Mar 13 15:56:45 2012
@@ -24,9 +24,9 @@ import org.apache.qpid.exchange.Exchange
import org.apache.qpid.framing.AMQShortString;
import org.apache.qpid.server.exchange.DirectExchange;
import org.apache.qpid.server.management.AMQManagedObject;
+import org.apache.qpid.server.management.AMQQueueMBean;
import org.apache.qpid.server.queue.AMQQueue;
import org.apache.qpid.server.queue.AMQQueueFactory;
-import org.apache.qpid.server.queue.AMQQueueMBean;
import org.apache.qpid.server.registry.ApplicationRegistry;
import org.apache.qpid.server.registry.IApplicationRegistry;
import org.apache.qpid.server.util.InternalBrokerBaseCase;
Modified: qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/ManagedQueueMBeanTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/ManagedQueueMBeanTest.java?rev=1300204&r1=1300203&r2=1300204&view=diff
==============================================================================
--- qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/ManagedQueueMBeanTest.java (original)
+++ qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/ManagedQueueMBeanTest.java Tue Mar 13 15:56:45 2012
@@ -24,7 +24,7 @@ import org.apache.log4j.Logger;
import org.apache.qpid.client.AMQSession;
import org.apache.qpid.configuration.ClientProperties;
import org.apache.qpid.management.common.mbeans.ManagedQueue;
-import org.apache.qpid.server.queue.AMQQueueMBean;
+import org.apache.qpid.server.management.AMQQueueMBean;
import org.apache.qpid.test.utils.JMXTestUtils;
import org.apache.qpid.test.utils.QpidBrokerTestCase;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org