Spin out metrics-guice.

dropwizard · Jun 6, 2012 · 64263bc · 64263bc
1 parent 0011daa
commit 64263bc
Show file tree

Hide file tree

Showing 24 changed files with 116 additions and 40 deletions.
diff --git a/contribs/metrics-guice/pom.xml b/contribs/metrics-guice/pom.xml
@@ -4,27 +4,32 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <parent>
-        <groupId>com.yammer.metrics.contribs</groupId>
-        <artifactId>contribs</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
-    </parent>
-
+    <groupId>com.example</groupId>
     <artifactId>metrics-guice</artifactId>
-
+    <version>0.0.1-SNAPSHOT</version>
     <name>Metrics Guice Support</name>
     <packaging>bundle</packaging>
 
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <metrics.version>3.0.0-SNAPSHOT</metrics.version>
+        <slf4j.version>1.6.5</slf4j.version>
+        <guice.version>3.0</guice.version>
+        <servlet.version>2.5</servlet.version>
+        <jackson.version>1.9.7</jackson.version>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>com.yammer.metrics</groupId>
             <artifactId>metrics-core</artifactId>
-            <version>${project.version}</version>
+            <version>${metrics.version}</version>
         </dependency>
         <dependency>
             <groupId>com.yammer.metrics</groupId>
             <artifactId>metrics-annotation</artifactId>
-            <version>${project.version}</version>
+            <version>${metrics.version}</version>
         </dependency>
         <dependency>
             <groupId>com.google.inject</groupId>
@@ -54,7 +59,7 @@
         <dependency>
             <groupId>com.yammer.metrics</groupId>
             <artifactId>metrics-servlet</artifactId>
-            <version>${project.version}</version>
+            <version>${metrics.version}</version>
             <optional>true</optional>
         </dependency>
         <dependency>
