You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sirona.apache.org by rm...@apache.org on 2013/10/22 12:03:07 UTC
svn commit: r1534581 [2/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/...
Copied: incubator/sirona/trunk/core/src/main/java/org/apache/sirona/MonitoringException.java (from r1534560, incubator/sirona/trunk/core/src/main/java/org/apache/commons/monitoring/MonitoringException.java)
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/core/src/main/java/org/apache/sirona/MonitoringException.java?p2=incubator/sirona/trunk/core/src/main/java/org/apache/sirona/MonitoringException.java&p1=incubator/sirona/trunk/core/src/main/java/org/apache/commons/monitoring/MonitoringException.java&r1=1534560&r2=1534581&rev=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/core/src/main/java/org/apache/commons/monitoring/MonitoringException.java (original)
+++ incubator/sirona/trunk/core/src/main/java/org/apache/sirona/MonitoringException.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;
+package org.apache.sirona;
public class MonitoringException extends RuntimeException {
public MonitoringException(final Throwable e) {
Copied: incubator/sirona/trunk/core/src/main/java/org/apache/sirona/Role.java (from r1534560, incubator/sirona/trunk/core/src/main/java/org/apache/commons/monitoring/Role.java)
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/core/src/main/java/org/apache/sirona/Role.java?p2=incubator/sirona/trunk/core/src/main/java/org/apache/sirona/Role.java&p1=incubator/sirona/trunk/core/src/main/java/org/apache/commons/monitoring/Role.java&r1=1534560&r2=1534581&rev=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/core/src/main/java/org/apache/commons/monitoring/Role.java (original)
+++ incubator/sirona/trunk/core/src/main/java/org/apache/sirona/Role.java Tue Oct 22 10:03:02 2013
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.commons.monitoring;
+package org.apache.sirona;
-import org.apache.commons.monitoring.counters.Unit;
+import org.apache.sirona.counters.Unit;
-import static org.apache.commons.monitoring.counters.Unit.Time.NANOSECOND;
+import static org.apache.sirona.counters.Unit.Time.NANOSECOND;
/**
* As a monitored resource may have multipe Metrics, each one has a dedicated 'role' that
Modified: incubator/sirona/trunk/core/src/main/java/org/apache/sirona/configuration/Configuration.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/core/src/main/java/org/apache/sirona/configuration/Configuration.java?rev=1534581&r1=1534560&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/core/src/main/java/org/apache/sirona/configuration/Configuration.java (original)
+++ incubator/sirona/trunk/core/src/main/java/org/apache/sirona/configuration/Configuration.java Tue Oct 22 10:03:02 2013
@@ -14,11 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.monitoring.configuration;
+package org.apache.sirona.configuration;
-import org.apache.commons.monitoring.MonitoringException;
-import org.apache.commons.monitoring.store.GaugeDataStore;
-import org.apache.commons.monitoring.util.ClassLoaders;
+import org.apache.sirona.MonitoringException;
+import org.apache.sirona.util.ClassLoaders;
import java.io.File;
import java.io.FileInputStream;
@@ -44,7 +43,7 @@ import java.util.logging.Logger;
public final class Configuration {
private static final Logger LOGGER = Logger.getLogger(Configuration.class.getName());
- public static final String COMMONS_MONITORING_PREFIX = "org.apache.commons.monitoring.";
+ public static final String COMMONS_MONITORING_PREFIX = "org.apache.sirona.";
private static final Map<Class<?>, Object> SINGLETONS = new ConcurrentHashMap<Class<?>, Object>();
private static final Collection<ToDestroy> INSTANCES = new ArrayList<ToDestroy>();
Modified: incubator/sirona/trunk/core/src/main/java/org/apache/sirona/counters/AggregatedCounter.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/core/src/main/java/org/apache/sirona/counters/AggregatedCounter.java?rev=1534581&r1=1534560&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/core/src/main/java/org/apache/sirona/counters/AggregatedCounter.java (original)
+++ incubator/sirona/trunk/core/src/main/java/org/apache/sirona/counters/AggregatedCounter.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.counters;
+package org.apache.sirona.counters;
import java.util.Map;
Modified: incubator/sirona/trunk/core/src/main/java/org/apache/sirona/counters/Counter.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/core/src/main/java/org/apache/sirona/counters/Counter.java?rev=1534581&r1=1534560&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/core/src/main/java/org/apache/sirona/counters/Counter.java (original)
+++ incubator/sirona/trunk/core/src/main/java/org/apache/sirona/counters/Counter.java Tue Oct 22 10:03:02 2013
@@ -14,12 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.monitoring.counters;
+package org.apache.sirona.counters;
-import org.apache.commons.monitoring.Role;
+import org.apache.sirona.Role;
-import java.util.Collection;
-import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
/**
Modified: incubator/sirona/trunk/core/src/main/java/org/apache/sirona/counters/DefaultCounter.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/core/src/main/java/org/apache/sirona/counters/DefaultCounter.java?rev=1534581&r1=1534560&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/core/src/main/java/org/apache/sirona/counters/DefaultCounter.java (original)
+++ incubator/sirona/trunk/core/src/main/java/org/apache/sirona/counters/DefaultCounter.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.counters;
+package org.apache.sirona.counters;
import org.apache.commons.math3.stat.descriptive.SummaryStatistics;
-import org.apache.commons.monitoring.store.CounterDataStore;
+import org.apache.sirona.store.CounterDataStore;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.locks.Lock;
Modified: incubator/sirona/trunk/core/src/main/java/org/apache/sirona/counters/MetricData.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/core/src/main/java/org/apache/sirona/counters/MetricData.java?rev=1534581&r1=1534560&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/core/src/main/java/org/apache/sirona/counters/MetricData.java (original)
+++ incubator/sirona/trunk/core/src/main/java/org/apache/sirona/counters/MetricData.java Tue Oct 22 10:03:02 2013
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.commons.monitoring.counters;
+package org.apache.sirona.counters;
/**
* An enum to acces data from a Counter based on the property name. Can be used to avoid reflection on Counter
Modified: incubator/sirona/trunk/core/src/main/java/org/apache/sirona/counters/Unit.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/core/src/main/java/org/apache/sirona/counters/Unit.java?rev=1534581&r1=1534560&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/core/src/main/java/org/apache/sirona/counters/Unit.java (original)
+++ incubator/sirona/trunk/core/src/main/java/org/apache/sirona/counters/Unit.java Tue Oct 22 10:03:02 2013
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.commons.monitoring.counters;
+package org.apache.sirona.counters;
import java.util.ArrayList;
import java.util.Collections;
Modified: incubator/sirona/trunk/core/src/main/java/org/apache/sirona/gauges/DefaultGaugeManager.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/core/src/main/java/org/apache/sirona/gauges/DefaultGaugeManager.java?rev=1534581&r1=1534560&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/core/src/main/java/org/apache/sirona/gauges/DefaultGaugeManager.java (original)
+++ incubator/sirona/trunk/core/src/main/java/org/apache/sirona/gauges/DefaultGaugeManager.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.gauges;
+package org.apache.sirona.gauges;
-import org.apache.commons.monitoring.Role;
-import org.apache.commons.monitoring.store.GaugeDataStore;
+import org.apache.sirona.Role;
+import org.apache.sirona.store.GaugeDataStore;
import java.util.Map;
import java.util.Timer;
Modified: incubator/sirona/trunk/core/src/main/java/org/apache/sirona/gauges/Gauge.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/core/src/main/java/org/apache/sirona/gauges/Gauge.java?rev=1534581&r1=1534560&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/core/src/main/java/org/apache/sirona/gauges/Gauge.java (original)
+++ incubator/sirona/trunk/core/src/main/java/org/apache/sirona/gauges/Gauge.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.gauges;
+package org.apache.sirona.gauges;
-import org.apache.commons.monitoring.Role;
-import org.apache.commons.monitoring.repositories.Repository;
-import org.apache.commons.monitoring.spi.SPI;
+import org.apache.sirona.Role;
+import org.apache.sirona.repositories.Repository;
+import org.apache.sirona.spi.SPI;
import java.util.LinkedList;
Modified: incubator/sirona/trunk/core/src/main/java/org/apache/sirona/gauges/GaugeFactory.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/core/src/main/java/org/apache/sirona/gauges/GaugeFactory.java?rev=1534581&r1=1534560&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/core/src/main/java/org/apache/sirona/gauges/GaugeFactory.java (original)
+++ incubator/sirona/trunk/core/src/main/java/org/apache/sirona/gauges/GaugeFactory.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.gauges;
+package org.apache.sirona.gauges;
public interface GaugeFactory {
Gauge[] gauges();
Modified: incubator/sirona/trunk/core/src/main/java/org/apache/sirona/gauges/GaugeManager.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/core/src/main/java/org/apache/sirona/gauges/GaugeManager.java?rev=1534581&r1=1534560&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/core/src/main/java/org/apache/sirona/gauges/GaugeManager.java (original)
+++ incubator/sirona/trunk/core/src/main/java/org/apache/sirona/gauges/GaugeManager.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.gauges;
+package org.apache.sirona.gauges;
-import org.apache.commons.monitoring.Role;
+import org.apache.sirona.Role;
public interface GaugeManager {
void stop();
Modified: incubator/sirona/trunk/core/src/main/java/org/apache/sirona/repositories/DefaultRepository.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/core/src/main/java/org/apache/sirona/repositories/DefaultRepository.java?rev=1534581&r1=1534560&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/core/src/main/java/org/apache/sirona/repositories/DefaultRepository.java (original)
+++ incubator/sirona/trunk/core/src/main/java/org/apache/sirona/repositories/DefaultRepository.java Tue Oct 22 10:03:02 2013
@@ -14,20 +14,20 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.monitoring.repositories;
+package org.apache.sirona.repositories;
-import org.apache.commons.monitoring.MonitoringException;
-import org.apache.commons.monitoring.Role;
-import org.apache.commons.monitoring.configuration.Configuration;
-import org.apache.commons.monitoring.counters.Counter;
-import org.apache.commons.monitoring.gauges.DefaultGaugeManager;
-import org.apache.commons.monitoring.gauges.Gauge;
-import org.apache.commons.monitoring.stopwatches.CounterStopWatch;
-import org.apache.commons.monitoring.stopwatches.StopWatch;
-import org.apache.commons.monitoring.store.CounterDataStore;
-import org.apache.commons.monitoring.store.DataStoreFactory;
-import org.apache.commons.monitoring.store.GaugeDataStore;
-import org.apache.commons.monitoring.store.GaugeValuesRequest;
+import org.apache.sirona.MonitoringException;
+import org.apache.sirona.Role;
+import org.apache.sirona.configuration.Configuration;
+import org.apache.sirona.counters.Counter;
+import org.apache.sirona.gauges.DefaultGaugeManager;
+import org.apache.sirona.gauges.Gauge;
+import org.apache.sirona.stopwatches.CounterStopWatch;
+import org.apache.sirona.stopwatches.StopWatch;
+import org.apache.sirona.store.CounterDataStore;
+import org.apache.sirona.store.DataStoreFactory;
+import org.apache.sirona.store.GaugeDataStore;
+import org.apache.sirona.store.GaugeValuesRequest;
import java.util.Iterator;
import java.util.Map;
Modified: incubator/sirona/trunk/core/src/main/java/org/apache/sirona/repositories/Repository.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/core/src/main/java/org/apache/sirona/repositories/Repository.java?rev=1534581&r1=1534560&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/core/src/main/java/org/apache/sirona/repositories/Repository.java (original)
+++ incubator/sirona/trunk/core/src/main/java/org/apache/sirona/repositories/Repository.java Tue Oct 22 10:03:02 2013
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.commons.monitoring.repositories;
+package org.apache.sirona.repositories;
-import org.apache.commons.monitoring.Role;
-import org.apache.commons.monitoring.configuration.Configuration;
-import org.apache.commons.monitoring.counters.Counter;
-import org.apache.commons.monitoring.gauges.Gauge;
-import org.apache.commons.monitoring.stopwatches.StopWatch;
+import org.apache.sirona.Role;
+import org.apache.sirona.configuration.Configuration;
+import org.apache.sirona.counters.Counter;
+import org.apache.sirona.gauges.Gauge;
+import org.apache.sirona.stopwatches.StopWatch;
import java.util.Map;
Modified: incubator/sirona/trunk/core/src/main/java/org/apache/sirona/spi/DefaultSPI.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/core/src/main/java/org/apache/sirona/spi/DefaultSPI.java?rev=1534581&r1=1534560&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/core/src/main/java/org/apache/sirona/spi/DefaultSPI.java (original)
+++ incubator/sirona/trunk/core/src/main/java/org/apache/sirona/spi/DefaultSPI.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.spi;
+package org.apache.sirona.spi;
import java.util.ServiceLoader;
Modified: incubator/sirona/trunk/core/src/main/java/org/apache/sirona/spi/SPI.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/core/src/main/java/org/apache/sirona/spi/SPI.java?rev=1534581&r1=1534560&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/core/src/main/java/org/apache/sirona/spi/SPI.java (original)
+++ incubator/sirona/trunk/core/src/main/java/org/apache/sirona/spi/SPI.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.spi;
+package org.apache.sirona.spi;
-import org.apache.commons.monitoring.configuration.Configuration;
+import org.apache.sirona.configuration.Configuration;
// ServiceLoader is sometimes just wrong
public interface SPI {
Modified: incubator/sirona/trunk/core/src/main/java/org/apache/sirona/stopwatches/CounterStopWatch.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/core/src/main/java/org/apache/sirona/stopwatches/CounterStopWatch.java?rev=1534581&r1=1534560&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/core/src/main/java/org/apache/sirona/stopwatches/CounterStopWatch.java (original)
+++ incubator/sirona/trunk/core/src/main/java/org/apache/sirona/stopwatches/CounterStopWatch.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.stopwatches;
+package org.apache.sirona.stopwatches;
-import org.apache.commons.monitoring.counters.Counter;
+import org.apache.sirona.counters.Counter;
import java.util.concurrent.atomic.AtomicInteger;
-import static org.apache.commons.monitoring.counters.Unit.Time.NANOSECOND;
+import static org.apache.sirona.counters.Unit.Time.NANOSECOND;
public class CounterStopWatch implements StopWatch {
protected final Counter counter;
Modified: incubator/sirona/trunk/core/src/main/java/org/apache/sirona/stopwatches/StopWatch.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/core/src/main/java/org/apache/sirona/stopwatches/StopWatch.java?rev=1534581&r1=1534560&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/core/src/main/java/org/apache/sirona/stopwatches/StopWatch.java (original)
+++ incubator/sirona/trunk/core/src/main/java/org/apache/sirona/stopwatches/StopWatch.java Tue Oct 22 10:03:02 2013
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.commons.monitoring.stopwatches;
+package org.apache.sirona.stopwatches;
/**
* Instrumentation tool to compute resource consumption of some code fragment execution.
Modified: incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/BatchCounterDataStore.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/BatchCounterDataStore.java?rev=1534581&r1=1534560&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/BatchCounterDataStore.java (original)
+++ incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/BatchCounterDataStore.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.store;
+package org.apache.sirona.store;
-import org.apache.commons.monitoring.configuration.Configuration;
-import org.apache.commons.monitoring.repositories.Repository;
-import org.apache.commons.monitoring.util.DaemonThreadFactory;
+import org.apache.sirona.configuration.Configuration;
+import org.apache.sirona.repositories.Repository;
+import org.apache.sirona.util.DaemonThreadFactory;
import java.util.Locale;
import java.util.concurrent.Executors;
Modified: incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/CounterDataStore.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/CounterDataStore.java?rev=1534581&r1=1534560&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/CounterDataStore.java (original)
+++ incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/CounterDataStore.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.store;
+package org.apache.sirona.store;
-import org.apache.commons.monitoring.counters.Counter;
+import org.apache.sirona.counters.Counter;
import java.util.Collection;
Modified: incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/DataStoreFactory.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/DataStoreFactory.java?rev=1534581&r1=1534560&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/DataStoreFactory.java (original)
+++ incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/DataStoreFactory.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.store;
+package org.apache.sirona.store;
public interface DataStoreFactory {
Modified: incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/DefaultDataStoreFactory.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/DefaultDataStoreFactory.java?rev=1534581&r1=1534560&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/DefaultDataStoreFactory.java (original)
+++ incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/DefaultDataStoreFactory.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.store;
+package org.apache.sirona.store;
public class DefaultDataStoreFactory extends DelegateDataStoreFactory {
Modified: incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/DelegateDataStoreFactory.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/DelegateDataStoreFactory.java?rev=1534581&r1=1534560&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/DelegateDataStoreFactory.java (original)
+++ incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/DelegateDataStoreFactory.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.store;
+package org.apache.sirona.store;
public class DelegateDataStoreFactory implements DataStoreFactory {
Modified: incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/GaugeDataStore.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/GaugeDataStore.java?rev=1534581&r1=1534560&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/GaugeDataStore.java (original)
+++ incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/GaugeDataStore.java Tue Oct 22 10:03:02 2013
@@ -14,10 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.monitoring.store;
+package org.apache.sirona.store;
-import org.apache.commons.monitoring.Role;
-import org.apache.commons.monitoring.gauges.Gauge;
+import org.apache.sirona.Role;
import java.util.Map;
Modified: incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/GaugeValuesRequest.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/GaugeValuesRequest.java?rev=1534581&r1=1534560&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/GaugeValuesRequest.java (original)
+++ incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/GaugeValuesRequest.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.store;
+package org.apache.sirona.store;
-import org.apache.commons.monitoring.Role;
+import org.apache.sirona.Role;
/**
* @author Olivier Lamy
Modified: incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/InMemoryCounterDataStore.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/InMemoryCounterDataStore.java?rev=1534581&r1=1534560&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/InMemoryCounterDataStore.java (original)
+++ incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/InMemoryCounterDataStore.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.store;
+package org.apache.sirona.store;
-import org.apache.commons.monitoring.counters.Counter;
-import org.apache.commons.monitoring.counters.DefaultCounter;
+import org.apache.sirona.counters.Counter;
+import org.apache.sirona.counters.DefaultCounter;
import java.util.Collection;
import java.util.concurrent.ConcurrentHashMap;
Modified: incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/InMemoryGaugeDataStore.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/InMemoryGaugeDataStore.java?rev=1534581&r1=1534560&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/InMemoryGaugeDataStore.java (original)
+++ incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/InMemoryGaugeDataStore.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.store;
+package org.apache.sirona.store;
-import org.apache.commons.monitoring.Role;
-import org.apache.commons.monitoring.configuration.Configuration;
+import org.apache.sirona.Role;
+import org.apache.sirona.configuration.Configuration;
import java.util.Collections;
import java.util.Map;
Modified: incubator/sirona/trunk/core/src/main/java/org/apache/sirona/util/ClassLoaders.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/core/src/main/java/org/apache/sirona/util/ClassLoaders.java?rev=1534581&r1=1534560&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/core/src/main/java/org/apache/sirona/util/ClassLoaders.java (original)
+++ incubator/sirona/trunk/core/src/main/java/org/apache/sirona/util/ClassLoaders.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.util;
+package org.apache.sirona.util;
public final class ClassLoaders {
public static ClassLoader current() {
Modified: incubator/sirona/trunk/core/src/main/java/org/apache/sirona/util/DaemonThreadFactory.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/core/src/main/java/org/apache/sirona/util/DaemonThreadFactory.java?rev=1534581&r1=1534560&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/core/src/main/java/org/apache/sirona/util/DaemonThreadFactory.java (original)
+++ incubator/sirona/trunk/core/src/main/java/org/apache/sirona/util/DaemonThreadFactory.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.util;
+package org.apache.sirona.util;
import java.util.concurrent.ThreadFactory;
import java.util.concurrent.atomic.AtomicInteger;
Modified: incubator/sirona/trunk/core/src/test/java/org/apache/sirona/counters/CounterBench.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/core/src/test/java/org/apache/sirona/counters/CounterBench.java?rev=1534581&r1=1534560&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/core/src/test/java/org/apache/sirona/counters/CounterBench.java (original)
+++ incubator/sirona/trunk/core/src/test/java/org/apache/sirona/counters/CounterBench.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.counters;
+package org.apache.sirona.counters;
-import org.apache.commons.monitoring.Role;
-import org.apache.commons.monitoring.store.InMemoryCounterDataStore;
+import org.apache.sirona.Role;
+import org.apache.sirona.store.InMemoryCounterDataStore;
import org.junit.Test;
import java.util.concurrent.ExecutorService;
Copied: incubator/sirona/trunk/core/src/test/java/org/apache/sirona/counters/UnitTest.java (from r1534560, incubator/sirona/trunk/core/src/test/java/org/apache/commons/monitoring/UnitTest.java)
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/core/src/test/java/org/apache/sirona/counters/UnitTest.java?p2=incubator/sirona/trunk/core/src/test/java/org/apache/sirona/counters/UnitTest.java&p1=incubator/sirona/trunk/core/src/test/java/org/apache/commons/monitoring/UnitTest.java&r1=1534560&r2=1534581&rev=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/core/src/test/java/org/apache/commons/monitoring/UnitTest.java (original)
+++ incubator/sirona/trunk/core/src/test/java/org/apache/sirona/counters/UnitTest.java Tue Oct 22 10:03:02 2013
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-package org.apache.commons.monitoring;
+package org.apache.sirona.counters;
import org.junit.Test;
-import static org.apache.commons.monitoring.counters.Unit.Time.HOUR;
-import static org.apache.commons.monitoring.counters.Unit.Time.MICROSECOND;
-import static org.apache.commons.monitoring.counters.Unit.Time.MILLISECOND;
-import static org.apache.commons.monitoring.counters.Unit.Time.NANOSECOND;
-import static org.apache.commons.monitoring.counters.Unit.Time.SECOND;
+import static org.apache.sirona.counters.Unit.Time.HOUR;
+import static org.apache.sirona.counters.Unit.Time.MICROSECOND;
+import static org.apache.sirona.counters.Unit.Time.MILLISECOND;
+import static org.apache.sirona.counters.Unit.Time.NANOSECOND;
+import static org.apache.sirona.counters.Unit.Time.SECOND;
import static org.junit.Assert.assertEquals;
/**
Copied: incubator/sirona/trunk/cube/src/main/java/org/apache/sirona/cube/Cube.java (from r1534560, incubator/sirona/trunk/cube/src/main/java/org/apache/commons/monitoring/cube/Cube.java)
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/cube/src/main/java/org/apache/sirona/cube/Cube.java?p2=incubator/sirona/trunk/cube/src/main/java/org/apache/sirona/cube/Cube.java&p1=incubator/sirona/trunk/cube/src/main/java/org/apache/commons/monitoring/cube/Cube.java&r1=1534560&r2=1534581&rev=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/cube/src/main/java/org/apache/commons/monitoring/cube/Cube.java (original)
+++ incubator/sirona/trunk/cube/src/main/java/org/apache/sirona/cube/Cube.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.cube;
+package org.apache.sirona.cube;
import java.io.OutputStream;
import java.net.HttpURLConnection;
Copied: incubator/sirona/trunk/cube/src/main/java/org/apache/sirona/cube/CubeBuilder.java (from r1534560, incubator/sirona/trunk/cube/src/main/java/org/apache/commons/monitoring/cube/CubeBuilder.java)
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/cube/src/main/java/org/apache/sirona/cube/CubeBuilder.java?p2=incubator/sirona/trunk/cube/src/main/java/org/apache/sirona/cube/CubeBuilder.java&p1=incubator/sirona/trunk/cube/src/main/java/org/apache/commons/monitoring/cube/CubeBuilder.java&r1=1534560&r2=1534581&rev=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/cube/src/main/java/org/apache/commons/monitoring/cube/CubeBuilder.java (original)
+++ incubator/sirona/trunk/cube/src/main/java/org/apache/sirona/cube/CubeBuilder.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.cube;
+package org.apache.sirona.cube;
-import org.apache.commons.monitoring.configuration.Configuration;
+import org.apache.sirona.configuration.Configuration;
import java.net.InetAddress;
import java.net.UnknownHostException;
Copied: incubator/sirona/trunk/cube/src/main/java/org/apache/sirona/cube/CubeCounterDataStore.java (from r1534560, incubator/sirona/trunk/cube/src/main/java/org/apache/commons/monitoring/cube/CubeCounterDataStore.java)
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/cube/src/main/java/org/apache/sirona/cube/CubeCounterDataStore.java?p2=incubator/sirona/trunk/cube/src/main/java/org/apache/sirona/cube/CubeCounterDataStore.java&p1=incubator/sirona/trunk/cube/src/main/java/org/apache/commons/monitoring/cube/CubeCounterDataStore.java&r1=1534560&r2=1534581&rev=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/cube/src/main/java/org/apache/commons/monitoring/cube/CubeCounterDataStore.java (original)
+++ incubator/sirona/trunk/cube/src/main/java/org/apache/sirona/cube/CubeCounterDataStore.java Tue Oct 22 10:03:02 2013
@@ -14,13 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.monitoring.cube;
+package org.apache.sirona.cube;
-import org.apache.commons.monitoring.configuration.Configuration;
-import org.apache.commons.monitoring.counters.Counter;
-import org.apache.commons.monitoring.counters.MetricData;
-import org.apache.commons.monitoring.repositories.Repository;
-import org.apache.commons.monitoring.store.BatchCounterDataStore;
+import org.apache.sirona.configuration.Configuration;
+import org.apache.sirona.counters.Counter;
+import org.apache.sirona.repositories.Repository;
+import org.apache.sirona.store.BatchCounterDataStore;
public class CubeCounterDataStore extends BatchCounterDataStore {
private static final String COUNTER_TYPE = "counter";
Copied: incubator/sirona/trunk/cube/src/main/java/org/apache/sirona/cube/CubeDataStoreFactory.java (from r1534560, incubator/sirona/trunk/cube/src/main/java/org/apache/commons/monitoring/cube/CubeDataStoreFactory.java)
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/cube/src/main/java/org/apache/sirona/cube/CubeDataStoreFactory.java?p2=incubator/sirona/trunk/cube/src/main/java/org/apache/sirona/cube/CubeDataStoreFactory.java&p1=incubator/sirona/trunk/cube/src/main/java/org/apache/commons/monitoring/cube/CubeDataStoreFactory.java&r1=1534560&r2=1534581&rev=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/cube/src/main/java/org/apache/commons/monitoring/cube/CubeDataStoreFactory.java (original)
+++ incubator/sirona/trunk/cube/src/main/java/org/apache/sirona/cube/CubeDataStoreFactory.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.cube;
+package org.apache.sirona.cube;
-import org.apache.commons.monitoring.store.DelegateDataStoreFactory;
+import org.apache.sirona.store.DelegateDataStoreFactory;
public class CubeDataStoreFactory extends DelegateDataStoreFactory {
public CubeDataStoreFactory() {
Copied: incubator/sirona/trunk/cube/src/main/java/org/apache/sirona/cube/CubeGaugeDataStore.java (from r1534560, incubator/sirona/trunk/cube/src/main/java/org/apache/commons/monitoring/cube/CubeGaugeDataStore.java)
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/cube/src/main/java/org/apache/sirona/cube/CubeGaugeDataStore.java?p2=incubator/sirona/trunk/cube/src/main/java/org/apache/sirona/cube/CubeGaugeDataStore.java&p1=incubator/sirona/trunk/cube/src/main/java/org/apache/commons/monitoring/cube/CubeGaugeDataStore.java&r1=1534560&r2=1534581&rev=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/cube/src/main/java/org/apache/commons/monitoring/cube/CubeGaugeDataStore.java (original)
+++ incubator/sirona/trunk/cube/src/main/java/org/apache/sirona/cube/CubeGaugeDataStore.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.cube;
+package org.apache.sirona.cube;
-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.sirona.Role;
+import org.apache.sirona.configuration.Configuration;
+import org.apache.sirona.store.GaugeDataStore;
+import org.apache.sirona.store.GaugeValuesRequest;
import java.util.Collections;
import java.util.Map;
Copied: incubator/sirona/trunk/cube/src/main/java/org/apache/sirona/cube/MapBuilder.java (from r1534560, incubator/sirona/trunk/cube/src/main/java/org/apache/commons/monitoring/cube/MapBuilder.java)
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/cube/src/main/java/org/apache/sirona/cube/MapBuilder.java?p2=incubator/sirona/trunk/cube/src/main/java/org/apache/sirona/cube/MapBuilder.java&p1=incubator/sirona/trunk/cube/src/main/java/org/apache/commons/monitoring/cube/MapBuilder.java&r1=1534560&r2=1534581&rev=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/cube/src/main/java/org/apache/commons/monitoring/cube/MapBuilder.java (original)
+++ incubator/sirona/trunk/cube/src/main/java/org/apache/sirona/cube/MapBuilder.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.cube;
+package org.apache.sirona.cube;
import java.util.HashMap;
import java.util.Map;
Copied: incubator/sirona/trunk/cube/src/test/java/org/apache/sirona/cube/CubeDataStoreTest.java (from r1534560, incubator/sirona/trunk/cube/src/test/java/org/apache/commons/monitoring/cube/CubeDataStoreTest.java)
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/cube/src/test/java/org/apache/sirona/cube/CubeDataStoreTest.java?p2=incubator/sirona/trunk/cube/src/test/java/org/apache/sirona/cube/CubeDataStoreTest.java&p1=incubator/sirona/trunk/cube/src/test/java/org/apache/commons/monitoring/cube/CubeDataStoreTest.java&r1=1534560&r2=1534581&rev=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/cube/src/test/java/org/apache/commons/monitoring/cube/CubeDataStoreTest.java (original)
+++ incubator/sirona/trunk/cube/src/test/java/org/apache/sirona/cube/CubeDataStoreTest.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.cube;
+package org.apache.sirona.cube;
-import org.apache.commons.monitoring.Role;
-import org.apache.commons.monitoring.counters.Counter;
-import org.apache.commons.monitoring.gauges.Gauge;
-import org.apache.commons.monitoring.repositories.Repository;
+import org.apache.sirona.Role;
+import org.apache.sirona.counters.Counter;
+import org.apache.sirona.gauges.Gauge;
+import org.apache.sirona.repositories.Repository;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
Copied: incubator/sirona/trunk/cube/src/test/java/org/apache/sirona/cube/CubeServer.java (from r1534560, incubator/sirona/trunk/cube/src/test/java/org/apache/commons/monitoring/cube/CubeServer.java)
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/cube/src/test/java/org/apache/sirona/cube/CubeServer.java?p2=incubator/sirona/trunk/cube/src/test/java/org/apache/sirona/cube/CubeServer.java&p1=incubator/sirona/trunk/cube/src/test/java/org/apache/commons/monitoring/cube/CubeServer.java&r1=1534560&r2=1534581&rev=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/cube/src/test/java/org/apache/commons/monitoring/cube/CubeServer.java (original)
+++ incubator/sirona/trunk/cube/src/test/java/org/apache/sirona/cube/CubeServer.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.cube;
+package org.apache.sirona.cube;
import io.netty.bootstrap.ServerBootstrap;
import io.netty.channel.ChannelFuture;
Modified: incubator/sirona/trunk/cube/src/test/java/org/apache/sirona/cube/gauge/MockGauge.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/cube/src/test/java/org/apache/sirona/cube/gauge/MockGauge.java?rev=1534581&r1=1534560&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/cube/src/test/java/org/apache/sirona/cube/gauge/MockGauge.java (original)
+++ incubator/sirona/trunk/cube/src/test/java/org/apache/sirona/cube/gauge/MockGauge.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.cube.gauge;
+package org.apache.sirona.cube.gauge;
-import org.apache.commons.monitoring.Role;
-import org.apache.commons.monitoring.counters.Unit;
-import org.apache.commons.monitoring.gauges.Gauge;
+import org.apache.sirona.Role;
+import org.apache.sirona.counters.Unit;
+import org.apache.sirona.gauges.Gauge;
public class MockGauge implements Gauge {
public static final Role MOCK = new Role("mock", Unit.UNARY);
Copied: incubator/sirona/trunk/cube/src/test/resources/META-INF/services/org.apache.sirona.gauges.Gauge (from r1534560, incubator/sirona/trunk/cube/src/test/resources/META-INF/services/org.apache.commons.monitoring.gauges.Gauge)
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/cube/src/test/resources/META-INF/services/org.apache.sirona.gauges.Gauge?p2=incubator/sirona/trunk/cube/src/test/resources/META-INF/services/org.apache.sirona.gauges.Gauge&p1=incubator/sirona/trunk/cube/src/test/resources/META-INF/services/org.apache.commons.monitoring.gauges.Gauge&r1=1534560&r2=1534581&rev=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/cube/src/test/resources/META-INF/services/org.apache.commons.monitoring.gauges.Gauge (original)
+++ incubator/sirona/trunk/cube/src/test/resources/META-INF/services/org.apache.sirona.gauges.Gauge Tue Oct 22 10:03:02 2013
@@ -1 +1 @@
-org.apache.commons.monitoring.cube.gauge.MockGauge
+org.apache.sirona.cube.gauge.MockGauge
Modified: incubator/sirona/trunk/cube/src/test/resources/commons-monitoring.properties
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/cube/src/test/resources/commons-monitoring.properties?rev=1534581&r1=1534580&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/cube/src/test/resources/commons-monitoring.properties (original)
+++ incubator/sirona/trunk/cube/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.cube.CubeDataStoreFactory
-org.apache.commons.monitoring.cube.period = 100
-org.apache.commons.monitoring.cube.CubeBuilder.collector = http://localhost:1234/1.0/event/put
+org.apache.sirona.store.DataStoreFactory = org.apache.sirona.cube.CubeDataStoreFactory
+org.apache.sirona.cube.period = 100
+org.apache.sirona.cube.CubeBuilder.collector = http://localhost:1234/1.0/event/put
Copied: incubator/sirona/trunk/graphite/src/main/java/org/apache/sirona/graphite/Graphite.java (from r1534560, incubator/sirona/trunk/graphite/src/main/java/org/apache/commons/monitoring/graphite/Graphite.java)
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/graphite/src/main/java/org/apache/sirona/graphite/Graphite.java?p2=incubator/sirona/trunk/graphite/src/main/java/org/apache/sirona/graphite/Graphite.java&p1=incubator/sirona/trunk/graphite/src/main/java/org/apache/commons/monitoring/graphite/Graphite.java&r1=1534560&r2=1534581&rev=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/graphite/src/main/java/org/apache/commons/monitoring/graphite/Graphite.java (original)
+++ incubator/sirona/trunk/graphite/src/main/java/org/apache/sirona/graphite/Graphite.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.graphite;
+package org.apache.sirona.graphite;
import javax.net.SocketFactory;
import java.io.BufferedWriter;
Copied: incubator/sirona/trunk/graphite/src/main/java/org/apache/sirona/graphite/GraphiteBuilder.java (from r1534560, incubator/sirona/trunk/graphite/src/main/java/org/apache/commons/monitoring/graphite/GraphiteBuilder.java)
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/graphite/src/main/java/org/apache/sirona/graphite/GraphiteBuilder.java?p2=incubator/sirona/trunk/graphite/src/main/java/org/apache/sirona/graphite/GraphiteBuilder.java&p1=incubator/sirona/trunk/graphite/src/main/java/org/apache/commons/monitoring/graphite/GraphiteBuilder.java&r1=1534560&r2=1534581&rev=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/graphite/src/main/java/org/apache/commons/monitoring/graphite/GraphiteBuilder.java (original)
+++ incubator/sirona/trunk/graphite/src/main/java/org/apache/sirona/graphite/GraphiteBuilder.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.graphite;
+package org.apache.sirona.graphite;
-import org.apache.commons.monitoring.MonitoringException;
-import org.apache.commons.monitoring.configuration.Configuration;
+import org.apache.sirona.MonitoringException;
+import org.apache.sirona.configuration.Configuration;
import javax.net.SocketFactory;
import java.io.IOException;
Copied: incubator/sirona/trunk/graphite/src/main/java/org/apache/sirona/graphite/GraphiteCounterDataStore.java (from r1534560, incubator/sirona/trunk/graphite/src/main/java/org/apache/commons/monitoring/graphite/GraphiteCounterDataStore.java)
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/graphite/src/main/java/org/apache/sirona/graphite/GraphiteCounterDataStore.java?p2=incubator/sirona/trunk/graphite/src/main/java/org/apache/sirona/graphite/GraphiteCounterDataStore.java&p1=incubator/sirona/trunk/graphite/src/main/java/org/apache/commons/monitoring/graphite/GraphiteCounterDataStore.java&r1=1534560&r2=1534581&rev=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/graphite/src/main/java/org/apache/commons/monitoring/graphite/GraphiteCounterDataStore.java (original)
+++ incubator/sirona/trunk/graphite/src/main/java/org/apache/sirona/graphite/GraphiteCounterDataStore.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.graphite;
+package org.apache.sirona.graphite;
-import org.apache.commons.monitoring.configuration.Configuration;
-import org.apache.commons.monitoring.counters.Counter;
-import org.apache.commons.monitoring.counters.MetricData;
-import org.apache.commons.monitoring.repositories.Repository;
-import org.apache.commons.monitoring.store.BatchCounterDataStore;
+import org.apache.sirona.configuration.Configuration;
+import org.apache.sirona.counters.Counter;
+import org.apache.sirona.counters.MetricData;
+import org.apache.sirona.repositories.Repository;
+import org.apache.sirona.store.BatchCounterDataStore;
import java.io.IOException;
import java.util.logging.Level;
Copied: incubator/sirona/trunk/graphite/src/main/java/org/apache/sirona/graphite/GraphiteDataStoreFactory.java (from r1534560, incubator/sirona/trunk/graphite/src/main/java/org/apache/commons/monitoring/graphite/GraphiteDataStoreFactory.java)
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/graphite/src/main/java/org/apache/sirona/graphite/GraphiteDataStoreFactory.java?p2=incubator/sirona/trunk/graphite/src/main/java/org/apache/sirona/graphite/GraphiteDataStoreFactory.java&p1=incubator/sirona/trunk/graphite/src/main/java/org/apache/commons/monitoring/graphite/GraphiteDataStoreFactory.java&r1=1534560&r2=1534581&rev=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/graphite/src/main/java/org/apache/commons/monitoring/graphite/GraphiteDataStoreFactory.java (original)
+++ incubator/sirona/trunk/graphite/src/main/java/org/apache/sirona/graphite/GraphiteDataStoreFactory.java Tue Oct 22 10:03:02 2013
@@ -14,11 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.monitoring.graphite;
+package org.apache.sirona.graphite;
-import org.apache.commons.monitoring.store.CounterDataStore;
-import org.apache.commons.monitoring.store.DelegateDataStoreFactory;
-import org.apache.commons.monitoring.store.GaugeDataStore;
+import org.apache.sirona.store.DelegateDataStoreFactory;
public class GraphiteDataStoreFactory extends DelegateDataStoreFactory {
public GraphiteDataStoreFactory() {
Copied: incubator/sirona/trunk/graphite/src/main/java/org/apache/sirona/graphite/GraphiteGaugeDataStore.java (from r1534560, incubator/sirona/trunk/graphite/src/main/java/org/apache/commons/monitoring/graphite/GraphiteGaugeDataStore.java)
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/graphite/src/main/java/org/apache/sirona/graphite/GraphiteGaugeDataStore.java?p2=incubator/sirona/trunk/graphite/src/main/java/org/apache/sirona/graphite/GraphiteGaugeDataStore.java&p1=incubator/sirona/trunk/graphite/src/main/java/org/apache/commons/monitoring/graphite/GraphiteGaugeDataStore.java&r1=1534560&r2=1534581&rev=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/graphite/src/main/java/org/apache/commons/monitoring/graphite/GraphiteGaugeDataStore.java (original)
+++ incubator/sirona/trunk/graphite/src/main/java/org/apache/sirona/graphite/GraphiteGaugeDataStore.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.graphite;
+package org.apache.sirona.graphite;
-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.sirona.Role;
+import org.apache.sirona.configuration.Configuration;
+import org.apache.sirona.store.GaugeDataStore;
+import org.apache.sirona.store.GaugeValuesRequest;
import java.io.IOException;
import java.util.Collections;
Copied: incubator/sirona/trunk/graphite/src/test/java/org/apache/sirona/graphite/GraphiteTest.java (from r1534560, incubator/sirona/trunk/graphite/src/test/java/org/apache/commons/monitoring/graphite/GraphiteTest.java)
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/graphite/src/test/java/org/apache/sirona/graphite/GraphiteTest.java?p2=incubator/sirona/trunk/graphite/src/test/java/org/apache/sirona/graphite/GraphiteTest.java&p1=incubator/sirona/trunk/graphite/src/test/java/org/apache/commons/monitoring/graphite/GraphiteTest.java&r1=1534560&r2=1534581&rev=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/graphite/src/test/java/org/apache/commons/monitoring/graphite/GraphiteTest.java (original)
+++ incubator/sirona/trunk/graphite/src/test/java/org/apache/sirona/graphite/GraphiteTest.java Tue Oct 22 10:03:02 2013
@@ -14,15 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.monitoring.graphite;
+package org.apache.sirona.graphite;
-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.ArrayList;
-import java.util.Arrays;
import java.util.Collection;
import static org.junit.Assert.assertEquals;
Copied: incubator/sirona/trunk/graphite/src/test/java/org/apache/sirona/graphite/GraphiteTestBase.java (from r1534560, incubator/sirona/trunk/graphite/src/test/java/org/apache/commons/monitoring/graphite/GraphiteTestBase.java)
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/graphite/src/test/java/org/apache/sirona/graphite/GraphiteTestBase.java?p2=incubator/sirona/trunk/graphite/src/test/java/org/apache/sirona/graphite/GraphiteTestBase.java&p1=incubator/sirona/trunk/graphite/src/test/java/org/apache/commons/monitoring/graphite/GraphiteTestBase.java&r1=1534560&r2=1534581&rev=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/graphite/src/test/java/org/apache/commons/monitoring/graphite/GraphiteTestBase.java (original)
+++ incubator/sirona/trunk/graphite/src/test/java/org/apache/sirona/graphite/GraphiteTestBase.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.graphite;
+package org.apache.sirona.graphite;
-import org.apache.commons.monitoring.configuration.Configuration;
-import org.apache.commons.monitoring.gauges.Gauge;
-import org.apache.commons.monitoring.graphite.server.GraphiteMockServer;
-import org.apache.commons.monitoring.repositories.Repository;
+import org.apache.sirona.configuration.Configuration;
+import org.apache.sirona.gauges.Gauge;
+import org.apache.sirona.graphite.server.GraphiteMockServer;
+import org.apache.sirona.repositories.Repository;
import org.junit.After;
import org.junit.Before;
Modified: incubator/sirona/trunk/graphite/src/test/java/org/apache/sirona/graphite/gauge/MockGauge.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/graphite/src/test/java/org/apache/sirona/graphite/gauge/MockGauge.java?rev=1534581&r1=1534560&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/graphite/src/test/java/org/apache/sirona/graphite/gauge/MockGauge.java (original)
+++ incubator/sirona/trunk/graphite/src/test/java/org/apache/sirona/graphite/gauge/MockGauge.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.graphite.gauge;
+package org.apache.sirona.graphite.gauge;
-import org.apache.commons.monitoring.Role;
-import org.apache.commons.monitoring.counters.Unit;
-import org.apache.commons.monitoring.gauges.Gauge;
+import org.apache.sirona.Role;
+import org.apache.sirona.counters.Unit;
+import org.apache.sirona.gauges.Gauge;
public class MockGauge implements Gauge {
public static final Role MOCK = new Role("mock", Unit.UNARY);
Modified: incubator/sirona/trunk/graphite/src/test/java/org/apache/sirona/graphite/server/GraphiteMockServer.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/graphite/src/test/java/org/apache/sirona/graphite/server/GraphiteMockServer.java?rev=1534581&r1=1534560&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/graphite/src/test/java/org/apache/sirona/graphite/server/GraphiteMockServer.java (original)
+++ incubator/sirona/trunk/graphite/src/test/java/org/apache/sirona/graphite/server/GraphiteMockServer.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.graphite.server;
+package org.apache.sirona.graphite.server;
import java.io.BufferedReader;
import java.io.IOException;
Copied: incubator/sirona/trunk/graphite/src/test/resources/META-INF/services/org.apache.sirona.gauges.Gauge (from r1534560, incubator/sirona/trunk/graphite/src/test/resources/META-INF/services/org.apache.commons.monitoring.gauges.Gauge)
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/graphite/src/test/resources/META-INF/services/org.apache.sirona.gauges.Gauge?p2=incubator/sirona/trunk/graphite/src/test/resources/META-INF/services/org.apache.sirona.gauges.Gauge&p1=incubator/sirona/trunk/graphite/src/test/resources/META-INF/services/org.apache.commons.monitoring.gauges.Gauge&r1=1534560&r2=1534581&rev=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/graphite/src/test/resources/META-INF/services/org.apache.commons.monitoring.gauges.Gauge (original)
+++ incubator/sirona/trunk/graphite/src/test/resources/META-INF/services/org.apache.sirona.gauges.Gauge Tue Oct 22 10:03:02 2013
@@ -1 +1 @@
-org.apache.commons.monitoring.graphite.gauge.MockGauge
+org.apache.sirona.graphite.gauge.MockGauge
Modified: incubator/sirona/trunk/graphite/src/test/resources/commons-monitoring.properties
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/graphite/src/test/resources/commons-monitoring.properties?rev=1534581&r1=1534580&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/graphite/src/test/resources/commons-monitoring.properties (original)
+++ incubator/sirona/trunk/graphite/src/test/resources/commons-monitoring.properties Tue Oct 22 10:03:02 2013
@@ -14,9 +14,9 @@
# 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.graphite.GraphiteDataStoreFactory
+org.apache.sirona.store.DataStoreFactory = org.apache.sirona.graphite.GraphiteDataStoreFactory
-org.apache.commons.monitoring.graphite.period = 100
+org.apache.sirona.graphite.period = 100
-org.apache.commons.monitoring.graphite.GraphiteBuilder.address = localhost
-org.apache.commons.monitoring.graphite.GraphiteBuilder.port = 1234
+org.apache.sirona.graphite.GraphiteBuilder.address = localhost
+org.apache.sirona.graphite.GraphiteBuilder.port = 1234
Copied: incubator/sirona/trunk/jdbc/src/main/java/org/apache/sirona/jdbc/ConnectionClosedCallBack.java (from r1534560, incubator/sirona/trunk/jdbc/src/main/java/org/apache/commons/monitoring/jdbc/ConnectionClosedCallBack.java)
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/jdbc/src/main/java/org/apache/sirona/jdbc/ConnectionClosedCallBack.java?p2=incubator/sirona/trunk/jdbc/src/main/java/org/apache/sirona/jdbc/ConnectionClosedCallBack.java&p1=incubator/sirona/trunk/jdbc/src/main/java/org/apache/commons/monitoring/jdbc/ConnectionClosedCallBack.java&r1=1534560&r2=1534581&rev=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/jdbc/src/main/java/org/apache/commons/monitoring/jdbc/ConnectionClosedCallBack.java (original)
+++ incubator/sirona/trunk/jdbc/src/main/java/org/apache/sirona/jdbc/ConnectionClosedCallBack.java Tue Oct 22 10:03:02 2013
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.commons.monitoring.jdbc;
+package org.apache.sirona.jdbc;
/**
* CallBack on connection beeing closed
Copied: incubator/sirona/trunk/jdbc/src/main/java/org/apache/sirona/jdbc/MonitoredConnection.java (from r1534560, incubator/sirona/trunk/jdbc/src/main/java/org/apache/commons/monitoring/jdbc/MonitoredConnection.java)
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/jdbc/src/main/java/org/apache/sirona/jdbc/MonitoredConnection.java?p2=incubator/sirona/trunk/jdbc/src/main/java/org/apache/sirona/jdbc/MonitoredConnection.java&p1=incubator/sirona/trunk/jdbc/src/main/java/org/apache/commons/monitoring/jdbc/MonitoredConnection.java&r1=1534560&r2=1534581&rev=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/jdbc/src/main/java/org/apache/commons/monitoring/jdbc/MonitoredConnection.java (original)
+++ incubator/sirona/trunk/jdbc/src/main/java/org/apache/sirona/jdbc/MonitoredConnection.java Tue Oct 22 10:03:02 2013
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.commons.monitoring.jdbc;
+package org.apache.sirona.jdbc;
-import org.apache.commons.monitoring.counters.Counter;
-import org.apache.commons.monitoring.stopwatches.CounterStopWatch;
-import org.apache.commons.monitoring.stopwatches.StopWatch;
-import org.apache.commons.monitoring.util.ClassLoaders;
+import org.apache.sirona.counters.Counter;
+import org.apache.sirona.stopwatches.CounterStopWatch;
+import org.apache.sirona.stopwatches.StopWatch;
+import org.apache.sirona.util.ClassLoaders;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.InvocationTargetException;
Copied: incubator/sirona/trunk/jdbc/src/main/java/org/apache/sirona/jdbc/MonitoredDataSource.java (from r1534560, incubator/sirona/trunk/jdbc/src/main/java/org/apache/commons/monitoring/jdbc/MonitoredDataSource.java)
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/jdbc/src/main/java/org/apache/sirona/jdbc/MonitoredDataSource.java?p2=incubator/sirona/trunk/jdbc/src/main/java/org/apache/sirona/jdbc/MonitoredDataSource.java&p1=incubator/sirona/trunk/jdbc/src/main/java/org/apache/commons/monitoring/jdbc/MonitoredDataSource.java&r1=1534560&r2=1534581&rev=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/jdbc/src/main/java/org/apache/commons/monitoring/jdbc/MonitoredDataSource.java (original)
+++ incubator/sirona/trunk/jdbc/src/main/java/org/apache/sirona/jdbc/MonitoredDataSource.java Tue Oct 22 10:03:02 2013
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.commons.monitoring.jdbc;
+package org.apache.sirona.jdbc;
-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 javax.sql.DataSource;
import java.io.PrintWriter;
Copied: incubator/sirona/trunk/jdbc/src/main/java/org/apache/sirona/jdbc/MonitoredPreparedStatement.java (from r1534560, incubator/sirona/trunk/jdbc/src/main/java/org/apache/commons/monitoring/jdbc/MonitoredPreparedStatement.java)
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/jdbc/src/main/java/org/apache/sirona/jdbc/MonitoredPreparedStatement.java?p2=incubator/sirona/trunk/jdbc/src/main/java/org/apache/sirona/jdbc/MonitoredPreparedStatement.java&p1=incubator/sirona/trunk/jdbc/src/main/java/org/apache/commons/monitoring/jdbc/MonitoredPreparedStatement.java&r1=1534560&r2=1534581&rev=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/jdbc/src/main/java/org/apache/commons/monitoring/jdbc/MonitoredPreparedStatement.java (original)
+++ incubator/sirona/trunk/jdbc/src/main/java/org/apache/sirona/jdbc/MonitoredPreparedStatement.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.jdbc;
+package org.apache.sirona.jdbc;
-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.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
Copied: incubator/sirona/trunk/jdbc/src/main/java/org/apache/sirona/jdbc/MonitoredStatement.java (from r1534560, incubator/sirona/trunk/jdbc/src/main/java/org/apache/commons/monitoring/jdbc/MonitoredStatement.java)
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/jdbc/src/main/java/org/apache/sirona/jdbc/MonitoredStatement.java?p2=incubator/sirona/trunk/jdbc/src/main/java/org/apache/sirona/jdbc/MonitoredStatement.java&p1=incubator/sirona/trunk/jdbc/src/main/java/org/apache/commons/monitoring/jdbc/MonitoredStatement.java&r1=1534560&r2=1534581&rev=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/jdbc/src/main/java/org/apache/commons/monitoring/jdbc/MonitoredStatement.java (original)
+++ incubator/sirona/trunk/jdbc/src/main/java/org/apache/sirona/jdbc/MonitoredStatement.java Tue Oct 22 10:03:02 2013
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.commons.monitoring.jdbc;
+package org.apache.sirona.jdbc;
-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.lang.reflect.InvocationHandler;
import java.lang.reflect.InvocationTargetException;
Copied: incubator/sirona/trunk/jdbc/src/main/java/org/apache/sirona/jdbc/MonitoringDriver.java (from r1534560, incubator/sirona/trunk/jdbc/src/main/java/org/apache/commons/monitoring/jdbc/MonitoringDriver.java)
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/jdbc/src/main/java/org/apache/sirona/jdbc/MonitoringDriver.java?p2=incubator/sirona/trunk/jdbc/src/main/java/org/apache/sirona/jdbc/MonitoringDriver.java&p1=incubator/sirona/trunk/jdbc/src/main/java/org/apache/commons/monitoring/jdbc/MonitoringDriver.java&r1=1534560&r2=1534581&rev=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/jdbc/src/main/java/org/apache/commons/monitoring/jdbc/MonitoringDriver.java (original)
+++ incubator/sirona/trunk/jdbc/src/main/java/org/apache/sirona/jdbc/MonitoringDriver.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.jdbc;
+package org.apache.sirona.jdbc;
-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 java.sql.Connection;
import java.sql.Driver;
@@ -42,7 +42,7 @@ public class MonitoringDriver implements
private static final String DRIVER_SUFFIX = "delegateDriver=";
public static void load() {
- } // sexier than Class.forName("org.apache.commons.monitoring.jdbc.MonitoringDriver"); in full java
+ } // sexier than Class.forName("org.apache.sirona.jdbc.MonitoringDriver"); in full java
@Override
public Connection connect(final String url, final Properties info) throws SQLException {
Copied: incubator/sirona/trunk/jdbc/src/test/java/org/apache/sirona/jdbc/HsqlDBTest.java (from r1534560, incubator/sirona/trunk/jdbc/src/test/java/org/apache/commons/monitoring/jdbc/HsqlDBTest.java)
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/jdbc/src/test/java/org/apache/sirona/jdbc/HsqlDBTest.java?p2=incubator/sirona/trunk/jdbc/src/test/java/org/apache/sirona/jdbc/HsqlDBTest.java&p1=incubator/sirona/trunk/jdbc/src/test/java/org/apache/commons/monitoring/jdbc/HsqlDBTest.java&r1=1534560&r2=1534581&rev=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/jdbc/src/test/java/org/apache/commons/monitoring/jdbc/HsqlDBTest.java (original)
+++ incubator/sirona/trunk/jdbc/src/test/java/org/apache/sirona/jdbc/HsqlDBTest.java Tue Oct 22 10:03:02 2013
@@ -14,11 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.monitoring.jdbc;
+package org.apache.sirona.jdbc;
-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.jdbc.MonitoredConnection;
+import org.apache.sirona.jdbc.MonitoringDriver;
+import org.apache.sirona.repositories.Repository;
import org.hsqldb.jdbcDriver;
import org.junit.BeforeClass;
import org.junit.Test;
Copied: incubator/sirona/trunk/jpa/src/main/java/org/apache/sirona/jpa/JPAProxyFactory.java (from r1534560, incubator/sirona/trunk/jpa/src/main/java/org/apache/commons/monitoring/jpa/JPAProxyFactory.java)
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/jpa/src/main/java/org/apache/sirona/jpa/JPAProxyFactory.java?p2=incubator/sirona/trunk/jpa/src/main/java/org/apache/sirona/jpa/JPAProxyFactory.java&p1=incubator/sirona/trunk/jpa/src/main/java/org/apache/commons/monitoring/jpa/JPAProxyFactory.java&r1=1534560&r2=1534581&rev=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/jpa/src/main/java/org/apache/commons/monitoring/jpa/JPAProxyFactory.java (original)
+++ incubator/sirona/trunk/jpa/src/main/java/org/apache/sirona/jpa/JPAProxyFactory.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.jpa;
+package org.apache.sirona.jpa;
-import org.apache.commons.monitoring.Role;
-import org.apache.commons.monitoring.aop.AbstractPerformanceInterceptor;
-import org.apache.commons.monitoring.util.ClassLoaders;
+import org.apache.sirona.Role;
+import org.apache.sirona.aop.AbstractPerformanceInterceptor;
+import org.apache.sirona.util.ClassLoaders;
import java.io.Serializable;
import java.lang.reflect.InvocationHandler;
Copied: incubator/sirona/trunk/jpa/src/main/java/org/apache/sirona/jpa/MonitoringPersistence.java (from r1534561, incubator/sirona/trunk/jpa/src/main/java/org/apache/commons/monitoring/jpa/MonitoringPersistence.java)
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/jpa/src/main/java/org/apache/sirona/jpa/MonitoringPersistence.java?p2=incubator/sirona/trunk/jpa/src/main/java/org/apache/sirona/jpa/MonitoringPersistence.java&p1=incubator/sirona/trunk/jpa/src/main/java/org/apache/commons/monitoring/jpa/MonitoringPersistence.java&r1=1534561&r2=1534581&rev=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/jpa/src/main/java/org/apache/commons/monitoring/jpa/MonitoringPersistence.java (original)
+++ incubator/sirona/trunk/jpa/src/main/java/org/apache/sirona/jpa/MonitoringPersistence.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.jpa;
+package org.apache.sirona.jpa;
-import org.apache.commons.monitoring.Role;
-import org.apache.commons.monitoring.configuration.Configuration;
-import org.apache.commons.monitoring.counters.Unit;
+import org.apache.sirona.Role;
+import org.apache.sirona.configuration.Configuration;
+import org.apache.sirona.counters.Unit;
import javax.persistence.EntityManagerFactory;
import javax.persistence.spi.PersistenceProvider;
@@ -30,7 +30,7 @@ import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
import java.util.Map;
-import static org.apache.commons.monitoring.jpa.JPAProxyFactory.monitor;
+import static org.apache.sirona.jpa.JPAProxyFactory.monitor;
public class MonitoringPersistence implements PersistenceProvider {
public static final Role ROLE = new Role("jpa", Unit.Time.NANOSECOND);
Copied: incubator/sirona/trunk/jpa/src/main/java/org/apache/sirona/jpa/OverridePersistenceXmlClassLoader.java (from r1534560, incubator/sirona/trunk/jpa/src/main/java/org/apache/commons/monitoring/jpa/OverridePersistenceXmlClassLoader.java)
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/jpa/src/main/java/org/apache/sirona/jpa/OverridePersistenceXmlClassLoader.java?p2=incubator/sirona/trunk/jpa/src/main/java/org/apache/sirona/jpa/OverridePersistenceXmlClassLoader.java&p1=incubator/sirona/trunk/jpa/src/main/java/org/apache/commons/monitoring/jpa/OverridePersistenceXmlClassLoader.java&r1=1534560&r2=1534581&rev=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/jpa/src/main/java/org/apache/commons/monitoring/jpa/OverridePersistenceXmlClassLoader.java (original)
+++ incubator/sirona/trunk/jpa/src/main/java/org/apache/sirona/jpa/OverridePersistenceXmlClassLoader.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.jpa;
+package org.apache.sirona.jpa;
-import org.apache.commons.monitoring.MonitoringException;
+import org.apache.sirona.MonitoringException;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
Modified: incubator/sirona/trunk/jpa/src/main/resources/META-INF/services/javax.persistence.spi.PersistenceProvider
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/jpa/src/main/resources/META-INF/services/javax.persistence.spi.PersistenceProvider?rev=1534581&r1=1534580&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/jpa/src/main/resources/META-INF/services/javax.persistence.spi.PersistenceProvider (original)
+++ incubator/sirona/trunk/jpa/src/main/resources/META-INF/services/javax.persistence.spi.PersistenceProvider Tue Oct 22 10:03:02 2013
@@ -1 +1 @@
-org.apache.commons.monitoring.jpa.MonitoringPersistence
+org.apache.sirona.jpa.MonitoringPersistence
Copied: incubator/sirona/trunk/jpa/src/test/java/org/apache/sirona/jpa/EMFTest.java (from r1534560, incubator/sirona/trunk/jpa/src/test/java/org/apache/commons/monitoring/jpa/EMFTest.java)
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/jpa/src/test/java/org/apache/sirona/jpa/EMFTest.java?p2=incubator/sirona/trunk/jpa/src/test/java/org/apache/sirona/jpa/EMFTest.java&p1=incubator/sirona/trunk/jpa/src/test/java/org/apache/commons/monitoring/jpa/EMFTest.java&r1=1534560&r2=1534581&rev=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/jpa/src/test/java/org/apache/commons/monitoring/jpa/EMFTest.java (original)
+++ incubator/sirona/trunk/jpa/src/test/java/org/apache/sirona/jpa/EMFTest.java Tue Oct 22 10:03:02 2013
@@ -14,11 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.monitoring.jpa;
+package org.apache.sirona.jpa;
import org.apache.commons.collections.IteratorUtils;
-import org.apache.commons.monitoring.counters.Counter;
-import org.apache.commons.monitoring.repositories.Repository;
+import org.apache.sirona.counters.Counter;
+import org.apache.sirona.jpa.MonitoringPersistence;
+import org.apache.sirona.repositories.Repository;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
Copied: incubator/sirona/trunk/jpa/src/test/java/org/apache/sirona/jpa/QueryTest.java (from r1534560, incubator/sirona/trunk/jpa/src/test/java/org/apache/commons/monitoring/jpa/QueryTest.java)
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/jpa/src/test/java/org/apache/sirona/jpa/QueryTest.java?p2=incubator/sirona/trunk/jpa/src/test/java/org/apache/sirona/jpa/QueryTest.java&p1=incubator/sirona/trunk/jpa/src/test/java/org/apache/commons/monitoring/jpa/QueryTest.java&r1=1534560&r2=1534581&rev=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/jpa/src/test/java/org/apache/commons/monitoring/jpa/QueryTest.java (original)
+++ incubator/sirona/trunk/jpa/src/test/java/org/apache/sirona/jpa/QueryTest.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.jpa;
+package org.apache.sirona.jpa;
-import org.apache.commons.monitoring.counters.Counter;
-import org.apache.commons.monitoring.jpa.entity.Person;
-import org.apache.commons.monitoring.repositories.Repository;
+import org.apache.sirona.counters.Counter;
+import org.apache.sirona.jpa.entity.Person;
+import org.apache.sirona.repositories.Repository;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
Modified: incubator/sirona/trunk/jpa/src/test/java/org/apache/sirona/jpa/entity/Address.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/jpa/src/test/java/org/apache/sirona/jpa/entity/Address.java?rev=1534581&r1=1534560&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/jpa/src/test/java/org/apache/sirona/jpa/entity/Address.java (original)
+++ incubator/sirona/trunk/jpa/src/test/java/org/apache/sirona/jpa/entity/Address.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.jpa.entity;
+package org.apache.sirona.jpa.entity;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
Modified: incubator/sirona/trunk/jpa/src/test/java/org/apache/sirona/jpa/entity/Person.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/jpa/src/test/java/org/apache/sirona/jpa/entity/Person.java?rev=1534581&r1=1534560&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/jpa/src/test/java/org/apache/sirona/jpa/entity/Person.java (original)
+++ incubator/sirona/trunk/jpa/src/test/java/org/apache/sirona/jpa/entity/Person.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.jpa.entity;
+package org.apache.sirona.jpa.entity;
import javax.persistence.CascadeType;
import javax.persistence.Entity;
Modified: incubator/sirona/trunk/jpa/src/test/resources/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/jpa/src/test/resources/META-INF/persistence.xml?rev=1534581&r1=1534580&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/jpa/src/test/resources/META-INF/persistence.xml (original)
+++ incubator/sirona/trunk/jpa/src/test/resources/META-INF/persistence.xml Tue Oct 22 10:03:02 2013
@@ -21,9 +21,9 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/persistence
http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
<persistence-unit name="test-jse" transaction-type="RESOURCE_LOCAL">
- <provider>org.apache.commons.monitoring.jpa.MonitoringPersistence</provider>
- <class>org.apache.commons.monitoring.jpa.entity.Person</class>
- <class>org.apache.commons.monitoring.jpa.entity.Address</class>
+ <provider>org.apache.sirona.jpa.MonitoringPersistence</provider>
+ <class>org.apache.sirona.jpa.entity.Person</class>
+ <class>org.apache.sirona.jpa.entity.Address</class>
<properties>
<property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true)"/>
<property name="openjpa.ConnectionURL" value="jdbc:hsqldb:mem:jpa;create=true"/>
@@ -34,9 +34,9 @@
</properties>
</persistence-unit>
<persistence-unit name="test-jta">
- <provider>org.apache.commons.monitoring.jpa.MonitoringPersistence</provider>
- <class>org.apache.commons.monitoring.jpa.entity.Person</class>
- <class>org.apache.commons.monitoring.jpa.entity.Address</class>
+ <provider>org.apache.sirona.jpa.MonitoringPersistence</provider>
+ <class>org.apache.sirona.jpa.entity.Person</class>
+ <class>org.apache.sirona.jpa.entity.Address</class>
<properties>
<property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true)"/>
<property name="openjpa.ConnectionURL" value="jdbc:hsqldb:mem:jpa;create=true"/>
Copied: incubator/sirona/trunk/jta/src/main/java/org/apache/sirona/jta/JTAGauges.java (from r1534560, incubator/sirona/trunk/jta/src/main/java/org/apache/commons/monitoring/jta/JTAGauges.java)
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/jta/src/main/java/org/apache/sirona/jta/JTAGauges.java?p2=incubator/sirona/trunk/jta/src/main/java/org/apache/sirona/jta/JTAGauges.java&p1=incubator/sirona/trunk/jta/src/main/java/org/apache/commons/monitoring/jta/JTAGauges.java&r1=1534560&r2=1534581&rev=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/jta/src/main/java/org/apache/commons/monitoring/jta/JTAGauges.java (original)
+++ incubator/sirona/trunk/jta/src/main/java/org/apache/sirona/jta/JTAGauges.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.jta;
+package org.apache.sirona.jta;
-import org.apache.commons.monitoring.Role;
-import org.apache.commons.monitoring.configuration.Configuration;
-import org.apache.commons.monitoring.counters.Unit;
-import org.apache.commons.monitoring.gauges.Gauge;
-import org.apache.commons.monitoring.gauges.GaugeFactory;
+import org.apache.sirona.Role;
+import org.apache.sirona.configuration.Configuration;
+import org.apache.sirona.counters.Unit;
+import org.apache.sirona.gauges.Gauge;
+import org.apache.sirona.gauges.GaugeFactory;
import java.util.concurrent.atomic.AtomicLong;
Copied: incubator/sirona/trunk/jta/src/main/java/org/apache/sirona/jta/JTAInterceptor.java (from r1534560, incubator/sirona/trunk/jta/src/main/java/org/apache/commons/monitoring/jta/JTAInterceptor.java)
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/jta/src/main/java/org/apache/sirona/jta/JTAInterceptor.java?p2=incubator/sirona/trunk/jta/src/main/java/org/apache/sirona/jta/JTAInterceptor.java&p1=incubator/sirona/trunk/jta/src/main/java/org/apache/commons/monitoring/jta/JTAInterceptor.java&r1=1534560&r2=1534581&rev=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/jta/src/main/java/org/apache/commons/monitoring/jta/JTAInterceptor.java (original)
+++ incubator/sirona/trunk/jta/src/main/java/org/apache/sirona/jta/JTAInterceptor.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.jta;
+package org.apache.sirona.jta;
import javax.annotation.Resource;
import javax.interceptor.AroundInvoke;
Copied: incubator/sirona/trunk/jta/src/main/java/org/apache/sirona/jta/JTAMonitored.java (from r1534560, incubator/sirona/trunk/jta/src/main/java/org/apache/commons/monitoring/jta/JTAMonitored.java)
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/jta/src/main/java/org/apache/sirona/jta/JTAMonitored.java?p2=incubator/sirona/trunk/jta/src/main/java/org/apache/sirona/jta/JTAMonitored.java&p1=incubator/sirona/trunk/jta/src/main/java/org/apache/commons/monitoring/jta/JTAMonitored.java&r1=1534560&r2=1534581&rev=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/jta/src/main/java/org/apache/commons/monitoring/jta/JTAMonitored.java (original)
+++ incubator/sirona/trunk/jta/src/main/java/org/apache/sirona/jta/JTAMonitored.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.jta;
+package org.apache.sirona.jta;
import javax.interceptor.InterceptorBinding;
import java.lang.annotation.ElementType;
Modified: incubator/sirona/trunk/jta/src/main/resources/META-INF/beans.xml
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/jta/src/main/resources/META-INF/beans.xml?rev=1534581&r1=1534580&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/jta/src/main/resources/META-INF/beans.xml (original)
+++ incubator/sirona/trunk/jta/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.jta.JTAInterceptor</class>
+ <class>org.apache.sirona.jta.JTAInterceptor</class>
</interceptors>
</beans>