From 9a7170ebb434dda3249b8199ffde5851531907f4 Mon Sep 17 00:00:00 2001
From: Max Gensthaler <max@gensthaler.de>
Date: Thu, 18 Aug 2011 16:41:51 +0200
Subject: [PATCH 1/2] preparing directory structure to mavenize

---
 build.xml                                     | 76 +++++++++----------
 .../metrics/collectd/CollectdContext.java     |  0
 .../hadoop-collectd-types.properties          |  0
 3 files changed, 38 insertions(+), 38 deletions(-)
 rename src/{core => main/java}/org/apache/hadoop/metrics/collectd/CollectdContext.java (100%)
 rename hadoop-collectd-types.properties => src/main/resources/hadoop-collectd-types.properties (100%)

diff --git a/build.xml b/build.xml
index 94a04bd..b0bdc43 100644
--- a/build.xml
+++ b/build.xml
@@ -1,45 +1,45 @@
-<project name="hadoop-collectd" default="dist" basedir="."> 
+<project name="hadoop-collectd" default="dist" basedir=".">
   <property file="${user.home}/.hadoop-collectd-build.properties"/>
-  <property environment="env"/> 
+  <property environment="env"/>
 
   <property name="hadoop"
-            value="../../../hadoop-core-trunk"/>
-  <property name="hadoop.jar" 
+            value="${basedir}/../../../hadoop-core-trunk"/>
+  <property name="hadoop.jar"
             location="${hadoop}/build/hadoop-metrics-0.21.0-dev.jar"/>
-  <property name="logging.jar" 
+  <property name="logging.jar"
             location="${hadoop}/build/ivy/lib/Hadoop/common/commons-logging-1.0.4.jar"/>
-  <property name="collectd.jar" 
-            location="../jcollectd/target/lib/collectd.jar"/>
+  <property name="collectd.jar"
+            location="${basedir}/../jcollectd/target/lib/collectd.jar"/>
 
-  <path id="hd.classpath"> 
-    <path location="${hadoop.jar}"/> 
-    <path location="${collectd.jar}"/> 
-    <path location="${logging.jar}"/> 
-  </path> 
- 
-  <target name="init"> 
-    <mkdir dir="build/classes"/> 
-  </target> 
- 
-  <target name="compile" depends="init"> 
-    <javac srcdir="src/core"  
-           destdir="build/classes"  
-           debug="true" 
-           source="1.6" 
-           target="1.6" 
-           classpathref="hd.classpath"/> 
-  </target> 
- 
-  <target name="dist" depends="compile"> 
-    <jar jarfile="build/hadoop-collectd.jar">
-      <fileset dir="." includes="*.properties"/>
-      <fileset dir="build/classes" includes="**/*.class"> 
-        <exclude name="**/test/*"/> 
-      </fileset> 
-    </jar> 
-  </target> 
-  
-  <target name="clean"> 
-    <delete dir="build"/> 
-  </target> 
+  <path id="hd.classpath">
+    <path location="${hadoop.jar}"/>
+    <path location="${collectd.jar}"/>
+    <path location="${logging.jar}"/>
+  </path>
+
+  <target name="init">
+    <mkdir dir="${basedir}/target/classes"/>
+  </target>
+
+  <target name="compile" depends="init">
+    <javac srcdir="${basedir}/src/main/java"
+           destdir="${basedir}/target/classes"
+           debug="true"
+           source="1.6"
+           target="1.6"
+           classpathref="hd.classpath"/>
+  </target>
+
+  <target name="dist" depends="compile">
+    <jar jarfile="${basedir}/target/hadoop-collectd.jar">
+      <fileset dir="${basedir}/src/main/resources" includes="*.properties"/>
+      <fileset dir="${basedir}/target/classes" includes="**/*.class">
+        <exclude name="**/test/*"/>
+      </fileset>
+    </jar>
+  </target>
+
+  <target name="clean">
+    <delete dir="target"/>
+  </target>
 </project>
diff --git a/src/core/org/apache/hadoop/metrics/collectd/CollectdContext.java b/src/main/java/org/apache/hadoop/metrics/collectd/CollectdContext.java
similarity index 100%
rename from src/core/org/apache/hadoop/metrics/collectd/CollectdContext.java
rename to src/main/java/org/apache/hadoop/metrics/collectd/CollectdContext.java
diff --git a/hadoop-collectd-types.properties b/src/main/resources/hadoop-collectd-types.properties
similarity index 100%
rename from hadoop-collectd-types.properties
rename to src/main/resources/hadoop-collectd-types.properties

