Spin out metrics-spring.

dropwizard · Jun 6, 2012 · 770a190 · 770a190
1 parent e62015d
commit 770a190
Show file tree

Hide file tree

Showing 43 changed files with 168 additions and 99 deletions.
diff --git a/contribs/metrics-spring/pom.xml b/contribs/metrics-spring/pom.xml
@@ -4,31 +4,29 @@
          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-spring</artifactId>
-
-    <name>Metrics Spring Support</name>
+    <version>0.0.1-SNAPSHOT</version>
+    <name>Metrics Spring Integration</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>
         <spring.version>3.1.1.RELEASE</spring.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>org.springframework</groupId>
@@ -50,6 +48,24 @@
             <artifactId>spring-aop</artifactId>
             <version>${spring.version}</version>
         </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>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>
@@ -63,4 +79,58 @@
             <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/...ng/AbstractProxyingBeanPostProcessor.java → ...ng/AbstractProxyingBeanPostProcessor.java b/...ng/AbstractProxyingBeanPostProcessor.java → ...ng/AbstractProxyingBeanPostProcessor.java
@@ -1,4 +1,4 @@
-package com.yammer.metrics.spring;
+package com.example.metrics.spring;
 
 import org.aopalliance.intercept.MethodInterceptor;
 import org.apache.commons.logging.Log;

diff --git a/...mmer/metrics/spring/AnnotationFilter.java → ...mple/metrics/spring/AnnotationFilter.java b/...mmer/metrics/spring/AnnotationFilter.java → ...mple/metrics/spring/AnnotationFilter.java
@@ -1,4 +1,4 @@
-package com.yammer.metrics.spring;
+package com.example.metrics.spring;
 
 import org.springframework.util.ReflectionUtils.FieldFilter;
 import org.springframework.util.ReflectionUtils.MethodFilter;
@@ -25,4 +25,4 @@ public boolean matches(Field field) {
         return field.isAnnotationPresent(clazz);
     }
 
-}
+}
diff --git a/...onMeteredAnnotationBeanPostProcessor.java → ...onMeteredAnnotationBeanPostProcessor.java b/...onMeteredAnnotationBeanPostProcessor.java → ...onMeteredAnnotationBeanPostProcessor.java
@@ -1,4 +1,4 @@
-package com.yammer.metrics.spring;
+package com.example.metrics.spring;
 
 import org.aopalliance.intercept.MethodInterceptor;
 import org.springframework.aop.Pointcut;

diff --git a/...ng/ExceptionMeteredMethodInterceptor.java → ...ng/ExceptionMeteredMethodInterceptor.java b/...ng/ExceptionMeteredMethodInterceptor.java → ...ng/ExceptionMeteredMethodInterceptor.java
@@ -1,4 +1,4 @@
-package com.yammer.metrics.spring;
+package com.example.metrics.spring;
 
 import com.yammer.metrics.annotation.ExceptionMetered;
 import com.yammer.metrics.core.Meter;

diff --git a/...ing/GaugeAnnotationBeanPostProcessor.java → ...ing/GaugeAnnotationBeanPostProcessor.java b/...ing/GaugeAnnotationBeanPostProcessor.java → ...ing/GaugeAnnotationBeanPostProcessor.java
@@ -1,4 +1,4 @@
-package com.yammer.metrics.spring;
+package com.example.metrics.spring;
 
 import com.yammer.metrics.annotation.Gauge;
 import com.yammer.metrics.core.MetricName;

diff --git a/...com/yammer/metrics/spring/GaugeField.java → ...om/example/metrics/spring/GaugeField.java b/...com/yammer/metrics/spring/GaugeField.java → ...om/example/metrics/spring/GaugeField.java
@@ -1,4 +1,4 @@
-package com.yammer.metrics.spring;
+package com.example.metrics.spring;
 
 import com.yammer.metrics.core.Gauge;
 import org.springframework.util.ReflectionUtils;

diff --git a/...om/yammer/metrics/spring/GaugeMethod.java → ...m/example/metrics/spring/GaugeMethod.java b/...om/yammer/metrics/spring/GaugeMethod.java → ...m/example/metrics/spring/GaugeMethod.java
@@ -1,4 +1,4 @@
-package com.yammer.metrics.spring;
+package com.example.metrics.spring;
 
 import com.yammer.metrics.core.Gauge;
 import org.springframework.util.ReflectionUtils;

