svn commit: r1534581 [1/4] - in /incubator/sirona/trunk: aop/src/main/java/org/apache/commons/ aop/src/main/java/org/apache/sirona/ aop/src/main/java/org/apache/sirona/aop/ aop/src/test/java/org/apache/commons/ aop/src/test/java/org/apache/sirona/ aop/...

[rm...@apache.org]

Author: rmannibucau
Date: Tue Oct 22 10:03:02 2013
New Revision: 1534581

URL: http://svn.apache.org/r1534581
Log:
package renaming

Added:
    incubator/sirona/trunk/aop/src/main/java/org/apache/sirona/
    incubator/sirona/trunk/aop/src/main/java/org/apache/sirona/aop/
    incubator/sirona/trunk/aop/src/main/java/org/apache/sirona/aop/AbstractPerformanceInterceptor.java
      - copied, changed from r1534560, incubator/sirona/trunk/aop/src/main/java/org/apache/commons/monitoring/aop/AbstractPerformanceInterceptor.java
    incubator/sirona/trunk/aop/src/main/java/org/apache/sirona/aop/DefaultMonitorNameExtractor.java
      - copied, changed from r1534560, incubator/sirona/trunk/aop/src/main/java/org/apache/commons/monitoring/aop/DefaultMonitorNameExtractor.java
    incubator/sirona/trunk/aop/src/main/java/org/apache/sirona/aop/MonitorNameExtractor.java
      - copied, changed from r1534560, incubator/sirona/trunk/aop/src/main/java/org/apache/commons/monitoring/aop/MonitorNameExtractor.java
    incubator/sirona/trunk/aop/src/main/java/org/apache/sirona/aop/MonitoringProxyFactory.java
      - copied, changed from r1534560, incubator/sirona/trunk/aop/src/main/java/org/apache/commons/monitoring/aop/MonitoringProxyFactory.java
    incubator/sirona/trunk/aop/src/test/java/org/apache/sirona/
    incubator/sirona/trunk/aop/src/test/java/org/apache/sirona/aop/
    incubator/sirona/trunk/aop/src/test/java/org/apache/sirona/aop/MonitoringProxyFactoryTest.java
      - copied, changed from r1534560, incubator/sirona/trunk/aop/src/test/java/org/apache/commons/monitoring/aop/MonitoringProxyFactoryTest.java
    incubator/sirona/trunk/aspectj/src/main/java/org/apache/sirona/
    incubator/sirona/trunk/aspectj/src/main/java/org/apache/sirona/aspectj/
    incubator/sirona/trunk/aspectj/src/main/java/org/apache/sirona/aspectj/CommonsMonitoringAspect.java
      - copied, changed from r1534560, incubator/sirona/trunk/aspectj/src/main/java/org/apache/commons/monitoring/aspectj/CommonsMonitoringAspect.java
    incubator/sirona/trunk/aspectj/src/test/java/org/apache/sirona/
    incubator/sirona/trunk/aspectj/src/test/java/org/apache/sirona/aspectj/
    incubator/sirona/trunk/aspectj/src/test/java/org/apache/sirona/aspectj/AspectJMonitoringTest.java
      - copied, changed from r1534560, incubator/sirona/trunk/aspectj/src/test/java/org/apache/commons/monitoring/aspectj/AspectJMonitoringTest.java
    incubator/sirona/trunk/cdi/src/main/java/org/apache/sirona/
    incubator/sirona/trunk/cdi/src/main/java/org/apache/sirona/cdi/
    incubator/sirona/trunk/cdi/src/main/java/org/apache/sirona/cdi/CommonsMonitoringInterceptor.java
      - copied, changed from r1534560, incubator/sirona/trunk/cdi/src/main/java/org/apache/commons/monitoring/cdi/CommonsMonitoringInterceptor.java
    incubator/sirona/trunk/cdi/src/main/java/org/apache/sirona/cdi/Monitored.java
      - copied, changed from r1534560, incubator/sirona/trunk/cdi/src/main/java/org/apache/commons/monitoring/cdi/Monitored.java
    incubator/sirona/trunk/cdi/src/main/java/org/apache/sirona/cdi/internal/
      - copied from r1534560, incubator/sirona/trunk/cdi/src/main/java/org/apache/commons/monitoring/cdi/internal/
    incubator/sirona/trunk/cdi/src/test/java/org/apache/sirona/
    incubator/sirona/trunk/cdi/src/test/java/org/apache/sirona/cdi/
    incubator/sirona/trunk/cdi/src/test/java/org/apache/sirona/cdi/CommonsMonitoringExtensionTest.java
      - copied, changed from r1534560, incubator/sirona/trunk/cdi/src/test/java/org/apache/commons/monitoring/cdi/CommonsMonitoringExtensionTest.java
    incubator/sirona/trunk/cdi/src/test/java/org/apache/sirona/cdi/CommonsMonitoringExtensionTestBase.java
      - copied, changed from r1534560, incubator/sirona/trunk/cdi/src/test/java/org/apache/commons/monitoring/cdi/CommonsMonitoringExtensionTestBase.java
    incubator/sirona/trunk/cdi/src/test/java/org/apache/sirona/cdi/CommonsMonitoringInterceptorTest.java
      - copied, changed from r1534560, incubator/sirona/trunk/cdi/src/test/java/org/apache/commons/monitoring/cdi/CommonsMonitoringInterceptorTest.java
    incubator/sirona/trunk/collector/src/main/java/org/apache/sirona/
    incubator/sirona/trunk/collector/src/main/java/org/apache/sirona/collector/
    incubator/sirona/trunk/collector/src/main/java/org/apache/sirona/collector/server/
    incubator/sirona/trunk/collector/src/main/java/org/apache/sirona/collector/server/Collector.java
      - copied, changed from r1534560, incubator/sirona/trunk/collector/src/main/java/org/apache/commons/monitoring/collector/server/Collector.java
    incubator/sirona/trunk/collector/src/main/java/org/apache/sirona/collector/server/Event.java
      - copied, changed from r1534560, incubator/sirona/trunk/collector/src/main/java/org/apache/commons/monitoring/collector/server/Event.java
    incubator/sirona/trunk/collector/src/main/java/org/apache/sirona/collector/server/math/
      - copied from r1534560, incubator/sirona/trunk/collector/src/main/java/org/apache/commons/monitoring/collector/server/math/
    incubator/sirona/trunk/collector/src/main/java/org/apache/sirona/collector/server/store/
      - copied from r1534560, incubator/sirona/trunk/collector/src/main/java/org/apache/commons/monitoring/collector/server/store/
    incubator/sirona/trunk/collector/src/test/java/org/apache/sirona/
    incubator/sirona/trunk/collector/src/test/java/org/apache/sirona/collector/
    incubator/sirona/trunk/collector/src/test/java/org/apache/sirona/collector/server/
    incubator/sirona/trunk/collector/src/test/java/org/apache/sirona/collector/server/CollectorServer.java
      - copied, changed from r1534560, incubator/sirona/trunk/collector/src/test/java/org/apache/commons/monitoring/collector/server/CollectorServer.java
    incubator/sirona/trunk/collector/src/test/java/org/apache/sirona/collector/server/CubeDataStoreCompatibilityTest.java
      - copied, changed from r1534560, incubator/sirona/trunk/collector/src/test/java/org/apache/commons/monitoring/collector/server/CubeDataStoreCompatibilityTest.java
    incubator/sirona/trunk/collector/src/test/java/org/apache/sirona/collector/server/HttpCollectorTest.java
      - copied, changed from r1534560, incubator/sirona/trunk/collector/src/test/java/org/apache/commons/monitoring/collector/server/HttpCollectorTest.java
    incubator/sirona/trunk/collector/src/test/java/org/apache/sirona/collector/server/store/
      - copied from r1534560, incubator/sirona/trunk/collector/src/test/java/org/apache/commons/monitoring/collector/server/store/
    incubator/sirona/trunk/core/src/main/java/org/apache/sirona/
    incubator/sirona/trunk/core/src/main/java/org/apache/sirona/MonitoringException.java
      - copied, changed from r1534560, incubator/sirona/trunk/core/src/main/java/org/apache/commons/monitoring/MonitoringException.java
    incubator/sirona/trunk/core/src/main/java/org/apache/sirona/Role.java
      - copied, changed from r1534560, incubator/sirona/trunk/core/src/main/java/org/apache/commons/monitoring/Role.java
    incubator/sirona/trunk/core/src/main/java/org/apache/sirona/configuration/
      - copied from r1534560, incubator/sirona/trunk/core/src/main/java/org/apache/commons/monitoring/configuration/
    incubator/sirona/trunk/core/src/main/java/org/apache/sirona/counters/
      - copied from r1534560, incubator/sirona/trunk/core/src/main/java/org/apache/commons/monitoring/counters/
    incubator/sirona/trunk/core/src/main/java/org/apache/sirona/gauges/
      - copied from r1534560, incubator/sirona/trunk/core/src/main/java/org/apache/commons/monitoring/gauges/
    incubator/sirona/trunk/core/src/main/java/org/apache/sirona/repositories/
      - copied from r1534560, incubator/sirona/trunk/core/src/main/java/org/apache/commons/monitoring/repositories/
    incubator/sirona/trunk/core/src/main/java/org/apache/sirona/spi/
      - copied from r1534560, incubator/sirona/trunk/core/src/main/java/org/apache/commons/monitoring/spi/
    incubator/sirona/trunk/core/src/main/java/org/apache/sirona/stopwatches/
      - copied from r1534560, incubator/sirona/trunk/core/src/main/java/org/apache/commons/monitoring/stopwatches/
    incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/
      - copied from r1534560, incubator/sirona/trunk/core/src/main/java/org/apache/commons/monitoring/store/
    incubator/sirona/trunk/core/src/main/java/org/apache/sirona/util/
      - copied from r1534560, incubator/sirona/trunk/core/src/main/java/org/apache/commons/monitoring/util/
    incubator/sirona/trunk/core/src/test/java/org/apache/sirona/
    incubator/sirona/trunk/core/src/test/java/org/apache/sirona/counters/
      - copied from r1534560, incubator/sirona/trunk/core/src/test/java/org/apache/commons/monitoring/counters/
    incubator/sirona/trunk/core/src/test/java/org/apache/sirona/counters/UnitTest.java
      - copied, changed from r1534560, incubator/sirona/trunk/core/src/test/java/org/apache/commons/monitoring/UnitTest.java
    incubator/sirona/trunk/cube/src/main/java/org/apache/sirona/
    incubator/sirona/trunk/cube/src/main/java/org/apache/sirona/cube/
    incubator/sirona/trunk/cube/src/main/java/org/apache/sirona/cube/Cube.java
      - copied, changed from r1534560, incubator/sirona/trunk/cube/src/main/java/org/apache/commons/monitoring/cube/Cube.java
    incubator/sirona/trunk/cube/src/main/java/org/apache/sirona/cube/CubeBuilder.java
      - copied, changed from r1534560, incubator/sirona/trunk/cube/src/main/java/org/apache/commons/monitoring/cube/CubeBuilder.java
    incubator/sirona/trunk/cube/src/main/java/org/apache/sirona/cube/CubeCounterDataStore.java
      - copied, changed from r1534560, incubator/sirona/trunk/cube/src/main/java/org/apache/commons/monitoring/cube/CubeCounterDataStore.java
    incubator/sirona/trunk/cube/src/main/java/org/apache/sirona/cube/CubeDataStoreFactory.java
      - copied, changed from r1534560, incubator/sirona/trunk/cube/src/main/java/org/apache/commons/monitoring/cube/CubeDataStoreFactory.java
    incubator/sirona/trunk/cube/src/main/java/org/apache/sirona/cube/CubeGaugeDataStore.java
      - copied, changed from r1534560, incubator/sirona/trunk/cube/src/main/java/org/apache/commons/monitoring/cube/CubeGaugeDataStore.java
    incubator/sirona/trunk/cube/src/main/java/org/apache/sirona/cube/MapBuilder.java
      - copied, changed from r1534560, incubator/sirona/trunk/cube/src/main/java/org/apache/commons/monitoring/cube/MapBuilder.java
    incubator/sirona/trunk/cube/src/test/java/org/apache/sirona/
    incubator/sirona/trunk/cube/src/test/java/org/apache/sirona/cube/
    incubator/sirona/trunk/cube/src/test/java/org/apache/sirona/cube/CubeDataStoreTest.java
      - copied, changed from r1534560, incubator/sirona/trunk/cube/src/test/java/org/apache/commons/monitoring/cube/CubeDataStoreTest.java
    incubator/sirona/trunk/cube/src/test/java/org/apache/sirona/cube/CubeServer.java
      - copied, changed from r1534560, incubator/sirona/trunk/cube/src/test/java/org/apache/commons/monitoring/cube/CubeServer.java
    incubator/sirona/trunk/cube/src/test/java/org/apache/sirona/cube/gauge/
      - copied from r1534560, incubator/sirona/trunk/cube/src/test/java/org/apache/commons/monitoring/cube/gauge/
    incubator/sirona/trunk/cube/src/test/resources/META-INF/services/org.apache.sirona.gauges.Gauge
      - copied, changed from r1534560, incubator/sirona/trunk/cube/src/test/resources/META-INF/services/org.apache.commons.monitoring.gauges.Gauge
    incubator/sirona/trunk/graphite/src/main/java/org/apache/sirona/
    incubator/sirona/trunk/graphite/src/main/java/org/apache/sirona/graphite/
    incubator/sirona/trunk/graphite/src/main/java/org/apache/sirona/graphite/Graphite.java
      - copied, changed from r1534560, incubator/sirona/trunk/graphite/src/main/java/org/apache/commons/monitoring/graphite/Graphite.java
    incubator/sirona/trunk/graphite/src/main/java/org/apache/sirona/graphite/GraphiteBuilder.java
      - copied, changed from r1534560, incubator/sirona/trunk/graphite/src/main/java/org/apache/commons/monitoring/graphite/GraphiteBuilder.java
    incubator/sirona/trunk/graphite/src/main/java/org/apache/sirona/graphite/GraphiteCounterDataStore.java
      - copied, changed from r1534560, incubator/sirona/trunk/graphite/src/main/java/org/apache/commons/monitoring/graphite/GraphiteCounterDataStore.java
    incubator/sirona/trunk/graphite/src/main/java/org/apache/sirona/graphite/GraphiteDataStoreFactory.java
      - copied, changed from r1534560, incubator/sirona/trunk/graphite/src/main/java/org/apache/commons/monitoring/graphite/GraphiteDataStoreFactory.java
    incubator/sirona/trunk/graphite/src/main/java/org/apache/sirona/graphite/GraphiteGaugeDataStore.java
      - copied, changed from r1534560, incubator/sirona/trunk/graphite/src/main/java/org/apache/commons/monitoring/graphite/GraphiteGaugeDataStore.java
    incubator/sirona/trunk/graphite/src/test/java/org/apache/sirona/
    incubator/sirona/trunk/graphite/src/test/java/org/apache/sirona/graphite/
    incubator/sirona/trunk/graphite/src/test/java/org/apache/sirona/graphite/GraphiteTest.java
      - copied, changed from r1534560, incubator/sirona/trunk/graphite/src/test/java/org/apache/commons/monitoring/graphite/GraphiteTest.java
    incubator/sirona/trunk/graphite/src/test/java/org/apache/sirona/graphite/GraphiteTestBase.java
      - copied, changed from r1534560, incubator/sirona/trunk/graphite/src/test/java/org/apache/commons/monitoring/graphite/GraphiteTestBase.java
    incubator/sirona/trunk/graphite/src/test/java/org/apache/sirona/graphite/gauge/
      - copied from r1534560, incubator/sirona/trunk/graphite/src/test/java/org/apache/commons/monitoring/graphite/gauge/
    incubator/sirona/trunk/graphite/src/test/java/org/apache/sirona/graphite/server/
      - copied from r1534560, incubator/sirona/trunk/graphite/src/test/java/org/apache/commons/monitoring/graphite/server/
    incubator/sirona/trunk/graphite/src/test/resources/META-INF/services/org.apache.sirona.gauges.Gauge
      - copied, changed from r1534560, incubator/sirona/trunk/graphite/src/test/resources/META-INF/services/org.apache.commons.monitoring.gauges.Gauge
    incubator/sirona/trunk/jdbc/src/main/java/org/apache/sirona/
    incubator/sirona/trunk/jdbc/src/main/java/org/apache/sirona/jdbc/
    incubator/sirona/trunk/jdbc/src/main/java/org/apache/sirona/jdbc/ConnectionClosedCallBack.java
      - copied, changed from r1534560, incubator/sirona/trunk/jdbc/src/main/java/org/apache/commons/monitoring/jdbc/ConnectionClosedCallBack.java
    incubator/sirona/trunk/jdbc/src/main/java/org/apache/sirona/jdbc/MonitoredConnection.java
      - copied, changed from r1534560, incubator/sirona/trunk/jdbc/src/main/java/org/apache/commons/monitoring/jdbc/MonitoredConnection.java
    incubator/sirona/trunk/jdbc/src/main/java/org/apache/sirona/jdbc/MonitoredDataSource.java
      - copied, changed from r1534560, incubator/sirona/trunk/jdbc/src/main/java/org/apache/commons/monitoring/jdbc/MonitoredDataSource.java
    incubator/sirona/trunk/jdbc/src/main/java/org/apache/sirona/jdbc/MonitoredPreparedStatement.java
      - copied, changed from r1534560, incubator/sirona/trunk/jdbc/src/main/java/org/apache/commons/monitoring/jdbc/MonitoredPreparedStatement.java
    incubator/sirona/trunk/jdbc/src/main/java/org/apache/sirona/jdbc/MonitoredStatement.java
      - copied, changed from r1534560, incubator/sirona/trunk/jdbc/src/main/java/org/apache/commons/monitoring/jdbc/MonitoredStatement.java
    incubator/sirona/trunk/jdbc/src/main/java/org/apache/sirona/jdbc/MonitoringDriver.java
      - copied, changed from r1534560, incubator/sirona/trunk/jdbc/src/main/java/org/apache/commons/monitoring/jdbc/MonitoringDriver.java
    incubator/sirona/trunk/jdbc/src/test/java/org/apache/sirona/
    incubator/sirona/trunk/jdbc/src/test/java/org/apache/sirona/jdbc/
    incubator/sirona/trunk/jdbc/src/test/java/org/apache/sirona/jdbc/HsqlDBTest.java
      - copied, changed from r1534560, incubator/sirona/trunk/jdbc/src/test/java/org/apache/commons/monitoring/jdbc/HsqlDBTest.java
    incubator/sirona/trunk/jpa/src/main/java/org/apache/sirona/
    incubator/sirona/trunk/jpa/src/main/java/org/apache/sirona/jpa/
    incubator/sirona/trunk/jpa/src/main/java/org/apache/sirona/jpa/JPAProxyFactory.java
      - copied, changed from r1534560, incubator/sirona/trunk/jpa/src/main/java/org/apache/commons/monitoring/jpa/JPAProxyFactory.java
    incubator/sirona/trunk/jpa/src/main/java/org/apache/sirona/jpa/MonitoringPersistence.java
      - copied, changed from r1534561, incubator/sirona/trunk/jpa/src/main/java/org/apache/commons/monitoring/jpa/MonitoringPersistence.java
    incubator/sirona/trunk/jpa/src/main/java/org/apache/sirona/jpa/OverridePersistenceXmlClassLoader.java
      - copied, changed from r1534560, incubator/sirona/trunk/jpa/src/main/java/org/apache/commons/monitoring/jpa/OverridePersistenceXmlClassLoader.java
    incubator/sirona/trunk/jpa/src/test/java/org/apache/sirona/
    incubator/sirona/trunk/jpa/src/test/java/org/apache/sirona/jpa/
    incubator/sirona/trunk/jpa/src/test/java/org/apache/sirona/jpa/EMFTest.java
      - copied, changed from r1534560, incubator/sirona/trunk/jpa/src/test/java/org/apache/commons/monitoring/jpa/EMFTest.java
    incubator/sirona/trunk/jpa/src/test/java/org/apache/sirona/jpa/QueryTest.java
      - copied, changed from r1534560, incubator/sirona/trunk/jpa/src/test/java/org/apache/commons/monitoring/jpa/QueryTest.java
    incubator/sirona/trunk/jpa/src/test/java/org/apache/sirona/jpa/entity/
      - copied from r1534560, incubator/sirona/trunk/jpa/src/test/java/org/apache/commons/monitoring/jpa/entity/
    incubator/sirona/trunk/jta/src/main/java/org/apache/sirona/
    incubator/sirona/trunk/jta/src/main/java/org/apache/sirona/jta/
    incubator/sirona/trunk/jta/src/main/java/org/apache/sirona/jta/JTAGauges.java
      - copied, changed from r1534560, incubator/sirona/trunk/jta/src/main/java/org/apache/commons/monitoring/jta/JTAGauges.java
    incubator/sirona/trunk/jta/src/main/java/org/apache/sirona/jta/JTAInterceptor.java
      - copied, changed from r1534560, incubator/sirona/trunk/jta/src/main/java/org/apache/commons/monitoring/jta/JTAInterceptor.java
    incubator/sirona/trunk/jta/src/main/java/org/apache/sirona/jta/JTAMonitored.java
      - copied, changed from r1534560, incubator/sirona/trunk/jta/src/main/java/org/apache/commons/monitoring/jta/JTAMonitored.java
    incubator/sirona/trunk/jta/src/main/resources/META-INF/services/org.apache.sirona.gauges.GaugeFactory
      - copied, changed from r1534560, incubator/sirona/trunk/jta/src/main/resources/META-INF/services/org.apache.commons.monitoring.gauges.GaugeFactory
    incubator/sirona/trunk/jta/src/test/java/org/apache/sirona/
    incubator/sirona/trunk/jta/src/test/java/org/apache/sirona/jta/
    incubator/sirona/trunk/jta/src/test/java/org/apache/sirona/jta/GaugesTest.java
      - copied, changed from r1534560, incubator/sirona/trunk/jta/src/test/java/org/apache/commons/monitoring/jta/GaugesTest.java
    incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/
    incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/
    incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/
    incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/MonitoringController.java
      - copied, changed from r1534560, incubator/sirona/trunk/reporting/src/main/java/org/apache/commons/monitoring/reporting/web/MonitoringController.java
    incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/handler/
      - copied from r1534560, incubator/sirona/trunk/reporting/src/main/java/org/apache/commons/monitoring/reporting/web/handler/
    incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/
      - copied from r1534560, incubator/sirona/trunk/reporting/src/main/java/org/apache/commons/monitoring/reporting/web/plugin/
    incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/registration/
      - copied from r1534560, incubator/sirona/trunk/reporting/src/main/java/org/apache/commons/monitoring/reporting/web/registration/
    incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/template/
      - copied from r1534560, incubator/sirona/trunk/reporting/src/main/java/org/apache/commons/monitoring/reporting/web/template/
    incubator/sirona/trunk/reporting/src/main/resources/META-INF/services/org.apache.sirona.gauges.Gauge
      - copied, changed from r1534560, incubator/sirona/trunk/reporting/src/main/resources/META-INF/services/org.apache.commons.monitoring.gauges.Gauge
    incubator/sirona/trunk/reporting/src/main/resources/META-INF/services/org.apache.sirona.reporting.web.plugin.Plugin
      - copied, changed from r1534560, incubator/sirona/trunk/reporting/src/main/resources/META-INF/services/org.apache.commons.monitoring.reporting.web.plugin.Plugin
    incubator/sirona/trunk/reporting/src/test/java/org/apache/sirona/
    incubator/sirona/trunk/reporting/src/test/java/org/apache/sirona/reporting/
    incubator/sirona/trunk/reporting/src/test/java/org/apache/sirona/reporting/FormatsTest.java
      - copied, changed from r1534560, incubator/sirona/trunk/reporting/src/test/java/org/apache/commons/monitoring/reporting/FormatsTest.java
    incubator/sirona/trunk/reporting/src/test/java/org/apache/sirona/reporting/template/
      - copied from r1534560, incubator/sirona/trunk/reporting/src/test/java/org/apache/commons/monitoring/reporting/template/
    incubator/sirona/trunk/spring/src/main/java/org/apache/sirona/
    incubator/sirona/trunk/spring/src/main/java/org/apache/sirona/spring/
    incubator/sirona/trunk/spring/src/main/java/org/apache/sirona/spring/AopaliancePerformanceInterceptor.java
      - copied, changed from r1534560, incubator/sirona/trunk/spring/src/main/java/org/apache/commons/monitoring/spring/AopaliancePerformanceInterceptor.java
    incubator/sirona/trunk/spring/src/main/java/org/apache/sirona/spring/BeanNameMonitoringAutoProxyCreator.java
      - copied, changed from r1534560, incubator/sirona/trunk/spring/src/main/java/org/apache/commons/monitoring/spring/BeanNameMonitoringAutoProxyCreator.java
    incubator/sirona/trunk/spring/src/main/java/org/apache/sirona/spring/PointcutMonitoringAutoProxyCreator.java
      - copied, changed from r1534560, incubator/sirona/trunk/spring/src/main/java/org/apache/commons/monitoring/spring/PointcutMonitoringAutoProxyCreator.java
    incubator/sirona/trunk/spring/src/test/java/org/apache/sirona/
    incubator/sirona/trunk/spring/src/test/java/org/apache/sirona/spring/
    incubator/sirona/trunk/spring/src/test/java/org/apache/sirona/spring/SpringMonitoringTest.java
      - copied, changed from r1534560, incubator/sirona/trunk/spring/src/test/java/org/apache/commons/monitoring/spring/SpringMonitoringTest.java
    incubator/sirona/trunk/spring/src/test/java/org/apache/sirona/spring/service/
      - copied from r1534560, incubator/sirona/trunk/spring/src/test/java/org/apache/commons/monitoring/spring/service/
    incubator/sirona/trunk/web/src/main/java/org/apache/sirona/
    incubator/sirona/trunk/web/src/main/java/org/apache/sirona/web/
    incubator/sirona/trunk/web/src/main/java/org/apache/sirona/web/discovery/
      - copied from r1534560, incubator/sirona/trunk/web/src/main/java/org/apache/commons/monitoring/web/discovery/
    incubator/sirona/trunk/web/src/main/java/org/apache/sirona/web/jsp/
      - copied from r1534560, incubator/sirona/trunk/web/src/main/java/org/apache/commons/monitoring/web/jsp/
    incubator/sirona/trunk/web/src/main/java/org/apache/sirona/web/lifecycle/
      - copied from r1534560, incubator/sirona/trunk/web/src/main/java/org/apache/commons/monitoring/web/lifecycle/
    incubator/sirona/trunk/web/src/main/java/org/apache/sirona/web/registration/
      - copied from r1534560, incubator/sirona/trunk/web/src/main/java/org/apache/commons/monitoring/web/registration/
    incubator/sirona/trunk/web/src/main/java/org/apache/sirona/web/servlet/
      - copied from r1534560, incubator/sirona/trunk/web/src/main/java/org/apache/commons/monitoring/web/servlet/
    incubator/sirona/trunk/web/src/main/java/org/apache/sirona/web/session/
      - copied from r1534560, incubator/sirona/trunk/web/src/main/java/org/apache/commons/monitoring/web/session/