From ce3545891aef8cd158ad3c25c06731e40f6aa3d2 Mon Sep 17 00:00:00 2001
From: Max Gensthaler <max@gensthaler.de>
Date: Thu, 18 Aug 2011 20:35:27 +0200
Subject: [PATCH 2/2] mavenize

---
 .gitignore |   1 +
 pom.xml    | 130 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 131 insertions(+)
 create mode 100644 pom.xml

diff --git a/.gitignore b/.gitignore
index 476be86..85e6099 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 .settings
 .classpath
 .project
+target
 *~
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..c24eb73
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,130 @@
+<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>
+
+	<groupId>com.hyperic.hypcomm</groupId>
+	<artifactId>hadoop-collectd</artifactId>
+	<version>0.0.1-SNAPSHOT</version>
+
+	<name>hadoop-collectd</name>
+	<description>A Hadoop metrics.spi.MetricContext for sending metric data to collectd.</description>
+	<url>https://github.com/hyperic/hadoop-collectd</url>
+
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<maven.compiler.source>1.6</maven.compiler.source>
+		<maven.compiler.target>1.6</maven.compiler.target>
+
+		<hadoop.version>0.20.2-cdh3u1</hadoop.version>
+	</properties>
+
+	<licenses>
+		<license>
+			<name>Apache License, Version 2.0</name>
+			<url>http://www.apache.org/licenses/LICENSE-2.0</url>
+			<distribution>repo</distribution>
+		</license>
+	</licenses>
+	<scm>
+		<url>https://github.com/hyperic/hadoop-collectd</url>
+		<connection>scm:git:git://github.com/hyperic/hadoop-collectd.git</connection>
+	</scm>
+	<issueManagement>
+		<system>github</system>
+		<url>https://github.com/hyperic/hadoop-collectd/issues</url>
+	</issueManagement>
+<!--
+	<distributionManagement>
+		<repository>
+			<uniqueVersion>true</uniqueVersion>
+			<id>googlecode</id>
+			<url>svn:https://hadoop-collectd.googlecode.com/svn/maven2/</url>
+		</repository>
+	</distributionManagement>
+ -->
+
+	<repositories>
+		<repository>
+			<id>cloudera</id>
+			<name>Cloudera Repository</name>
+			<url>https://repository.cloudera.com/content/groups/public/</url>
+		</repository>
+	</repositories>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.hadoop</groupId>
+			<artifactId>hadoop-core</artifactId>
+			<version>${hadoop.version}</version>
+			<scope>provided</scope>
+			<exclusions>
+				<exclusion>
+					<groupId>commons-httpclient</groupId>
+					<artifactId>commons-httpclient</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.apache.tomcat</groupId>
+					<artifactId>jasper</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+
+		<dependency>
+			<groupId>com.hyperic.hypcomm</groupId>
+			<artifactId>jcollectd</artifactId>
+			<version>0.2.0-SNAPSHOT</version>
+		</dependency>
+
+		<!-- Testing -->
+<!--
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>[4.8.2,5.0.0)</version>
+			<scope>test</scope>
+		</dependency>
+ -->
+	</dependencies>
+
+	<build>
+		<plugins>
+			<!-- use specified java version -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<source>${maven.compiler.source}</source>
+					<target>${maven.compiler.target}</target>
+					<encoding>${project.build.sourceEncoding}</encoding>
+					<showWarnings>true</showWarnings>
+				</configuration>
+			</plugin>
+
+			<!-- assemble running 'mvn package' -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<configuration>
+					<descriptorRefs>
+						<descriptorRef>jar-with-dependencies</descriptorRef>
+					</descriptorRefs>
+					<archive>
+						<manifest>
+							<addClasspath>true</addClasspath>
+							<mainClass>${mainClass}</mainClass>
+						</manifest>
+					</archive>
+				</configuration>
+				<executions>
+					<execution>
+						<id>make-assembly</id> <!-- this is used for inheritance merges -->
+						<phase>package</phase> <!-- bind to the packaging phase -->
+						<goals>
+							<goal>single</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+</project>