diff --git a/.../spring/HealthCheckBeanPostProcessor.java → .../spring/HealthCheckBeanPostProcessor.java b/.../spring/HealthCheckBeanPostProcessor.java → .../spring/HealthCheckBeanPostProcessor.java
@@ -1,4 +1,4 @@
-package com.yammer.metrics.spring;
+package com.example.metrics.spring;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

diff --git a/...er/metrics/spring/JmxReporterFactory.java → ...le/metrics/spring/JmxReporterFactory.java b/...er/metrics/spring/JmxReporterFactory.java → ...le/metrics/spring/JmxReporterFactory.java
@@ -1,4 +1,4 @@
-package com.yammer.metrics.spring;
+package com.example.metrics.spring;
 
 import com.yammer.metrics.core.MetricsRegistry;
 import com.yammer.metrics.reporting.JmxReporter;

diff --git a/...g/MeteredAnnotationBeanPostProcessor.java → ...g/MeteredAnnotationBeanPostProcessor.java b/...g/MeteredAnnotationBeanPostProcessor.java → ...g/MeteredAnnotationBeanPostProcessor.java
@@ -1,4 +1,4 @@
-package com.yammer.metrics.spring;
+package com.example.metrics.spring;
 
 import org.aopalliance.intercept.MethodInterceptor;
 import org.springframework.aop.Pointcut;

diff --git a/...rics/spring/MeteredMethodInterceptor.java → ...rics/spring/MeteredMethodInterceptor.java b/...rics/spring/MeteredMethodInterceptor.java → ...rics/spring/MeteredMethodInterceptor.java
@@ -1,4 +1,4 @@
-package com.yammer.metrics.spring;
+package com.example.metrics.spring;
 
 import com.yammer.metrics.annotation.Metered;
 import com.yammer.metrics.core.Meter;

diff --git a/...ing/TimedAnnotationBeanPostProcessor.java → ...ing/TimedAnnotationBeanPostProcessor.java b/...ing/TimedAnnotationBeanPostProcessor.java → ...ing/TimedAnnotationBeanPostProcessor.java
@@ -1,4 +1,4 @@
-package com.yammer.metrics.spring;
+package com.example.metrics.spring;
 
 import org.aopalliance.intercept.MethodInterceptor;
 import org.springframework.aop.Pointcut;

diff --git a/...etrics/spring/TimedMethodInterceptor.java → ...etrics/spring/TimedMethodInterceptor.java b/...etrics/spring/TimedMethodInterceptor.java → ...etrics/spring/TimedMethodInterceptor.java
@@ -1,4 +1,4 @@
-package com.yammer.metrics.spring;
+package com.example.metrics.spring;
 
 import com.yammer.metrics.annotation.Timed;
 import com.yammer.metrics.core.*;

diff --git a/...AnnotationDrivenBeanDefinitionParser.java → ...AnnotationDrivenBeanDefinitionParser.java b/...AnnotationDrivenBeanDefinitionParser.java → ...AnnotationDrivenBeanDefinitionParser.java
@@ -1,4 +1,4 @@
-package com.yammer.metrics.spring.config;
+package com.example.metrics.spring.config;
 
 import org.springframework.aop.framework.ProxyConfig;
 import org.springframework.beans.factory.config.BeanDefinition;
@@ -12,11 +12,11 @@
 
 import com.yammer.metrics.HealthChecks;
 import com.yammer.metrics.Metrics;
-import com.yammer.metrics.spring.ExceptionMeteredAnnotationBeanPostProcessor;
-import com.yammer.metrics.spring.GaugeAnnotationBeanPostProcessor;
-import com.yammer.metrics.spring.HealthCheckBeanPostProcessor;
-import com.yammer.metrics.spring.MeteredAnnotationBeanPostProcessor;
-import com.yammer.metrics.spring.TimedAnnotationBeanPostProcessor;
+import com.example.metrics.spring.ExceptionMeteredAnnotationBeanPostProcessor;
+import com.example.metrics.spring.GaugeAnnotationBeanPostProcessor;
+import com.example.metrics.spring.HealthCheckBeanPostProcessor;
+import com.example.metrics.spring.MeteredAnnotationBeanPostProcessor;
+import com.example.metrics.spring.TimedAnnotationBeanPostProcessor;
 
 import static org.springframework.beans.factory.config.BeanDefinition.*;
 