Removed:
    incubator/sirona/trunk/aop/src/main/java/org/apache/commons/
    incubator/sirona/trunk/aop/src/test/java/org/apache/commons/
    incubator/sirona/trunk/aspectj/src/main/java/org/apache/commons/
    incubator/sirona/trunk/aspectj/src/test/java/org/apache/commons/
    incubator/sirona/trunk/cdi/src/main/java/org/apache/commons/
    incubator/sirona/trunk/cdi/src/test/java/org/apache/commons/
    incubator/sirona/trunk/collector/src/main/java/org/apache/commons/
    incubator/sirona/trunk/collector/src/test/java/org/apache/commons/
    incubator/sirona/trunk/core/src/main/java/org/apache/commons/
    incubator/sirona/trunk/core/src/test/java/org/apache/commons/
    incubator/sirona/trunk/cube/src/main/java/org/apache/commons/
    incubator/sirona/trunk/cube/src/test/java/org/apache/commons/
    incubator/sirona/trunk/cube/src/test/resources/META-INF/services/org.apache.commons.monitoring.gauges.Gauge
    incubator/sirona/trunk/graphite/src/main/java/org/apache/commons/
    incubator/sirona/trunk/graphite/src/main/resources/
    incubator/sirona/trunk/graphite/src/test/java/org/apache/commons/
    incubator/sirona/trunk/graphite/src/test/resources/META-INF/services/org.apache.commons.monitoring.gauges.Gauge
    incubator/sirona/trunk/jdbc/src/main/java/org/apache/commons/
    incubator/sirona/trunk/jdbc/src/test/java/org/apache/commons/
    incubator/sirona/trunk/jpa/src/main/java/org/apache/commons/
    incubator/sirona/trunk/jpa/src/test/java/org/apache/commons/
    incubator/sirona/trunk/jta/src/main/java/org/apache/commons/
    incubator/sirona/trunk/jta/src/main/resources/META-INF/services/org.apache.commons.monitoring.gauges.GaugeFactory
    incubator/sirona/trunk/jta/src/test/java/org/apache/commons/
    incubator/sirona/trunk/reporting/src/main/java/org/apache/commons/
    incubator/sirona/trunk/reporting/src/main/resources/META-INF/services/org.apache.commons.monitoring.gauges.Gauge
    incubator/sirona/trunk/reporting/src/main/resources/META-INF/services/org.apache.commons.monitoring.reporting.web.plugin.Plugin
    incubator/sirona/trunk/reporting/src/test/java/org/apache/commons/
    incubator/sirona/trunk/spring/src/main/java/org/apache/commons/
    incubator/sirona/trunk/spring/src/test/java/org/apache/commons/
    incubator/sirona/trunk/web/src/main/java/org/apache/commons/
