Fix misc compile errors.

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-fix@764493 13f79535-47bb-0310-9956-ffa450edef68

8 files changed, 9 insertions, 94 deletions

diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfiguration.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfiguration.java
index 99d2bf6067..74bb7ee969 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfiguration.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfiguration.java
@@ -31,7 +31,7 @@ public class QueueConfiguration
     private String _name;
     private VirtualHostConfiguration _vHostConfig;
 
-    public QueueConfiguration(String name, Configuration config)
+    public QueueConfiguration(String name, Configuration config, VirtualHostConfiguration virtualHostConfiguration)
     {
         _vHostConfig = virtualHostConfiguration;
         _config = config;
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
index 93661f2d9a..28a07e7ebf 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
@@ -139,7 +139,7 @@ public class ServerConfiguration implements SignalHandler
                         String key = (String) k.next();
                         conf.setProperty("virtualhosts.virtualhost."+name+"."+key, myConf.getProperty(key));
                     }
-                    VirtualHostConfiguration vhostConfig = new VirtualHostConfiguration(name, conf.subset("virtualhosts.virtualhost."+name), this);
+                    VirtualHostConfiguration vhostConfig = new VirtualHostConfiguration(name, conf.subset("virtualhosts.virtualhost."+name));
                     _virtualHosts.put(vhostConfig.getName(), vhostConfig);
                 }
             }
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java
index 1576cd4582..0273a13262 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java
@@ -28,6 +28,7 @@ import java.util.Map;
 import org.apache.commons.configuration.CompositeConfiguration;
 import org.apache.commons.configuration.Configuration;
 import org.apache.commons.configuration.ConfigurationException;
+import org.apache.commons.configuration.PropertiesConfiguration;
 import org.apache.qpid.server.registry.ApplicationRegistry;
 import org.apache.qpid.server.store.MemoryMessageStore;
 
@@ -50,7 +51,7 @@ public class VirtualHostConfiguration
 			CompositeConfiguration mungedConf = new CompositeConfiguration();
 			mungedConf.addConfiguration(_config.subset("queues.queue." + queueName));
 			mungedConf.addConfiguration(_config.subset("queues"));
-			_queues.put(queueName, new QueueConfiguration(queueName, mungedConf));
+			_queues.put(queueName, new QueueConfiguration(queueName, mungedConf, this));
         }
 
 		i = _config.getList("exchanges.exchange.name").iterator();
@@ -106,31 +107,16 @@ public class VirtualHostConfiguration
 		return _config.getList("exchanges.exchange.name");
 	}
 
-	public ExchangeConfiguration getExchangeConfiguration(String exchangeName)
-	{
-		return _exchanges.get(exchangeName);
-	}
-
 	public String[] getQueueNames()
 	{
 		return _queues.keySet().toArray(new String[_queues.size()]);
 	}
 
-    public List getExchanges()
-    {
-        return _config.getList("exchanges.exchange.name");
-    }
-
     public ExchangeConfiguration getExchangeConfiguration(String exchangeName)
     {
         return _exchanges.get(exchangeName);
     }
 
