Spin out metrics-sigar.

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

Hide file tree

Showing 13 changed files with 97 additions and 56 deletions.
diff --git a/contribs/metrics-sigar/pom.xml b/contribs/metrics-sigar/pom.xml
@@ -2,38 +2,101 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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-sigar</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
     <name>Metrics Sigar 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>
+        <sigar.version>1.6.4</sigar.version>
+    </properties>
 
     <dependencies>
         <dependency>
             <groupId>com.yammer.metrics</groupId>
             <artifactId>metrics-core</artifactId>
-            <version>${project.version}</version>
+            <version>${metrics.version}</version>
         </dependency>
         <dependency>
             <groupId>org.fusesource</groupId>
             <artifactId>sigar</artifactId>
-            <version>1.6.4</version>
+            <version>${sigar.version}</version>
         </dependency>
         <dependency>
             <groupId>org.fusesource</groupId>
             <artifactId>sigar</artifactId>
-            <version>1.6.4</version>
+            <version>${sigar.version}</version>
             <classifier>native</classifier>
             <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-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>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
@@ -66,6 +129,7 @@
                     <systemPropertyVariables>
                         <org.hyperic.sigar.path>${project.build.directory}/sigar-native-libs</org.hyperic.sigar.path>
                     </systemPropertyVariables>
+                    <parallel>classes</parallel>
                 </configuration>
             </plugin>
         </plugins>

diff --git a/...er/metrics/sigar/AbstractSigarMetric.java → ...le/metrics/sigar/AbstractSigarMetric.java b/...er/metrics/sigar/AbstractSigarMetric.java → ...le/metrics/sigar/AbstractSigarMetric.java
@@ -1,4 +1,4 @@
-package com.yammer.metrics.sigar;
+package com.example.metrics.sigar;
 
 import org.hyperic.sigar.Sigar;
 

diff --git a/...mmer/metrics/sigar/CanRegisterGauges.java → ...mple/metrics/sigar/CanRegisterGauges.java b/...mmer/metrics/sigar/CanRegisterGauges.java → ...mple/metrics/sigar/CanRegisterGauges.java
@@ -1,4 +1,4 @@
-package com.yammer.metrics.sigar;
+package com.example.metrics.sigar;
 
 import com.yammer.metrics.core.MetricsRegistry;
 

diff --git a/.../com/yammer/metrics/sigar/CpuMetrics.java → ...com/example/metrics/sigar/CpuMetrics.java b/.../com/yammer/metrics/sigar/CpuMetrics.java → ...com/example/metrics/sigar/CpuMetrics.java
@@ -1,9 +1,8 @@
-package com.yammer.metrics.sigar;
+package com.example.metrics.sigar;
 
 import java.util.List;
 import java.util.ArrayList;
 
-import com.yammer.metrics.Metrics;
 import com.yammer.metrics.core.Gauge;
 import com.yammer.metrics.core.MetricsRegistry;
 import com.yammer.metrics.util.PercentGauge;

diff --git a/...mmer/metrics/sigar/FilesystemMetrics.java → ...mple/metrics/sigar/FilesystemMetrics.java b/...mmer/metrics/sigar/FilesystemMetrics.java → ...mple/metrics/sigar/FilesystemMetrics.java
@@ -1,12 +1,9 @@
-package com.yammer.metrics.sigar;
+package com.example.metrics.sigar;
 
 import java.util.List;
 import java.util.ArrayList;
 
-import com.yammer.metrics.Metrics;
-import com.yammer.metrics.core.Gauge;
 import com.yammer.metrics.core.MetricsRegistry;
-import com.yammer.metrics.util.PercentGauge;
 
 import org.hyperic.sigar.FileSystemUsage;
 import org.hyperic.sigar.Sigar;

diff --git a/...m/yammer/metrics/sigar/MemoryMetrics.java → .../example/metrics/sigar/MemoryMetrics.java b/...m/yammer/metrics/sigar/MemoryMetrics.java → .../example/metrics/sigar/MemoryMetrics.java
@@ -1,9 +1,5 @@
-package com.yammer.metrics.sigar;
+package com.example.metrics.sigar;
 
-import java.util.List;
-import java.util.ArrayList;
-
-import com.yammer.metrics.Metrics;
 import com.yammer.metrics.core.Gauge;
 import com.yammer.metrics.core.MetricsRegistry;
 

diff --git a/...om/yammer/metrics/sigar/SigarMetrics.java → ...m/example/metrics/sigar/SigarMetrics.java b/...om/yammer/metrics/sigar/SigarMetrics.java → ...m/example/metrics/sigar/SigarMetrics.java
@@ -1,4 +1,4 @@
-package com.yammer.metrics.sigar;
+package com.example.metrics.sigar;
 
 import com.yammer.metrics.Metrics;
 import com.yammer.metrics.core.Gauge;