Modified:
    incubator/sirona/trunk/aspectj/src/test/resources/META-INF/aop.xml
    incubator/sirona/trunk/cdi/src/main/java/org/apache/sirona/cdi/internal/CommonsMonitoringPerformanceExtension.java
    incubator/sirona/trunk/cdi/src/main/java/org/apache/sirona/cdi/internal/WrappedAnnotatedType.java
    incubator/sirona/trunk/cdi/src/main/resources/META-INF/beans.xml
    incubator/sirona/trunk/cdi/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
    incubator/sirona/trunk/cdi/src/test/resources/commons-monitoring.properties
    incubator/sirona/trunk/collector/src/main/java/org/apache/sirona/collector/server/math/Aggregators.java
    incubator/sirona/trunk/collector/src/main/java/org/apache/sirona/collector/server/math/M2AwareStatisticalSummary.java
    incubator/sirona/trunk/collector/src/main/java/org/apache/sirona/collector/server/store/CollectorDataStoreFactory.java
    incubator/sirona/trunk/collector/src/main/java/org/apache/sirona/collector/server/store/counter/AggregatedCollectorCounter.java
    incubator/sirona/trunk/collector/src/main/java/org/apache/sirona/collector/server/store/counter/CollectorCounter.java
    incubator/sirona/trunk/collector/src/main/java/org/apache/sirona/collector/server/store/counter/CollectorCounterStore.java
    incubator/sirona/trunk/collector/src/main/java/org/apache/sirona/collector/server/store/counter/InMemoryCollectorCounterStore.java
    incubator/sirona/trunk/collector/src/main/java/org/apache/sirona/collector/server/store/counter/LeafCollectorCounter.java
    incubator/sirona/trunk/collector/src/main/java/org/apache/sirona/collector/server/store/gauge/CollectorGaugeStore.java
    incubator/sirona/trunk/collector/src/test/java/org/apache/sirona/collector/server/store/counter/AggregatorTest.java
    incubator/sirona/trunk/collector/src/test/java/org/apache/sirona/collector/server/store/gauge/CollectorGaugeTest.java
    incubator/sirona/trunk/collector/src/test/resources/commons-monitoring.properties
    incubator/sirona/trunk/core/pom.xml
    incubator/sirona/trunk/core/src/main/java/org/apache/sirona/configuration/Configuration.java
    incubator/sirona/trunk/core/src/main/java/org/apache/sirona/counters/AggregatedCounter.java
    incubator/sirona/trunk/core/src/main/java/org/apache/sirona/counters/Counter.java
    incubator/sirona/trunk/core/src/main/java/org/apache/sirona/counters/DefaultCounter.java
    incubator/sirona/trunk/core/src/main/java/org/apache/sirona/counters/MetricData.java
    incubator/sirona/trunk/core/src/main/java/org/apache/sirona/counters/Unit.java
    incubator/sirona/trunk/core/src/main/java/org/apache/sirona/gauges/DefaultGaugeManager.java
    incubator/sirona/trunk/core/src/main/java/org/apache/sirona/gauges/Gauge.java
    incubator/sirona/trunk/core/src/main/java/org/apache/sirona/gauges/GaugeFactory.java
    incubator/sirona/trunk/core/src/main/java/org/apache/sirona/gauges/GaugeManager.java
    incubator/sirona/trunk/core/src/main/java/org/apache/sirona/repositories/DefaultRepository.java
    incubator/sirona/trunk/core/src/main/java/org/apache/sirona/repositories/Repository.java
    incubator/sirona/trunk/core/src/main/java/org/apache/sirona/spi/DefaultSPI.java
    incubator/sirona/trunk/core/src/main/java/org/apache/sirona/spi/SPI.java
    incubator/sirona/trunk/core/src/main/java/org/apache/sirona/stopwatches/CounterStopWatch.java
    incubator/sirona/trunk/core/src/main/java/org/apache/sirona/stopwatches/StopWatch.java
    incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/BatchCounterDataStore.java
    incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/CounterDataStore.java
    incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/DataStoreFactory.java
    incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/DefaultDataStoreFactory.java
    incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/DelegateDataStoreFactory.java
    incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/GaugeDataStore.java
    incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/GaugeValuesRequest.java
    incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/InMemoryCounterDataStore.java
    incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/InMemoryGaugeDataStore.java
    incubator/sirona/trunk/core/src/main/java/org/apache/sirona/util/ClassLoaders.java
    incubator/sirona/trunk/core/src/main/java/org/apache/sirona/util/DaemonThreadFactory.java
    incubator/sirona/trunk/core/src/test/java/org/apache/sirona/counters/CounterBench.java
    incubator/sirona/trunk/cube/src/test/java/org/apache/sirona/cube/gauge/MockGauge.java
    incubator/sirona/trunk/cube/src/test/resources/commons-monitoring.properties
    incubator/sirona/trunk/graphite/src/test/java/org/apache/sirona/graphite/gauge/MockGauge.java
    incubator/sirona/trunk/graphite/src/test/java/org/apache/sirona/graphite/server/GraphiteMockServer.java
    incubator/sirona/trunk/graphite/src/test/resources/commons-monitoring.properties
    incubator/sirona/trunk/jpa/src/main/resources/META-INF/services/javax.persistence.spi.PersistenceProvider
    incubator/sirona/trunk/jpa/src/test/java/org/apache/sirona/jpa/entity/Address.java
    incubator/sirona/trunk/jpa/src/test/java/org/apache/sirona/jpa/entity/Person.java
    incubator/sirona/trunk/jpa/src/test/resources/META-INF/persistence.xml
    incubator/sirona/trunk/jta/src/main/resources/META-INF/beans.xml
    incubator/sirona/trunk/jta/src/test/resources/commons-monitoring.properties
    incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/handler/FilteringEndpoints.java
    incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/handler/HomeEndpoint.java
    incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/handler/api/Regex.java
    incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/handler/api/Template.java
    incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/handler/api/TemplateHelper.java
    incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/handler/internal/EndpointInfo.java
    incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/handler/internal/Invoker.java
    incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/Plugin.java
    incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/PluginRepository.java
    incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/jmx/JMXEndpoints.java
    incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/jmx/JMXNode.java
    incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/jmx/JMXPlugin.java
    incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/json/Jsons.java
    incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/jta/JTAEndpoints.java
    incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/jta/JTAPlugin.java
    incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/jvm/JVMEndpoints.java
    incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/jvm/JVMPlugin.java
    incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/jvm/gauges/BaseMemoryGauge.java
    incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/jvm/gauges/CPUGauge.java
    incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/jvm/gauges/UsedMemoryGauge.java
    incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/report/ReportEndpoints.java
    incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/report/ReportPlugin.java
    incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/report/format/CSVFormat.java
    incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/report/format/Format.java
    incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/report/format/HTMLFormat.java
    incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/report/format/JSONFormat.java
    incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/report/format/MapFormat.java
    incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/report/format/XMLFormat.java
    incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/thread/ThreadEndpoints.java
    incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/thread/ThreadPlugin.java
    incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/web/WebEndpoints.java
    incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/web/WebPlugin.java
    incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/registration/MonitoringReportingInitializer.java
    incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/template/MapBuilder.java
    incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/template/Templates.java
    incubator/sirona/trunk/reporting/src/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer
    incubator/sirona/trunk/reporting/src/main/webapp/WEB-INF/web.xml
    incubator/sirona/trunk/reporting/src/test/java/org/apache/sirona/reporting/template/CounterDetailTemplateTest.java
    incubator/sirona/trunk/spring/src/test/java/org/apache/sirona/spring/service/MyService.java
    incubator/sirona/trunk/spring/src/test/resources/monitoring.xml
    incubator/sirona/trunk/src/site/markdown/basis.md
    incubator/sirona/trunk/src/site/markdown/collector.md
    incubator/sirona/trunk/src/site/markdown/configuration.md
    incubator/sirona/trunk/src/site/markdown/cube.md
    incubator/sirona/trunk/src/site/markdown/graphite.md
    incubator/sirona/trunk/src/site/markdown/instrumentation.md
    incubator/sirona/trunk/src/site/markdown/jpa.md
    incubator/sirona/trunk/src/site/markdown/jta.md
    incubator/sirona/trunk/src/site/markdown/plugins.md
    incubator/sirona/trunk/src/site/markdown/reporting.md
    incubator/sirona/trunk/src/site/markdown/web.md
    incubator/sirona/trunk/web/src/main/java/org/apache/sirona/web/discovery/GaugeDiscoveryListener.java
    incubator/sirona/trunk/web/src/main/java/org/apache/sirona/web/jsp/StartTag.java
    incubator/sirona/trunk/web/src/main/java/org/apache/sirona/web/jsp/StartTagTei.java
    incubator/sirona/trunk/web/src/main/java/org/apache/sirona/web/jsp/StopTag.java
    incubator/sirona/trunk/web/src/main/java/org/apache/sirona/web/jsp/TagUtils.java
    incubator/sirona/trunk/web/src/main/java/org/apache/sirona/web/lifecycle/CommonsMonitoringLifecycle.java
    incubator/sirona/trunk/web/src/main/java/org/apache/sirona/web/registration/WebMonitoringInitializer.java
    incubator/sirona/trunk/web/src/main/java/org/apache/sirona/web/servlet/MonitoringFilter.java
    incubator/sirona/trunk/web/src/main/java/org/apache/sirona/web/session/MonitoringSessionListener.java
    incubator/sirona/trunk/web/src/main/java/org/apache/sirona/web/session/SessionGauge.java
    incubator/sirona/trunk/web/src/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer

Copied: incubator/sirona/trunk/aop/src/main/java/org/apache/sirona/aop/AbstractPerformanceInterceptor.java (from r1534560, incubator/sirona/trunk/aop/src/main/java/org/apache/commons/monitoring/aop/AbstractPerformanceInterceptor.java)
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/aop/src/main/java/org/apache/sirona/aop/AbstractPerformanceInterceptor.java?p2=incubator/sirona/trunk/aop/src/main/java/org/apache/sirona/aop/AbstractPerformanceInterceptor.java&p1=incubator/sirona/trunk/aop/src/main/java/org/apache/commons/monitoring/aop/AbstractPerformanceInterceptor.java&r1=1534560&r2=1534581&rev=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/aop/src/main/java/org/apache/commons/monitoring/aop/AbstractPerformanceInterceptor.java (original)
+++ incubator/sirona/trunk/aop/src/main/java/org/apache/sirona/aop/AbstractPerformanceInterceptor.java Tue Oct 22 10:03:02 2013
@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-package org.apache.commons.monitoring.aop;
+package org.apache.sirona.aop;
 
-import org.apache.commons.monitoring.Role;
-import org.apache.commons.monitoring.counters.Counter;
-import org.apache.commons.monitoring.repositories.Repository;
-import org.apache.commons.monitoring.stopwatches.StopWatch;
+import org.apache.sirona.Role;
+import org.apache.sirona.counters.Counter;
+import org.apache.sirona.repositories.Repository;
+import org.apache.sirona.stopwatches.StopWatch;
 
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;

Copied: incubator/sirona/trunk/aop/src/main/java/org/apache/sirona/aop/DefaultMonitorNameExtractor.java (from r1534560, incubator/sirona/trunk/aop/src/main/java/org/apache/commons/monitoring/aop/DefaultMonitorNameExtractor.java)
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/aop/src/main/java/org/apache/sirona/aop/DefaultMonitorNameExtractor.java?p2=incubator/sirona/trunk/aop/src/main/java/org/apache/sirona/aop/DefaultMonitorNameExtractor.java&p1=incubator/sirona/trunk/aop/src/main/java/org/apache/commons/monitoring/aop/DefaultMonitorNameExtractor.java&r1=1534560&r2=1534581&rev=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/aop/src/main/java/org/apache/commons/monitoring/aop/DefaultMonitorNameExtractor.java (original)
+++ incubator/sirona/trunk/aop/src/main/java/org/apache/sirona/aop/DefaultMonitorNameExtractor.java Tue Oct 22 10:03:02 2013
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.monitoring.aop;
+package org.apache.sirona.aop;
 
 import java.lang.reflect.Method;
 

