You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ni...@apache.org on 2008/01/23 22:25:41 UTC
svn commit: r614679 [2/2] - in /commons/sandbox/monitoring/trunk: ./
src/main/java/org/apache/commons/monitoring/
src/main/java/org/apache/commons/monitoring/aop/
src/main/java/org/apache/commons/monitoring/impl/
src/main/java/org/apache/commons/monito...
Propchange: commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/jdbc/TODO.txt
------------------------------------------------------------------------------
svn:eol-style = native
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=614679&r1=614678&r2=614679&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 Wed Jan 23 13:25:36 2008
@@ -1,71 +1,71 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.commons.monitoring.reporting;
-
-import java.io.PrintWriter;
-import java.util.Collection;
-
-import org.apache.commons.monitoring.Monitor;
-import org.apache.commons.monitoring.StatValue;
-import org.apache.commons.monitoring.Monitor.Key;
-
-/**
- * Render a collection of monitor for reporting
- *
- * @author <a href="mailto:nicolas@apache.org">Nicolas De Loof</a>
- */
-public abstract class AbstractRenderer
- implements Renderer
-{
- private final Collection<String> roles;
-
- private final PrintWriter writer;
-
- public AbstractRenderer( PrintWriter writer, Collection<String> roles )
- {
- super();
- this.roles = roles;
- this.writer = writer;
- }
-
- protected void write( String string )
- {
- writer.append( string );
- }
-
- public void render( Collection<Monitor> monitors )
- {
- for ( Monitor monitor : monitors )
- {
- render( monitor );
- }
- }
-
- public void render( Monitor monitor )
- {
- render( monitor.getKey() );
- for ( String role : roles )
- {
- render( monitor.getValue( role ), role );
- }
- }
-
- public abstract void render( StatValue value, String role );
-
- public abstract void render( Key key );
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.commons.monitoring.reporting;
+
+import java.io.PrintWriter;
+import java.util.Collection;
+
+import org.apache.commons.monitoring.Monitor;
+import org.apache.commons.monitoring.StatValue;
+import org.apache.commons.monitoring.Monitor.Key;
+
+/**
+ * Render a collection of monitor for reporting
+ *
+ * @author <a href="mailto:nicolas@apache.org">Nicolas De Loof</a>
+ */
+public abstract class AbstractRenderer
+ implements Renderer
+{
+ private final Collection<String> roles;
+
+ private final PrintWriter writer;
+
+ public AbstractRenderer( PrintWriter writer, Collection<String> roles )
+ {
+ super();
+ this.roles = roles;
+ this.writer = writer;
+ }
+
+ protected void write( String string )
+ {
+ writer.append( string );
+ }
+
+ public void render( Collection<Monitor> monitors )
+ {
+ for ( Monitor monitor : monitors )
+ {
+ render( monitor );
+ }
+ }
+
+ public void render( Monitor monitor )
+ {
+ render( monitor.getKey() );
+ for ( String role : roles )
+ {
+ render( monitor.getValue( role ), role );
+ }
+ }
+
+ public abstract void render( StatValue value, String role );
+
+ public abstract void render( Key key );
+}
Propchange: commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/reporting/AbstractRenderer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/reporting/AbstractRenderer.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/reporting/JsonRenderer.java
URL: http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/reporting/JsonRenderer.java?rev=614679&r1=614678&r2=614679&view=diff
==============================================================================
--- commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/reporting/JsonRenderer.java (original)
+++ commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/reporting/JsonRenderer.java Wed Jan 23 13:25:36 2008
@@ -1,120 +1,120 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.commons.monitoring.reporting;
-
-import java.io.PrintWriter;
-import java.util.Collection;
-import java.util.Iterator;
-
-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;
-
-public class JsonRenderer
- extends AbstractRenderer
-{
- private final Collection<String> roles;
-
- public JsonRenderer( PrintWriter writer, Collection<String> roles )
- {
- super( writer, roles );
- this.roles = roles;
- }
-
- @Override
- public void render( Collection<Monitor> monitors )
- {
- write( "[" );
- for ( Iterator<Monitor> iterator = monitors.iterator(); iterator.hasNext(); )
- {
- Monitor monitor = iterator.next();
- render( monitor );
- if ( iterator.hasNext() )
- {
- write( "," );
- }
- }
- write( "]" );
- }
-
- @Override
- public void render( Monitor monitor )
- {
- write( "{" );
- render( monitor.getKey() );
- if ( !roles.isEmpty() )
- {
- write( "," );
- }
- for ( Iterator<String> iterator = roles.iterator(); iterator.hasNext(); )
- {
- String role = iterator.next();
- render( monitor.getValue( role ), role );
- if ( iterator.hasNext() )
- {
- write( "," );
- }
- }
- write( "}" );
- }
-
- @Override
- public void render( Key key )
- {
- write( "key:{name:\"" );
- write( key.getName() );
- if ( key.getCategory() != null )
- {
- write( "\",category:\"" );
- write( key.getCategory() );
- }
- if ( key.getSubsystem() != null )
- {
- write( "\",subsystem:\"" );
- write( key.getSubsystem() );
- }
- write( "\"}" );
- }
-
- @Override
- public void render( StatValue value, String role )
- {
- write( role );
- write( ":{value:\"" );
- write( String.valueOf( value.get() ) );
- write( "\",min:\"" );
- write( String.valueOf( value.min() ) );
- write( "\",max:\"" );
- write( String.valueOf( value.max() ) );
- write( "\",average:\"" );
- write( String.valueOf( value.average() ) );
- write( "\",stdDev:\"" );
- write( String.valueOf( value.standardDeviation() ) );
- if ( value instanceof Counter )
- {
- Counter counter = (Counter) value;
- write( "\",total:\"" );
- write( String.valueOf( counter.total() ) );
- write( "\",hits:\"" );
- write( String.valueOf( counter.hits() ) );
- }
- write( "\"}" );
- }
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.commons.monitoring.reporting;
+
+import java.io.PrintWriter;
+import java.util.Collection;
+import java.util.Iterator;
+
+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;
+
+public class JsonRenderer
+ extends AbstractRenderer
+{
+ private final Collection<String> roles;
+
+ public JsonRenderer( PrintWriter writer, Collection<String> roles )
+ {
+ super( writer, roles );
+ this.roles = roles;
+ }
+
+ @Override
+ public void render( Collection<Monitor> monitors )
+ {
+ write( "[" );
+ for ( Iterator<Monitor> iterator = monitors.iterator(); iterator.hasNext(); )
+ {
+ Monitor monitor = iterator.next();
+ render( monitor );
+ if ( iterator.hasNext() )
+ {
+ write( "," );
+ }
+ }
+ write( "]" );
+ }
+
+ @Override
+ public void render( Monitor monitor )
+ {
+ write( "{" );
+ render( monitor.getKey() );
+ if ( !roles.isEmpty() )
+ {
+ write( "," );
+ }
+ for ( Iterator<String> iterator = roles.iterator(); iterator.hasNext(); )
+ {
+ String role = iterator.next();
+ render( monitor.getValue( role ), role );
+ if ( iterator.hasNext() )
+ {
+ write( "," );
+ }
+ }
+ write( "}" );
+ }
+
+ @Override
+ public void render( Key key )
+ {
+ write( "key:{name:\"" );
+ write( key.getName() );
+ if ( key.getCategory() != null )
+ {
+ write( "\",category:\"" );
+ write( key.getCategory() );
+ }
+ if ( key.getSubsystem() != null )
+ {
+ write( "\",subsystem:\"" );
+ write( key.getSubsystem() );
+ }
+ write( "\"}" );
+ }
+
+ @Override
+ public void render( StatValue value, String role )
+ {
+ write( role );
+ write( ":{value:\"" );
+ write( String.valueOf( value.get() ) );
+ write( "\",min:\"" );
+ write( String.valueOf( value.min() ) );
+ write( "\",max:\"" );
+ write( String.valueOf( value.max() ) );
+ write( "\",average:\"" );
+ write( String.valueOf( value.average() ) );
+ write( "\",stdDev:\"" );
+ write( String.valueOf( value.standardDeviation() ) );
+ if ( value instanceof Counter )
+ {
+ Counter counter = (Counter) value;
+ write( "\",total:\"" );
+ write( String.valueOf( counter.total() ) );
+ write( "\",hits:\"" );
+ write( String.valueOf( counter.hits() ) );
+ }
+ write( "\"}" );
+ }
+
+}
Propchange: commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/reporting/JsonRenderer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/reporting/JsonRenderer.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/reporting/Renderer.java
URL: http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/reporting/Renderer.java?rev=614679&r1=614678&r2=614679&view=diff
==============================================================================
--- commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/reporting/Renderer.java (original)
+++ commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/reporting/Renderer.java Wed Jan 23 13:25:36 2008
@@ -1,32 +1,32 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.commons.monitoring.reporting;
-
-import java.util.Collection;
-
-import org.apache.commons.monitoring.Monitor;
-
-/**
- * Render a collection of monitor for reporting
- *
- * @author <a href="mailto:nicolas@apache.org">Nicolas De Loof</a>
- */
-public interface Renderer
-{
- void render( Collection<Monitor> monitors );
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.commons.monitoring.reporting;
+
+import java.util.Collection;
+
+import org.apache.commons.monitoring.Monitor;
+
+/**
+ * Render a collection of monitor for reporting
+ *
+ * @author <a href="mailto:nicolas@apache.org">Nicolas De Loof</a>
+ */
+public interface Renderer
+{
+ void render( Collection<Monitor> monitors );
+}
Propchange: commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/reporting/Renderer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/reporting/Renderer.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
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=614679&r1=614678&r2=614679&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 Wed Jan 23 13:25:36 2008
@@ -1,98 +1,98 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.commons.monitoring.reporting;
-
-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;
-
-public class XmlRenderer
- extends AbstractRenderer
-{
-
- public XmlRenderer( PrintWriter writer, Collection<String> roles )
- {
- super( writer, roles );
- }
-
- @Override
- public void render( Collection<Monitor> monitors )
- {
- write( "<monitors>" );
- super.render( monitors );
- write( "</monitors>" );
- }
-
- @Override
- public void render( Monitor monitor )
- {
- write( "<monitor " );
- super.render( monitor );
- write( "</monitor>" );
- }
-
- @Override
- public void render( Key key )
- {
- write( "name=\"" );
- write( key.getName() );
- if ( key.getCategory() != null )
- {
- write( "\" category=\"" );
- write( key.getCategory() );
- }
- if ( key.getSubsystem() != null )
- {
- write( "\" subsystem=\"" );
- write( key.getSubsystem() );
- }
- write( "\">" );
- }
-
- @Override
- public void render( StatValue value, String role )
- {
- write( "<" );
- write( role );
-
- write( " value=\"" );
- write( String.valueOf( value.get() ) );
- write( "\" min=\"" );
- write( String.valueOf( value.min() ) );
- write( "\" max=\"" );
- write( String.valueOf( value.max() ) );
- write( "\" average=\"" );
- write( String.valueOf( value.average() ) );
- write( "\" stdDev=\"" );
- write( String.valueOf( value.standardDeviation() ) );
- if ( value instanceof Counter )
- {
- Counter counter = (Counter) value;
- write( "\" total=\"" );
- write( String.valueOf( counter.total() ) );
- write( "\" hits=\"" );
- write( String.valueOf( counter.hits() ) );
- }
- write( "\"/>" );
- }
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.commons.monitoring.reporting;
+
+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;
+
+public class XmlRenderer
+ extends AbstractRenderer
+{
+
+ public XmlRenderer( PrintWriter writer, Collection<String> roles )
+ {
+ super( writer, roles );
+ }
+
+ @Override
+ public void render( Collection<Monitor> monitors )
+ {
+ write( "<monitors>" );
+ super.render( monitors );
+ write( "</monitors>" );
+ }
+
+ @Override
+ public void render( Monitor monitor )
+ {
+ write( "<monitor " );
+ super.render( monitor );
+ write( "</monitor>" );
+ }
+
+ @Override
+ public void render( Key key )
+ {
+ write( "name=\"" );
+ write( key.getName() );
+ if ( key.getCategory() != null )
+ {
+ write( "\" category=\"" );
+ write( key.getCategory() );
+ }
+ if ( key.getSubsystem() != null )
+ {
+ write( "\" subsystem=\"" );
+ write( key.getSubsystem() );
+ }
+ write( "\">" );
+ }
+
+ @Override
+ public void render( StatValue value, String role )
+ {
+ write( "<" );
+ write( role );
+
+ write( " value=\"" );
+ write( String.valueOf( value.get() ) );
+ write( "\" min=\"" );
+ write( String.valueOf( value.min() ) );
+ write( "\" max=\"" );
+ write( String.valueOf( value.max() ) );
+ write( "\" average=\"" );
+ write( String.valueOf( value.average() ) );
+ write( "\" stdDev=\"" );
+ write( String.valueOf( value.standardDeviation() ) );
+ if ( value instanceof Counter )
+ {
+ Counter counter = (Counter) value;
+ write( "\" total=\"" );
+ write( String.valueOf( counter.total() ) );
+ write( "\" hits=\"" );
+ write( String.valueOf( counter.hits() ) );
+ }
+ write( "\"/>" );
+ }
+
+}
Propchange: commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/reporting/XmlRenderer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/reporting/XmlRenderer.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/servlet/TODO.txt
URL: http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/servlet/TODO.txt?rev=614679&r1=614678&r2=614679&view=diff
==============================================================================
--- commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/servlet/TODO.txt (original)
+++ commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/servlet/TODO.txt Wed Jan 23 13:25:36 2008
@@ -1,7 +1,7 @@
-Create web monitoring helpers :
-
- - a servlet filter
- - a HttpServletResponse wrapper to gather status code
- - application-server specific helpers (tomcat valve ...)
-
-
+Create web monitoring helpers :
+
+ - a servlet filter
+ - a HttpServletResponse wrapper to gather status code
+ - application-server specific helpers (tomcat valve ...)
+
+
Propchange: commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/servlet/TODO.txt
------------------------------------------------------------------------------
svn:eol-style = native
Modified: commons/sandbox/monitoring/trunk/src/main/resources/META-INF/LICENSE.txt
URL: http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/src/main/resources/META-INF/LICENSE.txt?rev=614679&r1=614678&r2=614679&view=diff
==============================================================================
--- commons/sandbox/monitoring/trunk/src/main/resources/META-INF/LICENSE.txt (original)
+++ commons/sandbox/monitoring/trunk/src/main/resources/META-INF/LICENSE.txt Wed Jan 23 13:25:36 2008
@@ -1,202 +1,202 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
Propchange: commons/sandbox/monitoring/trunk/src/main/resources/META-INF/LICENSE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: commons/sandbox/monitoring/trunk/src/main/resources/META-INF/LICENSE.txt
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: commons/sandbox/monitoring/trunk/src/main/resources/META-INF/NOTICE.txt
URL: http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/src/main/resources/META-INF/NOTICE.txt?rev=614679&r1=614678&r2=614679&view=diff
==============================================================================
--- commons/sandbox/monitoring/trunk/src/main/resources/META-INF/NOTICE.txt (original)
+++ commons/sandbox/monitoring/trunk/src/main/resources/META-INF/NOTICE.txt Wed Jan 23 13:25:36 2008
@@ -1,5 +1,5 @@
-Apache Commons Monitoring
-Copyright 2008 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
+Apache Commons Monitoring
+Copyright 2008 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
Propchange: commons/sandbox/monitoring/trunk/src/main/resources/META-INF/NOTICE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: commons/sandbox/monitoring/trunk/src/main/resources/META-INF/NOTICE.txt
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/MonitoringTest.java
URL: http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/MonitoringTest.java?rev=614679&r1=614678&r2=614679&view=diff
==============================================================================
--- commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/MonitoringTest.java (original)
+++ commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/MonitoringTest.java Wed Jan 23 13:25:36 2008
@@ -1,47 +1,47 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.commons.monitoring;
-
-import junit.framework.TestCase;
-
-import org.apache.commons.monitoring.impl.RepositoryBase;
-
-/**
- * @author <a href="mailto:nicolas@apache.org">Nicolas De Loof</a>
- */
-public class MonitoringTest
- extends TestCase
-{
- public void testMonitoring()
- throws Exception
- {
- Monitoring.setRepository( new RepositoryBase() );
-
- StopWatch stopWatch1 = Monitoring.start( "MonitoringTest.testMonitoring", "test", "utils" );
- StopWatch stopWatch2 = Monitoring.start( "MonitoringTest.testMonitoring", "test", "utils" );
- stopWatch2.stop();
-
- Monitor monitor = Monitoring.getMonitor( "MonitoringTest.testMonitoring", "test", "utils" );
- Gauge concurrency = monitor.getGauge( Monitor.CONCURRENCY );
- assertEquals( 1, concurrency.get() );
- assertEquals( 2, concurrency.max() );
-
- stopWatch1.stop();
- assertEquals( 0, concurrency.get() );
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.commons.monitoring;
+
+import junit.framework.TestCase;
+
+import org.apache.commons.monitoring.impl.RepositoryBase;
+
+/**
+ * @author <a href="mailto:nicolas@apache.org">Nicolas De Loof</a>
+ */
+public class MonitoringTest
+ extends TestCase
+{
+ public void testMonitoring()
+ throws Exception
+ {
+ Monitoring.setRepository( new RepositoryBase() );
+
+ StopWatch stopWatch1 = Monitoring.start( "MonitoringTest.testMonitoring", "test", "utils" );
+ StopWatch stopWatch2 = Monitoring.start( "MonitoringTest.testMonitoring", "test", "utils" );
+ stopWatch2.stop();
+
+ Monitor monitor = Monitoring.getMonitor( "MonitoringTest.testMonitoring", "test", "utils" );
+ Gauge concurrency = monitor.getGauge( Monitor.CONCURRENCY );
+ assertEquals( 1, concurrency.get() );
+ assertEquals( 2, concurrency.max() );
+
+ stopWatch1.stop();
+ assertEquals( 0, concurrency.get() );
+ }
+}
Propchange: commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/MonitoringTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/MonitoringTest.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/StopWatchTest.java
URL: http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/StopWatchTest.java?rev=614679&r1=614678&r2=614679&view=diff
==============================================================================
--- commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/StopWatchTest.java (original)
+++ commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/StopWatchTest.java Wed Jan 23 13:25:36 2008
@@ -1,109 +1,109 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.commons.monitoring;
-
-import junit.framework.TestCase;
-
-/**
- * @author <a href="mailto:nicolas@apache.org">Nicolas De Loof</a>
- */
-public class StopWatchTest
- extends TestCase
-{
- private long time;
-
- /**
- * assert the StopWatch computes the time elapsed during the monitored
- * process execution. User a MockTimeWatch to make timing predictable
- *
- * @throws Exception
- */
- public void testComputeTime()
- throws Exception
- {
- time = 0;
- StopWatch stopWatch = new MockTimeWatch( null );
- time++;
- stopWatch.pause();
- assertTrue( stopWatch.isPaused() );
- time++;
- stopWatch.resume();
- assertTrue( !stopWatch.isPaused() );
- time++;
- stopWatch.stop();
- assertEquals( 2, stopWatch.getElapsedTime() );
- assertTrue( stopWatch.isStoped() );
- }
-
- /**
- * Check that the elapsed time computed by the WtopWatch is not affected by
- * unexpected method calls.
- *
- * @throws Exception
- */
- public void testSupportUnexpectedCalls()
- throws Exception
- {
- time = 0;
- StopWatch stopWatch = new MockTimeWatch( null );
-
- // resume the non-paused watch
- assertTrue( !stopWatch.isPaused() );
- stopWatch.resume();
- assertTrue( !stopWatch.isPaused() );
-
- // pause the watch multiple times
- time++;
- stopWatch.pause();
- assertEquals( 1, stopWatch.getElapsedTime() );
- assertTrue( stopWatch.isPaused() );
- time++;
- stopWatch.pause();
- assertEquals( 1, stopWatch.getElapsedTime() );
- assertTrue( stopWatch.isPaused() );
-
- stopWatch.stop();
- assertEquals( 1, stopWatch.getElapsedTime() );
- assertTrue( stopWatch.isStoped() );
-
- // Unexpected use after stopped
- stopWatch.resume();
- assertEquals( 1, stopWatch.getElapsedTime() );
- assertTrue( stopWatch.isStoped() );
- stopWatch.pause();
- assertEquals( 1, stopWatch.getElapsedTime() );
- assertTrue( stopWatch.isStoped() );
- stopWatch.stop();
- assertEquals( 1, stopWatch.getElapsedTime() );
- assertTrue( stopWatch.isStoped() );
- }
-
- private class MockTimeWatch
- extends StopWatch
- {
- public MockTimeWatch( Monitor monitor )
- {
- super( monitor );
- }
-
- protected long nanotime()
- {
- return time;
- }
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.commons.monitoring;
+
+import junit.framework.TestCase;
+
+/**
+ * @author <a href="mailto:nicolas@apache.org">Nicolas De Loof</a>
+ */
+public class StopWatchTest
+ extends TestCase
+{
+ private long time;
+
+ /**
+ * assert the StopWatch computes the time elapsed during the monitored
+ * process execution. User a MockTimeWatch to make timing predictable
+ *
+ * @throws Exception
+ */
+ public void testComputeTime()
+ throws Exception
+ {
+ time = 0;
+ StopWatch stopWatch = new MockTimeWatch( null );
+ time++;
+ stopWatch.pause();
+ assertTrue( stopWatch.isPaused() );
+ time++;
+ stopWatch.resume();
+ assertTrue( !stopWatch.isPaused() );
+ time++;
+ stopWatch.stop();
+ assertEquals( 2, stopWatch.getElapsedTime() );
+ assertTrue( stopWatch.isStoped() );
+ }
+
+ /**
+ * Check that the elapsed time computed by the WtopWatch is not affected by
+ * unexpected method calls.
+ *
+ * @throws Exception
+ */
+ public void testSupportUnexpectedCalls()
+ throws Exception
+ {
+ time = 0;
+ StopWatch stopWatch = new MockTimeWatch( null );
+
+ // resume the non-paused watch
+ assertTrue( !stopWatch.isPaused() );
+ stopWatch.resume();
+ assertTrue( !stopWatch.isPaused() );
+
+ // pause the watch multiple times
+ time++;
+ stopWatch.pause();
+ assertEquals( 1, stopWatch.getElapsedTime() );
+ assertTrue( stopWatch.isPaused() );
+ time++;
+ stopWatch.pause();
+ assertEquals( 1, stopWatch.getElapsedTime() );
+ assertTrue( stopWatch.isPaused() );
+
+ stopWatch.stop();
+ assertEquals( 1, stopWatch.getElapsedTime() );
+ assertTrue( stopWatch.isStoped() );
+
+ // Unexpected use after stopped
+ stopWatch.resume();
+ assertEquals( 1, stopWatch.getElapsedTime() );
+ assertTrue( stopWatch.isStoped() );
+ stopWatch.pause();
+ assertEquals( 1, stopWatch.getElapsedTime() );
+ assertTrue( stopWatch.isStoped() );
+ stopWatch.stop();
+ assertEquals( 1, stopWatch.getElapsedTime() );
+ assertTrue( stopWatch.isStoped() );
+ }
+
+ private class MockTimeWatch
+ extends StopWatch
+ {
+ public MockTimeWatch( Monitor monitor )
+ {
+ super( monitor );
+ }
+
+ protected long nanotime()
+ {
+ return time;
+ }
+ }
+}
Propchange: commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/StopWatchTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/StopWatchTest.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/impl/ConcurrencyGaugeTest.java
URL: http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/impl/ConcurrencyGaugeTest.java?rev=614679&r1=614678&r2=614679&view=diff
==============================================================================
--- commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/impl/ConcurrencyGaugeTest.java (original)
+++ commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/impl/ConcurrencyGaugeTest.java Wed Jan 23 13:25:36 2008
@@ -1,78 +1,78 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.commons.monitoring.impl;
-
-import junit.framework.TestCase;
-
-import org.apache.commons.monitoring.Gauge;
-
-public class ConcurrencyGaugeTest
- extends TestCase
-{
- private long time;
-
- /**
- * Use a fake time to emulate to concurrent threads
- * <ul>
- * <li>First one runs during 4 time units </li>
- * <li>First one runs during 2 time units </li>
- * </ul>
- * average concurrency is expected to be 1.5
- *
- * <pre>
- * concurrency
- * 3 _______
- * 2 ___| |___
- * 1 | |
- * 0 +---1---2---3---4---5---> time
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.commons.monitoring.impl;
+
+import junit.framework.TestCase;
+
+import org.apache.commons.monitoring.Gauge;
+
+public class ConcurrencyGaugeTest
+ extends TestCase
+{
+ private long time;
+
+ /**
+ * Use a fake time to emulate to concurrent threads
+ * <ul>
+ * <li>First one runs during 4 time units </li>
+ * <li>First one runs during 2 time units </li>
+ * </ul>
+ * average concurrency is expected to be 1.5
*
+ * <pre>
+ * concurrency
+ * 3 _______
+ * 2 ___| |___
+ * 1 | |
+ * 0 +---1---2---3---4---5---> time
*
- *
- * </pre>
- *
- * @throws Exception
- */
- public void testCompteAverageConcurency()
- throws Exception
- {
- Gauge concurrency = new MockTimeConcurrencyGauge();
-
- time = 1;
- concurrency.increment();
- time++;
- concurrency.increment();
- time++;
- time++;
- concurrency.decrement();
- time++;
- concurrency.decrement();
-
- assertEquals( 0, concurrency.get() );
- assertEquals( 1.5D, concurrency.average(), 0D );
- }
-
- private class MockTimeConcurrencyGauge
- extends ConcurrencyGauge
- {
- @Override
- protected long nanoTime()
- {
- return time;
- }
- }
-}
+ *
+ *
+ * </pre>
+ *
+ * @throws Exception
+ */
+ public void testCompteAverageConcurency()
+ throws Exception
+ {
+ Gauge concurrency = new MockTimeConcurrencyGauge();
+
+ time = 1;
+ concurrency.increment();
+ time++;
+ concurrency.increment();
+ time++;
+ time++;
+ concurrency.decrement();
+ time++;
+ concurrency.decrement();
+
+ assertEquals( 0, concurrency.get() );
+ assertEquals( 1.5D, concurrency.average(), 0D );
+ }
+
+ private class MockTimeConcurrencyGauge
+ extends ConcurrencyGauge
+ {
+ @Override
+ protected long nanoTime()
+ {
+ return time;
+ }
+ }
+}
Propchange: commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/impl/ConcurrencyGaugeTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/impl/ConcurrencyGaugeTest.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/reporting/RendererTest.java
URL: http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/reporting/RendererTest.java?rev=614679&r1=614678&r2=614679&view=diff
==============================================================================
--- commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/reporting/RendererTest.java (original)
+++ commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/reporting/RendererTest.java Wed Jan 23 13:25:36 2008
@@ -1,87 +1,87 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.commons.monitoring.reporting;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.LinkedList;
-
-import junit.framework.TestCase;
-
-import org.apache.commons.monitoring.Monitor;
-import org.apache.commons.monitoring.impl.SimpleMonitor;
-
-public class RendererTest
- extends TestCase
-{
- Collection<String> roles = Arrays.asList( new String[] { Monitor.CONCURRENCY, Monitor.PERFORMANCES } );
-
- Collection<Monitor> monitors;
-
- @Override
- protected void setUp()
- throws Exception
- {
- monitors = new LinkedList<Monitor>();
- Monitor m1 = new SimpleMonitor( "JsonRendererTest.setUp", "test", "reporting" );
- m1.getCounter( Monitor.PERFORMANCES ).add( 10 );
- monitors.add( m1 );
-
- Monitor m2 = new SimpleMonitor( "TestCase", "test", "junit" );
- m2.getCounter( Monitor.CONCURRENCY ).set( 1 );
- m2.getCounter( "UNEXPECTED" ).set( 1 );
- monitors.add( m2 );
- }
-
- public void testRenderToJson()
- throws Exception
- {
- StringWriter out = new StringWriter();
- Renderer renderer = new JsonRenderer( new PrintWriter( out ), roles );
- renderer.render( monitors );
- assertEquals(
- "["
- + "{key:{name:\"JsonRendererTest.setUp\",category:\"test\",subsystem:\"reporting\"},"
- + "concurrency:{value:\"0\",min:\"0\",max:\"0\",average:\"NaN\",stdDev:\"NaN\",total:\"0\",hits:\"0\"},"
- + "performances:{value:\"10\",min:\"10\",max:\"10\",average:\"0.0\",stdDev:\"NaN\",total:\"0\",hits:\"1\"}},"
- + "{key:{name:\"TestCase\",category:\"test\",subsystem:\"junit\"},"
- + "concurrency:{value:\"1\",min:\"1\",max:\"1\",average:\"0.0\",stdDev:\"NaN\",total:\"0\",hits:\"1\"},"
- + "performances:{value:\"0\",min:\"0\",max:\"0\",average:\"NaN\",stdDev:\"NaN\",total:\"0\",hits:\"0\"}}"
- + "]", out.toString() );
- }
-
- public void testRenderToXml()
- throws Exception
- {
- StringWriter out = new StringWriter();
- Renderer renderer = new XmlRenderer( new PrintWriter( out ), roles );
- renderer.render( monitors );
- assertEquals(
- "<monitors>"
- + "<monitor name=\"JsonRendererTest.setUp\" category=\"test\" subsystem=\"reporting\">"
- + "<concurrency value=\"0\" min=\"0\" max=\"0\" average=\"NaN\" stdDev=\"NaN\" total=\"0\" hits=\"0\"/>"
- + "<performances value=\"10\" min=\"10\" max=\"10\" average=\"0.0\" stdDev=\"NaN\" total=\"0\" hits=\"1\"/>"
- + "</monitor>"
- + "<monitor name=\"TestCase\" category=\"test\" subsystem=\"junit\">"
- + "<concurrency value=\"1\" min=\"1\" max=\"1\" average=\"0.0\" stdDev=\"NaN\" total=\"0\" hits=\"1\"/>"
- + "<performances value=\"0\" min=\"0\" max=\"0\" average=\"NaN\" stdDev=\"NaN\" total=\"0\" hits=\"0\"/>"
- + "</monitor></monitors>", out.toString() );
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.commons.monitoring.reporting;
+
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.LinkedList;
+
+import junit.framework.TestCase;
+
+import org.apache.commons.monitoring.Monitor;
+import org.apache.commons.monitoring.impl.SimpleMonitor;
+
+public class RendererTest
+ extends TestCase
+{
+ Collection<String> roles = Arrays.asList( new String[] { Monitor.CONCURRENCY, Monitor.PERFORMANCES } );
+
+ Collection<Monitor> monitors;
+
+ @Override
+ protected void setUp()
+ throws Exception
+ {
+ monitors = new LinkedList<Monitor>();
+ Monitor m1 = new SimpleMonitor( "JsonRendererTest.setUp", "test", "reporting" );
+ m1.getCounter( Monitor.PERFORMANCES ).add( 10 );
+ monitors.add( m1 );
+
+ Monitor m2 = new SimpleMonitor( "TestCase", "test", "junit" );
+ m2.getCounter( Monitor.CONCURRENCY ).set( 1 );
+ m2.getCounter( "UNEXPECTED" ).set( 1 );
+ monitors.add( m2 );
+ }
+
+ public void testRenderToJson()
+ throws Exception
+ {
+ StringWriter out = new StringWriter();
+ Renderer renderer = new JsonRenderer( new PrintWriter( out ), roles );
+ renderer.render( monitors );
+ assertEquals(
+ "["
+ + "{key:{name:\"JsonRendererTest.setUp\",category:\"test\",subsystem:\"reporting\"},"
+ + "concurrency:{value:\"0\",min:\"0\",max:\"0\",average:\"NaN\",stdDev:\"NaN\",total:\"0\",hits:\"0\"},"
+ + "performances:{value:\"10\",min:\"10\",max:\"10\",average:\"0.0\",stdDev:\"NaN\",total:\"0\",hits:\"1\"}},"
+ + "{key:{name:\"TestCase\",category:\"test\",subsystem:\"junit\"},"
+ + "concurrency:{value:\"1\",min:\"1\",max:\"1\",average:\"0.0\",stdDev:\"NaN\",total:\"0\",hits:\"1\"},"
+ + "performances:{value:\"0\",min:\"0\",max:\"0\",average:\"NaN\",stdDev:\"NaN\",total:\"0\",hits:\"0\"}}"
+ + "]", out.toString() );
+ }
+
+ public void testRenderToXml()
+ throws Exception
+ {
+ StringWriter out = new StringWriter();
+ Renderer renderer = new XmlRenderer( new PrintWriter( out ), roles );
+ renderer.render( monitors );
+ assertEquals(
+ "<monitors>"
+ + "<monitor name=\"JsonRendererTest.setUp\" category=\"test\" subsystem=\"reporting\">"
+ + "<concurrency value=\"0\" min=\"0\" max=\"0\" average=\"NaN\" stdDev=\"NaN\" total=\"0\" hits=\"0\"/>"
+ + "<performances value=\"10\" min=\"10\" max=\"10\" average=\"0.0\" stdDev=\"NaN\" total=\"0\" hits=\"1\"/>"
+ + "</monitor>"
+ + "<monitor name=\"TestCase\" category=\"test\" subsystem=\"junit\">"
+ + "<concurrency value=\"1\" min=\"1\" max=\"1\" average=\"0.0\" stdDev=\"NaN\" total=\"0\" hits=\"1\"/>"
+ + "<performances value=\"0\" min=\"0\" max=\"0\" average=\"NaN\" stdDev=\"NaN\" total=\"0\" hits=\"0\"/>"
+ + "</monitor></monitors>", out.toString() );
+ }
+}
Propchange: commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/reporting/RendererTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/reporting/RendererTest.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL