Author: chetanm
Date: Thu Jan 7 04:39:38 2016
New Revision: 1723459
URL: http://svn.apache.org/viewvc?rev=1723459&view=rev
Log:
SLING-4080 - API to capture/measure application-level metrics
Rename the package to 'org.apache.sling.commons.metrics'
Added:
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/Counter.java
(contents, props changed)
- copied, changed from r1723457,
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/metrics/Counter.java
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/Counting.java
(contents, props changed)
- copied, changed from r1723457,
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/metrics/Counting.java
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/Histogram.java
(contents, props changed)
- copied, changed from r1723457,
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/metrics/Histogram.java
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/Meter.java
(contents, props changed)
- copied, changed from r1723457,
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/metrics/Meter.java
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/Metric.java
(contents, props changed)
- copied, changed from r1723457,
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/metrics/Metric.java
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/MetricsService.java
(contents, props changed)
- copied, changed from r1723457,
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/metrics/MetricsService.java
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/NoopMetric.java
(contents, props changed)
- copied, changed from r1723457,
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/metrics/NoopMetric.java
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/Timer.java
(contents, props changed)
- copied, changed from r1723457,
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/metrics/Timer.java
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/internal/
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/internal/CounterImpl.java
(contents, props changed)
- copied, changed from r1723457,
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/metrics/internal/CounterImpl.java
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/internal/HistogramImpl.java
(contents, props changed)
- copied, changed from r1723457,
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/metrics/internal/HistogramImpl.java
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/internal/MeterImpl.java
(contents, props changed)
- copied, changed from r1723457,
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/metrics/internal/MeterImpl.java
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/internal/MetricWebConsolePlugin.java
(contents, props changed)
- copied, changed from r1723457,
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/metrics/internal/MetricWebConsolePlugin.java
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/internal/MetricsServiceImpl.java
(contents, props changed)
- copied, changed from r1723457,
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/metrics/internal/MetricsServiceImpl.java
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/internal/TimerImpl.java
(contents, props changed)
- copied, changed from r1723457,
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/metrics/internal/TimerImpl.java
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/package-info.java
(contents, props changed)
- copied, changed from r1723457,
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/metrics/package-info.java
sling/trunk/bundles/commons/metrics/src/test/java/org/apache/sling/commons/
sling/trunk/bundles/commons/metrics/src/test/java/org/apache/sling/commons/metrics/
sling/trunk/bundles/commons/metrics/src/test/java/org/apache/sling/commons/metrics/internal/
sling/trunk/bundles/commons/metrics/src/test/java/org/apache/sling/commons/metrics/internal/MetricServiceTest.java
(contents, props changed)
- copied, changed from r1723457,
sling/trunk/bundles/commons/metrics/src/test/java/org/apache/sling/metrics/internal/MetricServiceTest.java
sling/trunk/bundles/commons/metrics/src/test/java/org/apache/sling/commons/metrics/internal/MetricWrapperTest.java
(contents, props changed)
- copied, changed from r1723457,
sling/trunk/bundles/commons/metrics/src/test/java/org/apache/sling/metrics/internal/MetricWrapperTest.java
Removed:
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/metrics/
sling/trunk/bundles/commons/metrics/src/test/java/org/apache/sling/metrics/
Copied:
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/Counter.java
(from r1723457,
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/metrics/Counter.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/Counter.java?p2=sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/Counter.java&p1=sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/metrics/Counter.java&r1=1723457&r2=1723459&rev=1723459&view=diff
==============================================================================
---
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/metrics/Counter.java
(original)
+++
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/Counter.java
Thu Jan 7 04:39:38 2016
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.sling.metrics;
+package org.apache.sling.commons.metrics;
import aQute.bnd.annotation.ProviderType;
Propchange:
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/Counter.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied:
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/Counting.java
(from r1723457,
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/metrics/Counting.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/Counting.java?p2=sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/Counting.java&p1=sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/metrics/Counting.java&r1=1723457&r2=1723459&rev=1723459&view=diff
==============================================================================
---
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/metrics/Counting.java
(original)
+++
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/Counting.java
Thu Jan 7 04:39:38 2016
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.sling.metrics;
+package org.apache.sling.commons.metrics;
import aQute.bnd.annotation.ProviderType;
Propchange:
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/Counting.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied:
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/Histogram.java
(from r1723457,
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/metrics/Histogram.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/Histogram.java?p2=sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/Histogram.java&p1=sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/metrics/Histogram.java&r1=1723457&r2=1723459&rev=1723459&view=diff
==============================================================================
---
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/metrics/Histogram.java
(original)
+++
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/Histogram.java
Thu Jan 7 04:39:38 2016
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.sling.metrics;
+package org.apache.sling.commons.metrics;
import aQute.bnd.annotation.ProviderType;
Propchange:
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/Histogram.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied:
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/Meter.java
(from r1723457,
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/metrics/Meter.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/Meter.java?p2=sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/Meter.java&p1=sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/metrics/Meter.java&r1=1723457&r2=1723459&rev=1723459&view=diff
==============================================================================
---
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/metrics/Meter.java
(original)
+++
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/Meter.java
Thu Jan 7 04:39:38 2016
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.sling.metrics;
+package org.apache.sling.commons.metrics;
import aQute.bnd.annotation.ProviderType;
Propchange:
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/Meter.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied:
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/Metric.java
(from r1723457,
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/metrics/Metric.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/Metric.java?p2=sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/Metric.java&p1=sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/metrics/Metric.java&r1=1723457&r2=1723459&rev=1723459&view=diff
==============================================================================
---
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/metrics/Metric.java
(original)
+++
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/Metric.java
Thu Jan 7 04:39:38 2016
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.sling.metrics;
+package org.apache.sling.commons.metrics;
import aQute.bnd.annotation.ProviderType;
Propchange:
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/Metric.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied:
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/MetricsService.java
(from r1723457,
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/metrics/MetricsService.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/MetricsService.java?p2=sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/MetricsService.java&p1=sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/metrics/MetricsService.java&r1=1723457&r2=1723459&rev=1723459&view=diff
==============================================================================
---
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/metrics/MetricsService.java
(original)
+++
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/MetricsService.java
Thu Jan 7 04:39:38 2016
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.sling.metrics;
+package org.apache.sling.commons.metrics;
import aQute.bnd.annotation.ProviderType;
Propchange:
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/MetricsService.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied:
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/NoopMetric.java
(from r1723457,
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/metrics/NoopMetric.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/NoopMetric.java?p2=sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/NoopMetric.java&p1=sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/metrics/NoopMetric.java&r1=1723457&r2=1723459&rev=1723459&view=diff
==============================================================================
---
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/metrics/NoopMetric.java
(original)
+++
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/NoopMetric.java
Thu Jan 7 04:39:38 2016
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.sling.metrics;
+package org.apache.sling.commons.metrics;
import java.util.concurrent.TimeUnit;
Propchange:
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/NoopMetric.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied:
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/Timer.java
(from r1723457,
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/metrics/Timer.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/Timer.java?p2=sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/Timer.java&p1=sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/metrics/Timer.java&r1=1723457&r2=1723459&rev=1723459&view=diff
==============================================================================
---
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/metrics/Timer.java
(original)
+++
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/Timer.java
Thu Jan 7 04:39:38 2016
@@ -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;
Propchange:
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/Timer.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied:
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/internal/CounterImpl.java
(from r1723457,
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/metrics/internal/CounterImpl.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/internal/CounterImpl.java?p2=sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/internal/CounterImpl.java&p1=sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/metrics/internal/CounterImpl.java&r1=1723457&r2=1723459&rev=1723459&view=diff
==============================================================================
---
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/metrics/internal/CounterImpl.java
(original)
+++
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/internal/CounterImpl.java
Thu Jan 7 04:39:38 2016
@@ -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;
Propchange:
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/internal/CounterImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied:
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/internal/HistogramImpl.java
(from r1723457,
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/metrics/internal/HistogramImpl.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/internal/HistogramImpl.java?p2=sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/internal/HistogramImpl.java&p1=sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/metrics/internal/HistogramImpl.java&r1=1723457&r2=1723459&rev=1723459&view=diff
==============================================================================
---
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/metrics/internal/HistogramImpl.java
(original)
+++
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/internal/HistogramImpl.java
Thu Jan 7 04:39:38 2016
@@ -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;
Propchange:
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/internal/HistogramImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied:
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/internal/MeterImpl.java
(from r1723457,
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/metrics/internal/MeterImpl.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/internal/MeterImpl.java?p2=sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/internal/MeterImpl.java&p1=sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/metrics/internal/MeterImpl.java&r1=1723457&r2=1723459&rev=1723459&view=diff
==============================================================================
---
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/metrics/internal/MeterImpl.java
(original)
+++
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/internal/MeterImpl.java
Thu Jan 7 04:39:38 2016
@@ -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;
Propchange:
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/internal/MeterImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied:
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/internal/MetricWebConsolePlugin.java
(from r1723457,
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/metrics/internal/MetricWebConsolePlugin.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/internal/MetricWebConsolePlugin.java?p2=sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/internal/MetricWebConsolePlugin.java&p1=sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/metrics/internal/MetricWebConsolePlugin.java&r1=1723457&r2=1723459&rev=1723459&view=diff
==============================================================================
---
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/metrics/internal/MetricWebConsolePlugin.java
(original)
+++
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/internal/MetricWebConsolePlugin.java
Thu Jan 7 04:39:38 2016
@@ -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;
Propchange:
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/internal/MetricWebConsolePlugin.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied:
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/internal/MetricsServiceImpl.java
(from r1723457,
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/metrics/internal/MetricsServiceImpl.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/internal/MetricsServiceImpl.java?p2=sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/internal/MetricsServiceImpl.java&p1=sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/metrics/internal/MetricsServiceImpl.java&r1=1723457&r2=1723459&rev=1723459&view=diff
==============================================================================
---
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/metrics/internal/MetricsServiceImpl.java
(original)
+++
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/internal/MetricsServiceImpl.java
Thu Jan 7 04:39:38 2016
@@ -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.
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();
Propchange:
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/internal/MetricsServiceImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied:
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/internal/TimerImpl.java
(from r1723457,
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/metrics/internal/TimerImpl.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/internal/TimerImpl.java?p2=sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/internal/TimerImpl.java&p1=sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/metrics/internal/TimerImpl.java&r1=1723457&r2=1723459&rev=1723459&view=diff
==============================================================================
---
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/metrics/internal/TimerImpl.java
(original)
+++
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/internal/TimerImpl.java
Thu Jan 7 04:39:38 2016
@@ -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 {
Propchange:
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/internal/TimerImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied:
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/package-info.java
(from r1723457,
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/metrics/package-info.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/package-info.java?p2=sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/package-info.java&p1=sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/metrics/package-info.java&r1=1723457&r2=1723459&rev=1723459&view=diff
==============================================================================
---
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/metrics/package-info.java
(original)
+++
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/package-info.java
Thu Jan 7 04:39:38 2016
@@ -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;
Propchange:
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/package-info.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied:
sling/trunk/bundles/commons/metrics/src/test/java/org/apache/sling/commons/metrics/internal/MetricServiceTest.java
(from r1723457,
sling/trunk/bundles/commons/metrics/src/test/java/org/apache/sling/metrics/internal/MetricServiceTest.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/commons/metrics/src/test/java/org/apache/sling/commons/metrics/internal/MetricServiceTest.java?p2=sling/trunk/bundles/commons/metrics/src/test/java/org/apache/sling/commons/metrics/internal/MetricServiceTest.java&p1=sling/trunk/bundles/commons/metrics/src/test/java/org/apache/sling/metrics/internal/MetricServiceTest.java&r1=1723457&r2=1723459&rev=1723459&view=diff
==============================================================================
---
sling/trunk/bundles/commons/metrics/src/test/java/org/apache/sling/metrics/internal/MetricServiceTest.java
(original)
+++
sling/trunk/bundles/commons/metrics/src/test/java/org/apache/sling/commons/metrics/internal/MetricServiceTest.java
Thu Jan 7 04:39:38 2016
@@ -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;
Propchange:
sling/trunk/bundles/commons/metrics/src/test/java/org/apache/sling/commons/metrics/internal/MetricServiceTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied:
sling/trunk/bundles/commons/metrics/src/test/java/org/apache/sling/commons/metrics/internal/MetricWrapperTest.java
(from r1723457,
sling/trunk/bundles/commons/metrics/src/test/java/org/apache/sling/metrics/internal/MetricWrapperTest.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/commons/metrics/src/test/java/org/apache/sling/commons/metrics/internal/MetricWrapperTest.java?p2=sling/trunk/bundles/commons/metrics/src/test/java/org/apache/sling/commons/metrics/internal/MetricWrapperTest.java&p1=sling/trunk/bundles/commons/metrics/src/test/java/org/apache/sling/metrics/internal/MetricWrapperTest.java&r1=1723457&r2=1723459&rev=1723459&view=diff
==============================================================================
---
sling/trunk/bundles/commons/metrics/src/test/java/org/apache/sling/metrics/internal/MetricWrapperTest.java
(original)
+++
sling/trunk/bundles/commons/metrics/src/test/java/org/apache/sling/commons/metrics/internal/MetricWrapperTest.java
Thu Jan 7 04:39:38 2016
@@ -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();
Propchange:
sling/trunk/bundles/commons/metrics/src/test/java/org/apache/sling/commons/metrics/internal/MetricWrapperTest.java
------------------------------------------------------------------------------
svn:eol-style = native