diff --git a/...lthCheckRegistryBeanDefinitionParser.java → ...lthCheckRegistryBeanDefinitionParser.java b/...lthCheckRegistryBeanDefinitionParser.java → ...lthCheckRegistryBeanDefinitionParser.java
@@ -1,4 +1,4 @@
-package com.yammer.metrics.spring.config;
+package com.example.metrics.spring.config;
 
 import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
 import org.w3c.dom.Element;

diff --git a/...nfig/JmxReporterBeanDefinitionParser.java → ...nfig/JmxReporterBeanDefinitionParser.java b/...nfig/JmxReporterBeanDefinitionParser.java → ...nfig/JmxReporterBeanDefinitionParser.java
@@ -1,10 +1,10 @@
-package com.yammer.metrics.spring.config;
+package com.example.metrics.spring.config;
 
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
 import org.w3c.dom.Element;
 
-import com.yammer.metrics.spring.JmxReporterFactory;
+import com.example.metrics.spring.JmxReporterFactory;
 
 public class JmxReporterBeanDefinitionParser extends AbstractSingleBeanDefinitionParser {
 

diff --git a/...pring/config/MetricsNamespaceHandler.java → ...pring/config/MetricsNamespaceHandler.java b/...pring/config/MetricsNamespaceHandler.java → ...pring/config/MetricsNamespaceHandler.java
@@ -1,4 +1,4 @@
-package com.yammer.metrics.spring.config;
+package com.example.metrics.spring.config;
 
 import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
 

diff --git a/.../MetricsRegistryBeanDefinitionParser.java → .../MetricsRegistryBeanDefinitionParser.java b/.../MetricsRegistryBeanDefinitionParser.java → .../MetricsRegistryBeanDefinitionParser.java
@@ -1,4 +1,4 @@
-package com.yammer.metrics.spring.config;
+package com.example.metrics.spring.config;
 
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;

diff --git a/contribs/metrics-spring/src/main/resources/META-INF/spring.handlers b/contribs/metrics-spring/src/main/resources/META-INF/spring.handlers
@@ -1 +1 @@
-http\://www.yammer.com/schema/metrics=com.yammer.metrics.spring.config.MetricsNamespaceHandler
+http\://www.example.com/schema/metrics=com.example.metrics.spring.config.MetricsNamespaceHandler
diff --git a/contribs/metrics-spring/src/main/resources/META-INF/spring.schemas b/contribs/metrics-spring/src/main/resources/META-INF/spring.schemas
@@ -1 +1 @@
-http\://www.yammer.com/schema/metrics/metrics.xsd=com/yammer/metrics/spring/config/metrics.xsd
+http\://www.example.com/schema/metrics/metrics.xsd=com/example/metrics/spring/config/metrics.xsd
diff --git a/.../yammer/metrics/spring/config/metrics.xsd → ...example/metrics/spring/config/metrics.xsd b/.../yammer/metrics/spring/config/metrics.xsd → ...example/metrics/spring/config/metrics.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns="http://www.yammer.com/schema/metrics"
+<xsd:schema xmlns="http://www.example.com/schema/metrics"
             xmlns:xsd="http://www.w3.org/2001/XMLSchema"
             xmlns:beans="http://www.springframework.org/schema/beans"
-            targetNamespace="http://www.yammer.com/schema/metrics"
+            targetNamespace="http://www.example.com/schema/metrics"
             elementFormDefault="qualified" attributeFormDefault="unqualified">
 
     <xsd:import namespace="http://www.springframework.org/schema/beans"/>

diff --git a/...m/yammer/metrics/spring/AltClockTest.java → .../example/metrics/spring/AltClockTest.java b/...m/yammer/metrics/spring/AltClockTest.java → .../example/metrics/spring/AltClockTest.java
@@ -1,16 +1,15 @@
-package com.yammer.metrics.spring;
-
-import java.lang.reflect.Field;
+package com.example.metrics.spring;
 
+import com.yammer.metrics.core.Clock;
+import com.yammer.metrics.core.Clock.CpuTimeClock;
+import com.yammer.metrics.core.MetricsRegistry;
 import org.junit.Test;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
-import com.yammer.metrics.core.Clock;
-import com.yammer.metrics.core.MetricsRegistry;
-import com.yammer.metrics.core.Clock.CpuTimeClock;
+import java.lang.reflect.Field;
 
-import static org.junit.Assert.assertThat;
 import static org.hamcrest.Matchers.instanceOf;
+import static org.junit.Assert.assertThat;
 
 public class AltClockTest {
 
@@ -31,4 +30,4 @@ protected Field getClockField() throws NoSuchFieldException {
         }
         throw new NoSuchFieldException();
     }
-}
+}
diff --git a/...metrics/spring/AutowiredCollaborator.java → ...metrics/spring/AutowiredCollaborator.java b/...metrics/spring/AutowiredCollaborator.java → ...metrics/spring/AutowiredCollaborator.java
@@ -1,4 +1,4 @@
-package com.yammer.metrics.spring;
+package com.example.metrics.spring;
 
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -11,4 +11,4 @@ public ProxyTargetClass getDependency() {
         return dependency;
     }
 
