This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.commons.metrics-0.0.2 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-metrics.git
commit 79e3480b483b6b0de991935eae148ff85e5e5d45 Author: Chetan Mehrotra <[email protected]> AuthorDate: Thu Jan 7 04:39:38 2016 +0000 SLING-4080 - API to capture/measure application-level metrics Rename the package to 'org.apache.sling.commons.metrics' git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/commons/metrics@1723459 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/sling/{ => commons}/metrics/Counter.java | 2 +- .../org/apache/sling/{ => commons}/metrics/Counting.java | 2 +- .../apache/sling/{ => commons}/metrics/Histogram.java | 2 +- .../org/apache/sling/{ => commons}/metrics/Meter.java | 2 +- .../org/apache/sling/{ => commons}/metrics/Metric.java | 2 +- .../sling/{ => commons}/metrics/MetricsService.java | 2 +- .../apache/sling/{ => commons}/metrics/NoopMetric.java | 2 +- .../org/apache/sling/{ => commons}/metrics/Timer.java | 2 +- .../{ => commons}/metrics/internal/CounterImpl.java | 4 ++-- .../{ => commons}/metrics/internal/HistogramImpl.java | 4 ++-- .../sling/{ => commons}/metrics/internal/MeterImpl.java | 4 ++-- .../metrics/internal/MetricWebConsolePlugin.java | 2 +- .../metrics/internal/MetricsServiceImpl.java | 16 ++++++++-------- .../sling/{ => commons}/metrics/internal/TimerImpl.java | 4 ++-- .../apache/sling/{ => commons}/metrics/package-info.java | 2 +- .../metrics/internal/MetricServiceTest.java | 12 ++++++------ .../metrics/internal/MetricWrapperTest.java | 4 ++-- 17 files changed, 34 insertions(+), 34 deletions(-) diff --git a/src/main/java/org/apache/sling/metrics/Counter.java b/src/main/java/org/apache/sling/commons/metrics/Counter.java similarity index 97% rename from src/main/java/org/apache/sling/metrics/Counter.java rename to src/main/java/org/apache/sling/commons/metrics/Counter.java index b828aa5..a4b317a 100644 --- a/src/main/java/org/apache/sling/metrics/Counter.java +++ b/src/main/java/org/apache/sling/commons/metrics/Counter.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.sling.metrics; +package org.apache.sling.commons.metrics; import aQute.bnd.annotation.ProviderType; diff --git a/src/main/java/org/apache/sling/metrics/Counting.java b/src/main/java/org/apache/sling/commons/metrics/Counting.java similarity index 96% rename from src/main/java/org/apache/sling/metrics/Counting.java rename to src/main/java/org/apache/sling/commons/metrics/Counting.java index 309decd..890d650 100644 --- a/src/main/java/org/apache/sling/metrics/Counting.java +++ b/src/main/java/org/apache/sling/commons/metrics/Counting.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.sling.metrics; +package org.apache.sling.commons.metrics; import aQute.bnd.annotation.ProviderType; diff --git a/src/main/java/org/apache/sling/metrics/Histogram.java b/src/main/java/org/apache/sling/commons/metrics/Histogram.java similarity index 96% rename from src/main/java/org/apache/sling/metrics/Histogram.java rename to src/main/java/org/apache/sling/commons/metrics/Histogram.java index 37938f5..3d1e082 100644 --- a/src/main/java/org/apache/sling/metrics/Histogram.java +++ b/src/main/java/org/apache/sling/commons/metrics/Histogram.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.sling.metrics; +package org.apache.sling.commons.metrics; import aQute.bnd.annotation.ProviderType; diff --git a/src/main/java/org/apache/sling/metrics/Meter.java b/src/main/java/org/apache/sling/commons/metrics/Meter.java similarity index 96% rename from src/main/java/org/apache/sling/metrics/Meter.java rename to src/main/java/org/apache/sling/commons/metrics/Meter.java index a4914d7..e239c54 100644 --- a/src/main/java/org/apache/sling/metrics/Meter.java +++ b/src/main/java/org/apache/sling/commons/metrics/Meter.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.sling.metrics; +package org.apache.sling.commons.metrics; import aQute.bnd.annotation.ProviderType; diff --git a/src/main/java/org/apache/sling/metrics/Metric.java b/src/main/java/org/apache/sling/commons/metrics/Metric.java similarity index 96% rename from src/main/java/org/apache/sling/metrics/Metric.java rename to src/main/java/org/apache/sling/commons/metrics/Metric.java index 4952017..b8a12bb 100644 --- a/src/main/java/org/apache/sling/metrics/Metric.java +++ b/src/main/java/org/apache/sling/commons/metrics/Metric.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.sling.metrics; +package org.apache.sling.commons.metrics; import aQute.bnd.annotation.ProviderType; diff --git a/src/main/java/org/apache/sling/metrics/MetricsService.java b/src/main/java/org/apache/sling/commons/metrics/MetricsService.java similarity index 98% rename from src/main/java/org/apache/sling/metrics/MetricsService.java rename to src/main/java/org/apache/sling/commons/metrics/MetricsService.java index 8c51d4b..8d2c04f 100644 --- a/src/main/java/org/apache/sling/metrics/MetricsService.java +++ b/src/main/java/org/apache/sling/commons/metrics/MetricsService.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.sling.metrics; +package org.apache.sling.commons.metrics; import aQute.bnd.annotation.ProviderType; diff --git a/src/main/java/org/apache/sling/metrics/NoopMetric.java b/src/main/java/org/apache/sling/commons/metrics/NoopMetric.java similarity index 97% rename from src/main/java/org/apache/sling/metrics/NoopMetric.java rename to src/main/java/org/apache/sling/commons/metrics/NoopMetric.java index 210fb3c..f1595ff 100644 --- a/src/main/java/org/apache/sling/metrics/NoopMetric.java +++ b/src/main/java/org/apache/sling/commons/metrics/NoopMetric.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.sling.metrics; +package org.apache.sling.commons.metrics; import java.util.concurrent.TimeUnit; diff --git a/src/main/java/org/apache/sling/metrics/Timer.java b/src/main/java/org/apache/sling/commons/metrics/Timer.java similarity index 97% rename from src/main/java/org/apache/sling/metrics/Timer.java rename to src/main/java/org/apache/sling/commons/metrics/Timer.java index 602a0cb..a142953 100644 --- a/src/main/java/org/apache/sling/metrics/Timer.java +++ b/src/main/java/org/apache/sling/commons/metrics/Timer.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.sling.metrics; +package org.apache.sling.commons.metrics; import java.io.Closeable; import java.util.concurrent.TimeUnit; diff --git a/src/main/java/org/apache/sling/metrics/internal/CounterImpl.java b/src/main/java/org/apache/sling/commons/metrics/internal/CounterImpl.java similarity index 94% rename from src/main/java/org/apache/sling/metrics/internal/CounterImpl.java rename to src/main/java/org/apache/sling/commons/metrics/internal/CounterImpl.java index 0137b71..f929410 100644 --- a/src/main/java/org/apache/sling/metrics/internal/CounterImpl.java +++ b/src/main/java/org/apache/sling/commons/metrics/internal/CounterImpl.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.sling.metrics.internal; +package org.apache.sling.commons.metrics.internal; -import org.apache.sling.metrics.Counter; +import org.apache.sling.commons.metrics.Counter; final class CounterImpl implements Counter { private final com.codahale.metrics.Counter counter; diff --git a/src/main/java/org/apache/sling/metrics/internal/HistogramImpl.java b/src/main/java/org/apache/sling/commons/metrics/internal/HistogramImpl.java similarity index 93% rename from src/main/java/org/apache/sling/metrics/internal/HistogramImpl.java rename to src/main/java/org/apache/sling/commons/metrics/internal/HistogramImpl.java index 15117e9..3507e3a 100644 --- a/src/main/java/org/apache/sling/metrics/internal/HistogramImpl.java +++ b/src/main/java/org/apache/sling/commons/metrics/internal/HistogramImpl.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.sling.metrics.internal; +package org.apache.sling.commons.metrics.internal; -import org.apache.sling.metrics.Histogram; +import org.apache.sling.commons.metrics.Histogram; final class HistogramImpl implements Histogram { private final com.codahale.metrics.Histogram histogram; diff --git a/src/main/java/org/apache/sling/metrics/internal/MeterImpl.java b/src/main/java/org/apache/sling/commons/metrics/internal/MeterImpl.java similarity index 93% rename from src/main/java/org/apache/sling/metrics/internal/MeterImpl.java rename to src/main/java/org/apache/sling/commons/metrics/internal/MeterImpl.java index 719d356..83d4ff7 100644 --- a/src/main/java/org/apache/sling/metrics/internal/MeterImpl.java +++ b/src/main/java/org/apache/sling/commons/metrics/internal/MeterImpl.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.sling.metrics.internal; +package org.apache.sling.commons.metrics.internal; -import org.apache.sling.metrics.Meter; +import org.apache.sling.commons.metrics.Meter; final class MeterImpl implements Meter { private final com.codahale.metrics.Meter meter; diff --git a/src/main/java/org/apache/sling/metrics/internal/MetricWebConsolePlugin.java b/src/main/java/org/apache/sling/commons/metrics/internal/MetricWebConsolePlugin.java similarity index 99% rename from src/main/java/org/apache/sling/metrics/internal/MetricWebConsolePlugin.java rename to src/main/java/org/apache/sling/commons/metrics/internal/MetricWebConsolePlugin.java index 180acca..8796168 100644 --- a/src/main/java/org/apache/sling/metrics/internal/MetricWebConsolePlugin.java +++ b/src/main/java/org/apache/sling/commons/metrics/internal/MetricWebConsolePlugin.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.sling.metrics.internal; +package org.apache.sling.commons.metrics.internal; import java.io.IOException; import java.io.PrintStream; diff --git a/src/main/java/org/apache/sling/metrics/internal/MetricsServiceImpl.java b/src/main/java/org/apache/sling/commons/metrics/internal/MetricsServiceImpl.java similarity index 94% rename from src/main/java/org/apache/sling/metrics/internal/MetricsServiceImpl.java rename to src/main/java/org/apache/sling/commons/metrics/internal/MetricsServiceImpl.java index dea3ea2..729d555 100644 --- a/src/main/java/org/apache/sling/metrics/internal/MetricsServiceImpl.java +++ b/src/main/java/org/apache/sling/commons/metrics/internal/MetricsServiceImpl.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.sling.metrics.internal; +package org.apache.sling.commons.metrics.internal; import java.io.IOException; import java.util.ArrayList; @@ -36,18 +36,18 @@ import org.apache.felix.scr.annotations.Activate; import org.apache.felix.scr.annotations.Component; import org.apache.felix.scr.annotations.Deactivate; import org.apache.felix.scr.annotations.Reference; -import org.apache.sling.metrics.Counter; -import org.apache.sling.metrics.Histogram; -import org.apache.sling.metrics.Meter; -import org.apache.sling.metrics.Metric; -import org.apache.sling.metrics.MetricsService; -import org.apache.sling.metrics.Timer; +import org.apache.sling.commons.metrics.Meter; +import org.apache.sling.commons.metrics.MetricsService; +import org.apache.sling.commons.metrics.Timer; +import org.apache.sling.commons.metrics.Counter; +import org.apache.sling.commons.metrics.Histogram; +import org.apache.sling.commons.metrics.Metric; import org.osgi.framework.BundleContext; import org.osgi.framework.Constants; import org.osgi.framework.ServiceRegistration; @Component -public class MetricsServiceImpl implements MetricsService{ +public class MetricsServiceImpl implements MetricsService { private final List<ServiceRegistration> regs = new ArrayList<ServiceRegistration>(); private final ConcurrentMap<String, Metric> metrics = new ConcurrentHashMap<String, Metric>(); private final MetricRegistry registry = new MetricRegistry(); diff --git a/src/main/java/org/apache/sling/metrics/internal/TimerImpl.java b/src/main/java/org/apache/sling/commons/metrics/internal/TimerImpl.java similarity index 95% rename from src/main/java/org/apache/sling/metrics/internal/TimerImpl.java rename to src/main/java/org/apache/sling/commons/metrics/internal/TimerImpl.java index 54fd39c..cf9d87f 100644 --- a/src/main/java/org/apache/sling/metrics/internal/TimerImpl.java +++ b/src/main/java/org/apache/sling/commons/metrics/internal/TimerImpl.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.sling.metrics.internal; +package org.apache.sling.commons.metrics.internal; import java.util.concurrent.TimeUnit; -import org.apache.sling.metrics.Timer; +import org.apache.sling.commons.metrics.Timer; final class TimerImpl implements Timer { diff --git a/src/main/java/org/apache/sling/metrics/package-info.java b/src/main/java/org/apache/sling/commons/metrics/package-info.java similarity index 96% rename from src/main/java/org/apache/sling/metrics/package-info.java rename to src/main/java/org/apache/sling/commons/metrics/package-info.java index 9b4ae51..1180f06 100644 --- a/src/main/java/org/apache/sling/metrics/package-info.java +++ b/src/main/java/org/apache/sling/commons/metrics/package-info.java @@ -24,7 +24,7 @@ */ @Version("1.0") @Export(optional = "provide:=true") -package org.apache.sling.metrics; +package org.apache.sling.commons.metrics; import aQute.bnd.annotation.Export; import aQute.bnd.annotation.Version; diff --git a/src/test/java/org/apache/sling/metrics/internal/MetricServiceTest.java b/src/test/java/org/apache/sling/commons/metrics/internal/MetricServiceTest.java similarity index 91% rename from src/test/java/org/apache/sling/metrics/internal/MetricServiceTest.java rename to src/test/java/org/apache/sling/commons/metrics/internal/MetricServiceTest.java index e62daad..9dff1e9 100644 --- a/src/test/java/org/apache/sling/metrics/internal/MetricServiceTest.java +++ b/src/test/java/org/apache/sling/commons/metrics/internal/MetricServiceTest.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.sling.metrics.internal; +package org.apache.sling.commons.metrics.internal; import java.lang.management.ManagementFactory; import java.util.Collections; @@ -25,11 +25,11 @@ import java.util.Collections; import javax.management.MBeanServer; import com.codahale.metrics.MetricRegistry; -import org.apache.sling.metrics.Counter; -import org.apache.sling.metrics.Histogram; -import org.apache.sling.metrics.Meter; -import org.apache.sling.metrics.MetricsService; -import org.apache.sling.metrics.Timer; +import org.apache.sling.commons.metrics.Counter; +import org.apache.sling.commons.metrics.Histogram; +import org.apache.sling.commons.metrics.Meter; +import org.apache.sling.commons.metrics.MetricsService; +import org.apache.sling.commons.metrics.Timer; import org.apache.sling.testing.mock.osgi.MockOsgi; import org.apache.sling.testing.mock.osgi.junit.OsgiContext; import org.junit.After; diff --git a/src/test/java/org/apache/sling/metrics/internal/MetricWrapperTest.java b/src/test/java/org/apache/sling/commons/metrics/internal/MetricWrapperTest.java similarity index 96% rename from src/test/java/org/apache/sling/metrics/internal/MetricWrapperTest.java rename to src/test/java/org/apache/sling/commons/metrics/internal/MetricWrapperTest.java index 898626c..5489b31 100644 --- a/src/test/java/org/apache/sling/metrics/internal/MetricWrapperTest.java +++ b/src/test/java/org/apache/sling/commons/metrics/internal/MetricWrapperTest.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.sling.metrics.internal; +package org.apache.sling.commons.metrics.internal; import java.util.concurrent.TimeUnit; @@ -113,7 +113,7 @@ public class MetricWrapperTest { Timer time = new Timer(new ExponentiallyDecayingReservoir(), clock); TimerImpl timerStats = new TimerImpl(time); - org.apache.sling.metrics.Timer.Context context = timerStats.time(); + org.apache.sling.commons.metrics.Timer.Context context = timerStats.time(); clock.tick = TimeUnit.SECONDS.toNanos(314); context.close(); -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