Copied: incubator/sirona/trunk/aop/src/main/java/org/apache/sirona/aop/MonitorNameExtractor.java (from r1534560, incubator/sirona/trunk/aop/src/main/java/org/apache/commons/monitoring/aop/MonitorNameExtractor.java)
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/aop/src/main/java/org/apache/sirona/aop/MonitorNameExtractor.java?p2=incubator/sirona/trunk/aop/src/main/java/org/apache/sirona/aop/MonitorNameExtractor.java&p1=incubator/sirona/trunk/aop/src/main/java/org/apache/commons/monitoring/aop/MonitorNameExtractor.java&r1=1534560&r2=1534581&rev=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/aop/src/main/java/org/apache/commons/monitoring/aop/MonitorNameExtractor.java (original)
+++ incubator/sirona/trunk/aop/src/main/java/org/apache/sirona/aop/MonitorNameExtractor.java Tue Oct 22 10:03:02 2013
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.monitoring.aop;
+package org.apache.sirona.aop;
 
 import java.lang.reflect.Method;
 

Copied: incubator/sirona/trunk/aop/src/main/java/org/apache/sirona/aop/MonitoringProxyFactory.java (from r1534560, incubator/sirona/trunk/aop/src/main/java/org/apache/commons/monitoring/aop/MonitoringProxyFactory.java)
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/aop/src/main/java/org/apache/sirona/aop/MonitoringProxyFactory.java?p2=incubator/sirona/trunk/aop/src/main/java/org/apache/sirona/aop/MonitoringProxyFactory.java&p1=incubator/sirona/trunk/aop/src/main/java/org/apache/commons/monitoring/aop/MonitoringProxyFactory.java&r1=1534560&r2=1534581&rev=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/aop/src/main/java/org/apache/commons/monitoring/aop/MonitoringProxyFactory.java (original)
+++ incubator/sirona/trunk/aop/src/main/java/org/apache/sirona/aop/MonitoringProxyFactory.java Tue Oct 22 10:03:02 2013
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.monitoring.aop;
+package org.apache.sirona.aop;
 
-import org.apache.commons.monitoring.configuration.Configuration;
-import org.apache.commons.monitoring.util.ClassLoaders;
+import org.apache.sirona.configuration.Configuration;
+import org.apache.sirona.util.ClassLoaders;
 import org.apache.commons.proxy.Invoker;
 import org.apache.commons.proxy.ProxyFactory;
 

Copied: incubator/sirona/trunk/aop/src/test/java/org/apache/sirona/aop/MonitoringProxyFactoryTest.java (from r1534560, incubator/sirona/trunk/aop/src/test/java/org/apache/commons/monitoring/aop/MonitoringProxyFactoryTest.java)
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/aop/src/test/java/org/apache/sirona/aop/MonitoringProxyFactoryTest.java?p2=incubator/sirona/trunk/aop/src/test/java/org/apache/sirona/aop/MonitoringProxyFactoryTest.java&p1=incubator/sirona/trunk/aop/src/test/java/org/apache/commons/monitoring/aop/MonitoringProxyFactoryTest.java&r1=1534560&r2=1534581&rev=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/aop/src/test/java/org/apache/commons/monitoring/aop/MonitoringProxyFactoryTest.java (original)
+++ incubator/sirona/trunk/aop/src/test/java/org/apache/sirona/aop/MonitoringProxyFactoryTest.java Tue Oct 22 10:03:02 2013
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.monitoring.aop;
+package org.apache.sirona.aop;
 
-import org.apache.commons.monitoring.Role;
-import org.apache.commons.monitoring.counters.Counter;
-import org.apache.commons.monitoring.repositories.Repository;
+import org.apache.sirona.Role;
+import org.apache.sirona.counters.Counter;
+import org.apache.sirona.repositories.Repository;
 import org.junit.Test;
 
 import java.util.concurrent.TimeUnit;

Copied: incubator/sirona/trunk/aspectj/src/main/java/org/apache/sirona/aspectj/CommonsMonitoringAspect.java (from r1534560, incubator/sirona/trunk/aspectj/src/main/java/org/apache/commons/monitoring/aspectj/CommonsMonitoringAspect.java)
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/aspectj/src/main/java/org/apache/sirona/aspectj/CommonsMonitoringAspect.java?p2=incubator/sirona/trunk/aspectj/src/main/java/org/apache/sirona/aspectj/CommonsMonitoringAspect.java&p1=incubator/sirona/trunk/aspectj/src/main/java/org/apache/commons/monitoring/aspectj/CommonsMonitoringAspect.java&r1=1534560&r2=1534581&rev=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/aspectj/src/main/java/org/apache/commons/monitoring/aspectj/CommonsMonitoringAspect.java (original)
+++ incubator/sirona/trunk/aspectj/src/main/java/org/apache/sirona/aspectj/CommonsMonitoringAspect.java Tue Oct 22 10:03:02 2013
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.monitoring.aspectj;
+package org.apache.sirona.aspectj;
 
-import org.apache.commons.monitoring.aop.AbstractPerformanceInterceptor;
+import org.apache.sirona.aop.AbstractPerformanceInterceptor;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.Signature;
 import org.aspectj.lang.annotation.Around;

Copied: incubator/sirona/trunk/aspectj/src/test/java/org/apache/sirona/aspectj/AspectJMonitoringTest.java (from r1534560, incubator/sirona/trunk/aspectj/src/test/java/org/apache/commons/monitoring/aspectj/AspectJMonitoringTest.java)
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/aspectj/src/test/java/org/apache/sirona/aspectj/AspectJMonitoringTest.java?p2=incubator/sirona/trunk/aspectj/src/test/java/org/apache/sirona/aspectj/AspectJMonitoringTest.java&p1=incubator/sirona/trunk/aspectj/src/test/java/org/apache/commons/monitoring/aspectj/AspectJMonitoringTest.java&r1=1534560&r2=1534581&rev=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/aspectj/src/test/java/org/apache/commons/monitoring/aspectj/AspectJMonitoringTest.java (original)
+++ incubator/sirona/trunk/aspectj/src/test/java/org/apache/sirona/aspectj/AspectJMonitoringTest.java Tue Oct 22 10:03:02 2013
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.monitoring.aspectj;
+package org.apache.sirona.aspectj;
 