-}
+}
diff --git a/contribs/metrics-spring/src/test/java/com/example/metrics/spring/BogusException.java b/contribs/metrics-spring/src/test/java/com/example/metrics/spring/BogusException.java
@@ -0,0 +1,3 @@
+package com.example.metrics.spring;
+
+public class BogusException extends Throwable {}
diff --git a/...r/metrics/spring/DefaultRegistryTest.java → ...e/metrics/spring/DefaultRegistryTest.java b/...r/metrics/spring/DefaultRegistryTest.java → ...e/metrics/spring/DefaultRegistryTest.java
@@ -1,4 +1,4 @@
-package com.yammer.metrics.spring;
+package com.example.metrics.spring;
 
 import org.junit.Assert;
 import org.junit.Test;
@@ -25,4 +25,4 @@ public void testSuppliedRegistries() {
         Assert.assertNotSame("Should have provided HealthCheckRegistry.", HealthChecks.defaultRegistry(), ctx.getBean(HealthCheckRegistry.class));
     }
 
-}
+}
diff --git a/...m/yammer/metrics/spring/MeteredClass.java → .../example/metrics/spring/MeteredClass.java b/...m/yammer/metrics/spring/MeteredClass.java → .../example/metrics/spring/MeteredClass.java
@@ -1,4 +1,4 @@
-package com.yammer.metrics.spring;
+package com.example.metrics.spring;
 
 import com.yammer.metrics.annotation.ExceptionMetered;
 import com.yammer.metrics.annotation.Gauge;
@@ -39,4 +39,4 @@ public void triplyMeteredMethod(boolean doThrow) throws Throwable {
 		if (doThrow) throw new BogusException();
 	}
 
-}
+}
diff --git a/...mmer/metrics/spring/MeteredClassTest.java → ...mple/metrics/spring/MeteredClassTest.java b/...mmer/metrics/spring/MeteredClassTest.java → ...mple/metrics/spring/MeteredClassTest.java
@@ -1,4 +1,4 @@
-package com.yammer.metrics.spring;
+package com.example.metrics.spring;
 
 import static org.junit.Assert.*;
 

diff --git a/...mmer/metrics/spring/MeteredInterface.java → ...mple/metrics/spring/MeteredInterface.java b/...mmer/metrics/spring/MeteredInterface.java → ...mple/metrics/spring/MeteredInterface.java
@@ -1,4 +1,4 @@
-package com.yammer.metrics.spring;
+package com.example.metrics.spring;
 
 import com.yammer.metrics.annotation.ExceptionMetered;
 import com.yammer.metrics.annotation.Metered;
@@ -15,4 +15,4 @@ public interface MeteredInterface {
 	@ExceptionMetered
 	public void exceptionMeteredMethod() throws Throwable;
 
-}
+}
diff --git a/.../metrics/spring/MeteredInterfaceImpl.java → .../metrics/spring/MeteredInterfaceImpl.java b/.../metrics/spring/MeteredInterfaceImpl.java → .../metrics/spring/MeteredInterfaceImpl.java
@@ -1,4 +1,4 @@
-package com.yammer.metrics.spring;
+package com.example.metrics.spring;
 
 public class MeteredInterfaceImpl implements MeteredInterface {
 
@@ -17,4 +17,4 @@ public void exceptionMeteredMethod() throws Throwable {
 		throw new BogusException();
 	}
 
-}
+}
diff --git a/.../metrics/spring/MeteredInterfaceTest.java → .../metrics/spring/MeteredInterfaceTest.java b/.../metrics/spring/MeteredInterfaceTest.java → .../metrics/spring/MeteredInterfaceTest.java
@@ -1,4 +1,4 @@
-package com.yammer.metrics.spring;
+package com.example.metrics.spring;
 
 import org.junit.After;
 import org.junit.Assert;