diff --git a/...m/yammer/metrics/sigar/UlimitMetrics.java → .../example/metrics/sigar/UlimitMetrics.java b/...m/yammer/metrics/sigar/UlimitMetrics.java → .../example/metrics/sigar/UlimitMetrics.java
@@ -1,9 +1,5 @@
-package com.yammer.metrics.sigar;
+package com.example.metrics.sigar;
 
-import java.util.List;
-import java.util.ArrayList;
-
-import com.yammer.metrics.Metrics;
 import com.yammer.metrics.core.Gauge;
 import com.yammer.metrics.core.MetricsRegistry;
 

diff --git a/...r/metrics/sigar/tests/CpuMetricsTest.java → ...e/metrics/sigar/tests/CpuMetricsTest.java b/...r/metrics/sigar/tests/CpuMetricsTest.java → ...e/metrics/sigar/tests/CpuMetricsTest.java
@@ -1,8 +1,8 @@
-package com.yammer.metrics.sigar.tests;
+package com.example.metrics.sigar.tests;
 
-import com.yammer.metrics.sigar.CpuMetrics;
-import com.yammer.metrics.sigar.CpuMetrics.CpuTime;
-import com.yammer.metrics.sigar.SigarMetrics;
+import com.example.metrics.sigar.CpuMetrics;
+import com.example.metrics.sigar.CpuMetrics.CpuTime;
+import com.example.metrics.sigar.SigarMetrics;
 
 import org.junit.Test;
 

diff --git a/...cs/sigar/tests/FilesystemMetricsTest.java → ...cs/sigar/tests/FilesystemMetricsTest.java b/...cs/sigar/tests/FilesystemMetricsTest.java → ...cs/sigar/tests/FilesystemMetricsTest.java
@@ -1,18 +1,15 @@
-package com.yammer.metrics.sigar.tests;
+package com.example.metrics.sigar.tests;
 
 import java.io.File;
 import java.util.List;
 
-import com.yammer.metrics.sigar.FilesystemMetrics;
-import com.yammer.metrics.sigar.FilesystemMetrics.FileSystem;
-import com.yammer.metrics.sigar.SigarMetrics;
+import com.example.metrics.sigar.FilesystemMetrics;
+import com.example.metrics.sigar.FilesystemMetrics.FileSystem;
+import com.example.metrics.sigar.SigarMetrics;
 
 import org.junit.Test;
 
 import static org.hamcrest.Matchers.closeTo;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.greaterThan;
-import static org.hamcrest.Matchers.greaterThanOrEqualTo;
 import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertThat;
 

diff --git a/...etrics/sigar/tests/MemoryMetricsTest.java → ...etrics/sigar/tests/MemoryMetricsTest.java b/...etrics/sigar/tests/MemoryMetricsTest.java → ...etrics/sigar/tests/MemoryMetricsTest.java
@@ -1,14 +1,10 @@
-package com.yammer.metrics.sigar.tests;
+package com.example.metrics.sigar.tests;
 
-import com.yammer.metrics.sigar.MemoryMetrics;
-import com.yammer.metrics.sigar.MemoryMetrics.MainMemory;
-import com.yammer.metrics.sigar.MemoryMetrics.SwapSpace;
-import com.yammer.metrics.sigar.SigarMetrics;
+import com.example.metrics.sigar.MemoryMetrics;
+import com.example.metrics.sigar.SigarMetrics;
 
 import org.junit.Test;
 
-import static org.hamcrest.Matchers.closeTo;
-import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.greaterThan;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.lessThan;

diff --git a/...metrics/sigar/tests/SigarMetricsTest.java → ...metrics/sigar/tests/SigarMetricsTest.java b/...metrics/sigar/tests/SigarMetricsTest.java → ...metrics/sigar/tests/SigarMetricsTest.java
@@ -1,6 +1,6 @@
-package com.yammer.metrics.sigar.tests;
+package com.example.metrics.sigar.tests;
 
-import com.yammer.metrics.sigar.SigarMetrics;
+import com.example.metrics.sigar.SigarMetrics;
 
 import org.junit.Test;
 

diff --git a/...etrics/sigar/tests/UlimitMetricsTest.java → ...etrics/sigar/tests/UlimitMetricsTest.java b/...etrics/sigar/tests/UlimitMetricsTest.java → ...etrics/sigar/tests/UlimitMetricsTest.java
@@ -1,16 +1,12 @@
-package com.yammer.metrics.sigar.tests;
+package com.example.metrics.sigar.tests;
 
-import com.yammer.metrics.sigar.UlimitMetrics;
-import com.yammer.metrics.sigar.UlimitMetrics.Ulimit;
-import com.yammer.metrics.sigar.SigarMetrics;
+import com.example.metrics.sigar.UlimitMetrics;
+import com.example.metrics.sigar.SigarMetrics;
 
 import org.junit.Test;
 
-import static org.hamcrest.Matchers.closeTo;
-import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.greaterThan;
 import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.lessThan;
 
 import static org.junit.Assert.assertThat;