svn commit: r1509184 - in /commons/sandbox/monitoring/trunk: aop/src/main/java/org/apache/commons/monitoring/aop/ aop/src/test/java/org/apache/commons/monitoring/aop/ aspectj/src/test/java/org/apache/commons/monitoring/aspectj/ cdi/src/test/java/org/ap...

Thu, 01 Aug 2013 04:59:27 -0700 

Author: rmannibucau
Date: Thu Aug  1 11:58:25 2013
New Revision: 1509184

URL: http://svn.apache.org/r1509184
Log:
Role makes much more sense in counter package now

Added:
    
commons/sandbox/monitoring/trunk/core/src/main/java/org/apache/commons/monitoring/counter/Role.java
      - copied, changed from r1509169, 
commons/sandbox/monitoring/trunk/core/src/main/java/org/apache/commons/monitoring/Role.java
Removed:
    
commons/sandbox/monitoring/trunk/core/src/main/java/org/apache/commons/monitoring/Role.java
Modified:
    
commons/sandbox/monitoring/trunk/aop/src/main/java/org/apache/commons/monitoring/aop/AbstractPerformanceInterceptor.java
    
commons/sandbox/monitoring/trunk/aop/src/test/java/org/apache/commons/monitoring/aop/MonitoringProxyFactoryTest.java
    
commons/sandbox/monitoring/trunk/aspectj/src/test/java/org/apache/commons/monitoring/aspectj/AspectJMonitoringTest.java
    
commons/sandbox/monitoring/trunk/cdi/src/test/java/org/apache/commons/monitoring/cdi/CommonsMonitoringInterceptorTest.java
    
commons/sandbox/monitoring/trunk/core/src/main/java/org/apache/commons/monitoring/counter/Counter.java
    
commons/sandbox/monitoring/trunk/core/src/test/java/org/apache/commons/monitoring/counter/CounterBench.java
    
commons/sandbox/monitoring/trunk/cxf/src/main/java/org/apache/commons/monitoring/cxf/MonitoringInInterceptor.java
    
commons/sandbox/monitoring/trunk/jdbc/src/main/java/org/apache/commons/monitoring/jdbc/MonitoredDataSource.java
    
commons/sandbox/monitoring/trunk/jdbc/src/main/java/org/apache/commons/monitoring/jdbc/MonitoredPreparedStatement.java
    
commons/sandbox/monitoring/trunk/jdbc/src/main/java/org/apache/commons/monitoring/jdbc/MonitoredStatement.java
    
commons/sandbox/monitoring/trunk/jdbc/src/main/java/org/apache/commons/monitoring/jdbc/MonitoringDriver.java
    
commons/sandbox/monitoring/trunk/jdbc/src/test/java/org/apache/commons/monitoring/jdbc/HsqlDBTest.java
    
commons/sandbox/monitoring/trunk/reporting/src/test/java/org/apache/commons/monitoring/reporting/FormatsTest.java
    
commons/sandbox/monitoring/trunk/spring/src/test/java/org/apache/commons/monitoring/spring/SpringMonitoringTest.java
    
commons/sandbox/monitoring/trunk/web/src/main/java/org/apache/commons/monitoring/web/jsp/StartTag.java
    
commons/sandbox/monitoring/trunk/web/src/main/java/org/apache/commons/monitoring/web/servlet/MonitoringFilter.java

Modified: 
commons/sandbox/monitoring/trunk/aop/src/main/java/org/apache/commons/monitoring/aop/AbstractPerformanceInterceptor.java
URL: 
http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/aop/src/main/java/org/apache/commons/monitoring/aop/AbstractPerformanceInterceptor.java?rev=1509184&r1=1509183&r2=1509184&view=diff
==============================================================================
--- 
commons/sandbox/monitoring/trunk/aop/src/main/java/org/apache/commons/monitoring/aop/AbstractPerformanceInterceptor.java
 (original)
+++ 
commons/sandbox/monitoring/trunk/aop/src/main/java/org/apache/commons/monitoring/aop/AbstractPerformanceInterceptor.java
 Thu Aug  1 11:58:25 2013
@@ -17,7 +17,7 @@
 
 package org.apache.commons.monitoring.aop;
 
-import org.apache.commons.monitoring.Role;
+import org.apache.commons.monitoring.counter.Role;
 import org.apache.commons.monitoring.counter.Counter;
 import org.apache.commons.monitoring.repositories.Repository;
 import org.apache.commons.monitoring.stopwatches.StopWatch;

