qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rgodf...@apache.org
Subject svn commit: r1585979 [5/6] - in /qpid/trunk/qpid/java: bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/ bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/ broker-core/src/main/java/org/apache/qpid/server/binding/ br...
Date Wed, 09 Apr 2014 14:13:17 GMT
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/MockVirtualHost.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/MockVirtualHost.java?rev=1585979&r1=1585978&r2=1585979&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/MockVirtualHost.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/MockVirtualHost.java Wed Apr  9 14:13:13 2014
@@ -20,6 +20,7 @@
  */
 package org.apache.qpid.server.virtualhost;
 
+import java.security.AccessControlException;
 import java.util.Collection;
 import java.util.Map;
 import java.util.UUID;
@@ -31,6 +32,14 @@ import org.apache.qpid.server.exchange.E
 import org.apache.qpid.server.logging.EventLogger;
 import org.apache.qpid.server.message.MessageDestination;
 import org.apache.qpid.server.message.MessageSource;
+import org.apache.qpid.server.model.AbstractConfiguredObject;
+import org.apache.qpid.server.model.ConfigurationChangeListener;
+import org.apache.qpid.server.model.ConfiguredObject;
+import org.apache.qpid.server.model.Connection;
+import org.apache.qpid.server.model.IllegalStateTransitionException;
+import org.apache.qpid.server.model.LifetimePolicy;
+import org.apache.qpid.server.model.State;
+import org.apache.qpid.server.model.VirtualHostAlias;
 import org.apache.qpid.server.plugin.ExchangeType;
 import org.apache.qpid.server.protocol.LinkRegistry;
 import org.apache.qpid.server.queue.AMQQueue;
@@ -38,11 +47,12 @@ import org.apache.qpid.server.queue.Queu
 import org.apache.qpid.server.security.SecurityManager;
 import org.apache.qpid.server.security.auth.manager.AuthenticationManager;
 import org.apache.qpid.server.stats.StatisticsCounter;
+import org.apache.qpid.server.store.ConfiguredObjectRecord;
 import org.apache.qpid.server.store.DurableConfigurationStore;
 import org.apache.qpid.server.store.MessageStore;
 import org.apache.qpid.server.txn.DtxRegistry;
 
-public class MockVirtualHost implements VirtualHost<AMQQueue<?>, ExchangeImpl<?>>
+public class MockVirtualHost implements VirtualHostImpl<MockVirtualHost, AMQQueue<?>, ExchangeImpl<?>>
 {
     private String _name;
 
@@ -102,6 +112,86 @@ public class MockVirtualHost implements 
         return null;
     }
 
+    @Override
+    public String getType()
+    {
+        return null;
+    }
+
+    @Override
+    public Map<String, String> getContext()
+    {
+        return null;
+    }
+
+    @Override
+    public String getLastUpdatedBy()
+    {
+        return null;
+    }
+
+    @Override
+    public long getLastUpdatedTime()
+    {
+        return 0;
+    }
+
+    @Override
+    public String getCreatedBy()
+    {
+        return null;
+    }
+
+    @Override
+    public long getCreatedTime()
+    {
+        return 0;
+    }
+
+    @Override
+    public String setName(final String currentName, final String desiredName)
+            throws IllegalStateException, AccessControlException
+    {
+        return null;
+    }
+
+    @Override
+    public State getDesiredState()
+    {
+        return null;
+    }
+
+    @Override
+    public State setDesiredState(final State currentState, final State desiredState)
+            throws IllegalStateTransitionException, AccessControlException
+    {
+        return null;
+    }
+
+    @Override
+    public State getState()
+    {
+        return null;
+    }
+
+    @Override
+    public void addChangeListener(final ConfigurationChangeListener listener)
+    {
+
+    }
+
+    @Override
+    public boolean removeChangeListener(final ConfigurationChangeListener listener)
+    {
+        return false;
+    }
+
+    @Override
+    public <T extends ConfiguredObject> T getParent(final Class<T> clazz)
+    {
+        return null;
+    }
+
     public DurableConfigurationStore getDurableConfigurationStore()
     {
         return null;
@@ -112,6 +202,12 @@ public class MockVirtualHost implements 
         return _name;
     }
 
+    @Override
+    public String getDescription()
+    {
+        return null;
+    }
+
     public QueueRegistry getQueueRegistry()
     {
         return null;
@@ -136,6 +232,180 @@ public class MockVirtualHost implements 
     }
 
     @Override
+    public Collection<String> getSupportedExchangeTypes()
+    {
+        return null;
+    }
+
+    @Override
+    public Collection<String> getSupportedQueueTypes()
+    {
+        return null;
+    }
+
+    @Override
+    public boolean isQueue_deadLetterQueueEnabled()
+    {
+        return false;
+    }
+
+    @Override
+    public long getHousekeepingCheckPeriod()
+    {
+        return 0;
+    }
+
+    @Override
+    public int getQueue_maximumDeliveryAttempts()
+    {
+        return 0;
+    }
+
+    @Override
+    public long getQueue_flowControlSizeBytes()
+    {
+        return 0;
+    }
+
+    @Override
+    public long getQueue_flowResumeSizeBytes()
+    {
+        return 0;
+    }
+
+    @Override
+    public long getStoreTransactionIdleTimeoutClose()
+    {
+        return 0;
+    }
+
+    @Override
+    public long getStoreTransactionIdleTimeoutWarn()
+    {
+        return 0;
+    }
+
+    @Override
+    public long getStoreTransactionOpenTimeoutClose()
+    {
+        return 0;
+    }
+
+    @Override
+    public long getStoreTransactionOpenTimeoutWarn()
+    {
+        return 0;
+    }
+
+    @Override
+    public long getQueue_alertRepeatGap()
+    {
+        return 0;
+    }
+
+    @Override
+    public long getQueue_alertThresholdMessageAge()
+    {
+        return 0;
+    }
+
+    @Override
+    public long getQueue_alertThresholdMessageSize()
+    {
+        return 0;
+    }
+
+    @Override
+    public long getQueue_alertThresholdQueueDepthBytes()
+    {
+        return 0;
+    }
+
+    @Override
+    public long getQueue_alertThresholdQueueDepthMessages()
+    {
+        return 0;
+    }
+
+    @Override
+    public String getSecurityAcl()
+    {
+        return null;
+    }
+
+    @Override
+    public int getHouseKeepingThreadCount()
+    {
+        return 0;
+    }
+
+    @Override
+    public Map<String, Object> getMessageStoreSettings()
+    {
+        return null;
+    }
+
+    @Override
+    public Map<String, Object> getConfigurationStoreSettings()
+    {
+        return null;
+    }
+
+    @Override
+    public long getQueueCount()
+    {
+        return 0;
+    }
+
+    @Override
+    public long getExchangeCount()
+    {
+        return 0;
+    }
+
+    @Override
+    public long getConnectionCount()
+    {
+        return 0;
+    }
+
+    @Override
+    public long getBytesIn()
+    {
+        return 0;
+    }
+
+    @Override
+    public long getBytesOut()
+    {
+        return 0;
+    }
+
+    @Override
+    public long getMessagesIn()
+    {
+        return 0;
+    }
+
+    @Override
+    public long getMessagesOut()
+    {
+        return 0;
+    }
+
+    @Override
+    public Collection<VirtualHostAlias> getAliases()
+    {
+        return null;
+    }
+
+    @Override
+    public Collection<Connection> getConnections()
+    {
+        return null;
+    }
+
+    @Override
     public Collection<AMQQueue<?>> getQueues()
     {
         return null;
@@ -154,6 +424,18 @@ public class MockVirtualHost implements 
     }
 
     @Override
+    public Collection<String> getExchangeTypeNames()
+    {
+        return null;
+    }
+
+    @Override
+    public void executeTransaction(final TransactionalOperation op)
+    {
+
+    }
+
+    @Override
     public ExchangeImpl createExchange(Map<String,Object> attributes)
     {
         return null;
@@ -195,6 +477,18 @@ public class MockVirtualHost implements 
     }
 
     @Override
+    public ExchangeImpl<?> createExchange(final String name,
+                                          final State initialState,
+                                          final boolean durable,
+                                          final LifetimePolicy lifetime,
+                                          final String type,
+                                          final Map<String, Object> attributes)
+            throws AccessControlException, IllegalArgumentException
+    {
+        return null;
+    }
+
+    @Override
     public Collection<ExchangeType<? extends ExchangeImpl>> getExchangeTypes()
     {
         return null;
@@ -246,6 +540,114 @@ public class MockVirtualHost implements 
         return false;
     }
 
+    @Override
+    public void setDurable(final boolean durable)
+            throws IllegalStateException, AccessControlException, IllegalArgumentException
+    {
+
+    }
+
+    @Override
+    public LifetimePolicy getLifetimePolicy()
+    {
+        return null;
+    }
+
+    @Override
+    public LifetimePolicy setLifetimePolicy(final LifetimePolicy expected, final LifetimePolicy desired)
+            throws IllegalStateException, AccessControlException, IllegalArgumentException
+    {
+        return null;
+    }
+
+    @Override
+    public Collection<String> getAttributeNames()
+    {
+        return null;
+    }
+
+    @Override
+    public Object getAttribute(final String name)
+    {
+        return null;
+    }
+
+    @Override
+    public <T> T getAttribute(final AbstractConfiguredObject.Attribute<? super MockVirtualHost, T> attr)
+    {
+        return null;
+    }
+
+    @Override
+    public Map<String, Object> getActualAttributes()
+    {
+        return null;
+    }
+
+    @Override
+    public Object setAttribute(final String name, final Object expected, final Object desired)
+            throws IllegalStateException, AccessControlException, IllegalArgumentException
+    {
+        return null;
+    }
+
+    @Override
+    public Map<String, Number> getStatistics()
+    {
+        return null;
+    }
+
+    @Override
+    public <C extends ConfiguredObject> Collection<C> getChildren(final Class<C> clazz)
+    {
+        return null;
+    }
+
+    @Override
+    public <C extends ConfiguredObject> C createChild(final Class<C> childClass,
+                                                      final Map<String, Object> attributes,
+                                                      final ConfiguredObject... otherParents)
+    {
+        return null;
+    }
+
+    @Override
+    public void setAttributes(final Map<String, Object> attributes)
+            throws IllegalStateException, AccessControlException, IllegalArgumentException
+    {
+
+    }
+
+    @Override
+    public Class<? extends ConfiguredObject> getCategoryClass()
+    {
+        return null;
+    }
+
+    @Override
+    public <C extends ConfiguredObject<C>> C findConfiguredObject(final Class<C> clazz, final String name)
+    {
+        return null;
+    }
+
+    @Override
+    public ConfiguredObjectRecord asObjectRecord()
+    {
+        return null;
+    }
+
+    @Override
+    public void open()
+    {
+
+    }
+
+    @Override
+    public void validate()
+    {
+
+    }
+
     public StatisticsCounter getDataDeliveryStatistics()
     {
         return null;

Modified: qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProvider.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProvider.java?rev=1585979&r1=1585978&r2=1585979&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProvider.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProvider.java Wed Apr  9 14:13:13 2014
@@ -60,7 +60,6 @@ public class ACLFileAccessControlProvide
               Collections.<String,Object>emptyMap(), attributes, broker.getTaskExecutor());
 
 
-        _accessControl = new DefaultAccessControl(getPath(), broker);
         _broker = broker;
 
         State state = MapValueConverter.getEnumAttribute(State.class, STATE, attributes, State.INITIALISING);
@@ -68,6 +67,13 @@ public class ACLFileAccessControlProvide
 
     }
 
+    @Override
+    protected void onOpen()
+    {
+        super.onOpen();
+        _accessControl = new DefaultAccessControl(getPath(), _broker);
+    }
+
     @ManagedAttribute( automate = true, mandatory = true )
     public String getPath()
     {
@@ -155,6 +161,7 @@ public class ACLFileAccessControlProvide
 
         if(desiredState == State.DELETED)
         {
+            deleted();
             return _state.compareAndSet(state, State.DELETED);
         }
         else if (desiredState == State.QUIESCED)

Modified: qpid/trunk/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageConverter_Internal_to_v0_10.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageConverter_Internal_to_v0_10.java?rev=1585979&r1=1585978&r2=1585979&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageConverter_Internal_to_v0_10.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageConverter_Internal_to_v0_10.java Wed Apr  9 14:13:13 2014
@@ -20,12 +20,11 @@
  */
 package org.apache.qpid.server.protocol.v0_10;
 
-import org.apache.qpid.server.message.ServerMessage;
 import org.apache.qpid.server.message.internal.InternalMessage;
 import org.apache.qpid.server.plugin.MessageConverter;
 import org.apache.qpid.server.store.StoreFuture;
 import org.apache.qpid.server.store.StoredMessage;
-import org.apache.qpid.server.virtualhost.VirtualHost;
+import org.apache.qpid.server.virtualhost.VirtualHostImpl;
 import org.apache.qpid.transport.DeliveryProperties;
 import org.apache.qpid.transport.Header;
 import org.apache.qpid.transport.MessageDeliveryPriority;
@@ -48,7 +47,7 @@ public class MessageConverter_Internal_t
     }
 
     @Override
-    public MessageTransferMessage convert(InternalMessage serverMsg, VirtualHost vhost)
+    public MessageTransferMessage convert(InternalMessage serverMsg, VirtualHostImpl vhost)
     {
         return new MessageTransferMessage(convertToStoredMessage(serverMsg), null);
     }

Modified: qpid/trunk/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageConverter_v0_10.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageConverter_v0_10.java?rev=1585979&r1=1585978&r2=1585979&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageConverter_v0_10.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageConverter_v0_10.java Wed Apr  9 14:13:13 2014
@@ -33,7 +33,7 @@ import org.apache.qpid.server.plugin.Mes
 import org.apache.qpid.server.store.StoreFuture;
 import org.apache.qpid.server.store.StoredMessage;
 import org.apache.qpid.server.util.ConnectionScopedRuntimeException;
-import org.apache.qpid.server.virtualhost.VirtualHost;
+import org.apache.qpid.server.virtualhost.VirtualHostImpl;
 import org.apache.qpid.transport.DeliveryProperties;
 import org.apache.qpid.transport.Header;
 import org.apache.qpid.transport.MessageDeliveryPriority;
@@ -58,7 +58,7 @@ public class MessageConverter_v0_10 impl
     }
 
     @Override
-    public MessageTransferMessage convert(ServerMessage serverMsg, VirtualHost vhost)
+    public MessageTransferMessage convert(ServerMessage serverMsg, VirtualHostImpl vhost)
     {
         return new MessageTransferMessage(convertToStoredMessage(serverMsg), null);
     }

Modified: qpid/trunk/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageConverter_v0_10_to_Internal.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageConverter_v0_10_to_Internal.java?rev=1585979&r1=1585978&r2=1585979&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageConverter_v0_10_to_Internal.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageConverter_v0_10_to_Internal.java Wed Apr  9 14:13:13 2014
@@ -21,17 +21,10 @@
 package org.apache.qpid.server.protocol.v0_10;
 
 import org.apache.qpid.server.message.AMQMessageHeader;
-import org.apache.qpid.server.message.ServerMessage;
 import org.apache.qpid.server.message.internal.InternalMessage;
-import org.apache.qpid.server.message.internal.InternalMessageMetaData;
 import org.apache.qpid.server.plugin.MessageConverter;
-import org.apache.qpid.server.store.StoreFuture;
-import org.apache.qpid.server.store.StoredMessage;
 import org.apache.qpid.server.util.ConnectionScopedRuntimeException;
-import org.apache.qpid.server.virtualhost.VirtualHost;
-import org.apache.qpid.transport.DeliveryProperties;
-import org.apache.qpid.transport.Header;
-import org.apache.qpid.transport.MessageDeliveryPriority;
+import org.apache.qpid.server.virtualhost.VirtualHostImpl;
 import org.apache.qpid.transport.MessageProperties;
 import org.apache.qpid.transport.ReplyTo;
 import org.apache.qpid.transport.codec.BBDecoder;
@@ -44,7 +37,6 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.LinkedHashMap;
 import java.util.List;
-import java.util.ListIterator;
 import java.util.Map;
 import java.util.Set;
 
@@ -63,7 +55,7 @@ public class MessageConverter_v0_10_to_I
     }
 
     @Override