-import org.apache.commons.monitoring.Role;
-import org.apache.commons.monitoring.counters.Counter;
-import org.apache.commons.monitoring.repositories.Repository;
+import org.apache.sirona.Role;
+import org.apache.sirona.counters.Counter;
+import org.apache.sirona.repositories.Repository;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
@@ -27,7 +27,7 @@ public class AspectJMonitoringTest {
     @Test
     public void monitor() {
         new MonitorMe().foo();
-        assertEquals(1, Repository.INSTANCE.getCounter(new Counter.Key(Role.PERFORMANCES, "org.apache.commons.monitoring.aspectj.AspectJMonitoringTest$MonitorMe.foo")).getHits());
+        assertEquals(1, Repository.INSTANCE.getCounter(new Counter.Key(Role.PERFORMANCES, getClass().getName() + "$MonitorMe.foo")).getHits());
     }
 
     public static class MonitorMe {

Modified: incubator/sirona/trunk/aspectj/src/test/resources/META-INF/aop.xml
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/aspectj/src/test/resources/META-INF/aop.xml?rev=1534581&r1=1534580&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/aspectj/src/test/resources/META-INF/aop.xml (original)
+++ incubator/sirona/trunk/aspectj/src/test/resources/META-INF/aop.xml Tue Oct 22 10:03:02 2013
@@ -17,13 +17,13 @@
 -->
 <aspectj>
   <aspects>
-    <concrete-aspect name="org.apache.commons.aspectj.MyMonitoringAspectJ"
-                     extends="org.apache.commons.monitoring.aspectj.CommonsMonitoringAspect">
-      <pointcut name="pointcut" expression="execution(* org.apache.commons.monitoring.aspectj.AspectJMonitoringTest$MonitorMe.*(..))"/>
+    <concrete-aspect name="org.apache.sirona.aspectj.MyMonitoringAspectJ"
+                     extends="org.apache.sirona.aspectj.CommonsMonitoringAspect">
+      <pointcut name="pointcut" expression="execution(* org.apache.sirona.aspectj.AspectJMonitoringTest$MonitorMe.*(..))"/>
     </concrete-aspect>
   </aspects>
 
   <weaver>
-    <include within="org.apache.commons.monitoring.aspectj.AspectJMonitoringTest$MonitorMe"/>
+    <include within="org.apache.sirona.aspectj.AspectJMonitoringTest$MonitorMe"/>
   </weaver>
 </aspectj>

Copied: incubator/sirona/trunk/cdi/src/main/java/org/apache/sirona/cdi/CommonsMonitoringInterceptor.java (from r1534560, incubator/sirona/trunk/cdi/src/main/java/org/apache/commons/monitoring/cdi/CommonsMonitoringInterceptor.java)
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/cdi/src/main/java/org/apache/sirona/cdi/CommonsMonitoringInterceptor.java?p2=incubator/sirona/trunk/cdi/src/main/java/org/apache/sirona/cdi/CommonsMonitoringInterceptor.java&p1=incubator/sirona/trunk/cdi/src/main/java/org/apache/commons/monitoring/cdi/CommonsMonitoringInterceptor.java&r1=1534560&r2=1534581&rev=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/cdi/src/main/java/org/apache/commons/monitoring/cdi/CommonsMonitoringInterceptor.java (original)
+++ incubator/sirona/trunk/cdi/src/main/java/org/apache/sirona/cdi/CommonsMonitoringInterceptor.java Tue Oct 22 10:03:02 2013
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.monitoring.cdi;
+package org.apache.sirona.cdi;
 
-import org.apache.commons.monitoring.aop.AbstractPerformanceInterceptor;
+import org.apache.sirona.aop.AbstractPerformanceInterceptor;
 
 import javax.interceptor.AroundInvoke;
 import javax.interceptor.AroundTimeout;

Copied: incubator/sirona/trunk/cdi/src/main/java/org/apache/sirona/cdi/Monitored.java (from r1534560, incubator/sirona/trunk/cdi/src/main/java/org/apache/commons/monitoring/cdi/Monitored.java)
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/cdi/src/main/java/org/apache/sirona/cdi/Monitored.java?p2=incubator/sirona/trunk/cdi/src/main/java/org/apache/sirona/cdi/Monitored.java&p1=incubator/sirona/trunk/cdi/src/main/java/org/apache/commons/monitoring/cdi/Monitored.java&r1=1534560&r2=1534581&rev=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/cdi/src/main/java/org/apache/commons/monitoring/cdi/Monitored.java (original)
+++ incubator/sirona/trunk/cdi/src/main/java/org/apache/sirona/cdi/Monitored.java Tue Oct 22 10:03:02 2013
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.monitoring.cdi;
+package org.apache.sirona.cdi;
 
 import javax.interceptor.InterceptorBinding;
 import java.lang.annotation.ElementType;

Modified: incubator/sirona/trunk/cdi/src/main/java/org/apache/sirona/cdi/internal/CommonsMonitoringPerformanceExtension.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/cdi/src/main/java/org/apache/sirona/cdi/internal/CommonsMonitoringPerformanceExtension.java?rev=1534581&r1=1534560&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/cdi/src/main/java/org/apache/sirona/cdi/internal/CommonsMonitoringPerformanceExtension.java (original)
+++ incubator/sirona/trunk/cdi/src/main/java/org/apache/sirona/cdi/internal/CommonsMonitoringPerformanceExtension.java Tue Oct 22 10:03:02 2013
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.monitoring.cdi.internal;
+package org.apache.sirona.cdi.internal;
 
-import org.apache.commons.monitoring.cdi.Monitored;
-import org.apache.commons.monitoring.configuration.Configuration;
-import org.apache.commons.monitoring.util.ClassLoaders;
+import org.apache.sirona.cdi.Monitored;
+import org.apache.sirona.configuration.Configuration;
+import org.apache.sirona.util.ClassLoaders;
 
 import javax.enterprise.event.Observes;
 import javax.enterprise.inject.spi.Extension;
@@ -64,8 +64,8 @@ public class CommonsMonitoringPerformanc
 
                 if (PERFORMANCE_MARKER.equals(config)) {
                     wrapper.getAnnotations().add(binding);
-                } else { // convention is from <name> the binding is org.apache.commons.monitoring.<lowercase(name)>.<uppercase(name)>Monitored, ex: jta
-                    final String deducedName = "org.apache.commons.monitoring." + config.toLowerCase(Locale.ENGLISH) + "." + config.toUpperCase(Locale.ENGLISH) + "Monitored";
+                } else { // convention is from <name> the binding is org.apache.sirona.<lowercase(name)>.<uppercase(name)>Monitored, ex: jta
+                    final String deducedName = "org.apache.sirona." + config.toLowerCase(Locale.ENGLISH) + "." + config.toUpperCase(Locale.ENGLISH) + "Monitored";
                     try {
                         final Class<? extends Annotation> annotationType = Class.class.cast(ClassLoaders.current().loadClass(deducedName));
                         Annotation instance = otherBindings.get(annotationType);

Modified: incubator/sirona/trunk/cdi/src/main/java/org/apache/sirona/cdi/internal/WrappedAnnotatedType.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/cdi/src/main/java/org/apache/sirona/cdi/internal/WrappedAnnotatedType.java?rev=1534581&r1=1534560&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/cdi/src/main/java/org/apache/sirona/cdi/internal/WrappedAnnotatedType.java (original)
+++ incubator/sirona/trunk/cdi/src/main/java/org/apache/sirona/cdi/internal/WrappedAnnotatedType.java Tue Oct 22 10:03:02 2013
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.monitoring.cdi.internal;
+package org.apache.sirona.cdi.internal;
 
 import javax.enterprise.inject.spi.AnnotatedConstructor;
 import javax.enterprise.inject.spi.AnnotatedField;

Modified: incubator/sirona/trunk/cdi/src/main/resources/META-INF/beans.xml
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/cdi/src/main/resources/META-INF/beans.xml?rev=1534581&r1=1534580&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/cdi/src/main/resources/META-INF/beans.xml (original)
+++ incubator/sirona/trunk/cdi/src/main/resources/META-INF/beans.xml Tue Oct 22 10:03:02 2013
@@ -21,6 +21,6 @@
        xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
                             http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
   <interceptors>
-    <class>org.apache.commons.monitoring.cdi.CommonsMonitoringInterceptor</class>
+    <class>org.apache.sirona.cdi.CommonsMonitoringInterceptor</class>
   </interceptors>
 </beans>

Modified: incubator/sirona/trunk/cdi/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/cdi/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension?rev=1534581&r1=1534580&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/cdi/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension (original)
+++ incubator/sirona/trunk/cdi/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension Tue Oct 22 10:03:02 2013
@@ -1 +1 @@
-org.apache.commons.monitoring.cdi.internal.CommonsMonitoringPerformanceExtension
+org.apache.sirona.cdi.internal.CommonsMonitoringPerformanceExtension

Copied: incubator/sirona/trunk/cdi/src/test/java/org/apache/sirona/cdi/CommonsMonitoringExtensionTest.java (from r1534560, incubator/sirona/trunk/cdi/src/test/java/org/apache/commons/monitoring/cdi/CommonsMonitoringExtensionTest.java)
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/cdi/src/test/java/org/apache/sirona/cdi/CommonsMonitoringExtensionTest.java?p2=incubator/sirona/trunk/cdi/src/test/java/org/apache/sirona/cdi/CommonsMonitoringExtensionTest.java&p1=incubator/sirona/trunk/cdi/src/test/java/org/apache/commons/monitoring/cdi/CommonsMonitoringExtensionTest.java&r1=1534560&r2=1534581&rev=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/cdi/src/test/java/org/apache/commons/monitoring/cdi/CommonsMonitoringExtensionTest.java (original)
+++ incubator/sirona/trunk/cdi/src/test/java/org/apache/sirona/cdi/CommonsMonitoringExtensionTest.java Tue Oct 22 10:03:02 2013
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.monitoring.cdi;
+package org.apache.sirona.cdi;
 
 import javax.enterprise.context.ApplicationScoped;
 

Copied: incubator/sirona/trunk/cdi/src/test/java/org/apache/sirona/cdi/CommonsMonitoringExtensionTestBase.java (from r1534560, incubator/sirona/trunk/cdi/src/test/java/org/apache/commons/monitoring/cdi/CommonsMonitoringExtensionTestBase.java)
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/cdi/src/test/java/org/apache/sirona/cdi/CommonsMonitoringExtensionTestBase.java?p2=incubator/sirona/trunk/cdi/src/test/java/org/apache/sirona/cdi/CommonsMonitoringExtensionTestBase.java&p1=incubator/sirona/trunk/cdi/src/test/java/org/apache/commons/monitoring/cdi/CommonsMonitoringExtensionTestBase.java&r1=1534560&r2=1534581&rev=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/cdi/src/test/java/org/apache/commons/monitoring/cdi/CommonsMonitoringExtensionTestBase.java (original)
+++ incubator/sirona/trunk/cdi/src/test/java/org/apache/sirona/cdi/CommonsMonitoringExtensionTestBase.java Tue Oct 22 10:03:02 2013
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.monitoring.cdi;
+package org.apache.sirona.cdi;
 
-import org.apache.commons.monitoring.Role;
-import org.apache.commons.monitoring.counters.Counter;
-import org.apache.commons.monitoring.repositories.Repository;
+import org.apache.sirona.Role;
+import org.apache.sirona.counters.Counter;
+import org.apache.sirona.repositories.Repository;
 import org.apache.webbeans.cditest.CdiTestContainer;
 import org.apache.webbeans.cditest.CdiTestContainerLoader;
 import org.junit.Test;

Copied: incubator/sirona/trunk/cdi/src/test/java/org/apache/sirona/cdi/CommonsMonitoringInterceptorTest.java (from r1534560, incubator/sirona/trunk/cdi/src/test/java/org/apache/commons/monitoring/cdi/CommonsMonitoringInterceptorTest.java)
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/cdi/src/test/java/org/apache/sirona/cdi/CommonsMonitoringInterceptorTest.java?p2=incubator/sirona/trunk/cdi/src/test/java/org/apache/sirona/cdi/CommonsMonitoringInterceptorTest.java&p1=incubator/sirona/trunk/cdi/src/test/java/org/apache/commons/monitoring/cdi/CommonsMonitoringInterceptorTest.java&r1=1534560&r2=1534581&rev=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/cdi/src/test/java/org/apache/commons/monitoring/cdi/CommonsMonitoringInterceptorTest.java (original)
+++ incubator/sirona/trunk/cdi/src/test/java/org/apache/sirona/cdi/CommonsMonitoringInterceptorTest.java Tue Oct 22 10:03:02 2013
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.monitoring.cdi;
+package org.apache.sirona.cdi;
 
 import javax.enterprise.context.ApplicationScoped;
 

Modified: incubator/sirona/trunk/cdi/src/test/resources/commons-monitoring.properties
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/cdi/src/test/resources/commons-monitoring.properties?rev=1534581&r1=1534580&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/cdi/src/test/resources/commons-monitoring.properties (original)
+++ incubator/sirona/trunk/cdi/src/test/resources/commons-monitoring.properties Tue Oct 22 10:03:02 2013
@@ -14,4 +14,4 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-org.apache.commons.monitoring.cdi.CommonsMonitoringExtensionTest$AutoMonitoredBean.cdi = performance
+org.apache.sirona.cdi.CommonsMonitoringExtensionTest$AutoMonitoredBean.cdi = performance

Copied: incubator/sirona/trunk/collector/src/main/java/org/apache/sirona/collector/server/Collector.java (from r1534560, incubator/sirona/trunk/collector/src/main/java/org/apache/commons/monitoring/collector/server/Collector.java)
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/collector/src/main/java/org/apache/sirona/collector/server/Collector.java?p2=incubator/sirona/trunk/collector/src/main/java/org/apache/sirona/collector/server/Collector.java&p1=incubator/sirona/trunk/collector/src/main/java/org/apache/commons/monitoring/collector/server/Collector.java&r1=1534560&r2=1534581&rev=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/collector/src/main/java/org/apache/commons/monitoring/collector/server/Collector.java (original)
+++ incubator/sirona/trunk/collector/src/main/java/org/apache/sirona/collector/server/Collector.java Tue Oct 22 10:03:02 2013
@@ -14,22 +14,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.monitoring.collector.server;
+package org.apache.sirona.collector.server;
 
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.apache.commons.monitoring.Role;
-import org.apache.commons.monitoring.collector.server.math.M2AwareStatisticalSummary;
-import org.apache.commons.monitoring.collector.server.store.counter.CollectorCounterStore;
-import org.apache.commons.monitoring.collector.server.store.gauge.CollectorGaugeStore;
-import org.apache.commons.monitoring.configuration.Configuration;
-import org.apache.commons.monitoring.counters.Counter;
-import org.apache.commons.monitoring.counters.Unit;
-import org.apache.commons.monitoring.store.CounterDataStore;
-import org.apache.commons.monitoring.store.GaugeDataStore;
-import org.apache.commons.monitoring.store.InMemoryGaugeDataStore;
-import sun.misc.IOUtils;
+import org.apache.sirona.Role;
+import org.apache.sirona.collector.server.math.M2AwareStatisticalSummary;
+import org.apache.sirona.collector.server.store.counter.CollectorCounterStore;
+import org.apache.sirona.collector.server.store.gauge.CollectorGaugeStore;
+import org.apache.sirona.configuration.Configuration;
+import org.apache.sirona.counters.Counter;
+import org.apache.sirona.counters.Unit;
+import org.apache.sirona.store.CounterDataStore;
+import org.apache.sirona.store.GaugeDataStore;
+import org.apache.sirona.store.InMemoryGaugeDataStore;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;

Copied: incubator/sirona/trunk/collector/src/main/java/org/apache/sirona/collector/server/Event.java (from r1534560, incubator/sirona/trunk/collector/src/main/java/org/apache/commons/monitoring/collector/server/Event.java)
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/collector/src/main/java/org/apache/sirona/collector/server/Event.java?p2=incubator/sirona/trunk/collector/src/main/java/org/apache/sirona/collector/server/Event.java&p1=incubator/sirona/trunk/collector/src/main/java/org/apache/commons/monitoring/collector/server/Event.java&r1=1534560&r2=1534581&rev=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/collector/src/main/java/org/apache/commons/monitoring/collector/server/Event.java (original)
+++ incubator/sirona/trunk/collector/src/main/java/org/apache/sirona/collector/server/Event.java Tue Oct 22 10:03:02 2013
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.monitoring.collector.server;
+package org.apache.sirona.collector.server;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;

Modified: incubator/sirona/trunk/collector/src/main/java/org/apache/sirona/collector/server/math/Aggregators.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/collector/src/main/java/org/apache/sirona/collector/server/math/Aggregators.java?rev=1534581&r1=1534560&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/collector/src/main/java/org/apache/sirona/collector/server/math/Aggregators.java (original)
+++ incubator/sirona/trunk/collector/src/main/java/org/apache/sirona/collector/server/math/Aggregators.java Tue Oct 22 10:03:02 2013
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.monitoring.collector.server.math;
+package org.apache.sirona.collector.server.math;
 
-import org.apache.commons.monitoring.collector.server.store.counter.LeafCollectorCounter;
+import org.apache.sirona.collector.server.store.counter.LeafCollectorCounter;
 
 import java.util.Collection;
 import java.util.Iterator;

Modified: incubator/sirona/trunk/collector/src/main/java/org/apache/sirona/collector/server/math/M2AwareStatisticalSummary.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/collector/src/main/java/org/apache/sirona/collector/server/math/M2AwareStatisticalSummary.java?rev=1534581&r1=1534560&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/collector/src/main/java/org/apache/sirona/collector/server/math/M2AwareStatisticalSummary.java (original)
+++ incubator/sirona/trunk/collector/src/main/java/org/apache/sirona/collector/server/math/M2AwareStatisticalSummary.java Tue Oct 22 10:03:02 2013
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.monitoring.collector.server.math;
+package org.apache.sirona.collector.server.math;
 
 import java.util.Map;
 

Modified: incubator/sirona/trunk/collector/src/main/java/org/apache/sirona/collector/server/store/CollectorDataStoreFactory.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/collector/src/main/java/org/apache/sirona/collector/server/store/CollectorDataStoreFactory.java?rev=1534581&r1=1534560&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/collector/src/main/java/org/apache/sirona/collector/server/store/CollectorDataStoreFactory.java (original)
+++ incubator/sirona/trunk/collector/src/main/java/org/apache/sirona/collector/server/store/CollectorDataStoreFactory.java Tue Oct 22 10:03:02 2013
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.monitoring.collector.server.store;
+package org.apache.sirona.collector.server.store;
 
-import org.apache.commons.monitoring.collector.server.store.counter.InMemoryCollectorCounterStore;
-import org.apache.commons.monitoring.collector.server.store.gauge.CollectorGaugeStore;
-import org.apache.commons.monitoring.store.DelegateDataStoreFactory;
+import org.apache.sirona.collector.server.store.counter.InMemoryCollectorCounterStore;
+import org.apache.sirona.collector.server.store.gauge.CollectorGaugeStore;
+import org.apache.sirona.store.DelegateDataStoreFactory;
 
 public class CollectorDataStoreFactory extends DelegateDataStoreFactory {
     public CollectorDataStoreFactory() {

Modified: incubator/sirona/trunk/collector/src/main/java/org/apache/sirona/collector/server/store/counter/AggregatedCollectorCounter.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/collector/src/main/java/org/apache/sirona/collector/server/store/counter/AggregatedCollectorCounter.java?rev=1534581&r1=1534560&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/collector/src/main/java/org/apache/sirona/collector/server/store/counter/AggregatedCollectorCounter.java (original)
+++ incubator/sirona/trunk/collector/src/main/java/org/apache/sirona/collector/server/store/counter/AggregatedCollectorCounter.java Tue Oct 22 10:03:02 2013
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.monitoring.collector.server.store.counter;
+package org.apache.sirona.collector.server.store.counter;
 
-import org.apache.commons.monitoring.collector.server.math.Aggregators;
-import org.apache.commons.monitoring.counters.AggregatedCounter;
-import org.apache.commons.monitoring.counters.Counter;
+import org.apache.sirona.collector.server.math.Aggregators;
+import org.apache.sirona.counters.AggregatedCounter;
+import org.apache.sirona.counters.Counter;
 
 import java.util.Collection;
 import java.util.Map;

Modified: incubator/sirona/trunk/collector/src/main/java/org/apache/sirona/collector/server/store/counter/CollectorCounter.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/collector/src/main/java/org/apache/sirona/collector/server/store/counter/CollectorCounter.java?rev=1534581&r1=1534560&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/collector/src/main/java/org/apache/sirona/collector/server/store/counter/CollectorCounter.java (original)
+++ incubator/sirona/trunk/collector/src/main/java/org/apache/sirona/collector/server/store/counter/CollectorCounter.java Tue Oct 22 10:03:02 2013
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.monitoring.collector.server.store.counter;
+package org.apache.sirona.collector.server.store.counter;
 
-import org.apache.commons.monitoring.collector.server.math.M2AwareStatisticalSummary;
-import org.apache.commons.monitoring.counters.Counter;
-import org.apache.commons.monitoring.counters.Unit;
+import org.apache.sirona.collector.server.math.M2AwareStatisticalSummary;
+import org.apache.sirona.counters.Counter;
+import org.apache.sirona.counters.Unit;
 
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.locks.Lock;

Modified: incubator/sirona/trunk/collector/src/main/java/org/apache/sirona/collector/server/store/counter/CollectorCounterStore.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/collector/src/main/java/org/apache/sirona/collector/server/store/counter/CollectorCounterStore.java?rev=1534581&r1=1534560&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/collector/src/main/java/org/apache/sirona/collector/server/store/counter/CollectorCounterStore.java (original)
+++ incubator/sirona/trunk/collector/src/main/java/org/apache/sirona/collector/server/store/counter/CollectorCounterStore.java Tue Oct 22 10:03:02 2013
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.monitoring.collector.server.store.counter;
+package org.apache.sirona.collector.server.store.counter;
 
-import org.apache.commons.monitoring.collector.server.math.M2AwareStatisticalSummary;
-import org.apache.commons.monitoring.counters.Counter;
-import org.apache.commons.monitoring.store.CounterDataStore;
+import org.apache.sirona.collector.server.math.M2AwareStatisticalSummary;
+import org.apache.sirona.counters.Counter;
+import org.apache.sirona.store.CounterDataStore;
 
 import java.util.Collection;
 

Modified: incubator/sirona/trunk/collector/src/main/java/org/apache/sirona/collector/server/store/counter/InMemoryCollectorCounterStore.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/collector/src/main/java/org/apache/sirona/collector/server/store/counter/InMemoryCollectorCounterStore.java?rev=1534581&r1=1534560&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/collector/src/main/java/org/apache/sirona/collector/server/store/counter/InMemoryCollectorCounterStore.java (original)
+++ incubator/sirona/trunk/collector/src/main/java/org/apache/sirona/collector/server/store/counter/InMemoryCollectorCounterStore.java Tue Oct 22 10:03:02 2013
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.monitoring.collector.server.store.counter;
+package org.apache.sirona.collector.server.store.counter;
 
-import org.apache.commons.monitoring.collector.server.math.M2AwareStatisticalSummary;
-import org.apache.commons.monitoring.counters.Counter;
-import org.apache.commons.monitoring.store.InMemoryCounterDataStore;
+import org.apache.sirona.collector.server.math.M2AwareStatisticalSummary;
+import org.apache.sirona.counters.Counter;
+import org.apache.sirona.store.InMemoryCounterDataStore;
 
 import java.util.Collection;
 import java.util.Map;

Modified: incubator/sirona/trunk/collector/src/main/java/org/apache/sirona/collector/server/store/counter/LeafCollectorCounter.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/collector/src/main/java/org/apache/sirona/collector/server/store/counter/LeafCollectorCounter.java?rev=1534581&r1=1534560&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/collector/src/main/java/org/apache/sirona/collector/server/store/counter/LeafCollectorCounter.java (original)
+++ incubator/sirona/trunk/collector/src/main/java/org/apache/sirona/collector/server/store/counter/LeafCollectorCounter.java Tue Oct 22 10:03:02 2013
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.monitoring.collector.server.store.counter;
+package org.apache.sirona.collector.server.store.counter;
 
-import org.apache.commons.monitoring.collector.server.math.M2AwareStatisticalSummary;
-import org.apache.commons.monitoring.counters.Counter;
+import org.apache.sirona.collector.server.math.M2AwareStatisticalSummary;
+import org.apache.sirona.counters.Counter;
 
 import java.util.concurrent.locks.Lock;
 

Modified: incubator/sirona/trunk/collector/src/main/java/org/apache/sirona/collector/server/store/gauge/CollectorGaugeStore.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/collector/src/main/java/org/apache/sirona/collector/server/store/gauge/CollectorGaugeStore.java?rev=1534581&r1=1534560&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/collector/src/main/java/org/apache/sirona/collector/server/store/gauge/CollectorGaugeStore.java (original)
+++ incubator/sirona/trunk/collector/src/main/java/org/apache/sirona/collector/server/store/gauge/CollectorGaugeStore.java Tue Oct 22 10:03:02 2013
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.monitoring.collector.server.store.gauge;
+package org.apache.sirona.collector.server.store.gauge;
 
-import org.apache.commons.monitoring.MonitoringException;
-import org.apache.commons.monitoring.Role;
-import org.apache.commons.monitoring.configuration.Configuration;
-import org.apache.commons.monitoring.store.GaugeDataStore;
-import org.apache.commons.monitoring.store.GaugeValuesRequest;
-import org.apache.commons.monitoring.store.InMemoryGaugeDataStore;
+import org.apache.sirona.MonitoringException;
+import org.apache.sirona.Role;
+import org.apache.sirona.configuration.Configuration;
+import org.apache.sirona.store.GaugeDataStore;
+import org.apache.sirona.store.GaugeValuesRequest;
+import org.apache.sirona.store.InMemoryGaugeDataStore;
 
 import java.lang.reflect.Constructor;
 import java.util.Collection;

Copied: incubator/sirona/trunk/collector/src/test/java/org/apache/sirona/collector/server/CollectorServer.java (from r1534560, incubator/sirona/trunk/collector/src/test/java/org/apache/commons/monitoring/collector/server/CollectorServer.java)
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/collector/src/test/java/org/apache/sirona/collector/server/CollectorServer.java?p2=incubator/sirona/trunk/collector/src/test/java/org/apache/sirona/collector/server/CollectorServer.java&p1=incubator/sirona/trunk/collector/src/test/java/org/apache/commons/monitoring/collector/server/CollectorServer.java&r1=1534560&r2=1534581&rev=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/collector/src/test/java/org/apache/commons/monitoring/collector/server/CollectorServer.java (original)
+++ incubator/sirona/trunk/collector/src/test/java/org/apache/sirona/collector/server/CollectorServer.java Tue Oct 22 10:03:02 2013
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.monitoring.collector.server;
+package org.apache.sirona.collector.server;
 
 import io.netty.bootstrap.ServerBootstrap;
 import io.netty.channel.ChannelFuture;
@@ -36,6 +36,7 @@ import io.netty.handler.codec.http.HttpR
 import io.netty.handler.codec.http.HttpResponseStatus;
 import io.netty.handler.codec.http.HttpVersion;
 import io.netty.handler.stream.ChunkedWriteHandler;
+import org.apache.sirona.collector.server.Collector;
 
 import javax.servlet.ServletInputStream;
 import javax.servlet.http.HttpServletRequest;

Copied: incubator/sirona/trunk/collector/src/test/java/org/apache/sirona/collector/server/CubeDataStoreCompatibilityTest.java (from r1534560, incubator/sirona/trunk/collector/src/test/java/org/apache/commons/monitoring/collector/server/CubeDataStoreCompatibilityTest.java)
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/collector/src/test/java/org/apache/sirona/collector/server/CubeDataStoreCompatibilityTest.java?p2=incubator/sirona/trunk/collector/src/test/java/org/apache/sirona/collector/server/CubeDataStoreCompatibilityTest.java&p1=incubator/sirona/trunk/collector/src/test/java/org/apache/commons/monitoring/collector/server/CubeDataStoreCompatibilityTest.java&r1=1534560&r2=1534581&rev=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/collector/src/test/java/org/apache/commons/monitoring/collector/server/CubeDataStoreCompatibilityTest.java (original)
+++ incubator/sirona/trunk/collector/src/test/java/org/apache/sirona/collector/server/CubeDataStoreCompatibilityTest.java Tue Oct 22 10:03:02 2013
@@ -14,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.monitoring.collector.server;
+package org.apache.sirona.collector.server;
 
-import org.apache.commons.monitoring.Role;
-import org.apache.commons.monitoring.collector.server.store.counter.CollectorCounterStore;
-import org.apache.commons.monitoring.configuration.Configuration;
-import org.apache.commons.monitoring.counters.Counter;
-import org.apache.commons.monitoring.counters.Unit;
-import org.apache.commons.monitoring.cube.CubeCounterDataStore;
-import org.apache.commons.monitoring.repositories.Repository;
-import org.apache.commons.monitoring.store.CounterDataStore;
+import org.apache.sirona.Role;
+import org.apache.sirona.collector.server.store.counter.CollectorCounterStore;
+import org.apache.sirona.configuration.Configuration;
+import org.apache.sirona.counters.Counter;
+import org.apache.sirona.counters.Unit;
+import org.apache.sirona.cube.CubeCounterDataStore;
+import org.apache.sirona.repositories.Repository;
+import org.apache.sirona.store.CounterDataStore;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;

Copied: incubator/sirona/trunk/collector/src/test/java/org/apache/sirona/collector/server/HttpCollectorTest.java (from r1534560, incubator/sirona/trunk/collector/src/test/java/org/apache/commons/monitoring/collector/server/HttpCollectorTest.java)
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/collector/src/test/java/org/apache/sirona/collector/server/HttpCollectorTest.java?p2=incubator/sirona/trunk/collector/src/test/java/org/apache/sirona/collector/server/HttpCollectorTest.java&p1=incubator/sirona/trunk/collector/src/test/java/org/apache/commons/monitoring/collector/server/HttpCollectorTest.java&r1=1534560&r2=1534581&rev=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/collector/src/test/java/org/apache/commons/monitoring/collector/server/HttpCollectorTest.java (original)
+++ incubator/sirona/trunk/collector/src/test/java/org/apache/sirona/collector/server/HttpCollectorTest.java Tue Oct 22 10:03:02 2013
@@ -14,16 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.monitoring.collector.server;
+package org.apache.sirona.collector.server;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.apache.commons.monitoring.Role;
-import org.apache.commons.monitoring.collector.server.store.counter.CollectorCounterStore;
-import org.apache.commons.monitoring.configuration.Configuration;
-import org.apache.commons.monitoring.counters.Counter;
-import org.apache.commons.monitoring.counters.Unit;
-import org.apache.commons.monitoring.repositories.Repository;
-import org.apache.commons.monitoring.store.CounterDataStore;
+import org.apache.sirona.Role;
+import org.apache.sirona.collector.server.Event;
+import org.apache.sirona.collector.server.store.counter.CollectorCounterStore;
+import org.apache.sirona.configuration.Configuration;
+import org.apache.sirona.counters.Counter;
+import org.apache.sirona.counters.Unit;
+import org.apache.sirona.repositories.Repository;
+import org.apache.sirona.store.CounterDataStore;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;

Modified: incubator/sirona/trunk/collector/src/test/java/org/apache/sirona/collector/server/store/counter/AggregatorTest.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/collector/src/test/java/org/apache/sirona/collector/server/store/counter/AggregatorTest.java?rev=1534581&r1=1534560&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/collector/src/test/java/org/apache/sirona/collector/server/store/counter/AggregatorTest.java (original)
+++ incubator/sirona/trunk/collector/src/test/java/org/apache/sirona/collector/server/store/counter/AggregatorTest.java Tue Oct 22 10:03:02 2013
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.monitoring.collector.server.store.counter;
+package org.apache.sirona.collector.server.store.counter;
 
-import org.apache.commons.monitoring.Role;
-import org.apache.commons.monitoring.collector.server.math.M2AwareStatisticalSummary;
-import org.apache.commons.monitoring.counters.Counter;
-import org.apache.commons.monitoring.counters.Unit;
-import org.apache.commons.monitoring.repositories.Repository;
+import org.apache.sirona.Role;
+import org.apache.sirona.collector.server.math.M2AwareStatisticalSummary;
+import org.apache.sirona.counters.Counter;
+import org.apache.sirona.counters.Unit;
+import org.apache.sirona.repositories.Repository;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;

Modified: incubator/sirona/trunk/collector/src/test/java/org/apache/sirona/collector/server/store/gauge/CollectorGaugeTest.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/collector/src/test/java/org/apache/sirona/collector/server/store/gauge/CollectorGaugeTest.java?rev=1534581&r1=1534560&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/collector/src/test/java/org/apache/sirona/collector/server/store/gauge/CollectorGaugeTest.java (original)
+++ incubator/sirona/trunk/collector/src/test/java/org/apache/sirona/collector/server/store/gauge/CollectorGaugeTest.java Tue Oct 22 10:03:02 2013
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.monitoring.collector.server.store.gauge;
+package org.apache.sirona.collector.server.store.gauge;
 
-import org.apache.commons.monitoring.Role;
-import org.apache.commons.monitoring.counters.Unit;
-import org.apache.commons.monitoring.repositories.Repository;
-import org.apache.commons.monitoring.store.GaugeValuesRequest;
+import org.apache.sirona.Role;
+import org.apache.sirona.counters.Unit;
+import org.apache.sirona.repositories.Repository;
+import org.apache.sirona.store.GaugeValuesRequest;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;

Modified: incubator/sirona/trunk/collector/src/test/resources/commons-monitoring.properties
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/collector/src/test/resources/commons-monitoring.properties?rev=1534581&r1=1534580&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/collector/src/test/resources/commons-monitoring.properties (original)
+++ incubator/sirona/trunk/collector/src/test/resources/commons-monitoring.properties Tue Oct 22 10:03:02 2013
@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-org.apache.commons.monitoring.store.DataStoreFactory = org.apache.commons.monitoring.collector.server.store.CollectorDataStoreFactory
+org.apache.sirona.store.DataStoreFactory = org.apache.sirona.collector.server.store.CollectorDataStoreFactory
 
-org.apache.commons.monitoring.cube.CubeBuilder.collector = http://localhost:1234
-org.apache.commons.monitoring.cube.CubeBuilder.marker = local
+org.apache.sirona.cube.CubeBuilder.collector = http://localhost:1234
+org.apache.sirona.cube.CubeBuilder.marker = local

Modified: incubator/sirona/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/core/pom.xml?rev=1534581&r1=1534580&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/core/pom.xml (original)
+++ incubator/sirona/trunk/core/pom.xml Tue Oct 22 10:03:02 2013
@@ -60,7 +60,7 @@
               <relocations>
                 <relocation>
                   <pattern>org.apache.commons.math3</pattern>
-                  <shadedPattern>org.apache.commons.monitoring.math3</shadedPattern>
+                  <shadedPattern>org.apache.sirona.math3</shadedPattern>
                 </relocation>
               </relocations>
             </configuration>