Modified: 
commons/sandbox/monitoring/trunk/aop/src/test/java/org/apache/commons/monitoring/aop/MonitoringProxyFactoryTest.java
URL: 
http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/aop/src/test/java/org/apache/commons/monitoring/aop/MonitoringProxyFactoryTest.java?rev=1509184&r1=1509183&r2=1509184&view=diff
==============================================================================
--- 
commons/sandbox/monitoring/trunk/aop/src/test/java/org/apache/commons/monitoring/aop/MonitoringProxyFactoryTest.java
 (original)
+++ 
commons/sandbox/monitoring/trunk/aop/src/test/java/org/apache/commons/monitoring/aop/MonitoringProxyFactoryTest.java
 Thu Aug  1 11:58:25 2013
@@ -16,7 +16,7 @@
  */
 package org.apache.commons.monitoring.aop;
 
-import org.apache.commons.monitoring.Role;
+import org.apache.commons.monitoring.counter.Role;
 import org.apache.commons.monitoring.counter.Counter;
 import org.apache.commons.monitoring.repositories.Repository;
 import org.junit.Test;

Modified: 
commons/sandbox/monitoring/trunk/aspectj/src/test/java/org/apache/commons/monitoring/aspectj/AspectJMonitoringTest.java
URL: 
http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/aspectj/src/test/java/org/apache/commons/monitoring/aspectj/AspectJMonitoringTest.java?rev=1509184&r1=1509183&r2=1509184&view=diff
==============================================================================
--- 
commons/sandbox/monitoring/trunk/aspectj/src/test/java/org/apache/commons/monitoring/aspectj/AspectJMonitoringTest.java
 (original)
+++ 
commons/sandbox/monitoring/trunk/aspectj/src/test/java/org/apache/commons/monitoring/aspectj/AspectJMonitoringTest.java
 Thu Aug  1 11:58:25 2013
@@ -16,7 +16,7 @@
  */
 package org.apache.commons.monitoring.aspectj;
 
-import org.apache.commons.monitoring.Role;
+import org.apache.commons.monitoring.counter.Role;
 import org.apache.commons.monitoring.counter.Counter;
 import org.apache.commons.monitoring.repositories.Repository;
 import org.junit.Test;

Modified: 
commons/sandbox/monitoring/trunk/cdi/src/test/java/org/apache/commons/monitoring/cdi/CommonsMonitoringInterceptorTest.java
URL: 
http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/cdi/src/test/java/org/apache/commons/monitoring/cdi/CommonsMonitoringInterceptorTest.java?rev=1509184&r1=1509183&r2=1509184&view=diff
==============================================================================
--- 
commons/sandbox/monitoring/trunk/cdi/src/test/java/org/apache/commons/monitoring/cdi/CommonsMonitoringInterceptorTest.java
 (original)
+++ 
commons/sandbox/monitoring/trunk/cdi/src/test/java/org/apache/commons/monitoring/cdi/CommonsMonitoringInterceptorTest.java
 Thu Aug  1 11:58:25 2013
@@ -16,7 +16,7 @@
  */
 package org.apache.commons.monitoring.cdi;
 
-import org.apache.commons.monitoring.Role;
+import org.apache.commons.monitoring.counter.Role;
 import org.apache.commons.monitoring.counter.Counter;
 import org.apache.commons.monitoring.repositories.Repository;
 import org.apache.webbeans.cditest.CdiTestContainer;

Modified: 
commons/sandbox/monitoring/trunk/core/src/main/java/org/apache/commons/monitoring/counter/Counter.java
URL: 
http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/core/src/main/java/org/apache/commons/monitoring/counter/Counter.java?rev=1509184&r1=1509183&r2=1509184&view=diff
==============================================================================
--- 
commons/sandbox/monitoring/trunk/core/src/main/java/org/apache/commons/monitoring/counter/Counter.java
 (original)
+++ 
commons/sandbox/monitoring/trunk/core/src/main/java/org/apache/commons/monitoring/counter/Counter.java
 Thu Aug  1 11:58:25 2013
@@ -17,8 +17,6 @@
 
 package org.apache.commons.monitoring.counter;
 