-    public InternalMessage convert(MessageTransferMessage serverMessage, VirtualHost vhost)
+    public InternalMessage convert(MessageTransferMessage serverMessage, VirtualHostImpl vhost)
     {
         final String mimeType = serverMessage.getMessageHeader().getMimeType();
         byte[] data = new byte[(int) serverMessage.getSize()];

Modified: qpid/trunk/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnection.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnection.java?rev=1585979&r1=1585978&r2=1585979&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnection.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnection.java Wed Apr  9 14:13:13 2014
@@ -46,7 +46,7 @@ import org.apache.qpid.server.security.a
 import org.apache.qpid.server.stats.StatisticsCounter;
 import org.apache.qpid.server.util.Action;
 import org.apache.qpid.server.util.ServerScopedRuntimeException;
-import org.apache.qpid.server.virtualhost.VirtualHost;
+import org.apache.qpid.server.virtualhost.VirtualHostImpl;
 import org.apache.qpid.transport.Connection;
 import org.apache.qpid.transport.ConnectionCloseCode;
 import org.apache.qpid.transport.ExecutionErrorCode;
@@ -72,7 +72,7 @@ public class ServerConnection extends Co
     private StatisticsCounter _messagesDelivered, _dataDelivered, _messagesReceived, _dataReceived;
     private final long _connectionId;
     private final Object _reference = new Object();
-    private VirtualHost _virtualHost;
+    private VirtualHostImpl _virtualHost;
     private Port _port;
     private AtomicLong _lastIoTime = new AtomicLong();
     private boolean _blocking;
@@ -165,12 +165,12 @@ public class ServerConnection extends Co
         super.setConnectionDelegate(delegate);
     }
 
-    public VirtualHost getVirtualHost()
+    public VirtualHostImpl getVirtualHost()
     {
         return _virtualHost;
     }
 
-    public void setVirtualHost(VirtualHost virtualHost)
+    public void setVirtualHost(VirtualHostImpl virtualHost)
     {
         _virtualHost = virtualHost;
 

Modified: qpid/trunk/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnectionDelegate.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnectionDelegate.java?rev=1585979&r1=1585978&r2=1585979&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnectionDelegate.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnectionDelegate.java Wed Apr  9 14:13:13 2014
@@ -41,8 +41,8 @@ import org.apache.qpid.server.protocol.A
 import org.apache.qpid.server.security.SubjectCreator;
 import org.apache.qpid.server.security.auth.AuthenticationResult.AuthenticationStatus;
 import org.apache.qpid.server.security.auth.SubjectAuthenticationResult;
+import org.apache.qpid.server.virtualhost.VirtualHostImpl;
 import org.apache.qpid.server.virtualhost.VirtualHostState;
-import org.apache.qpid.server.virtualhost.VirtualHost;
 import org.apache.qpid.transport.*;
 import org.apache.qpid.transport.network.NetworkConnection;
 
@@ -177,7 +177,7 @@ public class ServerConnectionDelegate ex
     {
         final ServerConnection sconn = (ServerConnection) conn;
 
-        VirtualHost vhost;
+        VirtualHostImpl vhost;
         String vhostName;
         if(open.hasVirtualHost())
         {

Modified: qpid/trunk/qpid/java/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/trunk/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSession.java?rev=1585979&r1=1585978&r2=1585979&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSession.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSession.java Wed Apr  9 14:13:13 2014
@@ -49,7 +49,6 @@ import org.apache.qpid.server.consumer.C
 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.State;
 import org.apache.qpid.server.protocol.ConsumerListener;
 import org.apache.qpid.server.store.StoreException;
 import org.apache.qpid.protocol.AMQConstant;
@@ -84,7 +83,7 @@ import org.apache.qpid.server.txn.Timeou
 import org.apache.qpid.server.txn.UnknownDtxBranchException;
 import org.apache.qpid.server.util.Action;
 import org.apache.qpid.server.util.Deletable;
-import org.apache.qpid.server.virtualhost.VirtualHost;
+import org.apache.qpid.server.virtualhost.VirtualHostImpl;
 import org.apache.qpid.transport.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -686,7 +685,7 @@ public class ServerSession extends Sessi
         return getVirtualHost().getMessageStore();
     }
 
-    public VirtualHost getVirtualHost()
+    public VirtualHostImpl getVirtualHost()
     {
         return getConnection().getVirtualHost();
     }

Modified: qpid/trunk/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java?rev=1585979&r1=1585978&r2=1585979&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java Wed Apr  9 14:13:13 2014
@@ -195,7 +195,7 @@ public class ServerSessionDelegate exten
             else
             {
                 String queueName = method.getQueue();
-                VirtualHost vhost = getVirtualHost(session);
+                VirtualHostImpl vhost = getVirtualHost(session);
 
                 final MessageSource queue = vhost.getMessageSource(queueName);
 
@@ -288,7 +288,7 @@ public class ServerSessionDelegate exten
 
         final MessageMetaData_0_10 messageMetaData = new MessageMetaData_0_10(xfr);
 
-        final VirtualHost virtualHost = getVirtualHost(ssn);
+        final VirtualHostImpl virtualHost = getVirtualHost(ssn);
         try
         {
             virtualHost.getSecurityManager().authorisePublish(messageMetaData.isImmediate(), messageMetaData.getRoutingKey(), exchange.getName(), virtualHost.getName());
@@ -673,7 +673,7 @@ public class ServerSessionDelegate exten
     public void exchangeDeclare(Session session, ExchangeDeclare method)
     {
         String exchangeName = method.getExchange();
-        VirtualHost virtualHost = getVirtualHost(session);
+        VirtualHostImpl virtualHost = getVirtualHost(session);
 
         //we must check for any unsupported arguments present and throw not-implemented
         if(method.hasArguments())
@@ -803,7 +803,7 @@ public class ServerSessionDelegate exten
 
     private MessageDestination getDestinationForMessage(Session ssn, MessageTransfer xfr)
     {
-        VirtualHost virtualHost = getVirtualHost(ssn);
+        VirtualHostImpl virtualHost = getVirtualHost(ssn);
 
         MessageDestination destination;
         if(xfr.hasDestination())
@@ -821,10 +821,10 @@ public class ServerSessionDelegate exten
         return destination;
     }
 
-    private VirtualHost getVirtualHost(Session session)
+    private VirtualHostImpl getVirtualHost(Session session)
     {
         ServerConnection conn = getServerConnection(session);
-        VirtualHost vhost = conn.getVirtualHost();
+        VirtualHostImpl vhost = conn.getVirtualHost();
         return vhost;
     }
 
@@ -837,7 +837,7 @@ public class ServerSessionDelegate exten
     @Override
     public void exchangeDelete(Session session, ExchangeDelete method)
     {
-        VirtualHost virtualHost = getVirtualHost(session);
+        VirtualHostImpl virtualHost = getVirtualHost(session);
 
         try
         {
@@ -932,7 +932,7 @@ public class ServerSessionDelegate exten
     public void exchangeBind(Session session, ExchangeBind method)
     {
 
-        VirtualHost virtualHost = getVirtualHost(session);
+        VirtualHostImpl virtualHost = getVirtualHost(session);
 
         if (!method.hasQueue())
         {
@@ -997,7 +997,7 @@ public class ServerSessionDelegate exten
     @Override
     public void exchangeUnbind(Session session, ExchangeUnbind method)
     {
-        VirtualHost virtualHost = getVirtualHost(session);
+        VirtualHostImpl virtualHost = getVirtualHost(session);
 
         if (!method.hasQueue())
         {
@@ -1045,7 +1045,7 @@ public class ServerSessionDelegate exten
     {
 
         ExchangeBoundResult result = new ExchangeBoundResult();
-        VirtualHost virtualHost = getVirtualHost(session);
+        VirtualHostImpl virtualHost = getVirtualHost(session);
         ExchangeImpl exchange;
         AMQQueue queue;
         boolean isDefaultExchange;
@@ -1229,7 +1229,7 @@ public class ServerSessionDelegate exten
     public void queueDeclare(Session session, final QueueDeclare method)
     {
 
-        final VirtualHost virtualHost = getVirtualHost(session);
+        final VirtualHostImpl virtualHost = getVirtualHost(session);
         DurableConfigurationStore store = virtualHost.getDurableConfigurationStore();
 
         String queueName = method.getQueue();
@@ -1386,7 +1386,7 @@ public class ServerSessionDelegate exten
                 }
                 else
                 {
-                    VirtualHost virtualHost = getVirtualHost(session);
+                    VirtualHostImpl virtualHost = getVirtualHost(session);
 
                     try
                     {

Modified: qpid/trunk/qpid/java/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/ServerSessionTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/ServerSessionTest.java?rev=1585979&r1=1585978&r2=1585979&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/ServerSessionTest.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/ServerSessionTest.java Wed Apr  9 14:13:13 2014
@@ -18,20 +18,18 @@
  */
 package org.apache.qpid.server.protocol.v0_10;
 
-import org.apache.qpid.server.logging.MessageLogger;
 import org.apache.qpid.server.model.Broker;
 import org.apache.qpid.server.util.BrokerTestHelper;
-import org.apache.qpid.server.virtualhost.VirtualHost;
+import org.apache.qpid.server.virtualhost.VirtualHostImpl;
 import org.apache.qpid.test.utils.QpidTestCase;
 import org.apache.qpid.transport.Binary;
 
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
 
 public class ServerSessionTest extends QpidTestCase
 {
 
-    private VirtualHost _virtualHost;
+    private VirtualHostImpl _virtualHost;
 
     @Override
     public void setUp() throws Exception

Modified: qpid/trunk/qpid/java/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/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java?rev=1585979&r1=1585978&r2=1585979&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java Wed Apr  9 14:13:13 2014
@@ -88,7 +88,7 @@ import org.apache.qpid.server.txn.LocalT
 import org.apache.qpid.server.txn.ServerTransaction;
 import org.apache.qpid.server.util.Action;
 import org.apache.qpid.server.util.ConnectionScopedRuntimeException;
-import org.apache.qpid.server.virtualhost.VirtualHost;
+import org.apache.qpid.server.virtualhost.VirtualHostImpl;
 import org.apache.qpid.transport.TransportException;
 
 import javax.security.auth.Subject;
@@ -303,7 +303,7 @@ public class AMQChannel<T extends AMQPro
     public void setPublishFrame(MessagePublishInfo info, final MessageDestination e)
     {
         String routingKey = info.getRoutingKey() == null ? null : info.getRoutingKey().asString();
-        VirtualHost virtualHost = getVirtualHost();
+        VirtualHostImpl virtualHost = getVirtualHost();
         SecurityManager securityManager = virtualHost.getSecurityManager();
 
         securityManager.authorisePublish(info.isImmediate(), routingKey, e.getName(), virtualHost.getName());
@@ -1534,7 +1534,7 @@ public class AMQChannel<T extends AMQPro
         return _blocking.get();
     }
 
-    public VirtualHost getVirtualHost()
+    public VirtualHostImpl getVirtualHost()
     {
         return getProtocolSession().getVirtualHost();
     }

Modified: qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.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/AMQProtocolEngine.java?rev=1585979&r1=1585978&r2=1585979&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java Wed Apr  9 14:13:13 2014
@@ -79,7 +79,7 @@ import org.apache.qpid.server.stats.Stat
 import org.apache.qpid.server.util.Action;
 import org.apache.qpid.server.util.ConnectionScopedRuntimeException;
 import org.apache.qpid.server.util.ServerScopedRuntimeException;
-import org.apache.qpid.server.virtualhost.VirtualHost;
+import org.apache.qpid.server.virtualhost.VirtualHostImpl;
 import org.apache.qpid.transport.Sender;
 import org.apache.qpid.transport.TransportException;
 import org.apache.qpid.transport.network.NetworkConnection;
@@ -100,7 +100,7 @@ public class AMQProtocolEngine implement
     private String _clientVersion = null;
     private String _clientProduct = null;
 
-    private VirtualHost _virtualHost;
+    private VirtualHostImpl _virtualHost;
 
     private final Map<Integer, AMQChannel<AMQProtocolEngine>> _channelMap =
             new HashMap<Integer, AMQChannel<AMQProtocolEngine>>();
@@ -1152,12 +1152,12 @@ public class AMQProtocolEngine implement
         return getMethodRegistry();
     }
 
-    public VirtualHost getVirtualHost()
+    public VirtualHostImpl getVirtualHost()
     {
         return _virtualHost;
     }
 
-    public void setVirtualHost(VirtualHost virtualHost) throws AMQException
+    public void setVirtualHost(VirtualHostImpl virtualHost) throws AMQException
     {
         _virtualHost = virtualHost;
 

Modified: qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolSession.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/AMQProtocolSession.java?rev=1585979&r1=1585978&r2=1585979&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolSession.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolSession.java Wed Apr  9 14:13:13 2014
@@ -38,7 +38,7 @@ import org.apache.qpid.protocol.AMQVersi
 import org.apache.qpid.server.protocol.AMQConnectionModel;
 import org.apache.qpid.server.protocol.v0_8.output.ProtocolOutputConverter;
 import org.apache.qpid.server.security.AuthorizationHolder;
-import org.apache.qpid.server.virtualhost.VirtualHost;
+import org.apache.qpid.server.virtualhost.VirtualHostImpl;
 
 
 public interface AMQProtocolSession<T extends AMQProtocolSession<T>>
@@ -174,9 +174,9 @@ public interface AMQProtocolSession<T ex
 
     Object getReference();
 
-    VirtualHost getVirtualHost();
+    VirtualHostImpl getVirtualHost();
 
-    void setVirtualHost(VirtualHost virtualHost) throws AMQException;
+    void setVirtualHost(VirtualHostImpl virtualHost) throws AMQException;
 
     public ProtocolOutputConverter getProtocolOutputConverter();
 

Modified: qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageConverter_Internal_to_v0_8.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/MessageConverter_Internal_to_v0_8.java?rev=1585979&r1=1585978&r2=1585979&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageConverter_Internal_to_v0_8.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageConverter_Internal_to_v0_8.java Wed Apr  9 14:13:13 2014
@@ -30,7 +30,7 @@ import org.apache.qpid.server.plugin.Mes
 import org.apache.qpid.server.store.StoreFuture;
 import org.apache.qpid.server.store.StoredMessage;
 import org.apache.qpid.server.util.ConnectionScopedRuntimeException;
-import org.apache.qpid.server.virtualhost.VirtualHost;
+import org.apache.qpid.server.virtualhost.VirtualHostImpl;
 import org.apache.qpid.transport.codec.BBEncoder;
 
 import java.io.ByteArrayOutputStream;
@@ -60,7 +60,7 @@ public class MessageConverter_Internal_t
     }
 
     @Override
-    public AMQMessage convert(InternalMessage serverMsg, VirtualHost vhost)
+    public AMQMessage convert(InternalMessage serverMsg, VirtualHostImpl vhost)
     {
         return new AMQMessage(convertToStoredMessage(serverMsg), null);
     }

Modified: qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageConverter_v0_8_to_Internal.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/MessageConverter_v0_8_to_Internal.java?rev=1585979&r1=1585978&r2=1585979&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageConverter_v0_8_to_Internal.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageConverter_v0_8_to_Internal.java Wed Apr  9 14:13:13 2014
@@ -25,8 +25,7 @@ import org.apache.qpid.server.message.AM
 import org.apache.qpid.server.message.internal.InternalMessage;
 import org.apache.qpid.server.plugin.MessageConverter;
 import org.apache.qpid.server.util.ConnectionScopedRuntimeException;
-import org.apache.qpid.server.virtualhost.VirtualHost;
-import org.apache.qpid.transport.ReplyTo;
+import org.apache.qpid.server.virtualhost.VirtualHostImpl;
 import org.apache.qpid.transport.codec.BBDecoder;
 import org.apache.qpid.typedmessage.TypedBytesContentReader;
 import org.apache.qpid.typedmessage.TypedBytesFormatException;
@@ -57,7 +56,7 @@ public class MessageConverter_v0_8_to_In
     }
 
     @Override
-    public InternalMessage convert(AMQMessage serverMessage, VirtualHost vhost)
+    public InternalMessage convert(AMQMessage serverMessage, VirtualHostImpl vhost)
     {
         final String mimeType = serverMessage.getMessageHeader().getMimeType();
         byte[] data = new byte[(int) serverMessage.getSize()];

Modified: qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicConsumeMethodHandler.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/BasicConsumeMethodHandler.java?rev=1585979&r1=1585978&r2=1585979&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicConsumeMethodHandler.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicConsumeMethodHandler.java Wed Apr  9 14:13:13 2014
@@ -35,7 +35,7 @@ import org.apache.qpid.server.protocol.v
 import org.apache.qpid.server.queue.AMQQueue;
 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.VirtualHost;
+import org.apache.qpid.server.virtualhost.VirtualHostImpl;
 
 import java.security.AccessControlException;
 
@@ -59,7 +59,7 @@ public class BasicConsumeMethodHandler i
         AMQProtocolSession protocolConnection = stateManager.getProtocolSession();
 
         AMQChannel channel = protocolConnection.getChannel(channelId);
-        VirtualHost vHost = protocolConnection.getVirtualHost();
+        VirtualHostImpl vHost = protocolConnection.getVirtualHost();
 
         if (channel == null)
         {

Modified: qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicGetMethodHandler.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/BasicGetMethodHandler.java?rev=1585979&r1=1585978&r2=1585979&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicGetMethodHandler.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicGetMethodHandler.java Wed Apr  9 14:13:13 2014
@@ -45,7 +45,7 @@ import org.apache.qpid.server.protocol.v
 import org.apache.qpid.server.protocol.v0_8.state.StateAwareMethodListener;
 import org.apache.qpid.server.protocol.v0_8.ClientDeliveryMethod;
 import org.apache.qpid.server.protocol.v0_8.RecordDeliveryMethod;
-import org.apache.qpid.server.virtualhost.VirtualHost;
+import org.apache.qpid.server.virtualhost.VirtualHostImpl;
 
 import java.security.AccessControlException;
 import java.util.EnumSet;
@@ -70,7 +70,7 @@ public class BasicGetMethodHandler imple
         AMQProtocolSession protocolConnection = stateManager.getProtocolSession();
 
 
-        VirtualHost vHost = protocolConnection.getVirtualHost();
+        VirtualHostImpl vHost = protocolConnection.getVirtualHost();
 
         AMQChannel channel = protocolConnection.getChannel(channelId);
         if (channel == null)

Modified: qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicPublishMethodHandler.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/BasicPublishMethodHandler.java?rev=1585979&r1=1585978&r2=1585979&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicPublishMethodHandler.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicPublishMethodHandler.java Wed Apr  9 14:13:13 2014
@@ -32,7 +32,7 @@ import org.apache.qpid.server.protocol.v
 import org.apache.qpid.server.protocol.v0_8.AMQProtocolSession;
 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.VirtualHost;
+import org.apache.qpid.server.virtualhost.VirtualHostImpl;
 
 import java.security.AccessControlException;
 
@@ -61,7 +61,7 @@ public class BasicPublishMethodHandler i
         }
 
         AMQShortString exchangeName = body.getExchange();
-        VirtualHost vHost = session.getVirtualHost();
+        VirtualHostImpl vHost = session.getVirtualHost();
 
         // TODO: check the delivery tag field details - is it unique across the broker or per subscriber?
 

Modified: qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ChannelOpenHandler.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/ChannelOpenHandler.java?rev=1585979&r1=1585978&r2=1585979&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ChannelOpenHandler.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ChannelOpenHandler.java Wed Apr  9 14:13:13 2014
@@ -36,7 +36,7 @@ import org.apache.qpid.server.protocol.v
 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.util.ConnectionScopedRuntimeException;
-import org.apache.qpid.server.virtualhost.VirtualHost;
+import org.apache.qpid.server.virtualhost.VirtualHostImpl;
 
 import java.io.ByteArrayOutputStream;
 import java.io.DataOutputStream;
@@ -61,7 +61,7 @@ public class ChannelOpenHandler implemen
     public void methodReceived(AMQStateManager stateManager, ChannelOpenBody body, int channelId) throws AMQException
     {
         AMQProtocolSession session = stateManager.getProtocolSession();
-        VirtualHost virtualHost = session.getVirtualHost();
+        VirtualHostImpl virtualHost = session.getVirtualHost();
 
         // Protect the broker against out of order frame request.
         if (virtualHost == null)

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=1585979&r1=1585978&r2=1585979&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 Wed Apr  9 14:13:13 2014
@@ -34,7 +34,7 @@ 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.VirtualHost;
+import org.apache.qpid.server.virtualhost.VirtualHostImpl;
 import org.apache.qpid.server.virtualhost.VirtualHostState;
 
 public class ConnectionOpenMethodHandler implements StateAwareMethodListener<ConnectionOpenBody>
@@ -72,7 +72,7 @@ public class ConnectionOpenMethodHandler
             virtualHostName = body.getVirtualHost() == null ? null : String.valueOf(body.getVirtualHost());
         }
 
-        VirtualHost virtualHost = stateManager.getVirtualHostRegistry().getVirtualHost(virtualHostName);
+        VirtualHostImpl virtualHost = stateManager.getVirtualHostRegistry().getVirtualHost(virtualHostName);
 
         if (virtualHost == null)
         {

Modified: qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ExchangeBoundHandler.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/ExchangeBoundHandler.java?rev=1585979&r1=1585978&r2=1585979&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ExchangeBoundHandler.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ExchangeBoundHandler.java Wed Apr  9 14:13:13 2014
@@ -31,7 +31,7 @@ import org.apache.qpid.server.protocol.v
 import org.apache.qpid.server.queue.AMQQueue;
 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.VirtualHost;
+import org.apache.qpid.server.virtualhost.VirtualHostImpl;
 
 /**
  * @author Apache Software Foundation
@@ -68,7 +68,7 @@ public class ExchangeBoundHandler implem
     public void methodReceived(AMQStateManager stateManager, ExchangeBoundBody body, int channelId) throws AMQException
     {
         AMQProtocolSession session = stateManager.getProtocolSession();
-        VirtualHost virtualHost = session.getVirtualHost();
+        VirtualHostImpl virtualHost = session.getVirtualHost();
         MethodRegistry methodRegistry = session.getMethodRegistry();
 
         final AMQChannel channel = session.getChannel(channelId);

Modified: qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ExchangeDeclareHandler.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/ExchangeDeclareHandler.java?rev=1585979&r1=1585978&r2=1585979&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ExchangeDeclareHandler.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ExchangeDeclareHandler.java Wed Apr  9 14:13:13 2014
@@ -40,7 +40,7 @@ import org.apache.qpid.server.protocol.v
 import org.apache.qpid.server.virtualhost.ExchangeExistsException;
 import org.apache.qpid.server.virtualhost.ReservedExchangeNameException;
 import org.apache.qpid.server.virtualhost.UnknownExchangeException;
-import org.apache.qpid.server.virtualhost.VirtualHost;
+import org.apache.qpid.server.virtualhost.VirtualHostImpl;
 
 import java.security.AccessControlException;
 import java.util.HashMap;
@@ -64,7 +64,7 @@ public class ExchangeDeclareHandler impl
     public void methodReceived(AMQStateManager stateManager, ExchangeDeclareBody body, int channelId) throws AMQException
     {
         AMQProtocolSession session = stateManager.getProtocolSession();
-        VirtualHost virtualHost = session.getVirtualHost();
+        VirtualHostImpl virtualHost = session.getVirtualHost();
         final AMQChannel channel = session.getChannel(channelId);
         if (channel == null)
         {

Modified: qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ExchangeDeleteHandler.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/ExchangeDeleteHandler.java?rev=1585979&r1=1585978&r2=1585979&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ExchangeDeleteHandler.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ExchangeDeleteHandler.java Wed Apr  9 14:13:13 2014
@@ -32,7 +32,7 @@ import org.apache.qpid.server.protocol.v
 import org.apache.qpid.server.protocol.v0_8.state.StateAwareMethodListener;
 import org.apache.qpid.server.virtualhost.ExchangeIsAlternateException;
 import org.apache.qpid.server.virtualhost.RequiredExchangeException;
-import org.apache.qpid.server.virtualhost.VirtualHost;
+import org.apache.qpid.server.virtualhost.VirtualHostImpl;
 
 import java.security.AccessControlException;
 
@@ -52,7 +52,7 @@ public class ExchangeDeleteHandler imple
     public void methodReceived(AMQStateManager stateManager, ExchangeDeleteBody body, int channelId) throws AMQException
     {
         AMQProtocolSession session = stateManager.getProtocolSession();
-        VirtualHost virtualHost = session.getVirtualHost();
+        VirtualHostImpl virtualHost = session.getVirtualHost();
         final AMQChannel channel = session.getChannel(channelId);
         if (channel == null)
         {

Modified: qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueBindHandler.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/QueueBindHandler.java?rev=1585979&r1=1585978&r2=1585979&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueBindHandler.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueBindHandler.java Wed Apr  9 14:13:13 2014
@@ -36,7 +36,7 @@ import org.apache.qpid.server.protocol.v
 import org.apache.qpid.server.queue.AMQQueue;
 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.VirtualHost;
+import org.apache.qpid.server.virtualhost.VirtualHostImpl;
 
 import java.security.AccessControlException;
 import java.util.Map;
@@ -59,7 +59,7 @@ public class QueueBindHandler implements
     public void methodReceived(AMQStateManager stateManager, QueueBindBody body, int channelId) throws AMQException
     {
         AMQProtocolSession protocolConnection = stateManager.getProtocolSession();
-        VirtualHost virtualHost = protocolConnection.getVirtualHost();
+        VirtualHostImpl virtualHost = protocolConnection.getVirtualHost();
         AMQChannel channel = protocolConnection.getChannel(channelId);
 
         if (channel == null)

Modified: qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueDeclareHandler.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/QueueDeclareHandler.java?rev=1585979&r1=1585978&r2=1585979&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueDeclareHandler.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueDeclareHandler.java Wed Apr  9 14:13:13 2014
@@ -40,7 +40,7 @@ import org.apache.qpid.server.queue.AMQQ
 import org.apache.qpid.server.queue.QueueArgumentsConverter;
 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.VirtualHost;
+import org.apache.qpid.server.virtualhost.VirtualHostImpl;
 
 import java.security.AccessControlException;
 import java.util.Map;
@@ -62,7 +62,7 @@ public class QueueDeclareHandler impleme
     {
         final AMQProtocolSession protocolConnection = stateManager.getProtocolSession();
         final AMQSessionModel session = protocolConnection.getChannel(channelId);
-        VirtualHost virtualHost = protocolConnection.getVirtualHost();
+        VirtualHostImpl virtualHost = protocolConnection.getVirtualHost();
 
         final AMQShortString queueName;
 
@@ -178,7 +178,7 @@ public class QueueDeclareHandler impleme
 
     protected AMQQueue createQueue(final AMQChannel channel, final AMQShortString queueName,
                                    QueueDeclareBody body,
-                                   final VirtualHost virtualHost,
+                                   final VirtualHostImpl virtualHost,
                                    final AMQProtocolSession session)
             throws AMQException, QueueExistsException
     {

Modified: qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueDeleteHandler.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/QueueDeleteHandler.java?rev=1585979&r1=1585978&r2=1585979&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueDeleteHandler.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueDeleteHandler.java Wed Apr  9 14:13:13 2014
@@ -31,7 +31,7 @@ import org.apache.qpid.server.queue.AMQQ
 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.store.DurableConfigurationStore;
-import org.apache.qpid.server.virtualhost.VirtualHost;
+import org.apache.qpid.server.virtualhost.VirtualHostImpl;
 
 import java.security.AccessControlException;
 
@@ -60,7 +60,7 @@ public class QueueDeleteHandler implemen
     public void methodReceived(AMQStateManager stateManager, QueueDeleteBody body, int channelId) throws AMQException
     {
         AMQProtocolSession protocolConnection = stateManager.getProtocolSession();
-        VirtualHost virtualHost = protocolConnection.getVirtualHost();
+        VirtualHostImpl virtualHost = protocolConnection.getVirtualHost();
         DurableConfigurationStore store = virtualHost.getDurableConfigurationStore();
 
 

Modified: qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueuePurgeHandler.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/QueuePurgeHandler.java?rev=1585979&r1=1585978&r2=1585979&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueuePurgeHandler.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueuePurgeHandler.java Wed Apr  9 14:13:13 2014
@@ -31,7 +31,7 @@ import org.apache.qpid.server.protocol.v
 import org.apache.qpid.server.queue.AMQQueue;
 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.VirtualHost;
+import org.apache.qpid.server.virtualhost.VirtualHostImpl;
 
 import java.security.AccessControlException;
 
@@ -59,7 +59,7 @@ public class QueuePurgeHandler implement
     public void methodReceived(AMQStateManager stateManager, QueuePurgeBody body, int channelId) throws AMQException
     {
         AMQProtocolSession protocolConnection = stateManager.getProtocolSession();
-        VirtualHost virtualHost = protocolConnection.getVirtualHost();
+        VirtualHostImpl virtualHost = protocolConnection.getVirtualHost();
 
         AMQChannel channel = protocolConnection.getChannel(channelId);
         if (channel == null)

Modified: qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueUnbindHandler.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/QueueUnbindHandler.java?rev=1585979&r1=1585978&r2=1585979&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueUnbindHandler.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueUnbindHandler.java Wed Apr  9 14:13:13 2014
@@ -36,7 +36,7 @@ import org.apache.qpid.server.protocol.v
 import org.apache.qpid.server.queue.AMQQueue;
 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.VirtualHost;
+import org.apache.qpid.server.virtualhost.VirtualHostImpl;
 
 import java.security.AccessControlException;
 
@@ -58,7 +58,7 @@ public class QueueUnbindHandler implemen
     public void methodReceived(AMQStateManager stateManager, QueueUnbindBody body, int channelId) throws AMQException
     {
         AMQProtocolSession session = stateManager.getProtocolSession();
-        VirtualHost virtualHost = session.getVirtualHost();
+        VirtualHostImpl virtualHost = session.getVirtualHost();
 
         final AMQQueue queue;
         final AMQShortString routingKey;

Modified: qpid/trunk/qpid/java/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/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQChannelTest.java?rev=1585979&r1=1585978&r2=1585979&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQChannelTest.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQChannelTest.java Wed Apr  9 14:13:13 2014
@@ -35,12 +35,12 @@ import org.apache.qpid.server.exchange.E
 import org.apache.qpid.server.message.MessageContentSource;
 import org.apache.qpid.server.model.Broker;
 import org.apache.qpid.server.util.BrokerTestHelper;
-import org.apache.qpid.server.virtualhost.VirtualHost;
+import org.apache.qpid.server.virtualhost.VirtualHostImpl;
 import org.apache.qpid.test.utils.QpidTestCase;
 
 public class AMQChannelTest extends QpidTestCase
 {
-    private VirtualHost _virtualHost;
+    private VirtualHostImpl _virtualHost;
     private AMQProtocolSession _protocolSession;
     private Map<Integer,String> _replies;
     private Broker _broker;

Modified: qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AckTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AckTest.java?rev=1585979&r1=1585978&r2=1585979&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AckTest.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AckTest.java Wed Apr  9 14:13:13 2014
@@ -36,7 +36,7 @@ import org.apache.qpid.server.store.Test
 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.VirtualHost;
+import org.apache.qpid.server.virtualhost.VirtualHostImpl;
 import org.apache.qpid.test.utils.QpidTestCase;
 
 import java.util.ArrayList;
@@ -60,7 +60,7 @@ public class AckTest extends QpidTestCas
     private AMQQueue _queue;
 
     private static final AMQShortString DEFAULT_CONSUMER_TAG = new AMQShortString("conTag");
-    private VirtualHost _virtualHost;
+    private VirtualHostImpl _virtualHost;
 
     @Override
     public void setUp() throws Exception

Modified: qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AcknowledgeTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AcknowledgeTest.java?rev=1585979&r1=1585978&r2=1585979&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AcknowledgeTest.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AcknowledgeTest.java Wed Apr  9 14:13:13 2014
@@ -26,7 +26,7 @@ import org.apache.qpid.server.queue.AMQQ
 import org.apache.qpid.server.store.MessageStore;
 import org.apache.qpid.server.store.TestMemoryMessageStore;
 import org.apache.qpid.server.util.BrokerTestHelper;
-import org.apache.qpid.server.virtualhost.VirtualHost;
+import org.apache.qpid.server.virtualhost.VirtualHostImpl;
 import org.apache.qpid.test.utils.QpidTestCase;
 
 import java.util.List;
@@ -44,7 +44,7 @@ public class AcknowledgeTest extends Qpi
         super.setUp();
         BrokerTestHelper.setUp();
         _channel = BrokerTestHelper_0_8.createChannel();
-        VirtualHost virtualHost = _channel.getVirtualHost();
+        VirtualHostImpl virtualHost = _channel.getVirtualHost();
         _queueName = getTestName();
         _queue = BrokerTestHelper.createQueue(_queueName, virtualHost);
         _messageStore = virtualHost.getMessageStore();

Modified: qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/BrokerTestHelper_0_8.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/BrokerTestHelper_0_8.java?rev=1585979&r1=1585978&r2=1585979&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/BrokerTestHelper_0_8.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/BrokerTestHelper_0_8.java Wed Apr  9 14:13:13 2014
@@ -25,10 +25,9 @@ import org.apache.qpid.framing.AMQShortS
 import org.apache.qpid.framing.BasicContentHeaderProperties;
 import org.apache.qpid.framing.ContentHeaderBody;
 import org.apache.qpid.framing.abstraction.MessagePublishInfo;
-import org.apache.qpid.server.exchange.ExchangeImpl;
 import org.apache.qpid.server.message.MessageDestination;
 import org.apache.qpid.server.util.BrokerTestHelper;
-import org.apache.qpid.server.virtualhost.VirtualHost;
+import org.apache.qpid.server.virtualhost.VirtualHostImpl;
 
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -61,7 +60,7 @@ public class BrokerTestHelper_0_8 extend
 
     public static InternalTestProtocolSession createProtocolSession(String hostName) throws Exception
     {
-        VirtualHost virtualHost = createVirtualHost(hostName);
+        VirtualHostImpl virtualHost = createVirtualHost(hostName);
         return new InternalTestProtocolSession(virtualHost, createBrokerMock());
     }
 

Modified: qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/InternalTestProtocolSession.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/InternalTestProtocolSession.java?rev=1585979&r1=1585978&r2=1585979&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/InternalTestProtocolSession.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/InternalTestProtocolSession.java Wed Apr  9 14:13:13 2014
@@ -49,7 +49,7 @@ import org.apache.qpid.server.model.Brok
 import org.apache.qpid.server.protocol.v0_8.output.ProtocolOutputConverter;
 import org.apache.qpid.server.security.auth.AuthenticatedPrincipal;
 import org.apache.qpid.server.security.auth.UsernamePrincipal;
-import org.apache.qpid.server.virtualhost.VirtualHost;
+import org.apache.qpid.server.virtualhost.VirtualHostImpl;
 import org.apache.qpid.transport.Sender;
 import org.apache.qpid.transport.network.NetworkConnection;
 
@@ -61,7 +61,7 @@ public class InternalTestProtocolSession
     private AtomicInteger _deliveryCount = new AtomicInteger(0);
     private static final AtomicLong ID_GENERATOR = new AtomicLong(0);
 
-    public InternalTestProtocolSession(VirtualHost virtualHost, Broker broker) throws AMQException
+    public InternalTestProtocolSession(VirtualHostImpl virtualHost, Broker broker) throws AMQException
     {
         super(broker, new TestNetworkConnection(), ID_GENERATOR.getAndIncrement(), null, null);
 

Modified: qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/QueueBrowserUsesNoAckTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/QueueBrowserUsesNoAckTest.java?rev=1585979&r1=1585978&r2=1585979&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/QueueBrowserUsesNoAckTest.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/QueueBrowserUsesNoAckTest.java Wed Apr  9 14:13:13 2014
@@ -20,7 +20,6 @@
  */
 package org.apache.qpid.server.protocol.v0_8;
 
-import org.apache.qpid.AMQException;
 import org.apache.qpid.common.AMQPFilterTypes;
 import org.apache.qpid.exchange.ExchangeDefaults;
 import org.apache.qpid.framing.AMQShortString;
@@ -29,7 +28,7 @@ import org.apache.qpid.server.queue.AMQQ
 import org.apache.qpid.server.store.MessageStore;
 import org.apache.qpid.server.store.TestMemoryMessageStore;
 import org.apache.qpid.server.util.BrokerTestHelper;
-import org.apache.qpid.server.virtualhost.VirtualHost;
+import org.apache.qpid.server.virtualhost.VirtualHostImpl;
 import org.apache.qpid.test.utils.QpidTestCase;
 
 import java.util.List;
@@ -47,7 +46,7 @@ public class QueueBrowserUsesNoAckTest e
         super.setUp();
         BrokerTestHelper.setUp();
         _channel = BrokerTestHelper_0_8.createChannel();
-        VirtualHost virtualHost = _channel.getVirtualHost();
+        VirtualHostImpl virtualHost = _channel.getVirtualHost();
         _queueName = getTestName();
         _queue = BrokerTestHelper.createQueue(_queueName, virtualHost);
         _messageStore = virtualHost.getMessageStore();

Modified: qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Connection_1_0.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Connection_1_0.java?rev=1585979&r1=1585978&r2=1585979&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Connection_1_0.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Connection_1_0.java Wed Apr  9 14:13:13 2014
@@ -20,18 +20,28 @@
  */
 package org.apache.qpid.server.protocol.v1_0;
 
+import static org.apache.qpid.server.logging.subjects.LogSubjectFormat.CONNECTION_FORMAT;
+
 import java.net.SocketAddress;
 import java.security.Principal;
 import java.security.PrivilegedAction;
 import java.text.MessageFormat;
+import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+import javax.security.auth.Subject;
+
 import org.apache.qpid.amqp_1_0.transport.ConnectionEndpoint;
 import org.apache.qpid.amqp_1_0.transport.ConnectionEventListener;
 import org.apache.qpid.amqp_1_0.transport.LinkEndpoint;
 import org.apache.qpid.amqp_1_0.transport.SessionEndpoint;
-
 import org.apache.qpid.amqp_1_0.transport.SessionEventListener;
-import org.apache.qpid.amqp_1_0.type.transport.*;
+import org.apache.qpid.amqp_1_0.type.transport.AmqpError;
+import org.apache.qpid.amqp_1_0.type.transport.End;
 import org.apache.qpid.amqp_1_0.type.transport.Error;
 import org.apache.qpid.protocol.AMQConstant;
 import org.apache.qpid.server.connection.ConnectionPrincipal;
@@ -46,16 +56,7 @@ import org.apache.qpid.server.security.S
 import org.apache.qpid.server.security.auth.AuthenticatedPrincipal;
 import org.apache.qpid.server.stats.StatisticsCounter;
 import org.apache.qpid.server.util.Action;
-import org.apache.qpid.server.virtualhost.VirtualHost;
-
-import javax.security.auth.Subject;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.CopyOnWriteArrayList;
-
-import static org.apache.qpid.server.logging.subjects.LogSubjectFormat.CONNECTION_FORMAT;
+import org.apache.qpid.server.virtualhost.VirtualHostImpl;
 
 public class Connection_1_0 implements ConnectionEventListener, AMQConnectionModel<Connection_1_0,Session_1_0>
 {
@@ -63,7 +64,7 @@ public class Connection_1_0 implements C
     private final Port _port;
     private final Broker _broker;
     private final SubjectCreator _subjectCreator;
-    private VirtualHost _vhost;
+    private VirtualHostImpl _vhost;
     private final Transport _transport;
     private final ConnectionEndpoint _conn;
     private final long _connectionId;
@@ -130,7 +131,7 @@ public class Connection_1_0 implements C
         String host = _conn.getLocalHostname();
         if(host == null || host.trim().equals(""))
         {
-            host = (String)_broker.getAttribute(Broker.DEFAULT_VIRTUAL_HOST);
+            host = _broker.getDefaultVirtualHost();
         }
         _vhost = _broker.getVirtualHostRegistry().getVirtualHost(host);
         _vhost.getConnectionRegistry().registerConnection(this);
@@ -432,7 +433,7 @@ public class Connection_1_0 implements C
         return _subject;
     }
 
-    VirtualHost getVirtualHost()
+    VirtualHostImpl getVirtualHost()
     {
         return _vhost;
     }

Modified: qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_to_1_0.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_to_1_0.java?rev=1585979&r1=1585978&r2=1585979&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_to_1_0.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_to_1_0.java Wed Apr  9 14:13:13 2014
@@ -40,7 +40,7 @@ import org.apache.qpid.server.plugin.Mes
 import org.apache.qpid.server.store.StoreFuture;
 import org.apache.qpid.server.store.StoredMessage;
 import org.apache.qpid.server.util.ConnectionScopedRuntimeException;
-import org.apache.qpid.server.virtualhost.VirtualHost;
+import org.apache.qpid.server.virtualhost.VirtualHostImpl;
 import org.apache.qpid.transport.codec.BBDecoder;
 import org.apache.qpid.typedmessage.TypedBytesContentReader;
 import org.apache.qpid.typedmessage.TypedBytesFormatException;
@@ -60,7 +60,7 @@ public abstract class MessageConverter_t
     }
 
     @Override
-    public final Message_1_0 convert(M message, VirtualHost vhost)
+    public final Message_1_0 convert(M message, VirtualHostImpl vhost)
     {
 
         SectionEncoder sectionEncoder = new SectionEncoderImpl(_typeRegistry);

Modified: qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_v1_0_to_Internal.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_v1_0_to_Internal.java?rev=1585979&r1=1585978&r2=1585979&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_v1_0_to_Internal.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_v1_0_to_Internal.java Wed Apr  9 14:13:13 2014
@@ -23,18 +23,7 @@ package org.apache.qpid.server.protocol.
 import org.apache.qpid.amqp_1_0.type.codec.AMQPDescribedTypeRegistry;
 import org.apache.qpid.server.message.internal.InternalMessage;
 import org.apache.qpid.server.plugin.MessageConverter;
-import org.apache.qpid.server.util.ConnectionScopedRuntimeException;
-import org.apache.qpid.server.virtualhost.VirtualHost;
-import org.apache.qpid.transport.codec.BBDecoder;
-import org.apache.qpid.typedmessage.TypedBytesContentReader;
-import org.apache.qpid.typedmessage.TypedBytesFormatException;
-
-import java.io.EOFException;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
+import org.apache.qpid.server.virtualhost.VirtualHostImpl;
 
 public class MessageConverter_v1_0_to_Internal implements MessageConverter<Message_1_0, InternalMessage>
 {
@@ -61,7 +50,7 @@ public class MessageConverter_v1_0_to_In
     }
 
     @Override
-    public InternalMessage convert(Message_1_0 serverMessage, VirtualHost vhost)
+    public InternalMessage convert(Message_1_0 serverMessage, VirtualHostImpl vhost)
     {
         Object bodyObject = MessageConverter_from_1_0.convertBodyToObject(serverMessage);
 

Modified: qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngine_1_0_0_SASL.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngine_1_0_0_SASL.java?rev=1585979&r1=1585978&r2=1585979&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngine_1_0_0_SASL.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngine_1_0_0_SASL.java Wed Apr  9 14:13:13 2014
@@ -56,7 +56,6 @@ import org.apache.qpid.server.model.Tran
 import org.apache.qpid.server.security.SubjectCreator;
 import org.apache.qpid.server.security.auth.UsernamePrincipal;
 import org.apache.qpid.server.util.ServerScopedRuntimeException;
-import org.apache.qpid.server.virtualhost.VirtualHost;
 import org.apache.qpid.transport.Sender;
 import org.apache.qpid.transport.TransportException;
 import org.apache.qpid.transport.network.NetworkConnection;

Modified: qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ReceivingLink_1_0.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ReceivingLink_1_0.java?rev=1585979&r1=1585978&r2=1585979&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ReceivingLink_1_0.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ReceivingLink_1_0.java Wed Apr  9 14:13:13 2014
@@ -45,11 +45,11 @@ import org.apache.qpid.server.message.Me
 import org.apache.qpid.server.store.StoredMessage;
 import org.apache.qpid.server.txn.AutoCommitTransaction;
 import org.apache.qpid.server.txn.ServerTransaction;
-import org.apache.qpid.server.virtualhost.VirtualHost;
+import org.apache.qpid.server.virtualhost.VirtualHostImpl;
 
 public class ReceivingLink_1_0 implements ReceivingLinkListener, Link_1_0, DeliveryStateHandler
 {
-    private VirtualHost _vhost;
+    private VirtualHostImpl _vhost;
 
     private ReceivingDestination _destination;
     private SectionDecoderImpl _sectionDecoder;
@@ -65,7 +65,7 @@ public class ReceivingLink_1_0 implement
     private ReceiverSettleMode _receivingSettlementMode;
 
 
-    public ReceivingLink_1_0(ReceivingLinkAttachment receivingLinkAttachment, VirtualHost vhost,
+    public ReceivingLink_1_0(ReceivingLinkAttachment receivingLinkAttachment, VirtualHostImpl vhost,
                              ReceivingDestination destination)
     {
         _vhost = vhost;

Modified: qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java?rev=1585979&r1=1585978&r2=1585979&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java Wed Apr  9 14:13:13 2014
@@ -59,14 +59,14 @@ import org.apache.qpid.server.queue.AMQQ
 import org.apache.qpid.server.txn.AutoCommitTransaction;
 import org.apache.qpid.server.txn.ServerTransaction;
 import org.apache.qpid.server.util.ConnectionScopedRuntimeException;
-import org.apache.qpid.server.virtualhost.VirtualHost;
+import org.apache.qpid.server.virtualhost.VirtualHostImpl;
 import org.apache.qpid.server.virtualhost.QueueExistsException;
 
 public class SendingLink_1_0 implements SendingLinkListener, Link_1_0, DeliveryStateHandler
 {
     private static final Logger _logger = Logger.getLogger(SendingLink_1_0.class);
 
-    private VirtualHost _vhost;
+    private VirtualHostImpl _vhost;
     private SendingDestination _destination;
 
     private ConsumerImpl _consumer;
@@ -87,7 +87,7 @@ public class SendingLink_1_0 implements 
 
 
     public SendingLink_1_0(final SendingLinkAttachment linkAttachment,
-                           final VirtualHost vhost,
+                           final VirtualHostImpl vhost,
                            final SendingDestination destination)
             throws AmqpErrorException
     {
@@ -687,7 +687,7 @@ public class SendingLink_1_0 implements 
         _closeAction = action;
     }
 
-    public VirtualHost getVirtualHost()
+    public VirtualHostImpl getVirtualHost()
     {
         return _vhost;
     }

Modified: qpid/trunk/qpid/java/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/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java?rev=1585979&r1=1585978&r2=1585979&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java Wed Apr  9 14:13:13 2014
@@ -58,7 +58,7 @@ import org.apache.qpid.server.txn.AutoCo
 import org.apache.qpid.server.txn.ServerTransaction;
 import org.apache.qpid.server.util.Action;
 import org.apache.qpid.server.util.ConnectionScopedRuntimeException;
-import org.apache.qpid.server.virtualhost.VirtualHost;
+import org.apache.qpid.server.virtualhost.VirtualHostImpl;
 import org.apache.qpid.server.virtualhost.QueueExistsException;
 
 import javax.security.auth.Subject;
@@ -73,7 +73,7 @@ public class Session_1_0 implements Sess
     private static final Logger _logger = Logger.getLogger(Session_1_0.class);
     private static final Symbol LIFETIME_POLICY = Symbol.valueOf("lifetime-policy");
     private final SessionEndpoint _endpoint;
-    private VirtualHost _vhost;
+    private VirtualHostImpl _vhost;
     private AutoCommitTransaction _transaction;
 
     private final LinkedHashMap<Integer, ServerTransaction> _openTransactions =
@@ -721,7 +721,7 @@ public class Session_1_0 implements Sess
         return _subject;
     }
 
-    VirtualHost getVirtualHost()
+    VirtualHostImpl getVirtualHost()
     {
         return _connection.getVirtualHost();
     }

Modified: qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/TxnCoordinatorLink_1_0.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/TxnCoordinatorLink_1_0.java?rev=1585979&r1=1585978&r2=1585979&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/TxnCoordinatorLink_1_0.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/TxnCoordinatorLink_1_0.java Wed Apr  9 14:13:13 2014
@@ -35,7 +35,7 @@ import org.apache.qpid.amqp_1_0.type.tra
 import org.apache.qpid.amqp_1_0.type.transport.Error;
 import org.apache.qpid.server.txn.LocalTransaction;
 import org.apache.qpid.server.txn.ServerTransaction;
-import org.apache.qpid.server.virtualhost.VirtualHost;
+import org.apache.qpid.server.virtualhost.VirtualHostImpl;
 
 import java.nio.ByteBuffer;
 import java.util.*;
@@ -43,7 +43,7 @@ import java.util.*;
 public class TxnCoordinatorLink_1_0 implements ReceivingLinkListener, Link_1_0
 {
     private static final Logger _logger = Logger.getLogger(TxnCoordinatorLink_1_0.class);
-    private VirtualHost _vhost;
+    private VirtualHostImpl _vhost;
     private ReceivingLinkEndpoint _endpoint;
 
     private ArrayList<Transfer> _incompleteMessage;
@@ -52,7 +52,7 @@ public class TxnCoordinatorLink_1_0 impl
     private Session_1_0 _session;
 
 
-    public TxnCoordinatorLink_1_0(VirtualHost vhost,
+    public TxnCoordinatorLink_1_0(VirtualHostImpl vhost,
                                   Session_1_0 session_1_0, ReceivingLinkEndpoint endpoint,
                                   LinkedHashMap<Integer, ServerTransaction> openTransactions)
     {



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message