1 files changed, 3 insertions, 78 deletions
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/information/management/ServerInformationMBean.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/information/management/ServerInformationMBean.java
index 5e6a143d52..db2cc970b2 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/information/management/ServerInformationMBean.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/information/management/ServerInformationMBean.java
@@ -22,11 +22,9 @@ package org.apache.qpid.server.information.management;
 
 import java.io.IOException;
 
-import org.apache.qpid.common.QpidProperties;
 import org.apache.qpid.management.common.mbeans.ServerInformation;
 import org.apache.qpid.management.common.mbeans.annotations.MBeanDescription;
 import org.apache.qpid.server.management.AMQManagedObject;
-import org.apache.qpid.server.registry.ApplicationRegistry;
 
 import javax.management.JMException;
 
@@ -36,15 +34,12 @@ public class ServerInformationMBean extends AMQManagedObject implements ServerIn
 {
     private String buildVersion;
     private String productVersion;
-    private ApplicationRegistry registry;
     
-    public ServerInformationMBean(ApplicationRegistry applicationRegistry) throws JMException
+    public ServerInformationMBean(String buildVersion, String productVersion) throws JMException
     {
         super(ServerInformation.class, ServerInformation.TYPE);
-
-        registry = applicationRegistry;
-        buildVersion = QpidProperties.getBuildVersion();
-        productVersion = QpidProperties.getReleaseVersion();
+        this.buildVersion = buildVersion;
+        this.productVersion = productVersion;
     }
 
     public String getObjectInstanceName()
@@ -72,75 +67,5 @@ public class ServerInformationMBean extends AMQManagedObject implements ServerIn
         return productVersion;
     }
 
-
-    public void resetStatistics() throws Exception
-    {
-        registry.resetStatistics();
-    }
-
-    public double getPeakMessageDeliveryRate()
-    {
-        return registry.getMessageDeliveryStatistics().getPeak();
-    }
-
-    public double getPeakDataDeliveryRate()
-    {
-        return registry.getDataDeliveryStatistics().getPeak();
-    }
-
-    public double getMessageDeliveryRate()
-    {
-        return registry.getMessageDeliveryStatistics().getRate();
-    }
-
-    public double getDataDeliveryRate()
-    {
-        return registry.getDataDeliveryStatistics().getRate();
-    }
-
-    public long getTotalMessagesDelivered()
-    {
-        return registry.getMessageDeliveryStatistics().getTotal();
-    }
-
-    public long getTotalDataDelivered()
-    {
-        return registry.getDataDeliveryStatistics().getTotal();
-    }
-
-    public double getPeakMessageReceiptRate()
-    {
-        return registry.getMessageReceiptStatistics().getPeak();
-    }
-
-    public double getPeakDataReceiptRate()
-    {
-        return registry.getDataReceiptStatistics().getPeak();
-    }
-
-    public double getMessageReceiptRate()
-    {
-        return registry.getMessageReceiptStatistics().getRate();
-    }
-
-    public double getDataReceiptRate()
-    {
-        return registry.getDataReceiptStatistics().getRate();
-    }
-
-    public long getTotalMessagesReceived()
-    {
-        return registry.getMessageReceiptStatistics().getTotal();
-    }
-
-    public long getTotalDataReceived()
-    {
-        return registry.getDataReceiptStatistics().getTotal();
-    }
-
-    public boolean isStatisticsEnabled()
-    {
-        return registry.isStatisticsEnabled();
-    }
     
 }