-import org.apache.commons.monitoring.Role;
-
 import java.util.concurrent.atomic.AtomicInteger;
 
 /**

Copied: 
commons/sandbox/monitoring/trunk/core/src/main/java/org/apache/commons/monitoring/counter/Role.java
 (from r1509169, 
commons/sandbox/monitoring/trunk/core/src/main/java/org/apache/commons/monitoring/Role.java)
URL: 
http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/core/src/main/java/org/apache/commons/monitoring/counter/Role.java?p2=commons/sandbox/monitoring/trunk/core/src/main/java/org/apache/commons/monitoring/counter/Role.java&p1=commons/sandbox/monitoring/trunk/core/src/main/java/org/apache/commons/monitoring/Role.java&r1=1509169&r2=1509184&rev=1509184&view=diff
==============================================================================
--- 
commons/sandbox/monitoring/trunk/core/src/main/java/org/apache/commons/monitoring/Role.java
 (original)
+++ 
commons/sandbox/monitoring/trunk/core/src/main/java/org/apache/commons/monitoring/counter/Role.java
 Thu Aug  1 11:58:25 2013
@@ -15,9 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.monitoring;
-
-import org.apache.commons.monitoring.counter.Unit;
+package org.apache.commons.monitoring.counter;
 
 import static org.apache.commons.monitoring.counter.Unit.Time.NANOSECOND;
 
@@ -95,7 +93,7 @@ public class Role implements Comparable<
     /**
      * {@inheritDoc}
      */
