1 files changed, 2 insertions, 20 deletions
diff --git a/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java b/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java
index f810360662..d24f79c56c 100755
--- a/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java
@@ -25,13 +25,10 @@ import java.util.UUID;
 import java.util.concurrent.ScheduledFuture;
 import org.apache.qpid.common.Closeable;
 import org.apache.qpid.server.binding.BindingFactory;
-import org.apache.qpid.server.configuration.ConfigStore;
-import org.apache.qpid.server.configuration.VirtualHostConfig;
 import org.apache.qpid.server.configuration.VirtualHostConfiguration;
 import org.apache.qpid.server.connection.IConnectionRegistry;
 import org.apache.qpid.server.exchange.ExchangeFactory;
 import org.apache.qpid.server.exchange.ExchangeRegistry;
-import org.apache.qpid.server.federation.BrokerLink;
 import org.apache.qpid.server.protocol.v1_0.LinkRegistry;
 import org.apache.qpid.server.queue.QueueRegistry;
 import org.apache.qpid.server.registry.IApplicationRegistry;
@@ -41,7 +38,7 @@ import org.apache.qpid.server.store.DurableConfigurationStore;
 import org.apache.qpid.server.store.MessageStore;
 import org.apache.qpid.server.txn.DtxRegistry;
 
-public interface VirtualHost extends DurableConfigurationStore.Source, VirtualHostConfig, Closeable, StatisticsGatherer
+public interface VirtualHost extends DurableConfigurationStore.Source, Closeable, StatisticsGatherer
 {
     IConnectionRegistry getConnectionRegistry();
 
@@ -61,8 +58,6 @@ public interface VirtualHost extends DurableConfigurationStore.Source, VirtualHo
 
     void close();
 
-    UUID getBrokerId();
-
     UUID getId();
 
     void scheduleHouseKeepingTask(long period, HouseKeepingTask task);
@@ -77,25 +72,12 @@ public interface VirtualHost extends DurableConfigurationStore.Source, VirtualHo
 
     int getHouseKeepingActiveCount();
 
-    IApplicationRegistry getApplicationRegistry();
+    VirtualHostRegistry getVirtualHostRegistry();
 
     BindingFactory getBindingFactory();
 
-    void createBrokerConnection(String transport,
-                                String host,
-                                int port,
-                                String vhost,
-                                boolean durable,
-                                String authMechanism, String username, String password);
-
-    public BrokerLink createBrokerConnection(UUID id, long createTime, Map<String,String> arguments);
-
-    ConfigStore getConfigStore();
-
     DtxRegistry getDtxRegistry();
 
-    void removeBrokerConnection(BrokerLink brokerLink);
-
     LinkRegistry getLinkRegistry(String remoteContainerId);
 
     ScheduledFuture<?> scheduleTask(long delay, Runnable timeoutTask);