-    public String[] getQueueNames()
-    {
-        return _queues.keySet().toArray(new String[_queues.size()]);
-    }
-
     public QueueConfiguration getQueueConfiguration(String queueName)
     {
         // We might be asked for the config for a queue we don't know about,
@@ -154,18 +140,7 @@ public class VirtualHostConfiguration
     {
         return _config.getLong("queues.minimumMemoryUsage", 0);
     }
-
-    public ServerConfiguration getServerConfiguration()
-    {
-        return _serverConfiguration;
-    }
-
-    public static final String FLOW_TO_DISK_PATH = "flowToDiskPath";
-    public String getFlowToDiskLocation()
-    {
-        return _config.getString(FLOW_TO_DISK_PATH, getServerConfiguration().getQpidWork());
-    }
-
+    
     public int getMaximumMessageAge()
     {
         return _config.getInt("queues.maximumMessageAge", 0);
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueue.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueue.java
index b49cdde66e..014b348822 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueue.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueue.java
@@ -24,6 +24,7 @@ import org.apache.commons.configuration.CompositeConfiguration;
 import org.apache.commons.configuration.Configuration;
 import org.apache.qpid.server.management.Managable;
 import org.apache.qpid.server.store.StoreContext;
+import org.apache.qpid.server.configuration.QueueConfiguration;
 import org.apache.qpid.server.exchange.Exchange;
 import org.apache.qpid.server.protocol.AMQProtocolSession;
 import org.apache.qpid.server.virtualhost.VirtualHost;
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/ManagedQueue.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/ManagedQueue.java
index d91d45a446..579656893b 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/ManagedQueue.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/ManagedQueue.java
@@ -184,63 +184,6 @@ public interface ManagedQueue
     @MBeanAttribute(name="MaximumQueueDepth", description="The threshold high value(Bytes) for Queue Depth")
     void setMaximumQueueDepth(Long value) throws IOException;
 
-    /**
-     * View the limit on the memory that this queue will utilise.
-     *
-     * Used by Flow to Disk.
-     *
-     * @return The maximum memory(B) that the queue will occuy.
-     */
-    public Long getMemoryUsageMaximum();
-
-    /**
-     * Place a limit on the memory that this queue will utilise.
-     *
-     * Used by Flow to Disk
-     *
-     * @param maximumMemoryUsage The new maximum memory(B) to be used by this queue
-     */
-    @MBeanAttribute(name="MemoryUsageMaximum", description="The maximum memory(Bytes) that the queue will occupy.")
-    public void setMemoryUsageMaximum(Long maximumMemoryUsage);
-
-    /**
-     * View the minimum amount of memory that has been defined for this queue.
-     *
-     * Used by Flow to Disk
-     *
-     * @return The minimum amount of queue data(B) that the queue will attempt to keep in memory
-     */
-    public Long getMemoryUsageMinimum();
-
-    /**
-     * Set the minimum amount of memory that has been defined for this queue.
-     *
-     * Used by Flow to Disk
-     *
-     * @param minimumMemoryUsage The new minimum memory(B) level to be used by this queue
-     */
-    @MBeanAttribute(name="MemoryUsageMinimum", description="The minimum memory(Bytes) that the queue will occupy.")
-    public void setMemoryUsageMinimum(Long minimumMemoryUsage);
-
-    /**
-     * View the amount of memory(B) that this queue is using.
-     *
-     * @return The current memory(B) usage of this queue.
-     */
-    @MBeanAttribute(name="MemoryUsageCurrent", description="The current amount of memory(Bytes) used by this queue.")
-    public Long getMemoryUsageCurrent();
-
-    /**
-     * When a queue exceeds its MemoryUsageMaximum value then the Queue will start flowing to disk.
-     *
-     * This boolean is used to show that change in state.
-     *
-     * @return true if the Queue is currently flowing to disk
-     */
-    @MBeanAttribute(name="isFlowed", description="true if the queue is currently flowing to disk.")
-    public boolean isFlowed();
-
-
 
     //********** Operations *****************//
 
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
index ca6e7a8ce6..09258682bd 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
@@ -1595,8 +1595,6 @@ public class SimpleAMQQueue implements AMQQueue, Subscription.StateListener
             setMaximumMessageSize(config.getMaximumMessageSize());
             setMaximumMessageCount(config.getMaximumMessageCount());
             setMinimumAlertRepeatGap(config.getMinimumAlertRepeatGap());
-            setMemoryUsageMaximum(config.getMemoryUsageMaximum());
-            setMemoryUsageMinimum(config.getMemoryUsageMinimum());
         }
     }
 }
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/QueueConfigurationTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/QueueConfigurationTest.java
index b3a792521a..9692cf2727 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/QueueConfigurationTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/QueueConfigurationTest.java
@@ -35,9 +35,7 @@ public class QueueConfigurationTest extends TestCase
     public void setUp() throws Exception
     {
         _env = new PropertiesConfiguration();
-        ServerConfiguration emptyServerConfig;
-        emptyServerConfig = new ServerConfiguration(_env);
-        _emptyConf = new VirtualHostConfiguration("test", _env, emptyServerConfig);
+        _emptyConf = new VirtualHostConfiguration("test", _env);
         
         PropertiesConfiguration fullEnv = new PropertiesConfiguration();
         fullEnv.setProperty("queues.maximumMessageAge", 1);
@@ -46,8 +44,7 @@ public class QueueConfigurationTest extends TestCase
         fullEnv.setProperty("queues.maximumMessageCount", 1);
         fullEnv.setProperty("queues.minimumAlertRepeatGap", 1);
 
-        _fullServerConf = new ServerConfiguration(fullEnv);
-        _fullHostConf = new VirtualHostConfiguration("test", fullEnv, _fullServerConf);
+        _fullHostConf = new VirtualHostConfiguration("test", fullEnv);
         
     }
 
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java
index 8e0712e27c..20503bf15c 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java
@@ -28,6 +28,7 @@ import org.apache.qpid.server.configuration.VirtualHostConfiguration;
 import org.apache.qpid.server.exchange.Exchange;
 import org.apache.qpid.server.subscription.Subscription;
 import org.apache.qpid.server.store.StoreContext;
+import org.apache.qpid.server.virtualhost.VirtualHost;
 import org.apache.qpid.server.management.ManagedObject;
 import org.apache.qpid.server.registry.ApplicationRegistry;
 import org.apache.qpid.AMQException;