-    public int compareTo(Role o) {
+    public int compareTo(final Role o) {
         return name.compareTo(o.name);
     }
 

Modified: 
commons/sandbox/monitoring/trunk/core/src/test/java/org/apache/commons/monitoring/counter/CounterBench.java
URL: 
http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/core/src/test/java/org/apache/commons/monitoring/counter/CounterBench.java?rev=1509184&r1=1509183&r2=1509184&view=diff
==============================================================================
--- 
commons/sandbox/monitoring/trunk/core/src/test/java/org/apache/commons/monitoring/counter/CounterBench.java
 (original)
+++ 
commons/sandbox/monitoring/trunk/core/src/test/java/org/apache/commons/monitoring/counter/CounterBench.java
 Thu Aug  1 11:58:25 2013
@@ -16,7 +16,6 @@
  */
 package org.apache.commons.monitoring.counter;
 
-import org.apache.commons.monitoring.Role;
 import org.junit.Test;
 
 import java.util.concurrent.ExecutorService;

Modified: 
commons/sandbox/monitoring/trunk/cxf/src/main/java/org/apache/commons/monitoring/cxf/MonitoringInInterceptor.java
URL: 
http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/cxf/src/main/java/org/apache/commons/monitoring/cxf/MonitoringInInterceptor.java?rev=1509184&r1=1509183&r2=1509184&view=diff
==============================================================================
--- 
commons/sandbox/monitoring/trunk/cxf/src/main/java/org/apache/commons/monitoring/cxf/MonitoringInInterceptor.java
 (original)
+++ 
commons/sandbox/monitoring/trunk/cxf/src/main/java/org/apache/commons/monitoring/cxf/MonitoringInInterceptor.java
 Thu Aug  1 11:58:25 2013
@@ -17,7 +17,7 @@
 
 package org.apache.commons.monitoring.cxf;
 
-import org.apache.commons.monitoring.Role;
+import org.apache.commons.monitoring.counter.Role;
 import org.apache.commons.monitoring.counter.Counter;
 import org.apache.commons.monitoring.repositories.Repository;
 import org.apache.commons.monitoring.stopwatches.StopWatch;

Modified: 
commons/sandbox/monitoring/trunk/jdbc/src/main/java/org/apache/commons/monitoring/jdbc/MonitoredDataSource.java
URL: 
http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/jdbc/src/main/java/org/apache/commons/monitoring/jdbc/MonitoredDataSource.java?rev=1509184&r1=1509183&r2=1509184&view=diff
==============================================================================
--- 
commons/sandbox/monitoring/trunk/jdbc/src/main/java/org/apache/commons/monitoring/jdbc/MonitoredDataSource.java
 (original)
+++ 
commons/sandbox/monitoring/trunk/jdbc/src/main/java/org/apache/commons/monitoring/jdbc/MonitoredDataSource.java
 Thu Aug  1 11:58:25 2013
@@ -18,7 +18,7 @@
 package org.apache.commons.monitoring.jdbc;
 
 
-import org.apache.commons.monitoring.Role;
+import org.apache.commons.monitoring.counter.Role;
 import org.apache.commons.monitoring.counter.Counter;
 import org.apache.commons.monitoring.repositories.Repository;
 

Modified: 
commons/sandbox/monitoring/trunk/jdbc/src/main/java/org/apache/commons/monitoring/jdbc/MonitoredPreparedStatement.java
URL: 
http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/jdbc/src/main/java/org/apache/commons/monitoring/jdbc/MonitoredPreparedStatement.java?rev=1509184&r1=1509183&r2=1509184&view=diff
==============================================================================
--- 
commons/sandbox/monitoring/trunk/jdbc/src/main/java/org/apache/commons/monitoring/jdbc/MonitoredPreparedStatement.java
 (original)
+++ 
commons/sandbox/monitoring/trunk/jdbc/src/main/java/org/apache/commons/monitoring/jdbc/MonitoredPreparedStatement.java
 Thu Aug  1 11:58:25 2013
@@ -16,7 +16,7 @@
  */
 package org.apache.commons.monitoring.jdbc;
 
-import org.apache.commons.monitoring.Role;
+import org.apache.commons.monitoring.counter.Role;
 import org.apache.commons.monitoring.counter.Counter;
 import org.apache.commons.monitoring.repositories.Repository;
 import org.apache.commons.monitoring.stopwatches.StopWatch;

Modified: 
commons/sandbox/monitoring/trunk/jdbc/src/main/java/org/apache/commons/monitoring/jdbc/MonitoredStatement.java
URL: 
http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/jdbc/src/main/java/org/apache/commons/monitoring/jdbc/MonitoredStatement.java?rev=1509184&r1=1509183&r2=1509184&view=diff
==============================================================================
--- 
commons/sandbox/monitoring/trunk/jdbc/src/main/java/org/apache/commons/monitoring/jdbc/MonitoredStatement.java
 (original)
+++ 
commons/sandbox/monitoring/trunk/jdbc/src/main/java/org/apache/commons/monitoring/jdbc/MonitoredStatement.java
 Thu Aug  1 11:58:25 2013
@@ -17,7 +17,7 @@
 
 package org.apache.commons.monitoring.jdbc;
 
-import org.apache.commons.monitoring.Role;
+import org.apache.commons.monitoring.counter.Role;
 import org.apache.commons.monitoring.counter.Counter;
 import org.apache.commons.monitoring.repositories.Repository;
 import org.apache.commons.monitoring.stopwatches.StopWatch;

Modified: 
commons/sandbox/monitoring/trunk/jdbc/src/main/java/org/apache/commons/monitoring/jdbc/MonitoringDriver.java
URL: 
http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/jdbc/src/main/java/org/apache/commons/monitoring/jdbc/MonitoringDriver.java?rev=1509184&r1=1509183&r2=1509184&view=diff
==============================================================================
--- 
commons/sandbox/monitoring/trunk/jdbc/src/main/java/org/apache/commons/monitoring/jdbc/MonitoringDriver.java
 (original)
+++ 
commons/sandbox/monitoring/trunk/jdbc/src/main/java/org/apache/commons/monitoring/jdbc/MonitoringDriver.java
 Thu Aug  1 11:58:25 2013
@@ -16,7 +16,7 @@
  */
 package org.apache.commons.monitoring.jdbc;
 
-import org.apache.commons.monitoring.Role;
+import org.apache.commons.monitoring.counter.Role;
 import org.apache.commons.monitoring.counter.Counter;
 import org.apache.commons.monitoring.repositories.Repository;
 

Modified: 
commons/sandbox/monitoring/trunk/jdbc/src/test/java/org/apache/commons/monitoring/jdbc/HsqlDBTest.java
URL: 
http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/jdbc/src/test/java/org/apache/commons/monitoring/jdbc/HsqlDBTest.java?rev=1509184&r1=1509183&r2=1509184&view=diff
==============================================================================
--- 
commons/sandbox/monitoring/trunk/jdbc/src/test/java/org/apache/commons/monitoring/jdbc/HsqlDBTest.java
 (original)
+++ 
commons/sandbox/monitoring/trunk/jdbc/src/test/java/org/apache/commons/monitoring/jdbc/HsqlDBTest.java
 Thu Aug  1 11:58:25 2013
@@ -16,7 +16,7 @@
  */
 package org.apache.commons.monitoring.jdbc;
 
-import org.apache.commons.monitoring.Role;
+import org.apache.commons.monitoring.counter.Role;
 import org.apache.commons.monitoring.counter.Counter;
 import org.apache.commons.monitoring.repositories.Repository;
 import org.hsqldb.jdbcDriver;

Modified: 
commons/sandbox/monitoring/trunk/reporting/src/test/java/org/apache/commons/monitoring/reporting/FormatsTest.java
URL: 
http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/reporting/src/test/java/org/apache/commons/monitoring/reporting/FormatsTest.java?rev=1509184&r1=1509183&r2=1509184&view=diff
==============================================================================
--- 
commons/sandbox/monitoring/trunk/reporting/src/test/java/org/apache/commons/monitoring/reporting/FormatsTest.java
 (original)
+++ 
commons/sandbox/monitoring/trunk/reporting/src/test/java/org/apache/commons/monitoring/reporting/FormatsTest.java
 Thu Aug  1 11:58:25 2013
@@ -17,7 +17,7 @@
 
 package org.apache.commons.monitoring.reporting;
 
-import org.apache.commons.monitoring.Role;
+import org.apache.commons.monitoring.counter.Role;
 import org.apache.commons.monitoring.counter.Counter;
 import 
org.apache.commons.monitoring.reporting.web.plugin.report.format.CSVFormat;
 import org.apache.commons.monitoring.reporting.web.plugin.report.format.Format;

Modified: 
commons/sandbox/monitoring/trunk/spring/src/test/java/org/apache/commons/monitoring/spring/SpringMonitoringTest.java
URL: 
http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/spring/src/test/java/org/apache/commons/monitoring/spring/SpringMonitoringTest.java?rev=1509184&r1=1509183&r2=1509184&view=diff
==============================================================================
--- 
commons/sandbox/monitoring/trunk/spring/src/test/java/org/apache/commons/monitoring/spring/SpringMonitoringTest.java
 (original)
+++ 
commons/sandbox/monitoring/trunk/spring/src/test/java/org/apache/commons/monitoring/spring/SpringMonitoringTest.java
 Thu Aug  1 11:58:25 2013
@@ -16,7 +16,7 @@
  */
 package org.apache.commons.monitoring.spring;
 
-import org.apache.commons.monitoring.Role;
+import org.apache.commons.monitoring.counter.Role;
 import org.apache.commons.monitoring.counter.Counter;
 import org.apache.commons.monitoring.repositories.Repository;
 import org.apache.commons.monitoring.spring.service.MyService;

Modified: 
commons/sandbox/monitoring/trunk/web/src/main/java/org/apache/commons/monitoring/web/jsp/StartTag.java
URL: 
http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/web/src/main/java/org/apache/commons/monitoring/web/jsp/StartTag.java?rev=1509184&r1=1509183&r2=1509184&view=diff
==============================================================================
--- 
commons/sandbox/monitoring/trunk/web/src/main/java/org/apache/commons/monitoring/web/jsp/StartTag.java
 (original)
+++ 
commons/sandbox/monitoring/trunk/web/src/main/java/org/apache/commons/monitoring/web/jsp/StartTag.java
 Thu Aug  1 11:58:25 2013
@@ -17,7 +17,7 @@
 
 package org.apache.commons.monitoring.web.jsp;
 
-import org.apache.commons.monitoring.Role;
+import org.apache.commons.monitoring.counter.Role;
 import org.apache.commons.monitoring.counter.Counter;
 import org.apache.commons.monitoring.repositories.Repository;
 import org.apache.commons.monitoring.stopwatches.StopWatch;

Modified: 
commons/sandbox/monitoring/trunk/web/src/main/java/org/apache/commons/monitoring/web/servlet/MonitoringFilter.java
URL: 
http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/web/src/main/java/org/apache/commons/monitoring/web/servlet/MonitoringFilter.java?rev=1509184&r1=1509183&r2=1509184&view=diff
==============================================================================
--- 
commons/sandbox/monitoring/trunk/web/src/main/java/org/apache/commons/monitoring/web/servlet/MonitoringFilter.java
 (original)
+++ 
commons/sandbox/monitoring/trunk/web/src/main/java/org/apache/commons/monitoring/web/servlet/MonitoringFilter.java
 Thu Aug  1 11:58:25 2013
@@ -16,7 +16,7 @@
  */
 package org.apache.commons.monitoring.web.servlet;
 
-import org.apache.commons.monitoring.Role;
+import org.apache.commons.monitoring.counter.Role;
 import org.apache.commons.monitoring.counter.Counter;
 import org.apache.commons.monitoring.repositories.Repository;
 import org.apache.commons.monitoring.stopwatches.StopWatch;

Reply via email to