@@ -69,5 +74,77 @@
             <version>${slf4j.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.10</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest-all</artifactId>
+            <version>1.1</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-all</artifactId>
+            <version>1.9.0</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>2.3.2</version>
+                <configuration>
+                    <source>1.6</source>
+                    <target>1.6</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <version>2.3.7</version>
+                <extensions>true</extensions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.8.1</version>
+                <configuration>
+                    <parallel>classes</parallel>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <version>2.1.2</version>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.8.1</version>
+                <executions>
+                    <execution>
+                        <id>attach-javadocs</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/...cs/guice/ExceptionMeteredInterceptor.java → ...cs/guice/ExceptionMeteredInterceptor.java b/...cs/guice/ExceptionMeteredInterceptor.java → ...cs/guice/ExceptionMeteredInterceptor.java
@@ -1,4 +1,4 @@
-package com.yammer.metrics.guice;
+package com.example.metrics.guice;
 
 import com.yammer.metrics.annotation.ExceptionMetered;
 import com.yammer.metrics.core.Meter;

diff --git a/...trics/guice/ExceptionMeteredListener.java → ...trics/guice/ExceptionMeteredListener.java b/...trics/guice/ExceptionMeteredListener.java → ...trics/guice/ExceptionMeteredListener.java
@@ -1,4 +1,4 @@
-package com.yammer.metrics.guice;
+package com.example.metrics.guice;
 
 import com.google.inject.TypeLiteral;
 import com.google.inject.matcher.Matchers;

diff --git a/...metrics/guice/GaugeInjectionListener.java → ...metrics/guice/GaugeInjectionListener.java b/...metrics/guice/GaugeInjectionListener.java → ...metrics/guice/GaugeInjectionListener.java
@@ -1,4 +1,4 @@
-package com.yammer.metrics.guice;
+package com.example.metrics.guice;
 
 import java.lang.reflect.Method;
 

diff --git a/...m/yammer/metrics/guice/GaugeListener.java → .../example/metrics/guice/GaugeListener.java b/...m/yammer/metrics/guice/GaugeListener.java → .../example/metrics/guice/GaugeListener.java
@@ -1,4 +1,4 @@
-package com.yammer.metrics.guice;
+package com.example.metrics.guice;
 
 import com.google.inject.TypeLiteral;
 import com.google.inject.spi.TypeEncounter;

diff --git a/.../metrics/guice/InstrumentationModule.java → .../metrics/guice/InstrumentationModule.java b/.../metrics/guice/InstrumentationModule.java → .../metrics/guice/InstrumentationModule.java
@@ -1,4 +1,4 @@
-package com.yammer.metrics.guice;
+package com.example.metrics.guice;
 
 import com.google.inject.AbstractModule;
 import com.google.inject.Scopes;

diff --git a/...er/metrics/guice/JmxReporterProvider.java → ...le/metrics/guice/JmxReporterProvider.java b/...er/metrics/guice/JmxReporterProvider.java → ...le/metrics/guice/JmxReporterProvider.java
@@ -1,4 +1,4 @@
-package com.yammer.metrics.guice;
+package com.example.metrics.guice;
 
 import com.google.inject.Inject;
 import com.google.inject.Provider;

diff --git a/...mer/metrics/guice/MeteredInterceptor.java → ...ple/metrics/guice/MeteredInterceptor.java b/...mer/metrics/guice/MeteredInterceptor.java → ...ple/metrics/guice/MeteredInterceptor.java
@@ -1,4 +1,4 @@
-package com.yammer.metrics.guice;
+package com.example.metrics.guice;
 
 import com.yammer.metrics.annotation.Metered;
 import com.yammer.metrics.core.Meter;

diff --git a/...yammer/metrics/guice/MeteredListener.java → ...xample/metrics/guice/MeteredListener.java b/...yammer/metrics/guice/MeteredListener.java → ...xample/metrics/guice/MeteredListener.java
@@ -1,4 +1,4 @@
-package com.yammer.metrics.guice;
+package com.example.metrics.guice;
 
 import com.google.inject.TypeLiteral;
 import com.google.inject.matcher.Matchers;

diff --git a/...ammer/metrics/guice/TimedInterceptor.java → ...ample/metrics/guice/TimedInterceptor.java b/...ammer/metrics/guice/TimedInterceptor.java → ...ample/metrics/guice/TimedInterceptor.java
@@ -1,4 +1,4 @@
-package com.yammer.metrics.guice;
+package com.example.metrics.guice;
 
 import com.yammer.metrics.annotation.Timed;
 import com.yammer.metrics.core.MetricName;
@@ -9,7 +9,6 @@
 import org.aopalliance.intercept.MethodInvocation;
 
 import java.lang.reflect.Method;
-import java.util.concurrent.TimeUnit;
 
 /**
  * A method interceptor which creates a timer for the declaring class with the given name (or the

diff --git a/...m/yammer/metrics/guice/TimedListener.java → .../example/metrics/guice/TimedListener.java b/...m/yammer/metrics/guice/TimedListener.java → .../example/metrics/guice/TimedListener.java
@@ -1,4 +1,4 @@
-package com.yammer.metrics.guice;
+package com.example.metrics.guice;
 
 import com.google.inject.TypeLiteral;
 import com.google.inject.matcher.Matchers;

diff --git a/...ics/guice/servlet/AdminServletModule.java → ...ics/guice/servlet/AdminServletModule.java b/...ics/guice/servlet/AdminServletModule.java → ...ics/guice/servlet/AdminServletModule.java
@@ -1,4 +1,4 @@
-package com.yammer.metrics.guice.servlet;
+package com.example.metrics.guice.servlet;
 
 import com.yammer.metrics.reporting.AdminServlet;
 import org.codehaus.jackson.JsonFactory;

diff --git a/...s/guice/servlet/AdminServletProvider.java → ...s/guice/servlet/AdminServletProvider.java b/...s/guice/servlet/AdminServletProvider.java → ...s/guice/servlet/AdminServletProvider.java
@@ -1,4 +1,4 @@
-package com.yammer.metrics.guice.servlet;
+package com.example.metrics.guice.servlet;
 
 import com.google.inject.Inject;
 import com.google.inject.Provider;

diff --git a/...s/guice/tests/DefaultJmxReporterTest.java → ...s/guice/tests/DefaultJmxReporterTest.java b/...s/guice/tests/DefaultJmxReporterTest.java → ...s/guice/tests/DefaultJmxReporterTest.java
@@ -1,11 +1,11 @@
-package com.yammer.metrics.guice.tests;
+package com.exampe.metrics.guice.tests;
 
 import org.junit.Test;
 import com.google.inject.AbstractModule;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
 import com.yammer.metrics.annotation.Timed;
-import com.yammer.metrics.guice.InstrumentationModule;
+import com.example.metrics.guice.InstrumentationModule;
 import com.yammer.metrics.reporting.JmxReporter;
 
 import static org.hamcrest.Matchers.is;

diff --git a/...ics/guice/tests/ExceptionMeteredTest.java → ...ics/guice/tests/ExceptionMeteredTest.java b/...ics/guice/tests/ExceptionMeteredTest.java → ...ics/guice/tests/ExceptionMeteredTest.java
@@ -1,10 +1,10 @@
-package com.yammer.metrics.guice.tests;
+package com.exampe.metrics.guice.tests;
 
 import com.google.inject.Guice;
 import com.google.inject.Injector;
 import com.yammer.metrics.annotation.ExceptionMetered;
 import com.yammer.metrics.core.*;
-import com.yammer.metrics.guice.InstrumentationModule;
+import com.example.metrics.guice.InstrumentationModule;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;

diff --git a/...yammer/metrics/guice/tests/GaugeTest.java → ...exampe/metrics/guice/tests/GaugeTest.java b/...yammer/metrics/guice/tests/GaugeTest.java → ...exampe/metrics/guice/tests/GaugeTest.java
@@ -1,4 +1,4 @@
-package com.yammer.metrics.guice.tests;
+package com.exampe.metrics.guice.tests;
 
 import java.util.Set;
 
@@ -8,7 +8,7 @@
 import com.yammer.metrics.core.Metric;
 import com.yammer.metrics.core.MetricName;
 import com.yammer.metrics.core.MetricsRegistry;
-import com.yammer.metrics.guice.InstrumentationModule;
+import com.example.metrics.guice.InstrumentationModule;
 
 import org.junit.After;
 import org.junit.Before;

diff --git a/...uice/tests/InstrumentationModuleTest.java → ...uice/tests/InstrumentationModuleTest.java b/...uice/tests/InstrumentationModuleTest.java → ...uice/tests/InstrumentationModuleTest.java
@@ -1,12 +1,12 @@
-package com.yammer.metrics.guice.tests;
+package com.exampe.metrics.guice.tests;
 
 import com.google.inject.Guice;
 import com.google.inject.Injector;
 import com.yammer.metrics.HealthChecks;
 import com.yammer.metrics.Metrics;
 import com.yammer.metrics.core.HealthCheckRegistry;
 import com.yammer.metrics.core.MetricsRegistry;
-import com.yammer.metrics.guice.InstrumentationModule;
+import com.example.metrics.guice.InstrumentationModule;
 import org.junit.Test;
 
 import static org.hamcrest.Matchers.is;

diff --git a/...sts/InstrumentedWithExceptionMetered.java → ...sts/InstrumentedWithExceptionMetered.java b/...sts/InstrumentedWithExceptionMetered.java → ...sts/InstrumentedWithExceptionMetered.java
@@ -1,4 +1,4 @@
-package com.yammer.metrics.guice.tests;
+package com.exampe.metrics.guice.tests;
 
 import com.yammer.metrics.annotation.ExceptionMetered;
 import com.yammer.metrics.annotation.Metered;

diff --git a/...cs/guice/tests/InstrumentedWithGauge.java → ...cs/guice/tests/InstrumentedWithGauge.java b/...cs/guice/tests/InstrumentedWithGauge.java → ...cs/guice/tests/InstrumentedWithGauge.java
@@ -1,4 +1,4 @@
-package com.yammer.metrics.guice.tests;
+package com.exampe.metrics.guice.tests;
 
 import com.yammer.metrics.annotation.Gauge;
 

diff --git a/.../guice/tests/InstrumentedWithMetered.java → .../guice/tests/InstrumentedWithMetered.java b/.../guice/tests/InstrumentedWithMetered.java → .../guice/tests/InstrumentedWithMetered.java
@@ -1,4 +1,4 @@
-package com.yammer.metrics.guice.tests;
+package com.exampe.metrics.guice.tests;
 
 import com.yammer.metrics.annotation.Metered;
 import com.yammer.metrics.annotation.Timed;

diff --git a/...cs/guice/tests/InstrumentedWithTimed.java → ...cs/guice/tests/InstrumentedWithTimed.java b/...cs/guice/tests/InstrumentedWithTimed.java → ...cs/guice/tests/InstrumentedWithTimed.java
@@ -1,4 +1,4 @@
-package com.yammer.metrics.guice.tests;
+package com.exampe.metrics.guice.tests;
 
 import com.yammer.metrics.annotation.Timed;
 

diff --git a/...mmer/metrics/guice/tests/MeteredTest.java → ...ampe/metrics/guice/tests/MeteredTest.java b/...mmer/metrics/guice/tests/MeteredTest.java → ...ampe/metrics/guice/tests/MeteredTest.java
@@ -1,9 +1,9 @@
-package com.yammer.metrics.guice.tests;
+package com.exampe.metrics.guice.tests;
 
 import com.google.inject.Guice;
 import com.google.inject.Injector;
 import com.yammer.metrics.core.*;
-import com.yammer.metrics.guice.InstrumentationModule;
+import com.example.metrics.guice.InstrumentationModule;
 
 import org.junit.After;
 import org.junit.Before;

diff --git a/...mmer/metrics/guice/tests/MyException.java → ...ampe/metrics/guice/tests/MyException.java b/...mmer/metrics/guice/tests/MyException.java → ...ampe/metrics/guice/tests/MyException.java
@@ -1,4 +1,4 @@
-package com.yammer.metrics.guice.tests;
+package com.exampe.metrics.guice.tests;
 
 public class MyException extends RuntimeException {
 

diff --git a/...yammer/metrics/guice/tests/TimedTest.java → ...exampe/metrics/guice/tests/TimedTest.java b/...yammer/metrics/guice/tests/TimedTest.java → ...exampe/metrics/guice/tests/TimedTest.java
@@ -1,9 +1,9 @@
-package com.yammer.metrics.guice.tests;
+package com.exampe.metrics.guice.tests;
 
 import com.google.inject.Guice;
 import com.google.inject.Injector;
 import com.yammer.metrics.core.*;
-import com.yammer.metrics.guice.InstrumentationModule;
+import com.example.metrics.guice.InstrumentationModule;
 
 import org.junit.After;
 import org.junit.Before;