1 files changed, 23 insertions, 2 deletions
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java
index 8919f4d348..2435854912 100755
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java
@@ -20,13 +20,18 @@
 */
 package org.apache.qpid.server.virtualhost;
 
+import java.util.Collection;
 import java.util.UUID;
 import java.util.concurrent.ScheduledFuture;
+import org.apache.qpid.AMQException;
 import org.apache.qpid.common.Closeable;
 import org.apache.qpid.server.configuration.VirtualHostConfiguration;
 import org.apache.qpid.server.connection.IConnectionRegistry;
+import org.apache.qpid.server.exchange.Exchange;
 import org.apache.qpid.server.exchange.ExchangeFactory;
+import org.apache.qpid.server.exchange.ExchangeInUseException;
 import org.apache.qpid.server.exchange.ExchangeRegistry;
+import org.apache.qpid.server.plugin.ExchangeType;
 import org.apache.qpid.server.protocol.v1_0.LinkRegistry;
 import org.apache.qpid.server.queue.QueueRegistry;
 import org.apache.qpid.server.security.SecurityManager;
@@ -45,9 +50,23 @@ public interface VirtualHost extends DurableConfigurationStore.Source, Closeable
 
     QueueRegistry getQueueRegistry();
 
-    ExchangeRegistry getExchangeRegistry();
+    Exchange createExchange(UUID id,
+                            String exchange,
+                            String type,
+                            boolean durable,
+                            boolean autoDelete,
+                            String alternateExchange)
+            throws AMQException;
 
-    ExchangeFactory getExchangeFactory();
+    void removeExchange(Exchange exchange, boolean force) throws AMQException;
+
+    Exchange getExchange(String name);
+
+    Exchange getDefaultExchange();
+
+    Collection<Exchange> getExchanges();
+
+    Collection<ExchangeType<? extends Exchange>> getExchangeTypes();
 
     DurableConfigurationStore getDurableConfigurationStore();
 
@@ -55,6 +74,8 @@ public interface VirtualHost extends DurableConfigurationStore.Source, Closeable
 
     SecurityManager getSecurityManager();
 
+    void addVirtualHostListener(VirtualHostListener listener);
+
     void close();
 
     UUID getId();