Reorganized the Accumulators into their own package

git-svn-id: http://svn.igniterealtime.org/svn/repos/messenger/branches/pampero@2856 b35dd754-fafc-0310-a699-88a17e54d16e

src/plugins/meter/src/java/org/jivesoftware/messenger/plugin/meter/MeterPlugin.java

@@ -22,6 +22,7 @@ import javax.management.ReflectionException;
 
 import org.jivesoftware.messenger.container.Plugin;
 import org.jivesoftware.messenger.container.PluginManager;
+import org.jivesoftware.messenger.plugin.meter.accumulator.Accumulator;
 import org.jrobin.core.RrdDbPool;
 import org.jrobin.core.RrdException;
 

src/plugins/meter/src/java/org/jivesoftware/messenger/plugin/meter/RrdManager.java

@@ -37,6 +37,8 @@ import javax.management.relation.RelationServiceMBean;
 import javax.management.relation.RoleInfo;
 
 import org.apache.commons.jxpath.JXPathIntrospector;
+import org.jivesoftware.messenger.plugin.meter.accumulator.Accumulator;
+import org.jivesoftware.messenger.plugin.meter.accumulator.AccumulatorManager;
 import org.jrobin.annotations.Arc;
 import org.jrobin.annotations.Ds;
 import org.jrobin.annotations.Rrd;
@@ -66,6 +68,9 @@ public class RrdManager {
         return Collections.unmodifiableMap(stores);
     }
     
+    /** The overrides. */
+    private final List<Accumulator> overrides = new ArrayList<Accumulator>();
+    
     /** The stores. */
     private static Map<String, RrdManager> stores = new HashMap<String, RrdManager>();
     
@@ -109,13 +114,14 @@ public class RrdManager {
             is = this.getClass().getClassLoader().getResourceAsStream("typeoverrides.config");
         }
         try {
-            new Properties().load(is);
+            Properties p = new Properties();
+            p.load(is);
             
-            Enumeration names = new Properties().propertyNames();
+            Enumeration names = p.propertyNames();
             for(; names.hasMoreElements(); ) {
                 String name = (String)names.nextElement();
                 try {
-                    AccumulatorManager.registerOverride(new ObjectName(name), Class.forName(new Properties().getProperty(name)));
+                    AccumulatorManager.registerOverride(new ObjectName(name), Class.forName(p.getProperty(name)));
                 } catch (Exception e) {
                     logger.log(Level.WARNING, "Unable to register override: {0}", e.getLocalizedMessage());
                 }
@@ -128,6 +134,13 @@ public class RrdManager {
 
 
     
+    /**
+     * @return overrides A list of overrides
+     */
+    public List<Accumulator> getGraphableObjectNames() {
+        return this.overrides;
+    }
+
     
     /**
      * @throws MalformedObjectNameException

src/plugins/meter/src/java/org/jivesoftware/messenger/plugin/meter/Accumulator.java → src/plugins/meter/src/java/org/jivesoftware/messenger/plugin/meter/accumulator/Accumulator.java

 /**
  * 
  */
-package org.jivesoftware.messenger.plugin.meter;
+package org.jivesoftware.messenger.plugin.meter.accumulator;
 
 import java.io.IOException;
 import java.util.Date;
@@ -12,6 +12,7 @@ import java.util.logging.Logger;
 
 import javax.management.ObjectName;
 
+import org.jivesoftware.messenger.plugin.meter.UnableToAllocateAccumulator;
 import org.jrobin.annotations.Arc;
 import org.jrobin.annotations.Ds;
 import org.jrobin.annotations.Rrd;
@@ -25,7 +26,7 @@ import org.jrobin.core.Sample;
  * @author Noah Campbell
  * @version 1.0
  */
-public class Accumulator implements Runnable {
+public class Accumulator implements AccumulatorMBean, Runnable {
 
     
     /** The logger. */
@@ -56,6 +57,9 @@ public class Accumulator implements Runnable {
     /** The lastTimestamp. */
     private long lastTimestamp = Long.MIN_VALUE;
     
+    /** The count. */
+    private long count = 0;
+    
     /**
      * @see java.lang.Runnable#run()
      */
@@ -94,6 +98,7 @@ public class Accumulator implements Runnable {
             }
             s.update();
             lastTimestamp = timestamp;
+            count++;
             
         } catch (IOException e) {
             logger.log(Level.WARNING, "accumulator.ioexception", e);
@@ -119,4 +124,24 @@ public class Accumulator implements Runnable {
 
     }
 
+    /**
+     * @see org.jivesoftware.messenger.plugin.meter.accumulator.AccumulatorMBean#getPath()
+     */
+    public String getPath() {
+        return this.getPath();
+    }
+
+    /**
+     * @see org.jivesoftware.messenger.plugin.meter.accumulator.AccumulatorMBean#getSourceMBean()
+     */
+    public ObjectName getSourceMBean() {
+        return this.objectName;
+    }
+
+    /**
+     * @see org.jivesoftware.messenger.plugin.meter.accumulator.AccumulatorMBean#getTotalReads()
+     */
+    public long getTotalReads() {
+        return count;
+    }
 }

src/plugins/meter/src/java/org/jivesoftware/messenger/plugin/meter/AccumulatorDefinitionNotFoundException.java → src/plugins/meter/src/java/org/jivesoftware/messenger/plugin/meter/accumulator/AccumulatorDefinitionNotFoundException.java

 /**
  * 
  */
-package org.jivesoftware.messenger.plugin.meter;
+package org.jivesoftware.messenger.plugin.meter.accumulator;
 
 /**
  * @author Noah Campbell

src/plugins/meter/src/java/org/jivesoftware/messenger/plugin/meter/AccumulatorHelper.java → src/plugins/meter/src/java/org/jivesoftware/messenger/plugin/meter/accumulator/AccumulatorHelper.java

 /**
  * 
  */
-package org.jivesoftware.messenger.plugin.meter;
+package org.jivesoftware.messenger.plugin.meter.accumulator;
 
 import java.util.Map;
 

src/plugins/meter/src/java/org/jivesoftware/messenger/plugin/meter/accumulator/AccumulatorMBean.java

+/**
+ * 
+ */
+package org.jivesoftware.messenger.plugin.meter.accumulator;
+
+import javax.management.ObjectName;
+
+/**
+ * @author Noah Campbell
+ * @version 1.0
+ */
+public interface AccumulatorMBean {
+    String getPath();
+    ObjectName getSourceMBean();
+    long getTotalReads();
+}

src/plugins/meter/src/java/org/jivesoftware/messenger/plugin/meter/AccumulatorManager.java → src/plugins/meter/src/java/org/jivesoftware/messenger/plugin/meter/accumulator/AccumulatorManager.java

 /**
  * 
  */
-package org.jivesoftware.messenger.plugin.meter;
+package org.jivesoftware.messenger.plugin.meter.accumulator;
 
 import java.lang.management.ManagementFactory;
 import java.lang.reflect.InvocationHandler;
@@ -20,6 +20,7 @@ import javax.management.ObjectName;
 import org.apache.commons.jxpath.CompiledExpression;
 import org.apache.commons.jxpath.JXPathContext;
 import org.apache.commons.jxpath.JXPathException;
+import org.jivesoftware.messenger.plugin.meter.UnableToAllocateAccumulator;
 import org.jrobin.annotations.Ds;
 import org.jrobin.annotations.Rrd;