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 2014/04/07 14:44:44 UTC
svn commit: r1585471 [3/3] - in /qpid/trunk/qpid/java:
bdbstore/jmx/src/main/java/org/apache/qpid/server/store/berkeleydb/jmx/
bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/
bdbstore/src/main/resources/META-INF/services/ bdbstore/src/t...
Modified: qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionOpenMethodHandler.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionOpenMethodHandler.java?rev=1585471&r1=1585470&r2=1585471&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionOpenMethodHandler.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionOpenMethodHandler.java Mon Apr 7 12:44:42 2014
@@ -20,6 +20,8 @@
*/
package org.apache.qpid.server.protocol.v0_8.handler;
+import java.security.AccessControlException;
+
import org.apache.log4j.Logger;
import org.apache.qpid.AMQException;
@@ -32,10 +34,8 @@ import org.apache.qpid.server.protocol.v
import org.apache.qpid.server.protocol.v0_8.state.AMQState;
import org.apache.qpid.server.protocol.v0_8.state.AMQStateManager;
import org.apache.qpid.server.protocol.v0_8.state.StateAwareMethodListener;
-import org.apache.qpid.server.virtualhost.State;
import org.apache.qpid.server.virtualhost.VirtualHost;
-
-import java.security.AccessControlException;
+import org.apache.qpid.server.virtualhost.VirtualHostState;
public class ConnectionOpenMethodHandler implements StateAwareMethodListener<ConnectionOpenBody>
{
@@ -92,7 +92,7 @@ public class ConnectionOpenMethodHandler
throw body.getConnectionException(AMQConstant.ACCESS_REFUSED, e.getMessage());
}
- if (virtualHost.getState() != State.ACTIVE)
+ if (virtualHost.getVirtualHostState() != VirtualHostState.ACTIVE)
{
throw body.getConnectionException(AMQConstant.CONNECTION_FORCED, "Virtual host '" + virtualHost.getName() + "' is not active");
}
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MessageContentServlet.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MessageContentServlet.java?rev=1585471&r1=1585470&r2=1585471&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MessageContentServlet.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MessageContentServlet.java Mon Apr 7 12:44:42 2014
@@ -77,7 +77,7 @@ public class MessageContentServlet exten
String vhostName = pathInfoElements[0];
String queueName = pathInfoElements[1];
- VirtualHost<?> vhost = null;
+ VirtualHost<?,?,?> vhost = null;
for(VirtualHost vh : getBroker().getVirtualHosts())
{
@@ -91,7 +91,7 @@ public class MessageContentServlet exten
return getQueueFromVirtualHost(queueName, vhost);
}
- private Queue getQueueFromVirtualHost(String queueName, VirtualHost<?> vhost)
+ private Queue getQueueFromVirtualHost(String queueName, VirtualHost<?,?,?> vhost)
{
Queue queue = null;
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MessageServlet.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MessageServlet.java?rev=1585471&r1=1585470&r2=1585471&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MessageServlet.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MessageServlet.java Mon Apr 7 12:44:42 2014
@@ -31,6 +31,9 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpServletResponse;
import org.apache.log4j.Logger;
+import org.codehaus.jackson.map.ObjectMapper;
+import org.codehaus.jackson.map.SerializationConfig;
+
import org.apache.qpid.server.consumer.ConsumerImpl;
import org.apache.qpid.server.message.AMQMessageHeader;
import org.apache.qpid.server.message.MessageReference;
@@ -41,8 +44,6 @@ import org.apache.qpid.server.queue.Queu
import org.apache.qpid.server.queue.QueueEntryVisitor;
import org.apache.qpid.server.security.SecurityManager;
import org.apache.qpid.server.security.access.Operation;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
public class MessageServlet extends AbstractServlet
{
@@ -134,9 +135,9 @@ public class MessageServlet extends Abst
String vhostName = pathInfoElements[0];
String queueName = pathInfoElements[1];
- VirtualHost<?> vhost = null;
+ VirtualHost<?,?,?> vhost = null;
- for(VirtualHost<?> vh : getBroker().getVirtualHosts())
+ for(VirtualHost<?,?,?> vh : getBroker().getVirtualHosts())
{
if(vh.getName().equals(vhostName))
{
@@ -148,11 +149,11 @@ public class MessageServlet extends Abst
return getQueueFromVirtualHost(queueName, vhost);
}
- private Queue getQueueFromVirtualHost(String queueName, VirtualHost<?> vhost)
+ private Queue getQueueFromVirtualHost(String queueName, VirtualHost<?,?,?> vhost)
{
Queue queue = null;
- for(Queue q : vhost.getQueues())
+ for(Queue<?> q : vhost.getQueues())
{
if(q.getName().equals(queueName))
@@ -420,7 +421,7 @@ public class MessageServlet extends Abst
String destQueueName = (String) providedObject.get("destinationQueue");
Boolean move = (Boolean) providedObject.get("move");
- final VirtualHost<?> vhost = sourceQueue.getParent(VirtualHost.class);
+ final VirtualHost<?,?,?> vhost = sourceQueue.getParent(VirtualHost.class);
boolean isMoveTransaction = move != null && Boolean.valueOf(move);
@@ -461,7 +462,7 @@ public class MessageServlet extends Abst
final Queue<?> sourceQueue = getQueueFromRequest(request);
- final VirtualHost<?> vhost = sourceQueue.getParent(VirtualHost.class);
+ final VirtualHost<?,?,?> vhost = sourceQueue.getParent(VirtualHost.class);
final List<Long> messageIds = new ArrayList<Long>();
@@ -485,7 +486,7 @@ public class MessageServlet extends Abst
}
- private void authorizeMethod(String methodName, VirtualHost<?> vhost)
+ private void authorizeMethod(String methodName, VirtualHost<?,?,?> vhost)
{
SecurityManager securityManager = getBroker().getSecurityManager();
securityManager.authoriseMethod(Operation.UPDATE, "VirtualHost.Queue", methodName, vhost.getName());
Modified: qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagement.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagement.java?rev=1585471&r1=1585470&r2=1585471&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagement.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagement.java Mon Apr 7 12:44:42 2014
@@ -21,7 +21,17 @@
package org.apache.qpid.server.jmx;
+import java.io.IOException;
+import java.lang.reflect.Type;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+import javax.management.JMException;
+
import org.apache.log4j.Logger;
+
import org.apache.qpid.server.configuration.IllegalConfigurationException;
import org.apache.qpid.server.jmx.mbeans.LoggingManagementMBean;
import org.apache.qpid.server.jmx.mbeans.ServerInformationMBean;
@@ -29,21 +39,22 @@ import org.apache.qpid.server.jmx.mbeans
import org.apache.qpid.server.jmx.mbeans.UserManagementMBean;
import org.apache.qpid.server.jmx.mbeans.VirtualHostMBean;
import org.apache.qpid.server.logging.log4j.LoggingManagementFacade;
-import org.apache.qpid.server.model.*;
+import org.apache.qpid.server.model.AuthenticationProvider;
+import org.apache.qpid.server.model.Broker;
+import org.apache.qpid.server.model.ConfigurationChangeListener;
+import org.apache.qpid.server.model.ConfiguredObject;
+import org.apache.qpid.server.model.ManagedAttribute;
import org.apache.qpid.server.model.ManagedObject;
+import org.apache.qpid.server.model.PasswordCredentialManagingAuthenticationProvider;
+import org.apache.qpid.server.model.Port;
+import org.apache.qpid.server.model.Protocol;
+import org.apache.qpid.server.model.State;
+import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.model.adapter.AbstractPluginAdapter;
import org.apache.qpid.server.plugin.QpidServiceLoader;
import org.apache.qpid.server.util.MapValueConverter;
import org.apache.qpid.server.util.ServerScopedRuntimeException;
-import javax.management.JMException;
-import java.io.IOException;
-import java.lang.reflect.Type;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-
@ManagedObject( category = false , type = "MANAGEMENT-JMX" )
public class JMXManagement extends AbstractPluginAdapter<JMXManagement> implements ConfigurationChangeListener
{
@@ -143,7 +154,7 @@ public class JMXManagement extends Abstr
synchronized (_children)
{
- for(VirtualHost<?> virtualHost : broker.getVirtualHosts())
+ for(VirtualHost<?,?,?> virtualHost : broker.getVirtualHosts())
{
if(!_children.containsKey(virtualHost))
{
Modified: qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/MBeanInvocationHandlerImpl.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/MBeanInvocationHandlerImpl.java?rev=1585471&r1=1585470&r2=1585471&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/MBeanInvocationHandlerImpl.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/MBeanInvocationHandlerImpl.java Mon Apr 7 12:44:42 2014
@@ -20,14 +20,15 @@
*/
package org.apache.qpid.server.jmx;
-import org.apache.log4j.Logger;
-
-import org.apache.qpid.server.configuration.BrokerProperties;
-import org.apache.qpid.server.model.Broker;
-import org.apache.qpid.server.model.VirtualHost;
-import org.apache.qpid.server.security.SecurityManager;
-import org.apache.qpid.server.security.access.Operation;
-import org.apache.qpid.server.security.auth.AuthenticatedPrincipal;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+import java.security.AccessControlContext;
+import java.security.AccessController;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
+import java.util.Arrays;
import javax.management.Attribute;
import javax.management.JMException;
@@ -38,15 +39,15 @@ import javax.management.ObjectName;
import javax.management.RuntimeErrorException;
import javax.management.remote.MBeanServerForwarder;
import javax.security.auth.Subject;
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
-import java.security.AccessControlContext;
-import java.security.AccessController;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
-import java.util.Arrays;
+
+import org.apache.log4j.Logger;
+
+import org.apache.qpid.server.configuration.BrokerProperties;
+import org.apache.qpid.server.model.Broker;
+import org.apache.qpid.server.model.VirtualHost;
+import org.apache.qpid.server.security.SecurityManager;
+import org.apache.qpid.server.security.access.Operation;
+import org.apache.qpid.server.security.auth.AuthenticatedPrincipal;
/**
* This class can be used by the JMXConnectorServer as an InvocationHandler for the mbean operations. It delegates
@@ -200,7 +201,7 @@ public class MBeanInvocationHandlerImpl
if (virtualHostName != null)
{
- VirtualHost<?> virtualHost = _broker.findVirtualHostByName(virtualHostName);
+ VirtualHost<?,?,?> virtualHost = _broker.findVirtualHostByName(virtualHostName);
if (virtualHost == null)
{
throw new IllegalArgumentException("Virtual host with name '" + virtualHostName + "' is not found.");
Modified: qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/MBeanUtils.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/MBeanUtils.java?rev=1585471&r1=1585470&r2=1585471&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/MBeanUtils.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/MBeanUtils.java Mon Apr 7 12:44:42 2014
@@ -29,7 +29,7 @@ import org.apache.qpid.server.model.Virt
public class MBeanUtils
{
- public static Queue findQueueFromQueueName(VirtualHost<?> virtualHost, String queueName) throws OperationsException
+ public static Queue findQueueFromQueueName(VirtualHost<?,?,?> virtualHost, String queueName) throws OperationsException
{
Queue queue = ConfiguredObjectFinder.findConfiguredObjectByName(virtualHost.getQueues(), queueName);
if (queue == null)
@@ -42,7 +42,7 @@ public class MBeanUtils
}
}
- public static Exchange findExchangeFromExchangeName(VirtualHost<?> virtualHost, String exchangeName) throws OperationsException
+ public static Exchange findExchangeFromExchangeName(VirtualHost<?,?,?> virtualHost, String exchangeName) throws OperationsException
{
Exchange exchange = ConfiguredObjectFinder.findConfiguredObjectByName(virtualHost.getExchanges(), exchangeName);
if (exchange == null)
Modified: qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/QueueMBean.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/QueueMBean.java?rev=1585471&r1=1585470&r2=1585471&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/QueueMBean.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/QueueMBean.java Mon Apr 7 12:44:42 2014
@@ -298,7 +298,7 @@ public class QueueMBean extends AMQManag
}
else
{
- VirtualHost<?> virtualHost = _queue.getParent(VirtualHost.class);
+ VirtualHost<?,?,?> virtualHost = _queue.getParent(VirtualHost.class);
Exchange exchange = MBeanUtils.findExchangeFromExchangeName(virtualHost, exchangeName);
_queue.setAttribute(Queue.ALTERNATE_EXCHANGE, getAlternateExchange(), exchange);
Modified: qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/VirtualHostMBean.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/VirtualHostMBean.java?rev=1585471&r1=1585470&r2=1585471&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/VirtualHostMBean.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/VirtualHostMBean.java Mon Apr 7 12:44:42 2014
@@ -21,7 +21,16 @@
package org.apache.qpid.server.jmx.mbeans;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.management.JMException;
+import javax.management.ObjectName;
+
import org.apache.log4j.Logger;
+
import org.apache.qpid.server.jmx.AMQManagedObject;
import org.apache.qpid.server.jmx.ManagedObject;
import org.apache.qpid.server.jmx.ManagedObjectRegistry;
@@ -34,18 +43,11 @@ import org.apache.qpid.server.model.Stat
import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.virtualhost.ManagedVirtualHost;
-import javax.management.JMException;
-import javax.management.ObjectName;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-
public class VirtualHostMBean extends AMQManagedObject implements ManagedVirtualHost, ConfigurationChangeListener
{
private static final Logger LOGGER = Logger.getLogger(VirtualHostMBean.class);
- private final VirtualHost<?> _virtualHost;
+ private final VirtualHost<?,?,?> _virtualHost;
private final Map<ConfiguredObject, AMQManagedObject> _children =
new HashMap<ConfiguredObject, AMQManagedObject>();
Modified: qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/VirtualHostManagerMBean.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/VirtualHostManagerMBean.java?rev=1585471&r1=1585470&r2=1585471&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/VirtualHostManagerMBean.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/VirtualHostManagerMBean.java Mon Apr 7 12:44:42 2014
@@ -36,6 +36,7 @@ import javax.management.ObjectName;
import javax.management.OperationsException;
import org.apache.log4j.Logger;
+
import org.apache.qpid.management.common.mbeans.ManagedBroker;
import org.apache.qpid.management.common.mbeans.ManagedQueue;
import org.apache.qpid.management.common.mbeans.annotations.MBeanConstructor;
@@ -47,7 +48,6 @@ import org.apache.qpid.server.model.Life
import org.apache.qpid.server.model.Queue;
import org.apache.qpid.server.model.State;
import org.apache.qpid.server.model.VirtualHost;
-import org.apache.qpid.server.queue.AMQQueueFactory;
import org.apache.qpid.server.queue.QueueArgumentsConverter;
@MBeanDescription("This MBean exposes the broker level management features")
@@ -106,7 +106,7 @@ public class VirtualHostManagerMBean ext
@Override
public String[] getExchangeTypes() throws IOException
{
- Collection<String> exchangeTypes = _virtualHostMBean.getVirtualHost().getExchangeTypes();
+ Collection<String> exchangeTypes = _virtualHostMBean.getVirtualHost().getExchangeTypeNames();
return exchangeTypes.toArray(new String[exchangeTypes.size()]);
}
@@ -158,7 +158,7 @@ public class VirtualHostManagerMBean ext
public void createNewExchange(String name, String type, boolean durable)
throws IOException, JMException, MBeanException
{
- if (!getConfiguredObject().getExchangeTypes().contains(type))
+ if (!getConfiguredObject().getExchangeTypeNames().contains(type))
{
throw new OperationsException("No such exchange type \""+type+"\"");
}
Modified: qpid/trunk/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/VirtualHostManagerMBeanTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/VirtualHostManagerMBeanTest.java?rev=1585471&r1=1585470&r2=1585471&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/VirtualHostManagerMBeanTest.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/VirtualHostManagerMBeanTest.java Mon Apr 7 12:44:42 2014
@@ -20,8 +20,8 @@
package org.apache.qpid.server.jmx.mbeans;
import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import java.util.Collections;
@@ -30,6 +30,7 @@ import java.util.Map;
import javax.management.OperationsException;
import junit.framework.TestCase;
+import org.mockito.ArgumentCaptor;
import org.apache.qpid.server.jmx.ManagedObjectRegistry;
import org.apache.qpid.server.model.Exchange;
@@ -37,9 +38,7 @@ import org.apache.qpid.server.model.Life
import org.apache.qpid.server.model.Queue;
import org.apache.qpid.server.model.State;
import org.apache.qpid.server.model.VirtualHost;
-import org.apache.qpid.server.queue.AMQQueueFactory;
import org.apache.qpid.server.queue.QueueArgumentsConverter;
-import org.mockito.ArgumentCaptor;
public class VirtualHostManagerMBeanTest extends TestCase
{
@@ -59,7 +58,7 @@ public class VirtualHostManagerMBeanTest
protected void setUp() throws Exception
{
_mockVirtualHost = mock(VirtualHost.class);
- when(_mockVirtualHost.getExchangeTypes()).thenReturn(Collections.singletonList(TEST_EXCHANGE_TYPE));
+ when(_mockVirtualHost.getExchangeTypeNames()).thenReturn(Collections.singletonList(TEST_EXCHANGE_TYPE));
_mockManagedObjectRegistry = mock(ManagedObjectRegistry.class);
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java?rev=1585471&r1=1585470&r2=1585471&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java Mon Apr 7 12:44:42 2014
@@ -20,10 +20,6 @@
*/
package org.apache.qpid.server.store;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
import java.io.File;
import java.util.ArrayList;
import java.util.Collection;
@@ -31,6 +27,7 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.log4j.Logger;
+
import org.apache.qpid.common.AMQPFilterTypes;
import org.apache.qpid.framing.AMQShortString;
import org.apache.qpid.framing.BasicContentHeaderProperties;
@@ -59,7 +56,8 @@ import org.apache.qpid.server.queue.Stan
import org.apache.qpid.server.txn.AutoCommitTransaction;
import org.apache.qpid.server.txn.ServerTransaction;
import org.apache.qpid.server.util.BrokerTestHelper;
-import org.apache.qpid.server.virtualhost.StandardVirtualHostFactory;
+import org.apache.qpid.server.virtualhost.AbstractVirtualHost;
+import org.apache.qpid.server.virtualhost.StandardVirtualHost;
import org.apache.qpid.server.virtualhost.VirtualHost;
import org.apache.qpid.server.virtualhost.VirtualHostRegistry;
import org.apache.qpid.test.utils.QpidTestCase;
@@ -102,9 +100,9 @@ public class VirtualHostMessageStoreTest
private String queueOwner = "MST";
- private VirtualHost _virtualHost;
- private org.apache.qpid.server.model.VirtualHost<?> _virtualHostModel;
+ private AbstractVirtualHost<?> _virtualHost;
private String _storePath;
+ private Map<String, Object> _attributes;
public void setUp() throws Exception
{
@@ -118,13 +116,11 @@ public class VirtualHostMessageStoreTest
messageStoreSettings.put(MessageStore.STORE_PATH, _storePath);
messageStoreSettings.put(MessageStore.STORE_TYPE, getTestProfileMessageStoreType());
- _virtualHostModel = mock(org.apache.qpid.server.model.VirtualHost.class);
+ _attributes = new HashMap<String, Object>();
+ _attributes.put(org.apache.qpid.server.model.VirtualHost.MESSAGE_STORE_SETTINGS, messageStoreSettings);
+ _attributes.put(org.apache.qpid.server.model.VirtualHost.TYPE, StandardVirtualHost.TYPE);
+ _attributes.put(org.apache.qpid.server.model.VirtualHost.NAME, hostName);
- when(_virtualHostModel.getMessageStoreSettings()).thenReturn(messageStoreSettings);
- when(_virtualHostModel.getAttribute(eq(org.apache.qpid.server.model.VirtualHost.TYPE))).thenReturn(StandardVirtualHostFactory.TYPE);
- when(_virtualHostModel.getAttribute(eq(org.apache.qpid.server.model.VirtualHost.NAME))).thenReturn(hostName);
- when(_virtualHostModel.getType()).thenReturn(StandardVirtualHostFactory.TYPE);
- when(_virtualHostModel.getName()).thenReturn(hostName);
cleanup(new File(_storePath));
@@ -136,9 +132,9 @@ public class VirtualHostMessageStoreTest
return _storePath;
}
- protected org.apache.qpid.server.model.VirtualHost<?> getVirtualHostModel()
+ protected org.apache.qpid.server.model.VirtualHost<?,?,?> getVirtualHostModel()
{
- return _virtualHostModel;
+ return _virtualHost;
}
@Override
@@ -182,13 +178,7 @@ public class VirtualHostMessageStoreTest
try
{
- _virtualHost = BrokerTestHelper.createVirtualHost(new VirtualHostRegistry(new EventLogger()), getVirtualHostModel());
- when(_virtualHostModel.getId()).thenReturn(_virtualHost.getId());
-
- ConfiguredObjectRecord objectRecord = mock(ConfiguredObjectRecord.class);
- when(objectRecord.getId()).thenReturn(_virtualHost.getId());
- when(objectRecord.getType()).thenReturn(org.apache.qpid.server.model.VirtualHost.class.getSimpleName());
- when(_virtualHostModel.asObjectRecord()).thenReturn(objectRecord);
+ _virtualHost = (AbstractVirtualHost<?>) BrokerTestHelper.createVirtualHost(new VirtualHostRegistry(new EventLogger()), _attributes);
}
catch (Exception e)
{
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/VirtualHostRestTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/VirtualHostRestTest.java?rev=1585471&r1=1585470&r2=1585471&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/VirtualHostRestTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/VirtualHostRestTest.java Mon Apr 7 12:44:42 2014
@@ -30,16 +30,17 @@ import java.util.Map;
import javax.jms.Session;
import javax.servlet.http.HttpServletResponse;
+import org.codehaus.jackson.JsonGenerationException;
+import org.codehaus.jackson.map.JsonMappingException;
+
import org.apache.qpid.client.AMQConnection;
import org.apache.qpid.server.model.Exchange;
import org.apache.qpid.server.model.Queue;
import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.queue.ConflationQueue;
import org.apache.qpid.server.store.MessageStore;
-import org.apache.qpid.server.virtualhost.StandardVirtualHostFactory;
+import org.apache.qpid.server.virtualhost.StandardVirtualHost;
import org.apache.qpid.util.FileUtils;
-import org.codehaus.jackson.JsonGenerationException;
-import org.codehaus.jackson.map.JsonMappingException;
public class VirtualHostRestTest extends QpidRestTestCase
{
@@ -542,7 +543,7 @@ public class VirtualHostRestTest extends
Map<String, Object> hostData = new HashMap<String, Object>();
hostData.put(VirtualHost.NAME, hostName);
- hostData.put(VirtualHost.TYPE, StandardVirtualHostFactory.TYPE);
+ hostData.put(VirtualHost.TYPE, StandardVirtualHost.TYPE);
hostData.put(VirtualHost.MESSAGE_STORE_SETTINGS, messageStoreSettings);
return getRestTestHelper().submitRequest("/rest/virtualhost/" + hostName, "PUT", hostData);
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/BrokerACLTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/BrokerACLTest.java?rev=1585471&r1=1585470&r2=1585471&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/BrokerACLTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/BrokerACLTest.java Mon Apr 7 12:44:42 2014
@@ -47,7 +47,7 @@ import org.apache.qpid.server.security.a
import org.apache.qpid.server.security.auth.manager.PlainPasswordFileAuthenticationManagerFactory;
import org.apache.qpid.server.security.group.FileGroupManagerFactory;
import org.apache.qpid.server.store.MessageStore;
-import org.apache.qpid.server.virtualhost.StandardVirtualHostFactory;
+import org.apache.qpid.server.virtualhost.StandardVirtualHost;
import org.apache.qpid.systest.rest.QpidRestTestCase;
import org.apache.qpid.test.utils.TestBrokerConfiguration;
import org.apache.qpid.test.utils.TestFileUtils;
@@ -985,7 +985,7 @@ public class BrokerACLTest extends QpidR
Map<String, Object> hostData = new HashMap<String, Object>();
hostData.put(VirtualHost.NAME, hostName);
hostData.put(VirtualHost.MESSAGE_STORE_SETTINGS, messageStoreSettings);
- hostData.put(VirtualHost.TYPE, StandardVirtualHostFactory.TYPE);
+ hostData.put(VirtualHost.TYPE, StandardVirtualHost.TYPE);
return getRestTestHelper().submitRequest("/rest/virtualhost/" + hostName, "PUT", hostData);
}
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java?rev=1585471&r1=1585470&r2=1585471&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java Mon Apr 7 12:44:42 2014
@@ -36,7 +36,7 @@ import org.apache.qpid.server.model.Virt
import org.apache.qpid.server.protocol.AmqpProtocolVersion;
import org.apache.qpid.server.store.MemoryMessageStore;
import org.apache.qpid.server.store.MessageStore;
-import org.apache.qpid.server.virtualhost.StandardVirtualHostFactory;
+import org.apache.qpid.server.virtualhost.StandardVirtualHost;
import org.apache.qpid.url.URLSyntaxException;
import org.apache.qpid.util.FileUtils;
import org.apache.qpid.util.SystemUtils;
@@ -832,7 +832,7 @@ public class QpidBrokerTestCase extends
// add new virtual host configuration to the broker store
Map<String, Object> attributes = new HashMap<String, Object>();
attributes.put(VirtualHost.NAME, virtualHostName);
- attributes.put(VirtualHost.TYPE, StandardVirtualHostFactory.TYPE);
+ attributes.put(VirtualHost.TYPE, StandardVirtualHost.TYPE);
Map<String, Object> messageStoreSettings = new HashMap<String, Object>();
messageStoreSettings.put(MessageStore.STORE_TYPE, storeType);
messageStoreSettings.put(MessageStore.STORE_PATH, storeDir);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org