Author: ccardona
Date: Sun Feb 4 19:00:28 2007
New Revision: 503534
URL: http://svn.apache.org/viewvc?view=rev&rev=503534
Log:
Removed class BoundedRangeImpl and replaced with class BoundedRangeStatisticImpl
Removed:
geronimo/server/trunk/modules/geronimo-management/src/main/java/org/apache/geronimo/management/stats/BoundedRangeImpl.java
Modified:
geronimo/server/trunk/modules/geronimo-core/src/main/java/org/apache/geronimo/pool/ThreadPool.java
geronimo/server/trunk/modules/geronimo-j2ee/src/main/java/org/apache/geronimo/j2ee/management/impl/JVMImpl.java
geronimo/server/trunk/modules/geronimo-management/src/main/java/org/apache/geronimo/management/stats/JVMStatsImpl.java
geronimo/server/trunk/modules/geronimo-management/src/main/java/org/apache/geronimo/management/stats/WebConnectorStatsImpl.java
Modified: geronimo/server/trunk/modules/geronimo-core/src/main/java/org/apache/geronimo/pool/ThreadPool.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-core/src/main/java/org/apache/geronimo/pool/ThreadPool.java?view=diff&rev=503534&r1=503533&r2=503534
==============================================================================
--- geronimo/server/trunk/modules/geronimo-core/src/main/java/org/apache/geronimo/pool/ThreadPool.java
(original)
+++ geronimo/server/trunk/modules/geronimo-core/src/main/java/org/apache/geronimo/pool/ThreadPool.java
Sun Feb 4 19:00:28 2007
@@ -42,7 +42,7 @@
import org.apache.geronimo.management.J2EEManagedObject;
import org.apache.geronimo.management.StatisticsProvider;
import org.apache.geronimo.management.geronimo.stats.ThreadPoolStats;
-import org.apache.geronimo.management.stats.BoundedRangeImpl;
+import org.apache.geronimo.management.stats.BoundedRangeStatisticImpl;
import org.apache.geronimo.management.stats.CountStatisticImpl;
import org.apache.geronimo.management.stats.StatsImpl;
@@ -122,7 +122,9 @@
}
public static class PoolStatsImpl extends StatsImpl implements ThreadPoolStats {
- private BoundedRangeImpl threadsInUse = new BoundedRangeImpl("Threads In Use", "",
"The number of threads in use by this thread pool");
+ private BoundedRangeStatisticImpl threadsInUse = new BoundedRangeStatisticImpl(
+ "Threads In Use", "",
+ "The number of threads in use by this thread pool");
private Map consumers = new HashMap();
public PoolStatsImpl() {
Modified: geronimo/server/trunk/modules/geronimo-j2ee/src/main/java/org/apache/geronimo/j2ee/management/impl/JVMImpl.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-j2ee/src/main/java/org/apache/geronimo/j2ee/management/impl/JVMImpl.java?view=diff&rev=503534&r1=503533&r2=503534
==============================================================================
--- geronimo/server/trunk/modules/geronimo-j2ee/src/main/java/org/apache/geronimo/j2ee/management/impl/JVMImpl.java
(original)
+++ geronimo/server/trunk/modules/geronimo-j2ee/src/main/java/org/apache/geronimo/j2ee/management/impl/JVMImpl.java
Sun Feb 4 19:00:28 2007
@@ -22,6 +22,7 @@
import java.util.Date;
import java.util.Hashtable;
import java.util.Properties;
+
import javax.management.ObjectName;
import javax.management.j2ee.statistics.Stats;
@@ -32,7 +33,7 @@
import org.apache.geronimo.kernel.ObjectNameUtil;
import org.apache.geronimo.management.StatisticsProvider;
import org.apache.geronimo.management.geronimo.JVM;
-import org.apache.geronimo.management.stats.BoundedRangeImpl;
+import org.apache.geronimo.management.stats.BoundedRangeStatisticImpl;
import org.apache.geronimo.management.stats.JVMStatsImpl;
import org.apache.geronimo.system.logging.SystemLog;
@@ -150,7 +151,7 @@
}
public Stats getStats() {
- BoundedRangeImpl heap;
+ BoundedRangeStatisticImpl heap;
if(stats == null) {
stats = new JVMStatsImpl();
long start = kernel.getBootTime().getTime();
Modified: geronimo/server/trunk/modules/geronimo-management/src/main/java/org/apache/geronimo/management/stats/JVMStatsImpl.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-management/src/main/java/org/apache/geronimo/management/stats/JVMStatsImpl.java?view=diff&rev=503534&r1=503533&r2=503534
==============================================================================
--- geronimo/server/trunk/modules/geronimo-management/src/main/java/org/apache/geronimo/management/stats/JVMStatsImpl.java
(original)
+++ geronimo/server/trunk/modules/geronimo-management/src/main/java/org/apache/geronimo/management/stats/JVMStatsImpl.java
Sun Feb 4 19:00:28 2007
@@ -16,9 +16,9 @@
*/
package org.apache.geronimo.management.stats;
-import javax.management.j2ee.statistics.JVMStats;
-import javax.management.j2ee.statistics.CountStatistic;
import javax.management.j2ee.statistics.BoundedRangeStatistic;
+import javax.management.j2ee.statistics.CountStatistic;
+import javax.management.j2ee.statistics.JVMStats;
/**
* Geronimo implementation of the JSR-77 JVMStats interface.
@@ -27,12 +27,12 @@
*/
public class JVMStatsImpl extends StatsImpl implements JVMStats {
private final CountStatisticImpl upTime;
- private final BoundedRangeImpl heapSize;
+ private final BoundedRangeStatisticImpl heapSize;
public JVMStatsImpl() {
upTime = new CountStatisticImpl("JVM Up Time", StatisticImpl.UNIT_TIME_MILLISECOND,
"The length of time that the JVM has been running", 0);
- heapSize = new BoundedRangeImpl("JVM Heap Size", StatisticImpl.UNIT_MEMORY_BYTES,
+ heapSize = new BoundedRangeStatisticImpl("JVM Heap Size", StatisticImpl.UNIT_MEMORY_BYTES,
"The memory usage of the JVM");
addStat("UpTime", upTime);
addStat("HeapSize", heapSize);
@@ -56,7 +56,7 @@
/**
* Used to access the native implementation in order to call setters
*/
- public BoundedRangeImpl getHeapSizeImpl() {
+ public BoundedRangeStatisticImpl getHeapSizeImpl() {
return heapSize;
}
}
Modified: geronimo/server/trunk/modules/geronimo-management/src/main/java/org/apache/geronimo/management/stats/WebConnectorStatsImpl.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-management/src/main/java/org/apache/geronimo/management/stats/WebConnectorStatsImpl.java?view=diff&rev=503534&r1=503533&r2=503534
==============================================================================
--- geronimo/server/trunk/modules/geronimo-management/src/main/java/org/apache/geronimo/management/stats/WebConnectorStatsImpl.java
(original)
+++ geronimo/server/trunk/modules/geronimo-management/src/main/java/org/apache/geronimo/management/stats/WebConnectorStatsImpl.java
Sun Feb 4 19:00:28 2007
@@ -17,7 +17,6 @@
package org.apache.geronimo.management.stats;
-import javax.management.j2ee.statistics.BoundedRangeStatistic;
import javax.management.j2ee.statistics.CountStatistic;
import javax.management.j2ee.statistics.RangeStatistic;
import javax.management.j2ee.statistics.TimeStatistic;
@@ -49,7 +48,7 @@
private CountStatistic busyThreadCount;
// TODO - change the name to BoundedRangeStatisticsImpl
- private BoundedRangeImpl busyThreads;
+ private BoundedRangeStatisticImpl busyThreads;
// TODO - spareThreads metrics = current - busy, maxSpareThreads, minSpareThreads
public WebConnectorStatsImpl() {
@@ -65,7 +64,7 @@
"The number of bytes received during the observerd period", 0);
openConnectionCount = new RangeStatisticImpl("" + "Open Connections", StatisticImpl.UNIT_COUNT,
"Range for connections opened during the observed period", 0); // all 0's
- busyThreads = new BoundedRangeImpl("Busy Threads", StatisticImpl.UNIT_COUNT,
+ busyThreads = new BoundedRangeStatisticImpl("Busy Threads", StatisticImpl.UNIT_COUNT,
"BoundedRange for Threads currently busy serving requests", 0, 0, 0);
addStat("RequestTime", requestTime); // better name
addStat("activeRequestCount", activeRequestCount);
|