Author: nicolas Date: Thu Mar 6 03:47:07 2008 New Revision: 634231 URL: http://svn.apache.org/viewvc?rev=634231&view=rev Log: fix some PMD violations fix xdoc
Modified: commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/impl/monitors/AbstractMonitor.java commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/impl/monitors/CompositeValuesMonitor.java commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/impl/monitors/CreateValuesOnDemandMonitor.java commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/impl/values/CompositeGauge.java commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/reporting/AbstractRenderer.java commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/reporting/TxtRenderer.java commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/reporting/XmlRenderer.java commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/reporting/web/MonitoringServlet.java commons/sandbox/monitoring/trunk/src/site/site.xml commons/sandbox/monitoring/trunk/src/site/xdoc/web.xml commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/impl/CompositeValuesMonitorTest.java Modified: commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/impl/monitors/AbstractMonitor.java URL: http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/impl/monitors/AbstractMonitor.java?rev=634231&r1=634230&r2=634231&view=diff ============================================================================== --- commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/impl/monitors/AbstractMonitor.java (original) +++ commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/impl/monitors/AbstractMonitor.java Thu Mar 6 03:47:07 2008 @@ -26,7 +26,6 @@ import org.apache.commons.monitoring.Gauge; import org.apache.commons.monitoring.Monitor; import org.apache.commons.monitoring.StatValue; -import org.apache.commons.monitoring.Unit; /** * Abstract [EMAIL PROTECTED] Monitor} implementation with implementation for base methods Modified: commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/impl/monitors/CompositeValuesMonitor.java URL: http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/impl/monitors/CompositeValuesMonitor.java?rev=634231&r1=634230&r2=634231&view=diff ============================================================================== --- commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/impl/monitors/CompositeValuesMonitor.java (original) +++ commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/impl/monitors/CompositeValuesMonitor.java Thu Mar 6 03:47:07 2008 @@ -19,16 +19,17 @@ import org.apache.commons.monitoring.Counter; import org.apache.commons.monitoring.Gauge; -import org.apache.commons.monitoring.Unit; import org.apache.commons.monitoring.impl.values.CompositeCounter; import org.apache.commons.monitoring.impl.values.CompositeGauge; /** - * A Monitor implementation that creates [EMAIL PROTECTED] Composite} Gauges and Counters. + * A Monitor implementation that creates + * [EMAIL PROTECTED] org.apache.commons.monitoring.Composite} Gauges and Counters. * * @author <a href="mailto:[EMAIL PROTECTED]">Nicolas De Loof</a> */ -public class CompositeValuesMonitor extends CreateValuesOnDemandMonitor +public class CompositeValuesMonitor + extends CreateValuesOnDemandMonitor { public CompositeValuesMonitor( Key key ) Modified: commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/impl/monitors/CreateValuesOnDemandMonitor.java URL: http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/impl/monitors/CreateValuesOnDemandMonitor.java?rev=634231&r1=634230&r2=634231&view=diff ============================================================================== --- commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/impl/monitors/CreateValuesOnDemandMonitor.java (original) +++ commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/impl/monitors/CreateValuesOnDemandMonitor.java Thu Mar 6 03:47:07 2008 @@ -19,7 +19,6 @@ import org.apache.commons.monitoring.Counter; import org.apache.commons.monitoring.Gauge; -import org.apache.commons.monitoring.Unit; import org.apache.commons.monitoring.impl.values.ThreadSafeCounter; import org.apache.commons.monitoring.impl.values.ThreadSafeGauge; Modified: commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/impl/values/CompositeGauge.java URL: http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/impl/values/CompositeGauge.java?rev=634231&r1=634230&r2=634231&view=diff ============================================================================== --- commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/impl/values/CompositeGauge.java (original) +++ commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/impl/values/CompositeGauge.java Thu Mar 6 03:47:07 2008 @@ -23,7 +23,6 @@ import org.apache.commons.monitoring.Composite; import org.apache.commons.monitoring.Gauge; -import org.apache.commons.monitoring.Unit; /** * A composite implementation of [EMAIL PROTECTED] Gauge} that delegates to a primary Modified: commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/reporting/AbstractRenderer.java URL: http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/reporting/AbstractRenderer.java?rev=634231&r1=634230&r2=634231&view=diff ============================================================================== --- commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/reporting/AbstractRenderer.java (original) +++ commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/reporting/AbstractRenderer.java Thu Mar 6 03:47:07 2008 @@ -32,7 +32,6 @@ import org.apache.commons.monitoring.StatValue; import org.apache.commons.monitoring.Unit; import org.apache.commons.monitoring.Monitor.Key; -import org.apache.commons.monitoring.reporting.Renderer.Options; /** * Render a collection of monitor for reporting Modified: commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/reporting/TxtRenderer.java URL: http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/reporting/TxtRenderer.java?rev=634231&r1=634230&r2=634231&view=diff ============================================================================== --- commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/reporting/TxtRenderer.java (original) +++ commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/reporting/TxtRenderer.java Thu Mar 6 03:47:07 2008 @@ -19,10 +19,8 @@ import java.io.PrintWriter; -import org.apache.commons.monitoring.Counter; import org.apache.commons.monitoring.StatValue; import org.apache.commons.monitoring.Monitor.Key; -import org.apache.commons.monitoring.reporting.Renderer.Options; /** * A simple TXT renderer, typically to dump monitoring status in a log file Modified: commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/reporting/XmlRenderer.java URL: http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/reporting/XmlRenderer.java?rev=634231&r1=634230&r2=634231&view=diff ============================================================================== --- commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/reporting/XmlRenderer.java (original) +++ commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/reporting/XmlRenderer.java Thu Mar 6 03:47:07 2008 @@ -20,11 +20,9 @@ import java.io.PrintWriter; import java.util.Collection; -import org.apache.commons.monitoring.Counter; import org.apache.commons.monitoring.Monitor; import org.apache.commons.monitoring.StatValue; import org.apache.commons.monitoring.Monitor.Key; -import org.apache.commons.monitoring.reporting.Renderer.Options; public class XmlRenderer extends AbstractRenderer Modified: commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/reporting/web/MonitoringServlet.java URL: http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/reporting/web/MonitoringServlet.java?rev=634231&r1=634230&r2=634231&view=diff ============================================================================== --- commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/reporting/web/MonitoringServlet.java (original) +++ commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/reporting/web/MonitoringServlet.java Thu Mar 6 03:47:07 2008 @@ -22,7 +22,6 @@ import java.util.Arrays; import java.util.Collection; import java.util.Collections; -import java.util.HashMap; import java.util.List; import java.util.Locale; import java.util.Map; Modified: commons/sandbox/monitoring/trunk/src/site/site.xml URL: http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/src/site/site.xml?rev=634231&r1=634230&r2=634231&view=diff ============================================================================== --- commons/sandbox/monitoring/trunk/src/site/site.xml (original) +++ commons/sandbox/monitoring/trunk/src/site/site.xml Thu Mar 6 03:47:07 2008 @@ -34,6 +34,7 @@ <item name="Instrumentation" href="/instrumentation.html"/> <item name="Listeners" href="/listeners.html"/> <item name="Reporting" href="/reporting.html"/> + <item name="Use in a Webapp" href="/web.html"/> </menu> <menu name="Development"> Modified: commons/sandbox/monitoring/trunk/src/site/xdoc/web.xml URL: http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/src/site/xdoc/web.xml?rev=634231&r1=634230&r2=634231&view=diff ============================================================================== --- commons/sandbox/monitoring/trunk/src/site/xdoc/web.xml (original) +++ commons/sandbox/monitoring/trunk/src/site/xdoc/web.xml Thu Mar 6 03:47:07 2008 @@ -76,7 +76,7 @@ </ul> By combining the request URI path and parameters, you can filter what is relevant for you. Bookmark the valuable URIs ! Example : - <tt>http://myserver/monitoring/monitors?performances.unit=ms&performances.value=false&performances.sum=false</tt> + <tt>http://myserver/monitoring/monitors?performances.unit=ms&performances.value=false&performances.sum=false</tt> </p> </subsection> <subsection name="Web UI"> Modified: commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/impl/CompositeValuesMonitorTest.java URL: http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/impl/CompositeValuesMonitorTest.java?rev=634231&r1=634230&r2=634231&view=diff ============================================================================== --- commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/impl/CompositeValuesMonitorTest.java (original) +++ commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/impl/CompositeValuesMonitorTest.java Thu Mar 6 03:47:07 2008 @@ -17,6 +17,8 @@ package org.apache.commons.monitoring.impl; +import junit.framework.TestCase; + import org.apache.commons.monitoring.Composite; import org.apache.commons.monitoring.Counter; import org.apache.commons.monitoring.Gauge; @@ -24,8 +26,6 @@ import org.apache.commons.monitoring.Unit; import org.apache.commons.monitoring.impl.monitors.CompositeValuesMonitor; -import junit.framework.TestCase; - ; /** @@ -48,6 +48,7 @@ assertEquals( 0, counter.get() ); } + @SuppressWarnings("unchecked") public void testCompositeCounter() throws Exception { @@ -75,6 +76,7 @@ assertEquals( 3, secondary.get() ); } + @SuppressWarnings("unchecked") public void testCompositeGauge() throws Exception {