diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000000..921fe32be5
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,7 @@
+*.iml
+*.ipr
+*.iws
+.idea
+.svn
+.classpath
+target
diff --git a/common/build.xml b/common/build.xml
deleted file mode 100644
index e0beb7a95d..0000000000
--- a/common/build.xml
+++ /dev/null
@@ -1,1927 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-
-<project name="Hadoop-Common" default="compile" 
-   xmlns:ivy="antlib:org.apache.ivy.ant"
-   xmlns:artifact="urn:maven-artifact-ant"> 
-
-  <!-- Load all the default properties, and any the user wants    -->
-  <!-- to contribute (without having to type -D or edit this file -->
-  <property file="${user.home}/build.properties" />
-  <property file="${basedir}/build.properties" />
- 
-  <property name="module" value="common"/>
-  <property name="Name" value="Hadoop-${module}"/>
-  <property name="name" value="hadoop-${module}"/>
-  <property name="_version" value="0.23.0"/>
-  <property name="version" value="${_version}-SNAPSHOT"/>
-  <property name="final.name" value="${name}-${version}"/>
-  <property name="test.final.name" value="${name}-test-${version}"/>
-  <property name="year" value="2009"/>
-  <property name="package.release" value="1"/>
-
-  <property name="src.dir" value="${basedir}/src"/>  	
-  <property name="java.src.dir" value="${src.dir}/java"/>
-  <property name="native.src.dir" value="${basedir}/src/native"/>
-
-  <property name="lib.dir" value="${basedir}/lib"/>
-  <property name="conf.dir" value="${basedir}/conf"/>
-  <property name="docs.src" value="${basedir}/src/docs"/>
-  <property name="changes.src" value="${docs.src}/changes"/>
-  <property name="src.webapps" value="${basedir}/src/webapps"/>
-
-  <property name="build.dir" value="${basedir}/build"/>
-  <property name="build.classes" value="${build.dir}/classes"/>
-  <property name="build.src" value="${build.dir}/src"/>
-  <property name="build.webapps" value="${build.dir}/webapps"/>
-
-  <!-- convert spaces to _ so that mac os doesn't break things -->
-  <exec executable="tr" inputstring="${os.name}" 
-        outputproperty="nonspace.os">
-     <arg value="[:space:]"/>
-     <arg value="_"/>
-  </exec>
-  <property name="build.platform" 
-            value="${nonspace.os}-${os.arch}-${sun.arch.data.model}"/>
-  <property name="jvm.arch" 
-            value="${sun.arch.data.model}"/>
-  <property name="build.native" value="${build.dir}/native/${build.platform}"/>
-  <property name="build.docs" value="${build.dir}/docs"/>
-  <property name="build.javadoc" value="${build.docs}/api"/>
-  <property name="build.javadoc.timestamp" value="${build.javadoc}/index.html" />
-  <property name="build.javadoc.dev" value="${build.docs}/dev-api"/>
-  <property name="build.encoding" value="ISO-8859-1"/>
-  <property name="install.c++" value="${build.dir}/c++/${build.platform}"/>
-
-  <property name="test.src.dir" value="${basedir}/src/test"/>
-  <property name="test.build.dir" value="${build.dir}/test"/>
-  <property name="test.generated.dir" value="${test.build.dir}/src"/>
-  <property name="test.build.data" value="${test.build.dir}/data"/>
-  <property name="test.cache.data" value="${test.build.dir}/cache"/>
-  <property name="test.debug.data" value="${test.build.dir}/debug"/>
-  <property name="test.log.dir" value="${test.build.dir}/logs"/>
-  <property name="test.build.classes" value="${test.build.dir}/classes"/>
-  <property name="test.build.extraconf" value="${test.build.dir}/extraconf"/>
-  <property name="test.build.javadoc" value="${test.build.dir}/docs/api"/>
-  <property name="test.build.javadoc.dev" value="${test.build.dir}/docs/dev-api"/>
-  <property name="test.build.webapps" value="${build.dir}/test/webapps"/>
-  <property name="test.include" value="Test*"/>
-  <property name="test.classpath.id" value="test.classpath"/>
-  <property name="test.output" value="no"/>
-  <property name="test.timeout" value="900000"/>
-  <property name="test.junit.output.format" value="plain"/>
-  <property name="test.junit.fork.mode" value="perTest" />
-  <property name="test.junit.printsummary" value="yes" />
-  <property name="test.junit.haltonfailure" value="no" />
-  <property name="test.junit.maxmemory" value="512m" />
-  <property name="test.conf.dir" value="${build.dir}/test/conf" />
-
-  <property name="test.core.build.classes" value="${test.build.dir}/core/classes"/>
-
-  <property name="test.all.tests.file" value="${test.src.dir}/all-tests"/>
-  <property name="test.exclude.file" value="${test.src.dir}/empty-file" />
-
-  <property name="javadoc.link.java"
-	    value="http://java.sun.com/javase/6/docs/api/"/>
-  <property name="javadoc.packages" value="org.apache.hadoop.*"/>
-  <property name="javadoc.maxmemory" value="512m" />
-
-  <property name="dist.dir" value="${build.dir}/${final.name}"/>
-
-  <property name="javac.debug" value="on"/>
-  <property name="javac.optimize" value="on"/>
-  <property name="javac.deprecation" value="off"/>
-  <property name="javac.version" value="1.6"/>
-  <property name="javac.args" value=""/>
-  <property name="javac.args.warnings" value="-Xlint:unchecked"/>
-
-  <property name="clover.db.dir" location="${build.dir}/test/clover/db"/>
-  <property name="clover.report.dir" location="${build.dir}/test/clover/reports"/>
-
-  <property name="rat.reporting.classname" value="rat.Report"/>
-
-  <property name="jdiff.build.dir" value="${build.docs}/jdiff"/>
-  <property name="jdiff.xml.dir" value="${lib.dir}/jdiff"/>
-  <property name="jdiff.stability" value="-unstable"/>
-  <property name="jdiff.compatibility" value=""/>
-  <property name="jdiff.stable" value="0.20.2"/>
-  <property name="jdiff.stable.javadoc" 
-            value="http://hadoop.apache.org/core/docs/r${jdiff.stable}/api/"/>
-
-  <property name="scratch.dir" value="${user.home}/tmp"/>
-  <property name="svn.cmd" value="svn"/>
-  <property name="grep.cmd" value="grep"/>
-  <property name="patch.cmd" value="patch"/>
-  <property name="make.cmd" value="make"/>
-
-	
-  <!-- IVY properteis set here -->
-  <property name="ivy.repo.dir" value="${user.home}/ivyrepo" />
-  <property name="ivy.dir" location="ivy" />
-  <loadproperties srcfile="${ivy.dir}/libraries.properties"/>
-  <property name="asfrepo" value="https://repository.apache.org"/> 
-  <property name="asfsnapshotrepo" value="${asfrepo}/content/repositories/snapshots"/>
-  <property name="asfstagingrepo"
-  value="${asfrepo}/service/local/staging/deploy/maven2"/>
-  <property name="mvnrepo" value="http://repo2.maven.org/maven2"/>
-  <property name="ivy.jar" location="${ivy.dir}/ivy-${ivy.version}.jar"/>
-  <property name="ant_task.jar" location="${ivy.dir}/maven-ant-tasks-${ant-task.version}.jar"/>
-  <property name="ant_task_repo_url" 
-     value="${mvnrepo}/org/apache/maven/maven-ant-tasks/${ant-task.version}/maven-ant-tasks-${ant-task.version}.jar"/>
-  <property name="ivy_repo_url" value="${mvnrepo}/org/apache/ivy/ivy/${ivy.version}/ivy-${ivy.version}.jar"/>
-  <property name="ivysettings.xml" location="${ivy.dir}/ivysettings.xml" />
-  <property name="ivy.org" value="org.apache.hadoop"/>
-  <property name="build.dir" location="build" />
-  <property name="dist.dir" value="${build.dir}/${final.name}"/>
-  <property name="build.ivy.dir" location="${build.dir}/ivy" />
-  <property name="build.ivy.lib.dir" location="${build.ivy.dir}/lib" />
-  <property name="common.ivy.lib.dir" location="${build.ivy.lib.dir}/${ant.project.name}/common"/>
-  <property name="build.ivy.report.dir" location="${build.ivy.dir}/report"/>
-  <property name="build.ivy.maven.dir" location="${build.ivy.dir}/maven"/>
-  <property name="pom.xml" location="${build.ivy.maven.dir}/pom.xml"/>
-  <property name="hadoop-common.pom" location="${ivy.dir}/hadoop-common.xml"/>
-  <property name="build.ivy.maven.common.jar" location="${build.ivy.maven.dir}/hadoop-common-${version}.jar"/>
-  <property name="hadoop-common-test.pom" location="${ivy.dir}/hadoop-common-test.xml" />
-  <property name="build.ivy.maven.common-test.jar" location="${build.ivy.maven.dir}/hadoop-common-test-${version}.jar"/>
-
-  <!--this is the naming policy for artifacts we want pulled down-->
-  <property name="ivy.module" location="hadoop-common" />
-  <property name="ivy.artifact.retrieve.pattern" value="${ant.project.name}/[conf]/[artifact]-[revision].[ext]"/>
-
-  <!--this is how artifacts that get built are named-->
-  <property name="ivy.publish.pattern" value="[artifact]-[revision].[ext]"/>
-  <property name="hadoop-common.jar" location="${build.dir}/${final.name}.jar" />
-  <property name="hadoop-common-test.jar" location="${build.dir}/${test.final.name}.jar" />
-  <property name="hadoop-common-sources.jar" location="${build.dir}/${final.name}-sources.jar" />
-  <property name="hadoop-common-test-sources.jar" location="${build.dir}/${test.final.name}-sources.jar" />
-
-  <!-- jdiff.home property set -->
-  <property name="jdiff.home" value="${build.ivy.lib.dir}/${ant.project.name}/jdiff"/>
-  <property name="jdiff.jar" value="${jdiff.home}/jdiff-${jdiff.version}.jar"/>
-  <property name="xerces.jar" value="${jdiff.home}/xerces-${xerces.version}.jar"/>
-
-  <property name="clover.jar" location="${clover.home}/lib/clover.jar"/>
-  <available property="clover.present" file="${clover.jar}" />
-	
-  <!-- Eclipse properties -->
-  <property name="build.dir.eclipse" value="build/eclipse"/>
-  <property name="build.dir.eclipse-main-classes" value="${build.dir.eclipse}/classes-main"/>
-  <property name="build.dir.eclipse-test-classes" value="${build.dir.eclipse}/classes-test"/>
-  <property name="build.dir.eclipse-test-generated-classes" value="${build.dir.eclipse}/classes-test-generated"/>
-
-  <!-- Use environment -->
-  <property environment="env" />
-
-  <!-- check if clover reports should be generated -->
-  <condition property="clover.enabled">
-    <and>
-        <isset property="run.clover"/>
-        <isset property="clover.present"/>
-    </and>
-  </condition>
-
-  <condition property="staging">
-     <equals arg1="${repo}" arg2="staging"/>
-  </condition>
-
-  <!-- packaging properties -->
-  <property name="package.prefix" value="/usr"/>
-  <property name="package.conf.dir" value="/etc/hadoop"/>
-  <property name="package.log.dir" value="/var/log/hadoop"/>
-  <property name="package.pid.dir" value="/var/run/hadoop"/>
-  <property name="package.var.dir" value="/var/lib/hadoop"/>
-  <property name="package.share.dir" value="/share/hadoop/${module}"/>
-  <!-- Use fixed path to build rpm for avoiding rpmbuild conflict with dash path names -->
-  <property name="package.buildroot" value="/tmp/hadoop_package_build_${user.name}"/>
-  <property name="package.build.dir" value="/tmp/hadoop_package_build_${user.name}/BUILD"/>
-
-  <!-- Indicate is Snappy native library should be bundled with Hadoop or not -->
-  <property name="bundle.snappy" value="false"/>
-
-  <!-- Snappy native library location -->
-  <property name="snappy.prefix" value="/usr/local"/>
-  <property name="snappy.lib" value="${snappy.prefix}/lib"/>
-  <property name="snappy.include" value="${snappy.prefix}/include"/>
-
-  <!-- the normal classpath -->
-  <path id="classpath">
-    <pathelement location="${build.classes}"/>
-    <pathelement location="${conf.dir}"/>
-    <path refid="ivy-common.classpath"/>
-  </path>
-
-  <path id="test.classpath">
-    <pathelement location="${test.build.extraconf}"/>
-    <pathelement location="${test.core.build.classes}" />
-    <pathelement location="${test.src.dir}"/>
-    <pathelement location="${test.build.dir}"/>
-    <pathelement location="${build.dir}"/>
-    <pathelement location="${build.examples}"/>
-    <pathelement location="${build.tools}"/>
-    <pathelement path="${clover.jar}"/>
-    <path refid="ivy-common.classpath"/>
-    <path refid="ivy-test.classpath"/>
-    <pathelement location="${hadoop-common.jar}"/>
-    <pathelement location="${test.conf.dir}"/>
-  </path>
-<!--
-  <path id="test.hdfs.classpath">
-    <pathelement location="${test.hdfs.build.classes}" />
-    <path refid="test.classpath"/>
-  </path>
-
-  <path id="test.mapred.classpath">
-    <pathelement location="${test.mapred.build.classes}" />
-    <path refid="test.hdfs.classpath"/>
-  </path>
-
-  <path id="test.hdfs.with.mr.classpath">
-    <pathelement location="${test.hdfs.with.mr.build.classes}" />
-    <path refid="test.mapred.classpath"/>
-  </path>
--->
-  <!-- the cluster test classpath: uses conf.dir for configuration -->
-  <path id="test.cluster.classpath">
-    <path refid="classpath"/>
-    <pathelement location="${test.build.classes}" />
-    <pathelement location="${test.src.dir}"/>
-    <pathelement location="${build.dir}"/>
-  </path>
-
-
-  <!-- ====================================================== -->
-  <!-- Macro definitions                                      -->
-  <!-- ====================================================== -->
-  <macrodef name="macro_tar" description="Worker Macro for tar">
-    <attribute name="param.destfile"/>
-    <element name="param.listofitems"/>
-    <sequential>
-      <tar compression="gzip" longfile="gnu"
-      destfile="@{param.destfile}">
-      <param.listofitems/>
-      </tar>
-    </sequential>
-  </macrodef>
-
-  <!-- ====================================================== -->
-  <!-- Stuff needed by all targets                            -->
-  <!-- ====================================================== -->
-  <target name="init" depends="ivy-retrieve-common">
-    <mkdir dir="${build.dir}"/>
-    <mkdir dir="${build.classes}"/>
-    <mkdir dir="${build.src}"/>
-    <mkdir dir="${build.webapps}"/>
- 
-    <mkdir dir="${test.build.dir}"/>
-    <mkdir dir="${test.build.classes}"/>
-    <mkdir dir="${test.build.extraconf}"/>
-    <tempfile property="touch.temp.file" destDir="${java.io.tmpdir}"/>
-    <touch millis="0" file="${touch.temp.file}">
-      <fileset dir="${conf.dir}" includes="**/*.template"/>
-    </touch>
-    <delete file="${touch.temp.file}"/>
-    <!-- copy all of the jsp and static files -->
-    <copy todir="${build.webapps}">
-      <fileset dir="${src.webapps}">
-        <exclude name="**/*.jsp" />
-        <exclude name="**/*.jspx" />
-      </fileset>
-    </copy>
-
-    <copy todir="${conf.dir}" verbose="true">
-      <fileset dir="${conf.dir}" includes="**/*.template"/>
-      <mapper type="glob" from="*.template" to="*"/>
-    </copy>
-
-    <mkdir dir="${test.conf.dir}"/>
-    <copy todir="${test.conf.dir}" verbose="true">
-      <fileset dir="${conf.dir}" includes="**/*.template"/>
-      <mapper type="glob" from="*.template" to="*"/>
-    </copy>
-
-    <exec executable="sh">
-       <arg line="src/saveVersion.sh ${version} ${build.dir}"/>
-    </exec>
-	
-  </target>
-
-  <import file="${test.src.dir}/aop/build/aop.xml"/>
-
-  <!-- ====================================================== -->
-  <!-- Compile the Java files                                 -->
-  <!-- ====================================================== -->
-  <target name="record-parser" depends="init" if="javacc.home">
-      <javacc
-          target="${java.src.dir}/org/apache/hadoop/record/compiler/generated/rcc.jj"
-          outputdirectory="${java.src.dir}/org/apache/hadoop/record/compiler/generated"
-          javacchome="${javacc.home}" />
-  </target>
-  
-  <target name="compile-rcc-compiler" depends="init, record-parser">
-    <javac 
-        encoding="${build.encoding}" 
-        srcdir="${java.src.dir}"
-        includes="org/apache/hadoop/record/compiler/**/*.java"
-        destdir="${build.classes}"
-        debug="${javac.debug}"
-        optimize="${javac.optimize}"
-        target="${javac.version}"
-        source="${javac.version}"
-        deprecation="${javac.deprecation}">
-        <compilerarg line="${javac.args}"/>
-        <classpath refid="classpath"/>
-    </javac>
-    
-    <taskdef name="recordcc" classname="org.apache.hadoop.record.compiler.ant.RccTask">
-      <classpath refid="classpath" />
-    </taskdef>
-  </target>
-  
-  <target name="compile-core-classes" depends="init, compile-rcc-compiler">
-    <!-- Compile Java files (excluding JSPs) checking warnings -->
-    <javac 
-     encoding="${build.encoding}" 
-     srcdir="${java.src.dir};${build.src}"	
-     includes="org/apache/hadoop/**/*.java"
-     destdir="${build.classes}"
-     debug="${javac.debug}"
-     optimize="${javac.optimize}"
-     target="${javac.version}"
-     source="${javac.version}"
-     deprecation="${javac.deprecation}">
-      <compilerarg line="${javac.args} ${javac.args.warnings}" />
-      <classpath refid="classpath"/>
-    </javac>
-
-    <copy todir="${build.classes}">
-      <fileset dir="${java.src.dir}" includes="**/*.properties"/>
-      <fileset dir="${java.src.dir}" includes="core-default.xml"/>
-    </copy>
-     
-  </target>
-
-  <target name="compile-native">
-    <antcall target="compile-core-native">
-      <param name="compile.native" value="true"/>
-    </antcall> 
-  </target>
-
-  <target name="check-native-configure" if="compile.native">
-    <condition property="need.native.configure">
-       <not> <available file="${native.src.dir}/configure"/> </not>
-    </condition>
-  </target>
-
-  <target name="create-native-configure" depends="check-native-configure" if="need.native.configure">
-    <mkdir dir="${native.src.dir}/config"/>
-    <mkdir dir="${native.src.dir}/m4"/>
-    <exec executable="autoreconf" dir="${native.src.dir}" 
-          searchpath="yes" failonerror="yes">
-       <arg value="-i"/>
-       <arg value="-f"/>
-    </exec>
-  </target>
-
-  <target name="check-native-makefile" if="compile.native">
-    <condition property="need.native.makefile">
-       <not> <available file="${native.src.dir}/Makefile"/> </not>
-    </condition>
-  </target>
-
-  <target name="create-native-makefile" depends="check-native-makefile" if="need.native.makefile"> 
-    <antcall target="create-native-configure"/>
-    <mkdir dir="${build.native}"/>
-
-    <exec dir="${build.native}" executable="sh" failonerror="true">
-      <env key="OS_NAME" value="${os.name}"/>
-      <env key="OS_ARCH" value="${os.arch}"/>
-      <env key="JVM_DATA_MODEL" value="${sun.arch.data.model}"/>
-      <env key="HADOOP_NATIVE_SRCDIR" value="${native.src.dir}"/>
-      <arg line="${native.src.dir}/configure CPPFLAGS=-I${snappy.include} LDFLAGS=-L${snappy.lib}"/>
-    </exec>
-  </target>
-
-
-  <target name="compile-core-native" depends="compile-core-classes,create-native-makefile"
-          if="compile.native">
-  	
-    <mkdir dir="${build.native}/lib"/>
-    <mkdir dir="${build.native}/src/org/apache/hadoop/io/compress/zlib"/>
-    <mkdir dir="${build.native}/src/org/apache/hadoop/io/compress/snappy"/>
-    <mkdir dir="${build.native}/src/org/apache/hadoop/io/nativeio"/>
-    <mkdir dir="${build.native}/src/org/apache/hadoop/security"/>
-
-  	<javah 
-  	  classpath="${build.classes}"
-  	  destdir="${build.native}/src/org/apache/hadoop/io/compress/zlib"
-      force="yes"
-  	  verbose="yes"
-  	  >
-  	  <class name="org.apache.hadoop.io.compress.zlib.ZlibCompressor" />
-      <class name="org.apache.hadoop.io.compress.zlib.ZlibDecompressor" />
-  	</javah>
-
-    <javah
-      classpath="${build.classes}"
-      destdir="${build.native}/src/org/apache/hadoop/io/compress/snappy"
-      force="yes"
-      verbose="yes"
-      >
-      <class name="org.apache.hadoop.io.compress.snappy.SnappyCompressor"/>
-      <class name="org.apache.hadoop.io.compress.snappy.SnappyDecompressor"/>
-    </javah>
-
-    <javah
-  	  classpath="${build.classes}"
-  	  destdir="${build.native}/src/org/apache/hadoop/security"
-      force="yes"
-  	  verbose="yes"
-  	  >
-  	  <class name="org.apache.hadoop.security.JniBasedUnixGroupsMapping" />
-  	</javah>
-  	<javah
-  	  classpath="${build.classes}"
-  	  destdir="${build.native}/src/org/apache/hadoop/io/nativeio"
-      force="yes"
-  	  verbose="yes"
-  	  >
-  	  <class name="org.apache.hadoop.io.nativeio.NativeIO" />
-  	</javah>
-
-  	<javah
-  	  classpath="${build.classes}"
-  	  destdir="${build.native}/src/org/apache/hadoop/security"
-      force="yes"
-  	  verbose="yes"
-  	  >
-  	  <class name="org.apache.hadoop.security.JniBasedUnixGroupsNetgroupMapping" />
-  	</javah>
-
-    <exec dir="${build.native}" executable="${make.cmd}" failonerror="true">
-      <env key="OS_NAME" value="${os.name}"/>
-      <env key="OS_ARCH" value="${os.arch}"/>
-  	  <env key="JVM_DATA_MODEL" value="${sun.arch.data.model}"/>
-  	  <env key="HADOOP_NATIVE_SRCDIR" value="${native.src.dir}"/>
-    </exec>
-
-	<exec dir="${build.native}" executable="sh" failonerror="true">
-	  <arg line="${build.native}/libtool --mode=install cp ${build.native}/libhadoop.la ${build.native}/lib"/>
-    </exec>
-
-  </target>
-
-  <target name="compile-core"
-          depends="clover,compile-core-classes,
-  	compile-core-native" 
-  	description="Compile core only">
-  </target>
-
-  <target name="compile" depends="compile-core" description="Compile core">
-  </target>
-
-  <!-- ================================================================== -->
-  <!-- Make hadoop-common.jar                                               -->
-  <!-- ================================================================== -->
-  <!--                                                                    -->
-  <!-- ================================================================== -->
-  <target name="jar" depends="compile-core" description="Make hadoop-common.jar">
-    <tar compression="gzip" destfile="${build.classes}/bin.tgz">
-      <tarfileset dir="bin" mode="755"/>
-    </tar>
-    <property name="jar.properties.list" value="commons-logging.properties, hadoop-metrics.properties" />
-    <jar jarfile="${build.dir}/${final.name}.jar"
-         basedir="${build.classes}">
-      <service type="org.apache.hadoop.security.SecurityInfo">
-        <provider 
-           classname="org.apache.hadoop.security.AnnotatedSecurityInfo"/>
-      </service>
-      <manifest>
-        <section name="org/apache/hadoop">
-          <attribute name="Implementation-Title" value="${ant.project.name}"/>
-          <attribute name="Implementation-Version" value="${version}"/>
-          <attribute name="Implementation-Vendor" value="Apache"/>
-        </section>
-      </manifest>
-      <fileset dir="${conf.dir}" includes="${jar.properties.list}" />
-      <fileset file="${jar.extra.properties.list}" />
-    </jar>
-
-    <jar jarfile="${hadoop-common-sources.jar}">
-      <fileset dir="${java.src.dir}" includes="org/apache/hadoop/**/*.java"/>
-      <fileset dir="${build.src}" includes="org/apache/hadoop/**/*.java"/>
-    </jar>
-  </target>
-
-  <!-- ================================================================== -->
-  <!-- Make the Hadoop metrics jar. (for use outside Hadoop)              -->
-  <!-- ================================================================== -->
-  <!--                                                                    -->
-  <!-- ================================================================== -->
-  <target name="metrics.jar" depends="compile-core" description="Make the Hadoop metrics jar. (for use outside Hadoop)">
-    <jar jarfile="${build.dir}/hadoop-metrics-${version}.jar"
-         basedir="${build.classes}">
-      <include name="**/metrics/**" />
-      <exclude name="**/package.html" />
-    </jar>
-  </target>
-
-  <target name="metrics2.jar" depends="compile-core" description="Make the Hadoop metrics2 framework jar (for use plugin development)">
-    <jar jarfile="${build.dir}/hadoop-metrics2-${version}.jar"
-         basedir="${build.classes}">
-      <include name="**/metrics2/**" />
-    </jar>
-  </target>
-
-  <target name="generate-test-records" depends="compile-rcc-compiler">
-    <recordcc destdir="${test.generated.dir}">
-      <fileset dir="${test.src.dir}"
-	         includes="**/*.jr" />
-    </recordcc>
-  </target>
-
-  <target name="generate-avro-records" depends="init, ivy-retrieve-test">
-    <taskdef name="schema" classname="org.apache.avro.specific.SchemaTask">
-      <classpath refid="test.classpath"/>
-    </taskdef>
-    <schema destdir="${test.generated.dir}">
-      <fileset dir="${test.src.dir}">
-        <include name="**/*.avsc" />
-      </fileset>
-    </schema>
-  </target>
-
-  <target name="generate-avro-protocols" depends="init, ivy-retrieve-test">
-    <taskdef name="schema" classname="org.apache.avro.specific.ProtocolTask">
-      <classpath refid="test.classpath"/>
-    </taskdef>
-    <schema destdir="${test.generated.dir}">
-      <fileset dir="${test.src.dir}">
-        <include name="**/*.avpr" />
-     </fileset>
-    </schema>
-  </target>
-
-  <!-- ================================================================== -->
-  <!-- Compile test code                                                  --> 
-  <!-- ================================================================== -->
-  <!-- This is a wrapper for fault-injection needs-->
-  <target name="-classes-compilation"
-    depends="compile-core-classes, compile-core-test"/> 
-
-  <target name="compile-core-test" depends="jar, ivy-retrieve-test, generate-test-records, generate-avro-records, generate-avro-protocols">
-    <mkdir dir="${test.core.build.classes}"/>
-    <javac 
-     encoding="${build.encoding}" 
-     srcdir="${test.generated.dir}"
-     includes="org/apache/hadoop/**/*.java"
-     destdir="${test.core.build.classes}"
-     debug="${javac.debug}"
-     optimize="${javac.optimize}"
-     target="${javac.version}"
-     source="${javac.version}"
-     deprecation="${javac.deprecation}">
-      <compilerarg line="${javac.args}"/>
-      <classpath refid="test.classpath"/>
-    </javac>
-    <javac 
-     encoding="${build.encoding}" 
-     srcdir="${test.src.dir}/core"
-     includes="org/apache/hadoop/**/*.java"
-     destdir="${test.core.build.classes}"
-     debug="${javac.debug}"
-     optimize="${javac.optimize}"
-     target="${javac.version}"
-     source="${javac.version}"
-     deprecation="${javac.deprecation}">
-      <compilerarg line="${javac.args} ${javac.args.warnings}" />
-      <classpath refid="test.classpath"/>
-     </javac>
-
-    <taskdef
-       name="paranamer" 
-       classname="com.thoughtworks.paranamer.ant.ParanamerGeneratorTask">
-      <classpath refid="classpath" />
-    </taskdef>
-    <paranamer sourceDirectory="${test.src.dir}/core"
-	       outputDirectory="${test.core.build.classes}"/>
-
-    <delete dir="${test.cache.data}"/>
-    <mkdir dir="${test.cache.data}"/>
-    <copy file="${test.src.dir}/core/org/apache/hadoop/cli/testConf.xml" todir="${test.cache.data}"/>
-
-  </target>
-
-  <!-- ================================================================== -->
-  <!-- Make hadoop-test.jar                                               -->
-  <!-- ================================================================== -->
-  <!--                                                                    -->
-  <!-- ================================================================== -->
-  <target name="jar-test" depends="compile-core-test" description="Make hadoop-test.jar">
-    <copy todir="${test.build.classes}">
-      <fileset dir="${test.core.build.classes}"/>
-    </copy>
-    <jar jarfile="${build.dir}/${test.final.name}.jar"
-         basedir="${test.build.classes}">
-         <manifest>
-           <attribute name="Main-Class"
-                      value="org/apache/hadoop/test/CoreTestDriver"/>
-          <section name="org/apache/hadoop">
-            <attribute name="Implementation-Title" value="${ant.project.name}"/>
-            <attribute name="Implementation-Version" value="${version}"/>
-            <attribute name="Implementation-Vendor" value="Apache"/>
-          </section>
-         </manifest>
-    </jar>
-
-    <jar jarfile="${hadoop-common-test-sources.jar}">
-      <fileset dir="${test.generated.dir}" includes="org/apache/hadoop/**/*.java"/>
-      <fileset dir="${test.src.dir}/core" includes="org/apache/hadoop/**/*.java"/>
-    </jar>
-  </target>
-
-  <!-- ================================================================== -->
-  <!-- Fault injection customization section.
-       These targets ought to be copied over to other projects and modified
-       as needed -->
-  <!-- ================================================================== -->
-  <target name="run-test-core-fault-inject" depends="injectfaults" 
-	  description="Run full set of the unit tests with fault injection">
-    <macro-run-tests-fault-inject target.name="run-test-core"
-      testcasesonly="false"/>
-  </target>
-
-  <target name="jar-test-fault-inject" depends="injectfaults" 
-    description="Make hadoop-test-fi.jar">
-    <macro-jar-test-fault-inject
-      target.name="jar-test"
-      jar.final.name="test.final.name"
-      jar.final.value="${test.final.name}-fi" />
-  </target>
-
-  <target name="jar-fault-inject" depends="injectfaults" 
-    description="Make hadoop-fi.jar">
-    <macro-jar-fault-inject
-      target.name="jar"
-      build.dir="${build-fi.dir}"
-      jar.final.name="final.name"
-      jar.final.value="${final.name}-fi" />
-  </target>
-
-  <!--This target is not included into the the top level list of target
-  for it serves a special "regression" testing purpose of non-FI tests in
-  FI environment -->
-  <target name="run-fault-inject-with-testcaseonly" depends="injectfaults">
-    <fail unless="testcase">Can't run this target without -Dtestcase setting!
-    </fail>
-    <macro-run-tests-fault-inject target.name="run-test-core" 
-      testcasesonly="true"/>
-  </target>
-  <!-- ================================================================== -->
-  <!-- End of Fault injection customization section                       -->
-  <!-- ================================================================== -->
-
-  <condition property="tests.notestcase">
-    <and>
-      <isfalse value="${test.fault.inject}"/>
-      <not>
-        <isset property="testcase"/>
-      </not>
-    </and>
-  </condition>
-  <condition property="tests.notestcase.fi">
-    <and>
-      <not>
-        <isset property="testcase" />
-      </not>
-      <istrue value="${test.fault.inject}" />
-    </and>
-  </condition>
-  <condition property="tests.testcase">
-    <and>
-      <isfalse value="${test.fault.inject}" />
-      <isset property="testcase" />
-    </and>
-  </condition>
-  <condition property="tests.testcaseonly">
-    <istrue value="${special.fi.testcasesonly}" />
-  </condition>
-  <condition property="tests.testcase.fi">
-    <and>
-      <istrue value="${test.fault.inject}" />
-      <isset property="testcase" />
-      <isfalse value="${special.fi.testcasesonly}" />
-    </and>
-  </condition>
-	     
-  <!-- ================================================================== -->
-  <!-- Run unit tests                                                     --> 
-  <!-- ================================================================== -->
-  <macrodef name="macro-test-runner">
-    <attribute name="test.file" />
-    <attribute name="classpath" />
-    <attribute name="test.dir" />
-    <attribute name="fileset.dir" />
-    <attribute name="hadoop.conf.dir.deployed" default="" />
-    <attribute name="test.krb5.conf.filename" default="" />
-    <sequential>
-      <delete file="${test.build.dir}/testsfailed"/>
-      <delete dir="@{test.dir}/data" />
-      <mkdir dir="@{test.dir}/data" />
-      <delete dir="${test.build.webapps}"/>
-      <copy todir="${test.build.webapps}">
-        <fileset dir="${test.src.dir}/test-webapps" includes="**/*" />
-      </copy>
-      <delete dir="@{test.dir}/logs" />
-      <mkdir dir="@{test.dir}/logs" />
-      <copy file="${test.src.dir}/hadoop-policy.xml"
-            todir="@{test.dir}/extraconf" />
-      <copy file="${test.src.dir}/fi-site.xml"
-            todir="@{test.dir}/extraconf" />
-      <junit showoutput="${test.output}"
-             printsummary="${test.junit.printsummary}"
-             haltonfailure="${test.junit.haltonfailure}"
-             fork="yes"
-             forkmode="${test.junit.fork.mode}"
-             maxmemory="${test.junit.maxmemory}"
-             dir="${basedir}"
-             timeout="${test.timeout}"
-             errorProperty="tests.failed"
-             failureProperty="tests.failed">
-        <jvmarg value="-ea" />
-        <sysproperty key="java.net.preferIPv4Stack" value="true"/>
-        <sysproperty key="test.build.data" value="${test.build.data}" />
-        <sysproperty key="test.cache.data" value="${test.cache.data}" />
-        <sysproperty key="test.debug.data" value="${test.debug.data}" />
-        <sysproperty key="hadoop.log.dir" value="${test.log.dir}" />
-        <sysproperty key="test.src.dir" value="${test.src.dir}" />
-        <sysproperty key="test.build.extraconf" value="@{test.dir}/extraconf" />
-         <sysproperty key="java.security.krb5.conf" value="@{test.krb5.conf.filename}"/>
-        <sysproperty key="hadoop.policy.file" value="hadoop-policy.xml" />
-        <sysproperty key="java.library.path"
-          value="${build.native}/lib:${lib.dir}/native/${build.platform}:${snappy.lib}"/>
-        <sysproperty key="java.security.egd" value="file:///dev/urandom" />
-        <sysproperty key="install.c++.examples" value="${install.c++.examples}"/>
-
-        <!-- set io.compression.codec.lzo.class in the child jvm only if it is set -->
-        <syspropertyset dynamic="no">
-          <propertyref name="io.compression.codec.lzo.class"/>
-        </syspropertyset>
-        <!-- set compile.c++ in the child jvm only if it is set -->
-        <syspropertyset dynamic="no">
-          <propertyref name="compile.c++"/>
-        </syspropertyset>
-        <classpath refid="@{classpath}" />
-        <!-- Pass probability specifications to the spawn JVM -->
-        <syspropertyset id="FaultProbabilityProperties">
-          <propertyref regex="fi.*"/>
-        </syspropertyset>
-        <sysproperty key="test.system.hdrc.deployed.hadoopconfdir"
-                     value="@{hadoop.conf.dir.deployed}" />
-        <!-- user to group mapping class for TestAccessControlList -->
-        <syspropertyset dynamic="no">
-          <propertyref name="TestAccessControlListGroupMapping"/>
-        </syspropertyset>
-        <formatter type="${test.junit.output.format}" />
-        <batchtest todir="@{test.dir}" if="tests.notestcase">
-          <fileset dir="@{fileset.dir}/core"
-                   excludes="**/${test.exclude}.java aop/** system/**">
-             <patternset>
-               <includesfile name="@{test.file}"/>
-               <excludesfile name="${test.exclude.file}"/>
-             </patternset>
-         </fileset>
-        </batchtest>
-        <batchtest todir="${test.build.dir}" if="tests.notestcase.fi">
-          <fileset dir="@{fileset.dir}/aop"
-                   includes="**/${test.include}.java"
-                   excludes="**/${test.exclude}.java"
-                   excludesfile="${test.exclude.file}" />
-         </batchtest>
-         <batchtest todir="@{test.dir}" if="tests.testcase">
-           <fileset dir="@{fileset.dir}/core"
-             includes="**/${testcase}.java" excludes="aop/** system/**"/>
-         </batchtest>
-         <batchtest todir="${test.build.dir}" if="tests.testcase.fi">
-           <fileset dir="@{fileset.dir}/aop" includes="**/${testcase}.java" />
-         </batchtest>
-         <!--The following batch is for very special occasions only when
-                a non-FI tests are needed to be executed against FI-environment -->
-         <batchtest todir="${test.build.dir}" if="tests.testcaseonly">
-           <fileset dir="@{fileset.dir}/core" includes="**/${testcase}.java" />
-         </batchtest>
-      </junit>
-      <antcall target="checkfailure"/>
-    </sequential>
-  </macrodef>
-
-  <target name="run-test-core" depends="compile-core-test" description="Run core unit tests">
-    <macro-test-runner test.file="${test.all.tests.file}"
-                       classpath="${test.classpath.id}"
-                       test.dir="${test.build.dir}"
-                       fileset.dir="${test.src.dir}"
-                       test.krb5.conf.filename="${test.src.dir}/krb5.conf"
-                       >
-    </macro-test-runner>
-  </target>   
-
-  <target name="checkfailure" if="tests.failed">
-    <touch file="${test.build.dir}/testsfailed"/>
-    <fail unless="continueOnFailure">Tests failed!</fail>
-  </target>
-
-  <target name="test-core" description="Run core unit tests">
-    <delete file="${test.build.dir}/testsfailed"/> 
-    <property name="continueOnFailure" value="true"/> 
-    <antcall target="run-test-core"/>
-    <antcall target="run-test-core-fault-inject"/>
-    <available file="${test.build.dir}/testsfailed" property="testsfailed"/>
-    <fail if="testsfailed">Tests failed!</fail> 
-  </target>
-
-  <target name="test" depends="jar-test,test-core" description="Run all unit tests"/>
-
-  <!-- Run all unit tests, not just Test*, and use non-test configuration. -->
-  <target name="test-cluster" description="Run all unit tests, not just Test*, and use non-test configuration.">
-    <antcall target="test">
-      <param name="test.include" value="*"/>
-      <param name="test.classpath.id" value="test.cluster.classpath"/>
-    </antcall>
-  </target>
-
-  <target name="nightly" depends="test, tar">
-  </target>
-	
-  <!-- ================================================================== -->
-  <!-- Run optional third-party tool targets                              --> 
-  <!-- ================================================================== -->
-  <target name="checkstyle" depends="ivy-retrieve-checkstyle,check-for-checkstyle" if="checkstyle.present" 
-       description="Run optional third-party tool targets">
-       <taskdef resource="checkstyletask.properties">
-         <classpath refid="checkstyle-classpath"/>
-       </taskdef>
-  
-	<mkdir dir="${test.build.dir}"/>
-  	
-  	<checkstyle config="${test.src.dir}/checkstyle.xml"
-  		failOnViolation="false">
-      <fileset dir="${java.src.dir}" includes="**/*.java" excludes="**/generated/**"/>
-      <formatter type="xml" toFile="${test.build.dir}/checkstyle-errors.xml"/>
-  	</checkstyle>
-  	
-  	<xslt style="${test.src.dir}/checkstyle-noframes-sorted.xsl"
-        in="${test.build.dir}/checkstyle-errors.xml"
-        out="${test.build.dir}/checkstyle-errors.html"/>
-  </target>
-	
-  <target name="check-for-checkstyle">
-    <available property="checkstyle.present" resource="checkstyletask.properties">
-       <classpath refid="checkstyle-classpath"/>
-    </available>  	
-  </target>
-
-
- <property name="findbugs.home" value=""/>
-  <target name="findbugs" depends="check-for-findbugs, jar" if="findbugs.present" description="Run findbugs if present">
-    <property name="findbugs.out.dir" value="${test.build.dir}/findbugs"/>
-    <property name="findbugs.exclude.file" value="${test.src.dir}/findbugsExcludeFile.xml"/>
-    <property name="findbugs.report.htmlfile" value="${findbugs.out.dir}/hadoop-findbugs-report.html"/>
-    <property name="findbugs.report.xmlfile" value="${findbugs.out.dir}/hadoop-findbugs-report.xml"/>
-    <taskdef name="findbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask"
-        classpath="${findbugs.home}/lib/findbugs-ant.jar" />
-
-        <mkdir dir="${findbugs.out.dir}"/>
-
-    <findbugs home="${findbugs.home}" output="xml:withMessages"
-        outputFile="${findbugs.report.xmlfile}" effort="max"
-        excludeFilter="${findbugs.exclude.file}" jvmargs="-Xmx512M">
-      <auxClasspath>
-        <fileset dir="${env.ANT_HOME}/lib">
-          <include name="ant.jar"/>
-          <include name="ant-launcher.jar"/>
-        </fileset>
-        <fileset dir="${build.ivy.lib.dir}/${ant.project.name}/common">
-          <include name="**/*.jar"/>
-        </fileset>
-      </auxClasspath>
-      <sourcePath path="${java.src.dir}"/>
-      <class location="${basedir}/build/${final.name}.jar" />
-    </findbugs>
-
-        <xslt style="${findbugs.home}/src/xsl/default.xsl"
-        in="${findbugs.report.xmlfile}"
-        out="${findbugs.report.htmlfile}"/>
-  </target>
-	
-  <target name="check-for-findbugs">
-    <available property="findbugs.present"
-        file="${findbugs.home}/lib/findbugs.jar" />
-  </target>
-
-
-  <!-- ================================================================== -->
-  <!-- Documentation                                                      -->
-  <!-- ================================================================== -->
-  
-  <target name="docs" depends="forrest.check" description="Generate forrest-based documentation. 
-       To use, specify -Dforrest.home=&lt;base of Apache Forrest installation&gt; on the command line." if="forrest.home">
-    <exec dir="${docs.src}" executable="${forrest.home}/bin/forrest"
-	  failonerror="true">
-    </exec>
-    <copy todir="${build.docs}">
-      <fileset dir="${docs.src}/build/site/" />
-    </copy>
-    <copy file="${docs.src}/releasenotes.html" todir="${build.docs}"/>
-    <style basedir="${java.src.dir}" destdir="${build.docs}"
-           includes="core-default.xml" style="conf/configuration.xsl"/>
-    <antcall target="changes-to-html"/>
-  </target>
-
-  <target name="forrest.check" unless="forrest.home">
-    <fail message="'forrest.home' is not defined. Please pass 
-      -Dforrest.home=&lt;base of Apache Forrest installation&gt; to Ant on the command-line." />
-  </target>
-
-  <target name="javadoc-dev" depends="compile, ivy-retrieve-javadoc" description="Generate javadoc for hadoop developers">
-    <mkdir dir="${build.javadoc.dev}"/>
-    <javadoc
-      overview="${java.src.dir}/overview.html"
-      packagenames="org.apache.hadoop.*"
-      destdir="${build.javadoc.dev}"
-      author="true"
-      version="true"
-      use="true"
-      windowtitle="${Name} ${version} API"
-      doctitle="${Name} ${version} Developer API"
-      bottom="Copyright &amp;copy; ${year} The Apache Software Foundation"
-      maxmemory="${javadoc.maxmemory}">
-        <packageset dir="${java.src.dir}"/>
-
-        <link href="${javadoc.link.java}"/>
-
-        <classpath >
-          <path refid="classpath" />
-          <path refid="javadoc-classpath"/>
-          <pathelement path="${java.class.path}"/>
-          <pathelement location="${build.tools}"/>
-        </classpath>
-
-    	<group title="Core" packages="org.apache.*"/>
-
-    </javadoc>
-  </target>	
-
-  <target name="javadoc-uptodate" depends="compile, ivy-retrieve-javadoc">
-    <uptodate property="javadoc.is.uptodate">
-      <srcfiles dir="${src.dir}">
-        <include name="**/*.java" />
-        <include name="**/*.html" />
-      </srcfiles>
-      <mapper type="merge" to="${build.javadoc.timestamp}" />
-    </uptodate>
-  </target>
- 
-  <target name="javadoc" description="Generate javadoc" depends="jar, javadoc-uptodate"
-       unless="javadoc.is.uptodate">
-    <mkdir dir="${build.javadoc}"/>
-    <javadoc
-      overview="${java.src.dir}/overview.html"
-      packagenames="org.apache.hadoop.*"
-      destdir="${build.javadoc}"
-      author="true"
-      version="true"
-      use="true"
-      windowtitle="${Name} ${version} API"
-      doctitle="${Name} ${version} API"
-      bottom="Copyright &amp;copy; ${year} The Apache Software Foundation"
-      maxmemory="${javadoc.maxmemory}">
-        <packageset dir="${java.src.dir}"/>
-	
-        <link href="${javadoc.link.java}"/>
-
-        <classpath >
-          <path refid="classpath" />
-          <path refid="javadoc-classpath"/>
-          <pathelement path="${java.class.path}"/>
-          <pathelement location="${build.tools}"/>
-        </classpath>
-
-       <group title="Core" packages="org.apache.*"/>
-       <doclet name="org.apache.hadoop.classification.tools.ExcludePrivateAnnotationsStandardDoclet"
-               path="${build.dir}/${final.name}.jar"/>
-    </javadoc>
-  </target>	
-
-  <target name="api-xml" depends="ivy-retrieve-jdiff,javadoc,write-null">
-    <javadoc maxmemory="${javadoc.maxmemory}">
-       <doclet name="org.apache.hadoop.classification.tools.ExcludePrivateAnnotationsJDiffDoclet"
-               path="${build.dir}/${final.name}.jar:${jdiff.jar}:${xerces.jar}">
-         <param name="-apidir" value="${jdiff.xml.dir}"/>
-         <param name="-apiname" value="hadoop-core ${version}"/>
-         <param name="${jdiff.stability}"/>
-       </doclet>
-       <packageset dir="src/java"/>
-       <classpath >
-         <path refid="classpath" />
-         <path refid="jdiff-classpath" />
-         <pathelement path="${java.class.path}"/>
-       </classpath>
-    </javadoc>
-  </target>
-	
-  <target name="write-null">
-	<exec executable="touch">
-	   <arg value="${jdiff.home}/Null.java"/>
-        </exec>
-  </target> 
-
-  <target name="api-report" depends="ivy-retrieve-jdiff,api-xml">
-    <mkdir dir="${jdiff.build.dir}"/>
-    <javadoc sourcepath="src/java"
-             destdir="${jdiff.build.dir}"
-	     sourceFiles="${jdiff.home}/Null.java"
-	     maxmemory="${javadoc.maxmemory}">
-       <doclet name="org.apache.hadoop.classification.tools.ExcludePrivateAnnotationsJDiffDoclet"
-              path="${build.dir}/${final.name}.jar:${jdiff.jar}:${xerces.jar}">
-         <param name="-oldapi" value="hadoop-core ${jdiff.stable}"/>
-         <param name="-newapi" value="hadoop-core ${version}"/>
-         <param name="-oldapidir" value="${jdiff.xml.dir}"/>
-         <param name="-newapidir" value="${jdiff.xml.dir}"/>
-         <param name="-javadocold" value="${jdiff.stable.javadoc}"/>
-         <param name="-javadocnew" value="../../api/"/>
-         <param name="-stats"/>
-         <param name="${jdiff.stability}"/>
-         <param name="${jdiff.compatibility}"/>
-       </doclet>
-       <classpath >
-         <path refid="classpath" />
-         <path refid="jdiff-classpath"/>
-         <pathelement path="${java.class.path}"/>
-       </classpath>
-    </javadoc>
-  </target>
-	
-  <target name="changes-to-html" description="Convert CHANGES.txt into an html file">
-    <mkdir dir="${build.docs}"/>
-    <exec executable="perl" input="CHANGES.txt" output="${build.docs}/changes.html" failonerror="true">
-      <arg value="${changes.src}/changes2html.pl"/>
-    </exec>
-    <copy todir="${build.docs}">
-      <fileset dir="${changes.src}" includes="*.css"/>
-    </copy>
-  </target>
-
-  <!-- ================================================================== -->
-  <!-- D I S T R I B U T I O N                                            -->
-  <!-- ================================================================== -->
-  <!--                                                                    -->
-  <!-- ================================================================== -->
-  <target name="package" depends="compile, jar, javadoc, docs, api-report, create-native-configure, jar-test"
-	  description="Build distribution">
-    <mkdir dir="${dist.dir}"/>
-    <mkdir dir="${dist.dir}/lib"/>
-    <mkdir dir="${dist.dir}/libexec"/>
-    <mkdir dir="${dist.dir}/bin"/>
-    <mkdir dir="${dist.dir}/docs"/>
-    <mkdir dir="${dist.dir}/docs/api"/>
-    <mkdir dir="${dist.dir}/docs/jdiff"/>
-
-    <copy todir="${dist.dir}/lib" includeEmptyDirs="false" flatten="true">
-      <fileset dir="${common.ivy.lib.dir}"/>
-    </copy>
-
-    <copy todir="${dist.dir}/lib" includeEmptyDirs="false">
-      <fileset dir="lib">
-        <exclude name="**/native/**"/>
-      </fileset>
-    </copy>
-
-  	<exec dir="${dist.dir}" executable="sh" failonerror="true">
-	  <env key="BASE_NATIVE_LIB_DIR" value="${lib.dir}/native"/>
-	  <env key="BUILD_NATIVE_DIR" value="${build.dir}/native"/>
-	  <env key="DIST_LIB_DIR" value="${dist.dir}/lib/native"/>
-          <env key="BUNDLE_SNAPPY_LIB" value="${bundle.snappy}"/>
-          <env key="SNAPPY_LIB_DIR" value="${snappy.prefix}/lib"/>
-	  <arg line="${native.src.dir}/packageNativeHadoop.sh"/>
-    </exec>
-
-    <copy todir="${dist.dir}/webapps">
-      <fileset dir="${build.webapps}"/>
-    </copy>
-
-    <copy todir="${dist.dir}"> 
-      <fileset file="${build.dir}/${final.name}.jar"/>
-      <fileset file="${build.dir}/${test.final.name}.jar"/>
-    </copy>
-    
-    <copy todir="${dist.dir}/bin">
-      <fileset dir="bin"/>
-    </copy>
-
-    <copy todir="${dist.dir}/conf">
-      <fileset dir="${conf.dir}" excludes="**/*.template"/>
-    </copy>
-
-    <copy todir="${dist.dir}/docs">
-      <fileset dir="${build.docs}"/>
-    </copy>
-
-    <copy file="ivy.xml" tofile="${dist.dir}/ivy.xml"/>
-
-    <copy todir="${dist.dir}/ivy">
-      <fileset dir="ivy"/>
-    </copy>
-
-    <copy todir="${dist.dir}/libexec">
-      <fileset dir="bin">
-        <include name="hadoop-config.sh"/>
-      </fileset>
-    </copy>
-
-    <copy todir="${dist.dir}">
-      <fileset dir=".">
-        <include name="*.txt" />
-      </fileset>
-    </copy>
-
-    <copy todir="${dist.dir}/src" includeEmptyDirs="true">
-      <fileset dir="src" excludes="**/*.template **/docs/build/**/*"/>
-    </copy>
-  	
-    <copy todir="${dist.dir}/" file="build.xml"/>
-
-    <chmod perm="ugo+x" file="${dist.dir}/src/native/configure"/>
-    <chmod perm="ugo+x" type="file" parallel="false">
-        <fileset dir="${dist.dir}/bin"/>
-    </chmod>
-
-  </target>
-
-  <!-- ================================================================== -->
-  <!-- Make release tarball                                               -->
-  <!-- ================================================================== -->
-  <target name="tar" depends="package" description="Make release tarball">
-    <macro_tar param.destfile="${build.dir}/${final.name}.tar.gz">
-      <param.listofitems>
-        <tarfileset dir="${build.dir}" mode="664">
-          <exclude name="${final.name}/bin/*" />
-          <exclude name="${final.name}/src/native/configure" />
-          <include name="${final.name}/**" />
-        </tarfileset>
-        <tarfileset dir="${build.dir}" mode="755">
-          <include name="${final.name}/bin/*" />
-          <include name="${final.name}/src/native/configure" />
-        </tarfileset>
-      </param.listofitems>
-    </macro_tar>
-  </target>
-
-  <target name="bin-package" depends="compile, jar, jar-test, javadoc" 
-		description="assembles artifacts for binary target">
-    <mkdir dir="${dist.dir}"/>
-    <mkdir dir="${dist.dir}/lib"/>
-    <mkdir dir="${dist.dir}/${package.share.dir}/contrib"/>
-    <mkdir dir="${dist.dir}/${package.share.dir}/templates"/>
-    <mkdir dir="${dist.dir}/${package.share.dir}/webapps"/>
-    <mkdir dir="${dist.dir}/bin"/>
-    <mkdir dir="${dist.dir}/libexec"/>
-    <mkdir dir="${dist.dir}/sbin"/>
-    <mkdir dir="${dist.dir}/var/log"/>
-    <mkdir dir="${dist.dir}/var/run"/>
-
-    <copy todir="${dist.dir}/${package.share.dir}/lib" includeEmptyDirs="false" flatten="true">
-      <fileset dir="${common.ivy.lib.dir}"/>
-    </copy>
-
-    <copy todir="${dist.dir}/${package.share.dir}" includeEmptyDirs="false">
-      <fileset dir="lib">
-        <exclude name="**/native/**"/>
-      </fileset>
-    </copy>
-
-  	<exec dir="${dist.dir}" executable="sh" failonerror="true">
-	  <env key="BASE_NATIVE_LIB_DIR" value="${lib.dir}/native"/>
-	  <env key="BUILD_NATIVE_DIR" value="${build.dir}/native"/>
-	  <env key="DIST_LIB_DIR" value="${dist.dir}/lib"/>
-          <env key="BUNDLE_SNAPPY_LIB" value="${bundle.snappy}"/>
-          <env key="SNAPPY_LIB_DIR" value="${snappy.prefix}/lib"/>
-	  <arg line="${native.src.dir}/packageNativeHadoop.sh"/>
-    </exec>
-
-    <copy todir="${dist.dir}/${package.share.dir}"> 
-      <fileset file="${build.dir}/*.jar"/>
-    </copy>
-    
-    <copy todir="${dist.dir}/bin">
-      <fileset dir="bin">
-        <include name="hadoop"/>
-      </fileset>
-    </copy>
-
-    <copy todir="${dist.dir}/libexec">
-      <fileset dir="bin">
-        <include name="hadoop-config.sh"/>
-      </fileset>
-    </copy>
-
-    <copy todir="${dist.dir}/sbin">
-      <fileset dir="bin">
-        <include name="hadoop-daemon.sh"/>
-        <include name="hadoop-daemons.sh"/>
-        <include name="slaves.sh"/>
-        <include name="start-all.sh"/>
-        <include name="stop-all.sh"/>
-      </fileset>
-      <fileset dir="${basedir}/src/packages">
-        <include name="*.sh" />
-      </fileset>
-    </copy>
-
-    <copy todir="${dist.dir}/etc/hadoop">
-      <fileset dir="${conf.dir}" excludes="**/*.template"/>
-      <fileset dir="${conf.dir}" includes="hadoop-env.sh.template"/>
-    </copy>
-
-    <copy todir="${dist.dir}/${package.share.dir}/templates">
-      <fileset dir="${basedir}/src/packages/templates/conf" includes="*"/>
-    </copy>
-
-    <copy todir="${dist.dir}/share/doc/hadoop/${module}">
-      <fileset dir=".">
-        <include name="*.txt" />
-      </fileset>
-    </copy>
-
-    <chmod perm="ugo+x" type="file" parallel="false">
-        <fileset dir="${dist.dir}/bin"/>
-        <fileset dir="${dist.dir}/sbin"/>
-    </chmod>
-  </target>
-
-  <target name="binary" depends="bin-package" description="Make tarball without source and documentation">
-    <macro_tar param.destfile="${build.dir}/${final.name}-bin.tar.gz">
-      <param.listofitems>
-        <tarfileset dir="${build.dir}" mode="664">
-          <exclude name="${final.name}/bin/*" />
-          <exclude name="${final.name}/libexec/*" />
-          <exclude name="${final.name}/sbin/*" />
-          <exclude name="${final.name}/src/**" />
-          <exclude name="${final.name}/docs/**" />
-          <include name="${final.name}/**" />
-        </tarfileset>
-        <tarfileset dir="${build.dir}" mode="755">
-          <include name="${final.name}/bin/*" />
-          <include name="${final.name}/libexec/*" />
-          <include name="${final.name}/sbin/*" />
-        </tarfileset>
-      </param.listofitems>
-    </macro_tar>
-  </target>
-
-  <target name="rpm" depends="binary" description="Make rpm package">
-    <mkdir dir="${package.buildroot}/BUILD" />
-    <mkdir dir="${package.buildroot}/RPMS" />
-    <mkdir dir="${package.buildroot}/SRPMS" />
-    <mkdir dir="${package.buildroot}/SOURCES" />
-    <mkdir dir="${package.buildroot}/SPECS" />
-    <copy todir="${package.buildroot}/SOURCES">
-      <fileset dir="${build.dir}">
-        <include name="${final.name}-bin.tar.gz" />
-      </fileset>
-    </copy>
-    <copy file="${src.dir}/packages/rpm/spec/hadoop.spec" todir="${package.buildroot}/SPECS">
-      <filterchain>
-        <replacetokens>
-          <token key="final.name" value="${final.name}" />
-          <token key="version" value="${_version}" />
-          <token key="package.release" value="${package.release}" />
-          <token key="package.build.dir" value="${package.build.dir}" />
-          <token key="package.prefix" value="${package.prefix}" />
-          <token key="package.conf.dir" value="${package.conf.dir}" />
-          <token key="package.log.dir" value="${package.log.dir}" />
-          <token key="package.pid.dir" value="${package.pid.dir}" />
-          <token key="package.var.dir" value="${package.var.dir}" />
-        </replacetokens>
-      </filterchain>
-    </copy>
-    <rpm specFile="hadoop.spec" command="-bb --target ${os.arch}" topDir="${package.buildroot}" cleanBuildDir="true" failOnError="true"/>
-    <copy todir="${build.dir}/" flatten="true">
-      <fileset dir="${package.buildroot}/RPMS">
-        <include name="**/*.rpm" />
-      </fileset>
-    </copy>
-    <delete dir="${package.buildroot}" quiet="true" verbose="false"/>
-  </target>
-
-  <target name="deb" depends="ivy-retrieve-package, binary" description="Make deb package">
-    <taskdef name="deb"
-           classname="org.vafer.jdeb.ant.DebAntTask">
-      <classpath refid="ivy-package.classpath" />
-    </taskdef>
-
-    <mkdir dir="${package.build.dir}/hadoop.control" />
-    <mkdir dir="${package.buildroot}/${package.prefix}" />
-    <copy todir="${package.buildroot}/${package.prefix}">
-      <fileset dir="${build.dir}/${final.name}">
-        <include name="**" />
-      </fileset>
-    </copy>
-    <copy todir="${package.build.dir}/hadoop.control">
-      <fileset dir="${src.dir}/packages/deb/hadoop.control">
-        <exclude name="control" />
-      </fileset>
-    </copy>
-    <copy file="${src.dir}/packages/deb/hadoop.control/control" todir="${package.build.dir}/hadoop.control">
-      <filterchain>
-        <replacetokens>
-          <token key="final.name" value="${final.name}" />
-          <token key="version" value="${_version}" />
-          <token key="package.release" value="${package.release}" />
-          <token key="package.build.dir" value="${package.build.dir}" />
-          <token key="package.prefix" value="${package.prefix}" />
-          <token key="package.conf.dir" value="${package.conf.dir}" />
-          <token key="package.log.dir" value="${package.log.dir}" />
-          <token key="package.pid.dir" value="${package.pid.dir}" />
-        </replacetokens>
-      </filterchain>
-    </copy>
-    <deb destfile="${package.buildroot}/${name}_${_version}-${package.release}_${os.arch}.deb" control="${package.build.dir}/hadoop.control">
-      <tarfileset dir="${build.dir}/${final.name}" filemode="644" prefix="${package.prefix}">
-        <exclude name="bin" />
-        <exclude name="etc" />
-        <exclude name="libexec" />
-        <exclude name="etc/**" />
-        <exclude name="sbin" />
-        <include name="**" />
-      </tarfileset>
-      <tarfileset dir="${build.dir}/${final.name}/bin" filemode="755" prefix="${package.prefix}/bin">
-        <include name="*" />
-      </tarfileset>
-      <tarfileset dir="${build.dir}/${final.name}/libexec" filemode="755" prefix="${package.prefix}/libexec">
-        <include name="*" />
-      </tarfileset>
-      <tarfileset dir="${build.dir}/${final.name}/sbin" filemode="755" prefix="${package.prefix}/sbin">
-        <include name="*" />
-      </tarfileset>
-      <tarfileset dir="${src.dir}/packages" filemode="755" prefix="${package.prefix}/sbin">
-        <include name="*.sh" />
-      </tarfileset>
-      <tarfileset dir="${build.dir}/${final.name}/etc/hadoop" filemode="644" prefix="${package.conf.dir}">
-        <exclude name="core-site.xml" />
-        <exclude name="hdfs-site.xml" />
-        <exclude name="mapred-site.xml" />
-        <include name="**" /> 
-      </tarfileset>
-    </deb>
-    <copy todir="${build.dir}/" flatten="true">
-      <fileset dir="${package.buildroot}">
-        <include name="**/hadoop*.deb" />
-      </fileset>
-    </copy>
-    <delete dir="${package.buildroot}" quiet="true" verbose="false"/>
-  </target>
-  
-  <target name="ant-task-download" description="To download mvn-ant-task" unless="offline">
-    <get src="${ant_task_repo_url}" dest="${ant_task.jar}" usetimestamp="true"/>
-  </target>
-
-  <target name="mvn-taskdef" depends="ant-task-download">
-     <path id="mvn-ant-task.classpath" path="${ant_task.jar}"/> 
-     <typedef resource="org/apache/maven/artifact/ant/antlib.xml" 
-         uri="urn:maven-artifact-ant"
-         classpathref="mvn-ant-task.classpath"/>
-  </target>   
-
-  <target name="mvn-install" depends="mvn-taskdef,jar,jar-test,set-version"
-    description="Install hadoop common and test jars to local fs m2 repo">
-     <artifact:pom file="${hadoop-common.pom}" id="hadoop.core"/>
-     <artifact:pom file="${hadoop-common-test.pom}" id="hadoop.core.test"/>
-     <artifact:install file="${hadoop-common.jar}">
-        <pom refid="hadoop.core"/>
-	<attach file="${hadoop-common-sources.jar}" classifier="sources" />
-     </artifact:install>
-     <artifact:install file="${hadoop-common-test.jar}">
-        <pom refid="hadoop.core.test"/>
-	<attach file="${hadoop-common-test-sources.jar}" classifier="sources" />
-     </artifact:install>
-  </target>
-
-  <target name="mvn-si-install" depends="mvn-install,-mvn-system-install"
-     description="Install system integration test jars as well"/>
-
-  <target name="mvn-deploy" depends="mvn-taskdef, jar, jar-test,
-     jar-system, set-version, signanddeploy, simpledeploy"
-     description="To deploy hadoop common and test jar's to apache
-     snapshot's repository"/>
-
-  <target name="signanddeploy" if="staging" depends="sign">
-     <artifact:pom file="${hadoop-common.pom}" id="hadoop.core"/>
-     <artifact:pom file="${hadoop-common-test.pom}" id="hadoop.core.test"/>
-     <artifact:pom file="${hadoop-common-instrumented.pom}" 
-       id="hadoop.core.${herriot.suffix}"/>
-     <artifact:install-provider artifactId="wagon-http"
-     version="${wagon-http.version}"/>
-
-     <artifact:deploy file="${hadoop-common.jar}">
-       <remoteRepository id="apache.staging.https" url="${asfstagingrepo}"/>
-       <pom refid="hadoop.core"/>
-       <attach file="${hadoop-common.jar}.asc" type="jar.asc"/>
-       <attach file="${hadoop-common.pom}.asc" type="pom.asc"/>
-       <attach file="${hadoop-common-sources.jar}.asc" type="jar.asc"
-         classifier="sources"/>
-       <attach file="${hadoop-common-sources.jar}" classifier="sources"/>
-     </artifact:deploy>
-
-     <artifact:deploy file="${hadoop-common-test.jar}">
-       <remoteRepository id="apache.staging.https" url="${asfstagingrepo}"/>
-       <pom refid="hadoop.core.test"/>
-       <attach file="${hadoop-common-test.jar}.asc" type="jar.asc"/>
-       <attach file="${hadoop-common-test.pom}.asc" type="pom.asc"/>
-       <attach file="${hadoop-common-test-sources.jar}.asc" type="jar.asc"
-         classifier="sources"/>
-       <attach file="${hadoop-common-test-sources.jar}" classifier="sources"/>
-     </artifact:deploy>
-
-     <artifact:deploy file="${hadoop-common-instrumented.jar}">
-       <remoteRepository id="apache.staging.https" url="${asfstagingrepo}"/>
-       <pom refid="hadoop.core.${herriot.suffix}"/>
-       <attach file="${hadoop-common-instrumented.jar}.asc" type="jar.asc"/>
-       <attach file="${hadoop-common-instrumented.pom}.asc" type="pom.asc"/>
-       <attach file="${hadoop-common-instrumented-sources.jar}.asc" 
-         type="jar.asc" classifier="sources"/>
-       <attach file="${hadoop-common-instrumented-sources.jar}"
-         classifier="sources"/>
-     </artifact:deploy>
-  </target>
-
-  <target name="sign" depends="clean-sign" if="staging">
-    <input message="password:>" addproperty="gpg.passphrase">
-     <handler classname="org.apache.tools.ant.input.SecureInputHandler" />
-    </input>
-    <macrodef name="sign-artifact" description="Signs the artifact">
-      <attribute name="input.file"/>
-      <attribute name="output.file" default="@{input.file}.asc"/>
-      <attribute name="gpg.passphrase"/>
-      <sequential>
-        <echo>Signing @{input.file} Sig File: @{output.file}</echo>
-        <exec executable="gpg" >
-          <arg value="--armor"/>
-          <arg value="--output"/>
-          <arg value="@{output.file}"/>
-          <arg value="--passphrase"/>
-          <arg value="@{gpg.passphrase}"/>
-          <arg value="--detach-sig"/>
-          <arg value="@{input.file}"/>
-        </exec>
-      </sequential>
-    </macrodef>
-    <sign-artifact input.file="${hadoop-common.jar}" 
-     output.file="${hadoop-common.jar}.asc" gpg.passphrase="${gpg.passphrase}"/>
-    <sign-artifact input.file="${hadoop-common-test.jar}" 
-     output.file="${hadoop-common-test.jar}.asc" gpg.passphrase="${gpg.passphrase}"/>
-    <sign-artifact input.file="${hadoop-common-sources.jar}" 
-     output.file="${hadoop-common-sources.jar}.asc" gpg.passphrase="${gpg.passphrase}"/>
-    <sign-artifact input.file="${hadoop-common-test-sources.jar}" 
-     output.file="${hadoop-common-test-sources.jar}.asc" gpg.passphrase="${gpg.passphrase}"/>
-    <sign-artifact input.file="${hadoop-common.pom}" 
-     output.file="${hadoop-common.pom}.asc" gpg.passphrase="${gpg.passphrase}"/>
-    <sign-artifact input.file="${hadoop-common-test.pom}" 
-     output.file="${hadoop-common-test.pom}.asc" gpg.passphrase="${gpg.passphrase}"/>
-    <sign-artifact input.file="${hadoop-common-instrumented.jar}" 
-     output.file="${hadoop-common-instrumented.jar}.asc" gpg.passphrase="${gpg.passphrase}"/>
-    <sign-artifact input.file="${hadoop-common-instrumented.pom}" 
-     output.file="${hadoop-common-instrumented.pom}.asc" gpg.passphrase="${gpg.passphrase}"/>
-    <sign-artifact input.file="${hadoop-common-instrumented-sources.jar}" 
-     output.file="${hadoop-common-instrumented-sources.jar}.asc" gpg.passphrase="${gpg.passphrase}"/>
-  </target>
-
-  <target name="simpledeploy" unless="staging">
-     <artifact:pom file="${hadoop-common.pom}" id="hadoop.core"/>
-     <artifact:pom file="${hadoop-common-test.pom}" id="hadoop.test"/>
-     <artifact:pom file="${hadoop-common-instrumented.pom}" 
-       id="hadoop.core.${herriot.suffix}"/>
-
-     <artifact:install-provider artifactId="wagon-http" version="${wagon-http.version}"/>
-     <artifact:deploy file="${hadoop-common.jar}">
-         <remoteRepository id="apache.snapshots.https" url="${asfsnapshotrepo}"/>
-         <pom refid="hadoop.core"/>
-	 <attach file="${hadoop-common-sources.jar}" classifier="sources" />
-     </artifact:deploy>
-
-     <artifact:deploy file="${hadoop-common-test.jar}">
-         <remoteRepository id="apache.snapshots.https" url="${asfsnapshotrepo}"/>
-         <pom refid="hadoop.core.test"/>
-	 <attach file="${hadoop-common-test-sources.jar}" classifier="sources" />
-     </artifact:deploy> 
-
-     <artifact:deploy file="${hadoop-common-instrumented.jar}">
-         <remoteRepository id="apache.snapshots.https" url="${asfsnapshotrepo}"/>
-         <pom refid="hadoop.core.${herriot.suffix}"/>
-         <attach file="${hadoop-common-instrumented-sources.jar}" classifier="sources" />
-     </artifact:deploy>
-  </target>
-
-  <target name="set-version">
-    <delete file="${basedir}/ivy/hadoop-common.xml"/>
-    <delete file="${basedir}/ivy/hadoop-common-test.xml"/>
-    <delete file="${basedir}/ivy/hadoop-common-${herriot.suffix}.xml"/>
-    <copy file="${basedir}/ivy/hadoop-common-template.xml" tofile="${basedir}/ivy/hadoop-common.xml"/>
-    <copy file="${basedir}/ivy/hadoop-common-test-template.xml" tofile="${basedir}/ivy/hadoop-common-test.xml"/>
-    <copy file="${basedir}/ivy/hadoop-common-${herriot.suffix}-template.xml"
-      tofile="${basedir}/ivy/hadoop-common-${herriot.suffix}.xml"/>
-    <replaceregexp byline="true">
-      <regexp pattern="@version"/>
-      <substitution expression="${version}"/>
-      <fileset dir="${basedir}/ivy">
-        <include name="hadoop-common.xml"/>
-        <include name="hadoop-common-test.xml"/>
-        <include name="hadoop-common-${herriot.suffix}.xml"/>
-      </fileset>
-    </replaceregexp>
-  </target>
-
-  <!-- ================================================================== -->
-  <!-- Perform audit activities for the release                           -->
-  <!-- ================================================================== -->
-  <target name="rats-taskdef" depends="ivy-retrieve-releaseaudit">
-     <typedef format="xml" resource="org/apache/rat/anttasks/antlib.xml" uri="antlib:org.apache.rat.anttasks"
-      classpathref="releaseaudit-classpath"/>
-  </target>
-
-  <target name="releaseaudit" depends="package, rats-taskdef" description="Release Audit activities">
-   <rat:report xmlns:rat="antlib:org.apache.rat.anttasks">
-      <fileset dir="${dist.dir}">
-        <exclude name="**/CHANGES.txt"/>
-        <exclude name="**/conf/*"/>
-        <exclude name="**/docs/"/>
-        <exclude name="lib/jdiff/"/>
-        <exclude name="**/native/*"/>
-        <exclude name="**/native/config/*"/>
-        <exclude name="**/native/m4/*"/>
-        <exclude name="**/VERSION"/>
-        <exclude name="**/*.json"/>
-        <exclude name="**/hod/*.txt"/>
-        <exclude name="src/test/empty-file" />
-      </fileset>
-    </rat:report>
-  </target>
-
-  <!-- ================================================================== -->
-  <!-- Clean.  Delete the build files, and their directories              -->
-  <!-- ================================================================== -->
-  <target name="clean" depends="clean-sign, clean-fi" description="Clean.  Delete the build files, and their directories">
-    <delete dir="${build.dir}"/>
-    <delete dir="${package.buildroot}"/>
-    <delete file="${basedir}/ivy/hadoop-common.xml"/>
-    <delete file="${basedir}/ivy/hadoop-common-pom.xml"/>
-    <delete file="${basedir}/ivy/hadoop-common-test.xml"/>
-    <delete file="${basedir}/ivy/hadoop-common-test-pom.xml"/>
-    <delete file="${basedir}/ivy/hadoop-common-${herriot.suffix}.xml"/>
-    <delete dir="${docs.src}/build"/>
-  </target>
-
-  <target name="clean-sign" description="Clean.  Delete .asc files">
-    <delete>
-      <fileset dir="." includes="**/**/*.asc"/>
-    </delete>
-  </target>  
-
-  <target name="veryclean" depends="clean" description="Delete mvn ant task jar and ivy ant taks jar">
-    <delete file="${ant_task.jar}"/>
-    <delete file="${ivy.jar}"/>
-  </target>
-
- <target name="clover" depends="clover.setup, clover.info" description="Instrument the Unit tests using Clover. 
-     To use, specify -Dclover.home=&lt;base of clover installation&gt; -Drun.clover=true on the command line."/>
-
-<target name="clover.setup" if="clover.enabled">
-   <taskdef resource="cloverlib.xml" classpath="${clover.jar}"/>
-   <mkdir dir="${clover.db.dir}"/>
-   <clover-setup initString="${clover.db.dir}/hadoop_coverage.db">
-     <fileset dir="${src.dir}" includes="java/**/*"/>
-     <testsources dir="${test.src.dir}"/>
-   </clover-setup>
-</target>
-
-<target name="clover.info" unless="clover.present">
-  <echo>
-     Clover not found. Code coverage reports disabled.
-  </echo>
-</target>
-
-<target name="clover.check">
-  <fail unless="clover.present">
-  ##################################################################
-   Clover not found.
-   Please specify -Dclover.home=&lt;base of clover installation&gt;
-   on the command line.
-  ##################################################################
-  </fail>
-</target>
-
-<target name="generate-clover-reports" depends="clover.check, clover">
-  <mkdir dir="${clover.report.dir}"/>
-  <clover-report>
-     <current outfile="${clover.report.dir}" title="${final.name}">
-     <format type="html"/>
-     </current>
-  </clover-report>
-  <clover-report>
-     <current outfile="${clover.report.dir}/clover.xml" title="${final.name}">
-     <format type="xml"/>
-     </current>
-  </clover-report>
-</target>
-
-<target name="findbugs.check" depends="check-for-findbugs" unless="findbugs.present">
-  <fail message="'findbugs.home' is not defined. Please pass -Dfindbugs.home=&lt;base of Findbugs installation&gt; to Ant on the command-line." />
-</target>
-
-<target name="patch.check" unless="patch.file">
-  <fail message="'patch.file' is not defined. Please pass -Dpatch.file=&lt;location of patch file&gt; to Ant on the command-line." />
-</target>
-
-<target name="test-patch" depends="patch.check,findbugs.check,forrest.check">
-  <exec executable="bash" failonerror="true">
-    <arg value="${basedir}/src/test/bin/test-patch.sh"/>
-    <arg value="DEVELOPER"/>
-    <arg value="${patch.file}"/>
-    <arg value="${scratch.dir}"/>
-    <arg value="${svn.cmd}"/>
-    <arg value="${grep.cmd}"/>
-    <arg value="${patch.cmd}"/>
-    <arg value="${findbugs.home}"/>
-    <arg value="${forrest.home}"/>
-    <arg value="${basedir}"/>
-  </exec>
-</target>
-
-<target name="hudson-test-patch" depends="findbugs.check,forrest.check">
-  <exec executable="bash" failonerror="true">
-    <arg value="${basedir}/src/test/bin/test-patch.sh"/>
-    <arg value="HUDSON"/>
-    <arg value="${scratch.dir}"/>
-    <arg value="${support.dir}"/>
-    <arg value="${ps.cmd}"/>
-    <arg value="${wget.cmd}"/>
-    <arg value="${jiracli.cmd}"/>
-    <arg value="${svn.cmd}"/>
-    <arg value="${grep.cmd}"/>
-    <arg value="${patch.cmd}"/>
-    <arg value="${findbugs.home}"/>
-    <arg value="${forrest.home}"/>
-    <arg value="${eclipse.home}"/>
-    <arg value="${basedir}"/>
-    <arg value="${jira.passwd}"/>
-    <arg value="${curl.cmd}"/>
-    <arg value="${defect}"/>
-  </exec>
-</target>
-	
-  <condition property="ant-eclipse.jar.exists">
-    <available file="${build.dir}/lib/ant-eclipse-1.0-jvm1.2.jar"/>
-  </condition>
-
-  <target name="ant-eclipse-download" unless="ant-eclipse.jar.exists"
-          description="Downloads the ant-eclipse binary.">
-    <get src="http://downloads.sourceforge.net/project/ant-eclipse/ant-eclipse/1.0/ant-eclipse-1.0.bin.tar.bz2"
-         dest="${build.dir}/ant-eclipse-1.0.bin.tar.bz2" usetimestamp="false" />
-
-    <untar src="${build.dir}/ant-eclipse-1.0.bin.tar.bz2"
-           dest="${build.dir}" compression="bzip2">
-      <patternset>
-        <include name="lib/ant-eclipse-1.0-jvm1.2.jar"/>
-      </patternset>
-    </untar>
-    <delete file="${build.dir}/ant-eclipse-1.0.bin.tar.bz2" />
-  </target>
-
-  <target name="eclipse" 
-          depends="init,ant-eclipse-download,ivy-retrieve-common,ivy-retrieve-test,compile-core-test"
-          description="Create eclipse project files">
-
-    <property environment="env"/>
-
-    <!-- Locate the tools.jar which is part of the JDK -->
-    <condition property="jdk.tools.jar" value="${env.JDK_HOME}/lib/tools.jar">
-      <available file="${env.JDK_HOME}/lib/tools.jar"/>
-    </condition>
-    <condition property="jdk.tools.jar" value="${env.JAVA_HOME}/lib/tools.jar">
-      <available file="${env.JAVA_HOME}/lib/tools.jar"/>
-    </condition>
-    <condition property="jdk.tools.jar" value="${java.home}/../lib/tools.jar">
-      <available file="${java.home}/../lib/tools.jar"/>
-    </condition>
-
-    <!-- The tools.jar from the JDK is called classes.jar on OS X. -->
-    <condition property="jdk.tools.jar" value="${java.home}/bundle/Classes/classes.jar">
-      <available file="${java.home}/bundle/Classes/classes.jar"/>
-    </condition>  	
-
-    <pathconvert property="eclipse.project">
-      <path path="${basedir}"/>
-      <regexpmapper from="^.*/([^/]+)$$" to="\1" handledirsep="yes"/>
-    </pathconvert>
-    <taskdef name="eclipse"
-             classname="prantl.ant.eclipse.EclipseTask"
-             classpath="${build.dir}/lib/ant-eclipse-1.0-jvm1.2.jar" />
-    <eclipse updatealways="true">
-      <project name="${eclipse.project}" />
-      <classpath>
-        <source path="${java.src.dir}"
-                output="${build.dir.eclipse-main-classes}" />
-        <source path="${test.src.dir}/core"
-                output="${build.dir.eclipse-test-classes}" />
-        <source path="${test.src.dir}/aop"
-                output="${build.dir.eclipse-test-classes}" />
-        <source path="${test.generated.dir}"
-                output="${build.dir.eclipse-test-generated-classes}" />
-        <output path="${build.dir.eclipse-main-classes}" />
-        <library pathref="ivy-common.classpath" exported="true" />
-        <library pathref="ivy-test.classpath" exported="false" />
-        <variable path="ANT_HOME/lib/ant.jar" exported="false" />
-        <library path="${conf.dir}" exported="false" />
-        <library path="${jdk.tools.jar}" exported="false" />
-      </classpath>
-    </eclipse>
-  </target>
-
-  <target name="ivy-init-dirs">
-    <mkdir dir="${build.ivy.dir}" />
-    <mkdir dir="${build.ivy.lib.dir}" />
-    <mkdir dir="${build.ivy.report.dir}" />
-    <mkdir dir="${build.ivy.maven.dir}" />
-  </target>
-
-  <target name="ivy-probe-antlib" >
-    <condition property="ivy.found">
-      <typefound uri="antlib:org.apache.ivy.ant" name="cleancache"/>
-    </condition>
-  </target>
-
-  <target name="ivy-download" description="To download ivy" unless="offline">
-    <get src="${ivy_repo_url}" dest="${ivy.jar}" usetimestamp="true"/>
-  </target>
-
-  <!--
-  To avoid Ivy leaking things across big projects, always load Ivy in the same classloader.
-  Also note how we skip loading Ivy if it is already there, just to make sure all is well.
-  -->
-  <target name="ivy-init-antlib" depends="ivy-download,ivy-init-dirs,ivy-probe-antlib" unless="ivy.found">
-    <typedef uri="antlib:org.apache.ivy.ant" onerror="fail"
-      loaderRef="ivyLoader">
-      <classpath>
-        <pathelement location="${ivy.jar}"/>
-      </classpath>
-    </typedef>
-    <fail >
-      <condition >
-        <not>
-          <typefound uri="antlib:org.apache.ivy.ant" name="cleancache"/>
-        </not>
-      </condition>
-      You need Apache Ivy 2.0 or later from http://ant.apache.org/
-      It could not be loaded from ${ivy_repo_url}
-    </fail>
-  </target>
-
-  <property name="ivyresolvelog" value="download-only"/>
-  <property name="ivyretrievelog" value="quiet"/>
-
-  <target name="ivy-init" depends="ivy-init-antlib" >
-
-    <!--Configure Ivy by reading in the settings file
-        If anyone has already read in a settings file into this settings ID, it gets priority
-    -->
-    <ivy:configure settingsid="${ant.project.name}.ivy.settings" file="${ivysettings.xml}" override='false'
-      realm="Sonatype Nexus Repository Manager"/>
-
-  </target>
-
-  <target name="ivy-resolve" depends="ivy-init">
-    <ivy:resolve settingsRef="${ant.project.name}.ivy.settings"
-    	log="${ivyresolvelog}"/>
-  </target>
-
-  <target name="ivy-resolve-javadoc" depends="ivy-init">
-    <ivy:resolve settingsRef="${ant.project.name}.ivy.settings" conf="javadoc"
-    	log="${ivyresolvelog}"/>
-  </target>
-
-  <target name="ivy-resolve-releaseaudit" depends="ivy-init">
-    <ivy:resolve settingsRef="${ant.project.name}.ivy.settings" conf="releaseaudit"
-  		log="${ivyresolvelog}"/>
-  </target>
-
-  <target name="ivy-resolve-test" depends="ivy-init">
-    <ivy:resolve settingsRef="${ant.project.name}.ivy.settings" conf="test"
-    	log="${ivyresolvelog}"/>
-  </target>
-
-  <target name="ivy-resolve-common" depends="ivy-init">
-    <ivy:resolve settingsRef="${ant.project.name}.ivy.settings" conf="common"
-    	log="${ivyresolvelog}"/>
-  </target>
-
-  <target name="ivy-resolve-package" depends="ivy-init">
-    <ivy:resolve settingsRef="${ant.project.name}.ivy.settings" conf="package"
-    	log="${ivyresolvelog}"/>
-  </target>
-
-  <target name="ivy-resolve-jdiff" depends="ivy-init">
-    <ivy:resolve settingsRef="${ant.project.name}.ivy.settings" conf="jdiff"
-    	log="${ivyresolvelog}"/>
-  </target>
-
-  <target name="ivy-resolve-checkstyle" depends="ivy-init">
-    <ivy:resolve settingsRef="${ant.project.name}.ivy.settings" conf="checkstyle"
-  		log="${ivyresolvelog}"/>
-  </target>
-
-  <target name="ivy-retrieve" depends="ivy-resolve"
-    description="Retrieve Ivy-managed artifacts">
-    <ivy:retrieve settingsRef="${ant.project.name}.ivy.settings"
-      pattern="${build.ivy.lib.dir}/${ivy.artifact.retrieve.pattern}"
-    		log="${ivyretrievelog}"/>
-  </target>
-
-  <target name="ivy-retrieve-checkstyle" depends="ivy-resolve-checkstyle"
-    description="Retrieve Ivy-managed artifacts for the checkstyle configurations">
-    <ivy:retrieve settingsRef="${ant.project.name}.ivy.settings"
-      pattern="${build.ivy.lib.dir}/${ivy.artifact.retrieve.pattern}"
-  			log="${ivyretrievelog}"/>
-    <ivy:cachepath pathid="checkstyle-classpath" conf="checkstyle"/>
-  </target>
-
-  <target name="ivy-retrieve-jdiff" depends="ivy-resolve-jdiff"
-    description="Retrieve Ivy-managed artifacts for the jdiff configurations">
-    <ivy:retrieve settingsRef="${ant.project.name}.ivy.settings"
-      pattern="${build.ivy.lib.dir}/${ivy.artifact.retrieve.pattern}"
-  			log="${ivyretrievelog}"/>
-    <ivy:cachepath pathid="jdiff-classpath" conf="jdiff"/>
-  </target>
-
-  <target name="ivy-retrieve-javadoc" depends="ivy-resolve-javadoc"
-    description="Retrieve Ivy-managed artifacts for the javadoc configurations">
-    <ivy:retrieve settingsRef="${ant.project.name}.ivy.settings"
-      pattern="${build.ivy.lib.dir}/${ivy.artifact.retrieve.pattern}"
-  			log="${ivyretrievelog}"/>
-    <ivy:cachepath pathid="javadoc-classpath" conf="javadoc"/>
-  </target>
-
-  <target name="ivy-retrieve-test" depends="ivy-resolve-test"
-    description="Retrieve Ivy-managed artifacts for the test configurations">
-    <ivy:retrieve settingsRef="${ant.project.name}.ivy.settings"
-      pattern="${build.ivy.lib.dir}/${ivy.artifact.retrieve.pattern}"
-    		log="${ivyretrievelog}"/>
-    <ivy:cachepath pathid="ivy-test.classpath" conf="test"/>
-  </target>
-
-  <target name="ivy-retrieve-common" depends="ivy-resolve-common"
-    description="Retrieve Ivy-managed artifacts for the compile configurations">
-    <ivy:retrieve settingsRef="${ant.project.name}.ivy.settings"
-      pattern="${build.ivy.lib.dir}/${ivy.artifact.retrieve.pattern}"
-    		log="${ivyretrievelog}"/>
-    <ivy:cachepath pathid="ivy-common.classpath" conf="common"/>
-  </target>
-
-  <target name="ivy-retrieve-package" depends="ivy-resolve-package"
-    description="Retrieve Ivy-managed artifacts for the package configurations">
-    <ivy:retrieve settingsRef="${ant.project.name}.ivy.settings"
-      pattern="${build.ivy.lib.dir}/${ivy.artifact.retrieve.pattern}"
-    		log="${ivyretrievelog}"/>
-    <ivy:cachepath pathid="ivy-package.classpath" conf="package"/>
-  </target>
-
-  <target name="ivy-retrieve-releaseaudit" depends="ivy-resolve-releaseaudit"
-    description="Retrieve Ivy-managed artifacts for the compile configurations">
-    <ivy:retrieve settingsRef="${ant.project.name}.ivy.settings"
-      pattern="${build.ivy.lib.dir}/${ivy.artifact.retrieve.pattern}"
-    		log="${ivyretrievelog}"/>
-    <ivy:cachepath pathid="releaseaudit-classpath" conf="releaseaudit"/>
-  </target>
-
-  <target name="ivy-report" depends="ivy-resolve-releaseaudit"
-    description="Generate">
-    <ivy:report todir="${build.ivy.report.dir}" settingsRef="${ant.project.name}.ivy.settings"/>
-    <echo>
-      Reports generated:${build.ivy.report.dir}
-    </echo>
-  </target>
-
-</project>
diff --git a/common/conf/configuration.xsl b/common/conf/configuration.xsl
deleted file mode 100644
index 377cdbeb93..0000000000
--- a/common/conf/configuration.xsl
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-<xsl:output method="html"/>
-<xsl:template match="configuration">
-<html>
-<body>
-<table border="1">
-<tr>
- <td>name</td>
- <td>value</td>
- <td>description</td>
-</tr>
-<xsl:for-each select="property">
-<tr>
-  <td><a name="{name}"><xsl:value-of select="name"/></a></td>
-  <td><xsl:value-of select="value"/></td>
-  <td><xsl:value-of select="description"/></td>
-</tr>
-</xsl:for-each>
-</table>
-</body>
-</html>
-</xsl:template>
-</xsl:stylesheet>
diff --git a/common/conf/core-site.xml.template b/common/conf/core-site.xml.template
deleted file mode 100644
index 970c8fe0e8..0000000000
--- a/common/conf/core-site.xml.template
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
-
-<!-- Put site-specific property overrides in this file. -->
-
-<configuration>
-
-</configuration>
diff --git a/common/conf/hadoop-env.sh.template b/common/conf/hadoop-env.sh.template
deleted file mode 100644
index 6776bff463..0000000000
--- a/common/conf/hadoop-env.sh.template
+++ /dev/null
@@ -1,66 +0,0 @@
-# Set Hadoop-specific environment variables here.
-
-# The only required environment variable is JAVA_HOME.  All others are
-# optional.  When running a distributed configuration it is best to
-# set JAVA_HOME in this file, so that it is correctly defined on
-# remote nodes.
-
-# The java implementation to use.  Required.
-export JAVA_HOME=${JAVA_HOME}
-
-# Hadoop Installation Prefix
-HADOOP_PREFIX=${HADOOP_PREFIX}
-
-# Hadoop Configuration Directory
-HADOOP_CONF_DIR=${HADOOP_CONF_DIR}
-export HADOOP_CONF_DIR=${HADOOP_CONF_DIR:-$HADOOP_PREFIX/conf}
-
-# Extra Java CLASSPATH elements.  Optional.
-# export HADOOP_CLASSPATH="<extra_entries>:$HADOOP_CLASSPATH"
-
-# The maximum amount of heap to use, in MB. Default is 1000.
-# export HADOOP_HEAPSIZE=2000
-
-# Extra Java runtime options.  Empty by default.
-# if [ "$HADOOP_OPTS" == "" ]; then export HADOOP_OPTS=-server; else HADOOP_OPTS+=" -server"; fi
-
-# Command specific options appended to HADOOP_OPTS when specified
-export HADOOP_NAMENODE_OPTS="-Dcom.sun.management.jmxremote $HADOOP_NAMENODE_OPTS"
-export HADOOP_SECONDARYNAMENODE_OPTS="-Dcom.sun.management.jmxremote $HADOOP_SECONDARYNAMENODE_OPTS"
-export HADOOP_DATANODE_OPTS="-Dcom.sun.management.jmxremote $HADOOP_DATANODE_OPTS"
-export HADOOP_BALANCER_OPTS="-Dcom.sun.management.jmxremote $HADOOP_BALANCER_OPTS"
-export HADOOP_JOBTRACKER_OPTS="-Dcom.sun.management.jmxremote $HADOOP_JOBTRACKER_OPTS"
-export HADOOP_TASKTRACKER_OPTS="-Dcom.sun.management.jmxremote $HADOOP_TASKTRACKER_OPTS"
-# The following applies to multiple commands (fs, dfs, fsck, distcp etc)
-# export HADOOP_CLIENT_OPTS
-
-# Extra ssh options.  Empty by default.
-# export HADOOP_SSH_OPTS="-o ConnectTimeout=1 -o SendEnv=HADOOP_CONF_DIR"
-
-# File naming remote slave hosts.  $HADOOP_PREFIX/conf/slaves by default.
-export HADOOP_SLAVES=${HADOOP_CONF_DIR}/slaves
-
-# host:path where hadoop code should be rsync'd from.  Unset by default.
-# export HADOOP_MASTER=master:/home/$USER/src/hadoop
-
-# Seconds to sleep between slave commands.  Unset by default.  This
-# can be useful in large clusters, where, e.g., slave rsyncs can
-# otherwise arrive faster than the master can service them.
-# export HADOOP_SLAVE_SLEEP=0.1
-
-# The directory where pid files are stored. /tmp by default.
-HADOOP_PID_DIR=${HADOOP_PID_DIR}
-export HADOOP_PID_DIR=${HADOOP_PID_DIR:-$HADOOP_PREFIX/var/run}
-
-# A string representing this instance of hadoop. $USER by default.
-export HADOOP_IDENT_STRING=`whoami`
-
-# The scheduling priority for daemon processes.  See 'man nice'.
-# export HADOOP_NICENESS=10
-
-# Allow Hadoop to run with sysctl net.ipv6.bindv6only = 1
-# export HADOOP_ALLOW_IPV6=yes
-
-# Where log files are stored.  $HADOOP_PREFIX/logs by default.
-HADOOP_LOG_DIR=${HADOOP_LOG_DIR}/$HADOOP_IDENT_STRING
-export HADOOP_LOG_DIR=${HADOOP_LOG_DIR:-$HADOOP_PREFIX/var/log}
diff --git a/common/conf/hadoop-policy.xml.template b/common/conf/hadoop-policy.xml.template
deleted file mode 100644
index 5727b13313..0000000000
--- a/common/conf/hadoop-policy.xml.template
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
-
-<!-- Put site-specific property overrides in this file. -->
-
-<configuration>
-  <property>
-    <name>security.client.protocol.acl</name>
-    <value>*</value>
-    <description>ACL for ClientProtocol, which is used by user code 
-    via the DistributedFileSystem. 
-    The ACL is a comma-separated list of user and group names. The user and 
-    group list is separated by a blank. For e.g. "alice,bob users,wheel". 
-    A special value of "*" means all users are allowed.</description>
-  </property>
-
-  <property>
-    <name>security.client.datanode.protocol.acl</name>
-    <value>*</value>
-    <description>ACL for ClientDatanodeProtocol, the client-to-datanode protocol 
-    for block recovery.
-    The ACL is a comma-separated list of user and group names. The user and 
-    group list is separated by a blank. For e.g. "alice,bob users,wheel". 
-    A special value of "*" means all users are allowed.</description>
-  </property>
-
-  <property>
-    <name>security.datanode.protocol.acl</name>
-    <value>*</value>
-    <description>ACL for DatanodeProtocol, which is used by datanodes to 
-    communicate with the namenode.
-    The ACL is a comma-separated list of user and group names. The user and 
-    group list is separated by a blank. For e.g. "alice,bob users,wheel". 
-    A special value of "*" means all users are allowed.</description>
-  </property>
-
-  <property>
-    <name>security.inter.datanode.protocol.acl</name>
-    <value>*</value>
-    <description>ACL for InterDatanodeProtocol, the inter-datanode protocol
-    for updating generation timestamp.
-    The ACL is a comma-separated list of user and group names. The user and 
-    group list is separated by a blank. For e.g. "alice,bob users,wheel". 
-    A special value of "*" means all users are allowed.</description>
-  </property>
-
-  <property>
-    <name>security.namenode.protocol.acl</name>
-    <value>*</value>
-    <description>ACL for NamenodeProtocol, the protocol used by the secondary
-    namenode to communicate with the namenode.
-    The ACL is a comma-separated list of user and group names. The user and 
-    group list is separated by a blank. For e.g. "alice,bob users,wheel". 
-    A special value of "*" means all users are allowed.</description>
-  </property>
-
-  <property>
-    <name>security.inter.tracker.protocol.acl</name>
-    <value>*</value>
-    <description>ACL for InterTrackerProtocol, used by the tasktrackers to 
-    communicate with the jobtracker.
-    The ACL is a comma-separated list of user and group names. The user and 
-    group list is separated by a blank. For e.g. "alice,bob users,wheel". 
-    A special value of "*" means all users are allowed.</description>
-  </property>
-
-  <property>
-    <name>security.job.submission.protocol.acl</name>
-    <value>*</value>
-    <description>ACL for JobSubmissionProtocol, used by job clients to 
-    communciate with the jobtracker for job submission, querying job status etc.
-    The ACL is a comma-separated list of user and group names. The user and 
-    group list is separated by a blank. For e.g. "alice,bob users,wheel". 
-    A special value of "*" means all users are allowed.</description>
-  </property>
-
-  <property>
-    <name>security.task.umbilical.protocol.acl</name>
-    <value>*</value>
-    <description>ACL for TaskUmbilicalProtocol, used by the map and reduce 
-    tasks to communicate with the parent tasktracker. 
-    The ACL is a comma-separated list of user and group names. The user and 
-    group list is separated by a blank. For e.g. "alice,bob users,wheel". 
-    A special value of "*" means all users are allowed.</description>
-  </property>
-
-  <property>
-    <name>security.refresh.policy.protocol.acl</name>
-    <value>*</value>
-    <description>ACL for RefreshAuthorizationPolicyProtocol, used by the 
-    dfsadmin and mradmin commands to refresh the security policy in-effect. 
-    The ACL is a comma-separated list of user and group names. The user and 
-    group list is separated by a blank. For e.g. "alice,bob users,wheel". 
-    A special value of "*" means all users are allowed.</description>
-  </property>
-
-  <property>
-    <name>security.admin.operations.protocol.acl</name>
-    <value>*</value>
-    <description>ACL for AdminOperationsProtocol, used by the mradmins commands
-    to refresh queues and nodes at JobTracker. The ACL is a comma-separated list of 
-    user and group names. The user and group list is separated by a blank. 
-    For e.g. "alice,bob users,wheel". A special value of "*" means all users are 
-    allowed.</description>
-  </property>
-</configuration>
diff --git a/common/conf/masters.template b/common/conf/masters.template
deleted file mode 100644
index 2fbb50c4a8..0000000000
--- a/common/conf/masters.template
+++ /dev/null
@@ -1 +0,0 @@
-localhost
diff --git a/common/conf/slaves.template b/common/conf/slaves.template
deleted file mode 100644
index 23067fa3b8..0000000000
--- a/common/conf/slaves.template
+++ /dev/null
@@ -1,2 +0,0 @@
-# Specify multiple slaves, one per each line. 
-localhost
diff --git a/common/ivy.xml b/common/ivy.xml
deleted file mode 100644
index c7d369943c..0000000000
--- a/common/ivy.xml
+++ /dev/null
@@ -1,331 +0,0 @@
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-
-<ivy-module version="1.0">
-  <info organisation="org.apache.hadoop" module="${ant.project.name}" revision="${version}">
-    <license name="Apache 2.0"/>
-    <ivyauthor name="Apache Hadoop Team" url="http://hadoop.apache.org"/>
-    <description>
-        Hadoop Common
-    </description>
-  </info>
-  <configurations defaultconfmapping="default">
-    <!--these match the Maven configurations-->
-    <conf name="default" extends="master,runtime"/>
-    <conf name="master" description="contains the artifact but no dependencies"/>
-    <conf name="runtime" description="runtime but not the artifact"
-      extends="client,server,s3-server,kfs,mandatory,jetty,ftp"/>
-
-    <conf name="mandatory" description="contains the critical  dependencies"
-      extends="commons-logging,log4j"/>
-
-    <!--
-    These public configurations contain the core dependencies for running hadoop client or server.
-    The server is effectively a superset of the client.
-    -->
-    <conf name="client" description="client-side dependencies"
-      extends="mandatory,httpclient"/>
-    <conf name="server" description="server-side dependencies"
-      extends="client"/>
-    <conf name="s3-client" description="dependencies for working with S3/EC2 infrastructure"
-      extends="client"/>
-    <conf name="s3-server" description="dependencies for running on S3/EC2 infrastructure"
-      extends="s3-client,server"/>
-    <conf name="kfs" description="dependencies for KFS file system support"/>
-    <conf name="ftp" description="dependencies for workign with FTP filesytems" 
-              extends="mandatory"/>
-   <conf name="jetty" description="Jetty provides the in-VM HTTP daemon" extends="commons-logging"/>
-
-   <conf name="common" extends="runtime,mandatory,httpclient,ftp,jetty,jdiff"
-		      description="common artifacts"/>
-    <!--Testing pulls in everything-->
-   <conf name="test" extends="master" description="the classpath needed to run tests"/>
-
-    <!--Packaging pulls in everything-->
-   <conf name="package" extends="master" description="the classpath needed for packaging"/>
-
-    <!--Private configurations. -->
-
-    <conf name="javadoc" visibility="private" description="artiracts required while performing doc generation"
-      extends="common,mandatory,jetty,lucene"/>
-
-    <conf name="releaseaudit" visibility="private"
-	description="Artifacts required for releaseaudit target"/>
-     
-    <conf name="commons-logging" visibility="private"/>
-    <conf name="httpclient" visibility="private" extends="commons-logging"/>
-    <conf name="log4j" visibility="private"/>
-    <conf name="lucene" visibility="private"/>
-    <conf name="jdiff" visibility="private" extends="log4j,s3-client,jetty,server"/>
-    <conf name="checkstyle" visibility="private"/>
-
-  </configurations>
-
-  <publications>
-    <!--get the artifact from our module name-->
-    <artifact conf="master"/>
-  </publications>
-  <dependencies>
-
- <!--used client side-->
-    <dependency org="commons-cli"
-      name="commons-cli"
-      rev="${commons-cli.version}"
-      conf="client->default"/>
-    <dependency org="checkstyle"
-      name="checkstyle"
-      rev="${checkstyle.version}"
-      conf="checkstyle->default"/>
-    <dependency org="jdiff"
-      name="jdiff"
-      rev="${jdiff.version}"
-      conf="jdiff->default"/>
-
-    <dependency org="xmlenc"
-      name="xmlenc"
-      rev="${xmlenc.version}"
-      conf="server->default"/>
-
-    <!--Configuration: httpclient-->
-
-    <!--
-    commons-httpclient asks for too many files.
-    All it needs is commons-codec and commons-logging JARs
-    -->
-    <dependency org="commons-httpclient"
-      name="commons-httpclient"
-      rev="${commons-httpclient.version}"
-      conf="httpclient->master">
-    </dependency>
-
-    <dependency org="commons-codec"
-      name="commons-codec"
-      rev="${commons-codec.version}"
-      conf="httpclient->default"/>
-
-    <dependency org="commons-net"
-      name="commons-net"
-      rev="${commons-net.version}"
-      conf="ftp->default"/>
-
-    <!--Configuration: Jetty -->
-
-<!-- <dependency org="javax.servlet"
-      name="servlet-api"
-      rev="${servlet-api.version}"
-      conf="jetty->master"/>   -->
-    <dependency org="org.mortbay.jetty"
-      name="jetty"
-      rev="${jetty.version}"
-      conf="jetty->master"/>
-    <dependency org="org.mortbay.jetty"
-      name="jetty-util"
-      rev="${jetty-util.version}"
-      conf="jetty->master"/>
-
-    <dependency org="tomcat"
-      name="jasper-runtime"
-      rev="${jasper.version}"
-      conf="jetty->master"/>
-    <dependency org="tomcat"
-      name="jasper-compiler"
-      rev="${jasper.version}"
-      conf="jetty->master"/>
-    <dependency org="org.mortbay.jetty"
-      name="jsp-api-2.1"
-      rev="${jetty.version}"
-      conf="jetty->master"/>
-    <dependency org="org.mortbay.jetty"
-      name="jsp-2.1"
-      rev="${jetty.version}"
-      conf="jetty->master"/>
-    <dependency org="commons-el"
-      name="commons-el"
-      rev="${commons-el.version}"
-      conf="jetty->master"/>
-
-
-    <!--Configuration: commons-logging -->
-
-    <!--it is essential that only the master JAR of commons logging
-    is pulled in, as its dependencies are usually a mess, including things
-    like out of date servlet APIs, bits of Avalon, etc.
-    -->
-    <dependency org="commons-logging"
-      name="commons-logging"
-      rev="${commons-logging.version}"
-      conf="commons-logging->master"/>
-
-
-    <!--Configuration: commons-logging -->
-
-    <!--log4J is not optional until commons-logging.properties is stripped out of the JAR -->
-    <dependency org="log4j"
-      name="log4j"
-      rev="${log4j.version}"
-      conf="log4j->master"/>
-
-    <!--Configuration: s3-client -->
-    <!--there are two jets3t projects in the repository; this one goes up to 0.6 and
-    is assumed to be the live one-->
-    <dependency org="net.java.dev.jets3t"
-      name="jets3t"
-      rev="${jets3t.version}"
-      conf="s3-client->master"/>
-    <dependency org="commons-net"
-      name="commons-net"
-      rev="${commons-net.version}"
-      conf="s3-client->master"/> 
-    <dependency org="org.mortbay.jetty"
-      name="servlet-api-2.5"
-      rev="${servlet-api-2.5.version}"
-      conf="s3-client->master"/>
-    <dependency org="net.sf.kosmosfs"
-      name="kfs"
-      rev="${kfs.version}"
-      conf="kfs->default"/>
-
-    <!--Configuration: test -->
-    <!--artifacts needed for testing -->
-
-    <dependency org="org.apache.ftpserver"
-      name="ftplet-api"
-      rev="${ftplet-api.version}"
-      conf="test->default"/>
-    <dependency org="org.apache.mina"
-      name="mina-core"
-      rev="${mina-core.version}"
-      conf="test->default"/>
-    <dependency org="org.apache.ftpserver"
-      name="ftpserver-core"
-      rev="${ftpserver-core.version}"
-      conf="test->default"/>
-    <dependency org="org.apache.ftpserver"
-      name="ftpserver-deprecated"
-      rev="${ftpserver-deprecated.version}"
-      conf="test->default"/>
-
-    <dependency org="junit"
-      name="junit"
-      rev="${junit.version}"
-      conf="test->default"/>
-    <dependency org="org.apache.rat"
-      name="apache-rat-tasks"
-      rev="${rats-lib.version}"
-      conf="releaseaudit->default"/>
-    <dependency org="commons-lang"
-      name="commons-lang"
-      rev="${commons-lang.version}"
-      conf="releaseaudit->default"/>
-    <dependency org="commons-collections"
-      name="commons-collections"
-      rev="${commons-collections.version}"
-      conf="releaseaudit->default"/>
-    <dependency org="hsqldb"
-      name="hsqldb"
-      rev="${hsqldb.version}"
-      conf="common->default"/>
-    <dependency org="org.apache.lucene"
-      name="lucene-core"
-      rev="${lucene-core.version}"
-      conf="javadoc->default"/> 
-    <dependency org="commons-logging"
-      name="commons-logging-api"
-      rev="${commons-logging-api.version}"
-      conf="common->default"/>
-    <dependency org="org.slf4j"
-      name="slf4j-api"
-      rev="${slf4j-api.version}"
-      conf="common->default"/>
-    <dependency org="org.eclipse.jdt"
-      name="core"
-      rev="${core.version}"
-      conf="common->master"/>
-    <dependency org="oro"
-      name="oro"
-      rev="${oro.version}"
-      conf="common->default"/>
-    <dependency org="org.slf4j"
-      name="slf4j-log4j12"
-      rev="${slf4j-log4j12.version}"
-      conf="common->master">
-    </dependency>
-    <dependency org="org.apache.hadoop"
-      name="avro"
-      rev="${avro.version}"
-      conf="common->default">
-      <exclude module="ant"/>
-      <exclude module="jetty"/>
-      <exclude module="slf4j-simple"/>
-    </dependency>
-    <dependency org="org.codehaus.jackson"
-      name="jackson-mapper-asl"
-      rev="${jackson.version}"
-      conf="common->default"/> 
-    <dependency org="com.thoughtworks.paranamer"
-      name="paranamer"
-      rev="${paranamer.version}"
-      conf="common->default"/>
-    <dependency org="com.thoughtworks.paranamer"
-      name="paranamer-ant"
-      rev="${paranamer.version}"
-      conf="common->default"/>
-    <dependency org="org.aspectj"
-      name="aspectjrt"
-      rev="${aspectj.version}"
-      conf="common->default">
-    </dependency>
-    <dependency org="org.aspectj"
-      name="aspectjtools"
-      rev="${aspectj.version}"
-      conf="common->default">
-    </dependency>
-    <dependency org="org.mockito" 
-      name="mockito-all" 
-      rev="${mockito-all.version}" 
-      conf="test->default">
-    </dependency> 
-    <dependency org="com.jcraft"
-      name="jsch"
-      rev="${jsch.version}"
-      conf="common->default">
-    </dependency>
-    <!--Configuration: package -->
-    <!--artifacts needed for packaging -->
-    <dependency org="org.vafer" 
-      name="jdeb" 
-      rev="${jdeb.version}"
-      conf="package->master">
-    </dependency>
-    <dependency org="commons-configuration"
-      name="commons-configuration"
-      rev="${commons-configuration.version}"
-      conf="common->default"/>
-    <dependency org="org.apache.commons"
-      name="commons-math"
-      rev="${commons-math.version}"
-      conf="common->default"/>
-    <dependency org="com.google.guava"
-      name="guava"
-      rev="${guava.version}"
-      conf="common->default"/>
-    <dependency org="com.google.protobuf"
-      name="protobuf-java"
-      rev="${protobuf.version}"
-      conf="common->default"/>
-  </dependencies>
-</ivy-module>
diff --git a/common/ivy/hadoop-common-instrumented-template.xml b/common/ivy/hadoop-common-instrumented-template.xml
deleted file mode 100644
index e681000757..0000000000
--- a/common/ivy/hadoop-common-instrumented-template.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-<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/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.hadoop</groupId>
-  <artifactId>hadoop-common-instrumented</artifactId>
-  <packaging>jar</packaging>
-  <version>@version</version>
-  <dependencies>
-   <dependency>
-      <groupId>commons-cli</groupId>
-      <artifactId>commons-cli</artifactId>
-      <version>1.2</version>
-    </dependency>
-   <dependency>
-      <groupId>xmlenc</groupId>
-      <artifactId>xmlenc</artifactId>
-      <version>0.52</version>
-    </dependency>
-    <dependency>
-      <groupId>commons-httpclient</groupId>
-      <artifactId>commons-httpclient</artifactId>
-      <version>3.1</version>
-    </dependency>
-    <dependency>
-      <groupId>commons-codec</groupId>
-      <artifactId>commons-codec</artifactId>
-      <version>1.4</version>
-    </dependency>
-    <dependency>
-      <groupId>commons-net</groupId>
-      <artifactId>commons-net</artifactId>
-      <version>1.4.1</version>
-    </dependency>
-    <dependency>
-      <groupId>org.mortbay.jetty</groupId>
-      <artifactId>jetty</artifactId>
-      <version>6.1.14</version>
-    </dependency>
-    <dependency>
-      <groupId>org.mortbay.jetty</groupId>
-      <artifactId>jetty-util</artifactId>
-      <version>6.1.14</version>
-    </dependency>
-    <dependency>
-      <groupId>tomcat</groupId>
-      <artifactId>jasper-runtime</artifactId>
-      <version>5.5.12</version>
-    </dependency>
-    <dependency>
-      <groupId>tomcat</groupId>
-      <artifactId>jasper-compiler</artifactId>
-      <version>5.5.12</version>
-    </dependency>
-    <dependency>
-      <groupId>org.mortbay.jetty</groupId>
-      <artifactId>jsp-api-2.1</artifactId>
-      <version>6.1.14</version>
-    </dependency>
-    <dependency>
-      <groupId>org.mortbay.jetty</groupId>
-      <artifactId>jsp-2.1</artifactId>
-      <version>6.1.14</version>
-    </dependency>
-    <dependency>
-      <groupId>commons-el</groupId>
-      <artifactId>commons-el</artifactId>
-      <version>1.0</version>
-    </dependency>
-    <dependency>
-      <groupId>net.java.dev.jets3t</groupId>
-      <artifactId>jets3t</artifactId>
-      <version>0.7.1</version>
-    </dependency>
-    <dependency>
-      <groupId>commons-net</groupId>
-      <artifactId>commons-net</artifactId>
-      <version>1.4.1</version>
-    </dependency>
-    <dependency>
-      <groupId>org.mortbay.jetty</groupId>
-      <artifactId>servlet-api-2.5</artifactId>
-      <version>6.1.14</version>
-    </dependency>
-    <dependency>
-      <groupId>net.sf.kosmosfs</groupId>
-      <artifactId>kfs</artifactId>
-      <version>0.3</version>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.8.1</version>
-    </dependency>
-    <dependency>
-      <groupId>hsqldb</groupId>
-      <artifactId>hsqldb</artifactId>
-      <version>1.8.0.10</version>
-    </dependency>
-    <dependency>
-      <groupId>oro</groupId>
-      <artifactId>oro</artifactId>
-      <version>2.0.8</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>avro</artifactId>
-      <version>1.3.2</version>
-      <exclusions>
-        <exclusion>
-          <!-- Don't pull in Avro's (later) version of Jetty.-->
-          <groupId>org.mortbay.jetty</groupId>
-          <artifactId>jetty</artifactId>
-        </exclusion>
-        <exclusion>
-          <!-- Exclude Avro's version of ant since it conflicts with Jetty's.-->
-          <groupId>org.apache.ant</groupId>
-          <artifactId>ant</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-  </dependencies>
-</project>
diff --git a/common/ivy/hadoop-common-template.xml b/common/ivy/hadoop-common-template.xml
deleted file mode 100644
index fcb31ff0f1..0000000000
--- a/common/ivy/hadoop-common-template.xml
+++ /dev/null
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-<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/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.hadoop</groupId>
-  <artifactId>hadoop-common</artifactId>
-  <packaging>jar</packaging>
-  <version>@version</version>
-  <dependencies>
-   <dependency>
-      <groupId>commons-cli</groupId>
-      <artifactId>commons-cli</artifactId>
-      <version>1.2</version>
-    </dependency>
-   <dependency>
-      <groupId>xmlenc</groupId>
-      <artifactId>xmlenc</artifactId>
-      <version>0.52</version>
-    </dependency>
-    <dependency>
-      <groupId>commons-httpclient</groupId>
-      <artifactId>commons-httpclient</artifactId>
-      <version>3.1</version>
-    </dependency>
-    <dependency>
-      <groupId>commons-codec</groupId>
-      <artifactId>commons-codec</artifactId>
-      <version>1.4</version>
-    </dependency>
-    <dependency>
-      <groupId>commons-net</groupId>
-      <artifactId>commons-net</artifactId>
-      <version>1.4.1</version>
-    </dependency>
-    <dependency>
-      <groupId>org.mortbay.jetty</groupId>
-      <artifactId>jetty</artifactId>
-      <version>6.1.14</version>
-    </dependency>
-    <dependency>
-      <groupId>org.mortbay.jetty</groupId>
-      <artifactId>jetty-util</artifactId>
-      <version>6.1.14</version>
-    </dependency>
-    <dependency>
-      <groupId>tomcat</groupId>
-      <artifactId>jasper-runtime</artifactId>
-      <version>5.5.12</version>
-    </dependency>
-    <dependency>
-      <groupId>tomcat</groupId>
-      <artifactId>jasper-compiler</artifactId>
-      <version>5.5.12</version>
-    </dependency>
-    <dependency>
-      <groupId>org.mortbay.jetty</groupId>
-      <artifactId>jsp-api-2.1</artifactId>
-      <version>6.1.14</version>
-    </dependency>
-    <dependency>
-      <groupId>org.mortbay.jetty</groupId>
-      <artifactId>jsp-2.1</artifactId>
-      <version>6.1.14</version>
-    </dependency>
-    <dependency>
-      <groupId>commons-el</groupId>
-      <artifactId>commons-el</artifactId>
-      <version>1.0</version>
-    </dependency>
-    <dependency>
-      <groupId>net.java.dev.jets3t</groupId>
-      <artifactId>jets3t</artifactId>
-      <version>0.7.1</version>
-    </dependency>
-    <dependency>
-      <groupId>commons-net</groupId>
-      <artifactId>commons-net</artifactId>
-      <version>1.4.1</version>
-    </dependency>
-    <dependency>
-      <groupId>org.mortbay.jetty</groupId>
-      <artifactId>servlet-api-2.5</artifactId>
-      <version>6.1.14</version>
-    </dependency>
-    <dependency>
-      <groupId>net.sf.kosmosfs</groupId>
-      <artifactId>kfs</artifactId>
-      <version>0.3</version>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.8.1</version>
-    </dependency>
-    <dependency>
-      <groupId>hsqldb</groupId>
-      <artifactId>hsqldb</artifactId>
-      <version>1.8.0.10</version>
-    </dependency>
-    <dependency>
-      <groupId>oro</groupId>
-      <artifactId>oro</artifactId>
-      <version>2.0.8</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>avro</artifactId>
-      <version>1.3.2</version>
-      <exclusions>
-        <exclusion>
-          <!-- Don't pull in Avro's (later) version of Jetty.-->
-          <groupId>org.mortbay.jetty</groupId>
-          <artifactId>jetty</artifactId>
-        </exclusion>
-        <exclusion>
-          <!-- Exclude Avro's version of ant since it conflicts with Jetty's.-->
-          <groupId>org.apache.ant</groupId>
-          <artifactId>ant</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>commons-configuration</groupId>
-      <artifactId>commons-configuration</artifactId>
-      <version>1.6</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-math</artifactId>
-      <version>2.1</version>
-    </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-      <version>r09</version>
-    </dependency>
-    <dependency>
-      <groupId>com.google.protobuf</groupId>
-      <artifactId>protobuf-java</artifactId>
-      <version>2.4.0a</version>
-    </dependency>
-  </dependencies>
-</project>
diff --git a/common/ivy/hadoop-common-test-template.xml b/common/ivy/hadoop-common-test-template.xml
deleted file mode 100644
index 4780f880cb..0000000000
--- a/common/ivy/hadoop-common-test-template.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-
-<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/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.hadoop</groupId>
-  <artifactId>hadoop-common-test</artifactId>
-  <packaging>jar</packaging>
-  <version>@version</version>
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-common</artifactId>
-      <version>@version</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.ftpserver</groupId>
-      <artifactId>ftplet-api</artifactId>
-      <version>1.0.0</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.mina</groupId>
-      <artifactId>mina-core</artifactId>
-      <version>2.0.0-M5</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.ftpserver</groupId>
-      <artifactId>ftpserver-core</artifactId>
-      <version>1.0.0</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.ftpserver</groupId>
-      <artifactId>ftpserver-deprecated</artifactId>
-      <version>1.0.0-M2</version>
-    </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
-      <version>1.8.5</version>
-    </dependency>
-  </dependencies>
-</project>
diff --git a/common/ivy/ivysettings.xml b/common/ivy/ivysettings.xml
deleted file mode 100644
index 79cf836cf7..0000000000
--- a/common/ivy/ivysettings.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<ivysettings>
- <!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-
-  <property name="repo.maven.org" value="http://repo1.maven.org/maven2/" override="false"/>
-
-  <property name="maven2.pattern" value="[organisation]/[module]/[revision]/[module]-[revision]"/>
-  <property name="repo.dir" value="${user.home}/.m2/repository"/>
-      <!-- pull in the local repository -->
- <include url="${ivy.default.conf.dir}/ivyconf-local.xml"/> 
-
- <property name="resolvers" value="default" override="false"/>
-  <property name="force-resolve" value="false" override="false"/>
- <settings defaultResolver="${resolvers}"/>
-
- <resolvers>
-   <!--ibiblio resolvers-->
-    <ibiblio name="maven2" root="${repo.maven.org}" m2compatible="true"/>
-
-    <filesystem name="fs" m2compatible="true" force="${force-resolve}">
-       <artifact pattern="${repo.dir}/${maven2.pattern}.[ext]"/>
-       <ivy pattern="${repo.dir}/${maven2.pattern}.pom"/>
-    </filesystem>
-
-    <chain name="default" dual="true">
-      <resolver ref="maven2"/>
-    </chain>
-
-    <chain name="internal" dual="true">
-      <resolver ref="fs"/>
-      <resolver ref="maven2"/>
-    </chain>
-
-  </resolvers>
-
-</ivysettings>
diff --git a/common/ivy/libraries.properties b/common/ivy/libraries.properties
deleted file mode 100644
index 0b312635b8..0000000000
--- a/common/ivy/libraries.properties
+++ /dev/null
@@ -1,90 +0,0 @@
-#   Licensed under the Apache License, Version 2.0 (the "License");
-#   you may not use this file except in compliance with the License.
-#   You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the License is distributed on an "AS IS" BASIS,
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#   See the License for the specific language governing permissions and
-#   limitations under the License.
-
-#This properties file lists the versions of the various artifacts used by hadoop and components.
-#It drives ivy and the generation of a maven POM
-
-#These are the versions of our dependencies (in alphabetical order)
-ant-task.version=2.0.10
-
-avro.version=1.3.2
-
-checkstyle.version=4.2
-
-commons-cli.version=1.2
-commons-cli2.version=2.0-mahout
-commons-codec.version=1.4
-commons-collections.version=3.1
-commons-configuration.version=1.6
-commons-httpclient.version=3.1
-commons-lang.version=2.5
-commons-logging.version=1.1.1
-commons-logging-api.version=1.1
-commons-el.version=1.0
-commons-fileupload.version=1.2
-commons-io.version=1.4
-commons-math.version=2.1
-commons-net.version=1.4.1
-core.version=3.1.1
-coreplugin.version=1.3.2
-
-ftplet-api.version=1.0.0
-ftpserver-core.version=1.0.0
-ftpserver-deprecated.version=1.0.0-M2
-
-guava.version=r09
-
-hsqldb.version=1.8.0.10
-
-ivy.version=2.1.0
-
-jasper.version=5.5.12
-jdeb.version=0.8
-jsp.version=2.1
-jsp-api.version=5.5.12
-jets3t.version=0.7.1
-jetty.version=6.1.14
-jetty-util.version=6.1.14
-junit.version=4.8.1
-jdiff.version=1.0.9
-json.version=1.0
-
-kfs.version=0.3
-
-log4j.version=1.2.15
-lucene-core.version=2.3.1
-
-mina-core.version=2.0.0-M5
-
-oro.version=2.0.8
-
-protobuf.version=2.4.0a
-
-rats-lib.version=0.6
-
-servlet.version=4.0.6
-servlet-api-2.5.version=6.1.14
-servlet-api.version=2.5
-slf4j-api.version=1.5.11
-slf4j-log4j12.version=1.5.11
-
-wagon-http.version=1.0-beta-2
-
-xmlenc.version=0.52
-xerces.version=1.4.4
-
-aspectj.version=1.6.5
-
-mockito-all.version=1.8.5
-
-jsch.version=0.1.42
-
diff --git a/common/src/fixFontsPath.sh b/common/src/fixFontsPath.sh
deleted file mode 100644
index 194d03e7ac..0000000000
--- a/common/src/fixFontsPath.sh
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/bin/sh
-
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-# This file is used to fix the paths in CNDOCS_SRC/uming.conf, CNDOCS_SRC/src/documentation/sitemap.xmap 
-
-CNDOCS_SRC=$1
-
-cat <<EOF > src/docs/cn/uming.conf
-<?xml version="1.0"?>
-<configuration>
-  <fonts>
-    <font metrics-file="$CNDOCS_SRC/uming.xml" kerning="yes" embed-file="$CNDOCS_SRC/uming.ttc">
-      <font-triplet name="AR PL UMing" style="normal" weight="normal"/>
-      <font-triplet name="AR PL UMing" style="italic" weight="normal"/>
-      <font-triplet name="AR PL UMing" style="normal" weight="bold"/>
-      <font-triplet name="AR PL UMing" style="italic" weight="bold"/>
-    </font>
-  </fonts>
-</configuration>
-EOF
-
-cat <<EOF > src/docs/cn/src/documentation/sitemap.xmap
-<?xml version="1.0"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
-  <map:components>
-    <map:serializers default="fo2pdf">
-      <map:serializer name="fo2pdf"
-                src="org.apache.cocoon.serialization.FOPSerializer"
-                mime-type="application/pdf">
-        <user-config src="$CNDOCS_SRC/uming.conf"/>
-        </map:serializer>
-    </map:serializers>
-  </map:components>
-  <map:pipelines>
-    <map:pipeline>
-<!-- generate .pdf files from .fo -->
-      <map:match type="regexp" pattern="^(.*?)([^/]*).pdf$">
-        <map:select type="exists">
-          <map:when test="{lm:project.{1}{2}.pdf}">
-            <map:read src="{lm:project.{1}{2}.pdf}"/>
-          </map:when>
-          <map:when test="{lm:project.{1}{2}.fo}">
-            <map:generate src="{lm:project.{1}{2}.fo}"/>
-            <map:serialize type="fo2pdf"/>
-          </map:when>
-          <map:otherwise>
-            <map:generate src="cocoon://{1}{2}.fo"/>
-            <map:serialize type="fo2pdf"/>
-          </map:otherwise>
-        </map:select>
-      </map:match>
-    </map:pipeline>
-  </map:pipelines>
-</map:sitemap>
-EOF
diff --git a/common/src/native/packageNativeHadoop.sh b/common/src/native/packageNativeHadoop.sh
deleted file mode 100755
index 9ede8fd077..0000000000
--- a/common/src/native/packageNativeHadoop.sh
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/bin/sh
-
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-# packageNativeHadoop.sh - A simple script to help package native-hadoop libraries
-
-#
-# Note: 
-# This script relies on the following environment variables to function correctly:
-#  * BASE_NATIVE_LIB_DIR
-#  * BUILD_NATIVE_DIR
-#  * DIST_LIB_DIR
-# All these are setup by build.xml.
-#
-
-TAR='tar cf -'
-UNTAR='tar xfBp -'
-
-# Copy the pre-built libraries in $BASE_NATIVE_LIB_DIR
-if [ -d $BASE_NATIVE_LIB_DIR ]
-then
-  for platform in `ls $BASE_NATIVE_LIB_DIR`
-  do
-    if [ ! -d $DIST_LIB_DIR ]
-    then
-      mkdir -p $DIST_LIB_DIR
-      echo "Created $DIST_LIB_DIR"
-    fi
-    echo "Copying libraries in $BASE_NATIVE_LIB_DIR/$platform to $DIST_LIB_DIR/"
-    cd $BASE_NATIVE_LIB_DIR/
-    $TAR . | (cd $DIST_LIB_DIR/; $UNTAR)
-  done
-fi
-
-# Copy the custom-built libraries in $BUILD_DIR
-if [ -d $BUILD_NATIVE_DIR ]
-then 
-  for platform in `ls $BUILD_NATIVE_DIR`
-  do
-    if [ ! -d $DIST_LIB_DIR ]
-    then
-      mkdir -p $DIST_LIB_DIR
-      echo "Created $DIST_LIB_DIR"
-    fi
-    echo "Copying libraries in $BUILD_NATIVE_DIR/$platform/lib to $DIST_LIB_DIR/"
-    cd $BUILD_NATIVE_DIR/$platform/lib
-    $TAR . | (cd $DIST_LIB_DIR/; $UNTAR)
-  done  
-fi
-
-if [ "${BUNDLE_SNAPPY_LIB}" = "true" ]
-then
- if [ -d ${SNAPPY_LIB_DIR} ]
- then
-   echo "Copying Snappy library in ${SNAPPY_LIB_DIR} to $DIST_LIB_DIR/"
-   cd ${SNAPPY_LIB_DIR}
-   $TAR . | (cd $DIST_LIB_DIR/; $UNTAR)
- else
-   echo "Snappy lib directory ${SNAPPY_LIB_DIR} does not exist"
-   exit 1
- fi
-fi
-
-#vim: ts=2: sw=2: et
diff --git a/common/src/packages/templates/conf/core-site.xml b/common/src/packages/templates/conf/core-site.xml
deleted file mode 100644
index c4797503e5..0000000000
--- a/common/src/packages/templates/conf/core-site.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
-
-<!-- Put site-specific property overrides in this file. -->
-
-<configuration>
-  <property>
-    <name>fs.default.name</name>
-    <value>${HADOOP_NN_HOST}</value>
-  </property>
-</configuration>
diff --git a/dev-support/smart-apply-patch.sh b/dev-support/smart-apply-patch.sh
new file mode 100755
index 0000000000..3334c2bd88
--- /dev/null
+++ b/dev-support/smart-apply-patch.sh
@@ -0,0 +1,72 @@
+#!/usr/bin/env bash
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+set -e
+
+PATCH_FILE=$1
+if [ -z "$PATCH_FILE" ]; then
+  echo usage: $0 patch-file
+  exit 1
+fi
+
+PATCH=${PATCH:-patch} # allow overriding patch binary
+
+# Cleanup handler for temporary files
+TOCLEAN=""
+cleanup() {
+  rm $TOCLEAN
+  exit $1
+}
+trap "cleanup 1" HUP INT QUIT TERM
+
+# Allow passing "-" for stdin patches
+if [ "$PATCH_FILE" == "-" ]; then
+  PATCH_FILE=/tmp/tmp.in.$$
+  cat /dev/fd/0 > $PATCH_FILE
+  TOCLEAN="$TOCLEAN $PATCH_FILE"
+fi
+
+# Come up with a list of changed files into $TMP
+TMP=/tmp/tmp.paths.$$
+TOCLEAN="$TOCLEAN $TMP"
+grep '^+++\|^---' $PATCH_FILE | cut -c '5-' | grep -v /dev/null | sort | uniq > $TMP
+
+# Assume p0 to start
+PLEVEL=0
+
+# if all of the lines start with a/ or b/, then this is a git patch that
+# was generated without --no-prefix
+if ! grep -qv '^a/\|^b/' $TMP ; then
+  echo Looks like this is a git patch. Stripping a/ and b/ prefixes
+  echo and incrementing PLEVEL
+  PLEVEL=$[$PLEVEL + 1]
+  sed -i -e 's,^[ab]/,,' $TMP
+fi
+
+# if all of the lines start with common/, hdfs/, or mapreduce/, this is
+# relative to the hadoop root instead of the subproject root, so we need
+# to chop off another layer
+PREFIX_DIRS=$(cut -d '/' -f 1 $TMP | sort | uniq)
+if [[ "$PREFIX_DIRS" =~ ^(hdfs|common|mapreduce)$ ]]; then
+
+  echo Looks like this is relative to project root. Increasing PLEVEL
+  PLEVEL=$[$PLEVEL + 1]
+elif ! echo "$PREFIX_DIRS" | grep -vxq 'common\|hdfs\|mapreduce' ; then
+  echo Looks like this is a cross-subproject patch. Not supported!
+  exit 1
+fi
+
+echo Going to apply patch with: $PATCH -p$PLEVEL
+$PATCH -p$PLEVEL -E < $PATCH_FILE
+
+cleanup 0
diff --git a/common/.gitignore b/dev-support/test-patch.properties
similarity index 59%
rename from common/.gitignore
rename to dev-support/test-patch.properties
index b177fe8ae9..e459e3c9e1 100644
--- a/common/.gitignore
+++ b/dev-support/test-patch.properties
@@ -13,36 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-*~
-.classpath
-.project
-.settings
-*.iml
-*.ipr
-*.iws
-.idea
-.svn
-build/
-build-fi/
-build.properties
-conf/masters
-conf/slaves
-conf/hadoop-env.sh
-conf/hadoop-site.xml
-conf/core-site.xml
-conf/mapred-site.xml
-conf/hdfs-site.xml
-conf/hadoop-policy.xml
-conf/capacity-scheduler.xml
-conf/mapred-queue-acls.xml
-docs/api/
-ivy/hadoop-core.xml
-ivy/hadoop-core-test.xml
-ivy/ivy-*.jar
-ivy/maven-ant-tasks-*.jar
-logs/
-src/contrib/ec2/bin/hadoop-ec2-env.sh
-src/docs/build
-src/docs/cn/build
-src/docs/cn/src/documentation/sitemap.xmap
-src/docs/cn/uming.conf
+OK_RELEASEAUDIT_WARNINGS=0
+OK_FINDBUGS_WARNINGS=0
+OK_JAVADOC_WARNINGS=0
diff --git a/dev-support/test-patch.sh b/dev-support/test-patch.sh
new file mode 100755
index 0000000000..2e22020050
--- /dev/null
+++ b/dev-support/test-patch.sh
@@ -0,0 +1,715 @@
+#!/usr/bin/env bash
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+
+#set -x
+ulimit -n 1024
+
+### Setup some variables.  
+### SVN_REVISION and BUILD_URL are set by Hudson if it is run by patch process
+### Read variables from properties file
+bindir=$(dirname $0)
+. $bindir/test-patch.properties
+
+###############################################################################
+parseArgs() {
+  case "$1" in
+    HUDSON)
+      ### Set HUDSON to true to indicate that this script is being run by Hudson
+      HUDSON=true
+      if [[ $# != 16 ]] ; then
+        echo "ERROR: usage $0 HUDSON <PATCH_DIR> <SUPPORT_DIR> <PS_CMD> <WGET_CMD> <JIRACLI> <SVN_CMD> <GREP_CMD> <PATCH_CMD> <FINDBUGS_HOME> <FORREST_HOME> <ECLIPSE_HOME> <WORKSPACE_BASEDIR> <JIRA_PASSWD> <CURL_CMD> <DEFECT> "
+        cleanupAndExit 0
+      fi
+      PATCH_DIR=$2
+      SUPPORT_DIR=$3
+      PS=$4
+      WGET=$5
+      JIRACLI=$6
+      SVN=$7
+      GREP=$8
+      PATCH=$9
+      FINDBUGS_HOME=${10}
+      FORREST_HOME=${11}
+      ECLIPSE_HOME=${12}
+      BASEDIR=${13}
+      JIRA_PASSWD=${14}
+      CURL=${15}
+      defect=${16}
+		
+      ### Retrieve the defect number
+      if [ -z "$defect" ] ; then
+        echo "Could not determine the patch to test.  Exiting."
+        cleanupAndExit 0
+      fi
+
+      if [ ! -e "$PATCH_DIR" ] ; then
+        mkdir -p $PATCH_DIR 
+      fi
+
+      ECLIPSE_PROPERTY="-Declipse.home=$ECLIPSE_HOME"
+      ;;
+    DEVELOPER)
+      ### Set HUDSON to false to indicate that this script is being run by a developer
+      HUDSON=false
+      if [[ $# != 9 ]] ; then
+        echo "ERROR: usage $0 DEVELOPER <PATCH_FILE> <SCRATCH_DIR> <SVN_CMD> <GREP_CMD> <PATCH_CMD> <FINDBUGS_HOME> <FORREST_HOME> <WORKSPACE_BASEDIR>"
+        cleanupAndExit 0
+      fi
+      ### PATCH_FILE contains the location of the patchfile
+      PATCH_FILE=$2 
+      if [[ ! -e "$PATCH_FILE" ]] ; then
+        echo "Unable to locate the patch file $PATCH_FILE"
+        cleanupAndExit 0
+      fi
+      PATCH_DIR=$3
+      ### Check if $PATCH_DIR exists. If it does not exist, create a new directory
+      if [[ ! -e "$PATCH_DIR" ]] ; then
+	mkdir "$PATCH_DIR"
+	if [[ $? == 0 ]] ; then 
+	  echo "$PATCH_DIR has been created"
+	else
+	  echo "Unable to create $PATCH_DIR"
+	  cleanupAndExit 0
+	fi
+      fi
+      SVN=$4
+      GREP=$5
+      PATCH=$6
+      FINDBUGS_HOME=$7
+      FORREST_HOME=$8
+      BASEDIR=$9
+      ### Obtain the patch filename to append it to the version number
+      defect=`basename $PATCH_FILE` 
+      ;;
+    *)
+      echo "ERROR: usage $0 HUDSON [args] | DEVELOPER [args]"
+      cleanupAndExit 0
+      ;;
+  esac
+}
+
+###############################################################################
+checkout () {
+  echo ""
+  echo ""
+  echo "======================================================================"
+  echo "======================================================================"
+  echo "    Testing patch for ${defect}."
+  echo "======================================================================"
+  echo "======================================================================"
+  echo ""
+  echo ""
+  ### When run by a developer, if the workspace contains modifications, do not continue
+  status=`$SVN stat --ignore-externals | sed -e '/^X[ ]*/D'`
+  if [[ $HUDSON == "false" ]] ; then
+    if [[ "$status" != "" ]] ; then
+      echo "ERROR: can't run in a workspace that contains the following modifications"
+      echo "$status"
+      cleanupAndExit 1
+    fi
+    echo
+  else   
+    cd $BASEDIR
+    $SVN revert -R .
+    rm -rf `$SVN status --no-ignore`
+    $SVN update
+  fi
+  return $?
+}
+
+###############################################################################
+setup () {
+  ### Download latest patch file (ignoring .htm and .html) when run from patch process
+  if [[ $HUDSON == "true" ]] ; then
+    $WGET -q -O $PATCH_DIR/jira http://issues.apache.org/jira/browse/$defect
+    if [[ `$GREP -c 'Patch Available' $PATCH_DIR/jira` == 0 ]] ; then
+      echo "$defect is not \"Patch Available\".  Exiting."
+      cleanupAndExit 0
+    fi
+    relativePatchURL=`$GREP -o '"/jira/secure/attachment/[0-9]*/[^"]*' $PATCH_DIR/jira | $GREP -v -e 'htm[l]*$' | sort | tail -1 | $GREP -o '/jira/secure/attachment/[0-9]*/[^"]*'`
+    patchURL="http://issues.apache.org${relativePatchURL}"
+    patchNum=`echo $patchURL | $GREP -o '[0-9]*/' | $GREP -o '[0-9]*'`
+    echo "$defect patch is being downloaded at `date` from"
+    echo "$patchURL"
+    $WGET -q -O $PATCH_DIR/patch $patchURL
+    VERSION=${SVN_REVISION}_${defect}_PATCH-${patchNum}
+    JIRA_COMMENT="Here are the results of testing the latest attachment 
+  $patchURL
+  against trunk revision ${SVN_REVISION}."
+
+    ### Copy in any supporting files needed by this process
+    cp -r $SUPPORT_DIR/lib/* ./lib
+    #PENDING: cp -f $SUPPORT_DIR/etc/checkstyle* ./src/test
+  ### Copy the patch file to $PATCH_DIR
+  else
+    VERSION=PATCH-${defect}
+    cp $PATCH_FILE $PATCH_DIR/patch
+    if [[ $? == 0 ]] ; then
+      echo "Patch file $PATCH_FILE copied to $PATCH_DIR"
+    else
+      echo "Could not copy $PATCH_FILE to $PATCH_DIR"
+      cleanupAndExit 0
+    fi
+  fi
+  ### exit if warnings are NOT defined in the properties file
+  if [ -z "$OK_FINDBUGS_WARNINGS" ] || [[ -z "$OK_JAVADOC_WARNINGS" ]] || [[ -z $OK_RELEASEAUDIT_WARNINGS ]]; then
+    echo "Please define the following properties in test-patch.properties file"
+	 echo  "OK_FINDBUGS_WARNINGS"
+	 echo  "OK_RELEASEAUDIT_WARNINGS"
+	 echo  "OK_JAVADOC_WARNINGS"
+    cleanupAndExit 1
+  fi
+  echo ""
+  echo ""
+  echo "======================================================================"
+  echo "======================================================================"
+  echo " Pre-build trunk to verify trunk stability and javac warnings" 
+  echo "======================================================================"
+  echo "======================================================================"
+  echo ""
+  echo ""
+#  echo "$ANT_HOME/bin/ant  -Djavac.args="-Xlint -Xmaxwarns 1000" $ECLIPSE_PROPERTY -Dforrest.home=${FORREST_HOME} -D${PROJECT_NAME}PatchProcess= clean tar > $PATCH_DIR/trunkJavacWarnings.txt 2>&1"
+# $ANT_HOME/bin/ant -Djavac.args="-Xlint -Xmaxwarns 1000" $ECLIPSE_PROPERTY -Dforrest.home=${FORREST_HOME} -D${PROJECT_NAME}PatchProcess= clean tar > $PATCH_DIR/trunkJavacWarnings.txt 2>&1
+  $MAVEN_HOME/bin/mvn clean compile -DskipTests -D${PROJECT_NAME}PatchProcess -Ptest-patch > $PATCH_DIR/trunkJavacWarnings.txt 2>&1
+  if [[ $? != 0 ]] ; then
+    echo "Trunk compilation is broken?"
+    cleanupAndExit 1
+  fi
+}
+
+###############################################################################
+### Check for @author tags in the patch
+checkAuthor () {
+  echo ""
+  echo ""
+  echo "======================================================================"
+  echo "======================================================================"
+  echo "    Checking there are no @author tags in the patch."
+  echo "======================================================================"
+  echo "======================================================================"
+  echo ""
+  echo ""
+  authorTags=`$GREP -c -i '@author' $PATCH_DIR/patch`
+  echo "There appear to be $authorTags @author tags in the patch."
+  if [[ $authorTags != 0 ]] ; then
+    JIRA_COMMENT="$JIRA_COMMENT
+
+    -1 @author.  The patch appears to contain $authorTags @author tags which the Hadoop community has agreed to not allow in code contributions."
+    return 1
+  fi
+  JIRA_COMMENT="$JIRA_COMMENT
+
+    +1 @author.  The patch does not contain any @author tags."
+  return 0
+}
+
+###############################################################################
+### Check for tests in the patch
+checkTests () {
+  echo ""
+  echo ""
+  echo "======================================================================"
+  echo "======================================================================"
+  echo "    Checking there are new or changed tests in the patch."
+  echo "======================================================================"
+  echo "======================================================================"
+  echo ""
+  echo ""
+  testReferences=`$GREP -c -i '/test' $PATCH_DIR/patch`
+  echo "There appear to be $testReferences test files referenced in the patch."
+  if [[ $testReferences == 0 ]] ; then
+    if [[ $HUDSON == "true" ]] ; then
+      patchIsDoc=`$GREP -c -i 'title="documentation' $PATCH_DIR/jira`
+      if [[ $patchIsDoc != 0 ]] ; then
+        echo "The patch appears to be a documentation patch that doesn't require tests."
+        JIRA_COMMENT="$JIRA_COMMENT
+
+    +0 tests included.  The patch appears to be a documentation patch that doesn't require tests."
+        return 0
+      fi
+    fi
+    JIRA_COMMENT="$JIRA_COMMENT
+
+    -1 tests included.  The patch doesn't appear to include any new or modified tests.
+                        Please justify why no new tests are needed for this patch.
+                        Also please list what manual steps were performed to verify this patch."
+    return 1
+  fi
+  JIRA_COMMENT="$JIRA_COMMENT
+
+    +1 tests included.  The patch appears to include $testReferences new or modified tests."
+  return 0
+}
+
+cleanUpXml () {
+  cd $BASEDIR/conf
+  for file in `ls *.xml.template`
+    do
+      rm -f `basename $file .template`
+    done
+  cd $BASEDIR  
+}
+
+###############################################################################
+### Attempt to apply the patch
+applyPatch () {
+  echo ""
+  echo ""
+  echo "======================================================================"
+  echo "======================================================================"
+  echo "    Applying patch."
+  echo "======================================================================"
+  echo "======================================================================"
+  echo ""
+  echo ""
+  export PATCH
+  $bindir/smart-apply-patch.sh $PATCH_DIR/patch
+  if [[ $? != 0 ]] ; then
+    echo "PATCH APPLICATION FAILED"
+    JIRA_COMMENT="$JIRA_COMMENT
+
+    -1 patch.  The patch command could not apply the patch."
+    return 1
+  fi
+  return 0
+}
+
+###############################################################################
+### Check there are no javadoc warnings
+checkJavadocWarnings () {
+  echo ""
+  echo ""
+  echo "======================================================================"
+  echo "======================================================================"
+  echo "    Determining number of patched javadoc warnings."
+  echo "======================================================================"
+  echo "======================================================================"
+  echo ""
+  echo ""
+  echo "$ANT_HOME/bin/ant -Dversion="${VERSION}" -DHadoopPatchProcess= clean javadoc | tee $PATCH_DIR/patchJavadocWarnings.txt"
+  (cd root; mvn install)
+  (cd doclet; mvn install)
+  #$ANT_HOME/bin/ant -Dversion="${VERSION}" -DHadoopPatchProcess= clean javadoc | tee $PATCH_DIR/patchJavadocWarnings.txt
+  $MAVEN_HOME/bin/mvn clean compile javadoc:javadoc -DskipTests -Pdocs -D${PROJECT_NAME}PatchProcess > $PATCH_DIR/patchJavadocWarnings.txt 2>&1
+  javadocWarnings=`$GREP '\[WARNING\]' $PATCH_DIR/patchJavadocWarnings.txt | awk '/Javadoc Warnings/,EOF' | $GREP -v 'Javadoc Warnings' | awk 'BEGIN {total = 0} {total += 1} END {print total}'`
+  echo ""
+  echo ""
+  echo "There appear to be $javadocWarnings javadoc warnings generated by the patched build."
+
+  ### if current warnings greater than OK_JAVADOC_WARNINGS
+  if [[ $javadocWarnings > $OK_JAVADOC_WARNINGS ]] ; then
+    JIRA_COMMENT="$JIRA_COMMENT
+
+    -1 javadoc.  The javadoc tool appears to have generated `expr $(($javadocWarnings-$OK_JAVADOC_WARNINGS))` warning messages."
+    return 1
+  fi
+  JIRA_COMMENT="$JIRA_COMMENT
+
+    +1 javadoc.  The javadoc tool did not generate any warning messages."
+  return 0
+}
+
+###############################################################################
+### Check there are no changes in the number of Javac warnings
+checkJavacWarnings () {
+  echo ""
+  echo ""
+  echo "======================================================================"
+  echo "======================================================================"
+  echo "    Determining number of patched javac warnings."
+  echo "======================================================================"
+  echo "======================================================================"
+  echo ""
+  echo ""
+  #echo "$ANT_HOME/bin/ant -Dversion="${VERSION}" -Djavac.args="-Xlint -Xmaxwarns 1000" $ECLIPSE_PROPERTY -Dforrest.home=${FORREST_HOME} -DHadoopPatchProcess= clean tar > $PATCH_DIR/patchJavacWarnings.txt 2>&1"
+  #$ANT_HOME/bin/ant -Dversion="${VERSION}" -Djavac.args="-Xlint -Xmaxwarns 1000" $ECLIPSE_PROPERTY -Dforrest.home=${FORREST_HOME} -DHadoopPatchProcess= clean tar > $PATCH_DIR/patchJavacWarnings.txt 2>&1
+  $MAVEN_HOME/bin/mvn clean compile -DskipTests -D${PROJECT_NAME}PatchProcess -Ptest-patch > $PATCH_DIR/patchJavacWarnings.txt 2>&1
+  if [[ $? != 0 ]] ; then
+    JIRA_COMMENT="$JIRA_COMMENT
+
+    -1 javac.  The patch appears to cause tar ant target to fail."
+    return 1
+  fi
+  ### Compare trunk and patch javac warning numbers
+  if [[ -f $PATCH_DIR/patchJavacWarnings.txt ]] ; then
+    trunkJavacWarnings=`$GREP '\[WARNING\]' $PATCH_DIR/trunkJavacWarnings.txt | awk 'BEGIN {total = 0} {total += 1} END {print total}'`
+    patchJavacWarnings=`$GREP '\[WARNING\]' $PATCH_DIR/patchJavacWarnings.txt | awk 'BEGIN {total = 0} {total += 1} END {print total}'`
+    echo "There appear to be $trunkJavacWarnings javac compiler warnings before the patch and $patchJavacWarnings javac compiler warnings after applying the patch."
+    if [[ $patchJavacWarnings != "" && $trunkJavacWarnings != "" ]] ; then
+      if [[ $patchJavacWarnings -gt $trunkJavacWarnings ]] ; then
+        JIRA_COMMENT="$JIRA_COMMENT
+
+    -1 javac.  The applied patch generated $patchJavacWarnings javac compiler warnings (more than the trunk's current $trunkJavacWarnings warnings)."
+        return 1
+      fi
+    fi
+  fi
+  JIRA_COMMENT="$JIRA_COMMENT
+
+    +1 javac.  The applied patch does not increase the total number of javac compiler warnings."
+  return 0
+}
+
+###############################################################################
+### Check there are no changes in the number of release audit (RAT) warnings
+checkReleaseAuditWarnings () {
+  echo ""
+  echo ""
+  echo "======================================================================"
+  echo "======================================================================"
+  echo "    Determining number of patched release audit warnings."
+  echo "======================================================================"
+  echo "======================================================================"
+  echo ""
+  echo ""
+  #echo "$ANT_HOME/bin/ant -Dversion="${VERSION}" -Dforrest.home=${FORREST_HOME} -DHadoopPatchProcess= releaseaudit > $PATCH_DIR/patchReleaseAuditWarnings.txt 2>&1"
+  #$ANT_HOME/bin/ant -Dversion="${VERSION}" -Dforrest.home=${FORREST_HOME} -DHadoopPatchProcess= releaseaudit > $PATCH_DIR/patchReleaseAuditWarnings.txt 2>&1
+  $MAVEN_HOME/bin/mvn apache-rat:check -D${PROJECT_NAME}PatchProcess 2>&1
+  find . -name rat.txt | xargs cat > $PATCH_DIR/patchReleaseAuditWarnings.txt
+
+  ### Compare trunk and patch release audit warning numbers
+  if [[ -f $PATCH_DIR/patchReleaseAuditWarnings.txt ]] ; then
+    patchReleaseAuditWarnings=`$GREP -c '\!?????' $PATCH_DIR/patchReleaseAuditWarnings.txt`
+    echo ""
+    echo ""
+    echo "There appear to be $OK_RELEASEAUDIT_WARNINGS release audit warnings before the patch and $patchReleaseAuditWarnings release audit warnings after applying the patch."
+    if [[ $patchReleaseAuditWarnings != "" && $OK_RELEASEAUDIT_WARNINGS != "" ]] ; then
+      if [[ $patchReleaseAuditWarnings -gt $OK_RELEASEAUDIT_WARNINGS ]] ; then
+        JIRA_COMMENT="$JIRA_COMMENT
+
+    -1 release audit.  The applied patch generated $patchReleaseAuditWarnings release audit warnings (more than the trunk's current $OK_RELEASEAUDIT_WARNINGS warnings)."
+        $GREP '\!?????' $PATCH_DIR/patchReleaseAuditWarnings.txt > $PATCH_DIR/patchReleaseAuditProblems.txt
+        echo "Lines that start with ????? in the release audit report indicate files that do not have an Apache license header." >> $PATCH_DIR/patchReleaseAuditProblems.txt
+        JIRA_COMMENT_FOOTER="Release audit warnings: $BUILD_URL/artifact/trunk/patchprocess/patchReleaseAuditProblems.txt
+$JIRA_COMMENT_FOOTER"
+        return 1
+      fi
+    fi
+  fi
+  JIRA_COMMENT="$JIRA_COMMENT
+
+    +1 release audit.  The applied patch does not increase the total number of release audit warnings."
+  return 0
+}
+
+###############################################################################
+### Check there are no changes in the number of Checkstyle warnings
+checkStyle () {
+  echo ""
+  echo ""
+  echo "======================================================================"
+  echo "======================================================================"
+  echo "    Determining number of patched checkstyle warnings."
+  echo "======================================================================"
+  echo "======================================================================"
+  echo ""
+  echo ""
+  echo "THIS IS NOT IMPLEMENTED YET"
+  echo ""
+  echo ""
+  #echo "$ANT_HOME/bin/ant -Dversion="${VERSION}" -DHadoopPatchProcess= checkstyle"
+  #$ANT_HOME/bin/ant -Dversion="${VERSION}" -DHadoopPatchProcess= checkstyle
+  $MAVEN_HOME/bin/mvn compile checkstyle:checkstyle -D${PROJECT_NAME}PatchProcess
+
+  JIRA_COMMENT_FOOTER="Checkstyle results: $BUILD_URL/artifact/trunk/build/test/checkstyle-errors.html
+$JIRA_COMMENT_FOOTER"
+  ### TODO: calculate actual patchStyleErrors
+#  patchStyleErrors=0
+#  if [[ $patchStyleErrors != 0 ]] ; then
+#    JIRA_COMMENT="$JIRA_COMMENT
+#
+#    -1 checkstyle.  The patch generated $patchStyleErrors code style errors."
+#    return 1
+#  fi
+#  JIRA_COMMENT="$JIRA_COMMENT
+#
+#    +1 checkstyle.  The patch generated 0 code style errors."
+  return 0
+}
+
+###############################################################################
+### Check there are no changes in the number of Findbugs warnings
+checkFindbugsWarnings () {
+  findbugs_version=`${FINDBUGS_HOME}/bin/findbugs -version`
+  echo ""
+  echo ""
+  echo "======================================================================"
+  echo "======================================================================"
+  echo "    Determining number of patched Findbugs warnings."
+  echo "======================================================================"
+  echo "======================================================================"
+  echo ""
+  echo ""
+  #echo "$ANT_HOME/bin/ant -Dversion="${VERSION}" -Dfindbugs.home=$FINDBUGS_HOME -Dforrest.home=${FORREST_HOME} -DHadoopPatchProcess= findbugs"
+  #$ANT_HOME/bin/ant -Dversion="${VERSION}" -Dfindbugs.home=${FINDBUGS_HOME} -Dforrest.home=${FORREST_HOME} -DHadoopPatchProcess= findbugs
+  $MAVEN_HOME/bin/mvn clean compile findbugs:findbugs -D${PROJECT_NAME}PatchProcess -X
+
+  if [ $? != 0 ] ; then
+    JIRA_COMMENT="$JIRA_COMMENT
+
+    -1 findbugs.  The patch appears to cause Findbugs (version ${findbugs_version}) to fail."
+    return 1
+  fi
+JIRA_COMMENT_FOOTER="Findbugs warnings: $BUILD_URL/artifact/trunk/target/newPatchFindbugsWarnings.html
+$JIRA_COMMENT_FOOTER"
+  
+  cp $BASEDIR/hadoop-common/target/findbugsXml.xml $PATCH_DIR/patchFindbugsWarnings.xml
+  $FINDBUGS_HOME/bin/setBugDatabaseInfo -timestamp "01/01/2000" \
+    $PATCH_DIR/patchFindbugsWarnings.xml \
+    $PATCH_DIR/patchFindbugsWarnings.xml
+  findbugsWarnings=`$FINDBUGS_HOME/bin/filterBugs -first "01/01/2000" $PATCH_DIR/patchFindbugsWarnings.xml \
+    $PATCH_DIR/newPatchFindbugsWarnings.xml | /usr/bin/awk '{print $1}'`
+  $FINDBUGS_HOME/bin/convertXmlToText -html \
+    $PATCH_DIR/newPatchFindbugsWarnings.xml \
+    $PATCH_DIR/newPatchFindbugsWarnings.html
+
+  ### if current warnings greater than OK_FINDBUGS_WARNINGS
+  if [[ $findbugsWarnings > $OK_FINDBUGS_WARNINGS ]] ; then
+    JIRA_COMMENT="$JIRA_COMMENT
+
+    -1 findbugs.  The patch appears to introduce `expr $(($findbugsWarnings-$OK_FINDBUGS_WARNINGS))` new Findbugs (version ${findbugs_version}) warnings."
+    return 1
+  fi
+  JIRA_COMMENT="$JIRA_COMMENT
+
+    +1 findbugs.  The patch does not introduce any new Findbugs (version ${findbugs_version}) warnings."
+  return 0
+}
+
+###############################################################################
+### Run the test-core target
+runCoreTests () {
+  echo ""
+  echo ""
+  echo "======================================================================"
+  echo "======================================================================"
+  echo "    Running core tests."
+  echo "======================================================================"
+  echo "======================================================================"
+  echo ""
+  echo ""
+  
+  ### Kill any rogue build processes from the last attempt
+  $PS auxwww | $GREP HadoopPatchProcess | /usr/bin/nawk '{print $2}' | /usr/bin/xargs -t -I {} /bin/kill -9 {} > /dev/null
+  PreTestTarget=""
+  if [[ $defect == MAPREDUCE-* ]] ; then
+     PreTestTarget="create-c++-configure"
+  fi
+
+  #echo "$ANT_HOME/bin/ant -Dversion="${VERSION}" -DHadoopPatchProcess= -Dtest.junit.output.format=xml -Dtest.output=no -Dcompile.c++=yes -Dforrest.home=$FORREST_HOME $PreTestTarget test-core"
+  #$ANT_HOME/bin/ant -Dversion="${VERSION}" -DHadoopPatchProcess= -Dtest.junit.output.format=xml -Dtest.output=no -Dcompile.c++=yes -Dforrest.home=$FORREST_HOME  $PreTestTarget test-core
+  $MAVEN_HOME/bin/mvn clean test -Pnative -DHadoopPatchProcess
+  if [[ $? != 0 ]] ; then
+    ### Find and format names of failed tests
+    failed_tests=`grep -l -E "<failure|<error" $WORKSPACE/trunk/target/hadoop-common/surefire-reports/*.xml | sed -e "s|.*target/surefire-reports/TEST-|                  |g" | sed -e "s|\.xml||g"`
+    JIRA_COMMENT="$JIRA_COMMENT
+
+    -1 core tests.  The patch failed these core unit tests:
+$failed_tests"
+    return 1
+  fi
+  JIRA_COMMENT="$JIRA_COMMENT
+
+    +1 core tests.  The patch passed core unit tests."
+  return 0
+}
+
+###############################################################################
+### Run the test-contrib target
+runContribTests () {
+  echo ""
+  echo ""
+  echo "======================================================================"
+  echo "======================================================================"
+  echo "    Running contrib tests."
+  echo "======================================================================"
+  echo "======================================================================"
+  echo ""
+  echo ""
+
+  if [[ `$GREP -c 'test-contrib' build.xml` == 0 ]] ; then
+    echo "No contrib tests in this project."
+    return 0
+  fi
+
+  ### Kill any rogue build processes from the last attempt
+  $PS auxwww | $GREP HadoopPatchProcess | /usr/bin/nawk '{print $2}' | /usr/bin/xargs -t -I {} /bin/kill -9 {} > /dev/null
+
+  #echo "$ANT_HOME/bin/ant -Dversion="${VERSION}" $ECLIPSE_PROPERTY -DHadoopPatchProcess= -Dtest.junit.output.format=xml -Dtest.output=no test-contrib"
+  #$ANT_HOME/bin/ant -Dversion="${VERSION}" $ECLIPSE_PROPERTY -DHadoopPatchProcess= -Dtest.junit.output.format=xml -Dtest.output=no test-contrib
+  echo "NOP"
+  if [[ $? != 0 ]] ; then
+    JIRA_COMMENT="$JIRA_COMMENT
+
+    -1 contrib tests.  The patch failed contrib unit tests."
+    return 1
+  fi
+  JIRA_COMMENT="$JIRA_COMMENT
+
+    +1 contrib tests.  The patch passed contrib unit tests."
+  return 0
+}
+
+###############################################################################
+### Run the inject-system-faults target
+checkInjectSystemFaults () {
+  echo ""
+  echo ""
+  echo "======================================================================"
+  echo "======================================================================"
+  echo "    Checking the integrity of system test framework code."
+  echo "======================================================================"
+  echo "======================================================================"
+  echo ""
+  echo ""
+  
+  ### Kill any rogue build processes from the last attempt
+  $PS auxwww | $GREP HadoopPatchProcess | /usr/bin/nawk '{print $2}' | /usr/bin/xargs -t -I {} /bin/kill -9 {} > /dev/null
+
+  #echo "$ANT_HOME/bin/ant -Dversion="${VERSION}" -DHadoopPatchProcess= -Dtest.junit.output.format=xml -Dtest.output=no -Dcompile.c++=yes -Dforrest.home=$FORREST_HOME inject-system-faults"
+  #$ANT_HOME/bin/ant -Dversion="${VERSION}" -DHadoopPatchProcess= -Dtest.junit.output.format=xml -Dtest.output=no -Dcompile.c++=yes -Dforrest.home=$FORREST_HOME inject-system-faults
+  echo "NOP"
+  if [[ $? != 0 ]] ; then
+    JIRA_COMMENT="$JIRA_COMMENT
+
+    -1 system test framework.  The patch failed system test framework compile."
+    return 1
+  fi
+  JIRA_COMMENT="$JIRA_COMMENT
+
+    +1 system test framework.  The patch passed system test framework compile."
+  return 0
+}
+
+###############################################################################
+### Submit a comment to the defect's Jira
+submitJiraComment () {
+  local result=$1
+  ### Do not output the value of JIRA_COMMENT_FOOTER when run by a developer
+  if [[  $HUDSON == "false" ]] ; then
+    JIRA_COMMENT_FOOTER=""
+  fi
+  if [[ $result == 0 ]] ; then
+    comment="+1 overall.  $JIRA_COMMENT
+
+$JIRA_COMMENT_FOOTER"
+  else
+    comment="-1 overall.  $JIRA_COMMENT
+
+$JIRA_COMMENT_FOOTER"
+  fi
+  ### Output the test result to the console
+  echo "
+
+
+
+$comment"  
+
+  if [[ $HUDSON == "true" ]] ; then
+    echo ""
+    echo ""
+    echo "======================================================================"
+    echo "======================================================================"
+    echo "    Adding comment to Jira."
+    echo "======================================================================"
+    echo "======================================================================"
+    echo ""
+    echo ""
+    ### Update Jira with a comment
+    export USER=hudson
+    $JIRACLI -s https://issues.apache.org/jira -a addcomment -u hadoopqa -p $JIRA_PASSWD --comment "$comment" --issue $defect
+    $JIRACLI -s https://issues.apache.org/jira -a logout -u hadoopqa -p $JIRA_PASSWD
+  fi
+}
+
+###############################################################################
+### Cleanup files
+cleanupAndExit () {
+  local result=$1
+  if [[ $HUDSON == "true" ]] ; then
+    if [ -e "$PATCH_DIR" ] ; then
+      mv $PATCH_DIR $BASEDIR
+    fi
+  fi
+  echo ""
+  echo ""
+  echo "======================================================================"
+  echo "======================================================================"
+  echo "    Finished build."
+  echo "======================================================================"
+  echo "======================================================================"
+  echo ""
+  echo ""
+  exit $result
+}
+
+###############################################################################
+###############################################################################
+###############################################################################
+
+JIRA_COMMENT=""
+JIRA_COMMENT_FOOTER="Console output: $BUILD_URL/console
+
+This message is automatically generated."
+
+### Check if arguments to the script have been specified properly or not
+parseArgs $@
+cd $BASEDIR
+
+checkout
+RESULT=$?
+if [[ $HUDSON == "true" ]] ; then
+  if [[ $RESULT != 0 ]] ; then
+    exit 100
+  fi
+fi
+setup
+checkAuthor
+RESULT=$?
+
+if [[ $HUDSON == "true" ]] ; then
+  cleanUpXml
+fi
+checkTests
+(( RESULT = RESULT + $? ))
+applyPatch
+if [[ $? != 0 ]] ; then
+  submitJiraComment 1
+  cleanupAndExit 1
+fi
+checkJavadocWarnings
+(( RESULT = RESULT + $? ))
+checkJavacWarnings
+(( RESULT = RESULT + $? ))
+### Checkstyle not implemented yet
+#checkStyle
+#(( RESULT = RESULT + $? ))
+checkFindbugsWarnings
+(( RESULT = RESULT + $? ))
+checkReleaseAuditWarnings
+(( RESULT = RESULT + $? ))
+### Do not call these when run by a developer 
+if [[ $HUDSON == "true" ]] ; then
+  runCoreTests
+  (( RESULT = RESULT + $? ))
+  runContribTests
+  (( RESULT = RESULT + $? ))
+fi
+checkInjectSystemFaults
+(( RESULT = RESULT + $? ))
+JIRA_COMMENT_FOOTER="Test results: $BUILD_URL/testReport/
+$JIRA_COMMENT_FOOTER"
+
+submitJiraComment $RESULT
+cleanupAndExit $RESULT
diff --git a/hadoop-annotations/pom.xml b/hadoop-annotations/pom.xml
new file mode 100644
index 0000000000..6c9313f859
--- /dev/null
+++ b/hadoop-annotations/pom.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License. See accompanying LICENSE file.
+-->
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.hadoop</groupId>
+    <artifactId>hadoop-project</artifactId>
+    <version>0.23.0-SNAPSHOT</version>
+    <relativePath>../hadoop-project</relativePath>
+  </parent>
+  <groupId>org.apache.hadoop</groupId>
+  <artifactId>hadoop-annotations</artifactId>
+  <version>0.23.0-SNAPSHOT</version>
+  <description>Apache Hadoop Annotations</description>
+  <name>Apache Hadoop Annotations</name>
+  <packaging>jar</packaging>
+
+  <dependencies>
+    <dependency>
+      <groupId>jdiff</groupId>
+      <artifactId>jdiff</artifactId>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+
+</project>
diff --git a/common/src/java/org/apache/hadoop/classification/InterfaceAudience.java b/hadoop-annotations/src/main/java/org/apache/hadoop/classification/InterfaceAudience.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/classification/InterfaceAudience.java
rename to hadoop-annotations/src/main/java/org/apache/hadoop/classification/InterfaceAudience.java
diff --git a/common/src/java/org/apache/hadoop/classification/InterfaceStability.java b/hadoop-annotations/src/main/java/org/apache/hadoop/classification/InterfaceStability.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/classification/InterfaceStability.java
rename to hadoop-annotations/src/main/java/org/apache/hadoop/classification/InterfaceStability.java
diff --git a/common/src/java/org/apache/hadoop/classification/tools/ExcludePrivateAnnotationsJDiffDoclet.java b/hadoop-annotations/src/main/java/org/apache/hadoop/classification/tools/ExcludePrivateAnnotationsJDiffDoclet.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/classification/tools/ExcludePrivateAnnotationsJDiffDoclet.java
rename to hadoop-annotations/src/main/java/org/apache/hadoop/classification/tools/ExcludePrivateAnnotationsJDiffDoclet.java
diff --git a/common/src/java/org/apache/hadoop/classification/tools/ExcludePrivateAnnotationsStandardDoclet.java b/hadoop-annotations/src/main/java/org/apache/hadoop/classification/tools/ExcludePrivateAnnotationsStandardDoclet.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/classification/tools/ExcludePrivateAnnotationsStandardDoclet.java
rename to hadoop-annotations/src/main/java/org/apache/hadoop/classification/tools/ExcludePrivateAnnotationsStandardDoclet.java
diff --git a/common/src/java/org/apache/hadoop/classification/tools/RootDocProcessor.java b/hadoop-annotations/src/main/java/org/apache/hadoop/classification/tools/RootDocProcessor.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/classification/tools/RootDocProcessor.java
rename to hadoop-annotations/src/main/java/org/apache/hadoop/classification/tools/RootDocProcessor.java
diff --git a/common/src/java/org/apache/hadoop/classification/tools/StabilityOptions.java b/hadoop-annotations/src/main/java/org/apache/hadoop/classification/tools/StabilityOptions.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/classification/tools/StabilityOptions.java
rename to hadoop-annotations/src/main/java/org/apache/hadoop/classification/tools/StabilityOptions.java
diff --git a/common/src/java/org/apache/hadoop/classification/tools/package-info.java b/hadoop-annotations/src/main/java/org/apache/hadoop/classification/tools/package-info.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/classification/tools/package-info.java
rename to hadoop-annotations/src/main/java/org/apache/hadoop/classification/tools/package-info.java
diff --git a/hadoop-assemblies/pom.xml b/hadoop-assemblies/pom.xml
new file mode 100644
index 0000000000..59062a4b78
--- /dev/null
+++ b/hadoop-assemblies/pom.xml
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.hadoop</groupId>
+    <artifactId>hadoop-project</artifactId>
+    <version>0.23.0-SNAPSHOT</version>
+    <relativePath>../hadoop-project</relativePath>
+  </parent>
+  <groupId>org.apache.hadoop</groupId>
+  <artifactId>hadoop-assemblies</artifactId>
+  <version>0.23.0-SNAPSHOT</version>
+  <name>Apache Hadoop Assemblies</name>
+  <description>Apache Hadoop Assemblies</description>
+
+  <properties>
+    <failIfNoTests>false</failIfNoTests>
+  </properties>
+
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-enforcer-plugin</artifactId>
+          <version>1.0</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-assembly-plugin</artifactId>
+          <version>2.2-beta-3</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.rat</groupId>
+          <artifactId>apache-rat-plugin</artifactId>
+          <version>0.7</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-enforcer-plugin</artifactId>
+        <inherited>false</inherited>
+        <configuration>
+          <rules>
+            <requireMavenVersion>
+              <version>[3.0.0,)</version>
+            </requireMavenVersion>
+            <requireJavaVersion>
+              <version>1.6</version>
+            </requireJavaVersion>
+            <requireOS>
+              <family>unix</family>
+            </requireOS>
+          </rules>
+        </configuration>
+        <executions>
+          <execution>
+            <id>clean</id>
+            <goals>
+              <goal>enforce</goal>
+            </goals>
+            <phase>pre-clean</phase>
+          </execution>
+          <execution>
+            <id>default</id>
+            <goals>
+              <goal>enforce</goal>
+            </goals>
+            <phase>validate</phase>
+          </execution>
+          <execution>
+            <id>site</id>
+            <goals>
+              <goal>enforce</goal>
+            </goals>
+            <phase>pre-site</phase>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.rat</groupId>
+        <artifactId>apache-rat-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/hadoop-assemblies/src/main/resources/assemblies/hadoop-bintar.xml b/hadoop-assemblies/src/main/resources/assemblies/hadoop-bintar.xml
new file mode 100644
index 0000000000..4e1f46378a
--- /dev/null
+++ b/hadoop-assemblies/src/main/resources/assemblies/hadoop-bintar.xml
@@ -0,0 +1,113 @@
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+<assembly>
+  <id>hadoop-bintar</id>
+  <formats>
+    <format>dir</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <fileSets>
+    <fileSet>
+      <directory>${basedir}/src/main/bin</directory>
+      <outputDirectory>/bin</outputDirectory>
+      <includes>
+        <include>hadoop</include>
+      </includes>
+      <fileMode>0755</fileMode>
+    </fileSet>
+    <fileSet>
+      <directory>${basedir}/src/main/conf</directory>
+      <outputDirectory>/etc/hadoop</outputDirectory>
+    </fileSet>
+    <fileSet>
+      <directory>${basedir}/src/main/bin</directory>
+      <outputDirectory>/libexec</outputDirectory>
+      <includes>
+        <include>hadoop-config.sh</include>
+      </includes>
+      <fileMode>0755</fileMode>
+    </fileSet>
+    <fileSet>
+      <directory>${basedir}/src/main/bin</directory>
+      <outputDirectory>/sbin</outputDirectory>
+      <includes>
+        <include>*.sh</include>
+      </includes>
+      <excludes>
+        <exclude>hadoop-config.sh</exclude>
+      </excludes>
+      <fileMode>0755</fileMode>
+    </fileSet>
+    <fileSet>
+      <directory>${basedir}/src/main/packages</directory>
+      <outputDirectory>/sbin</outputDirectory>
+      <includes>
+        <include>*.sh</include>
+      </includes>
+      <fileMode>0755</fileMode>
+    </fileSet>
+    <fileSet>
+      <directory>${basedir}</directory>
+      <outputDirectory>/share/doc/hadoop/${hadoop.component}</outputDirectory>
+      <includes>
+        <include>*.txt</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>${basedir}/src/main/webapps</directory>
+      <outputDirectory>/share/hadoop/${hadoop.component}/webapps</outputDirectory>
+    </fileSet>
+    <fileSet>
+      <directory>${basedir}/src/main/conf</directory>
+      <outputDirectory>/share/hadoop/${hadoop.component}/templates</outputDirectory>
+      <includes>
+        <include>*-site.xml</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>${project.build.directory}</directory>
+      <outputDirectory>/share/hadoop/${hadoop.component}</outputDirectory>
+      <includes>
+        <include>${project.artifactId}-${project.version}.jar</include>
+        <include>${project.artifactId}-${project.version}-tests.jar</include>
+        <include>${project.artifactId}-${project.version}-sources.jar</include>
+        <include>${project.artifactId}-${project.version}-test-sources.jar</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>${basedir}/dev-support/jdiff</directory>
+      <outputDirectory>/share/hadoop/${hadoop.component}/jdiff</outputDirectory>
+    </fileSet>
+    <fileSet>
+      <directory>${project.build.directory}/site/jdiff/xml</directory>
+      <outputDirectory>/share/hadoop/${hadoop.component}/jdiff</outputDirectory>
+    </fileSet>
+  </fileSets>
+  <dependencySets>
+    <dependencySet>
+      <outputDirectory>/share/hadoop/${hadoop.component}/lib</outputDirectory>
+      <unpack>false</unpack>
+      <scope>compile</scope>
+      <useProjectArtifact>false</useProjectArtifact>
+      <excludes>
+        <exclude>org.apache.ant:*:jar</exclude>
+        <exclude>org.apache.hadoop:hadoop-*:jar</exclude>
+        <exclude>jdiff:jdiff:jar</exclude>
+      </excludes>
+    </dependencySet>
+  </dependencySets>
+</assembly>
diff --git a/hadoop-assemblies/src/main/resources/assemblies/hadoop-src.xml b/hadoop-assemblies/src/main/resources/assemblies/hadoop-src.xml
new file mode 100644
index 0000000000..1829f22ea4
--- /dev/null
+++ b/hadoop-assemblies/src/main/resources/assemblies/hadoop-src.xml
@@ -0,0 +1,37 @@
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+  <id>hadoop-src</id>
+  <formats>
+    <format>dir</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <fileSets>
+    <fileSet>
+      <directory>${project.basedir}</directory>
+      <outputDirectory>src/</outputDirectory>
+      <useDefaultExcludes>true</useDefaultExcludes>
+      <excludes>
+        <exclude>**/*.log</exclude>
+        <exclude>**/build/**</exclude>
+        <exclude>**/target/**</exclude>
+      </excludes>
+    </fileSet>
+  </fileSets>
+</assembly>
diff --git a/hadoop-assemblies/src/main/resources/assemblies/hadoop-tar.xml b/hadoop-assemblies/src/main/resources/assemblies/hadoop-tar.xml
new file mode 100644
index 0000000000..32984f7778
--- /dev/null
+++ b/hadoop-assemblies/src/main/resources/assemblies/hadoop-tar.xml
@@ -0,0 +1,85 @@
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+<assembly>
+  <id>hadoop-tar</id>
+  <formats>
+    <format>dir</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <fileSets>
+    <fileSet>
+      <directory>${basedir}</directory>
+      <outputDirectory>/</outputDirectory>
+      <includes>
+        <include>*.txt</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>${basedir}/src/main/bin</directory>
+      <outputDirectory>/bin</outputDirectory>
+      <includes>
+        <include>*</include>
+      </includes>
+      <fileMode>0755</fileMode>
+    </fileSet>
+    <fileSet>
+      <directory>${basedir}/src/main/bin</directory>
+      <outputDirectory>/libexec</outputDirectory>
+      <includes>
+        <include>hadoop-config.sh</include>
+      </includes>
+      <fileMode>0755</fileMode>
+    </fileSet>
+    <fileSet>
+      <directory>${basedir}/src/main/conf</directory>
+      <outputDirectory>/conf</outputDirectory>
+    </fileSet>
+    <fileSet>
+      <directory>${basedir}/src/main/webapps</directory>
+      <outputDirectory>/webapps</outputDirectory>
+    </fileSet>
+    <fileSet>
+      <directory>${project.build.directory}/site</directory>
+      <outputDirectory>/docs</outputDirectory>
+    </fileSet>
+    <fileSet>
+      <directory>${project.build.directory}</directory>
+      <outputDirectory>/</outputDirectory>
+      <includes>
+        <include>${project.artifactId}-${project.version}.jar</include>
+        <include>${project.artifactId}-${project.version}-tests.jar</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>${project.build.directory}/src</directory>
+      <outputDirectory>/src</outputDirectory>
+    </fileSet>
+  </fileSets>
+  <dependencySets>
+    <dependencySet>
+      <outputDirectory>/lib</outputDirectory>
+      <unpack>false</unpack>
+      <scope>compile</scope>
+      <useProjectArtifact>false</useProjectArtifact>
+      <excludes>
+        <exclude>org.apache.ant:*:jar</exclude>
+        <exclude>org.apache.hadoop:hadoop-*:jar</exclude>
+        <exclude>jdiff:jdiff:jar</exclude>
+      </excludes>
+    </dependencySet>
+  </dependencySets>
+</assembly>
diff --git a/hadoop-common/BUILDING.txt b/hadoop-common/BUILDING.txt
new file mode 100644
index 0000000000..2f122ddf76
--- /dev/null
+++ b/hadoop-common/BUILDING.txt
@@ -0,0 +1,61 @@
+----------------------------------------------------------------------------------
+Requirements:
+
+* Unix System
+* JDK 1.6
+* Maven 3.0
+* Forrest 0.8 (if generating docs)
+* Findbugs 1.3.9 (if running findbugs)
+* Autotools (if compiling native code)
+* Internet connection for first build (to fetch all Maven and Hadoop dependencies)
+
+----------------------------------------------------------------------------------
+Maven modules:
+
+  hadoop                      (Main Hadoop project)
+         - hadoop-project     (Parent POM for all Hadoop Maven modules.             )
+                              (All plugins & dependencies versions are defined here.)
+         - hadoop-annotations (Generates the Hadoop doclet used to generated the Javadocs)
+         - hadoop-common      (Hadoop common)
+
+----------------------------------------------------------------------------------
+Where to run Maven from?
+
+  It can be run from any module. The only catch is that if not run from utrunk
+  all modules that are not part of the build run must be installed in the local
+  Maven cache or available in a Maven repository.
+
+----------------------------------------------------------------------------------
+Maven build goals:
+
+ * Clean                     : mvn clean
+ * Compile                   : mvn compile [-Pnative]
+ * Run tests                 : mvn test [-Pnative]
+ * Create JAR                : mvn package
+ * Run findbugs              : mvn compile findbugs:findbugs
+ * Run checkstyle            : mvn compile checkstyle:checkstyle
+ * Install JAR in M2 cache   : mvn install
+ * Deploy JAR to Maven repo  : mvn deploy
+ * Run clover                : mvn test -Pclover [-DcloverLicenseLocation=${user.name}/.clover.license]
+ * Run Rat                   : mvn apache-rat:check
+ * Build javadocs            : mvn javadoc:javadoc
+ * Build TAR                 : mvn package [-Ptar][-Pbintar][-Pdocs][-Psrc][-Pnative]
+
+ Build options:
+
+  * Use -Pnative to compile/bundle native code
+  * Use -Dsnappy.prefix=(/usr/local) & -Dbundle.snappy=(false) to compile
+    Snappy JNI bindings and to bundle Snappy SO files
+  * Use -Pdocs to generate & bundle the documentation in the TAR (using -Ptar)
+  * Use -Psrc to bundle the source in the TAR (using -Ptar)
+
+   Tests options:
+
+  * Use -DskipTests to skip tests when running the following Maven goals:
+    'package',  'install', 'deploy' or 'verify'
+  * -Dtest=<TESTCLASSNAME>,....
+  * -Dtest.exclude=<TESTCLASSNAME>
+  * -Dtest.exclude.pattern=**/<TESTCLASSNAME1>.java,**/<TESTCLASSNAME2>.java
+
+
+----------------------------------------------------------------------------------
diff --git a/common/CHANGES.txt b/hadoop-common/CHANGES.txt
similarity index 99%
rename from common/CHANGES.txt
rename to hadoop-common/CHANGES.txt
index 5df8eeefa0..c499c750f0 100644
--- a/common/CHANGES.txt
+++ b/hadoop-common/CHANGES.txt
@@ -296,7 +296,19 @@ Trunk (unreleased changes)
 
     HADOOP-7491. hadoop command should respect HADOOP_OPTS when given
     a class name. (eli)
-    
+
+    HADOOP-7178. Add a parameter, useRawLocalFileSystem, to copyToLocalFile(..)
+    in FileSystem.  (Uma Maheswara Rao G via szetszwo)
+
+    HADOOP-6671. Use maven for hadoop common builds. (Alejandro Abdelnur
+    via tomwhite)
+
+    HADOOP-7502. Make generated sources IDE friendly.
+    (Alejandro Abdelnur via llu)
+
+    HADOOP-7501. Publish Hadoop Common artifacts (post HADOOP-6671) to Apache
+    SNAPSHOTs repo. (Alejandro Abdelnur via tomwhite)
+
   OPTIMIZATIONS
   
     HADOOP-7333. Performance improvement in PureJavaCrc32. (Eric Caspole
@@ -437,6 +449,9 @@ Trunk (unreleased changes)
     HADOOP-7468 hadoop-core JAR contains a log4j.properties file.
     (Jolly Chen)
 
+    HADOOP-7508. Compiled nativelib is in wrong directory and it is not picked
+    up by surefire setup. (Alejandro Abdelnur via tomwhite)
+
 Release 0.22.0 - Unreleased
 
   INCOMPATIBLE CHANGES
diff --git a/common/LICENSE.txt b/hadoop-common/LICENSE.txt
similarity index 100%
rename from common/LICENSE.txt
rename to hadoop-common/LICENSE.txt
diff --git a/common/NOTICE.txt b/hadoop-common/NOTICE.txt
similarity index 100%
rename from common/NOTICE.txt
rename to hadoop-common/NOTICE.txt
diff --git a/common/README.txt b/hadoop-common/README.txt
similarity index 100%
rename from common/README.txt
rename to hadoop-common/README.txt
diff --git a/common/src/test/checkstyle.xml b/hadoop-common/dev-support/checkstyle.xml
similarity index 98%
rename from common/src/test/checkstyle.xml
rename to hadoop-common/dev-support/checkstyle.xml
index 24e2aa25bf..ad70bee176 100644
--- a/common/src/test/checkstyle.xml
+++ b/hadoop-common/dev-support/checkstyle.xml
@@ -51,7 +51,7 @@
 
     <!-- Checks that a package.html file exists for each package.     -->
     <!-- See http://checkstyle.sf.net/config_javadoc.html#PackageHtml -->
-    <module name="PackageHtml"/>
+    <module name="JavadocPackage"/>
 
     <!-- Checks whether files end with a new line.                        -->
     <!-- See http://checkstyle.sf.net/config_misc.html#NewlineAtEndOfFile -->
@@ -61,6 +61,8 @@
     <!-- See http://checkstyle.sf.net/config_misc.html#Translation -->
     <module name="Translation"/>
 
+    <module name="FileLength"/>
+    <module name="FileTabCharacter"/>
 
     <module name="TreeWalker">
 
@@ -112,7 +114,6 @@
 
         <!-- Checks for Size Violations.                    -->
         <!-- See http://checkstyle.sf.net/config_sizes.html -->
-        <module name="FileLength"/>
         <module name="LineLength"/>
         <module name="MethodLength"/>
         <module name="ParameterNumber"/>
@@ -126,7 +127,6 @@
         <module name="NoWhitespaceBefore"/>
         <module name="ParenPad"/>
         <module name="TypecastParenPad"/>
-        <module name="TabCharacter"/>
         <module name="WhitespaceAfter">
 	    	<property name="tokens" value="COMMA, SEMI"/>
 		</module>
diff --git a/common/src/test/findbugsExcludeFile.xml b/hadoop-common/dev-support/findbugsExcludeFile.xml
similarity index 100%
rename from common/src/test/findbugsExcludeFile.xml
rename to hadoop-common/dev-support/findbugsExcludeFile.xml
diff --git a/common/lib/jdiff/hadoop-core_0.20.0.xml b/hadoop-common/dev-support/jdiff/hadoop-core_0.20.0.xml
similarity index 100%
rename from common/lib/jdiff/hadoop-core_0.20.0.xml
rename to hadoop-common/dev-support/jdiff/hadoop-core_0.20.0.xml
diff --git a/common/lib/jdiff/hadoop-core_0.21.0.xml b/hadoop-common/dev-support/jdiff/hadoop-core_0.21.0.xml
similarity index 100%
rename from common/lib/jdiff/hadoop-core_0.21.0.xml
rename to hadoop-common/dev-support/jdiff/hadoop-core_0.21.0.xml
diff --git a/common/lib/jdiff/hadoop_0.17.0.xml b/hadoop-common/dev-support/jdiff/hadoop_0.17.0.xml
similarity index 100%
rename from common/lib/jdiff/hadoop_0.17.0.xml
rename to hadoop-common/dev-support/jdiff/hadoop_0.17.0.xml
diff --git a/common/lib/jdiff/hadoop_0.18.1.xml b/hadoop-common/dev-support/jdiff/hadoop_0.18.1.xml
similarity index 100%
rename from common/lib/jdiff/hadoop_0.18.1.xml
rename to hadoop-common/dev-support/jdiff/hadoop_0.18.1.xml
diff --git a/common/lib/jdiff/hadoop_0.18.2.xml b/hadoop-common/dev-support/jdiff/hadoop_0.18.2.xml
similarity index 100%
rename from common/lib/jdiff/hadoop_0.18.2.xml
rename to hadoop-common/dev-support/jdiff/hadoop_0.18.2.xml
diff --git a/common/lib/jdiff/hadoop_0.18.3.xml b/hadoop-common/dev-support/jdiff/hadoop_0.18.3.xml
similarity index 100%
rename from common/lib/jdiff/hadoop_0.18.3.xml
rename to hadoop-common/dev-support/jdiff/hadoop_0.18.3.xml
diff --git a/common/lib/jdiff/hadoop_0.19.0.xml b/hadoop-common/dev-support/jdiff/hadoop_0.19.0.xml
similarity index 100%
rename from common/lib/jdiff/hadoop_0.19.0.xml
rename to hadoop-common/dev-support/jdiff/hadoop_0.19.0.xml
diff --git a/common/lib/jdiff/hadoop_0.19.1.xml b/hadoop-common/dev-support/jdiff/hadoop_0.19.1.xml
similarity index 100%
rename from common/lib/jdiff/hadoop_0.19.1.xml
rename to hadoop-common/dev-support/jdiff/hadoop_0.19.1.xml
diff --git a/common/lib/jdiff/hadoop_0.19.2.xml b/hadoop-common/dev-support/jdiff/hadoop_0.19.2.xml
similarity index 100%
rename from common/lib/jdiff/hadoop_0.19.2.xml
rename to hadoop-common/dev-support/jdiff/hadoop_0.19.2.xml
diff --git a/common/lib/jdiff/hadoop_0.20.0.xml b/hadoop-common/dev-support/jdiff/hadoop_0.20.0.xml
similarity index 100%
rename from common/lib/jdiff/hadoop_0.20.0.xml
rename to hadoop-common/dev-support/jdiff/hadoop_0.20.0.xml
diff --git a/common/lib/jdiff/hadoop_0.20.1.xml b/hadoop-common/dev-support/jdiff/hadoop_0.20.1.xml
similarity index 100%
rename from common/lib/jdiff/hadoop_0.20.1.xml
rename to hadoop-common/dev-support/jdiff/hadoop_0.20.1.xml
diff --git a/common/lib/jdiff/hadoop_0.20.2.xml b/hadoop-common/dev-support/jdiff/hadoop_0.20.2.xml
similarity index 100%
rename from common/lib/jdiff/hadoop_0.20.2.xml
rename to hadoop-common/dev-support/jdiff/hadoop_0.20.2.xml
diff --git a/common/src/saveVersion.sh b/hadoop-common/dev-support/saveVersion.sh
similarity index 88%
rename from common/src/saveVersion.sh
rename to hadoop-common/dev-support/saveVersion.sh
index 93ce7ecdb6..d11a4cf75c 100755
--- a/common/src/saveVersion.sh
+++ b/hadoop-common/dev-support/saveVersion.sh
@@ -43,14 +43,20 @@ else
   branch="Unknown"
   url="file://$cwd"
 fi
-srcChecksum=`find src -name '*.java' | LC_ALL=C sort | xargs md5sum | md5sum | cut -d ' ' -f 1`
 
-mkdir -p $build_dir/src/org/apache/hadoop
+which md5sum > /dev/null
+if [ "$?" = "0" ] ; then
+  srcChecksum=`find src/main/java -name '*.java' | LC_ALL=C sort | xargs md5sum | md5sum | cut -d ' ' -f 1`
+else
+  srcChecksum="Not Available"
+fi
+
+mkdir -p $build_dir/org/apache/hadoop
 cat << EOF | \
   sed -e "s/VERSION/$version/" -e "s/USER/$user/" -e "s/DATE/$date/" \
       -e "s|URL|$url|" -e "s/REV/$revision/" \
       -e "s|BRANCH|$branch|" -e "s/SRCCHECKSUM/$srcChecksum/" \
-      > $build_dir/src/org/apache/hadoop/package-info.java
+      > $build_dir/org/apache/hadoop/package-info.java
 /*
  * Generated by src/saveVersion.sh
  */
diff --git a/hadoop-common/pom.xml b/hadoop-common/pom.xml
new file mode 100644
index 0000000000..d5635b0c8e
--- /dev/null
+++ b/hadoop-common/pom.xml
@@ -0,0 +1,1019 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License. See accompanying LICENSE file.
+-->
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.hadoop</groupId>
+    <artifactId>hadoop-project</artifactId>
+    <version>0.23.0-SNAPSHOT</version>
+    <relativePath>../hadoop-project</relativePath>
+  </parent>
+  <groupId>org.apache.hadoop</groupId>
+  <artifactId>hadoop-common</artifactId>
+  <version>0.23.0-SNAPSHOT</version>
+  <description>Apache Hadoop Common</description>
+  <name>Apache Hadoop Common</name>
+  <packaging>jar</packaging>
+
+  <properties>
+    <test.build.data>${project.build.directory}/test/data</test.build.data>
+    <hadoop.log.dir>${project.build.directory}/log</hadoop.log.dir>
+    <test.build.webapps>${project.build.directory}/test-classes/webapps</test.build.webapps>
+    <test.cache.data>${project.build.directory}/test-classes</test.cache.data>
+    <test.build.classes>${project.build.directory}/test-classes</test.build.classes>
+
+    <build.platform>${os.name}-${os.arch}-${sun.arch.data.model}</build.platform>
+    <snappy.prefix>/usr/local</snappy.prefix>
+    <snappy.lib>${snappy.prefix}/lib</snappy.lib>
+    <bundle.snappy>false</bundle.snappy>
+    
+    <hadoop.component>common</hadoop.component>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-annotations</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-cli</groupId>
+      <artifactId>commons-cli</artifactId>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-math</artifactId>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>xmlenc</groupId>
+      <artifactId>xmlenc</artifactId>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-httpclient</groupId>
+      <artifactId>commons-httpclient</artifactId>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-codec</groupId>
+      <artifactId>commons-codec</artifactId>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-net</groupId>
+      <artifactId>commons-net</artifactId>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mortbay.jetty</groupId>
+      <artifactId>jetty</artifactId>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mortbay.jetty</groupId>
+      <artifactId>jetty-util</artifactId>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>tomcat</groupId>
+      <artifactId>jasper-compiler</artifactId>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>tomcat</groupId>
+      <artifactId>jasper-runtime</artifactId>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet.jsp</groupId>
+      <artifactId>jsp-api</artifactId>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-el</groupId>
+      <artifactId>commons-el</artifactId>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging-api</artifactId>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>net.java.dev.jets3t</groupId>
+      <artifactId>jets3t</artifactId>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.mina</groupId>
+      <artifactId>mina-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.ftpserver</groupId>
+      <artifactId>ftplet-api</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.ftpserver</groupId>
+      <artifactId>ftpserver-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.ftpserver</groupId>
+      <artifactId>ftpserver-deprecated</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-collections</groupId>
+      <artifactId>commons-collections</artifactId>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-configuration</groupId>
+      <artifactId>commons-configuration</artifactId>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>hsqldb</groupId>
+      <artifactId>hsqldb</artifactId>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jdt</groupId>
+      <artifactId>core</artifactId>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>oro</groupId>
+      <artifactId>oro</artifactId>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.jackson</groupId>
+      <artifactId>jackson-mapper-asl</artifactId>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>aspectjrt</artifactId>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-all</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>avro</artifactId>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>net.sf.kosmosfs</groupId>
+      <artifactId>kfs</artifactId>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.ant</groupId>
+      <artifactId>ant</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.protobuf</groupId>
+      <artifactId>protobuf-java</artifactId>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <forkMode>always</forkMode>
+          <forkedProcessTimeoutInSeconds>600</forkedProcessTimeoutInSeconds>
+          <argLine>-Xmx1024m</argLine>
+          <environmentVariables>
+            <LD_LIBRARY_PATH>${env.LD_LIBRARY_PATH}:${project.build.directory}/native/target/usr/local/lib</LD_LIBRARY_PATH>
+          </environmentVariables>
+          <systemPropertyVariables>
+
+            <!-- TODO: all references in testcases should be updated to this default -->
+            <test.build.data>${test.build.data}</test.build.data>
+            <test.build.webapps>${test.build.webapps}</test.build.webapps>
+            <test.cache.data>${test.cache.data}</test.cache.data>
+            <hadoop.log.dir>${hadoop.log.dir}</hadoop.log.dir>
+            <test.build.classes>${test.build.classes}</test.build.classes>
+
+            <java.net.preferIPv4Stack>true</java.net.preferIPv4Stack>
+            <java.security.krb5.conf>${basedir}/src/test/resources/krb5.conf</java.security.krb5.conf>
+          </systemPropertyVariables>
+          <includes>
+            <include>**/Test*.java</include>
+          </includes>
+          <excludes>
+            <exclude>**/${test.exclude}.java</exclude>
+            <exclude>${test.exclude.pattern}</exclude>
+            <exclude>**/Test*$*.java</exclude>
+          </excludes>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>prepare-package</phase>
+            <goals>
+              <goal>jar</goal>
+              <goal>test-jar</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-source-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>prepare-package</phase>
+            <goals>
+              <goal>jar</goal>
+              <goal>test-jar</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <attach>true</attach>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>findbugs-maven-plugin</artifactId>
+        <configuration>
+          <excludeFilterFile>${basedir}/dev-support/findbugsExcludeFile.xml</excludeFilterFile>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>save-version</id>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <target>
+                <mkdir dir="${project.build.directory}/generated-sources/java"/>
+                <exec executable="sh">
+                  <arg
+                      line="${basedir}/dev-support/saveVersion.sh ${project.version} ${project.build.directory}/generated-sources/java"/>
+                </exec>
+              </target>
+            </configuration>
+          </execution>
+          <execution>
+            <id>generate-test-sources</id>
+            <phase>generate-test-sources</phase>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <target>
+
+                <mkdir dir="${project.build.directory}/generated-test-sources/java"/>
+
+                <taskdef name="recordcc" classname="org.apache.hadoop.record.compiler.ant.RccTask">
+                  <classpath refid="maven.compile.classpath"/>
+                </taskdef>
+                <recordcc destdir="${project.build.directory}/generated-test-sources/java">
+                  <fileset dir="${basedir}/src/test/ddl" includes="**/*.jr"/>
+                </recordcc>
+
+                <taskdef name="schema" classname="org.apache.avro.specific.SchemaTask">
+                  <classpath refid="maven.test.classpath"/>
+                </taskdef>
+                <schema destdir="${project.build.directory}/generated-test-sources/java">
+                  <fileset dir="${basedir}/src/test">
+                    <include name="**/*.avsc"/>
+                  </fileset>
+                </schema>
+
+                <taskdef name="schema" classname="org.apache.avro.specific.ProtocolTask">
+                  <classpath refid="maven.test.classpath"/>
+                </taskdef>
+                <schema destdir="${project.build.directory}/generated-test-sources/java">
+                  <fileset dir="${basedir}/src/test">
+                    <include name="**/*.avpr"/>
+                  </fileset>
+                </schema>
+              </target>
+            </configuration>
+          </execution>
+          <execution>
+            <id>create-log-dir</id>
+            <phase>process-test-resources</phase>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <target>
+                <!--
+                TODO: there are tests (TestLocalFileSystem#testCopy) that fail if data
+                TODO: from a previous run is present
+                -->
+                <delete dir="${test.build.data}"/>
+                <mkdir dir="${hadoop.log.dir}"/>
+
+                <copy toDir="${project.build.directory}/test-classes">
+                  <fileset dir="${basedir}/src/main/conf"/>
+                </copy>
+              </target>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>add-source</id>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>add-source</goal>
+            </goals>
+            <configuration>
+              <sources>
+                <source>${project.build.directory}/generated-sources/java</source>
+              </sources>
+            </configuration>
+          </execution>
+          <execution>
+            <id>add-test-source</id>
+            <phase>generate-test-sources</phase>
+            <goals>
+              <goal>add-test-source</goal>
+            </goals>
+            <configuration>
+              <sources>
+                <source>${project.build.directory}/generated-test-sources/java</source>
+              </sources>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-checkstyle-plugin</artifactId>
+        <configuration>
+          <configLocation>file://${basedir}/dev-support/checkstyle.xml</configLocation>
+          <failOnViolation>false</failOnViolation>
+          <format>xml</format>
+          <format>html</format>
+          <outputFile>${project.build.directory}/test/checkstyle-errors.xml</outputFile>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.rat</groupId>
+        <artifactId>apache-rat-plugin</artifactId>
+        <configuration>
+          <excludes>
+            <exclude>CHANGES.txt</exclude>
+            <exclude>.idea/**</exclude>
+            <exclude>src/main/conf/*</exclude>
+            <exclude>src/main/docs/**</exclude>
+            <exclude>dev-support/jdiff/**</exclude>
+            <exclude>src/main/native/*</exclude>
+            <exclude>src/main/native/config/*</exclude>
+            <exclude>src/main/resources/META-INF/services/org.apache.hadoop.security.SecurityInfo</exclude>
+            <exclude>src/main/native/m4/*</exclude>
+            <exclude>src/test/empty-file</exclude>
+            <exclude>src/test/all-tests</exclude>
+          </excludes>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <configuration>
+          <linksource>true</linksource>
+          <quiet>true</quiet>
+          <verbose>false</verbose>
+          <source>${maven.compile.source}</source>
+          <charset>${maven.compile.encoding}</charset>
+          <reportOutputDirectory>${project.build.directory}/site</reportOutputDirectory>
+          <destDir>api</destDir>
+          <groups>
+            <group>
+              <title>${project.name} API</title>
+              <packages>org.apache.hadoop*</packages>
+            </group>
+          </groups>
+          <doclet>org.apache.hadoop.classification.tools.ExcludePrivateAnnotationsStandardDoclet</doclet>
+          <docletArtifacts>
+            <docletArtifact>
+              <groupId>org.apache.hadoop</groupId>
+              <artifactId>hadoop-annotations</artifactId>
+              <version>${project.version}</version>
+            </docletArtifact>
+          </docletArtifacts>
+          <useStandardDocletOptions>true</useStandardDocletOptions>
+
+          <!-- switch on dependency-driven aggregation -->
+          <includeDependencySources>true</includeDependencySources>
+
+          <dependencySourceIncludes>
+            <!-- include ONLY dependencies I control -->
+            <dependencySourceInclude>org.apache.hadoop:hadoop-annotations</dependencySourceInclude>
+          </dependencySourceIncludes>
+
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+  <profiles>
+    <profile>
+      <id>native</id>
+      <activation>
+        <activeByDefault>false</activeByDefault>
+      </activation>
+      <properties>
+        <snappy.prefix>/usr/local</snappy.prefix>
+        <snappy.lib>${snappy.prefix}/lib</snappy.lib>
+        <snappy.include>${snappy.prefix}/include</snappy.include>
+      </properties>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>compile</id>
+                <phase>compile</phase>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+                <configuration>
+                  <target>
+                    <mkdir dir="${project.build.directory}/native/javah"/>
+                    <copy toDir="${project.build.directory}/native">
+                      <fileset dir="${basedir}/src/main/native"/>
+                    </copy>
+                    <mkdir dir="${project.build.directory}/native/m4"/>
+                  </target>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>native-maven-plugin</artifactId>
+            <executions>
+              <execution>
+                <phase>compile</phase>
+                <goals>
+                  <goal>javah</goal>
+                </goals>
+                <configuration>
+                  <javahPath>${env.JAVA_HOME}/bin/javah</javahPath>
+                  <javahClassNames>
+                    <javahClassName>org.apache.hadoop.io.compress.zlib.ZlibCompressor</javahClassName>
+                    <javahClassName>org.apache.hadoop.io.compress.zlib.ZlibDecompressor</javahClassName>
+                    <javahClassName>org.apache.hadoop.security.JniBasedUnixGroupsMapping</javahClassName>
+                    <javahClassName>org.apache.hadoop.io.nativeio.NativeIO</javahClassName>
+                    <javahClassName>org.apache.hadoop.security.JniBasedUnixGroupsNetgroupMapping</javahClassName>
+                    <javahClassName>org.apache.hadoop.io.compress.snappy.SnappyCompressor</javahClassName>
+                    <javahClassName>org.apache.hadoop.io.compress.snappy.SnappyDecompressor</javahClassName>
+                  </javahClassNames>
+                  <javahOutputDirectory>${project.build.directory}/native/javah</javahOutputDirectory>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>make-maven-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>compile</id>
+                <phase>compile</phase>
+                <goals>
+                  <goal>autoreconf</goal>
+                  <goal>configure</goal>
+                  <goal>make-install</goal>
+                </goals>
+              </execution>
+            </executions>
+            <configuration>
+              <!-- autoreconf settings -->
+              <workDir>${project.build.directory}/native</workDir>
+              <arguments>
+                <argument>-i</argument>
+                <argument>-f</argument>
+              </arguments>
+
+              <!-- configure settings -->
+              <configureEnvironment>
+                <property>
+                  <name>OS_NAME</name>
+                  <value>${os.name}</value>
+                </property>
+                <property>
+                  <name>OS_ARCH</name>
+                  <value>${os.arch}</value>
+                </property>
+                <property>
+                  <name>JVM_DATA_MODEL</name>
+                  <value>${sun.arch.data.model}</value>
+                </property>
+              </configureEnvironment>
+              <configureOptions>
+                <configureOption>CPPFLAGS=-I${snappy.include}</configureOption>
+                <configureOption>LDFLAGS=-L${snappy.lib}</configureOption>
+              </configureOptions>
+              <configureWorkDir>${project.build.directory}/native</configureWorkDir>
+              <prefix>/usr/local</prefix>
+
+              <!-- make settings -->
+              <installEnvironment>
+                <property>
+                  <name>OS_NAME</name>
+                  <value>${os.name}</value>
+                </property>
+                <property>
+                  <name>OS_ARCH</name>
+                  <value>${os.arch}</value>
+                </property>
+                <property>
+                  <name>JVM_DATA_MODEL</name>
+                  <value>${sun.arch.data.model}</value>
+                </property>
+                <property>
+                  <name>HADOOP_NATIVE_SRCDIR</name>
+                  <value>${project.build.directory}/native</value>
+                </property>
+              </installEnvironment>
+
+              <!-- configure & make settings -->
+              <destDir>${project.build.directory}/native/target</destDir>
+
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+
+    <profile>
+      <id>docs</id>
+      <activation>
+        <activeByDefault>false</activeByDefault>
+      </activation>
+      <properties>
+        <jdiff.stable.api>0.20.2</jdiff.stable.api>
+        <jdiff.stability>-unstable</jdiff.stability>
+        <jdiff.compatibility></jdiff.compatibility>
+        <jdiff.javadoc.maxmemory>512m</jdiff.javadoc.maxmemory>
+      </properties>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-javadoc-plugin</artifactId>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>javadoc</goal>
+                </goals>
+                <phase>prepare-package</phase>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>findbugs-maven-plugin</artifactId>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>findbugs</goal>
+                </goals>
+                <phase>prepare-package</phase>
+              </execution>
+            </executions>
+            <configuration>
+              <excludeFilterFile>${basedir}/dev-support/findbugsExcludeFile.xml</excludeFilterFile>
+            </configuration>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-dependency-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>site</id>
+                <phase>prepare-package</phase>
+                <goals>
+                  <goal>copy</goal>
+                </goals>
+                <configuration>
+                  <artifactItems>
+                    <artifactItem>
+                      <groupId>jdiff</groupId>
+                      <artifactId>jdiff</artifactId>
+                      <version>${jdiff.version}</version>
+                      <overWrite>false</overWrite>
+                      <outputDirectory>${project.build.directory}</outputDirectory>
+                      <destFileName>jdiff.jar</destFileName>
+                    </artifactItem>
+                    <artifactItem>
+                      <groupId>org.apache.hadoop</groupId>
+                      <artifactId>hadoop-annotations</artifactId>
+                      <version>${hadoop.annotations.version}</version>
+                      <overWrite>false</overWrite>
+                      <outputDirectory>${project.build.directory}</outputDirectory>
+                      <destFileName>hadoop-annotations.jar</destFileName>
+                    </artifactItem>
+                  </artifactItems>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>site</id>
+                <phase>prepare-package</phase>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+                <configuration>
+                  <target>
+
+                    <mkdir dir="${project.build.directory}/docs-src"/>
+
+                    <copy todir="${project.build.directory}/docs-src">
+                      <fileset dir="${basedir}/src/main/docs"/>
+                    </copy>
+
+                    <!-- Docs -->
+                    <exec dir="${project.build.directory}/docs-src"
+                          executable="${env.FORREST_HOME}/bin/forrest"
+                          failonerror="true">
+                    </exec>
+                    <copy todir="${project.build.directory}/site">
+                      <fileset dir="${project.build.directory}/docs-src/build/site"/>
+                    </copy>
+                    <copy file="${project.build.directory}/docs-src/releasenotes.html"
+                          todir="${project.build.directory}/site"/>
+                    <style basedir="${basedir}/src/main/resources"
+                           destdir="${project.build.directory}/site"
+                           includes="core-default.xml"
+                           style="${basedir}/src/main/xsl/configuration.xsl"/>
+
+                    <!-- Convert 'CHANGES.txt' to 'changes.html" -->
+                    <exec executable="perl" input="${basedir}/../CHANGES.txt"
+                          output="${project.build.directory}/site/changes.html"
+                          failonerror="true">
+                      <arg value="${project.build.directory}/docs-src/changes/changes2html.pl"/>
+                    </exec>
+                    <copy todir="${project.build.directory}/site">
+                      <fileset dir="${project.build.directory}/docs-src/changes" includes="*.css"/>
+                    </copy>
+
+                    <!-- Jdiff -->
+                    <mkdir dir="${project.build.directory}/site/jdiff/xml"/>
+
+                    <javadoc maxmemory="${jdiff.javadoc.maxmemory}" verbose="yes">
+                      <doclet name="org.apache.hadoop.classification.tools.ExcludePrivateAnnotationsJDiffDoclet"
+                              path="${project.build.directory}/hadoop-annotations.jar:${project.build.directory}/jdiff.jar">
+                        <param name="-apidir" value="${project.build.directory}/site/jdiff/xml"/>
+                        <param name="-apiname" value="hadoop-core ${project.version}"/>
+                        <param name="${jdiff.stability}"/>
+                      </doclet>
+                      <packageset dir="${basedir}/src/main/java"/>
+                      <classpath>
+                        <path refid="maven.compile.classpath"/>
+                      </classpath>
+                    </javadoc>
+                    <javadoc sourcepath="${basedir}/src/main/java"
+                             destdir="${project.build.directory}/site/jdiff/xml"
+                             sourceFiles="${basedir}/dev-support/jdiff/Null.java"
+                             maxmemory="${jdiff.javadoc.maxmemory}">
+                      <doclet name="org.apache.hadoop.classification.tools.ExcludePrivateAnnotationsJDiffDoclet"
+                              path="${project.build.directory}/hadoop-annotations.jar:${project.build.directory}/jdiff.jar">
+                        <param name="-oldapi" value="hadoop-core ${jdiff.stable.api}"/>
+                        <param name="-newapi" value="hadoop-core ${project.version}"/>
+                        <param name="-oldapidir" value="${basedir}/dev-support/jdiff"/>
+                        <param name="-newapidir" value="${project.build.directory}/site/jdiff/xml"/>
+                        <param name="-javadocold"
+                               value="http://hadoop.apache.org/docs/${jdiff.stable.api}/api/"/>
+                        <param name="-javadocnew" value="${project.build.directory}/site/api"/>
+                        <param name="-stats"/>
+                        <param name="${jdiff.stability}"/>
+                        <param name="${jdiff.compatibility}"/>
+                      </doclet>
+                      <classpath>
+                        <path refid="maven.compile.classpath"/>
+                      </classpath>
+                    </javadoc>
+
+                    <xslt style="${env.FINDBUGS_HOME}/src/xsl/default.xsl"
+                          in="${project.build.directory}/findbugsXml.xml"
+                          out="${project.build.directory}/site/findbugs.html"/>
+
+                  </target>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+
+    <profile>
+      <id>src</id>
+      <activation>
+        <activeByDefault>false</activeByDefault>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-assembly-plugin</artifactId>
+            <dependencies>
+              <dependency>
+                <groupId>org.apache.hadoop</groupId>
+                <artifactId>hadoop-assemblies</artifactId>
+                <version>${hadoop.assemblies.version}</version>
+              </dependency>
+            </dependencies>
+            <executions>
+              <execution>
+                <id>pre-tar-src</id>
+                <phase>prepare-package</phase>
+                <goals>
+                  <goal>single</goal>
+                </goals>
+                <configuration>
+                  <appendAssemblyId>false</appendAssemblyId>
+                  <attach>false</attach>
+                  <finalName>${project.artifactId}-${project.version}</finalName>
+                  <descriptorRefs>
+                    <descriptorRef>hadoop-src</descriptorRef>
+                  </descriptorRefs>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+
+    <profile>
+      <id>tar</id>
+      <activation>
+        <activeByDefault>false</activeByDefault>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>pre-tar</id>
+                <phase>prepare-package</phase>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+                <configuration>
+                  <target>
+                    <!-- Using Unix script to preserve symlinks -->
+                    <echo file="${project.build.directory}/tar-copynativelibs.sh">
+
+                      TAR='tar cf -'
+                      UNTAR='tar xfBp -'
+                      LIB_DIR="${project.build.directory}/native/target/usr/local/lib"
+                      if [ -d $${LIB_DIR} ] ; then
+                      TARGET_DIR="${project.build.directory}/${project.artifactId}-${project.version}/lib/native/${build.platform}"
+                      mkdir -p $${TARGET_DIR}
+                      cd $${LIB_DIR}
+                      $$TAR *hadoop* | (cd $${TARGET_DIR}/; $$UNTAR)
+                      if [ "${bundle.snappy}" = "true" ] ; then
+                      cd ${snappy.lib}
+                      $$TAR *snappy* | (cd $${TARGET_DIR}/; $$UNTAR)
+                      fi
+                      fi
+                    </echo>
+                    <exec executable="sh" dir="${project.build.directory}" failonerror="true">
+                      <arg line="./tar-copynativelibs.sh"/>
+                    </exec>
+                  </target>
+                </configuration>
+              </execution>
+              <execution>
+                <id>tar</id>
+                <phase>package</phase>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+                <configuration>
+                  <target>
+                    <!-- Using Unix tar to preserve symlinks -->
+                    <exec executable="tar" dir="${project.build.directory}" failonerror="yes">
+                      <arg value="czf"/>
+                      <arg value="${project.build.directory}/${project.artifactId}-${project.version}.tar.gz"/>
+                      <arg value="${project.artifactId}-${project.version}"/>
+                    </exec>
+                  </target>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-assembly-plugin</artifactId>
+            <dependencies>
+              <dependency>
+                <groupId>org.apache.hadoop</groupId>
+                <artifactId>hadoop-assemblies</artifactId>
+                <version>${hadoop.assemblies.version}</version>
+              </dependency>
+            </dependencies>
+            <executions>
+              <execution>
+                <id>pre-tar</id>
+                <phase>prepare-package</phase>
+                <goals>
+                  <goal>single</goal>
+                </goals>
+                <configuration>
+                  <appendAssemblyId>false</appendAssemblyId>
+                  <attach>false</attach>
+                  <finalName>${project.artifactId}-${project.version}</finalName>
+                  <descriptorRefs>
+                    <descriptorRef>hadoop-tar</descriptorRef>
+                  </descriptorRefs>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+
+    <profile>
+      <id>bintar</id>
+      <activation>
+        <activeByDefault>false</activeByDefault>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>pre-bintar</id>
+                <phase>prepare-package</phase>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+                <configuration>
+                  <target>
+                    <!-- Using Unix script to preserve symlinks -->
+                    <echo file="${project.build.directory}/bintar-copynativelibs.sh">
+
+                      TAR='tar cf -'
+                      UNTAR='tar xfBp -'
+                      LIB_DIR="${project.build.directory}/native/target/usr/local/lib"
+                      if [ -d $${LIB_DIR} ] ; then
+                      TARGET_DIR="${project.build.directory}/${project.artifactId}-${project.version}-bin/lib"
+                      mkdir -p $${TARGET_DIR}
+                      cd $${LIB_DIR}
+                      $$TAR *hadoop* | (cd $${TARGET_DIR}/; $$UNTAR)
+                      if [ "${bundle.snappy}" = "true" ] ; then
+                      cd ${snappy.lib}
+                      $$TAR *snappy* | (cd $${TARGET_DIR}/; $$UNTAR)
+                      fi
+                      fi
+                    </echo>
+                    <exec executable="sh" dir="${project.build.directory}" failonerror="true">
+                      <arg line="./bintar-copynativelibs.sh"/>
+                    </exec>
+                  </target>
+                </configuration>
+              </execution>
+              <execution>
+                <id>bintar</id>
+                <phase>package</phase>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+                <configuration>
+                  <target>
+                    <!-- Using Unix tar to preserve symlinks -->
+                    <exec executable="tar" dir="${project.build.directory}" failonerror="yes">
+                      <arg value="czf"/>
+                      <arg value="${project.build.directory}/${project.artifactId}-${project.version}-bin.tar.gz"/>
+                      <arg value="${project.artifactId}-${project.version}-bin"/>
+                    </exec>
+                  </target>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-assembly-plugin</artifactId>
+            <dependencies>
+              <dependency>
+                <groupId>org.apache.hadoop</groupId>
+                <artifactId>hadoop-assemblies</artifactId>
+                <version>${hadoop.assemblies.version}</version>
+              </dependency>
+            </dependencies>
+            <executions>
+              <execution>
+                <id>pre-bintar</id>
+                <phase>prepare-package</phase>
+                <goals>
+                  <goal>single</goal>
+                </goals>
+                <configuration>
+                  <appendAssemblyId>false</appendAssemblyId>
+                  <attach>false</attach>
+                  <finalName>${project.artifactId}-${project.version}-bin</finalName>
+                  <descriptorRefs>
+                    <descriptorRef>hadoop-bintar</descriptorRef>
+                  </descriptorRefs>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+</project>
diff --git a/common/src/contrib/bash-tab-completion/README b/hadoop-common/src/contrib/bash-tab-completion/README
similarity index 100%
rename from common/src/contrib/bash-tab-completion/README
rename to hadoop-common/src/contrib/bash-tab-completion/README
diff --git a/common/src/contrib/bash-tab-completion/hadoop.sh b/hadoop-common/src/contrib/bash-tab-completion/hadoop.sh
similarity index 100%
rename from common/src/contrib/bash-tab-completion/hadoop.sh
rename to hadoop-common/src/contrib/bash-tab-completion/hadoop.sh
diff --git a/common/bin/hadoop b/hadoop-common/src/main/bin/hadoop
similarity index 100%
rename from common/bin/hadoop
rename to hadoop-common/src/main/bin/hadoop
diff --git a/common/bin/hadoop-config.sh b/hadoop-common/src/main/bin/hadoop-config.sh
similarity index 100%
rename from common/bin/hadoop-config.sh
rename to hadoop-common/src/main/bin/hadoop-config.sh
diff --git a/common/bin/hadoop-daemon.sh b/hadoop-common/src/main/bin/hadoop-daemon.sh
similarity index 100%
rename from common/bin/hadoop-daemon.sh
rename to hadoop-common/src/main/bin/hadoop-daemon.sh
diff --git a/common/bin/hadoop-daemons.sh b/hadoop-common/src/main/bin/hadoop-daemons.sh
similarity index 100%
rename from common/bin/hadoop-daemons.sh
rename to hadoop-common/src/main/bin/hadoop-daemons.sh
diff --git a/common/bin/rcc b/hadoop-common/src/main/bin/rcc
similarity index 100%
rename from common/bin/rcc
rename to hadoop-common/src/main/bin/rcc
diff --git a/common/bin/slaves.sh b/hadoop-common/src/main/bin/slaves.sh
similarity index 100%
rename from common/bin/slaves.sh
rename to hadoop-common/src/main/bin/slaves.sh
diff --git a/common/bin/start-all.sh b/hadoop-common/src/main/bin/start-all.sh
similarity index 100%
rename from common/bin/start-all.sh
rename to hadoop-common/src/main/bin/start-all.sh
diff --git a/common/bin/stop-all.sh b/hadoop-common/src/main/bin/stop-all.sh
similarity index 100%
rename from common/bin/stop-all.sh
rename to hadoop-common/src/main/bin/stop-all.sh
diff --git a/common/conf/hadoop-metrics.properties b/hadoop-common/src/main/conf/hadoop-metrics.properties
similarity index 100%
rename from common/conf/hadoop-metrics.properties
rename to hadoop-common/src/main/conf/hadoop-metrics.properties
diff --git a/common/conf/hadoop-metrics2.properties b/hadoop-common/src/main/conf/hadoop-metrics2.properties
similarity index 100%
rename from common/conf/hadoop-metrics2.properties
rename to hadoop-common/src/main/conf/hadoop-metrics2.properties
diff --git a/common/conf/log4j.properties b/hadoop-common/src/main/conf/log4j.properties
similarity index 100%
rename from common/conf/log4j.properties
rename to hadoop-common/src/main/conf/log4j.properties
diff --git a/common/conf/ssl-client.xml.example b/hadoop-common/src/main/conf/ssl-client.xml.example
similarity index 100%
rename from common/conf/ssl-client.xml.example
rename to hadoop-common/src/main/conf/ssl-client.xml.example
diff --git a/common/conf/ssl-server.xml.example b/hadoop-common/src/main/conf/ssl-server.xml.example
similarity index 100%
rename from common/conf/ssl-server.xml.example
rename to hadoop-common/src/main/conf/ssl-server.xml.example
diff --git a/common/src/docs/changes/ChangesFancyStyle.css b/hadoop-common/src/main/docs/changes/ChangesFancyStyle.css
similarity index 100%
rename from common/src/docs/changes/ChangesFancyStyle.css
rename to hadoop-common/src/main/docs/changes/ChangesFancyStyle.css
diff --git a/common/src/docs/changes/ChangesSimpleStyle.css b/hadoop-common/src/main/docs/changes/ChangesSimpleStyle.css
similarity index 100%
rename from common/src/docs/changes/ChangesSimpleStyle.css
rename to hadoop-common/src/main/docs/changes/ChangesSimpleStyle.css
diff --git a/common/src/docs/changes/changes2html.pl b/hadoop-common/src/main/docs/changes/changes2html.pl
similarity index 100%
rename from common/src/docs/changes/changes2html.pl
rename to hadoop-common/src/main/docs/changes/changes2html.pl
diff --git a/common/src/docs/forrest.properties b/hadoop-common/src/main/docs/forrest.properties
similarity index 100%
rename from common/src/docs/forrest.properties
rename to hadoop-common/src/main/docs/forrest.properties
diff --git a/common/src/docs/releasenotes.html b/hadoop-common/src/main/docs/releasenotes.html
similarity index 100%
rename from common/src/docs/releasenotes.html
rename to hadoop-common/src/main/docs/releasenotes.html
diff --git a/common/src/docs/src/documentation/README.txt b/hadoop-common/src/main/docs/src/documentation/README.txt
similarity index 100%
rename from common/src/docs/src/documentation/README.txt
rename to hadoop-common/src/main/docs/src/documentation/README.txt
diff --git a/common/src/docs/src/documentation/classes/CatalogManager.properties b/hadoop-common/src/main/docs/src/documentation/classes/CatalogManager.properties
similarity index 100%
rename from common/src/docs/src/documentation/classes/CatalogManager.properties
rename to hadoop-common/src/main/docs/src/documentation/classes/CatalogManager.properties
diff --git a/common/src/docs/src/documentation/conf/cli.xconf b/hadoop-common/src/main/docs/src/documentation/conf/cli.xconf
similarity index 100%
rename from common/src/docs/src/documentation/conf/cli.xconf
rename to hadoop-common/src/main/docs/src/documentation/conf/cli.xconf
diff --git a/common/src/docs/src/documentation/content/xdocs/Superusers.xml b/hadoop-common/src/main/docs/src/documentation/content/xdocs/Superusers.xml
similarity index 100%
rename from common/src/docs/src/documentation/content/xdocs/Superusers.xml
rename to hadoop-common/src/main/docs/src/documentation/content/xdocs/Superusers.xml
diff --git a/common/src/docs/src/documentation/content/xdocs/cluster_setup.xml b/hadoop-common/src/main/docs/src/documentation/content/xdocs/cluster_setup.xml
similarity index 100%
rename from common/src/docs/src/documentation/content/xdocs/cluster_setup.xml
rename to hadoop-common/src/main/docs/src/documentation/content/xdocs/cluster_setup.xml
diff --git a/common/src/docs/src/documentation/content/xdocs/commands_manual.xml b/hadoop-common/src/main/docs/src/documentation/content/xdocs/commands_manual.xml
similarity index 100%
rename from common/src/docs/src/documentation/content/xdocs/commands_manual.xml
rename to hadoop-common/src/main/docs/src/documentation/content/xdocs/commands_manual.xml
diff --git a/common/src/docs/src/documentation/content/xdocs/deployment_layout.xml b/hadoop-common/src/main/docs/src/documentation/content/xdocs/deployment_layout.xml
similarity index 100%
rename from common/src/docs/src/documentation/content/xdocs/deployment_layout.xml
rename to hadoop-common/src/main/docs/src/documentation/content/xdocs/deployment_layout.xml
diff --git a/common/src/docs/src/documentation/content/xdocs/file_system_shell.xml b/hadoop-common/src/main/docs/src/documentation/content/xdocs/file_system_shell.xml
similarity index 100%
rename from common/src/docs/src/documentation/content/xdocs/file_system_shell.xml
rename to hadoop-common/src/main/docs/src/documentation/content/xdocs/file_system_shell.xml
diff --git a/common/src/docs/src/documentation/content/xdocs/index.xml b/hadoop-common/src/main/docs/src/documentation/content/xdocs/index.xml
similarity index 100%
rename from common/src/docs/src/documentation/content/xdocs/index.xml
rename to hadoop-common/src/main/docs/src/documentation/content/xdocs/index.xml
diff --git a/common/src/docs/src/documentation/content/xdocs/native_libraries.xml b/hadoop-common/src/main/docs/src/documentation/content/xdocs/native_libraries.xml
similarity index 100%
rename from common/src/docs/src/documentation/content/xdocs/native_libraries.xml
rename to hadoop-common/src/main/docs/src/documentation/content/xdocs/native_libraries.xml
diff --git a/common/src/docs/src/documentation/content/xdocs/service_level_auth.xml b/hadoop-common/src/main/docs/src/documentation/content/xdocs/service_level_auth.xml
similarity index 100%
rename from common/src/docs/src/documentation/content/xdocs/service_level_auth.xml
rename to hadoop-common/src/main/docs/src/documentation/content/xdocs/service_level_auth.xml
diff --git a/common/src/docs/src/documentation/content/xdocs/single_node_setup.xml b/hadoop-common/src/main/docs/src/documentation/content/xdocs/single_node_setup.xml
similarity index 100%
rename from common/src/docs/src/documentation/content/xdocs/single_node_setup.xml
rename to hadoop-common/src/main/docs/src/documentation/content/xdocs/single_node_setup.xml
diff --git a/common/src/docs/src/documentation/content/xdocs/site.xml b/hadoop-common/src/main/docs/src/documentation/content/xdocs/site.xml
similarity index 100%
rename from common/src/docs/src/documentation/content/xdocs/site.xml
rename to hadoop-common/src/main/docs/src/documentation/content/xdocs/site.xml
diff --git a/common/src/docs/src/documentation/content/xdocs/tabs.xml b/hadoop-common/src/main/docs/src/documentation/content/xdocs/tabs.xml
similarity index 100%
rename from common/src/docs/src/documentation/content/xdocs/tabs.xml
rename to hadoop-common/src/main/docs/src/documentation/content/xdocs/tabs.xml
diff --git a/common/src/docs/src/documentation/resources/images/architecture.gif b/hadoop-common/src/main/docs/src/documentation/resources/images/architecture.gif
similarity index 100%
rename from common/src/docs/src/documentation/resources/images/architecture.gif
rename to hadoop-common/src/main/docs/src/documentation/resources/images/architecture.gif
diff --git a/common/src/docs/src/documentation/resources/images/common-logo.jpg b/hadoop-common/src/main/docs/src/documentation/resources/images/common-logo.jpg
similarity index 100%
rename from common/src/docs/src/documentation/resources/images/common-logo.jpg
rename to hadoop-common/src/main/docs/src/documentation/resources/images/common-logo.jpg
diff --git a/common/src/docs/src/documentation/resources/images/core-logo.gif b/hadoop-common/src/main/docs/src/documentation/resources/images/core-logo.gif
similarity index 100%
rename from common/src/docs/src/documentation/resources/images/core-logo.gif
rename to hadoop-common/src/main/docs/src/documentation/resources/images/core-logo.gif
diff --git a/common/src/docs/src/documentation/resources/images/favicon.ico b/hadoop-common/src/main/docs/src/documentation/resources/images/favicon.ico
similarity index 100%
rename from common/src/docs/src/documentation/resources/images/favicon.ico
rename to hadoop-common/src/main/docs/src/documentation/resources/images/favicon.ico
diff --git a/common/src/docs/src/documentation/resources/images/hadoop-logo-big.jpg b/hadoop-common/src/main/docs/src/documentation/resources/images/hadoop-logo-big.jpg
similarity index 100%
rename from common/src/docs/src/documentation/resources/images/hadoop-logo-big.jpg
rename to hadoop-common/src/main/docs/src/documentation/resources/images/hadoop-logo-big.jpg
diff --git a/common/src/docs/src/documentation/resources/images/hadoop-logo.jpg b/hadoop-common/src/main/docs/src/documentation/resources/images/hadoop-logo.jpg
similarity index 100%
rename from common/src/docs/src/documentation/resources/images/hadoop-logo.jpg
rename to hadoop-common/src/main/docs/src/documentation/resources/images/hadoop-logo.jpg
diff --git a/common/src/docs/src/documentation/resources/images/hdfsarchitecture.gif b/hadoop-common/src/main/docs/src/documentation/resources/images/hdfsarchitecture.gif
similarity index 100%
rename from common/src/docs/src/documentation/resources/images/hdfsarchitecture.gif
rename to hadoop-common/src/main/docs/src/documentation/resources/images/hdfsarchitecture.gif
diff --git a/common/src/docs/src/documentation/resources/images/hdfsarchitecture.odg b/hadoop-common/src/main/docs/src/documentation/resources/images/hdfsarchitecture.odg
similarity index 100%
rename from common/src/docs/src/documentation/resources/images/hdfsarchitecture.odg
rename to hadoop-common/src/main/docs/src/documentation/resources/images/hdfsarchitecture.odg
diff --git a/common/src/docs/src/documentation/resources/images/hdfsarchitecture.png b/hadoop-common/src/main/docs/src/documentation/resources/images/hdfsarchitecture.png
similarity index 100%
rename from common/src/docs/src/documentation/resources/images/hdfsarchitecture.png
rename to hadoop-common/src/main/docs/src/documentation/resources/images/hdfsarchitecture.png
diff --git a/common/src/docs/src/documentation/resources/images/hdfsdatanodes.gif b/hadoop-common/src/main/docs/src/documentation/resources/images/hdfsdatanodes.gif
similarity index 100%
rename from common/src/docs/src/documentation/resources/images/hdfsdatanodes.gif
rename to hadoop-common/src/main/docs/src/documentation/resources/images/hdfsdatanodes.gif
diff --git a/common/src/docs/src/documentation/resources/images/hdfsdatanodes.odg b/hadoop-common/src/main/docs/src/documentation/resources/images/hdfsdatanodes.odg
similarity index 100%
rename from common/src/docs/src/documentation/resources/images/hdfsdatanodes.odg
rename to hadoop-common/src/main/docs/src/documentation/resources/images/hdfsdatanodes.odg
diff --git a/common/src/docs/src/documentation/resources/images/hdfsdatanodes.png b/hadoop-common/src/main/docs/src/documentation/resources/images/hdfsdatanodes.png
similarity index 100%
rename from common/src/docs/src/documentation/resources/images/hdfsdatanodes.png
rename to hadoop-common/src/main/docs/src/documentation/resources/images/hdfsdatanodes.png
diff --git a/common/src/docs/src/documentation/skinconf.xml b/hadoop-common/src/main/docs/src/documentation/skinconf.xml
similarity index 100%
rename from common/src/docs/src/documentation/skinconf.xml
rename to hadoop-common/src/main/docs/src/documentation/skinconf.xml
diff --git a/common/src/docs/status.xml b/hadoop-common/src/main/docs/status.xml
similarity index 100%
rename from common/src/docs/status.xml
rename to hadoop-common/src/main/docs/status.xml
diff --git a/common/src/java/org/apache/hadoop/HadoopIllegalArgumentException.java b/hadoop-common/src/main/java/org/apache/hadoop/HadoopIllegalArgumentException.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/HadoopIllegalArgumentException.java
rename to hadoop-common/src/main/java/org/apache/hadoop/HadoopIllegalArgumentException.java
diff --git a/common/src/java/org/apache/hadoop/HadoopVersionAnnotation.java b/hadoop-common/src/main/java/org/apache/hadoop/HadoopVersionAnnotation.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/HadoopVersionAnnotation.java
rename to hadoop-common/src/main/java/org/apache/hadoop/HadoopVersionAnnotation.java
diff --git a/common/src/java/org/apache/hadoop/conf/ConfServlet.java b/hadoop-common/src/main/java/org/apache/hadoop/conf/ConfServlet.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/conf/ConfServlet.java
rename to hadoop-common/src/main/java/org/apache/hadoop/conf/ConfServlet.java
diff --git a/common/src/java/org/apache/hadoop/conf/Configurable.java b/hadoop-common/src/main/java/org/apache/hadoop/conf/Configurable.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/conf/Configurable.java
rename to hadoop-common/src/main/java/org/apache/hadoop/conf/Configurable.java
diff --git a/common/src/java/org/apache/hadoop/conf/Configuration.java b/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/conf/Configuration.java
rename to hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
diff --git a/common/src/java/org/apache/hadoop/conf/Configured.java b/hadoop-common/src/main/java/org/apache/hadoop/conf/Configured.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/conf/Configured.java
rename to hadoop-common/src/main/java/org/apache/hadoop/conf/Configured.java
diff --git a/common/src/java/org/apache/hadoop/conf/Reconfigurable.java b/hadoop-common/src/main/java/org/apache/hadoop/conf/Reconfigurable.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/conf/Reconfigurable.java
rename to hadoop-common/src/main/java/org/apache/hadoop/conf/Reconfigurable.java
diff --git a/common/src/java/org/apache/hadoop/conf/ReconfigurableBase.java b/hadoop-common/src/main/java/org/apache/hadoop/conf/ReconfigurableBase.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/conf/ReconfigurableBase.java
rename to hadoop-common/src/main/java/org/apache/hadoop/conf/ReconfigurableBase.java
diff --git a/common/src/java/org/apache/hadoop/conf/ReconfigurationException.java b/hadoop-common/src/main/java/org/apache/hadoop/conf/ReconfigurationException.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/conf/ReconfigurationException.java
rename to hadoop-common/src/main/java/org/apache/hadoop/conf/ReconfigurationException.java
diff --git a/common/src/java/org/apache/hadoop/conf/ReconfigurationServlet.java b/hadoop-common/src/main/java/org/apache/hadoop/conf/ReconfigurationServlet.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/conf/ReconfigurationServlet.java
rename to hadoop-common/src/main/java/org/apache/hadoop/conf/ReconfigurationServlet.java
diff --git a/common/src/java/org/apache/hadoop/conf/ReconfigurationUtil.java b/hadoop-common/src/main/java/org/apache/hadoop/conf/ReconfigurationUtil.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/conf/ReconfigurationUtil.java
rename to hadoop-common/src/main/java/org/apache/hadoop/conf/ReconfigurationUtil.java
diff --git a/common/src/java/org/apache/hadoop/conf/package.html b/hadoop-common/src/main/java/org/apache/hadoop/conf/package.html
similarity index 100%
rename from common/src/java/org/apache/hadoop/conf/package.html
rename to hadoop-common/src/main/java/org/apache/hadoop/conf/package.html
diff --git a/common/src/java/org/apache/hadoop/fs/AbstractFileSystem.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/AbstractFileSystem.java
similarity index 99%
rename from common/src/java/org/apache/hadoop/fs/AbstractFileSystem.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/AbstractFileSystem.java
index de72eee301..f4632f30ae 100644
--- a/common/src/java/org/apache/hadoop/fs/AbstractFileSystem.java
+++ b/hadoop-common/src/main/java/org/apache/hadoop/fs/AbstractFileSystem.java
@@ -91,7 +91,7 @@ private static boolean isValidName(String src) {
     StringTokenizer tokens = new StringTokenizer(src, Path.SEPARATOR);
     while(tokens.hasMoreTokens()) {
       String element = tokens.nextToken();
-      if (element.equals("..") || 
+      if (element.equals("target/generated-sources") ||
           element.equals(".")  ||
           (element.indexOf(":") >= 0)) {
         return false;
diff --git a/common/src/java/org/apache/hadoop/fs/AvroFSInput.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/AvroFSInput.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/AvroFSInput.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/AvroFSInput.java
diff --git a/common/src/java/org/apache/hadoop/fs/BlockLocation.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/BlockLocation.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/BlockLocation.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/BlockLocation.java
diff --git a/common/src/java/org/apache/hadoop/fs/BufferedFSInputStream.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/BufferedFSInputStream.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/BufferedFSInputStream.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/BufferedFSInputStream.java
diff --git a/common/src/java/org/apache/hadoop/fs/ChecksumException.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/ChecksumException.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/ChecksumException.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/ChecksumException.java
diff --git a/common/src/java/org/apache/hadoop/fs/ChecksumFileSystem.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/ChecksumFileSystem.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/ChecksumFileSystem.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/ChecksumFileSystem.java
diff --git a/common/src/java/org/apache/hadoop/fs/ChecksumFs.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/ChecksumFs.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/ChecksumFs.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/ChecksumFs.java
diff --git a/common/src/java/org/apache/hadoop/fs/CommonConfigurationKeys.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/CommonConfigurationKeys.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/CommonConfigurationKeys.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/CommonConfigurationKeys.java
diff --git a/common/src/java/org/apache/hadoop/fs/CommonConfigurationKeysPublic.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/CommonConfigurationKeysPublic.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/CommonConfigurationKeysPublic.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/CommonConfigurationKeysPublic.java
diff --git a/common/src/java/org/apache/hadoop/fs/ContentSummary.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/ContentSummary.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/ContentSummary.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/ContentSummary.java
diff --git a/common/src/java/org/apache/hadoop/fs/CreateFlag.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/CreateFlag.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/CreateFlag.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/CreateFlag.java
diff --git a/common/src/java/org/apache/hadoop/fs/DF.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/DF.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/DF.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/DF.java
diff --git a/common/src/java/org/apache/hadoop/fs/DU.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/DU.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/DU.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/DU.java
diff --git a/common/src/java/org/apache/hadoop/fs/DelegateToFileSystem.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/DelegateToFileSystem.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/DelegateToFileSystem.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/DelegateToFileSystem.java
diff --git a/common/src/java/org/apache/hadoop/fs/FSDataInputStream.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/FSDataInputStream.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/FSDataInputStream.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/FSDataInputStream.java
diff --git a/common/src/java/org/apache/hadoop/fs/FSDataOutputStream.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/FSDataOutputStream.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/FSDataOutputStream.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/FSDataOutputStream.java
diff --git a/common/src/java/org/apache/hadoop/fs/FSError.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/FSError.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/FSError.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/FSError.java
diff --git a/common/src/java/org/apache/hadoop/fs/FSInputChecker.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/FSInputChecker.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/FSInputChecker.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/FSInputChecker.java
diff --git a/common/src/java/org/apache/hadoop/fs/FSInputStream.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/FSInputStream.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/FSInputStream.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/FSInputStream.java
diff --git a/common/src/java/org/apache/hadoop/fs/FSOutputSummer.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/FSOutputSummer.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/FSOutputSummer.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/FSOutputSummer.java
diff --git a/common/src/java/org/apache/hadoop/fs/FileAlreadyExistsException.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/FileAlreadyExistsException.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/FileAlreadyExistsException.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/FileAlreadyExistsException.java
diff --git a/common/src/java/org/apache/hadoop/fs/FileChecksum.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/FileChecksum.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/FileChecksum.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/FileChecksum.java
diff --git a/common/src/java/org/apache/hadoop/fs/FileContext.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/FileContext.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/FileContext.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/FileContext.java
diff --git a/common/src/java/org/apache/hadoop/fs/FileStatus.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/FileStatus.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/FileStatus.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/FileStatus.java
diff --git a/common/src/java/org/apache/hadoop/fs/FileSystem.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java
similarity index 98%
rename from common/src/java/org/apache/hadoop/fs/FileSystem.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java
index 6395491096..d3fde9bb57 100644
--- a/common/src/java/org/apache/hadoop/fs/FileSystem.java
+++ b/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java
@@ -1707,7 +1707,38 @@ public void moveToLocalFile(Path src, Path dst) throws IOException {
    */   
   public void copyToLocalFile(boolean delSrc, Path src, Path dst)
     throws IOException {
-    FileUtil.copy(this, src, getLocal(getConf()), dst, delSrc, getConf());
+    copyToLocalFile(delSrc, src, dst, false);
+  }
+  
+    /**
+   * The src file is under FS, and the dst is on the local disk. Copy it from FS
+   * control to the local dst name. delSrc indicates if the src will be removed
+   * or not. useRawLocalFileSystem indicates whether to use RawLocalFileSystem
+   * as local file system or not. RawLocalFileSystem is non crc file system.So,
+   * It will not create any crc files at local.
+   * 
+   * @param delSrc
+   *          whether to delete the src
+   * @param src
+   *          path
+   * @param dst
+   *          path
+   * @param useRawLocalFileSystem
+   *          whether to use RawLocalFileSystem as local file system or not.
+   * 
+   * @throws IOException
+   *           - if any IO error
+   */
+  public void copyToLocalFile(boolean delSrc, Path src, Path dst,
+      boolean useRawLocalFileSystem) throws IOException {
+    Configuration conf = getConf();
+    FileSystem local = null;
+    if (useRawLocalFileSystem) {
+      local = getLocal(conf).getRawFileSystem();
+    } else {
+      local = getLocal(conf);
+    }
+    FileUtil.copy(this, src, local, dst, delSrc, conf);
   }
 
   /**
diff --git a/common/src/java/org/apache/hadoop/fs/FileUtil.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/FileUtil.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/FileUtil.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/FileUtil.java
diff --git a/common/src/java/org/apache/hadoop/fs/FilterFileSystem.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/FilterFileSystem.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/FilterFileSystem.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/FilterFileSystem.java
diff --git a/common/src/java/org/apache/hadoop/fs/FilterFs.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/FilterFs.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/FilterFs.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/FilterFs.java
diff --git a/common/src/java/org/apache/hadoop/fs/FsConfig.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/FsConfig.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/FsConfig.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/FsConfig.java
diff --git a/common/src/java/org/apache/hadoop/fs/FsConstants.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/FsConstants.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/FsConstants.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/FsConstants.java
diff --git a/common/src/java/org/apache/hadoop/fs/FsServerDefaults.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/FsServerDefaults.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/FsServerDefaults.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/FsServerDefaults.java
diff --git a/common/src/java/org/apache/hadoop/fs/FsShell.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/FsShell.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/FsShell.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/FsShell.java
diff --git a/common/src/java/org/apache/hadoop/fs/FsShellPermissions.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/FsShellPermissions.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/FsShellPermissions.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/FsShellPermissions.java
diff --git a/common/src/java/org/apache/hadoop/fs/FsStatus.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/FsStatus.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/FsStatus.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/FsStatus.java
diff --git a/common/src/java/org/apache/hadoop/fs/FsUrlConnection.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/FsUrlConnection.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/FsUrlConnection.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/FsUrlConnection.java
diff --git a/common/src/java/org/apache/hadoop/fs/FsUrlStreamHandler.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/FsUrlStreamHandler.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/FsUrlStreamHandler.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/FsUrlStreamHandler.java
diff --git a/common/src/java/org/apache/hadoop/fs/FsUrlStreamHandlerFactory.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/FsUrlStreamHandlerFactory.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/FsUrlStreamHandlerFactory.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/FsUrlStreamHandlerFactory.java
diff --git a/common/src/java/org/apache/hadoop/fs/GlobExpander.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/GlobExpander.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/GlobExpander.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/GlobExpander.java
diff --git a/common/src/java/org/apache/hadoop/fs/GlobFilter.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/GlobFilter.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/GlobFilter.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/GlobFilter.java
diff --git a/common/src/java/org/apache/hadoop/fs/GlobPattern.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/GlobPattern.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/GlobPattern.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/GlobPattern.java
diff --git a/common/src/java/org/apache/hadoop/fs/HardLink.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/HardLink.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/HardLink.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/HardLink.java
diff --git a/common/src/java/org/apache/hadoop/fs/InvalidPathException.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/InvalidPathException.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/InvalidPathException.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/InvalidPathException.java
diff --git a/common/src/java/org/apache/hadoop/fs/LocalDirAllocator.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/LocalDirAllocator.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/LocalDirAllocator.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/LocalDirAllocator.java
diff --git a/common/src/java/org/apache/hadoop/fs/LocalFileSystem.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/LocalFileSystem.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/LocalFileSystem.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/LocalFileSystem.java
diff --git a/common/src/java/org/apache/hadoop/fs/LocalFileSystemConfigKeys.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/LocalFileSystemConfigKeys.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/LocalFileSystemConfigKeys.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/LocalFileSystemConfigKeys.java
diff --git a/common/src/java/org/apache/hadoop/fs/LocatedFileStatus.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/LocatedFileStatus.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/LocatedFileStatus.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/LocatedFileStatus.java
diff --git a/common/src/java/org/apache/hadoop/fs/MD5MD5CRC32FileChecksum.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/MD5MD5CRC32FileChecksum.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/MD5MD5CRC32FileChecksum.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/MD5MD5CRC32FileChecksum.java
diff --git a/common/src/java/org/apache/hadoop/fs/Options.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/Options.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/Options.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/Options.java
diff --git a/common/src/java/org/apache/hadoop/fs/ParentNotDirectoryException.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/ParentNotDirectoryException.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/ParentNotDirectoryException.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/ParentNotDirectoryException.java
diff --git a/common/src/java/org/apache/hadoop/fs/Path.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/Path.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/Path.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/Path.java
diff --git a/common/src/java/org/apache/hadoop/fs/PathFilter.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/PathFilter.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/PathFilter.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/PathFilter.java
diff --git a/common/src/java/org/apache/hadoop/fs/PositionedReadable.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/PositionedReadable.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/PositionedReadable.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/PositionedReadable.java
diff --git a/common/src/java/org/apache/hadoop/fs/RawLocalFileSystem.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/RawLocalFileSystem.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/RawLocalFileSystem.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/RawLocalFileSystem.java
diff --git a/common/src/java/org/apache/hadoop/fs/RemoteIterator.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/RemoteIterator.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/RemoteIterator.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/RemoteIterator.java
diff --git a/common/src/java/org/apache/hadoop/fs/Seekable.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/Seekable.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/Seekable.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/Seekable.java
diff --git a/common/src/java/org/apache/hadoop/fs/Syncable.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/Syncable.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/Syncable.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/Syncable.java
diff --git a/common/src/java/org/apache/hadoop/fs/Trash.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/Trash.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/Trash.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/Trash.java
diff --git a/common/src/java/org/apache/hadoop/fs/TrashPolicy.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/TrashPolicy.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/TrashPolicy.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/TrashPolicy.java
diff --git a/common/src/java/org/apache/hadoop/fs/TrashPolicyDefault.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/TrashPolicyDefault.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/TrashPolicyDefault.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/TrashPolicyDefault.java
diff --git a/common/src/java/org/apache/hadoop/fs/UnresolvedLinkException.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/UnresolvedLinkException.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/UnresolvedLinkException.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/UnresolvedLinkException.java
diff --git a/common/src/java/org/apache/hadoop/fs/UnsupportedFileSystemException.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/UnsupportedFileSystemException.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/UnsupportedFileSystemException.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/UnsupportedFileSystemException.java
diff --git a/common/src/java/org/apache/hadoop/fs/ftp/FTPException.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/ftp/FTPException.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/ftp/FTPException.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/ftp/FTPException.java
diff --git a/common/src/java/org/apache/hadoop/fs/ftp/FTPFileSystem.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/ftp/FTPFileSystem.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/ftp/FTPFileSystem.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/ftp/FTPFileSystem.java
diff --git a/common/src/java/org/apache/hadoop/fs/ftp/FTPInputStream.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/ftp/FTPInputStream.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/ftp/FTPInputStream.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/ftp/FTPInputStream.java
diff --git a/common/src/java/org/apache/hadoop/fs/ftp/FtpConfigKeys.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/ftp/FtpConfigKeys.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/ftp/FtpConfigKeys.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/ftp/FtpConfigKeys.java
diff --git a/common/src/java/org/apache/hadoop/fs/ftp/FtpFs.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/ftp/FtpFs.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/ftp/FtpFs.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/ftp/FtpFs.java
diff --git a/common/src/java/org/apache/hadoop/fs/kfs/IFSImpl.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/kfs/IFSImpl.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/kfs/IFSImpl.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/kfs/IFSImpl.java
diff --git a/common/src/java/org/apache/hadoop/fs/kfs/KFSConfigKeys.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/kfs/KFSConfigKeys.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/kfs/KFSConfigKeys.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/kfs/KFSConfigKeys.java
diff --git a/common/src/java/org/apache/hadoop/fs/kfs/KFSImpl.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/kfs/KFSImpl.java
similarity index 97%
rename from common/src/java/org/apache/hadoop/fs/kfs/KFSImpl.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/kfs/KFSImpl.java
index e04f64f15a..88b28ed434 100644
--- a/common/src/java/org/apache/hadoop/fs/kfs/KFSImpl.java
+++ b/hadoop-common/src/main/java/org/apache/hadoop/fs/kfs/KFSImpl.java
@@ -73,14 +73,14 @@ public FileStatus[] readdirplus(Path path) throws IOException {
             return null;
         int numEntries = 0;
         for (int i = 0; i < fattr.length; i++) {
-            if ((fattr[i].filename.compareTo(".") == 0) || (fattr[i].filename.compareTo("..") == 0))
+            if ((fattr[i].filename.compareTo(".") == 0) || (fattr[i].filename.compareTo("target/generated-sources") == 0))
                 continue;
             numEntries++;
         }
         FileStatus[] fstatus = new FileStatus[numEntries];
         int j = 0;
         for (int i = 0; i < fattr.length; i++) {
-            if ((fattr[i].filename.compareTo(".") == 0) || (fattr[i].filename.compareTo("..") == 0))
+            if ((fattr[i].filename.compareTo(".") == 0) || (fattr[i].filename.compareTo("target/generated-sources") == 0))
                 continue;
             Path fn = new Path(path, fattr[i].filename);
 
diff --git a/common/src/java/org/apache/hadoop/fs/kfs/KFSInputStream.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/kfs/KFSInputStream.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/kfs/KFSInputStream.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/kfs/KFSInputStream.java
diff --git a/common/src/java/org/apache/hadoop/fs/kfs/KFSOutputStream.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/kfs/KFSOutputStream.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/kfs/KFSOutputStream.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/kfs/KFSOutputStream.java
diff --git a/common/src/java/org/apache/hadoop/fs/kfs/KosmosFileSystem.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/kfs/KosmosFileSystem.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/kfs/KosmosFileSystem.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/kfs/KosmosFileSystem.java
diff --git a/common/src/java/org/apache/hadoop/fs/kfs/package.html b/hadoop-common/src/main/java/org/apache/hadoop/fs/kfs/package.html
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/kfs/package.html
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/kfs/package.html
diff --git a/common/src/java/org/apache/hadoop/fs/local/LocalConfigKeys.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/local/LocalConfigKeys.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/local/LocalConfigKeys.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/local/LocalConfigKeys.java
diff --git a/common/src/java/org/apache/hadoop/fs/local/LocalFs.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/local/LocalFs.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/local/LocalFs.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/local/LocalFs.java
diff --git a/common/src/java/org/apache/hadoop/fs/local/RawLocalFs.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/local/RawLocalFs.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/local/RawLocalFs.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/local/RawLocalFs.java
diff --git a/common/src/java/org/apache/hadoop/fs/local/package-info.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/local/package-info.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/local/package-info.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/local/package-info.java
diff --git a/common/src/java/org/apache/hadoop/fs/package.html b/hadoop-common/src/main/java/org/apache/hadoop/fs/package.html
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/package.html
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/package.html
diff --git a/common/src/java/org/apache/hadoop/fs/permission/AccessControlException.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/permission/AccessControlException.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/permission/AccessControlException.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/permission/AccessControlException.java
diff --git a/common/src/java/org/apache/hadoop/fs/permission/ChmodParser.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/permission/ChmodParser.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/permission/ChmodParser.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/permission/ChmodParser.java
diff --git a/common/src/java/org/apache/hadoop/fs/permission/FsAction.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/permission/FsAction.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/permission/FsAction.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/permission/FsAction.java
diff --git a/common/src/java/org/apache/hadoop/fs/permission/FsPermission.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/permission/FsPermission.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/permission/FsPermission.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/permission/FsPermission.java
diff --git a/common/src/java/org/apache/hadoop/fs/permission/PermissionParser.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/permission/PermissionParser.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/permission/PermissionParser.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/permission/PermissionParser.java
diff --git a/common/src/java/org/apache/hadoop/fs/permission/PermissionStatus.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/permission/PermissionStatus.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/permission/PermissionStatus.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/permission/PermissionStatus.java
diff --git a/common/src/java/org/apache/hadoop/fs/permission/UmaskParser.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/permission/UmaskParser.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/permission/UmaskParser.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/permission/UmaskParser.java
diff --git a/common/src/java/org/apache/hadoop/fs/s3/Block.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/s3/Block.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/s3/Block.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/s3/Block.java
diff --git a/common/src/java/org/apache/hadoop/fs/s3/FileSystemStore.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/s3/FileSystemStore.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/s3/FileSystemStore.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/s3/FileSystemStore.java
diff --git a/common/src/java/org/apache/hadoop/fs/s3/INode.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/s3/INode.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/s3/INode.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/s3/INode.java
diff --git a/common/src/java/org/apache/hadoop/fs/s3/Jets3tFileSystemStore.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/s3/Jets3tFileSystemStore.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/s3/Jets3tFileSystemStore.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/s3/Jets3tFileSystemStore.java
diff --git a/common/src/java/org/apache/hadoop/fs/s3/MigrationTool.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/s3/MigrationTool.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/s3/MigrationTool.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/s3/MigrationTool.java
diff --git a/common/src/java/org/apache/hadoop/fs/s3/S3Credentials.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/s3/S3Credentials.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/s3/S3Credentials.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/s3/S3Credentials.java
diff --git a/common/src/java/org/apache/hadoop/fs/s3/S3Exception.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/s3/S3Exception.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/s3/S3Exception.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/s3/S3Exception.java
diff --git a/common/src/java/org/apache/hadoop/fs/s3/S3FileSystem.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/s3/S3FileSystem.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/s3/S3FileSystem.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/s3/S3FileSystem.java
diff --git a/common/src/java/org/apache/hadoop/fs/s3/S3FileSystemConfigKeys.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/s3/S3FileSystemConfigKeys.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/s3/S3FileSystemConfigKeys.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/s3/S3FileSystemConfigKeys.java
diff --git a/common/src/java/org/apache/hadoop/fs/s3/S3FileSystemException.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/s3/S3FileSystemException.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/s3/S3FileSystemException.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/s3/S3FileSystemException.java
diff --git a/common/src/java/org/apache/hadoop/fs/s3/S3InputStream.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/s3/S3InputStream.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/s3/S3InputStream.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/s3/S3InputStream.java
diff --git a/common/src/java/org/apache/hadoop/fs/s3/S3OutputStream.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/s3/S3OutputStream.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/s3/S3OutputStream.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/s3/S3OutputStream.java
diff --git a/common/src/java/org/apache/hadoop/fs/s3/VersionMismatchException.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/s3/VersionMismatchException.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/s3/VersionMismatchException.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/s3/VersionMismatchException.java
diff --git a/common/src/java/org/apache/hadoop/fs/s3/package.html b/hadoop-common/src/main/java/org/apache/hadoop/fs/s3/package.html
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/s3/package.html
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/s3/package.html
diff --git a/common/src/java/org/apache/hadoop/fs/s3native/FileMetadata.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/s3native/FileMetadata.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/s3native/FileMetadata.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/s3native/FileMetadata.java
diff --git a/common/src/java/org/apache/hadoop/fs/s3native/Jets3tNativeFileSystemStore.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/s3native/Jets3tNativeFileSystemStore.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/s3native/Jets3tNativeFileSystemStore.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/s3native/Jets3tNativeFileSystemStore.java
diff --git a/common/src/java/org/apache/hadoop/fs/s3native/NativeFileSystemStore.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/s3native/NativeFileSystemStore.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/s3native/NativeFileSystemStore.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/s3native/NativeFileSystemStore.java
diff --git a/common/src/java/org/apache/hadoop/fs/s3native/NativeS3FileSystem.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/s3native/NativeS3FileSystem.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/s3native/NativeS3FileSystem.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/s3native/NativeS3FileSystem.java
diff --git a/common/src/java/org/apache/hadoop/fs/s3native/PartialListing.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/s3native/PartialListing.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/s3native/PartialListing.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/s3native/PartialListing.java
diff --git a/common/src/java/org/apache/hadoop/fs/s3native/S3NativeFileSystemConfigKeys.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/s3native/S3NativeFileSystemConfigKeys.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/s3native/S3NativeFileSystemConfigKeys.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/s3native/S3NativeFileSystemConfigKeys.java
diff --git a/common/src/java/org/apache/hadoop/fs/s3native/package.html b/hadoop-common/src/main/java/org/apache/hadoop/fs/s3native/package.html
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/s3native/package.html
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/s3native/package.html
diff --git a/common/src/java/org/apache/hadoop/fs/shell/Command.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Command.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/shell/Command.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Command.java
diff --git a/common/src/java/org/apache/hadoop/fs/shell/CommandFactory.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/CommandFactory.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/shell/CommandFactory.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/shell/CommandFactory.java
diff --git a/common/src/java/org/apache/hadoop/fs/shell/CommandFormat.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/CommandFormat.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/shell/CommandFormat.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/shell/CommandFormat.java
diff --git a/common/src/java/org/apache/hadoop/fs/shell/CommandUtils.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/CommandUtils.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/shell/CommandUtils.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/shell/CommandUtils.java
diff --git a/common/src/java/org/apache/hadoop/fs/shell/CommandWithDestination.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/CommandWithDestination.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/shell/CommandWithDestination.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/shell/CommandWithDestination.java
diff --git a/common/src/java/org/apache/hadoop/fs/shell/CopyCommands.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/CopyCommands.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/shell/CopyCommands.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/shell/CopyCommands.java
diff --git a/common/src/java/org/apache/hadoop/fs/shell/Count.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Count.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/shell/Count.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Count.java
diff --git a/common/src/java/org/apache/hadoop/fs/shell/Delete.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Delete.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/shell/Delete.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Delete.java
diff --git a/common/src/java/org/apache/hadoop/fs/shell/Display.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Display.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/shell/Display.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Display.java
diff --git a/common/src/java/org/apache/hadoop/fs/shell/FsCommand.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/FsCommand.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/shell/FsCommand.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/shell/FsCommand.java
diff --git a/common/src/java/org/apache/hadoop/fs/shell/FsUsage.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/FsUsage.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/shell/FsUsage.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/shell/FsUsage.java
diff --git a/common/src/java/org/apache/hadoop/fs/shell/Ls.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Ls.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/shell/Ls.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Ls.java
diff --git a/common/src/java/org/apache/hadoop/fs/shell/Mkdir.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Mkdir.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/shell/Mkdir.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Mkdir.java
diff --git a/common/src/java/org/apache/hadoop/fs/shell/MoveCommands.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/MoveCommands.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/shell/MoveCommands.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/shell/MoveCommands.java
diff --git a/common/src/java/org/apache/hadoop/fs/shell/PathData.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/PathData.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/shell/PathData.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/shell/PathData.java
diff --git a/common/src/java/org/apache/hadoop/fs/shell/PathExceptions.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/PathExceptions.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/shell/PathExceptions.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/shell/PathExceptions.java
diff --git a/common/src/java/org/apache/hadoop/fs/shell/SetReplication.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/SetReplication.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/shell/SetReplication.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/shell/SetReplication.java
diff --git a/common/src/java/org/apache/hadoop/fs/shell/Stat.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Stat.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/shell/Stat.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Stat.java
diff --git a/common/src/java/org/apache/hadoop/fs/shell/Tail.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Tail.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/shell/Tail.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Tail.java
diff --git a/common/src/java/org/apache/hadoop/fs/shell/Test.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Test.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/shell/Test.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Test.java
diff --git a/common/src/java/org/apache/hadoop/fs/shell/Touchz.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Touchz.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/shell/Touchz.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Touchz.java
diff --git a/common/src/java/org/apache/hadoop/fs/shell/package-info.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/package-info.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/shell/package-info.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/shell/package-info.java
diff --git a/common/src/java/org/apache/hadoop/fs/viewfs/ChRootedFileSystem.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ChRootedFileSystem.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/viewfs/ChRootedFileSystem.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ChRootedFileSystem.java
diff --git a/common/src/java/org/apache/hadoop/fs/viewfs/ChRootedFs.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ChRootedFs.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/viewfs/ChRootedFs.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ChRootedFs.java
diff --git a/common/src/java/org/apache/hadoop/fs/viewfs/ConfigUtil.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ConfigUtil.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/viewfs/ConfigUtil.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ConfigUtil.java
diff --git a/common/src/java/org/apache/hadoop/fs/viewfs/Constants.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/Constants.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/viewfs/Constants.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/Constants.java
diff --git a/common/src/java/org/apache/hadoop/fs/viewfs/InodeTree.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/InodeTree.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/viewfs/InodeTree.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/InodeTree.java
diff --git a/common/src/java/org/apache/hadoop/fs/viewfs/ViewFileSystem.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ViewFileSystem.java
similarity index 99%
rename from common/src/java/org/apache/hadoop/fs/viewfs/ViewFileSystem.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ViewFileSystem.java
index eef54bb93e..a08aa3d58d 100644
--- a/common/src/java/org/apache/hadoop/fs/viewfs/ViewFileSystem.java
+++ b/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ViewFileSystem.java
@@ -100,7 +100,7 @@ private static boolean isValidName(final String src) {
     final StringTokenizer tokens = new StringTokenizer(src, Path.SEPARATOR);
     while(tokens.hasMoreTokens()) {
       String element = tokens.nextToken();
-      if (element.equals("..") || 
+      if (element.equals("..") ||
           element.equals(".")  ||
           (element.indexOf(":") >= 0)) {
         return false;
diff --git a/common/src/java/org/apache/hadoop/fs/viewfs/ViewFs.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ViewFs.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/viewfs/ViewFs.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ViewFs.java
diff --git a/common/src/java/org/apache/hadoop/fs/viewfs/ViewFsFileStatus.java b/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ViewFsFileStatus.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/fs/viewfs/ViewFsFileStatus.java
rename to hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ViewFsFileStatus.java
diff --git a/common/src/java/org/apache/hadoop/http/AdminAuthorizedServlet.java b/hadoop-common/src/main/java/org/apache/hadoop/http/AdminAuthorizedServlet.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/http/AdminAuthorizedServlet.java
rename to hadoop-common/src/main/java/org/apache/hadoop/http/AdminAuthorizedServlet.java
diff --git a/common/src/java/org/apache/hadoop/http/FilterContainer.java b/hadoop-common/src/main/java/org/apache/hadoop/http/FilterContainer.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/http/FilterContainer.java
rename to hadoop-common/src/main/java/org/apache/hadoop/http/FilterContainer.java
diff --git a/common/src/java/org/apache/hadoop/http/FilterInitializer.java b/hadoop-common/src/main/java/org/apache/hadoop/http/FilterInitializer.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/http/FilterInitializer.java
rename to hadoop-common/src/main/java/org/apache/hadoop/http/FilterInitializer.java
diff --git a/common/src/java/org/apache/hadoop/http/HtmlQuoting.java b/hadoop-common/src/main/java/org/apache/hadoop/http/HtmlQuoting.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/http/HtmlQuoting.java
rename to hadoop-common/src/main/java/org/apache/hadoop/http/HtmlQuoting.java
diff --git a/common/src/java/org/apache/hadoop/http/HttpServer.java b/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/http/HttpServer.java
rename to hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer.java
diff --git a/common/src/java/org/apache/hadoop/http/lib/StaticUserWebFilter.java b/hadoop-common/src/main/java/org/apache/hadoop/http/lib/StaticUserWebFilter.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/http/lib/StaticUserWebFilter.java
rename to hadoop-common/src/main/java/org/apache/hadoop/http/lib/StaticUserWebFilter.java
diff --git a/common/src/java/org/apache/hadoop/http/lib/package.html b/hadoop-common/src/main/java/org/apache/hadoop/http/lib/package.html
similarity index 100%
rename from common/src/java/org/apache/hadoop/http/lib/package.html
rename to hadoop-common/src/main/java/org/apache/hadoop/http/lib/package.html
diff --git a/common/src/java/org/apache/hadoop/http/package-info.java b/hadoop-common/src/main/java/org/apache/hadoop/http/package-info.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/http/package-info.java
rename to hadoop-common/src/main/java/org/apache/hadoop/http/package-info.java
diff --git a/common/src/java/org/apache/hadoop/io/AbstractMapWritable.java b/hadoop-common/src/main/java/org/apache/hadoop/io/AbstractMapWritable.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/AbstractMapWritable.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/AbstractMapWritable.java
diff --git a/common/src/java/org/apache/hadoop/io/ArrayFile.java b/hadoop-common/src/main/java/org/apache/hadoop/io/ArrayFile.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/ArrayFile.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/ArrayFile.java
diff --git a/common/src/java/org/apache/hadoop/io/ArrayPrimitiveWritable.java b/hadoop-common/src/main/java/org/apache/hadoop/io/ArrayPrimitiveWritable.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/ArrayPrimitiveWritable.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/ArrayPrimitiveWritable.java
diff --git a/common/src/java/org/apache/hadoop/io/ArrayWritable.java b/hadoop-common/src/main/java/org/apache/hadoop/io/ArrayWritable.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/ArrayWritable.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/ArrayWritable.java
diff --git a/common/src/java/org/apache/hadoop/io/BinaryComparable.java b/hadoop-common/src/main/java/org/apache/hadoop/io/BinaryComparable.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/BinaryComparable.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/BinaryComparable.java
diff --git a/common/src/java/org/apache/hadoop/io/BloomMapFile.java b/hadoop-common/src/main/java/org/apache/hadoop/io/BloomMapFile.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/BloomMapFile.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/BloomMapFile.java
diff --git a/common/src/java/org/apache/hadoop/io/BooleanWritable.java b/hadoop-common/src/main/java/org/apache/hadoop/io/BooleanWritable.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/BooleanWritable.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/BooleanWritable.java
diff --git a/common/src/java/org/apache/hadoop/io/BoundedByteArrayOutputStream.java b/hadoop-common/src/main/java/org/apache/hadoop/io/BoundedByteArrayOutputStream.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/BoundedByteArrayOutputStream.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/BoundedByteArrayOutputStream.java
diff --git a/common/src/java/org/apache/hadoop/io/ByteWritable.java b/hadoop-common/src/main/java/org/apache/hadoop/io/ByteWritable.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/ByteWritable.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/ByteWritable.java
diff --git a/common/src/java/org/apache/hadoop/io/BytesWritable.java b/hadoop-common/src/main/java/org/apache/hadoop/io/BytesWritable.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/BytesWritable.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/BytesWritable.java
diff --git a/common/src/java/org/apache/hadoop/io/Closeable.java b/hadoop-common/src/main/java/org/apache/hadoop/io/Closeable.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/Closeable.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/Closeable.java
diff --git a/common/src/java/org/apache/hadoop/io/CompressedWritable.java b/hadoop-common/src/main/java/org/apache/hadoop/io/CompressedWritable.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/CompressedWritable.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/CompressedWritable.java
diff --git a/common/src/java/org/apache/hadoop/io/DataInputBuffer.java b/hadoop-common/src/main/java/org/apache/hadoop/io/DataInputBuffer.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/DataInputBuffer.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/DataInputBuffer.java
diff --git a/common/src/java/org/apache/hadoop/io/DataInputByteBuffer.java b/hadoop-common/src/main/java/org/apache/hadoop/io/DataInputByteBuffer.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/DataInputByteBuffer.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/DataInputByteBuffer.java
diff --git a/common/src/java/org/apache/hadoop/io/DataOutputBuffer.java b/hadoop-common/src/main/java/org/apache/hadoop/io/DataOutputBuffer.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/DataOutputBuffer.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/DataOutputBuffer.java
diff --git a/common/src/java/org/apache/hadoop/io/DataOutputByteBuffer.java b/hadoop-common/src/main/java/org/apache/hadoop/io/DataOutputByteBuffer.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/DataOutputByteBuffer.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/DataOutputByteBuffer.java
diff --git a/common/src/java/org/apache/hadoop/io/DataOutputOutputStream.java b/hadoop-common/src/main/java/org/apache/hadoop/io/DataOutputOutputStream.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/DataOutputOutputStream.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/DataOutputOutputStream.java
diff --git a/common/src/java/org/apache/hadoop/io/DefaultStringifier.java b/hadoop-common/src/main/java/org/apache/hadoop/io/DefaultStringifier.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/DefaultStringifier.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/DefaultStringifier.java
diff --git a/common/src/java/org/apache/hadoop/io/DoubleWritable.java b/hadoop-common/src/main/java/org/apache/hadoop/io/DoubleWritable.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/DoubleWritable.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/DoubleWritable.java
diff --git a/common/src/java/org/apache/hadoop/io/EnumSetWritable.java b/hadoop-common/src/main/java/org/apache/hadoop/io/EnumSetWritable.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/EnumSetWritable.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/EnumSetWritable.java
diff --git a/common/src/java/org/apache/hadoop/io/FloatWritable.java b/hadoop-common/src/main/java/org/apache/hadoop/io/FloatWritable.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/FloatWritable.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/FloatWritable.java
diff --git a/common/src/java/org/apache/hadoop/io/GenericWritable.java b/hadoop-common/src/main/java/org/apache/hadoop/io/GenericWritable.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/GenericWritable.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/GenericWritable.java
diff --git a/common/src/java/org/apache/hadoop/io/IOUtils.java b/hadoop-common/src/main/java/org/apache/hadoop/io/IOUtils.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/IOUtils.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/IOUtils.java
diff --git a/common/src/java/org/apache/hadoop/io/InputBuffer.java b/hadoop-common/src/main/java/org/apache/hadoop/io/InputBuffer.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/InputBuffer.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/InputBuffer.java
diff --git a/common/src/java/org/apache/hadoop/io/IntWritable.java b/hadoop-common/src/main/java/org/apache/hadoop/io/IntWritable.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/IntWritable.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/IntWritable.java
diff --git a/common/src/java/org/apache/hadoop/io/LongWritable.java b/hadoop-common/src/main/java/org/apache/hadoop/io/LongWritable.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/LongWritable.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/LongWritable.java
diff --git a/common/src/java/org/apache/hadoop/io/MD5Hash.java b/hadoop-common/src/main/java/org/apache/hadoop/io/MD5Hash.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/MD5Hash.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/MD5Hash.java
diff --git a/common/src/java/org/apache/hadoop/io/MapFile.java b/hadoop-common/src/main/java/org/apache/hadoop/io/MapFile.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/MapFile.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/MapFile.java
diff --git a/common/src/java/org/apache/hadoop/io/MapWritable.java b/hadoop-common/src/main/java/org/apache/hadoop/io/MapWritable.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/MapWritable.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/MapWritable.java
diff --git a/common/src/java/org/apache/hadoop/io/MultipleIOException.java b/hadoop-common/src/main/java/org/apache/hadoop/io/MultipleIOException.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/MultipleIOException.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/MultipleIOException.java
diff --git a/common/src/java/org/apache/hadoop/io/NullWritable.java b/hadoop-common/src/main/java/org/apache/hadoop/io/NullWritable.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/NullWritable.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/NullWritable.java
diff --git a/common/src/java/org/apache/hadoop/io/ObjectWritable.java b/hadoop-common/src/main/java/org/apache/hadoop/io/ObjectWritable.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/ObjectWritable.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/ObjectWritable.java
diff --git a/common/src/java/org/apache/hadoop/io/OutputBuffer.java b/hadoop-common/src/main/java/org/apache/hadoop/io/OutputBuffer.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/OutputBuffer.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/OutputBuffer.java
diff --git a/common/src/java/org/apache/hadoop/io/RawComparator.java b/hadoop-common/src/main/java/org/apache/hadoop/io/RawComparator.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/RawComparator.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/RawComparator.java
diff --git a/common/src/java/org/apache/hadoop/io/SecureIOUtils.java b/hadoop-common/src/main/java/org/apache/hadoop/io/SecureIOUtils.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/SecureIOUtils.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/SecureIOUtils.java
diff --git a/common/src/java/org/apache/hadoop/io/SequenceFile.java b/hadoop-common/src/main/java/org/apache/hadoop/io/SequenceFile.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/SequenceFile.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/SequenceFile.java
diff --git a/common/src/java/org/apache/hadoop/io/SetFile.java b/hadoop-common/src/main/java/org/apache/hadoop/io/SetFile.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/SetFile.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/SetFile.java
diff --git a/common/src/java/org/apache/hadoop/io/SortedMapWritable.java b/hadoop-common/src/main/java/org/apache/hadoop/io/SortedMapWritable.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/SortedMapWritable.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/SortedMapWritable.java
diff --git a/common/src/java/org/apache/hadoop/io/Stringifier.java b/hadoop-common/src/main/java/org/apache/hadoop/io/Stringifier.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/Stringifier.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/Stringifier.java
diff --git a/common/src/java/org/apache/hadoop/io/Text.java b/hadoop-common/src/main/java/org/apache/hadoop/io/Text.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/Text.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/Text.java
diff --git a/common/src/java/org/apache/hadoop/io/TwoDArrayWritable.java b/hadoop-common/src/main/java/org/apache/hadoop/io/TwoDArrayWritable.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/TwoDArrayWritable.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/TwoDArrayWritable.java
diff --git a/common/src/java/org/apache/hadoop/io/UTF8.java b/hadoop-common/src/main/java/org/apache/hadoop/io/UTF8.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/UTF8.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/UTF8.java
diff --git a/common/src/java/org/apache/hadoop/io/VIntWritable.java b/hadoop-common/src/main/java/org/apache/hadoop/io/VIntWritable.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/VIntWritable.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/VIntWritable.java
diff --git a/common/src/java/org/apache/hadoop/io/VLongWritable.java b/hadoop-common/src/main/java/org/apache/hadoop/io/VLongWritable.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/VLongWritable.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/VLongWritable.java
diff --git a/common/src/java/org/apache/hadoop/io/VersionMismatchException.java b/hadoop-common/src/main/java/org/apache/hadoop/io/VersionMismatchException.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/VersionMismatchException.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/VersionMismatchException.java
diff --git a/common/src/java/org/apache/hadoop/io/VersionedWritable.java b/hadoop-common/src/main/java/org/apache/hadoop/io/VersionedWritable.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/VersionedWritable.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/VersionedWritable.java
diff --git a/common/src/java/org/apache/hadoop/io/Writable.java b/hadoop-common/src/main/java/org/apache/hadoop/io/Writable.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/Writable.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/Writable.java
diff --git a/common/src/java/org/apache/hadoop/io/WritableComparable.java b/hadoop-common/src/main/java/org/apache/hadoop/io/WritableComparable.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/WritableComparable.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/WritableComparable.java
diff --git a/common/src/java/org/apache/hadoop/io/WritableComparator.java b/hadoop-common/src/main/java/org/apache/hadoop/io/WritableComparator.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/WritableComparator.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/WritableComparator.java
diff --git a/common/src/java/org/apache/hadoop/io/WritableFactories.java b/hadoop-common/src/main/java/org/apache/hadoop/io/WritableFactories.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/WritableFactories.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/WritableFactories.java
diff --git a/common/src/java/org/apache/hadoop/io/WritableFactory.java b/hadoop-common/src/main/java/org/apache/hadoop/io/WritableFactory.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/WritableFactory.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/WritableFactory.java
diff --git a/common/src/java/org/apache/hadoop/io/WritableName.java b/hadoop-common/src/main/java/org/apache/hadoop/io/WritableName.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/WritableName.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/WritableName.java
diff --git a/common/src/java/org/apache/hadoop/io/WritableUtils.java b/hadoop-common/src/main/java/org/apache/hadoop/io/WritableUtils.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/WritableUtils.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/WritableUtils.java
diff --git a/common/src/java/org/apache/hadoop/io/compress/BZip2Codec.java b/hadoop-common/src/main/java/org/apache/hadoop/io/compress/BZip2Codec.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/compress/BZip2Codec.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/compress/BZip2Codec.java
diff --git a/common/src/java/org/apache/hadoop/io/compress/BlockCompressorStream.java b/hadoop-common/src/main/java/org/apache/hadoop/io/compress/BlockCompressorStream.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/compress/BlockCompressorStream.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/compress/BlockCompressorStream.java
diff --git a/common/src/java/org/apache/hadoop/io/compress/BlockDecompressorStream.java b/hadoop-common/src/main/java/org/apache/hadoop/io/compress/BlockDecompressorStream.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/compress/BlockDecompressorStream.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/compress/BlockDecompressorStream.java
diff --git a/common/src/java/org/apache/hadoop/io/compress/CodecPool.java b/hadoop-common/src/main/java/org/apache/hadoop/io/compress/CodecPool.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/compress/CodecPool.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/compress/CodecPool.java
diff --git a/common/src/java/org/apache/hadoop/io/compress/CompressionCodec.java b/hadoop-common/src/main/java/org/apache/hadoop/io/compress/CompressionCodec.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/compress/CompressionCodec.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/compress/CompressionCodec.java
diff --git a/common/src/java/org/apache/hadoop/io/compress/CompressionCodecFactory.java b/hadoop-common/src/main/java/org/apache/hadoop/io/compress/CompressionCodecFactory.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/compress/CompressionCodecFactory.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/compress/CompressionCodecFactory.java
diff --git a/common/src/java/org/apache/hadoop/io/compress/CompressionInputStream.java b/hadoop-common/src/main/java/org/apache/hadoop/io/compress/CompressionInputStream.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/compress/CompressionInputStream.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/compress/CompressionInputStream.java
diff --git a/common/src/java/org/apache/hadoop/io/compress/CompressionOutputStream.java b/hadoop-common/src/main/java/org/apache/hadoop/io/compress/CompressionOutputStream.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/compress/CompressionOutputStream.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/compress/CompressionOutputStream.java
diff --git a/common/src/java/org/apache/hadoop/io/compress/Compressor.java b/hadoop-common/src/main/java/org/apache/hadoop/io/compress/Compressor.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/compress/Compressor.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/compress/Compressor.java
diff --git a/common/src/java/org/apache/hadoop/io/compress/CompressorStream.java b/hadoop-common/src/main/java/org/apache/hadoop/io/compress/CompressorStream.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/compress/CompressorStream.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/compress/CompressorStream.java
diff --git a/common/src/java/org/apache/hadoop/io/compress/Decompressor.java b/hadoop-common/src/main/java/org/apache/hadoop/io/compress/Decompressor.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/compress/Decompressor.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/compress/Decompressor.java
diff --git a/common/src/java/org/apache/hadoop/io/compress/DecompressorStream.java b/hadoop-common/src/main/java/org/apache/hadoop/io/compress/DecompressorStream.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/compress/DecompressorStream.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/compress/DecompressorStream.java
diff --git a/common/src/java/org/apache/hadoop/io/compress/DefaultCodec.java b/hadoop-common/src/main/java/org/apache/hadoop/io/compress/DefaultCodec.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/compress/DefaultCodec.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/compress/DefaultCodec.java
diff --git a/common/src/java/org/apache/hadoop/io/compress/DeflateCodec.java b/hadoop-common/src/main/java/org/apache/hadoop/io/compress/DeflateCodec.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/compress/DeflateCodec.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/compress/DeflateCodec.java
diff --git a/common/src/java/org/apache/hadoop/io/compress/DoNotPool.java b/hadoop-common/src/main/java/org/apache/hadoop/io/compress/DoNotPool.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/compress/DoNotPool.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/compress/DoNotPool.java
diff --git a/common/src/java/org/apache/hadoop/io/compress/GzipCodec.java b/hadoop-common/src/main/java/org/apache/hadoop/io/compress/GzipCodec.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/compress/GzipCodec.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/compress/GzipCodec.java
diff --git a/common/src/java/org/apache/hadoop/io/compress/SnappyCodec.java b/hadoop-common/src/main/java/org/apache/hadoop/io/compress/SnappyCodec.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/compress/SnappyCodec.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/compress/SnappyCodec.java
diff --git a/common/src/java/org/apache/hadoop/io/compress/SplitCompressionInputStream.java b/hadoop-common/src/main/java/org/apache/hadoop/io/compress/SplitCompressionInputStream.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/compress/SplitCompressionInputStream.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/compress/SplitCompressionInputStream.java
diff --git a/common/src/java/org/apache/hadoop/io/compress/SplittableCompressionCodec.java b/hadoop-common/src/main/java/org/apache/hadoop/io/compress/SplittableCompressionCodec.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/compress/SplittableCompressionCodec.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/compress/SplittableCompressionCodec.java
diff --git a/common/src/java/org/apache/hadoop/io/compress/bzip2/BZip2Constants.java b/hadoop-common/src/main/java/org/apache/hadoop/io/compress/bzip2/BZip2Constants.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/compress/bzip2/BZip2Constants.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/compress/bzip2/BZip2Constants.java
diff --git a/common/src/java/org/apache/hadoop/io/compress/bzip2/BZip2DummyCompressor.java b/hadoop-common/src/main/java/org/apache/hadoop/io/compress/bzip2/BZip2DummyCompressor.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/compress/bzip2/BZip2DummyCompressor.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/compress/bzip2/BZip2DummyCompressor.java
diff --git a/common/src/java/org/apache/hadoop/io/compress/bzip2/BZip2DummyDecompressor.java b/hadoop-common/src/main/java/org/apache/hadoop/io/compress/bzip2/BZip2DummyDecompressor.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/compress/bzip2/BZip2DummyDecompressor.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/compress/bzip2/BZip2DummyDecompressor.java
diff --git a/common/src/java/org/apache/hadoop/io/compress/bzip2/CBZip2InputStream.java b/hadoop-common/src/main/java/org/apache/hadoop/io/compress/bzip2/CBZip2InputStream.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/compress/bzip2/CBZip2InputStream.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/compress/bzip2/CBZip2InputStream.java
diff --git a/common/src/java/org/apache/hadoop/io/compress/bzip2/CBZip2OutputStream.java b/hadoop-common/src/main/java/org/apache/hadoop/io/compress/bzip2/CBZip2OutputStream.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/compress/bzip2/CBZip2OutputStream.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/compress/bzip2/CBZip2OutputStream.java
diff --git a/common/src/java/org/apache/hadoop/io/compress/bzip2/CRC.java b/hadoop-common/src/main/java/org/apache/hadoop/io/compress/bzip2/CRC.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/compress/bzip2/CRC.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/compress/bzip2/CRC.java
diff --git a/common/src/java/org/apache/hadoop/io/compress/bzip2/package-info.java b/hadoop-common/src/main/java/org/apache/hadoop/io/compress/bzip2/package-info.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/compress/bzip2/package-info.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/compress/bzip2/package-info.java
diff --git a/common/src/java/org/apache/hadoop/io/compress/snappy/LoadSnappy.java b/hadoop-common/src/main/java/org/apache/hadoop/io/compress/snappy/LoadSnappy.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/compress/snappy/LoadSnappy.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/compress/snappy/LoadSnappy.java
diff --git a/common/src/java/org/apache/hadoop/io/compress/snappy/SnappyCompressor.java b/hadoop-common/src/main/java/org/apache/hadoop/io/compress/snappy/SnappyCompressor.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/compress/snappy/SnappyCompressor.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/compress/snappy/SnappyCompressor.java
diff --git a/common/src/java/org/apache/hadoop/io/compress/snappy/SnappyDecompressor.java b/hadoop-common/src/main/java/org/apache/hadoop/io/compress/snappy/SnappyDecompressor.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/compress/snappy/SnappyDecompressor.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/compress/snappy/SnappyDecompressor.java
diff --git a/common/src/java/org/apache/hadoop/io/compress/zlib/BuiltInGzipDecompressor.java b/hadoop-common/src/main/java/org/apache/hadoop/io/compress/zlib/BuiltInGzipDecompressor.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/compress/zlib/BuiltInGzipDecompressor.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/compress/zlib/BuiltInGzipDecompressor.java
diff --git a/common/src/java/org/apache/hadoop/io/compress/zlib/BuiltInZlibDeflater.java b/hadoop-common/src/main/java/org/apache/hadoop/io/compress/zlib/BuiltInZlibDeflater.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/compress/zlib/BuiltInZlibDeflater.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/compress/zlib/BuiltInZlibDeflater.java
diff --git a/common/src/java/org/apache/hadoop/io/compress/zlib/BuiltInZlibInflater.java b/hadoop-common/src/main/java/org/apache/hadoop/io/compress/zlib/BuiltInZlibInflater.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/compress/zlib/BuiltInZlibInflater.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/compress/zlib/BuiltInZlibInflater.java
diff --git a/common/src/java/org/apache/hadoop/io/compress/zlib/ZlibCompressor.java b/hadoop-common/src/main/java/org/apache/hadoop/io/compress/zlib/ZlibCompressor.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/compress/zlib/ZlibCompressor.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/compress/zlib/ZlibCompressor.java
diff --git a/common/src/java/org/apache/hadoop/io/compress/zlib/ZlibDecompressor.java b/hadoop-common/src/main/java/org/apache/hadoop/io/compress/zlib/ZlibDecompressor.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/compress/zlib/ZlibDecompressor.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/compress/zlib/ZlibDecompressor.java
diff --git a/common/src/java/org/apache/hadoop/io/compress/zlib/ZlibFactory.java b/hadoop-common/src/main/java/org/apache/hadoop/io/compress/zlib/ZlibFactory.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/compress/zlib/ZlibFactory.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/compress/zlib/ZlibFactory.java
diff --git a/common/src/java/org/apache/hadoop/io/compress/zlib/package-info.java b/hadoop-common/src/main/java/org/apache/hadoop/io/compress/zlib/package-info.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/compress/zlib/package-info.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/compress/zlib/package-info.java
diff --git a/common/src/java/org/apache/hadoop/io/file/tfile/BCFile.java b/hadoop-common/src/main/java/org/apache/hadoop/io/file/tfile/BCFile.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/file/tfile/BCFile.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/file/tfile/BCFile.java
diff --git a/common/src/java/org/apache/hadoop/io/file/tfile/BoundedRangeFileInputStream.java b/hadoop-common/src/main/java/org/apache/hadoop/io/file/tfile/BoundedRangeFileInputStream.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/file/tfile/BoundedRangeFileInputStream.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/file/tfile/BoundedRangeFileInputStream.java
diff --git a/common/src/java/org/apache/hadoop/io/file/tfile/ByteArray.java b/hadoop-common/src/main/java/org/apache/hadoop/io/file/tfile/ByteArray.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/file/tfile/ByteArray.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/file/tfile/ByteArray.java
diff --git a/common/src/java/org/apache/hadoop/io/file/tfile/Chunk.java b/hadoop-common/src/main/java/org/apache/hadoop/io/file/tfile/Chunk.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/file/tfile/Chunk.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/file/tfile/Chunk.java
diff --git a/common/src/java/org/apache/hadoop/io/file/tfile/CompareUtils.java b/hadoop-common/src/main/java/org/apache/hadoop/io/file/tfile/CompareUtils.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/file/tfile/CompareUtils.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/file/tfile/CompareUtils.java
diff --git a/common/src/java/org/apache/hadoop/io/file/tfile/Compression.java b/hadoop-common/src/main/java/org/apache/hadoop/io/file/tfile/Compression.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/file/tfile/Compression.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/file/tfile/Compression.java
diff --git a/common/src/java/org/apache/hadoop/io/file/tfile/MetaBlockAlreadyExists.java b/hadoop-common/src/main/java/org/apache/hadoop/io/file/tfile/MetaBlockAlreadyExists.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/file/tfile/MetaBlockAlreadyExists.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/file/tfile/MetaBlockAlreadyExists.java
diff --git a/common/src/java/org/apache/hadoop/io/file/tfile/MetaBlockDoesNotExist.java b/hadoop-common/src/main/java/org/apache/hadoop/io/file/tfile/MetaBlockDoesNotExist.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/file/tfile/MetaBlockDoesNotExist.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/file/tfile/MetaBlockDoesNotExist.java
diff --git a/common/src/java/org/apache/hadoop/io/file/tfile/RawComparable.java b/hadoop-common/src/main/java/org/apache/hadoop/io/file/tfile/RawComparable.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/file/tfile/RawComparable.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/file/tfile/RawComparable.java
diff --git a/common/src/java/org/apache/hadoop/io/file/tfile/SimpleBufferedOutputStream.java b/hadoop-common/src/main/java/org/apache/hadoop/io/file/tfile/SimpleBufferedOutputStream.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/file/tfile/SimpleBufferedOutputStream.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/file/tfile/SimpleBufferedOutputStream.java
diff --git a/common/src/java/org/apache/hadoop/io/file/tfile/TFile.java b/hadoop-common/src/main/java/org/apache/hadoop/io/file/tfile/TFile.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/file/tfile/TFile.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/file/tfile/TFile.java
diff --git a/common/src/java/org/apache/hadoop/io/file/tfile/TFileDumper.java b/hadoop-common/src/main/java/org/apache/hadoop/io/file/tfile/TFileDumper.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/file/tfile/TFileDumper.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/file/tfile/TFileDumper.java
diff --git a/common/src/java/org/apache/hadoop/io/file/tfile/Utils.java b/hadoop-common/src/main/java/org/apache/hadoop/io/file/tfile/Utils.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/file/tfile/Utils.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/file/tfile/Utils.java
diff --git a/common/src/java/org/apache/hadoop/io/nativeio/Errno.java b/hadoop-common/src/main/java/org/apache/hadoop/io/nativeio/Errno.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/nativeio/Errno.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/nativeio/Errno.java
diff --git a/common/src/java/org/apache/hadoop/io/nativeio/NativeIO.java b/hadoop-common/src/main/java/org/apache/hadoop/io/nativeio/NativeIO.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/nativeio/NativeIO.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/nativeio/NativeIO.java
diff --git a/common/src/java/org/apache/hadoop/io/nativeio/NativeIOException.java b/hadoop-common/src/main/java/org/apache/hadoop/io/nativeio/NativeIOException.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/nativeio/NativeIOException.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/nativeio/NativeIOException.java
diff --git a/common/src/java/org/apache/hadoop/io/package.html b/hadoop-common/src/main/java/org/apache/hadoop/io/package.html
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/package.html
rename to hadoop-common/src/main/java/org/apache/hadoop/io/package.html
diff --git a/common/src/java/org/apache/hadoop/io/retry/DefaultFailoverProxyProvider.java b/hadoop-common/src/main/java/org/apache/hadoop/io/retry/DefaultFailoverProxyProvider.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/retry/DefaultFailoverProxyProvider.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/retry/DefaultFailoverProxyProvider.java
diff --git a/common/src/java/org/apache/hadoop/io/retry/FailoverProxyProvider.java b/hadoop-common/src/main/java/org/apache/hadoop/io/retry/FailoverProxyProvider.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/retry/FailoverProxyProvider.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/retry/FailoverProxyProvider.java
diff --git a/common/src/java/org/apache/hadoop/io/retry/Idempotent.java b/hadoop-common/src/main/java/org/apache/hadoop/io/retry/Idempotent.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/retry/Idempotent.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/retry/Idempotent.java
diff --git a/common/src/java/org/apache/hadoop/io/retry/RetryInvocationHandler.java b/hadoop-common/src/main/java/org/apache/hadoop/io/retry/RetryInvocationHandler.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/retry/RetryInvocationHandler.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/retry/RetryInvocationHandler.java
diff --git a/common/src/java/org/apache/hadoop/io/retry/RetryPolicies.java b/hadoop-common/src/main/java/org/apache/hadoop/io/retry/RetryPolicies.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/retry/RetryPolicies.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/retry/RetryPolicies.java
diff --git a/common/src/java/org/apache/hadoop/io/retry/RetryPolicy.java b/hadoop-common/src/main/java/org/apache/hadoop/io/retry/RetryPolicy.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/retry/RetryPolicy.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/retry/RetryPolicy.java
diff --git a/common/src/java/org/apache/hadoop/io/retry/RetryProxy.java b/hadoop-common/src/main/java/org/apache/hadoop/io/retry/RetryProxy.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/retry/RetryProxy.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/retry/RetryProxy.java
diff --git a/common/src/java/org/apache/hadoop/io/retry/package-info.java b/hadoop-common/src/main/java/org/apache/hadoop/io/retry/package-info.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/retry/package-info.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/retry/package-info.java
diff --git a/common/src/java/org/apache/hadoop/io/retry/package.html b/hadoop-common/src/main/java/org/apache/hadoop/io/retry/package.html
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/retry/package.html
rename to hadoop-common/src/main/java/org/apache/hadoop/io/retry/package.html
diff --git a/common/src/java/org/apache/hadoop/io/serializer/Deserializer.java b/hadoop-common/src/main/java/org/apache/hadoop/io/serializer/Deserializer.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/serializer/Deserializer.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/serializer/Deserializer.java
diff --git a/common/src/java/org/apache/hadoop/io/serializer/DeserializerComparator.java b/hadoop-common/src/main/java/org/apache/hadoop/io/serializer/DeserializerComparator.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/serializer/DeserializerComparator.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/serializer/DeserializerComparator.java
diff --git a/common/src/java/org/apache/hadoop/io/serializer/JavaSerialization.java b/hadoop-common/src/main/java/org/apache/hadoop/io/serializer/JavaSerialization.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/serializer/JavaSerialization.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/serializer/JavaSerialization.java
diff --git a/common/src/java/org/apache/hadoop/io/serializer/JavaSerializationComparator.java b/hadoop-common/src/main/java/org/apache/hadoop/io/serializer/JavaSerializationComparator.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/serializer/JavaSerializationComparator.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/serializer/JavaSerializationComparator.java
diff --git a/common/src/java/org/apache/hadoop/io/serializer/Serialization.java b/hadoop-common/src/main/java/org/apache/hadoop/io/serializer/Serialization.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/serializer/Serialization.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/serializer/Serialization.java
diff --git a/common/src/java/org/apache/hadoop/io/serializer/SerializationFactory.java b/hadoop-common/src/main/java/org/apache/hadoop/io/serializer/SerializationFactory.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/serializer/SerializationFactory.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/serializer/SerializationFactory.java
diff --git a/common/src/java/org/apache/hadoop/io/serializer/Serializer.java b/hadoop-common/src/main/java/org/apache/hadoop/io/serializer/Serializer.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/serializer/Serializer.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/serializer/Serializer.java
diff --git a/common/src/java/org/apache/hadoop/io/serializer/WritableSerialization.java b/hadoop-common/src/main/java/org/apache/hadoop/io/serializer/WritableSerialization.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/serializer/WritableSerialization.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/serializer/WritableSerialization.java
diff --git a/common/src/java/org/apache/hadoop/io/serializer/avro/AvroReflectSerializable.java b/hadoop-common/src/main/java/org/apache/hadoop/io/serializer/avro/AvroReflectSerializable.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/serializer/avro/AvroReflectSerializable.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/serializer/avro/AvroReflectSerializable.java
diff --git a/common/src/java/org/apache/hadoop/io/serializer/avro/AvroReflectSerialization.java b/hadoop-common/src/main/java/org/apache/hadoop/io/serializer/avro/AvroReflectSerialization.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/serializer/avro/AvroReflectSerialization.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/serializer/avro/AvroReflectSerialization.java
diff --git a/common/src/java/org/apache/hadoop/io/serializer/avro/AvroSerialization.java b/hadoop-common/src/main/java/org/apache/hadoop/io/serializer/avro/AvroSerialization.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/serializer/avro/AvroSerialization.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/serializer/avro/AvroSerialization.java
diff --git a/common/src/java/org/apache/hadoop/io/serializer/avro/AvroSpecificSerialization.java b/hadoop-common/src/main/java/org/apache/hadoop/io/serializer/avro/AvroSpecificSerialization.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/serializer/avro/AvroSpecificSerialization.java
rename to hadoop-common/src/main/java/org/apache/hadoop/io/serializer/avro/AvroSpecificSerialization.java
diff --git a/common/src/java/org/apache/hadoop/io/serializer/avro/package.html b/hadoop-common/src/main/java/org/apache/hadoop/io/serializer/avro/package.html
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/serializer/avro/package.html
rename to hadoop-common/src/main/java/org/apache/hadoop/io/serializer/avro/package.html
diff --git a/common/src/java/org/apache/hadoop/io/serializer/package.html b/hadoop-common/src/main/java/org/apache/hadoop/io/serializer/package.html
similarity index 100%
rename from common/src/java/org/apache/hadoop/io/serializer/package.html
rename to hadoop-common/src/main/java/org/apache/hadoop/io/serializer/package.html
diff --git a/common/src/java/org/apache/hadoop/ipc/AvroRpcEngine.java b/hadoop-common/src/main/java/org/apache/hadoop/ipc/AvroRpcEngine.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/ipc/AvroRpcEngine.java
rename to hadoop-common/src/main/java/org/apache/hadoop/ipc/AvroRpcEngine.java
diff --git a/common/src/java/org/apache/hadoop/ipc/AvroSpecificRpcEngine.java b/hadoop-common/src/main/java/org/apache/hadoop/ipc/AvroSpecificRpcEngine.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/ipc/AvroSpecificRpcEngine.java
rename to hadoop-common/src/main/java/org/apache/hadoop/ipc/AvroSpecificRpcEngine.java
diff --git a/common/src/java/org/apache/hadoop/ipc/Client.java b/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/ipc/Client.java
rename to hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java
diff --git a/common/src/java/org/apache/hadoop/ipc/ClientCache.java b/hadoop-common/src/main/java/org/apache/hadoop/ipc/ClientCache.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/ipc/ClientCache.java
rename to hadoop-common/src/main/java/org/apache/hadoop/ipc/ClientCache.java
diff --git a/common/src/java/org/apache/hadoop/ipc/ConnectionHeader.java b/hadoop-common/src/main/java/org/apache/hadoop/ipc/ConnectionHeader.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/ipc/ConnectionHeader.java
rename to hadoop-common/src/main/java/org/apache/hadoop/ipc/ConnectionHeader.java
diff --git a/common/src/java/org/apache/hadoop/ipc/ProtocolProxy.java b/hadoop-common/src/main/java/org/apache/hadoop/ipc/ProtocolProxy.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/ipc/ProtocolProxy.java
rename to hadoop-common/src/main/java/org/apache/hadoop/ipc/ProtocolProxy.java
diff --git a/common/src/java/org/apache/hadoop/ipc/ProtocolSignature.java b/hadoop-common/src/main/java/org/apache/hadoop/ipc/ProtocolSignature.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/ipc/ProtocolSignature.java
rename to hadoop-common/src/main/java/org/apache/hadoop/ipc/ProtocolSignature.java
diff --git a/common/src/java/org/apache/hadoop/ipc/RPC.java b/hadoop-common/src/main/java/org/apache/hadoop/ipc/RPC.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/ipc/RPC.java
rename to hadoop-common/src/main/java/org/apache/hadoop/ipc/RPC.java
diff --git a/common/src/java/org/apache/hadoop/ipc/RemoteException.java b/hadoop-common/src/main/java/org/apache/hadoop/ipc/RemoteException.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/ipc/RemoteException.java
rename to hadoop-common/src/main/java/org/apache/hadoop/ipc/RemoteException.java
diff --git a/common/src/java/org/apache/hadoop/ipc/RpcClientException.java b/hadoop-common/src/main/java/org/apache/hadoop/ipc/RpcClientException.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/ipc/RpcClientException.java
rename to hadoop-common/src/main/java/org/apache/hadoop/ipc/RpcClientException.java
diff --git a/common/src/java/org/apache/hadoop/ipc/RpcEngine.java b/hadoop-common/src/main/java/org/apache/hadoop/ipc/RpcEngine.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/ipc/RpcEngine.java
rename to hadoop-common/src/main/java/org/apache/hadoop/ipc/RpcEngine.java
diff --git a/common/src/java/org/apache/hadoop/ipc/RpcException.java b/hadoop-common/src/main/java/org/apache/hadoop/ipc/RpcException.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/ipc/RpcException.java
rename to hadoop-common/src/main/java/org/apache/hadoop/ipc/RpcException.java
diff --git a/common/src/java/org/apache/hadoop/ipc/RpcServerException.java b/hadoop-common/src/main/java/org/apache/hadoop/ipc/RpcServerException.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/ipc/RpcServerException.java
rename to hadoop-common/src/main/java/org/apache/hadoop/ipc/RpcServerException.java
diff --git a/common/src/java/org/apache/hadoop/ipc/Server.java b/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/ipc/Server.java
rename to hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java
diff --git a/common/src/java/org/apache/hadoop/ipc/StandbyException.java b/hadoop-common/src/main/java/org/apache/hadoop/ipc/StandbyException.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/ipc/StandbyException.java
rename to hadoop-common/src/main/java/org/apache/hadoop/ipc/StandbyException.java
diff --git a/common/src/java/org/apache/hadoop/ipc/Status.java b/hadoop-common/src/main/java/org/apache/hadoop/ipc/Status.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/ipc/Status.java
rename to hadoop-common/src/main/java/org/apache/hadoop/ipc/Status.java
diff --git a/common/src/java/org/apache/hadoop/ipc/UnexpectedServerException.java b/hadoop-common/src/main/java/org/apache/hadoop/ipc/UnexpectedServerException.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/ipc/UnexpectedServerException.java
rename to hadoop-common/src/main/java/org/apache/hadoop/ipc/UnexpectedServerException.java
diff --git a/common/src/java/org/apache/hadoop/ipc/VersionedProtocol.java b/hadoop-common/src/main/java/org/apache/hadoop/ipc/VersionedProtocol.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/ipc/VersionedProtocol.java
rename to hadoop-common/src/main/java/org/apache/hadoop/ipc/VersionedProtocol.java
diff --git a/common/src/java/org/apache/hadoop/ipc/WritableRpcEngine.java b/hadoop-common/src/main/java/org/apache/hadoop/ipc/WritableRpcEngine.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/ipc/WritableRpcEngine.java
rename to hadoop-common/src/main/java/org/apache/hadoop/ipc/WritableRpcEngine.java
diff --git a/common/src/java/org/apache/hadoop/ipc/metrics/RpcDetailedMetrics.java b/hadoop-common/src/main/java/org/apache/hadoop/ipc/metrics/RpcDetailedMetrics.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/ipc/metrics/RpcDetailedMetrics.java
rename to hadoop-common/src/main/java/org/apache/hadoop/ipc/metrics/RpcDetailedMetrics.java
diff --git a/common/src/java/org/apache/hadoop/ipc/metrics/RpcMetrics.java b/hadoop-common/src/main/java/org/apache/hadoop/ipc/metrics/RpcMetrics.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/ipc/metrics/RpcMetrics.java
rename to hadoop-common/src/main/java/org/apache/hadoop/ipc/metrics/RpcMetrics.java
diff --git a/common/src/java/org/apache/hadoop/ipc/metrics/package-info.java b/hadoop-common/src/main/java/org/apache/hadoop/ipc/metrics/package-info.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/ipc/metrics/package-info.java
rename to hadoop-common/src/main/java/org/apache/hadoop/ipc/metrics/package-info.java
diff --git a/common/src/java/org/apache/hadoop/ipc/package-info.java b/hadoop-common/src/main/java/org/apache/hadoop/ipc/package-info.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/ipc/package-info.java
rename to hadoop-common/src/main/java/org/apache/hadoop/ipc/package-info.java
diff --git a/common/src/java/org/apache/hadoop/ipc/package.html b/hadoop-common/src/main/java/org/apache/hadoop/ipc/package.html
similarity index 100%
rename from common/src/java/org/apache/hadoop/ipc/package.html
rename to hadoop-common/src/main/java/org/apache/hadoop/ipc/package.html
diff --git a/common/src/java/org/apache/hadoop/jmx/JMXJsonServlet.java b/hadoop-common/src/main/java/org/apache/hadoop/jmx/JMXJsonServlet.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/jmx/JMXJsonServlet.java
rename to hadoop-common/src/main/java/org/apache/hadoop/jmx/JMXJsonServlet.java
diff --git a/common/src/java/org/apache/hadoop/jmx/package-info.java b/hadoop-common/src/main/java/org/apache/hadoop/jmx/package-info.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/jmx/package-info.java
rename to hadoop-common/src/main/java/org/apache/hadoop/jmx/package-info.java
diff --git a/common/src/java/org/apache/hadoop/log/EventCounter.java b/hadoop-common/src/main/java/org/apache/hadoop/log/EventCounter.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/log/EventCounter.java
rename to hadoop-common/src/main/java/org/apache/hadoop/log/EventCounter.java
diff --git a/common/src/java/org/apache/hadoop/log/LogLevel.java b/hadoop-common/src/main/java/org/apache/hadoop/log/LogLevel.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/log/LogLevel.java
rename to hadoop-common/src/main/java/org/apache/hadoop/log/LogLevel.java
diff --git a/common/src/java/org/apache/hadoop/log/metrics/EventCounter.java b/hadoop-common/src/main/java/org/apache/hadoop/log/metrics/EventCounter.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/log/metrics/EventCounter.java
rename to hadoop-common/src/main/java/org/apache/hadoop/log/metrics/EventCounter.java
diff --git a/common/src/java/org/apache/hadoop/metrics/ContextFactory.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics/ContextFactory.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics/ContextFactory.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics/ContextFactory.java
diff --git a/common/src/java/org/apache/hadoop/metrics/MetricsContext.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics/MetricsContext.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics/MetricsContext.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics/MetricsContext.java
diff --git a/common/src/java/org/apache/hadoop/metrics/MetricsException.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics/MetricsException.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics/MetricsException.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics/MetricsException.java
diff --git a/common/src/java/org/apache/hadoop/metrics/MetricsRecord.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics/MetricsRecord.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics/MetricsRecord.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics/MetricsRecord.java
diff --git a/common/src/java/org/apache/hadoop/metrics/MetricsServlet.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics/MetricsServlet.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics/MetricsServlet.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics/MetricsServlet.java
diff --git a/common/src/java/org/apache/hadoop/metrics/MetricsUtil.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics/MetricsUtil.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics/MetricsUtil.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics/MetricsUtil.java
diff --git a/common/src/java/org/apache/hadoop/metrics/Updater.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics/Updater.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics/Updater.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics/Updater.java
diff --git a/common/src/java/org/apache/hadoop/metrics/file/FileContext.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics/file/FileContext.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics/file/FileContext.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics/file/FileContext.java
diff --git a/common/src/java/org/apache/hadoop/metrics/file/package.html b/hadoop-common/src/main/java/org/apache/hadoop/metrics/file/package.html
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics/file/package.html
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics/file/package.html
diff --git a/common/src/java/org/apache/hadoop/metrics/ganglia/GangliaContext.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics/ganglia/GangliaContext.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics/ganglia/GangliaContext.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics/ganglia/GangliaContext.java
diff --git a/common/src/java/org/apache/hadoop/metrics/ganglia/GangliaContext31.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics/ganglia/GangliaContext31.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics/ganglia/GangliaContext31.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics/ganglia/GangliaContext31.java
diff --git a/common/src/java/org/apache/hadoop/metrics/ganglia/package.html b/hadoop-common/src/main/java/org/apache/hadoop/metrics/ganglia/package.html
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics/ganglia/package.html
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics/ganglia/package.html
diff --git a/common/src/java/org/apache/hadoop/metrics/jvm/EventCounter.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics/jvm/EventCounter.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics/jvm/EventCounter.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics/jvm/EventCounter.java
diff --git a/common/src/java/org/apache/hadoop/metrics/jvm/JvmMetrics.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics/jvm/JvmMetrics.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics/jvm/JvmMetrics.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics/jvm/JvmMetrics.java
diff --git a/common/src/java/org/apache/hadoop/metrics/jvm/package-info.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics/jvm/package-info.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics/jvm/package-info.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics/jvm/package-info.java
diff --git a/common/src/java/org/apache/hadoop/metrics/package.html b/hadoop-common/src/main/java/org/apache/hadoop/metrics/package.html
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics/package.html
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics/package.html
diff --git a/common/src/java/org/apache/hadoop/metrics/spi/AbstractMetricsContext.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics/spi/AbstractMetricsContext.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics/spi/AbstractMetricsContext.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics/spi/AbstractMetricsContext.java
diff --git a/common/src/java/org/apache/hadoop/metrics/spi/CompositeContext.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics/spi/CompositeContext.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics/spi/CompositeContext.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics/spi/CompositeContext.java
diff --git a/common/src/java/org/apache/hadoop/metrics/spi/MetricValue.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics/spi/MetricValue.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics/spi/MetricValue.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics/spi/MetricValue.java
diff --git a/common/src/java/org/apache/hadoop/metrics/spi/MetricsRecordImpl.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics/spi/MetricsRecordImpl.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics/spi/MetricsRecordImpl.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics/spi/MetricsRecordImpl.java
diff --git a/common/src/java/org/apache/hadoop/metrics/spi/NoEmitMetricsContext.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics/spi/NoEmitMetricsContext.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics/spi/NoEmitMetricsContext.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics/spi/NoEmitMetricsContext.java
diff --git a/common/src/java/org/apache/hadoop/metrics/spi/NullContext.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics/spi/NullContext.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics/spi/NullContext.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics/spi/NullContext.java
diff --git a/common/src/java/org/apache/hadoop/metrics/spi/NullContextWithUpdateThread.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics/spi/NullContextWithUpdateThread.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics/spi/NullContextWithUpdateThread.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics/spi/NullContextWithUpdateThread.java
diff --git a/common/src/java/org/apache/hadoop/metrics/spi/OutputRecord.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics/spi/OutputRecord.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics/spi/OutputRecord.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics/spi/OutputRecord.java
diff --git a/common/src/java/org/apache/hadoop/metrics/spi/Util.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics/spi/Util.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics/spi/Util.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics/spi/Util.java
diff --git a/common/src/java/org/apache/hadoop/metrics/spi/package.html b/hadoop-common/src/main/java/org/apache/hadoop/metrics/spi/package.html
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics/spi/package.html
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics/spi/package.html
diff --git a/common/src/java/org/apache/hadoop/metrics/util/MBeanUtil.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics/util/MBeanUtil.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics/util/MBeanUtil.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics/util/MBeanUtil.java
diff --git a/common/src/java/org/apache/hadoop/metrics/util/MetricsBase.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics/util/MetricsBase.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics/util/MetricsBase.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics/util/MetricsBase.java
diff --git a/common/src/java/org/apache/hadoop/metrics/util/MetricsDynamicMBeanBase.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics/util/MetricsDynamicMBeanBase.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics/util/MetricsDynamicMBeanBase.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics/util/MetricsDynamicMBeanBase.java
diff --git a/common/src/java/org/apache/hadoop/metrics/util/MetricsIntValue.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics/util/MetricsIntValue.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics/util/MetricsIntValue.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics/util/MetricsIntValue.java
diff --git a/common/src/java/org/apache/hadoop/metrics/util/MetricsLongValue.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics/util/MetricsLongValue.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics/util/MetricsLongValue.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics/util/MetricsLongValue.java
diff --git a/common/src/java/org/apache/hadoop/metrics/util/MetricsRegistry.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics/util/MetricsRegistry.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics/util/MetricsRegistry.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics/util/MetricsRegistry.java
diff --git a/common/src/java/org/apache/hadoop/metrics/util/MetricsTimeVaryingInt.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics/util/MetricsTimeVaryingInt.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics/util/MetricsTimeVaryingInt.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics/util/MetricsTimeVaryingInt.java
diff --git a/common/src/java/org/apache/hadoop/metrics/util/MetricsTimeVaryingLong.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics/util/MetricsTimeVaryingLong.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics/util/MetricsTimeVaryingLong.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics/util/MetricsTimeVaryingLong.java
diff --git a/common/src/java/org/apache/hadoop/metrics/util/MetricsTimeVaryingRate.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics/util/MetricsTimeVaryingRate.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics/util/MetricsTimeVaryingRate.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics/util/MetricsTimeVaryingRate.java
diff --git a/common/src/java/org/apache/hadoop/metrics/util/package-info.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics/util/package-info.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics/util/package-info.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics/util/package-info.java
diff --git a/common/src/java/org/apache/hadoop/metrics2/AbstractMetric.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics2/AbstractMetric.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics2/AbstractMetric.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics2/AbstractMetric.java
diff --git a/common/src/java/org/apache/hadoop/metrics2/MetricType.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics2/MetricType.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics2/MetricType.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics2/MetricType.java
diff --git a/common/src/java/org/apache/hadoop/metrics2/MetricsCollector.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics2/MetricsCollector.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics2/MetricsCollector.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics2/MetricsCollector.java
diff --git a/common/src/java/org/apache/hadoop/metrics2/MetricsException.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics2/MetricsException.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics2/MetricsException.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics2/MetricsException.java
diff --git a/common/src/java/org/apache/hadoop/metrics2/MetricsFilter.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics2/MetricsFilter.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics2/MetricsFilter.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics2/MetricsFilter.java
diff --git a/common/src/java/org/apache/hadoop/metrics2/MetricsInfo.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics2/MetricsInfo.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics2/MetricsInfo.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics2/MetricsInfo.java
diff --git a/common/src/java/org/apache/hadoop/metrics2/MetricsPlugin.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics2/MetricsPlugin.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics2/MetricsPlugin.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics2/MetricsPlugin.java
diff --git a/common/src/java/org/apache/hadoop/metrics2/MetricsRecord.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics2/MetricsRecord.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics2/MetricsRecord.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics2/MetricsRecord.java
diff --git a/common/src/java/org/apache/hadoop/metrics2/MetricsRecordBuilder.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics2/MetricsRecordBuilder.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics2/MetricsRecordBuilder.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics2/MetricsRecordBuilder.java
diff --git a/common/src/java/org/apache/hadoop/metrics2/MetricsSink.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics2/MetricsSink.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics2/MetricsSink.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics2/MetricsSink.java
diff --git a/common/src/java/org/apache/hadoop/metrics2/MetricsSource.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics2/MetricsSource.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics2/MetricsSource.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics2/MetricsSource.java
diff --git a/common/src/java/org/apache/hadoop/metrics2/MetricsSystem.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics2/MetricsSystem.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics2/MetricsSystem.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics2/MetricsSystem.java
diff --git a/common/src/java/org/apache/hadoop/metrics2/MetricsSystemMXBean.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics2/MetricsSystemMXBean.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics2/MetricsSystemMXBean.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics2/MetricsSystemMXBean.java
diff --git a/common/src/java/org/apache/hadoop/metrics2/MetricsTag.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics2/MetricsTag.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics2/MetricsTag.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics2/MetricsTag.java
diff --git a/common/src/java/org/apache/hadoop/metrics2/MetricsVisitor.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics2/MetricsVisitor.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics2/MetricsVisitor.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics2/MetricsVisitor.java
diff --git a/common/src/java/org/apache/hadoop/metrics2/annotation/Metric.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics2/annotation/Metric.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics2/annotation/Metric.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics2/annotation/Metric.java
diff --git a/common/src/java/org/apache/hadoop/metrics2/annotation/Metrics.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics2/annotation/Metrics.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics2/annotation/Metrics.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics2/annotation/Metrics.java
diff --git a/common/src/java/org/apache/hadoop/metrics2/annotation/package-info.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics2/annotation/package-info.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics2/annotation/package-info.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics2/annotation/package-info.java
diff --git a/common/src/java/org/apache/hadoop/metrics2/filter/AbstractPatternFilter.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics2/filter/AbstractPatternFilter.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics2/filter/AbstractPatternFilter.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics2/filter/AbstractPatternFilter.java
diff --git a/common/src/java/org/apache/hadoop/metrics2/filter/GlobFilter.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics2/filter/GlobFilter.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics2/filter/GlobFilter.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics2/filter/GlobFilter.java
diff --git a/common/src/java/org/apache/hadoop/metrics2/filter/RegexFilter.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics2/filter/RegexFilter.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics2/filter/RegexFilter.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics2/filter/RegexFilter.java
diff --git a/common/src/java/org/apache/hadoop/metrics2/filter/package-info.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics2/filter/package-info.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics2/filter/package-info.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics2/filter/package-info.java
diff --git a/common/src/java/org/apache/hadoop/metrics2/impl/AbstractMetricsRecord.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/AbstractMetricsRecord.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics2/impl/AbstractMetricsRecord.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/AbstractMetricsRecord.java
diff --git a/common/src/java/org/apache/hadoop/metrics2/impl/MBeanInfoBuilder.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MBeanInfoBuilder.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics2/impl/MBeanInfoBuilder.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MBeanInfoBuilder.java
diff --git a/common/src/java/org/apache/hadoop/metrics2/impl/MetricCounterInt.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricCounterInt.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics2/impl/MetricCounterInt.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricCounterInt.java
diff --git a/common/src/java/org/apache/hadoop/metrics2/impl/MetricCounterLong.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricCounterLong.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics2/impl/MetricCounterLong.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricCounterLong.java
diff --git a/common/src/java/org/apache/hadoop/metrics2/impl/MetricGaugeDouble.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricGaugeDouble.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics2/impl/MetricGaugeDouble.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricGaugeDouble.java
diff --git a/common/src/java/org/apache/hadoop/metrics2/impl/MetricGaugeFloat.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricGaugeFloat.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics2/impl/MetricGaugeFloat.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricGaugeFloat.java
diff --git a/common/src/java/org/apache/hadoop/metrics2/impl/MetricGaugeInt.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricGaugeInt.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics2/impl/MetricGaugeInt.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricGaugeInt.java
diff --git a/common/src/java/org/apache/hadoop/metrics2/impl/MetricGaugeLong.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricGaugeLong.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics2/impl/MetricGaugeLong.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricGaugeLong.java
diff --git a/common/src/java/org/apache/hadoop/metrics2/impl/MetricsBuffer.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsBuffer.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics2/impl/MetricsBuffer.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsBuffer.java
diff --git a/common/src/java/org/apache/hadoop/metrics2/impl/MetricsBufferBuilder.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsBufferBuilder.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics2/impl/MetricsBufferBuilder.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsBufferBuilder.java
diff --git a/common/src/java/org/apache/hadoop/metrics2/impl/MetricsCollectorImpl.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsCollectorImpl.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics2/impl/MetricsCollectorImpl.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsCollectorImpl.java
diff --git a/common/src/java/org/apache/hadoop/metrics2/impl/MetricsConfig.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsConfig.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics2/impl/MetricsConfig.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsConfig.java
diff --git a/common/src/java/org/apache/hadoop/metrics2/impl/MetricsConfigException.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsConfigException.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics2/impl/MetricsConfigException.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsConfigException.java
diff --git a/common/src/java/org/apache/hadoop/metrics2/impl/MetricsRecordBuilderImpl.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsRecordBuilderImpl.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics2/impl/MetricsRecordBuilderImpl.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsRecordBuilderImpl.java
diff --git a/common/src/java/org/apache/hadoop/metrics2/impl/MetricsRecordFiltered.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsRecordFiltered.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics2/impl/MetricsRecordFiltered.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsRecordFiltered.java
diff --git a/common/src/java/org/apache/hadoop/metrics2/impl/MetricsRecordImpl.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsRecordImpl.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics2/impl/MetricsRecordImpl.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsRecordImpl.java
diff --git a/common/src/java/org/apache/hadoop/metrics2/impl/MetricsSinkAdapter.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSinkAdapter.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics2/impl/MetricsSinkAdapter.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSinkAdapter.java
diff --git a/common/src/java/org/apache/hadoop/metrics2/impl/MetricsSourceAdapter.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSourceAdapter.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics2/impl/MetricsSourceAdapter.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSourceAdapter.java
diff --git a/common/src/java/org/apache/hadoop/metrics2/impl/MetricsSystemImpl.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSystemImpl.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics2/impl/MetricsSystemImpl.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSystemImpl.java
diff --git a/common/src/java/org/apache/hadoop/metrics2/impl/MsInfo.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MsInfo.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics2/impl/MsInfo.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MsInfo.java
diff --git a/common/src/java/org/apache/hadoop/metrics2/impl/SinkQueue.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/SinkQueue.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics2/impl/SinkQueue.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/SinkQueue.java
diff --git a/common/src/java/org/apache/hadoop/metrics2/impl/package-info.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/package-info.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics2/impl/package-info.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/package-info.java
diff --git a/common/src/java/org/apache/hadoop/metrics2/lib/DefaultMetricsFactory.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/DefaultMetricsFactory.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics2/lib/DefaultMetricsFactory.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/DefaultMetricsFactory.java
diff --git a/common/src/java/org/apache/hadoop/metrics2/lib/DefaultMetricsSystem.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/DefaultMetricsSystem.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics2/lib/DefaultMetricsSystem.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/DefaultMetricsSystem.java
diff --git a/common/src/java/org/apache/hadoop/metrics2/lib/Interns.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/Interns.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics2/lib/Interns.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/Interns.java
diff --git a/common/src/java/org/apache/hadoop/metrics2/lib/MethodMetric.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MethodMetric.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics2/lib/MethodMetric.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MethodMetric.java
diff --git a/common/src/java/org/apache/hadoop/metrics2/lib/MetricsAnnotations.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MetricsAnnotations.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics2/lib/MetricsAnnotations.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MetricsAnnotations.java
diff --git a/common/src/java/org/apache/hadoop/metrics2/lib/MetricsInfoImpl.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MetricsInfoImpl.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics2/lib/MetricsInfoImpl.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MetricsInfoImpl.java
diff --git a/common/src/java/org/apache/hadoop/metrics2/lib/MetricsRegistry.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MetricsRegistry.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics2/lib/MetricsRegistry.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MetricsRegistry.java
diff --git a/common/src/java/org/apache/hadoop/metrics2/lib/MetricsSourceBuilder.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MetricsSourceBuilder.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics2/lib/MetricsSourceBuilder.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MetricsSourceBuilder.java
diff --git a/common/src/java/org/apache/hadoop/metrics2/lib/MutableCounter.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MutableCounter.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics2/lib/MutableCounter.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MutableCounter.java
diff --git a/common/src/java/org/apache/hadoop/metrics2/lib/MutableCounterInt.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MutableCounterInt.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics2/lib/MutableCounterInt.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MutableCounterInt.java
diff --git a/common/src/java/org/apache/hadoop/metrics2/lib/MutableCounterLong.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MutableCounterLong.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics2/lib/MutableCounterLong.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MutableCounterLong.java
diff --git a/common/src/java/org/apache/hadoop/metrics2/lib/MutableGauge.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MutableGauge.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics2/lib/MutableGauge.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MutableGauge.java
diff --git a/common/src/java/org/apache/hadoop/metrics2/lib/MutableGaugeInt.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MutableGaugeInt.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics2/lib/MutableGaugeInt.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MutableGaugeInt.java
diff --git a/common/src/java/org/apache/hadoop/metrics2/lib/MutableGaugeLong.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MutableGaugeLong.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics2/lib/MutableGaugeLong.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MutableGaugeLong.java
diff --git a/common/src/java/org/apache/hadoop/metrics2/lib/MutableMetric.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MutableMetric.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics2/lib/MutableMetric.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MutableMetric.java
diff --git a/common/src/java/org/apache/hadoop/metrics2/lib/MutableMetricsFactory.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MutableMetricsFactory.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics2/lib/MutableMetricsFactory.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MutableMetricsFactory.java
diff --git a/common/src/java/org/apache/hadoop/metrics2/lib/MutableRate.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MutableRate.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics2/lib/MutableRate.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MutableRate.java
diff --git a/common/src/java/org/apache/hadoop/metrics2/lib/MutableRates.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MutableRates.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics2/lib/MutableRates.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MutableRates.java
diff --git a/common/src/java/org/apache/hadoop/metrics2/lib/MutableStat.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MutableStat.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics2/lib/MutableStat.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MutableStat.java
diff --git a/common/src/java/org/apache/hadoop/metrics2/lib/UniqueNames.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/UniqueNames.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics2/lib/UniqueNames.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/UniqueNames.java
diff --git a/common/src/java/org/apache/hadoop/metrics2/lib/package-info.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/package-info.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics2/lib/package-info.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/package-info.java
diff --git a/common/src/java/org/apache/hadoop/metrics2/package-info.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics2/package-info.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics2/package-info.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics2/package-info.java
diff --git a/common/src/java/org/apache/hadoop/metrics2/sink/FileSink.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics2/sink/FileSink.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics2/sink/FileSink.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics2/sink/FileSink.java
diff --git a/common/src/java/org/apache/hadoop/metrics2/sink/ganglia/AbstractGangliaSink.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics2/sink/ganglia/AbstractGangliaSink.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics2/sink/ganglia/AbstractGangliaSink.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics2/sink/ganglia/AbstractGangliaSink.java
diff --git a/common/src/java/org/apache/hadoop/metrics2/sink/ganglia/GangliaConf.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics2/sink/ganglia/GangliaConf.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics2/sink/ganglia/GangliaConf.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics2/sink/ganglia/GangliaConf.java
diff --git a/common/src/java/org/apache/hadoop/metrics2/sink/ganglia/GangliaMetricVisitor.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics2/sink/ganglia/GangliaMetricVisitor.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics2/sink/ganglia/GangliaMetricVisitor.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics2/sink/ganglia/GangliaMetricVisitor.java
diff --git a/common/src/java/org/apache/hadoop/metrics2/sink/ganglia/GangliaSink30.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics2/sink/ganglia/GangliaSink30.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics2/sink/ganglia/GangliaSink30.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics2/sink/ganglia/GangliaSink30.java
diff --git a/common/src/java/org/apache/hadoop/metrics2/sink/ganglia/GangliaSink31.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics2/sink/ganglia/GangliaSink31.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics2/sink/ganglia/GangliaSink31.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics2/sink/ganglia/GangliaSink31.java
diff --git a/common/src/java/org/apache/hadoop/metrics2/sink/package-info.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics2/sink/package-info.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics2/sink/package-info.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics2/sink/package-info.java
diff --git a/common/src/java/org/apache/hadoop/metrics2/source/JvmMetrics.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics2/source/JvmMetrics.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics2/source/JvmMetrics.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics2/source/JvmMetrics.java
diff --git a/common/src/java/org/apache/hadoop/metrics2/source/JvmMetricsInfo.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics2/source/JvmMetricsInfo.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics2/source/JvmMetricsInfo.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics2/source/JvmMetricsInfo.java
diff --git a/common/src/java/org/apache/hadoop/metrics2/util/Contracts.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics2/util/Contracts.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics2/util/Contracts.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics2/util/Contracts.java
diff --git a/common/src/java/org/apache/hadoop/metrics2/util/MBeans.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics2/util/MBeans.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics2/util/MBeans.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics2/util/MBeans.java
diff --git a/common/src/java/org/apache/hadoop/metrics2/util/MetricsCache.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics2/util/MetricsCache.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics2/util/MetricsCache.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics2/util/MetricsCache.java
diff --git a/common/src/java/org/apache/hadoop/metrics2/util/SampleStat.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics2/util/SampleStat.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics2/util/SampleStat.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics2/util/SampleStat.java
diff --git a/common/src/java/org/apache/hadoop/metrics2/util/Servers.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics2/util/Servers.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics2/util/Servers.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics2/util/Servers.java
diff --git a/common/src/java/org/apache/hadoop/metrics2/util/package-info.java b/hadoop-common/src/main/java/org/apache/hadoop/metrics2/util/package-info.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/metrics2/util/package-info.java
rename to hadoop-common/src/main/java/org/apache/hadoop/metrics2/util/package-info.java
diff --git a/common/src/java/org/apache/hadoop/net/CachedDNSToSwitchMapping.java b/hadoop-common/src/main/java/org/apache/hadoop/net/CachedDNSToSwitchMapping.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/net/CachedDNSToSwitchMapping.java
rename to hadoop-common/src/main/java/org/apache/hadoop/net/CachedDNSToSwitchMapping.java
diff --git a/common/src/java/org/apache/hadoop/net/DNS.java b/hadoop-common/src/main/java/org/apache/hadoop/net/DNS.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/net/DNS.java
rename to hadoop-common/src/main/java/org/apache/hadoop/net/DNS.java
diff --git a/common/src/java/org/apache/hadoop/net/DNSToSwitchMapping.java b/hadoop-common/src/main/java/org/apache/hadoop/net/DNSToSwitchMapping.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/net/DNSToSwitchMapping.java
rename to hadoop-common/src/main/java/org/apache/hadoop/net/DNSToSwitchMapping.java
diff --git a/common/src/java/org/apache/hadoop/net/NetUtils.java b/hadoop-common/src/main/java/org/apache/hadoop/net/NetUtils.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/net/NetUtils.java
rename to hadoop-common/src/main/java/org/apache/hadoop/net/NetUtils.java
diff --git a/common/src/java/org/apache/hadoop/net/NetworkTopology.java b/hadoop-common/src/main/java/org/apache/hadoop/net/NetworkTopology.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/net/NetworkTopology.java
rename to hadoop-common/src/main/java/org/apache/hadoop/net/NetworkTopology.java
diff --git a/common/src/java/org/apache/hadoop/net/Node.java b/hadoop-common/src/main/java/org/apache/hadoop/net/Node.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/net/Node.java
rename to hadoop-common/src/main/java/org/apache/hadoop/net/Node.java
diff --git a/common/src/java/org/apache/hadoop/net/NodeBase.java b/hadoop-common/src/main/java/org/apache/hadoop/net/NodeBase.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/net/NodeBase.java
rename to hadoop-common/src/main/java/org/apache/hadoop/net/NodeBase.java
diff --git a/common/src/java/org/apache/hadoop/net/ScriptBasedMapping.java b/hadoop-common/src/main/java/org/apache/hadoop/net/ScriptBasedMapping.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/net/ScriptBasedMapping.java
rename to hadoop-common/src/main/java/org/apache/hadoop/net/ScriptBasedMapping.java
diff --git a/common/src/java/org/apache/hadoop/net/SocketIOWithTimeout.java b/hadoop-common/src/main/java/org/apache/hadoop/net/SocketIOWithTimeout.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/net/SocketIOWithTimeout.java
rename to hadoop-common/src/main/java/org/apache/hadoop/net/SocketIOWithTimeout.java
diff --git a/common/src/java/org/apache/hadoop/net/SocketInputStream.java b/hadoop-common/src/main/java/org/apache/hadoop/net/SocketInputStream.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/net/SocketInputStream.java
rename to hadoop-common/src/main/java/org/apache/hadoop/net/SocketInputStream.java
diff --git a/common/src/java/org/apache/hadoop/net/SocketOutputStream.java b/hadoop-common/src/main/java/org/apache/hadoop/net/SocketOutputStream.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/net/SocketOutputStream.java
rename to hadoop-common/src/main/java/org/apache/hadoop/net/SocketOutputStream.java
diff --git a/common/src/java/org/apache/hadoop/net/SocksSocketFactory.java b/hadoop-common/src/main/java/org/apache/hadoop/net/SocksSocketFactory.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/net/SocksSocketFactory.java
rename to hadoop-common/src/main/java/org/apache/hadoop/net/SocksSocketFactory.java
diff --git a/common/src/java/org/apache/hadoop/net/StandardSocketFactory.java b/hadoop-common/src/main/java/org/apache/hadoop/net/StandardSocketFactory.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/net/StandardSocketFactory.java
rename to hadoop-common/src/main/java/org/apache/hadoop/net/StandardSocketFactory.java
diff --git a/common/src/java/org/apache/hadoop/net/package.html b/hadoop-common/src/main/java/org/apache/hadoop/net/package.html
similarity index 100%
rename from common/src/java/org/apache/hadoop/net/package.html
rename to hadoop-common/src/main/java/org/apache/hadoop/net/package.html
diff --git a/common/src/java/org/apache/hadoop/record/BinaryRecordInput.java b/hadoop-common/src/main/java/org/apache/hadoop/record/BinaryRecordInput.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/record/BinaryRecordInput.java
rename to hadoop-common/src/main/java/org/apache/hadoop/record/BinaryRecordInput.java
diff --git a/common/src/java/org/apache/hadoop/record/BinaryRecordOutput.java b/hadoop-common/src/main/java/org/apache/hadoop/record/BinaryRecordOutput.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/record/BinaryRecordOutput.java
rename to hadoop-common/src/main/java/org/apache/hadoop/record/BinaryRecordOutput.java
diff --git a/common/src/java/org/apache/hadoop/record/Buffer.java b/hadoop-common/src/main/java/org/apache/hadoop/record/Buffer.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/record/Buffer.java
rename to hadoop-common/src/main/java/org/apache/hadoop/record/Buffer.java
diff --git a/common/src/java/org/apache/hadoop/record/CsvRecordInput.java b/hadoop-common/src/main/java/org/apache/hadoop/record/CsvRecordInput.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/record/CsvRecordInput.java
rename to hadoop-common/src/main/java/org/apache/hadoop/record/CsvRecordInput.java
diff --git a/common/src/java/org/apache/hadoop/record/CsvRecordOutput.java b/hadoop-common/src/main/java/org/apache/hadoop/record/CsvRecordOutput.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/record/CsvRecordOutput.java
rename to hadoop-common/src/main/java/org/apache/hadoop/record/CsvRecordOutput.java
diff --git a/common/src/java/org/apache/hadoop/record/Index.java b/hadoop-common/src/main/java/org/apache/hadoop/record/Index.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/record/Index.java
rename to hadoop-common/src/main/java/org/apache/hadoop/record/Index.java
diff --git a/common/src/java/org/apache/hadoop/record/Record.java b/hadoop-common/src/main/java/org/apache/hadoop/record/Record.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/record/Record.java
rename to hadoop-common/src/main/java/org/apache/hadoop/record/Record.java
diff --git a/common/src/java/org/apache/hadoop/record/RecordComparator.java b/hadoop-common/src/main/java/org/apache/hadoop/record/RecordComparator.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/record/RecordComparator.java
rename to hadoop-common/src/main/java/org/apache/hadoop/record/RecordComparator.java
diff --git a/common/src/java/org/apache/hadoop/record/RecordInput.java b/hadoop-common/src/main/java/org/apache/hadoop/record/RecordInput.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/record/RecordInput.java
rename to hadoop-common/src/main/java/org/apache/hadoop/record/RecordInput.java
diff --git a/common/src/java/org/apache/hadoop/record/RecordOutput.java b/hadoop-common/src/main/java/org/apache/hadoop/record/RecordOutput.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/record/RecordOutput.java
rename to hadoop-common/src/main/java/org/apache/hadoop/record/RecordOutput.java
diff --git a/common/src/java/org/apache/hadoop/record/Utils.java b/hadoop-common/src/main/java/org/apache/hadoop/record/Utils.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/record/Utils.java
rename to hadoop-common/src/main/java/org/apache/hadoop/record/Utils.java
diff --git a/common/src/java/org/apache/hadoop/record/XmlRecordInput.java b/hadoop-common/src/main/java/org/apache/hadoop/record/XmlRecordInput.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/record/XmlRecordInput.java
rename to hadoop-common/src/main/java/org/apache/hadoop/record/XmlRecordInput.java
diff --git a/common/src/java/org/apache/hadoop/record/XmlRecordOutput.java b/hadoop-common/src/main/java/org/apache/hadoop/record/XmlRecordOutput.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/record/XmlRecordOutput.java
rename to hadoop-common/src/main/java/org/apache/hadoop/record/XmlRecordOutput.java
diff --git a/common/src/java/org/apache/hadoop/record/compiler/CGenerator.java b/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/CGenerator.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/record/compiler/CGenerator.java
rename to hadoop-common/src/main/java/org/apache/hadoop/record/compiler/CGenerator.java
diff --git a/common/src/java/org/apache/hadoop/record/compiler/CodeBuffer.java b/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/CodeBuffer.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/record/compiler/CodeBuffer.java
rename to hadoop-common/src/main/java/org/apache/hadoop/record/compiler/CodeBuffer.java
diff --git a/common/src/java/org/apache/hadoop/record/compiler/CodeGenerator.java b/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/CodeGenerator.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/record/compiler/CodeGenerator.java
rename to hadoop-common/src/main/java/org/apache/hadoop/record/compiler/CodeGenerator.java
diff --git a/common/src/java/org/apache/hadoop/record/compiler/Consts.java b/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/Consts.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/record/compiler/Consts.java
rename to hadoop-common/src/main/java/org/apache/hadoop/record/compiler/Consts.java
diff --git a/common/src/java/org/apache/hadoop/record/compiler/CppGenerator.java b/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/CppGenerator.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/record/compiler/CppGenerator.java
rename to hadoop-common/src/main/java/org/apache/hadoop/record/compiler/CppGenerator.java
diff --git a/common/src/java/org/apache/hadoop/record/compiler/JBoolean.java b/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JBoolean.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/record/compiler/JBoolean.java
rename to hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JBoolean.java
diff --git a/common/src/java/org/apache/hadoop/record/compiler/JBuffer.java b/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JBuffer.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/record/compiler/JBuffer.java
rename to hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JBuffer.java
diff --git a/common/src/java/org/apache/hadoop/record/compiler/JByte.java b/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JByte.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/record/compiler/JByte.java
rename to hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JByte.java
diff --git a/common/src/java/org/apache/hadoop/record/compiler/JCompType.java b/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JCompType.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/record/compiler/JCompType.java
rename to hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JCompType.java
diff --git a/common/src/java/org/apache/hadoop/record/compiler/JDouble.java b/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JDouble.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/record/compiler/JDouble.java
rename to hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JDouble.java
diff --git a/common/src/java/org/apache/hadoop/record/compiler/JField.java b/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JField.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/record/compiler/JField.java
rename to hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JField.java
diff --git a/common/src/java/org/apache/hadoop/record/compiler/JFile.java b/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JFile.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/record/compiler/JFile.java
rename to hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JFile.java
diff --git a/common/src/java/org/apache/hadoop/record/compiler/JFloat.java b/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JFloat.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/record/compiler/JFloat.java
rename to hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JFloat.java
diff --git a/common/src/java/org/apache/hadoop/record/compiler/JInt.java b/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JInt.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/record/compiler/JInt.java
rename to hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JInt.java
diff --git a/common/src/java/org/apache/hadoop/record/compiler/JLong.java b/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JLong.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/record/compiler/JLong.java
rename to hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JLong.java
diff --git a/common/src/java/org/apache/hadoop/record/compiler/JMap.java b/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JMap.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/record/compiler/JMap.java
rename to hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JMap.java
diff --git a/common/src/java/org/apache/hadoop/record/compiler/JRecord.java b/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JRecord.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/record/compiler/JRecord.java
rename to hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JRecord.java
diff --git a/common/src/java/org/apache/hadoop/record/compiler/JString.java b/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JString.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/record/compiler/JString.java
rename to hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JString.java
diff --git a/common/src/java/org/apache/hadoop/record/compiler/JType.java b/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JType.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/record/compiler/JType.java
rename to hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JType.java
diff --git a/common/src/java/org/apache/hadoop/record/compiler/JVector.java b/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JVector.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/record/compiler/JVector.java
rename to hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JVector.java
diff --git a/common/src/java/org/apache/hadoop/record/compiler/JavaGenerator.java b/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JavaGenerator.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/record/compiler/JavaGenerator.java
rename to hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JavaGenerator.java
diff --git a/common/src/java/org/apache/hadoop/record/compiler/ant/RccTask.java b/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/ant/RccTask.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/record/compiler/ant/RccTask.java
rename to hadoop-common/src/main/java/org/apache/hadoop/record/compiler/ant/RccTask.java
diff --git a/common/src/java/org/apache/hadoop/record/compiler/generated/ParseException.java b/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/generated/ParseException.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/record/compiler/generated/ParseException.java
rename to hadoop-common/src/main/java/org/apache/hadoop/record/compiler/generated/ParseException.java
diff --git a/common/src/java/org/apache/hadoop/record/compiler/generated/Rcc.java b/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/generated/Rcc.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/record/compiler/generated/Rcc.java
rename to hadoop-common/src/main/java/org/apache/hadoop/record/compiler/generated/Rcc.java
diff --git a/common/src/java/org/apache/hadoop/record/compiler/generated/RccConstants.java b/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/generated/RccConstants.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/record/compiler/generated/RccConstants.java
rename to hadoop-common/src/main/java/org/apache/hadoop/record/compiler/generated/RccConstants.java
diff --git a/common/src/java/org/apache/hadoop/record/compiler/generated/RccTokenManager.java b/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/generated/RccTokenManager.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/record/compiler/generated/RccTokenManager.java
rename to hadoop-common/src/main/java/org/apache/hadoop/record/compiler/generated/RccTokenManager.java
diff --git a/common/src/java/org/apache/hadoop/record/compiler/generated/SimpleCharStream.java b/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/generated/SimpleCharStream.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/record/compiler/generated/SimpleCharStream.java
rename to hadoop-common/src/main/java/org/apache/hadoop/record/compiler/generated/SimpleCharStream.java
diff --git a/common/src/java/org/apache/hadoop/record/compiler/generated/Token.java b/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/generated/Token.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/record/compiler/generated/Token.java
rename to hadoop-common/src/main/java/org/apache/hadoop/record/compiler/generated/Token.java
diff --git a/common/src/java/org/apache/hadoop/record/compiler/generated/TokenMgrError.java b/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/generated/TokenMgrError.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/record/compiler/generated/TokenMgrError.java
rename to hadoop-common/src/main/java/org/apache/hadoop/record/compiler/generated/TokenMgrError.java
diff --git a/common/src/java/org/apache/hadoop/record/compiler/generated/package.html b/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/generated/package.html
similarity index 100%
rename from common/src/java/org/apache/hadoop/record/compiler/generated/package.html
rename to hadoop-common/src/main/java/org/apache/hadoop/record/compiler/generated/package.html
diff --git a/common/src/java/org/apache/hadoop/record/compiler/generated/rcc.jj b/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/generated/rcc.jj
similarity index 100%
rename from common/src/java/org/apache/hadoop/record/compiler/generated/rcc.jj
rename to hadoop-common/src/main/java/org/apache/hadoop/record/compiler/generated/rcc.jj
diff --git a/common/src/java/org/apache/hadoop/record/compiler/package.html b/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/package.html
similarity index 100%
rename from common/src/java/org/apache/hadoop/record/compiler/package.html
rename to hadoop-common/src/main/java/org/apache/hadoop/record/compiler/package.html
diff --git a/common/src/java/org/apache/hadoop/record/meta/FieldTypeInfo.java b/hadoop-common/src/main/java/org/apache/hadoop/record/meta/FieldTypeInfo.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/record/meta/FieldTypeInfo.java
rename to hadoop-common/src/main/java/org/apache/hadoop/record/meta/FieldTypeInfo.java
diff --git a/common/src/java/org/apache/hadoop/record/meta/MapTypeID.java b/hadoop-common/src/main/java/org/apache/hadoop/record/meta/MapTypeID.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/record/meta/MapTypeID.java
rename to hadoop-common/src/main/java/org/apache/hadoop/record/meta/MapTypeID.java
diff --git a/common/src/java/org/apache/hadoop/record/meta/RecordTypeInfo.java b/hadoop-common/src/main/java/org/apache/hadoop/record/meta/RecordTypeInfo.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/record/meta/RecordTypeInfo.java
rename to hadoop-common/src/main/java/org/apache/hadoop/record/meta/RecordTypeInfo.java
diff --git a/common/src/java/org/apache/hadoop/record/meta/StructTypeID.java b/hadoop-common/src/main/java/org/apache/hadoop/record/meta/StructTypeID.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/record/meta/StructTypeID.java
rename to hadoop-common/src/main/java/org/apache/hadoop/record/meta/StructTypeID.java
diff --git a/common/src/java/org/apache/hadoop/record/meta/TypeID.java b/hadoop-common/src/main/java/org/apache/hadoop/record/meta/TypeID.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/record/meta/TypeID.java
rename to hadoop-common/src/main/java/org/apache/hadoop/record/meta/TypeID.java
diff --git a/common/src/java/org/apache/hadoop/record/meta/Utils.java b/hadoop-common/src/main/java/org/apache/hadoop/record/meta/Utils.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/record/meta/Utils.java
rename to hadoop-common/src/main/java/org/apache/hadoop/record/meta/Utils.java
diff --git a/common/src/java/org/apache/hadoop/record/meta/VectorTypeID.java b/hadoop-common/src/main/java/org/apache/hadoop/record/meta/VectorTypeID.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/record/meta/VectorTypeID.java
rename to hadoop-common/src/main/java/org/apache/hadoop/record/meta/VectorTypeID.java
diff --git a/common/src/java/org/apache/hadoop/record/package.html b/hadoop-common/src/main/java/org/apache/hadoop/record/package.html
similarity index 100%
rename from common/src/java/org/apache/hadoop/record/package.html
rename to hadoop-common/src/main/java/org/apache/hadoop/record/package.html
diff --git a/common/src/java/org/apache/hadoop/security/AccessControlException.java b/hadoop-common/src/main/java/org/apache/hadoop/security/AccessControlException.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/security/AccessControlException.java
rename to hadoop-common/src/main/java/org/apache/hadoop/security/AccessControlException.java
diff --git a/common/src/java/org/apache/hadoop/security/AnnotatedSecurityInfo.java b/hadoop-common/src/main/java/org/apache/hadoop/security/AnnotatedSecurityInfo.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/security/AnnotatedSecurityInfo.java
rename to hadoop-common/src/main/java/org/apache/hadoop/security/AnnotatedSecurityInfo.java
diff --git a/common/src/java/org/apache/hadoop/security/Credentials.java b/hadoop-common/src/main/java/org/apache/hadoop/security/Credentials.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/security/Credentials.java
rename to hadoop-common/src/main/java/org/apache/hadoop/security/Credentials.java
diff --git a/common/src/java/org/apache/hadoop/security/GroupMappingServiceProvider.java b/hadoop-common/src/main/java/org/apache/hadoop/security/GroupMappingServiceProvider.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/security/GroupMappingServiceProvider.java
rename to hadoop-common/src/main/java/org/apache/hadoop/security/GroupMappingServiceProvider.java
diff --git a/common/src/java/org/apache/hadoop/security/Groups.java b/hadoop-common/src/main/java/org/apache/hadoop/security/Groups.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/security/Groups.java
rename to hadoop-common/src/main/java/org/apache/hadoop/security/Groups.java
diff --git a/common/src/java/org/apache/hadoop/security/JniBasedUnixGroupsMapping.java b/hadoop-common/src/main/java/org/apache/hadoop/security/JniBasedUnixGroupsMapping.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/security/JniBasedUnixGroupsMapping.java
rename to hadoop-common/src/main/java/org/apache/hadoop/security/JniBasedUnixGroupsMapping.java
diff --git a/common/src/java/org/apache/hadoop/security/JniBasedUnixGroupsNetgroupMapping.java b/hadoop-common/src/main/java/org/apache/hadoop/security/JniBasedUnixGroupsNetgroupMapping.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/security/JniBasedUnixGroupsNetgroupMapping.java
rename to hadoop-common/src/main/java/org/apache/hadoop/security/JniBasedUnixGroupsNetgroupMapping.java
diff --git a/common/src/java/org/apache/hadoop/security/KerberosInfo.java b/hadoop-common/src/main/java/org/apache/hadoop/security/KerberosInfo.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/security/KerberosInfo.java
rename to hadoop-common/src/main/java/org/apache/hadoop/security/KerberosInfo.java
diff --git a/common/src/java/org/apache/hadoop/security/KerberosName.java b/hadoop-common/src/main/java/org/apache/hadoop/security/KerberosName.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/security/KerberosName.java
rename to hadoop-common/src/main/java/org/apache/hadoop/security/KerberosName.java
diff --git a/common/src/java/org/apache/hadoop/security/Krb5AndCertsSslSocketConnector.java b/hadoop-common/src/main/java/org/apache/hadoop/security/Krb5AndCertsSslSocketConnector.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/security/Krb5AndCertsSslSocketConnector.java
rename to hadoop-common/src/main/java/org/apache/hadoop/security/Krb5AndCertsSslSocketConnector.java
diff --git a/common/src/java/org/apache/hadoop/security/NetgroupCache.java b/hadoop-common/src/main/java/org/apache/hadoop/security/NetgroupCache.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/security/NetgroupCache.java
rename to hadoop-common/src/main/java/org/apache/hadoop/security/NetgroupCache.java
diff --git a/common/src/java/org/apache/hadoop/security/RefreshUserMappingsProtocol.java b/hadoop-common/src/main/java/org/apache/hadoop/security/RefreshUserMappingsProtocol.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/security/RefreshUserMappingsProtocol.java
rename to hadoop-common/src/main/java/org/apache/hadoop/security/RefreshUserMappingsProtocol.java
diff --git a/common/src/java/org/apache/hadoop/security/SaslInputStream.java b/hadoop-common/src/main/java/org/apache/hadoop/security/SaslInputStream.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/security/SaslInputStream.java
rename to hadoop-common/src/main/java/org/apache/hadoop/security/SaslInputStream.java
diff --git a/common/src/java/org/apache/hadoop/security/SaslOutputStream.java b/hadoop-common/src/main/java/org/apache/hadoop/security/SaslOutputStream.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/security/SaslOutputStream.java
rename to hadoop-common/src/main/java/org/apache/hadoop/security/SaslOutputStream.java
diff --git a/common/src/java/org/apache/hadoop/security/SaslRpcClient.java b/hadoop-common/src/main/java/org/apache/hadoop/security/SaslRpcClient.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/security/SaslRpcClient.java
rename to hadoop-common/src/main/java/org/apache/hadoop/security/SaslRpcClient.java
diff --git a/common/src/java/org/apache/hadoop/security/SaslRpcServer.java b/hadoop-common/src/main/java/org/apache/hadoop/security/SaslRpcServer.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/security/SaslRpcServer.java
rename to hadoop-common/src/main/java/org/apache/hadoop/security/SaslRpcServer.java
diff --git a/common/src/java/org/apache/hadoop/security/SecurityInfo.java b/hadoop-common/src/main/java/org/apache/hadoop/security/SecurityInfo.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/security/SecurityInfo.java
rename to hadoop-common/src/main/java/org/apache/hadoop/security/SecurityInfo.java
diff --git a/common/src/java/org/apache/hadoop/security/SecurityUtil.java b/hadoop-common/src/main/java/org/apache/hadoop/security/SecurityUtil.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/security/SecurityUtil.java
rename to hadoop-common/src/main/java/org/apache/hadoop/security/SecurityUtil.java
diff --git a/common/src/java/org/apache/hadoop/security/ShellBasedUnixGroupsMapping.java b/hadoop-common/src/main/java/org/apache/hadoop/security/ShellBasedUnixGroupsMapping.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/security/ShellBasedUnixGroupsMapping.java
rename to hadoop-common/src/main/java/org/apache/hadoop/security/ShellBasedUnixGroupsMapping.java
diff --git a/common/src/java/org/apache/hadoop/security/ShellBasedUnixGroupsNetgroupMapping.java b/hadoop-common/src/main/java/org/apache/hadoop/security/ShellBasedUnixGroupsNetgroupMapping.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/security/ShellBasedUnixGroupsNetgroupMapping.java
rename to hadoop-common/src/main/java/org/apache/hadoop/security/ShellBasedUnixGroupsNetgroupMapping.java
diff --git a/common/src/java/org/apache/hadoop/security/User.java b/hadoop-common/src/main/java/org/apache/hadoop/security/User.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/security/User.java
rename to hadoop-common/src/main/java/org/apache/hadoop/security/User.java
diff --git a/common/src/java/org/apache/hadoop/security/UserGroupInformation.java b/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/security/UserGroupInformation.java
rename to hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java
diff --git a/common/src/java/org/apache/hadoop/security/authorize/AccessControlList.java b/hadoop-common/src/main/java/org/apache/hadoop/security/authorize/AccessControlList.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/security/authorize/AccessControlList.java
rename to hadoop-common/src/main/java/org/apache/hadoop/security/authorize/AccessControlList.java
diff --git a/common/src/java/org/apache/hadoop/security/authorize/AuthorizationException.java b/hadoop-common/src/main/java/org/apache/hadoop/security/authorize/AuthorizationException.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/security/authorize/AuthorizationException.java
rename to hadoop-common/src/main/java/org/apache/hadoop/security/authorize/AuthorizationException.java
diff --git a/common/src/java/org/apache/hadoop/security/authorize/PolicyProvider.java b/hadoop-common/src/main/java/org/apache/hadoop/security/authorize/PolicyProvider.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/security/authorize/PolicyProvider.java
rename to hadoop-common/src/main/java/org/apache/hadoop/security/authorize/PolicyProvider.java
diff --git a/common/src/java/org/apache/hadoop/security/authorize/ProxyUsers.java b/hadoop-common/src/main/java/org/apache/hadoop/security/authorize/ProxyUsers.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/security/authorize/ProxyUsers.java
rename to hadoop-common/src/main/java/org/apache/hadoop/security/authorize/ProxyUsers.java
diff --git a/common/src/java/org/apache/hadoop/security/authorize/RefreshAuthorizationPolicyProtocol.java b/hadoop-common/src/main/java/org/apache/hadoop/security/authorize/RefreshAuthorizationPolicyProtocol.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/security/authorize/RefreshAuthorizationPolicyProtocol.java
rename to hadoop-common/src/main/java/org/apache/hadoop/security/authorize/RefreshAuthorizationPolicyProtocol.java
diff --git a/common/src/java/org/apache/hadoop/security/authorize/Service.java b/hadoop-common/src/main/java/org/apache/hadoop/security/authorize/Service.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/security/authorize/Service.java
rename to hadoop-common/src/main/java/org/apache/hadoop/security/authorize/Service.java
diff --git a/common/src/java/org/apache/hadoop/security/authorize/ServiceAuthorizationManager.java b/hadoop-common/src/main/java/org/apache/hadoop/security/authorize/ServiceAuthorizationManager.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/security/authorize/ServiceAuthorizationManager.java
rename to hadoop-common/src/main/java/org/apache/hadoop/security/authorize/ServiceAuthorizationManager.java
diff --git a/common/src/java/org/apache/hadoop/security/token/SecretManager.java b/hadoop-common/src/main/java/org/apache/hadoop/security/token/SecretManager.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/security/token/SecretManager.java
rename to hadoop-common/src/main/java/org/apache/hadoop/security/token/SecretManager.java
diff --git a/common/src/java/org/apache/hadoop/security/token/Token.java b/hadoop-common/src/main/java/org/apache/hadoop/security/token/Token.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/security/token/Token.java
rename to hadoop-common/src/main/java/org/apache/hadoop/security/token/Token.java
diff --git a/common/src/java/org/apache/hadoop/security/token/TokenIdentifier.java b/hadoop-common/src/main/java/org/apache/hadoop/security/token/TokenIdentifier.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/security/token/TokenIdentifier.java
rename to hadoop-common/src/main/java/org/apache/hadoop/security/token/TokenIdentifier.java
diff --git a/common/src/java/org/apache/hadoop/security/token/TokenInfo.java b/hadoop-common/src/main/java/org/apache/hadoop/security/token/TokenInfo.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/security/token/TokenInfo.java
rename to hadoop-common/src/main/java/org/apache/hadoop/security/token/TokenInfo.java
diff --git a/common/src/java/org/apache/hadoop/security/token/TokenSelector.java b/hadoop-common/src/main/java/org/apache/hadoop/security/token/TokenSelector.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/security/token/TokenSelector.java
rename to hadoop-common/src/main/java/org/apache/hadoop/security/token/TokenSelector.java
diff --git a/common/src/java/org/apache/hadoop/security/token/delegation/AbstractDelegationTokenIdentifier.java b/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/AbstractDelegationTokenIdentifier.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/security/token/delegation/AbstractDelegationTokenIdentifier.java
rename to hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/AbstractDelegationTokenIdentifier.java
diff --git a/common/src/java/org/apache/hadoop/security/token/delegation/AbstractDelegationTokenSecretManager.java b/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/AbstractDelegationTokenSecretManager.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/security/token/delegation/AbstractDelegationTokenSecretManager.java
rename to hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/AbstractDelegationTokenSecretManager.java
diff --git a/common/src/java/org/apache/hadoop/security/token/delegation/AbstractDelegationTokenSelector.java b/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/AbstractDelegationTokenSelector.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/security/token/delegation/AbstractDelegationTokenSelector.java
rename to hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/AbstractDelegationTokenSelector.java
diff --git a/common/src/java/org/apache/hadoop/security/token/delegation/DelegationKey.java b/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/DelegationKey.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/security/token/delegation/DelegationKey.java
rename to hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/DelegationKey.java
diff --git a/common/src/java/org/apache/hadoop/tools/GetGroupsBase.java b/hadoop-common/src/main/java/org/apache/hadoop/tools/GetGroupsBase.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/tools/GetGroupsBase.java
rename to hadoop-common/src/main/java/org/apache/hadoop/tools/GetGroupsBase.java
diff --git a/common/src/java/org/apache/hadoop/tools/GetUserMappingsProtocol.java b/hadoop-common/src/main/java/org/apache/hadoop/tools/GetUserMappingsProtocol.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/tools/GetUserMappingsProtocol.java
rename to hadoop-common/src/main/java/org/apache/hadoop/tools/GetUserMappingsProtocol.java
diff --git a/common/src/java/org/apache/hadoop/util/AsyncDiskService.java b/hadoop-common/src/main/java/org/apache/hadoop/util/AsyncDiskService.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/util/AsyncDiskService.java
rename to hadoop-common/src/main/java/org/apache/hadoop/util/AsyncDiskService.java
diff --git a/common/src/java/org/apache/hadoop/util/CyclicIteration.java b/hadoop-common/src/main/java/org/apache/hadoop/util/CyclicIteration.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/util/CyclicIteration.java
rename to hadoop-common/src/main/java/org/apache/hadoop/util/CyclicIteration.java
diff --git a/common/src/java/org/apache/hadoop/util/Daemon.java b/hadoop-common/src/main/java/org/apache/hadoop/util/Daemon.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/util/Daemon.java
rename to hadoop-common/src/main/java/org/apache/hadoop/util/Daemon.java
diff --git a/common/src/java/org/apache/hadoop/util/DataChecksum.java b/hadoop-common/src/main/java/org/apache/hadoop/util/DataChecksum.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/util/DataChecksum.java
rename to hadoop-common/src/main/java/org/apache/hadoop/util/DataChecksum.java
diff --git a/common/src/java/org/apache/hadoop/util/DiskChecker.java b/hadoop-common/src/main/java/org/apache/hadoop/util/DiskChecker.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/util/DiskChecker.java
rename to hadoop-common/src/main/java/org/apache/hadoop/util/DiskChecker.java
diff --git a/common/src/java/org/apache/hadoop/util/GenericOptionsParser.java b/hadoop-common/src/main/java/org/apache/hadoop/util/GenericOptionsParser.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/util/GenericOptionsParser.java
rename to hadoop-common/src/main/java/org/apache/hadoop/util/GenericOptionsParser.java
diff --git a/common/src/java/org/apache/hadoop/util/GenericsUtil.java b/hadoop-common/src/main/java/org/apache/hadoop/util/GenericsUtil.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/util/GenericsUtil.java
rename to hadoop-common/src/main/java/org/apache/hadoop/util/GenericsUtil.java
diff --git a/common/src/java/org/apache/hadoop/util/HeapSort.java b/hadoop-common/src/main/java/org/apache/hadoop/util/HeapSort.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/util/HeapSort.java
rename to hadoop-common/src/main/java/org/apache/hadoop/util/HeapSort.java
diff --git a/common/src/java/org/apache/hadoop/util/HostsFileReader.java b/hadoop-common/src/main/java/org/apache/hadoop/util/HostsFileReader.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/util/HostsFileReader.java
rename to hadoop-common/src/main/java/org/apache/hadoop/util/HostsFileReader.java
diff --git a/common/src/java/org/apache/hadoop/util/IndexedSortable.java b/hadoop-common/src/main/java/org/apache/hadoop/util/IndexedSortable.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/util/IndexedSortable.java
rename to hadoop-common/src/main/java/org/apache/hadoop/util/IndexedSortable.java
diff --git a/common/src/java/org/apache/hadoop/util/IndexedSorter.java b/hadoop-common/src/main/java/org/apache/hadoop/util/IndexedSorter.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/util/IndexedSorter.java
rename to hadoop-common/src/main/java/org/apache/hadoop/util/IndexedSorter.java
diff --git a/common/src/java/org/apache/hadoop/util/LineReader.java b/hadoop-common/src/main/java/org/apache/hadoop/util/LineReader.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/util/LineReader.java
rename to hadoop-common/src/main/java/org/apache/hadoop/util/LineReader.java
diff --git a/common/src/java/org/apache/hadoop/util/MergeSort.java b/hadoop-common/src/main/java/org/apache/hadoop/util/MergeSort.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/util/MergeSort.java
rename to hadoop-common/src/main/java/org/apache/hadoop/util/MergeSort.java
diff --git a/common/src/java/org/apache/hadoop/util/NativeCodeLoader.java b/hadoop-common/src/main/java/org/apache/hadoop/util/NativeCodeLoader.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/util/NativeCodeLoader.java
rename to hadoop-common/src/main/java/org/apache/hadoop/util/NativeCodeLoader.java
diff --git a/common/src/java/org/apache/hadoop/util/Options.java b/hadoop-common/src/main/java/org/apache/hadoop/util/Options.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/util/Options.java
rename to hadoop-common/src/main/java/org/apache/hadoop/util/Options.java
diff --git a/common/src/java/org/apache/hadoop/util/PlatformName.java b/hadoop-common/src/main/java/org/apache/hadoop/util/PlatformName.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/util/PlatformName.java
rename to hadoop-common/src/main/java/org/apache/hadoop/util/PlatformName.java
diff --git a/common/src/java/org/apache/hadoop/util/PrintJarMainClass.java b/hadoop-common/src/main/java/org/apache/hadoop/util/PrintJarMainClass.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/util/PrintJarMainClass.java
rename to hadoop-common/src/main/java/org/apache/hadoop/util/PrintJarMainClass.java
diff --git a/common/src/java/org/apache/hadoop/util/PriorityQueue.java b/hadoop-common/src/main/java/org/apache/hadoop/util/PriorityQueue.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/util/PriorityQueue.java
rename to hadoop-common/src/main/java/org/apache/hadoop/util/PriorityQueue.java
diff --git a/common/src/java/org/apache/hadoop/util/ProgramDriver.java b/hadoop-common/src/main/java/org/apache/hadoop/util/ProgramDriver.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/util/ProgramDriver.java
rename to hadoop-common/src/main/java/org/apache/hadoop/util/ProgramDriver.java
diff --git a/common/src/java/org/apache/hadoop/util/Progress.java b/hadoop-common/src/main/java/org/apache/hadoop/util/Progress.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/util/Progress.java
rename to hadoop-common/src/main/java/org/apache/hadoop/util/Progress.java
diff --git a/common/src/java/org/apache/hadoop/util/Progressable.java b/hadoop-common/src/main/java/org/apache/hadoop/util/Progressable.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/util/Progressable.java
rename to hadoop-common/src/main/java/org/apache/hadoop/util/Progressable.java
diff --git a/common/src/java/org/apache/hadoop/util/ProtoUtil.java b/hadoop-common/src/main/java/org/apache/hadoop/util/ProtoUtil.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/util/ProtoUtil.java
rename to hadoop-common/src/main/java/org/apache/hadoop/util/ProtoUtil.java
diff --git a/common/src/java/org/apache/hadoop/util/PureJavaCrc32.java b/hadoop-common/src/main/java/org/apache/hadoop/util/PureJavaCrc32.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/util/PureJavaCrc32.java
rename to hadoop-common/src/main/java/org/apache/hadoop/util/PureJavaCrc32.java
diff --git a/common/src/java/org/apache/hadoop/util/PureJavaCrc32C.java b/hadoop-common/src/main/java/org/apache/hadoop/util/PureJavaCrc32C.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/util/PureJavaCrc32C.java
rename to hadoop-common/src/main/java/org/apache/hadoop/util/PureJavaCrc32C.java
diff --git a/common/src/java/org/apache/hadoop/util/QuickSort.java b/hadoop-common/src/main/java/org/apache/hadoop/util/QuickSort.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/util/QuickSort.java
rename to hadoop-common/src/main/java/org/apache/hadoop/util/QuickSort.java
diff --git a/common/src/java/org/apache/hadoop/util/ReflectionUtils.java b/hadoop-common/src/main/java/org/apache/hadoop/util/ReflectionUtils.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/util/ReflectionUtils.java
rename to hadoop-common/src/main/java/org/apache/hadoop/util/ReflectionUtils.java
diff --git a/common/src/java/org/apache/hadoop/util/RunJar.java b/hadoop-common/src/main/java/org/apache/hadoop/util/RunJar.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/util/RunJar.java
rename to hadoop-common/src/main/java/org/apache/hadoop/util/RunJar.java
diff --git a/common/src/java/org/apache/hadoop/util/ServicePlugin.java b/hadoop-common/src/main/java/org/apache/hadoop/util/ServicePlugin.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/util/ServicePlugin.java
rename to hadoop-common/src/main/java/org/apache/hadoop/util/ServicePlugin.java
diff --git a/common/src/java/org/apache/hadoop/util/ServletUtil.java b/hadoop-common/src/main/java/org/apache/hadoop/util/ServletUtil.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/util/ServletUtil.java
rename to hadoop-common/src/main/java/org/apache/hadoop/util/ServletUtil.java
diff --git a/common/src/java/org/apache/hadoop/util/Shell.java b/hadoop-common/src/main/java/org/apache/hadoop/util/Shell.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/util/Shell.java
rename to hadoop-common/src/main/java/org/apache/hadoop/util/Shell.java
diff --git a/common/src/java/org/apache/hadoop/util/StringUtils.java b/hadoop-common/src/main/java/org/apache/hadoop/util/StringUtils.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/util/StringUtils.java
rename to hadoop-common/src/main/java/org/apache/hadoop/util/StringUtils.java
diff --git a/common/src/java/org/apache/hadoop/util/Tool.java b/hadoop-common/src/main/java/org/apache/hadoop/util/Tool.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/util/Tool.java
rename to hadoop-common/src/main/java/org/apache/hadoop/util/Tool.java
diff --git a/common/src/java/org/apache/hadoop/util/ToolRunner.java b/hadoop-common/src/main/java/org/apache/hadoop/util/ToolRunner.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/util/ToolRunner.java
rename to hadoop-common/src/main/java/org/apache/hadoop/util/ToolRunner.java
diff --git a/common/src/java/org/apache/hadoop/util/UTF8ByteArrayUtils.java b/hadoop-common/src/main/java/org/apache/hadoop/util/UTF8ByteArrayUtils.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/util/UTF8ByteArrayUtils.java
rename to hadoop-common/src/main/java/org/apache/hadoop/util/UTF8ByteArrayUtils.java
diff --git a/common/src/java/org/apache/hadoop/util/VersionInfo.java b/hadoop-common/src/main/java/org/apache/hadoop/util/VersionInfo.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/util/VersionInfo.java
rename to hadoop-common/src/main/java/org/apache/hadoop/util/VersionInfo.java
diff --git a/common/src/java/org/apache/hadoop/util/XMLUtils.java b/hadoop-common/src/main/java/org/apache/hadoop/util/XMLUtils.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/util/XMLUtils.java
rename to hadoop-common/src/main/java/org/apache/hadoop/util/XMLUtils.java
diff --git a/common/src/java/org/apache/hadoop/util/bloom/BloomFilter.java b/hadoop-common/src/main/java/org/apache/hadoop/util/bloom/BloomFilter.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/util/bloom/BloomFilter.java
rename to hadoop-common/src/main/java/org/apache/hadoop/util/bloom/BloomFilter.java
diff --git a/common/src/java/org/apache/hadoop/util/bloom/CountingBloomFilter.java b/hadoop-common/src/main/java/org/apache/hadoop/util/bloom/CountingBloomFilter.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/util/bloom/CountingBloomFilter.java
rename to hadoop-common/src/main/java/org/apache/hadoop/util/bloom/CountingBloomFilter.java
diff --git a/common/src/java/org/apache/hadoop/util/bloom/DynamicBloomFilter.java b/hadoop-common/src/main/java/org/apache/hadoop/util/bloom/DynamicBloomFilter.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/util/bloom/DynamicBloomFilter.java
rename to hadoop-common/src/main/java/org/apache/hadoop/util/bloom/DynamicBloomFilter.java
diff --git a/common/src/java/org/apache/hadoop/util/bloom/Filter.java b/hadoop-common/src/main/java/org/apache/hadoop/util/bloom/Filter.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/util/bloom/Filter.java
rename to hadoop-common/src/main/java/org/apache/hadoop/util/bloom/Filter.java
diff --git a/common/src/java/org/apache/hadoop/util/bloom/HashFunction.java b/hadoop-common/src/main/java/org/apache/hadoop/util/bloom/HashFunction.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/util/bloom/HashFunction.java
rename to hadoop-common/src/main/java/org/apache/hadoop/util/bloom/HashFunction.java
diff --git a/common/src/java/org/apache/hadoop/util/bloom/Key.java b/hadoop-common/src/main/java/org/apache/hadoop/util/bloom/Key.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/util/bloom/Key.java
rename to hadoop-common/src/main/java/org/apache/hadoop/util/bloom/Key.java
diff --git a/common/src/java/org/apache/hadoop/util/bloom/RemoveScheme.java b/hadoop-common/src/main/java/org/apache/hadoop/util/bloom/RemoveScheme.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/util/bloom/RemoveScheme.java
rename to hadoop-common/src/main/java/org/apache/hadoop/util/bloom/RemoveScheme.java
diff --git a/common/src/java/org/apache/hadoop/util/bloom/RetouchedBloomFilter.java b/hadoop-common/src/main/java/org/apache/hadoop/util/bloom/RetouchedBloomFilter.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/util/bloom/RetouchedBloomFilter.java
rename to hadoop-common/src/main/java/org/apache/hadoop/util/bloom/RetouchedBloomFilter.java
diff --git a/common/src/java/org/apache/hadoop/util/hash/Hash.java b/hadoop-common/src/main/java/org/apache/hadoop/util/hash/Hash.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/util/hash/Hash.java
rename to hadoop-common/src/main/java/org/apache/hadoop/util/hash/Hash.java
diff --git a/common/src/java/org/apache/hadoop/util/hash/JenkinsHash.java b/hadoop-common/src/main/java/org/apache/hadoop/util/hash/JenkinsHash.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/util/hash/JenkinsHash.java
rename to hadoop-common/src/main/java/org/apache/hadoop/util/hash/JenkinsHash.java
diff --git a/common/src/java/org/apache/hadoop/util/hash/MurmurHash.java b/hadoop-common/src/main/java/org/apache/hadoop/util/hash/MurmurHash.java
similarity index 100%
rename from common/src/java/org/apache/hadoop/util/hash/MurmurHash.java
rename to hadoop-common/src/main/java/org/apache/hadoop/util/hash/MurmurHash.java
diff --git a/common/src/java/org/apache/hadoop/util/package.html b/hadoop-common/src/main/java/org/apache/hadoop/util/package.html
similarity index 100%
rename from common/src/java/org/apache/hadoop/util/package.html
rename to hadoop-common/src/main/java/org/apache/hadoop/util/package.html
diff --git a/common/src/java/overview.html b/hadoop-common/src/main/java/overview.html
similarity index 100%
rename from common/src/java/overview.html
rename to hadoop-common/src/main/java/overview.html
diff --git a/common/src/native/.autom4te.cfg b/hadoop-common/src/main/native/.autom4te.cfg
similarity index 100%
rename from common/src/native/.autom4te.cfg
rename to hadoop-common/src/main/native/.autom4te.cfg
diff --git a/common/src/native/AUTHORS b/hadoop-common/src/main/native/AUTHORS
similarity index 100%
rename from common/src/native/AUTHORS
rename to hadoop-common/src/main/native/AUTHORS
diff --git a/common/src/native/COPYING b/hadoop-common/src/main/native/COPYING
similarity index 100%
rename from common/src/native/COPYING
rename to hadoop-common/src/main/native/COPYING
diff --git a/common/src/native/ChangeLog b/hadoop-common/src/main/native/ChangeLog
similarity index 100%
rename from common/src/native/ChangeLog
rename to hadoop-common/src/main/native/ChangeLog
diff --git a/common/src/native/Makefile.am b/hadoop-common/src/main/native/Makefile.am
similarity index 91%
rename from common/src/native/Makefile.am
rename to hadoop-common/src/main/native/Makefile.am
index 286be3159b..d981641730 100644
--- a/common/src/native/Makefile.am
+++ b/hadoop-common/src/main/native/Makefile.am
@@ -33,10 +33,7 @@ export PLATFORM = $(shell echo $$OS_NAME | tr [A-Z] [a-z])
 
 ACLOCAL_AMFLAGS = -I m4 
 AM_CPPFLAGS = @JNI_CPPFLAGS@ -I$(HADOOP_NATIVE_SRCDIR)/src \
-              -Isrc/org/apache/hadoop/io/compress/zlib \
-              -Isrc/org/apache/hadoop/io/compress/snappy \
-              -Isrc/org/apache/hadoop/security \
-              -Isrc/org/apache/hadoop/io/nativeio/
+              -I$(HADOOP_NATIVE_SRCDIR)/javah
 AM_LDFLAGS = @JNI_LDFLAGS@
 AM_CFLAGS = -g -Wall -fPIC -O2
 if SPECIFY_DATA_MODEL
diff --git a/common/src/native/NEWS b/hadoop-common/src/main/native/NEWS
similarity index 100%
rename from common/src/native/NEWS
rename to hadoop-common/src/main/native/NEWS
diff --git a/common/src/native/README b/hadoop-common/src/main/native/README
similarity index 100%
rename from common/src/native/README
rename to hadoop-common/src/main/native/README
diff --git a/common/src/native/acinclude.m4 b/hadoop-common/src/main/native/acinclude.m4
similarity index 100%
rename from common/src/native/acinclude.m4
rename to hadoop-common/src/main/native/acinclude.m4
diff --git a/common/src/native/configure.ac b/hadoop-common/src/main/native/configure.ac
similarity index 100%
rename from common/src/native/configure.ac
rename to hadoop-common/src/main/native/configure.ac
diff --git a/common/src/native/lib/Makefile.am b/hadoop-common/src/main/native/lib/Makefile.am
similarity index 100%
rename from common/src/native/lib/Makefile.am
rename to hadoop-common/src/main/native/lib/Makefile.am
diff --git a/common/src/native/src/org/apache/hadoop/io/compress/snappy/SnappyCompressor.c b/hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/snappy/SnappyCompressor.c
similarity index 100%
rename from common/src/native/src/org/apache/hadoop/io/compress/snappy/SnappyCompressor.c
rename to hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/snappy/SnappyCompressor.c
diff --git a/common/src/native/src/org/apache/hadoop/io/compress/snappy/SnappyDecompressor.c b/hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/snappy/SnappyDecompressor.c
similarity index 100%
rename from common/src/native/src/org/apache/hadoop/io/compress/snappy/SnappyDecompressor.c
rename to hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/snappy/SnappyDecompressor.c
diff --git a/common/src/native/src/org/apache/hadoop/io/compress/snappy/org_apache_hadoop_io_compress_snappy.h b/hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/snappy/org_apache_hadoop_io_compress_snappy.h
similarity index 100%
rename from common/src/native/src/org/apache/hadoop/io/compress/snappy/org_apache_hadoop_io_compress_snappy.h
rename to hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/snappy/org_apache_hadoop_io_compress_snappy.h
diff --git a/common/src/native/src/org/apache/hadoop/io/compress/zlib/Makefile.am b/hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/zlib/Makefile.am
similarity index 100%
rename from common/src/native/src/org/apache/hadoop/io/compress/zlib/Makefile.am
rename to hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/zlib/Makefile.am
diff --git a/common/src/native/src/org/apache/hadoop/io/compress/zlib/ZlibCompressor.c b/hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/zlib/ZlibCompressor.c
similarity index 100%
rename from common/src/native/src/org/apache/hadoop/io/compress/zlib/ZlibCompressor.c
rename to hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/zlib/ZlibCompressor.c
diff --git a/common/src/native/src/org/apache/hadoop/io/compress/zlib/ZlibDecompressor.c b/hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/zlib/ZlibDecompressor.c
similarity index 100%
rename from common/src/native/src/org/apache/hadoop/io/compress/zlib/ZlibDecompressor.c
rename to hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/zlib/ZlibDecompressor.c
diff --git a/common/src/native/src/org/apache/hadoop/io/compress/zlib/org_apache_hadoop_io_compress_zlib.h b/hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/zlib/org_apache_hadoop_io_compress_zlib.h
similarity index 100%
rename from common/src/native/src/org/apache/hadoop/io/compress/zlib/org_apache_hadoop_io_compress_zlib.h
rename to hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/zlib/org_apache_hadoop_io_compress_zlib.h
diff --git a/common/src/native/src/org/apache/hadoop/io/nativeio/NativeIO.c b/hadoop-common/src/main/native/src/org/apache/hadoop/io/nativeio/NativeIO.c
similarity index 100%
rename from common/src/native/src/org/apache/hadoop/io/nativeio/NativeIO.c
rename to hadoop-common/src/main/native/src/org/apache/hadoop/io/nativeio/NativeIO.c
diff --git a/common/src/native/src/org/apache/hadoop/io/nativeio/errno_enum.c b/hadoop-common/src/main/native/src/org/apache/hadoop/io/nativeio/errno_enum.c
similarity index 100%
rename from common/src/native/src/org/apache/hadoop/io/nativeio/errno_enum.c
rename to hadoop-common/src/main/native/src/org/apache/hadoop/io/nativeio/errno_enum.c
diff --git a/common/src/native/src/org/apache/hadoop/io/nativeio/errno_enum.h b/hadoop-common/src/main/native/src/org/apache/hadoop/io/nativeio/errno_enum.h
similarity index 100%
rename from common/src/native/src/org/apache/hadoop/io/nativeio/errno_enum.h
rename to hadoop-common/src/main/native/src/org/apache/hadoop/io/nativeio/errno_enum.h
diff --git a/common/src/native/src/org/apache/hadoop/io/nativeio/file_descriptor.c b/hadoop-common/src/main/native/src/org/apache/hadoop/io/nativeio/file_descriptor.c
similarity index 100%
rename from common/src/native/src/org/apache/hadoop/io/nativeio/file_descriptor.c
rename to hadoop-common/src/main/native/src/org/apache/hadoop/io/nativeio/file_descriptor.c
diff --git a/common/src/native/src/org/apache/hadoop/io/nativeio/file_descriptor.h b/hadoop-common/src/main/native/src/org/apache/hadoop/io/nativeio/file_descriptor.h
similarity index 100%
rename from common/src/native/src/org/apache/hadoop/io/nativeio/file_descriptor.h
rename to hadoop-common/src/main/native/src/org/apache/hadoop/io/nativeio/file_descriptor.h
diff --git a/common/src/native/src/org/apache/hadoop/security/JniBasedUnixGroupsMapping.c b/hadoop-common/src/main/native/src/org/apache/hadoop/security/JniBasedUnixGroupsMapping.c
similarity index 100%
rename from common/src/native/src/org/apache/hadoop/security/JniBasedUnixGroupsMapping.c
rename to hadoop-common/src/main/native/src/org/apache/hadoop/security/JniBasedUnixGroupsMapping.c
diff --git a/common/src/native/src/org/apache/hadoop/security/JniBasedUnixGroupsNetgroupMapping.c b/hadoop-common/src/main/native/src/org/apache/hadoop/security/JniBasedUnixGroupsNetgroupMapping.c
similarity index 100%
rename from common/src/native/src/org/apache/hadoop/security/JniBasedUnixGroupsNetgroupMapping.c
rename to hadoop-common/src/main/native/src/org/apache/hadoop/security/JniBasedUnixGroupsNetgroupMapping.c
diff --git a/common/src/native/src/org/apache/hadoop/security/getGroup.c b/hadoop-common/src/main/native/src/org/apache/hadoop/security/getGroup.c
similarity index 100%
rename from common/src/native/src/org/apache/hadoop/security/getGroup.c
rename to hadoop-common/src/main/native/src/org/apache/hadoop/security/getGroup.c
diff --git a/common/src/native/src/org_apache_hadoop.h b/hadoop-common/src/main/native/src/org_apache_hadoop.h
similarity index 100%
rename from common/src/native/src/org_apache_hadoop.h
rename to hadoop-common/src/main/native/src/org_apache_hadoop.h
diff --git a/common/src/packages/deb/hadoop.control/conffile b/hadoop-common/src/main/packages/deb/hadoop.control/conffile
similarity index 100%
rename from common/src/packages/deb/hadoop.control/conffile
rename to hadoop-common/src/main/packages/deb/hadoop.control/conffile
diff --git a/common/src/packages/deb/hadoop.control/control b/hadoop-common/src/main/packages/deb/hadoop.control/control
similarity index 100%
rename from common/src/packages/deb/hadoop.control/control
rename to hadoop-common/src/main/packages/deb/hadoop.control/control
diff --git a/common/src/packages/deb/hadoop.control/postinst b/hadoop-common/src/main/packages/deb/hadoop.control/postinst
similarity index 100%
rename from common/src/packages/deb/hadoop.control/postinst
rename to hadoop-common/src/main/packages/deb/hadoop.control/postinst
diff --git a/common/src/packages/deb/hadoop.control/postrm b/hadoop-common/src/main/packages/deb/hadoop.control/postrm
similarity index 100%
rename from common/src/packages/deb/hadoop.control/postrm
rename to hadoop-common/src/main/packages/deb/hadoop.control/postrm
diff --git a/common/src/packages/deb/hadoop.control/preinst b/hadoop-common/src/main/packages/deb/hadoop.control/preinst
similarity index 100%
rename from common/src/packages/deb/hadoop.control/preinst
rename to hadoop-common/src/main/packages/deb/hadoop.control/preinst
diff --git a/common/src/packages/deb/hadoop.control/prerm b/hadoop-common/src/main/packages/deb/hadoop.control/prerm
similarity index 100%
rename from common/src/packages/deb/hadoop.control/prerm
rename to hadoop-common/src/main/packages/deb/hadoop.control/prerm
diff --git a/common/src/packages/deb/init.d/hadoop-datanode b/hadoop-common/src/main/packages/deb/init.d/hadoop-datanode
similarity index 100%
rename from common/src/packages/deb/init.d/hadoop-datanode
rename to hadoop-common/src/main/packages/deb/init.d/hadoop-datanode
diff --git a/common/src/packages/deb/init.d/hadoop-jobtracker b/hadoop-common/src/main/packages/deb/init.d/hadoop-jobtracker
similarity index 100%
rename from common/src/packages/deb/init.d/hadoop-jobtracker
rename to hadoop-common/src/main/packages/deb/init.d/hadoop-jobtracker
diff --git a/common/src/packages/deb/init.d/hadoop-namenode b/hadoop-common/src/main/packages/deb/init.d/hadoop-namenode
similarity index 100%
rename from common/src/packages/deb/init.d/hadoop-namenode
rename to hadoop-common/src/main/packages/deb/init.d/hadoop-namenode
diff --git a/common/src/packages/deb/init.d/hadoop-tasktracker b/hadoop-common/src/main/packages/deb/init.d/hadoop-tasktracker
similarity index 100%
rename from common/src/packages/deb/init.d/hadoop-tasktracker
rename to hadoop-common/src/main/packages/deb/init.d/hadoop-tasktracker
diff --git a/common/src/packages/hadoop-create-user.sh b/hadoop-common/src/main/packages/hadoop-create-user.sh
similarity index 100%
rename from common/src/packages/hadoop-create-user.sh
rename to hadoop-common/src/main/packages/hadoop-create-user.sh
diff --git a/common/src/packages/hadoop-setup-conf.sh b/hadoop-common/src/main/packages/hadoop-setup-conf.sh
similarity index 100%
rename from common/src/packages/hadoop-setup-conf.sh
rename to hadoop-common/src/main/packages/hadoop-setup-conf.sh
diff --git a/common/src/packages/hadoop-setup-hdfs.sh b/hadoop-common/src/main/packages/hadoop-setup-hdfs.sh
similarity index 100%
rename from common/src/packages/hadoop-setup-hdfs.sh
rename to hadoop-common/src/main/packages/hadoop-setup-hdfs.sh
diff --git a/common/src/packages/hadoop-setup-single-node.sh b/hadoop-common/src/main/packages/hadoop-setup-single-node.sh
similarity index 100%
rename from common/src/packages/hadoop-setup-single-node.sh
rename to hadoop-common/src/main/packages/hadoop-setup-single-node.sh
diff --git a/common/src/packages/rpm/init.d/hadoop-datanode b/hadoop-common/src/main/packages/rpm/init.d/hadoop-datanode
similarity index 100%
rename from common/src/packages/rpm/init.d/hadoop-datanode
rename to hadoop-common/src/main/packages/rpm/init.d/hadoop-datanode
diff --git a/common/src/packages/rpm/init.d/hadoop-jobtracker b/hadoop-common/src/main/packages/rpm/init.d/hadoop-jobtracker
similarity index 100%
rename from common/src/packages/rpm/init.d/hadoop-jobtracker
rename to hadoop-common/src/main/packages/rpm/init.d/hadoop-jobtracker
diff --git a/common/src/packages/rpm/init.d/hadoop-namenode b/hadoop-common/src/main/packages/rpm/init.d/hadoop-namenode
similarity index 100%
rename from common/src/packages/rpm/init.d/hadoop-namenode
rename to hadoop-common/src/main/packages/rpm/init.d/hadoop-namenode
diff --git a/common/src/packages/rpm/init.d/hadoop-tasktracker b/hadoop-common/src/main/packages/rpm/init.d/hadoop-tasktracker
similarity index 100%
rename from common/src/packages/rpm/init.d/hadoop-tasktracker
rename to hadoop-common/src/main/packages/rpm/init.d/hadoop-tasktracker
diff --git a/common/src/packages/rpm/spec/hadoop.spec b/hadoop-common/src/main/packages/rpm/spec/hadoop.spec
similarity index 100%
rename from common/src/packages/rpm/spec/hadoop.spec
rename to hadoop-common/src/main/packages/rpm/spec/hadoop.spec
diff --git a/hadoop-common/src/main/packages/templates/conf/core-site.xml b/hadoop-common/src/main/packages/templates/conf/core-site.xml
new file mode 100644
index 0000000000..c99b86cb70
--- /dev/null
+++ b/hadoop-common/src/main/packages/templates/conf/core-site.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+
+<!-- Put site-specific property overrides in this file. -->
+
+<configuration>
+  <property>
+    <name>fs.default.name</name>
+    <value>${HADOOP_NN_HOST}</value>
+  </property>
+</configuration>
diff --git a/common/src/packages/update-hadoop-env.sh b/hadoop-common/src/main/packages/update-hadoop-env.sh
similarity index 100%
rename from common/src/packages/update-hadoop-env.sh
rename to hadoop-common/src/main/packages/update-hadoop-env.sh
diff --git a/hadoop-common/src/main/resources/META-INF/services/org.apache.hadoop.security.SecurityInfo b/hadoop-common/src/main/resources/META-INF/services/org.apache.hadoop.security.SecurityInfo
new file mode 100644
index 0000000000..5295f3be2f
--- /dev/null
+++ b/hadoop-common/src/main/resources/META-INF/services/org.apache.hadoop.security.SecurityInfo
@@ -0,0 +1 @@
+org.apache.hadoop.security.AnnotatedSecurityInfo
diff --git a/common/src/java/core-default.xml b/hadoop-common/src/main/resources/core-default.xml
similarity index 100%
rename from common/src/java/core-default.xml
rename to hadoop-common/src/main/resources/core-default.xml
diff --git a/common/src/webapps/static/hadoop.css b/hadoop-common/src/main/webapps/static/hadoop.css
similarity index 100%
rename from common/src/webapps/static/hadoop.css
rename to hadoop-common/src/main/webapps/static/hadoop.css
diff --git a/hadoop-common/src/main/xsl/configuration.xsl b/hadoop-common/src/main/xsl/configuration.xsl
new file mode 100644
index 0000000000..4ac2504644
--- /dev/null
+++ b/hadoop-common/src/main/xsl/configuration.xsl
@@ -0,0 +1,37 @@
+<?xml version="1.0"?>
+<!--
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License. See accompanying LICENSE file.
+-->
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+<xsl:output method="html"/>
+<xsl:template match="configuration">
+<html>
+<body>
+<table border="1">
+<tr>
+ <td>name</td>
+ <td>value</td>
+ <td>description</td>
+</tr>
+<xsl:for-each select="property">
+<tr>
+  <td><a name="{name}"><xsl:value-of select="name"/></a></td>
+  <td><xsl:value-of select="value"/></td>
+  <td><xsl:value-of select="description"/></td>
+</tr>
+</xsl:for-each>
+</table>
+</body>
+</html>
+</xsl:template>
+</xsl:stylesheet>
diff --git a/common/src/test/all-tests b/hadoop-common/src/test/all-tests
similarity index 100%
rename from common/src/test/all-tests
rename to hadoop-common/src/test/all-tests
diff --git a/common/src/test/aop/build/aop.xml b/hadoop-common/src/test/aop/build/aop.xml
similarity index 100%
rename from common/src/test/aop/build/aop.xml
rename to hadoop-common/src/test/aop/build/aop.xml
diff --git a/common/src/test/aop/org/apache/hadoop/fi/FiConfig.java b/hadoop-common/src/test/aop/org/apache/hadoop/fi/FiConfig.java
similarity index 100%
rename from common/src/test/aop/org/apache/hadoop/fi/FiConfig.java
rename to hadoop-common/src/test/aop/org/apache/hadoop/fi/FiConfig.java
diff --git a/common/src/test/aop/org/apache/hadoop/fi/ProbabilityModel.java b/hadoop-common/src/test/aop/org/apache/hadoop/fi/ProbabilityModel.java
similarity index 100%
rename from common/src/test/aop/org/apache/hadoop/fi/ProbabilityModel.java
rename to hadoop-common/src/test/aop/org/apache/hadoop/fi/ProbabilityModel.java
diff --git a/common/src/test/checkstyle-noframes-sorted.xsl b/hadoop-common/src/test/checkstyle-noframes-sorted.xsl
similarity index 100%
rename from common/src/test/checkstyle-noframes-sorted.xsl
rename to hadoop-common/src/test/checkstyle-noframes-sorted.xsl
diff --git a/common/src/test/ddl/buffer.jr b/hadoop-common/src/test/ddl/buffer.jr
similarity index 100%
rename from common/src/test/ddl/buffer.jr
rename to hadoop-common/src/test/ddl/buffer.jr
diff --git a/common/src/test/ddl/int.jr b/hadoop-common/src/test/ddl/int.jr
similarity index 100%
rename from common/src/test/ddl/int.jr
rename to hadoop-common/src/test/ddl/int.jr
diff --git a/common/src/test/ddl/string.jr b/hadoop-common/src/test/ddl/string.jr
similarity index 100%
rename from common/src/test/ddl/string.jr
rename to hadoop-common/src/test/ddl/string.jr
diff --git a/common/src/test/ddl/test.jr b/hadoop-common/src/test/ddl/test.jr
similarity index 100%
rename from common/src/test/ddl/test.jr
rename to hadoop-common/src/test/ddl/test.jr
diff --git a/common/src/test/empty-file b/hadoop-common/src/test/empty-file
similarity index 100%
rename from common/src/test/empty-file
rename to hadoop-common/src/test/empty-file
diff --git a/common/src/test/core/org/apache/hadoop/cli/CLITestHelper.java b/hadoop-common/src/test/java/org/apache/hadoop/cli/CLITestHelper.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/cli/CLITestHelper.java
rename to hadoop-common/src/test/java/org/apache/hadoop/cli/CLITestHelper.java
diff --git a/common/src/test/core/org/apache/hadoop/cli/TestCLI.java b/hadoop-common/src/test/java/org/apache/hadoop/cli/TestCLI.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/cli/TestCLI.java
rename to hadoop-common/src/test/java/org/apache/hadoop/cli/TestCLI.java
diff --git a/common/src/test/core/org/apache/hadoop/cli/testConf.xsl b/hadoop-common/src/test/java/org/apache/hadoop/cli/testConf.xsl
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/cli/testConf.xsl
rename to hadoop-common/src/test/java/org/apache/hadoop/cli/testConf.xsl
diff --git a/common/src/test/core/org/apache/hadoop/cli/util/CLICommand.java b/hadoop-common/src/test/java/org/apache/hadoop/cli/util/CLICommand.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/cli/util/CLICommand.java
rename to hadoop-common/src/test/java/org/apache/hadoop/cli/util/CLICommand.java
diff --git a/common/src/test/core/org/apache/hadoop/cli/util/CLICommandFS.java b/hadoop-common/src/test/java/org/apache/hadoop/cli/util/CLICommandFS.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/cli/util/CLICommandFS.java
rename to hadoop-common/src/test/java/org/apache/hadoop/cli/util/CLICommandFS.java
diff --git a/common/src/test/core/org/apache/hadoop/cli/util/CLICommandTypes.java b/hadoop-common/src/test/java/org/apache/hadoop/cli/util/CLICommandTypes.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/cli/util/CLICommandTypes.java
rename to hadoop-common/src/test/java/org/apache/hadoop/cli/util/CLICommandTypes.java
diff --git a/common/src/test/core/org/apache/hadoop/cli/util/CLITestCmd.java b/hadoop-common/src/test/java/org/apache/hadoop/cli/util/CLITestCmd.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/cli/util/CLITestCmd.java
rename to hadoop-common/src/test/java/org/apache/hadoop/cli/util/CLITestCmd.java
diff --git a/common/src/test/core/org/apache/hadoop/cli/util/CLITestData.java b/hadoop-common/src/test/java/org/apache/hadoop/cli/util/CLITestData.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/cli/util/CLITestData.java
rename to hadoop-common/src/test/java/org/apache/hadoop/cli/util/CLITestData.java
diff --git a/common/src/test/core/org/apache/hadoop/cli/util/CommandExecutor.java b/hadoop-common/src/test/java/org/apache/hadoop/cli/util/CommandExecutor.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/cli/util/CommandExecutor.java
rename to hadoop-common/src/test/java/org/apache/hadoop/cli/util/CommandExecutor.java
diff --git a/common/src/test/core/org/apache/hadoop/cli/util/ComparatorBase.java b/hadoop-common/src/test/java/org/apache/hadoop/cli/util/ComparatorBase.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/cli/util/ComparatorBase.java
rename to hadoop-common/src/test/java/org/apache/hadoop/cli/util/ComparatorBase.java
diff --git a/common/src/test/core/org/apache/hadoop/cli/util/ComparatorData.java b/hadoop-common/src/test/java/org/apache/hadoop/cli/util/ComparatorData.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/cli/util/ComparatorData.java
rename to hadoop-common/src/test/java/org/apache/hadoop/cli/util/ComparatorData.java
diff --git a/common/src/test/core/org/apache/hadoop/cli/util/ExactComparator.java b/hadoop-common/src/test/java/org/apache/hadoop/cli/util/ExactComparator.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/cli/util/ExactComparator.java
rename to hadoop-common/src/test/java/org/apache/hadoop/cli/util/ExactComparator.java
diff --git a/common/src/test/core/org/apache/hadoop/cli/util/FSCmdExecutor.java b/hadoop-common/src/test/java/org/apache/hadoop/cli/util/FSCmdExecutor.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/cli/util/FSCmdExecutor.java
rename to hadoop-common/src/test/java/org/apache/hadoop/cli/util/FSCmdExecutor.java
diff --git a/common/src/test/core/org/apache/hadoop/cli/util/RegexpAcrossOutputComparator.java b/hadoop-common/src/test/java/org/apache/hadoop/cli/util/RegexpAcrossOutputComparator.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/cli/util/RegexpAcrossOutputComparator.java
rename to hadoop-common/src/test/java/org/apache/hadoop/cli/util/RegexpAcrossOutputComparator.java
diff --git a/common/src/test/core/org/apache/hadoop/cli/util/RegexpComparator.java b/hadoop-common/src/test/java/org/apache/hadoop/cli/util/RegexpComparator.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/cli/util/RegexpComparator.java
rename to hadoop-common/src/test/java/org/apache/hadoop/cli/util/RegexpComparator.java
diff --git a/common/src/test/core/org/apache/hadoop/cli/util/SubstringComparator.java b/hadoop-common/src/test/java/org/apache/hadoop/cli/util/SubstringComparator.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/cli/util/SubstringComparator.java
rename to hadoop-common/src/test/java/org/apache/hadoop/cli/util/SubstringComparator.java
diff --git a/common/src/test/core/org/apache/hadoop/cli/util/TokenComparator.java b/hadoop-common/src/test/java/org/apache/hadoop/cli/util/TokenComparator.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/cli/util/TokenComparator.java
rename to hadoop-common/src/test/java/org/apache/hadoop/cli/util/TokenComparator.java
diff --git a/common/src/test/core/org/apache/hadoop/conf/TestConfServlet.java b/hadoop-common/src/test/java/org/apache/hadoop/conf/TestConfServlet.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/conf/TestConfServlet.java
rename to hadoop-common/src/test/java/org/apache/hadoop/conf/TestConfServlet.java
diff --git a/common/src/test/core/org/apache/hadoop/conf/TestConfiguration.java b/hadoop-common/src/test/java/org/apache/hadoop/conf/TestConfiguration.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/conf/TestConfiguration.java
rename to hadoop-common/src/test/java/org/apache/hadoop/conf/TestConfiguration.java
diff --git a/common/src/test/core/org/apache/hadoop/conf/TestConfigurationDeprecation.java b/hadoop-common/src/test/java/org/apache/hadoop/conf/TestConfigurationDeprecation.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/conf/TestConfigurationDeprecation.java
rename to hadoop-common/src/test/java/org/apache/hadoop/conf/TestConfigurationDeprecation.java
diff --git a/common/src/test/core/org/apache/hadoop/conf/TestConfigurationSubclass.java b/hadoop-common/src/test/java/org/apache/hadoop/conf/TestConfigurationSubclass.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/conf/TestConfigurationSubclass.java
rename to hadoop-common/src/test/java/org/apache/hadoop/conf/TestConfigurationSubclass.java
diff --git a/common/src/test/core/org/apache/hadoop/conf/TestDeprecatedKeys.java b/hadoop-common/src/test/java/org/apache/hadoop/conf/TestDeprecatedKeys.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/conf/TestDeprecatedKeys.java
rename to hadoop-common/src/test/java/org/apache/hadoop/conf/TestDeprecatedKeys.java
diff --git a/common/src/test/core/org/apache/hadoop/conf/TestGetInstances.java b/hadoop-common/src/test/java/org/apache/hadoop/conf/TestGetInstances.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/conf/TestGetInstances.java
rename to hadoop-common/src/test/java/org/apache/hadoop/conf/TestGetInstances.java
diff --git a/common/src/test/core/org/apache/hadoop/conf/TestReconfiguration.java b/hadoop-common/src/test/java/org/apache/hadoop/conf/TestReconfiguration.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/conf/TestReconfiguration.java
rename to hadoop-common/src/test/java/org/apache/hadoop/conf/TestReconfiguration.java
diff --git a/common/src/test/core/org/apache/hadoop/conf/empty-configuration.xml b/hadoop-common/src/test/java/org/apache/hadoop/conf/empty-configuration.xml
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/conf/empty-configuration.xml
rename to hadoop-common/src/test/java/org/apache/hadoop/conf/empty-configuration.xml
diff --git a/common/src/test/core/org/apache/hadoop/fs/FCStatisticsBaseTest.java b/hadoop-common/src/test/java/org/apache/hadoop/fs/FCStatisticsBaseTest.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/fs/FCStatisticsBaseTest.java
rename to hadoop-common/src/test/java/org/apache/hadoop/fs/FCStatisticsBaseTest.java
diff --git a/common/src/test/core/org/apache/hadoop/fs/FSMainOperationsBaseTest.java b/hadoop-common/src/test/java/org/apache/hadoop/fs/FSMainOperationsBaseTest.java
similarity index 97%
rename from common/src/test/core/org/apache/hadoop/fs/FSMainOperationsBaseTest.java
rename to hadoop-common/src/test/java/org/apache/hadoop/fs/FSMainOperationsBaseTest.java
index 6a9079c8ec..9205f640ec 100644
--- a/common/src/test/core/org/apache/hadoop/fs/FSMainOperationsBaseTest.java
+++ b/hadoop-common/src/test/java/org/apache/hadoop/fs/FSMainOperationsBaseTest.java
@@ -21,9 +21,11 @@
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.URI;
 
 
 
+import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.Options.Rename;
 import org.apache.hadoop.fs.permission.FsPermission;
 import org.junit.After;
@@ -1080,6 +1082,31 @@ public void testGetWrappedInputStream() throws IOException {
     Assert.assertNotNull(is);  
   }
   
+  @Test
+  public void testCopyToLocalWithUseRawLocalFileSystemOption() throws Exception {
+    Configuration conf = new Configuration();
+    FileSystem fSys = new RawLocalFileSystem();
+    Path fileToFS = new Path(TEST_ROOT_DIR, "fs.txt");
+    Path fileToLFS = new Path(TEST_ROOT_DIR, "test.txt");
+    Path crcFileAtLFS = new Path(TEST_ROOT_DIR, ".test.txt.crc");
+    fSys.initialize(new URI("file:///"), conf);
+    writeFile(fSys, fileToFS);
+    if (fSys.exists(crcFileAtLFS))
+      Assert.assertTrue("CRC files not deleted", fSys
+          .delete(crcFileAtLFS, true));
+    fSys.copyToLocalFile(false, fileToFS, fileToLFS, true);
+    Assert.assertFalse("CRC files are created", fSys.exists(crcFileAtLFS));
+  }
+
+  private void writeFile(FileSystem fs, Path name) throws IOException {
+    FSDataOutputStream stm = fs.create(name);
+    try {
+      stm.writeBytes("42\n");
+    } finally {
+      stm.close();
+    }
+  }
+  
   protected void createFile(Path path) throws IOException {
     FileSystemTestHelper.createFile(fSys, path);
   }
diff --git a/common/src/test/core/org/apache/hadoop/fs/FileContextCreateMkdirBaseTest.java b/hadoop-common/src/test/java/org/apache/hadoop/fs/FileContextCreateMkdirBaseTest.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/fs/FileContextCreateMkdirBaseTest.java
rename to hadoop-common/src/test/java/org/apache/hadoop/fs/FileContextCreateMkdirBaseTest.java
diff --git a/common/src/test/core/org/apache/hadoop/fs/FileContextMainOperationsBaseTest.java b/hadoop-common/src/test/java/org/apache/hadoop/fs/FileContextMainOperationsBaseTest.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/fs/FileContextMainOperationsBaseTest.java
rename to hadoop-common/src/test/java/org/apache/hadoop/fs/FileContextMainOperationsBaseTest.java
diff --git a/common/src/test/core/org/apache/hadoop/fs/FileContextPermissionBase.java b/hadoop-common/src/test/java/org/apache/hadoop/fs/FileContextPermissionBase.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/fs/FileContextPermissionBase.java
rename to hadoop-common/src/test/java/org/apache/hadoop/fs/FileContextPermissionBase.java
diff --git a/common/src/test/core/org/apache/hadoop/fs/FileContextSymlinkBaseTest.java b/hadoop-common/src/test/java/org/apache/hadoop/fs/FileContextSymlinkBaseTest.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/fs/FileContextSymlinkBaseTest.java
rename to hadoop-common/src/test/java/org/apache/hadoop/fs/FileContextSymlinkBaseTest.java
diff --git a/common/src/test/core/org/apache/hadoop/fs/FileContextTestHelper.java b/hadoop-common/src/test/java/org/apache/hadoop/fs/FileContextTestHelper.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/fs/FileContextTestHelper.java
rename to hadoop-common/src/test/java/org/apache/hadoop/fs/FileContextTestHelper.java
diff --git a/common/src/test/core/org/apache/hadoop/fs/FileContextURIBase.java b/hadoop-common/src/test/java/org/apache/hadoop/fs/FileContextURIBase.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/fs/FileContextURIBase.java
rename to hadoop-common/src/test/java/org/apache/hadoop/fs/FileContextURIBase.java
diff --git a/common/src/test/core/org/apache/hadoop/fs/FileContextUtilBase.java b/hadoop-common/src/test/java/org/apache/hadoop/fs/FileContextUtilBase.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/fs/FileContextUtilBase.java
rename to hadoop-common/src/test/java/org/apache/hadoop/fs/FileContextUtilBase.java
diff --git a/common/src/test/core/org/apache/hadoop/fs/FileSystemContractBaseTest.java b/hadoop-common/src/test/java/org/apache/hadoop/fs/FileSystemContractBaseTest.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/fs/FileSystemContractBaseTest.java
rename to hadoop-common/src/test/java/org/apache/hadoop/fs/FileSystemContractBaseTest.java
diff --git a/common/src/test/core/org/apache/hadoop/fs/FileSystemTestHelper.java b/hadoop-common/src/test/java/org/apache/hadoop/fs/FileSystemTestHelper.java
similarity index 98%
rename from common/src/test/core/org/apache/hadoop/fs/FileSystemTestHelper.java
rename to hadoop-common/src/test/java/org/apache/hadoop/fs/FileSystemTestHelper.java
index 28deb624da..b827ca4378 100644
--- a/common/src/test/core/org/apache/hadoop/fs/FileSystemTestHelper.java
+++ b/hadoop-common/src/test/java/org/apache/hadoop/fs/FileSystemTestHelper.java
@@ -34,7 +34,7 @@
 public final class FileSystemTestHelper {
   // The test root is relative to the <wd>/build/test/data by default
   public static final String TEST_ROOT_DIR = 
-    System.getProperty("test.build.data", "build/test/data") + "/test";
+    System.getProperty("test.build.data", "target/test/data") + "/test";
   private static final int DEFAULT_BLOCK_SIZE = 1024;
   private static final int DEFAULT_NUM_BLOCKS = 2;
   private static String absTestRootDir = null;
diff --git a/common/src/test/core/org/apache/hadoop/fs/TestAvroFSInput.java b/hadoop-common/src/test/java/org/apache/hadoop/fs/TestAvroFSInput.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/fs/TestAvroFSInput.java
rename to hadoop-common/src/test/java/org/apache/hadoop/fs/TestAvroFSInput.java
diff --git a/common/src/test/core/org/apache/hadoop/fs/TestBlockLocation.java b/hadoop-common/src/test/java/org/apache/hadoop/fs/TestBlockLocation.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/fs/TestBlockLocation.java
rename to hadoop-common/src/test/java/org/apache/hadoop/fs/TestBlockLocation.java
diff --git a/common/src/test/core/org/apache/hadoop/fs/TestChecksumFileSystem.java b/hadoop-common/src/test/java/org/apache/hadoop/fs/TestChecksumFileSystem.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/fs/TestChecksumFileSystem.java
rename to hadoop-common/src/test/java/org/apache/hadoop/fs/TestChecksumFileSystem.java
diff --git a/common/src/test/core/org/apache/hadoop/fs/TestCommandFormat.java b/hadoop-common/src/test/java/org/apache/hadoop/fs/TestCommandFormat.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/fs/TestCommandFormat.java
rename to hadoop-common/src/test/java/org/apache/hadoop/fs/TestCommandFormat.java
diff --git a/common/src/test/core/org/apache/hadoop/fs/TestDFVariations.java b/hadoop-common/src/test/java/org/apache/hadoop/fs/TestDFVariations.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/fs/TestDFVariations.java
rename to hadoop-common/src/test/java/org/apache/hadoop/fs/TestDFVariations.java
diff --git a/common/src/test/core/org/apache/hadoop/fs/TestDU.java b/hadoop-common/src/test/java/org/apache/hadoop/fs/TestDU.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/fs/TestDU.java
rename to hadoop-common/src/test/java/org/apache/hadoop/fs/TestDU.java
diff --git a/common/src/test/core/org/apache/hadoop/fs/TestFSMainOperationsLocalFileSystem.java b/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFSMainOperationsLocalFileSystem.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/fs/TestFSMainOperationsLocalFileSystem.java
rename to hadoop-common/src/test/java/org/apache/hadoop/fs/TestFSMainOperationsLocalFileSystem.java
diff --git a/common/src/test/core/org/apache/hadoop/fs/TestFcLocalFsPermission.java b/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFcLocalFsPermission.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/fs/TestFcLocalFsPermission.java
rename to hadoop-common/src/test/java/org/apache/hadoop/fs/TestFcLocalFsPermission.java
diff --git a/common/src/test/core/org/apache/hadoop/fs/TestFcLocalFsUtil.java b/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFcLocalFsUtil.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/fs/TestFcLocalFsUtil.java
rename to hadoop-common/src/test/java/org/apache/hadoop/fs/TestFcLocalFsUtil.java
diff --git a/common/src/test/core/org/apache/hadoop/fs/TestFileContextDeleteOnExit.java b/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFileContextDeleteOnExit.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/fs/TestFileContextDeleteOnExit.java
rename to hadoop-common/src/test/java/org/apache/hadoop/fs/TestFileContextDeleteOnExit.java
diff --git a/common/src/test/core/org/apache/hadoop/fs/TestFileContextResolveAfs.java b/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFileContextResolveAfs.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/fs/TestFileContextResolveAfs.java
rename to hadoop-common/src/test/java/org/apache/hadoop/fs/TestFileContextResolveAfs.java
diff --git a/common/src/test/core/org/apache/hadoop/fs/TestFileStatus.java b/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFileStatus.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/fs/TestFileStatus.java
rename to hadoop-common/src/test/java/org/apache/hadoop/fs/TestFileStatus.java
diff --git a/common/src/test/core/org/apache/hadoop/fs/TestFileSystemCaching.java b/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFileSystemCaching.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/fs/TestFileSystemCaching.java
rename to hadoop-common/src/test/java/org/apache/hadoop/fs/TestFileSystemCaching.java
diff --git a/common/src/test/core/org/apache/hadoop/fs/TestFileUtil.java b/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFileUtil.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/fs/TestFileUtil.java
rename to hadoop-common/src/test/java/org/apache/hadoop/fs/TestFileUtil.java
diff --git a/common/src/test/core/org/apache/hadoop/fs/TestFilterFileSystem.java b/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFilterFileSystem.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/fs/TestFilterFileSystem.java
rename to hadoop-common/src/test/java/org/apache/hadoop/fs/TestFilterFileSystem.java
diff --git a/common/src/test/core/org/apache/hadoop/fs/TestFilterFs.java b/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFilterFs.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/fs/TestFilterFs.java
rename to hadoop-common/src/test/java/org/apache/hadoop/fs/TestFilterFs.java
diff --git a/common/src/test/core/org/apache/hadoop/fs/TestFsShellReturnCode.java b/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFsShellReturnCode.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/fs/TestFsShellReturnCode.java
rename to hadoop-common/src/test/java/org/apache/hadoop/fs/TestFsShellReturnCode.java
diff --git a/common/src/test/core/org/apache/hadoop/fs/TestGetFileBlockLocations.java b/hadoop-common/src/test/java/org/apache/hadoop/fs/TestGetFileBlockLocations.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/fs/TestGetFileBlockLocations.java
rename to hadoop-common/src/test/java/org/apache/hadoop/fs/TestGetFileBlockLocations.java
diff --git a/common/src/test/core/org/apache/hadoop/fs/TestGlobExpander.java b/hadoop-common/src/test/java/org/apache/hadoop/fs/TestGlobExpander.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/fs/TestGlobExpander.java
rename to hadoop-common/src/test/java/org/apache/hadoop/fs/TestGlobExpander.java
diff --git a/common/src/test/core/org/apache/hadoop/fs/TestGlobPattern.java b/hadoop-common/src/test/java/org/apache/hadoop/fs/TestGlobPattern.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/fs/TestGlobPattern.java
rename to hadoop-common/src/test/java/org/apache/hadoop/fs/TestGlobPattern.java
diff --git a/common/src/test/core/org/apache/hadoop/fs/TestHardLink.java b/hadoop-common/src/test/java/org/apache/hadoop/fs/TestHardLink.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/fs/TestHardLink.java
rename to hadoop-common/src/test/java/org/apache/hadoop/fs/TestHardLink.java
diff --git a/common/src/test/core/org/apache/hadoop/fs/TestListFiles.java b/hadoop-common/src/test/java/org/apache/hadoop/fs/TestListFiles.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/fs/TestListFiles.java
rename to hadoop-common/src/test/java/org/apache/hadoop/fs/TestListFiles.java
diff --git a/common/src/test/core/org/apache/hadoop/fs/TestLocalDirAllocator.java b/hadoop-common/src/test/java/org/apache/hadoop/fs/TestLocalDirAllocator.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/fs/TestLocalDirAllocator.java
rename to hadoop-common/src/test/java/org/apache/hadoop/fs/TestLocalDirAllocator.java
diff --git a/common/src/test/core/org/apache/hadoop/fs/TestLocalFSFileContextCreateMkdir.java b/hadoop-common/src/test/java/org/apache/hadoop/fs/TestLocalFSFileContextCreateMkdir.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/fs/TestLocalFSFileContextCreateMkdir.java
rename to hadoop-common/src/test/java/org/apache/hadoop/fs/TestLocalFSFileContextCreateMkdir.java
diff --git a/common/src/test/core/org/apache/hadoop/fs/TestLocalFSFileContextMainOperations.java b/hadoop-common/src/test/java/org/apache/hadoop/fs/TestLocalFSFileContextMainOperations.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/fs/TestLocalFSFileContextMainOperations.java
rename to hadoop-common/src/test/java/org/apache/hadoop/fs/TestLocalFSFileContextMainOperations.java
diff --git a/common/src/test/core/org/apache/hadoop/fs/TestLocalFSFileContextSymlink.java b/hadoop-common/src/test/java/org/apache/hadoop/fs/TestLocalFSFileContextSymlink.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/fs/TestLocalFSFileContextSymlink.java
rename to hadoop-common/src/test/java/org/apache/hadoop/fs/TestLocalFSFileContextSymlink.java
diff --git a/common/src/test/core/org/apache/hadoop/fs/TestLocalFileSystem.java b/hadoop-common/src/test/java/org/apache/hadoop/fs/TestLocalFileSystem.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/fs/TestLocalFileSystem.java
rename to hadoop-common/src/test/java/org/apache/hadoop/fs/TestLocalFileSystem.java
diff --git a/common/src/test/core/org/apache/hadoop/fs/TestLocalFileSystemPermission.java b/hadoop-common/src/test/java/org/apache/hadoop/fs/TestLocalFileSystemPermission.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/fs/TestLocalFileSystemPermission.java
rename to hadoop-common/src/test/java/org/apache/hadoop/fs/TestLocalFileSystemPermission.java
diff --git a/common/src/test/core/org/apache/hadoop/fs/TestLocalFsFCStatistics.java b/hadoop-common/src/test/java/org/apache/hadoop/fs/TestLocalFsFCStatistics.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/fs/TestLocalFsFCStatistics.java
rename to hadoop-common/src/test/java/org/apache/hadoop/fs/TestLocalFsFCStatistics.java
diff --git a/common/src/test/core/org/apache/hadoop/fs/TestLocal_S3FileContextURI.java b/hadoop-common/src/test/java/org/apache/hadoop/fs/TestLocal_S3FileContextURI.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/fs/TestLocal_S3FileContextURI.java
rename to hadoop-common/src/test/java/org/apache/hadoop/fs/TestLocal_S3FileContextURI.java
diff --git a/common/src/test/core/org/apache/hadoop/fs/TestPath.java b/hadoop-common/src/test/java/org/apache/hadoop/fs/TestPath.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/fs/TestPath.java
rename to hadoop-common/src/test/java/org/apache/hadoop/fs/TestPath.java
diff --git a/common/src/test/core/org/apache/hadoop/fs/TestS3_LocalFileContextURI.java b/hadoop-common/src/test/java/org/apache/hadoop/fs/TestS3_LocalFileContextURI.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/fs/TestS3_LocalFileContextURI.java
rename to hadoop-common/src/test/java/org/apache/hadoop/fs/TestS3_LocalFileContextURI.java
diff --git a/common/src/test/core/org/apache/hadoop/fs/TestTrash.java b/hadoop-common/src/test/java/org/apache/hadoop/fs/TestTrash.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/fs/TestTrash.java
rename to hadoop-common/src/test/java/org/apache/hadoop/fs/TestTrash.java
diff --git a/common/src/test/core/org/apache/hadoop/fs/TestTruncatedInputBug.java b/hadoop-common/src/test/java/org/apache/hadoop/fs/TestTruncatedInputBug.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/fs/TestTruncatedInputBug.java
rename to hadoop-common/src/test/java/org/apache/hadoop/fs/TestTruncatedInputBug.java
diff --git a/common/src/test/core/org/apache/hadoop/fs/kfs/KFSEmulationImpl.java b/hadoop-common/src/test/java/org/apache/hadoop/fs/kfs/KFSEmulationImpl.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/fs/kfs/KFSEmulationImpl.java
rename to hadoop-common/src/test/java/org/apache/hadoop/fs/kfs/KFSEmulationImpl.java
diff --git a/common/src/test/core/org/apache/hadoop/fs/kfs/TestKosmosFileSystem.java b/hadoop-common/src/test/java/org/apache/hadoop/fs/kfs/TestKosmosFileSystem.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/fs/kfs/TestKosmosFileSystem.java
rename to hadoop-common/src/test/java/org/apache/hadoop/fs/kfs/TestKosmosFileSystem.java
diff --git a/common/src/test/core/org/apache/hadoop/fs/loadGenerator/DataGenerator.java b/hadoop-common/src/test/java/org/apache/hadoop/fs/loadGenerator/DataGenerator.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/fs/loadGenerator/DataGenerator.java
rename to hadoop-common/src/test/java/org/apache/hadoop/fs/loadGenerator/DataGenerator.java
diff --git a/common/src/test/core/org/apache/hadoop/fs/loadGenerator/LoadGenerator.java b/hadoop-common/src/test/java/org/apache/hadoop/fs/loadGenerator/LoadGenerator.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/fs/loadGenerator/LoadGenerator.java
rename to hadoop-common/src/test/java/org/apache/hadoop/fs/loadGenerator/LoadGenerator.java
diff --git a/common/src/test/core/org/apache/hadoop/fs/loadGenerator/StructureGenerator.java b/hadoop-common/src/test/java/org/apache/hadoop/fs/loadGenerator/StructureGenerator.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/fs/loadGenerator/StructureGenerator.java
rename to hadoop-common/src/test/java/org/apache/hadoop/fs/loadGenerator/StructureGenerator.java
diff --git a/common/src/test/core/org/apache/hadoop/fs/permission/TestFsPermission.java b/hadoop-common/src/test/java/org/apache/hadoop/fs/permission/TestFsPermission.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/fs/permission/TestFsPermission.java
rename to hadoop-common/src/test/java/org/apache/hadoop/fs/permission/TestFsPermission.java
diff --git a/common/src/test/core/org/apache/hadoop/fs/s3/InMemoryFileSystemStore.java b/hadoop-common/src/test/java/org/apache/hadoop/fs/s3/InMemoryFileSystemStore.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/fs/s3/InMemoryFileSystemStore.java
rename to hadoop-common/src/test/java/org/apache/hadoop/fs/s3/InMemoryFileSystemStore.java
diff --git a/common/src/test/core/org/apache/hadoop/fs/s3/Jets3tS3FileSystemContractTest.java b/hadoop-common/src/test/java/org/apache/hadoop/fs/s3/Jets3tS3FileSystemContractTest.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/fs/s3/Jets3tS3FileSystemContractTest.java
rename to hadoop-common/src/test/java/org/apache/hadoop/fs/s3/Jets3tS3FileSystemContractTest.java
diff --git a/common/src/test/core/org/apache/hadoop/fs/s3/S3FileSystemContractBaseTest.java b/hadoop-common/src/test/java/org/apache/hadoop/fs/s3/S3FileSystemContractBaseTest.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/fs/s3/S3FileSystemContractBaseTest.java
rename to hadoop-common/src/test/java/org/apache/hadoop/fs/s3/S3FileSystemContractBaseTest.java
diff --git a/common/src/test/core/org/apache/hadoop/fs/s3/TestINode.java b/hadoop-common/src/test/java/org/apache/hadoop/fs/s3/TestINode.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/fs/s3/TestINode.java
rename to hadoop-common/src/test/java/org/apache/hadoop/fs/s3/TestINode.java
diff --git a/common/src/test/core/org/apache/hadoop/fs/s3/TestInMemoryS3FileSystemContract.java b/hadoop-common/src/test/java/org/apache/hadoop/fs/s3/TestInMemoryS3FileSystemContract.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/fs/s3/TestInMemoryS3FileSystemContract.java
rename to hadoop-common/src/test/java/org/apache/hadoop/fs/s3/TestInMemoryS3FileSystemContract.java
diff --git a/common/src/test/core/org/apache/hadoop/fs/s3/TestS3Credentials.java b/hadoop-common/src/test/java/org/apache/hadoop/fs/s3/TestS3Credentials.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/fs/s3/TestS3Credentials.java
rename to hadoop-common/src/test/java/org/apache/hadoop/fs/s3/TestS3Credentials.java
diff --git a/common/src/test/core/org/apache/hadoop/fs/s3/TestS3FileSystem.java b/hadoop-common/src/test/java/org/apache/hadoop/fs/s3/TestS3FileSystem.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/fs/s3/TestS3FileSystem.java
rename to hadoop-common/src/test/java/org/apache/hadoop/fs/s3/TestS3FileSystem.java
diff --git a/common/src/test/core/org/apache/hadoop/fs/s3native/InMemoryNativeFileSystemStore.java b/hadoop-common/src/test/java/org/apache/hadoop/fs/s3native/InMemoryNativeFileSystemStore.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/fs/s3native/InMemoryNativeFileSystemStore.java
rename to hadoop-common/src/test/java/org/apache/hadoop/fs/s3native/InMemoryNativeFileSystemStore.java
diff --git a/common/src/test/core/org/apache/hadoop/fs/s3native/Jets3tNativeS3FileSystemContractTest.java b/hadoop-common/src/test/java/org/apache/hadoop/fs/s3native/Jets3tNativeS3FileSystemContractTest.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/fs/s3native/Jets3tNativeS3FileSystemContractTest.java
rename to hadoop-common/src/test/java/org/apache/hadoop/fs/s3native/Jets3tNativeS3FileSystemContractTest.java
diff --git a/common/src/test/core/org/apache/hadoop/fs/s3native/NativeS3FileSystemContractBaseTest.java b/hadoop-common/src/test/java/org/apache/hadoop/fs/s3native/NativeS3FileSystemContractBaseTest.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/fs/s3native/NativeS3FileSystemContractBaseTest.java
rename to hadoop-common/src/test/java/org/apache/hadoop/fs/s3native/NativeS3FileSystemContractBaseTest.java
diff --git a/common/src/test/core/org/apache/hadoop/fs/s3native/TestInMemoryNativeS3FileSystemContract.java b/hadoop-common/src/test/java/org/apache/hadoop/fs/s3native/TestInMemoryNativeS3FileSystemContract.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/fs/s3native/TestInMemoryNativeS3FileSystemContract.java
rename to hadoop-common/src/test/java/org/apache/hadoop/fs/s3native/TestInMemoryNativeS3FileSystemContract.java
diff --git a/common/src/test/core/org/apache/hadoop/fs/shell/TestCommandFactory.java b/hadoop-common/src/test/java/org/apache/hadoop/fs/shell/TestCommandFactory.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/fs/shell/TestCommandFactory.java
rename to hadoop-common/src/test/java/org/apache/hadoop/fs/shell/TestCommandFactory.java
diff --git a/common/src/test/core/org/apache/hadoop/fs/shell/TestPathData.java b/hadoop-common/src/test/java/org/apache/hadoop/fs/shell/TestPathData.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/fs/shell/TestPathData.java
rename to hadoop-common/src/test/java/org/apache/hadoop/fs/shell/TestPathData.java
diff --git a/common/src/test/core/org/apache/hadoop/fs/shell/TestPathExceptions.java b/hadoop-common/src/test/java/org/apache/hadoop/fs/shell/TestPathExceptions.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/fs/shell/TestPathExceptions.java
rename to hadoop-common/src/test/java/org/apache/hadoop/fs/shell/TestPathExceptions.java
diff --git a/common/src/test/core/org/apache/hadoop/fs/viewfs/TestChRootedFileSystem.java b/hadoop-common/src/test/java/org/apache/hadoop/fs/viewfs/TestChRootedFileSystem.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/fs/viewfs/TestChRootedFileSystem.java
rename to hadoop-common/src/test/java/org/apache/hadoop/fs/viewfs/TestChRootedFileSystem.java
diff --git a/common/src/test/core/org/apache/hadoop/fs/viewfs/TestChRootedFs.java b/hadoop-common/src/test/java/org/apache/hadoop/fs/viewfs/TestChRootedFs.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/fs/viewfs/TestChRootedFs.java
rename to hadoop-common/src/test/java/org/apache/hadoop/fs/viewfs/TestChRootedFs.java
diff --git a/common/src/test/core/org/apache/hadoop/fs/viewfs/TestFSMainOperationsLocalFileSystem.java b/hadoop-common/src/test/java/org/apache/hadoop/fs/viewfs/TestFSMainOperationsLocalFileSystem.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/fs/viewfs/TestFSMainOperationsLocalFileSystem.java
rename to hadoop-common/src/test/java/org/apache/hadoop/fs/viewfs/TestFSMainOperationsLocalFileSystem.java
diff --git a/common/src/test/core/org/apache/hadoop/fs/viewfs/TestFcCreateMkdirLocalFs.java b/hadoop-common/src/test/java/org/apache/hadoop/fs/viewfs/TestFcCreateMkdirLocalFs.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/fs/viewfs/TestFcCreateMkdirLocalFs.java
rename to hadoop-common/src/test/java/org/apache/hadoop/fs/viewfs/TestFcCreateMkdirLocalFs.java
diff --git a/common/src/test/core/org/apache/hadoop/fs/viewfs/TestFcMainOperationsLocalFs.java b/hadoop-common/src/test/java/org/apache/hadoop/fs/viewfs/TestFcMainOperationsLocalFs.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/fs/viewfs/TestFcMainOperationsLocalFs.java
rename to hadoop-common/src/test/java/org/apache/hadoop/fs/viewfs/TestFcMainOperationsLocalFs.java
diff --git a/common/src/test/core/org/apache/hadoop/fs/viewfs/TestFcPermissionsLocalFs.java b/hadoop-common/src/test/java/org/apache/hadoop/fs/viewfs/TestFcPermissionsLocalFs.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/fs/viewfs/TestFcPermissionsLocalFs.java
rename to hadoop-common/src/test/java/org/apache/hadoop/fs/viewfs/TestFcPermissionsLocalFs.java
diff --git a/common/src/test/core/org/apache/hadoop/fs/viewfs/TestViewFileSystemLocalFileSystem.java b/hadoop-common/src/test/java/org/apache/hadoop/fs/viewfs/TestViewFileSystemLocalFileSystem.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/fs/viewfs/TestViewFileSystemLocalFileSystem.java
rename to hadoop-common/src/test/java/org/apache/hadoop/fs/viewfs/TestViewFileSystemLocalFileSystem.java
diff --git a/common/src/test/core/org/apache/hadoop/fs/viewfs/TestViewFileSystemWithAuthorityLocalFileSystem.java b/hadoop-common/src/test/java/org/apache/hadoop/fs/viewfs/TestViewFileSystemWithAuthorityLocalFileSystem.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/fs/viewfs/TestViewFileSystemWithAuthorityLocalFileSystem.java
rename to hadoop-common/src/test/java/org/apache/hadoop/fs/viewfs/TestViewFileSystemWithAuthorityLocalFileSystem.java
diff --git a/common/src/test/core/org/apache/hadoop/fs/viewfs/TestViewFsConfig.java b/hadoop-common/src/test/java/org/apache/hadoop/fs/viewfs/TestViewFsConfig.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/fs/viewfs/TestViewFsConfig.java
rename to hadoop-common/src/test/java/org/apache/hadoop/fs/viewfs/TestViewFsConfig.java
diff --git a/common/src/test/core/org/apache/hadoop/fs/viewfs/TestViewFsLocalFs.java b/hadoop-common/src/test/java/org/apache/hadoop/fs/viewfs/TestViewFsLocalFs.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/fs/viewfs/TestViewFsLocalFs.java
rename to hadoop-common/src/test/java/org/apache/hadoop/fs/viewfs/TestViewFsLocalFs.java
diff --git a/common/src/test/core/org/apache/hadoop/fs/viewfs/TestViewFsTrash.java b/hadoop-common/src/test/java/org/apache/hadoop/fs/viewfs/TestViewFsTrash.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/fs/viewfs/TestViewFsTrash.java
rename to hadoop-common/src/test/java/org/apache/hadoop/fs/viewfs/TestViewFsTrash.java
diff --git a/common/src/test/core/org/apache/hadoop/fs/viewfs/TestViewFsWithAuthorityLocalFs.java b/hadoop-common/src/test/java/org/apache/hadoop/fs/viewfs/TestViewFsWithAuthorityLocalFs.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/fs/viewfs/TestViewFsWithAuthorityLocalFs.java
rename to hadoop-common/src/test/java/org/apache/hadoop/fs/viewfs/TestViewFsWithAuthorityLocalFs.java
diff --git a/common/src/test/core/org/apache/hadoop/fs/viewfs/TestViewfsFileStatus.java b/hadoop-common/src/test/java/org/apache/hadoop/fs/viewfs/TestViewfsFileStatus.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/fs/viewfs/TestViewfsFileStatus.java
rename to hadoop-common/src/test/java/org/apache/hadoop/fs/viewfs/TestViewfsFileStatus.java
diff --git a/common/src/test/core/org/apache/hadoop/fs/viewfs/ViewFileSystemBaseTest.java b/hadoop-common/src/test/java/org/apache/hadoop/fs/viewfs/ViewFileSystemBaseTest.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/fs/viewfs/ViewFileSystemBaseTest.java
rename to hadoop-common/src/test/java/org/apache/hadoop/fs/viewfs/ViewFileSystemBaseTest.java
diff --git a/common/src/test/core/org/apache/hadoop/fs/viewfs/ViewFileSystemTestSetup.java b/hadoop-common/src/test/java/org/apache/hadoop/fs/viewfs/ViewFileSystemTestSetup.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/fs/viewfs/ViewFileSystemTestSetup.java
rename to hadoop-common/src/test/java/org/apache/hadoop/fs/viewfs/ViewFileSystemTestSetup.java
diff --git a/common/src/test/core/org/apache/hadoop/fs/viewfs/ViewFsBaseTest.java b/hadoop-common/src/test/java/org/apache/hadoop/fs/viewfs/ViewFsBaseTest.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/fs/viewfs/ViewFsBaseTest.java
rename to hadoop-common/src/test/java/org/apache/hadoop/fs/viewfs/ViewFsBaseTest.java
diff --git a/common/src/test/core/org/apache/hadoop/fs/viewfs/ViewFsTestSetup.java b/hadoop-common/src/test/java/org/apache/hadoop/fs/viewfs/ViewFsTestSetup.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/fs/viewfs/ViewFsTestSetup.java
rename to hadoop-common/src/test/java/org/apache/hadoop/fs/viewfs/ViewFsTestSetup.java
diff --git a/common/src/test/core/org/apache/hadoop/http/HttpServerFunctionalTest.java b/hadoop-common/src/test/java/org/apache/hadoop/http/HttpServerFunctionalTest.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/http/HttpServerFunctionalTest.java
rename to hadoop-common/src/test/java/org/apache/hadoop/http/HttpServerFunctionalTest.java
diff --git a/common/src/test/core/org/apache/hadoop/http/TestGlobalFilter.java b/hadoop-common/src/test/java/org/apache/hadoop/http/TestGlobalFilter.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/http/TestGlobalFilter.java
rename to hadoop-common/src/test/java/org/apache/hadoop/http/TestGlobalFilter.java
diff --git a/common/src/test/core/org/apache/hadoop/http/TestHtmlQuoting.java b/hadoop-common/src/test/java/org/apache/hadoop/http/TestHtmlQuoting.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/http/TestHtmlQuoting.java
rename to hadoop-common/src/test/java/org/apache/hadoop/http/TestHtmlQuoting.java
diff --git a/common/src/test/core/org/apache/hadoop/http/TestHttpServer.java b/hadoop-common/src/test/java/org/apache/hadoop/http/TestHttpServer.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/http/TestHttpServer.java
rename to hadoop-common/src/test/java/org/apache/hadoop/http/TestHttpServer.java
diff --git a/common/src/test/core/org/apache/hadoop/http/TestHttpServerLifecycle.java b/hadoop-common/src/test/java/org/apache/hadoop/http/TestHttpServerLifecycle.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/http/TestHttpServerLifecycle.java
rename to hadoop-common/src/test/java/org/apache/hadoop/http/TestHttpServerLifecycle.java
diff --git a/common/src/test/core/org/apache/hadoop/http/TestHttpServerWebapps.java b/hadoop-common/src/test/java/org/apache/hadoop/http/TestHttpServerWebapps.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/http/TestHttpServerWebapps.java
rename to hadoop-common/src/test/java/org/apache/hadoop/http/TestHttpServerWebapps.java
diff --git a/common/src/test/core/org/apache/hadoop/http/TestServletFilter.java b/hadoop-common/src/test/java/org/apache/hadoop/http/TestServletFilter.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/http/TestServletFilter.java
rename to hadoop-common/src/test/java/org/apache/hadoop/http/TestServletFilter.java
diff --git a/common/src/test/core/org/apache/hadoop/http/lib/TestStaticUserWebFilter.java b/hadoop-common/src/test/java/org/apache/hadoop/http/lib/TestStaticUserWebFilter.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/http/lib/TestStaticUserWebFilter.java
rename to hadoop-common/src/test/java/org/apache/hadoop/http/lib/TestStaticUserWebFilter.java
diff --git a/common/src/test/core/org/apache/hadoop/io/AvroTestUtil.java b/hadoop-common/src/test/java/org/apache/hadoop/io/AvroTestUtil.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/io/AvroTestUtil.java
rename to hadoop-common/src/test/java/org/apache/hadoop/io/AvroTestUtil.java
diff --git a/common/src/test/core/org/apache/hadoop/io/RandomDatum.java b/hadoop-common/src/test/java/org/apache/hadoop/io/RandomDatum.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/io/RandomDatum.java
rename to hadoop-common/src/test/java/org/apache/hadoop/io/RandomDatum.java
diff --git a/common/src/test/core/org/apache/hadoop/io/TestArrayFile.java b/hadoop-common/src/test/java/org/apache/hadoop/io/TestArrayFile.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/io/TestArrayFile.java
rename to hadoop-common/src/test/java/org/apache/hadoop/io/TestArrayFile.java
diff --git a/common/src/test/core/org/apache/hadoop/io/TestArrayPrimitiveWritable.java b/hadoop-common/src/test/java/org/apache/hadoop/io/TestArrayPrimitiveWritable.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/io/TestArrayPrimitiveWritable.java
rename to hadoop-common/src/test/java/org/apache/hadoop/io/TestArrayPrimitiveWritable.java
diff --git a/common/src/test/core/org/apache/hadoop/io/TestArrayWritable.java b/hadoop-common/src/test/java/org/apache/hadoop/io/TestArrayWritable.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/io/TestArrayWritable.java
rename to hadoop-common/src/test/java/org/apache/hadoop/io/TestArrayWritable.java
diff --git a/common/src/test/core/org/apache/hadoop/io/TestBloomMapFile.java b/hadoop-common/src/test/java/org/apache/hadoop/io/TestBloomMapFile.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/io/TestBloomMapFile.java
rename to hadoop-common/src/test/java/org/apache/hadoop/io/TestBloomMapFile.java
diff --git a/common/src/test/core/org/apache/hadoop/io/TestBooleanWritable.java b/hadoop-common/src/test/java/org/apache/hadoop/io/TestBooleanWritable.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/io/TestBooleanWritable.java
rename to hadoop-common/src/test/java/org/apache/hadoop/io/TestBooleanWritable.java
diff --git a/common/src/test/core/org/apache/hadoop/io/TestBoundedByteArrayOutputStream.java b/hadoop-common/src/test/java/org/apache/hadoop/io/TestBoundedByteArrayOutputStream.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/io/TestBoundedByteArrayOutputStream.java
rename to hadoop-common/src/test/java/org/apache/hadoop/io/TestBoundedByteArrayOutputStream.java
diff --git a/common/src/test/core/org/apache/hadoop/io/TestBytesWritable.java b/hadoop-common/src/test/java/org/apache/hadoop/io/TestBytesWritable.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/io/TestBytesWritable.java
rename to hadoop-common/src/test/java/org/apache/hadoop/io/TestBytesWritable.java
diff --git a/common/src/test/core/org/apache/hadoop/io/TestDataByteBuffers.java b/hadoop-common/src/test/java/org/apache/hadoop/io/TestDataByteBuffers.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/io/TestDataByteBuffers.java
rename to hadoop-common/src/test/java/org/apache/hadoop/io/TestDataByteBuffers.java
diff --git a/common/src/test/core/org/apache/hadoop/io/TestDefaultStringifier.java b/hadoop-common/src/test/java/org/apache/hadoop/io/TestDefaultStringifier.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/io/TestDefaultStringifier.java
rename to hadoop-common/src/test/java/org/apache/hadoop/io/TestDefaultStringifier.java
diff --git a/common/src/test/core/org/apache/hadoop/io/TestEnumSetWritable.java b/hadoop-common/src/test/java/org/apache/hadoop/io/TestEnumSetWritable.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/io/TestEnumSetWritable.java
rename to hadoop-common/src/test/java/org/apache/hadoop/io/TestEnumSetWritable.java
diff --git a/common/src/test/core/org/apache/hadoop/io/TestGenericWritable.java b/hadoop-common/src/test/java/org/apache/hadoop/io/TestGenericWritable.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/io/TestGenericWritable.java
rename to hadoop-common/src/test/java/org/apache/hadoop/io/TestGenericWritable.java
diff --git a/common/src/test/core/org/apache/hadoop/io/TestIOUtils.java b/hadoop-common/src/test/java/org/apache/hadoop/io/TestIOUtils.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/io/TestIOUtils.java
rename to hadoop-common/src/test/java/org/apache/hadoop/io/TestIOUtils.java
diff --git a/common/src/test/core/org/apache/hadoop/io/TestMD5Hash.java b/hadoop-common/src/test/java/org/apache/hadoop/io/TestMD5Hash.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/io/TestMD5Hash.java
rename to hadoop-common/src/test/java/org/apache/hadoop/io/TestMD5Hash.java
diff --git a/common/src/test/core/org/apache/hadoop/io/TestMapFile.java b/hadoop-common/src/test/java/org/apache/hadoop/io/TestMapFile.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/io/TestMapFile.java
rename to hadoop-common/src/test/java/org/apache/hadoop/io/TestMapFile.java
diff --git a/common/src/test/core/org/apache/hadoop/io/TestMapWritable.java b/hadoop-common/src/test/java/org/apache/hadoop/io/TestMapWritable.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/io/TestMapWritable.java
rename to hadoop-common/src/test/java/org/apache/hadoop/io/TestMapWritable.java
diff --git a/common/src/test/core/org/apache/hadoop/io/TestObjectWritableProtos.java b/hadoop-common/src/test/java/org/apache/hadoop/io/TestObjectWritableProtos.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/io/TestObjectWritableProtos.java
rename to hadoop-common/src/test/java/org/apache/hadoop/io/TestObjectWritableProtos.java
diff --git a/common/src/test/core/org/apache/hadoop/io/TestSecureIOUtils.java b/hadoop-common/src/test/java/org/apache/hadoop/io/TestSecureIOUtils.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/io/TestSecureIOUtils.java
rename to hadoop-common/src/test/java/org/apache/hadoop/io/TestSecureIOUtils.java
diff --git a/common/src/test/core/org/apache/hadoop/io/TestSequenceFile.java b/hadoop-common/src/test/java/org/apache/hadoop/io/TestSequenceFile.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/io/TestSequenceFile.java
rename to hadoop-common/src/test/java/org/apache/hadoop/io/TestSequenceFile.java
diff --git a/common/src/test/core/org/apache/hadoop/io/TestSequenceFileSerialization.java b/hadoop-common/src/test/java/org/apache/hadoop/io/TestSequenceFileSerialization.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/io/TestSequenceFileSerialization.java
rename to hadoop-common/src/test/java/org/apache/hadoop/io/TestSequenceFileSerialization.java
diff --git a/common/src/test/core/org/apache/hadoop/io/TestSequenceFileSync.java b/hadoop-common/src/test/java/org/apache/hadoop/io/TestSequenceFileSync.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/io/TestSequenceFileSync.java
rename to hadoop-common/src/test/java/org/apache/hadoop/io/TestSequenceFileSync.java
diff --git a/common/src/test/core/org/apache/hadoop/io/TestSetFile.java b/hadoop-common/src/test/java/org/apache/hadoop/io/TestSetFile.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/io/TestSetFile.java
rename to hadoop-common/src/test/java/org/apache/hadoop/io/TestSetFile.java
diff --git a/common/src/test/core/org/apache/hadoop/io/TestSortedMapWritable.java b/hadoop-common/src/test/java/org/apache/hadoop/io/TestSortedMapWritable.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/io/TestSortedMapWritable.java
rename to hadoop-common/src/test/java/org/apache/hadoop/io/TestSortedMapWritable.java
diff --git a/common/src/test/core/org/apache/hadoop/io/TestText.java b/hadoop-common/src/test/java/org/apache/hadoop/io/TestText.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/io/TestText.java
rename to hadoop-common/src/test/java/org/apache/hadoop/io/TestText.java
diff --git a/common/src/test/core/org/apache/hadoop/io/TestTextNonUTF8.java b/hadoop-common/src/test/java/org/apache/hadoop/io/TestTextNonUTF8.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/io/TestTextNonUTF8.java
rename to hadoop-common/src/test/java/org/apache/hadoop/io/TestTextNonUTF8.java
diff --git a/common/src/test/core/org/apache/hadoop/io/TestUTF8.java b/hadoop-common/src/test/java/org/apache/hadoop/io/TestUTF8.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/io/TestUTF8.java
rename to hadoop-common/src/test/java/org/apache/hadoop/io/TestUTF8.java
diff --git a/common/src/test/core/org/apache/hadoop/io/TestVersionedWritable.java b/hadoop-common/src/test/java/org/apache/hadoop/io/TestVersionedWritable.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/io/TestVersionedWritable.java
rename to hadoop-common/src/test/java/org/apache/hadoop/io/TestVersionedWritable.java
diff --git a/common/src/test/core/org/apache/hadoop/io/TestWritable.java b/hadoop-common/src/test/java/org/apache/hadoop/io/TestWritable.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/io/TestWritable.java
rename to hadoop-common/src/test/java/org/apache/hadoop/io/TestWritable.java
diff --git a/common/src/test/core/org/apache/hadoop/io/TestWritableName.java b/hadoop-common/src/test/java/org/apache/hadoop/io/TestWritableName.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/io/TestWritableName.java
rename to hadoop-common/src/test/java/org/apache/hadoop/io/TestWritableName.java
diff --git a/common/src/test/core/org/apache/hadoop/io/TestWritableUtils.java b/hadoop-common/src/test/java/org/apache/hadoop/io/TestWritableUtils.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/io/TestWritableUtils.java
rename to hadoop-common/src/test/java/org/apache/hadoop/io/TestWritableUtils.java
diff --git a/common/src/test/core/org/apache/hadoop/io/compress/TestBlockDecompressorStream.java b/hadoop-common/src/test/java/org/apache/hadoop/io/compress/TestBlockDecompressorStream.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/io/compress/TestBlockDecompressorStream.java
rename to hadoop-common/src/test/java/org/apache/hadoop/io/compress/TestBlockDecompressorStream.java
diff --git a/common/src/test/core/org/apache/hadoop/io/compress/TestCodec.java b/hadoop-common/src/test/java/org/apache/hadoop/io/compress/TestCodec.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/io/compress/TestCodec.java
rename to hadoop-common/src/test/java/org/apache/hadoop/io/compress/TestCodec.java
diff --git a/common/src/test/core/org/apache/hadoop/io/compress/TestCodecFactory.java b/hadoop-common/src/test/java/org/apache/hadoop/io/compress/TestCodecFactory.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/io/compress/TestCodecFactory.java
rename to hadoop-common/src/test/java/org/apache/hadoop/io/compress/TestCodecFactory.java
diff --git a/common/src/test/core/org/apache/hadoop/io/file/tfile/KVGenerator.java b/hadoop-common/src/test/java/org/apache/hadoop/io/file/tfile/KVGenerator.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/io/file/tfile/KVGenerator.java
rename to hadoop-common/src/test/java/org/apache/hadoop/io/file/tfile/KVGenerator.java
diff --git a/common/src/test/core/org/apache/hadoop/io/file/tfile/KeySampler.java b/hadoop-common/src/test/java/org/apache/hadoop/io/file/tfile/KeySampler.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/io/file/tfile/KeySampler.java
rename to hadoop-common/src/test/java/org/apache/hadoop/io/file/tfile/KeySampler.java
diff --git a/common/src/test/core/org/apache/hadoop/io/file/tfile/NanoTimer.java b/hadoop-common/src/test/java/org/apache/hadoop/io/file/tfile/NanoTimer.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/io/file/tfile/NanoTimer.java
rename to hadoop-common/src/test/java/org/apache/hadoop/io/file/tfile/NanoTimer.java
diff --git a/common/src/test/core/org/apache/hadoop/io/file/tfile/RandomDistribution.java b/hadoop-common/src/test/java/org/apache/hadoop/io/file/tfile/RandomDistribution.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/io/file/tfile/RandomDistribution.java
rename to hadoop-common/src/test/java/org/apache/hadoop/io/file/tfile/RandomDistribution.java
diff --git a/common/src/test/core/org/apache/hadoop/io/file/tfile/TestTFile.java b/hadoop-common/src/test/java/org/apache/hadoop/io/file/tfile/TestTFile.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/io/file/tfile/TestTFile.java
rename to hadoop-common/src/test/java/org/apache/hadoop/io/file/tfile/TestTFile.java
diff --git a/common/src/test/core/org/apache/hadoop/io/file/tfile/TestTFileByteArrays.java b/hadoop-common/src/test/java/org/apache/hadoop/io/file/tfile/TestTFileByteArrays.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/io/file/tfile/TestTFileByteArrays.java
rename to hadoop-common/src/test/java/org/apache/hadoop/io/file/tfile/TestTFileByteArrays.java
diff --git a/common/src/test/core/org/apache/hadoop/io/file/tfile/TestTFileComparator2.java b/hadoop-common/src/test/java/org/apache/hadoop/io/file/tfile/TestTFileComparator2.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/io/file/tfile/TestTFileComparator2.java
rename to hadoop-common/src/test/java/org/apache/hadoop/io/file/tfile/TestTFileComparator2.java
diff --git a/common/src/test/core/org/apache/hadoop/io/file/tfile/TestTFileComparators.java b/hadoop-common/src/test/java/org/apache/hadoop/io/file/tfile/TestTFileComparators.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/io/file/tfile/TestTFileComparators.java
rename to hadoop-common/src/test/java/org/apache/hadoop/io/file/tfile/TestTFileComparators.java
diff --git a/common/src/test/core/org/apache/hadoop/io/file/tfile/TestTFileJClassComparatorByteArrays.java b/hadoop-common/src/test/java/org/apache/hadoop/io/file/tfile/TestTFileJClassComparatorByteArrays.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/io/file/tfile/TestTFileJClassComparatorByteArrays.java
rename to hadoop-common/src/test/java/org/apache/hadoop/io/file/tfile/TestTFileJClassComparatorByteArrays.java
diff --git a/common/src/test/core/org/apache/hadoop/io/file/tfile/TestTFileLzoCodecsByteArrays.java b/hadoop-common/src/test/java/org/apache/hadoop/io/file/tfile/TestTFileLzoCodecsByteArrays.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/io/file/tfile/TestTFileLzoCodecsByteArrays.java
rename to hadoop-common/src/test/java/org/apache/hadoop/io/file/tfile/TestTFileLzoCodecsByteArrays.java
diff --git a/common/src/test/core/org/apache/hadoop/io/file/tfile/TestTFileLzoCodecsStreams.java b/hadoop-common/src/test/java/org/apache/hadoop/io/file/tfile/TestTFileLzoCodecsStreams.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/io/file/tfile/TestTFileLzoCodecsStreams.java
rename to hadoop-common/src/test/java/org/apache/hadoop/io/file/tfile/TestTFileLzoCodecsStreams.java
diff --git a/common/src/test/core/org/apache/hadoop/io/file/tfile/TestTFileNoneCodecsByteArrays.java b/hadoop-common/src/test/java/org/apache/hadoop/io/file/tfile/TestTFileNoneCodecsByteArrays.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/io/file/tfile/TestTFileNoneCodecsByteArrays.java
rename to hadoop-common/src/test/java/org/apache/hadoop/io/file/tfile/TestTFileNoneCodecsByteArrays.java
diff --git a/common/src/test/core/org/apache/hadoop/io/file/tfile/TestTFileNoneCodecsJClassComparatorByteArrays.java b/hadoop-common/src/test/java/org/apache/hadoop/io/file/tfile/TestTFileNoneCodecsJClassComparatorByteArrays.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/io/file/tfile/TestTFileNoneCodecsJClassComparatorByteArrays.java
rename to hadoop-common/src/test/java/org/apache/hadoop/io/file/tfile/TestTFileNoneCodecsJClassComparatorByteArrays.java
diff --git a/common/src/test/core/org/apache/hadoop/io/file/tfile/TestTFileNoneCodecsStreams.java b/hadoop-common/src/test/java/org/apache/hadoop/io/file/tfile/TestTFileNoneCodecsStreams.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/io/file/tfile/TestTFileNoneCodecsStreams.java
rename to hadoop-common/src/test/java/org/apache/hadoop/io/file/tfile/TestTFileNoneCodecsStreams.java
diff --git a/common/src/test/core/org/apache/hadoop/io/file/tfile/TestTFileSeek.java b/hadoop-common/src/test/java/org/apache/hadoop/io/file/tfile/TestTFileSeek.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/io/file/tfile/TestTFileSeek.java
rename to hadoop-common/src/test/java/org/apache/hadoop/io/file/tfile/TestTFileSeek.java
diff --git a/common/src/test/core/org/apache/hadoop/io/file/tfile/TestTFileSeqFileComparison.java b/hadoop-common/src/test/java/org/apache/hadoop/io/file/tfile/TestTFileSeqFileComparison.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/io/file/tfile/TestTFileSeqFileComparison.java
rename to hadoop-common/src/test/java/org/apache/hadoop/io/file/tfile/TestTFileSeqFileComparison.java
diff --git a/common/src/test/core/org/apache/hadoop/io/file/tfile/TestTFileSplit.java b/hadoop-common/src/test/java/org/apache/hadoop/io/file/tfile/TestTFileSplit.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/io/file/tfile/TestTFileSplit.java
rename to hadoop-common/src/test/java/org/apache/hadoop/io/file/tfile/TestTFileSplit.java
diff --git a/common/src/test/core/org/apache/hadoop/io/file/tfile/TestTFileStreams.java b/hadoop-common/src/test/java/org/apache/hadoop/io/file/tfile/TestTFileStreams.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/io/file/tfile/TestTFileStreams.java
rename to hadoop-common/src/test/java/org/apache/hadoop/io/file/tfile/TestTFileStreams.java
diff --git a/common/src/test/core/org/apache/hadoop/io/file/tfile/TestTFileUnsortedByteArrays.java b/hadoop-common/src/test/java/org/apache/hadoop/io/file/tfile/TestTFileUnsortedByteArrays.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/io/file/tfile/TestTFileUnsortedByteArrays.java
rename to hadoop-common/src/test/java/org/apache/hadoop/io/file/tfile/TestTFileUnsortedByteArrays.java
diff --git a/common/src/test/core/org/apache/hadoop/io/file/tfile/TestVLong.java b/hadoop-common/src/test/java/org/apache/hadoop/io/file/tfile/TestVLong.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/io/file/tfile/TestVLong.java
rename to hadoop-common/src/test/java/org/apache/hadoop/io/file/tfile/TestVLong.java
diff --git a/common/src/test/core/org/apache/hadoop/io/file/tfile/Timer.java b/hadoop-common/src/test/java/org/apache/hadoop/io/file/tfile/Timer.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/io/file/tfile/Timer.java
rename to hadoop-common/src/test/java/org/apache/hadoop/io/file/tfile/Timer.java
diff --git a/common/src/test/core/org/apache/hadoop/io/nativeio/TestNativeIO.java b/hadoop-common/src/test/java/org/apache/hadoop/io/nativeio/TestNativeIO.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/io/nativeio/TestNativeIO.java
rename to hadoop-common/src/test/java/org/apache/hadoop/io/nativeio/TestNativeIO.java
diff --git a/common/src/test/core/org/apache/hadoop/io/retry/TestFailoverProxy.java b/hadoop-common/src/test/java/org/apache/hadoop/io/retry/TestFailoverProxy.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/io/retry/TestFailoverProxy.java
rename to hadoop-common/src/test/java/org/apache/hadoop/io/retry/TestFailoverProxy.java
diff --git a/common/src/test/core/org/apache/hadoop/io/retry/TestRetryProxy.java b/hadoop-common/src/test/java/org/apache/hadoop/io/retry/TestRetryProxy.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/io/retry/TestRetryProxy.java
rename to hadoop-common/src/test/java/org/apache/hadoop/io/retry/TestRetryProxy.java
diff --git a/common/src/test/core/org/apache/hadoop/io/retry/UnreliableImplementation.java b/hadoop-common/src/test/java/org/apache/hadoop/io/retry/UnreliableImplementation.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/io/retry/UnreliableImplementation.java
rename to hadoop-common/src/test/java/org/apache/hadoop/io/retry/UnreliableImplementation.java
diff --git a/common/src/test/core/org/apache/hadoop/io/retry/UnreliableInterface.java b/hadoop-common/src/test/java/org/apache/hadoop/io/retry/UnreliableInterface.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/io/retry/UnreliableInterface.java
rename to hadoop-common/src/test/java/org/apache/hadoop/io/retry/UnreliableInterface.java
diff --git a/common/src/test/core/org/apache/hadoop/io/serializer/SerializationTestUtil.java b/hadoop-common/src/test/java/org/apache/hadoop/io/serializer/SerializationTestUtil.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/io/serializer/SerializationTestUtil.java
rename to hadoop-common/src/test/java/org/apache/hadoop/io/serializer/SerializationTestUtil.java
diff --git a/common/src/test/core/org/apache/hadoop/io/serializer/TestWritableSerialization.java b/hadoop-common/src/test/java/org/apache/hadoop/io/serializer/TestWritableSerialization.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/io/serializer/TestWritableSerialization.java
rename to hadoop-common/src/test/java/org/apache/hadoop/io/serializer/TestWritableSerialization.java
diff --git a/common/src/test/core/org/apache/hadoop/io/serializer/avro/Record.java b/hadoop-common/src/test/java/org/apache/hadoop/io/serializer/avro/Record.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/io/serializer/avro/Record.java
rename to hadoop-common/src/test/java/org/apache/hadoop/io/serializer/avro/Record.java
diff --git a/common/src/test/core/org/apache/hadoop/io/serializer/avro/TestAvroSerialization.java b/hadoop-common/src/test/java/org/apache/hadoop/io/serializer/avro/TestAvroSerialization.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/io/serializer/avro/TestAvroSerialization.java
rename to hadoop-common/src/test/java/org/apache/hadoop/io/serializer/avro/TestAvroSerialization.java
diff --git a/common/src/test/core/org/apache/hadoop/io/serializer/avro/avroRecord.avsc b/hadoop-common/src/test/java/org/apache/hadoop/io/serializer/avro/avroRecord.avsc
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/io/serializer/avro/avroRecord.avsc
rename to hadoop-common/src/test/java/org/apache/hadoop/io/serializer/avro/avroRecord.avsc
diff --git a/common/src/test/core/org/apache/hadoop/ipc/AvroSpecificTestProtocol.avpr b/hadoop-common/src/test/java/org/apache/hadoop/ipc/AvroSpecificTestProtocol.avpr
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/ipc/AvroSpecificTestProtocol.avpr
rename to hadoop-common/src/test/java/org/apache/hadoop/ipc/AvroSpecificTestProtocol.avpr
diff --git a/common/src/test/core/org/apache/hadoop/ipc/AvroTestProtocol.java b/hadoop-common/src/test/java/org/apache/hadoop/ipc/AvroTestProtocol.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/ipc/AvroTestProtocol.java
rename to hadoop-common/src/test/java/org/apache/hadoop/ipc/AvroTestProtocol.java
diff --git a/common/src/test/core/org/apache/hadoop/ipc/MiniRPCBenchmark.java b/hadoop-common/src/test/java/org/apache/hadoop/ipc/MiniRPCBenchmark.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/ipc/MiniRPCBenchmark.java
rename to hadoop-common/src/test/java/org/apache/hadoop/ipc/MiniRPCBenchmark.java
diff --git a/common/src/test/core/org/apache/hadoop/ipc/TestAvroRpc.java b/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestAvroRpc.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/ipc/TestAvroRpc.java
rename to hadoop-common/src/test/java/org/apache/hadoop/ipc/TestAvroRpc.java
diff --git a/common/src/test/core/org/apache/hadoop/ipc/TestIPC.java b/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestIPC.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/ipc/TestIPC.java
rename to hadoop-common/src/test/java/org/apache/hadoop/ipc/TestIPC.java
diff --git a/common/src/test/core/org/apache/hadoop/ipc/TestIPCServerResponder.java b/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestIPCServerResponder.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/ipc/TestIPCServerResponder.java
rename to hadoop-common/src/test/java/org/apache/hadoop/ipc/TestIPCServerResponder.java
diff --git a/common/src/test/core/org/apache/hadoop/ipc/TestMiniRPCBenchmark.java b/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestMiniRPCBenchmark.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/ipc/TestMiniRPCBenchmark.java
rename to hadoop-common/src/test/java/org/apache/hadoop/ipc/TestMiniRPCBenchmark.java
diff --git a/common/src/test/core/org/apache/hadoop/ipc/TestRPC.java b/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestRPC.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/ipc/TestRPC.java
rename to hadoop-common/src/test/java/org/apache/hadoop/ipc/TestRPC.java
diff --git a/common/src/test/core/org/apache/hadoop/ipc/TestRPCCompatibility.java b/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestRPCCompatibility.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/ipc/TestRPCCompatibility.java
rename to hadoop-common/src/test/java/org/apache/hadoop/ipc/TestRPCCompatibility.java
diff --git a/common/src/test/core/org/apache/hadoop/ipc/TestSaslRPC.java b/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestSaslRPC.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/ipc/TestSaslRPC.java
rename to hadoop-common/src/test/java/org/apache/hadoop/ipc/TestSaslRPC.java
diff --git a/common/src/test/core/org/apache/hadoop/ipc/TestSocketFactory.java b/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestSocketFactory.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/ipc/TestSocketFactory.java
rename to hadoop-common/src/test/java/org/apache/hadoop/ipc/TestSocketFactory.java
diff --git a/common/src/test/core/org/apache/hadoop/jmx/TestJMXJsonServlet.java b/hadoop-common/src/test/java/org/apache/hadoop/jmx/TestJMXJsonServlet.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/jmx/TestJMXJsonServlet.java
rename to hadoop-common/src/test/java/org/apache/hadoop/jmx/TestJMXJsonServlet.java
diff --git a/common/src/test/core/org/apache/hadoop/log/TestLogLevel.java b/hadoop-common/src/test/java/org/apache/hadoop/log/TestLogLevel.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/log/TestLogLevel.java
rename to hadoop-common/src/test/java/org/apache/hadoop/log/TestLogLevel.java
diff --git a/common/src/test/core/org/apache/hadoop/metrics/TestMetricsServlet.java b/hadoop-common/src/test/java/org/apache/hadoop/metrics/TestMetricsServlet.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/metrics/TestMetricsServlet.java
rename to hadoop-common/src/test/java/org/apache/hadoop/metrics/TestMetricsServlet.java
diff --git a/common/src/test/core/org/apache/hadoop/metrics/ganglia/TestGangliaContext.java b/hadoop-common/src/test/java/org/apache/hadoop/metrics/ganglia/TestGangliaContext.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/metrics/ganglia/TestGangliaContext.java
rename to hadoop-common/src/test/java/org/apache/hadoop/metrics/ganglia/TestGangliaContext.java
diff --git a/common/src/test/core/org/apache/hadoop/metrics/spi/TestOutputRecord.java b/hadoop-common/src/test/java/org/apache/hadoop/metrics/spi/TestOutputRecord.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/metrics/spi/TestOutputRecord.java
rename to hadoop-common/src/test/java/org/apache/hadoop/metrics/spi/TestOutputRecord.java
diff --git a/common/src/test/core/org/apache/hadoop/metrics2/filter/TestPatternFilter.java b/hadoop-common/src/test/java/org/apache/hadoop/metrics2/filter/TestPatternFilter.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/metrics2/filter/TestPatternFilter.java
rename to hadoop-common/src/test/java/org/apache/hadoop/metrics2/filter/TestPatternFilter.java
diff --git a/common/src/test/core/org/apache/hadoop/metrics2/impl/ConfigBuilder.java b/hadoop-common/src/test/java/org/apache/hadoop/metrics2/impl/ConfigBuilder.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/metrics2/impl/ConfigBuilder.java
rename to hadoop-common/src/test/java/org/apache/hadoop/metrics2/impl/ConfigBuilder.java
diff --git a/common/src/test/core/org/apache/hadoop/metrics2/impl/ConfigUtil.java b/hadoop-common/src/test/java/org/apache/hadoop/metrics2/impl/ConfigUtil.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/metrics2/impl/ConfigUtil.java
rename to hadoop-common/src/test/java/org/apache/hadoop/metrics2/impl/ConfigUtil.java
diff --git a/common/src/test/core/org/apache/hadoop/metrics2/impl/MetricsLists.java b/hadoop-common/src/test/java/org/apache/hadoop/metrics2/impl/MetricsLists.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/metrics2/impl/MetricsLists.java
rename to hadoop-common/src/test/java/org/apache/hadoop/metrics2/impl/MetricsLists.java
diff --git a/common/src/test/core/org/apache/hadoop/metrics2/impl/TestGangliaMetrics.java b/hadoop-common/src/test/java/org/apache/hadoop/metrics2/impl/TestGangliaMetrics.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/metrics2/impl/TestGangliaMetrics.java
rename to hadoop-common/src/test/java/org/apache/hadoop/metrics2/impl/TestGangliaMetrics.java
diff --git a/common/src/test/core/org/apache/hadoop/metrics2/impl/TestMetricsCollectorImpl.java b/hadoop-common/src/test/java/org/apache/hadoop/metrics2/impl/TestMetricsCollectorImpl.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/metrics2/impl/TestMetricsCollectorImpl.java
rename to hadoop-common/src/test/java/org/apache/hadoop/metrics2/impl/TestMetricsCollectorImpl.java
diff --git a/common/src/test/core/org/apache/hadoop/metrics2/impl/TestMetricsConfig.java b/hadoop-common/src/test/java/org/apache/hadoop/metrics2/impl/TestMetricsConfig.java
similarity index 97%
rename from common/src/test/core/org/apache/hadoop/metrics2/impl/TestMetricsConfig.java
rename to hadoop-common/src/test/java/org/apache/hadoop/metrics2/impl/TestMetricsConfig.java
index 5c3d7cac1f..3bdc8af1e6 100644
--- a/common/src/test/core/org/apache/hadoop/metrics2/impl/TestMetricsConfig.java
+++ b/hadoop-common/src/test/java/org/apache/hadoop/metrics2/impl/TestMetricsConfig.java
@@ -138,6 +138,7 @@ private void testInstances(MetricsConfig c) throws Exception {
    * @return the filename
    */
   public static String getTestFilename(String basename) {
-    return "build/test/"+ basename +".properties";
+      return System.getProperty("test.build.classes", "target/test-classes") +
+             "/"+ basename +".properties";
   }
 }
diff --git a/common/src/test/core/org/apache/hadoop/metrics2/impl/TestMetricsSystemImpl.java b/hadoop-common/src/test/java/org/apache/hadoop/metrics2/impl/TestMetricsSystemImpl.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/metrics2/impl/TestMetricsSystemImpl.java
rename to hadoop-common/src/test/java/org/apache/hadoop/metrics2/impl/TestMetricsSystemImpl.java
diff --git a/common/src/test/core/org/apache/hadoop/metrics2/impl/TestMetricsVisitor.java b/hadoop-common/src/test/java/org/apache/hadoop/metrics2/impl/TestMetricsVisitor.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/metrics2/impl/TestMetricsVisitor.java
rename to hadoop-common/src/test/java/org/apache/hadoop/metrics2/impl/TestMetricsVisitor.java
diff --git a/common/src/test/core/org/apache/hadoop/metrics2/impl/TestSinkQueue.java b/hadoop-common/src/test/java/org/apache/hadoop/metrics2/impl/TestSinkQueue.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/metrics2/impl/TestSinkQueue.java
rename to hadoop-common/src/test/java/org/apache/hadoop/metrics2/impl/TestSinkQueue.java
diff --git a/common/src/test/core/org/apache/hadoop/metrics2/lib/TestInterns.java b/hadoop-common/src/test/java/org/apache/hadoop/metrics2/lib/TestInterns.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/metrics2/lib/TestInterns.java
rename to hadoop-common/src/test/java/org/apache/hadoop/metrics2/lib/TestInterns.java
diff --git a/common/src/test/core/org/apache/hadoop/metrics2/lib/TestMetricsAnnotations.java b/hadoop-common/src/test/java/org/apache/hadoop/metrics2/lib/TestMetricsAnnotations.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/metrics2/lib/TestMetricsAnnotations.java
rename to hadoop-common/src/test/java/org/apache/hadoop/metrics2/lib/TestMetricsAnnotations.java
diff --git a/common/src/test/core/org/apache/hadoop/metrics2/lib/TestMetricsRegistry.java b/hadoop-common/src/test/java/org/apache/hadoop/metrics2/lib/TestMetricsRegistry.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/metrics2/lib/TestMetricsRegistry.java
rename to hadoop-common/src/test/java/org/apache/hadoop/metrics2/lib/TestMetricsRegistry.java
diff --git a/common/src/test/core/org/apache/hadoop/metrics2/lib/TestMutableMetrics.java b/hadoop-common/src/test/java/org/apache/hadoop/metrics2/lib/TestMutableMetrics.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/metrics2/lib/TestMutableMetrics.java
rename to hadoop-common/src/test/java/org/apache/hadoop/metrics2/lib/TestMutableMetrics.java
diff --git a/common/src/test/core/org/apache/hadoop/metrics2/lib/TestUniqNames.java b/hadoop-common/src/test/java/org/apache/hadoop/metrics2/lib/TestUniqNames.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/metrics2/lib/TestUniqNames.java
rename to hadoop-common/src/test/java/org/apache/hadoop/metrics2/lib/TestUniqNames.java
diff --git a/common/src/test/core/org/apache/hadoop/metrics2/sink/ganglia/GangliaMetricsTestHelper.java b/hadoop-common/src/test/java/org/apache/hadoop/metrics2/sink/ganglia/GangliaMetricsTestHelper.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/metrics2/sink/ganglia/GangliaMetricsTestHelper.java
rename to hadoop-common/src/test/java/org/apache/hadoop/metrics2/sink/ganglia/GangliaMetricsTestHelper.java
diff --git a/common/src/test/core/org/apache/hadoop/metrics2/source/TestJvmMetrics.java b/hadoop-common/src/test/java/org/apache/hadoop/metrics2/source/TestJvmMetrics.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/metrics2/source/TestJvmMetrics.java
rename to hadoop-common/src/test/java/org/apache/hadoop/metrics2/source/TestJvmMetrics.java
diff --git a/common/src/test/core/org/apache/hadoop/metrics2/util/TestMetricsCache.java b/hadoop-common/src/test/java/org/apache/hadoop/metrics2/util/TestMetricsCache.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/metrics2/util/TestMetricsCache.java
rename to hadoop-common/src/test/java/org/apache/hadoop/metrics2/util/TestMetricsCache.java
diff --git a/common/src/test/core/org/apache/hadoop/metrics2/util/TestSampleStat.java b/hadoop-common/src/test/java/org/apache/hadoop/metrics2/util/TestSampleStat.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/metrics2/util/TestSampleStat.java
rename to hadoop-common/src/test/java/org/apache/hadoop/metrics2/util/TestSampleStat.java
diff --git a/common/src/test/core/org/apache/hadoop/net/StaticMapping.java b/hadoop-common/src/test/java/org/apache/hadoop/net/StaticMapping.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/net/StaticMapping.java
rename to hadoop-common/src/test/java/org/apache/hadoop/net/StaticMapping.java
diff --git a/common/src/test/core/org/apache/hadoop/net/TestDNS.java b/hadoop-common/src/test/java/org/apache/hadoop/net/TestDNS.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/net/TestDNS.java
rename to hadoop-common/src/test/java/org/apache/hadoop/net/TestDNS.java
diff --git a/common/src/test/core/org/apache/hadoop/net/TestNetUtils.java b/hadoop-common/src/test/java/org/apache/hadoop/net/TestNetUtils.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/net/TestNetUtils.java
rename to hadoop-common/src/test/java/org/apache/hadoop/net/TestNetUtils.java
diff --git a/common/src/test/core/org/apache/hadoop/net/TestScriptBasedMapping.java b/hadoop-common/src/test/java/org/apache/hadoop/net/TestScriptBasedMapping.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/net/TestScriptBasedMapping.java
rename to hadoop-common/src/test/java/org/apache/hadoop/net/TestScriptBasedMapping.java
diff --git a/common/src/test/core/org/apache/hadoop/net/TestSocketIOWithTimeout.java b/hadoop-common/src/test/java/org/apache/hadoop/net/TestSocketIOWithTimeout.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/net/TestSocketIOWithTimeout.java
rename to hadoop-common/src/test/java/org/apache/hadoop/net/TestSocketIOWithTimeout.java
diff --git a/common/src/test/core/org/apache/hadoop/record/FromCpp.java b/hadoop-common/src/test/java/org/apache/hadoop/record/FromCpp.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/record/FromCpp.java
rename to hadoop-common/src/test/java/org/apache/hadoop/record/FromCpp.java
diff --git a/common/src/test/core/org/apache/hadoop/record/RecordBench.java b/hadoop-common/src/test/java/org/apache/hadoop/record/RecordBench.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/record/RecordBench.java
rename to hadoop-common/src/test/java/org/apache/hadoop/record/RecordBench.java
diff --git a/common/src/test/core/org/apache/hadoop/record/TestBuffer.java b/hadoop-common/src/test/java/org/apache/hadoop/record/TestBuffer.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/record/TestBuffer.java
rename to hadoop-common/src/test/java/org/apache/hadoop/record/TestBuffer.java
diff --git a/common/src/test/core/org/apache/hadoop/record/TestRecordIO.java b/hadoop-common/src/test/java/org/apache/hadoop/record/TestRecordIO.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/record/TestRecordIO.java
rename to hadoop-common/src/test/java/org/apache/hadoop/record/TestRecordIO.java
diff --git a/common/src/test/core/org/apache/hadoop/record/TestRecordVersioning.java b/hadoop-common/src/test/java/org/apache/hadoop/record/TestRecordVersioning.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/record/TestRecordVersioning.java
rename to hadoop-common/src/test/java/org/apache/hadoop/record/TestRecordVersioning.java
diff --git a/common/src/test/core/org/apache/hadoop/record/ToCpp.java b/hadoop-common/src/test/java/org/apache/hadoop/record/ToCpp.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/record/ToCpp.java
rename to hadoop-common/src/test/java/org/apache/hadoop/record/ToCpp.java
diff --git a/common/src/test/core/org/apache/hadoop/security/ManualTestKeytabLogins.java b/hadoop-common/src/test/java/org/apache/hadoop/security/ManualTestKeytabLogins.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/security/ManualTestKeytabLogins.java
rename to hadoop-common/src/test/java/org/apache/hadoop/security/ManualTestKeytabLogins.java
diff --git a/common/src/test/core/org/apache/hadoop/security/TestCredentials.java b/hadoop-common/src/test/java/org/apache/hadoop/security/TestCredentials.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/security/TestCredentials.java
rename to hadoop-common/src/test/java/org/apache/hadoop/security/TestCredentials.java
diff --git a/common/src/test/core/org/apache/hadoop/security/TestDoAsEffectiveUser.java b/hadoop-common/src/test/java/org/apache/hadoop/security/TestDoAsEffectiveUser.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/security/TestDoAsEffectiveUser.java
rename to hadoop-common/src/test/java/org/apache/hadoop/security/TestDoAsEffectiveUser.java
diff --git a/common/src/test/core/org/apache/hadoop/security/TestJNIGroupsMapping.java b/hadoop-common/src/test/java/org/apache/hadoop/security/TestJNIGroupsMapping.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/security/TestJNIGroupsMapping.java
rename to hadoop-common/src/test/java/org/apache/hadoop/security/TestJNIGroupsMapping.java
diff --git a/common/src/test/core/org/apache/hadoop/security/TestKerberosName.java b/hadoop-common/src/test/java/org/apache/hadoop/security/TestKerberosName.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/security/TestKerberosName.java
rename to hadoop-common/src/test/java/org/apache/hadoop/security/TestKerberosName.java
diff --git a/common/src/test/core/org/apache/hadoop/security/TestSecurityUtil.java b/hadoop-common/src/test/java/org/apache/hadoop/security/TestSecurityUtil.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/security/TestSecurityUtil.java
rename to hadoop-common/src/test/java/org/apache/hadoop/security/TestSecurityUtil.java
diff --git a/common/src/test/core/org/apache/hadoop/security/TestUserGroupInformation.java b/hadoop-common/src/test/java/org/apache/hadoop/security/TestUserGroupInformation.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/security/TestUserGroupInformation.java
rename to hadoop-common/src/test/java/org/apache/hadoop/security/TestUserGroupInformation.java
diff --git a/common/src/test/core/org/apache/hadoop/security/authorize/TestAccessControlList.java b/hadoop-common/src/test/java/org/apache/hadoop/security/authorize/TestAccessControlList.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/security/authorize/TestAccessControlList.java
rename to hadoop-common/src/test/java/org/apache/hadoop/security/authorize/TestAccessControlList.java
diff --git a/common/src/test/core/org/apache/hadoop/security/authorize/TestProxyUsers.java b/hadoop-common/src/test/java/org/apache/hadoop/security/authorize/TestProxyUsers.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/security/authorize/TestProxyUsers.java
rename to hadoop-common/src/test/java/org/apache/hadoop/security/authorize/TestProxyUsers.java
diff --git a/common/src/test/core/org/apache/hadoop/security/token/TestToken.java b/hadoop-common/src/test/java/org/apache/hadoop/security/token/TestToken.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/security/token/TestToken.java
rename to hadoop-common/src/test/java/org/apache/hadoop/security/token/TestToken.java
diff --git a/common/src/test/core/org/apache/hadoop/security/token/delegation/TestDelegationToken.java b/hadoop-common/src/test/java/org/apache/hadoop/security/token/delegation/TestDelegationToken.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/security/token/delegation/TestDelegationToken.java
rename to hadoop-common/src/test/java/org/apache/hadoop/security/token/delegation/TestDelegationToken.java
diff --git a/common/src/test/core/org/apache/hadoop/test/CoreTestDriver.java b/hadoop-common/src/test/java/org/apache/hadoop/test/CoreTestDriver.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/test/CoreTestDriver.java
rename to hadoop-common/src/test/java/org/apache/hadoop/test/CoreTestDriver.java
diff --git a/common/src/test/core/org/apache/hadoop/test/MetricsAsserts.java b/hadoop-common/src/test/java/org/apache/hadoop/test/MetricsAsserts.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/test/MetricsAsserts.java
rename to hadoop-common/src/test/java/org/apache/hadoop/test/MetricsAsserts.java
diff --git a/common/src/test/core/org/apache/hadoop/test/MockitoMaker.java b/hadoop-common/src/test/java/org/apache/hadoop/test/MockitoMaker.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/test/MockitoMaker.java
rename to hadoop-common/src/test/java/org/apache/hadoop/test/MockitoMaker.java
diff --git a/common/src/test/core/org/apache/hadoop/test/MoreAsserts.java b/hadoop-common/src/test/java/org/apache/hadoop/test/MoreAsserts.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/test/MoreAsserts.java
rename to hadoop-common/src/test/java/org/apache/hadoop/test/MoreAsserts.java
diff --git a/common/src/test/core/org/apache/hadoop/test/MultithreadedTestUtil.java b/hadoop-common/src/test/java/org/apache/hadoop/test/MultithreadedTestUtil.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/test/MultithreadedTestUtil.java
rename to hadoop-common/src/test/java/org/apache/hadoop/test/MultithreadedTestUtil.java
diff --git a/common/src/test/core/org/apache/hadoop/test/TestMultithreadedTestUtil.java b/hadoop-common/src/test/java/org/apache/hadoop/test/TestMultithreadedTestUtil.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/test/TestMultithreadedTestUtil.java
rename to hadoop-common/src/test/java/org/apache/hadoop/test/TestMultithreadedTestUtil.java
diff --git a/common/src/test/core/org/apache/hadoop/test/UnitTestcaseTimeLimit.java b/hadoop-common/src/test/java/org/apache/hadoop/test/UnitTestcaseTimeLimit.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/test/UnitTestcaseTimeLimit.java
rename to hadoop-common/src/test/java/org/apache/hadoop/test/UnitTestcaseTimeLimit.java
diff --git a/common/src/test/core/org/apache/hadoop/tools/GetGroupsTestBase.java b/hadoop-common/src/test/java/org/apache/hadoop/tools/GetGroupsTestBase.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/tools/GetGroupsTestBase.java
rename to hadoop-common/src/test/java/org/apache/hadoop/tools/GetGroupsTestBase.java
diff --git a/common/src/test/core/org/apache/hadoop/util/TestAsyncDiskService.java b/hadoop-common/src/test/java/org/apache/hadoop/util/TestAsyncDiskService.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/util/TestAsyncDiskService.java
rename to hadoop-common/src/test/java/org/apache/hadoop/util/TestAsyncDiskService.java
diff --git a/common/src/test/core/org/apache/hadoop/util/TestCyclicIteration.java b/hadoop-common/src/test/java/org/apache/hadoop/util/TestCyclicIteration.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/util/TestCyclicIteration.java
rename to hadoop-common/src/test/java/org/apache/hadoop/util/TestCyclicIteration.java
diff --git a/common/src/test/core/org/apache/hadoop/util/TestDataChecksum.java b/hadoop-common/src/test/java/org/apache/hadoop/util/TestDataChecksum.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/util/TestDataChecksum.java
rename to hadoop-common/src/test/java/org/apache/hadoop/util/TestDataChecksum.java
diff --git a/common/src/test/core/org/apache/hadoop/util/TestDiskChecker.java b/hadoop-common/src/test/java/org/apache/hadoop/util/TestDiskChecker.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/util/TestDiskChecker.java
rename to hadoop-common/src/test/java/org/apache/hadoop/util/TestDiskChecker.java
diff --git a/common/src/test/core/org/apache/hadoop/util/TestGenericOptionsParser.java b/hadoop-common/src/test/java/org/apache/hadoop/util/TestGenericOptionsParser.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/util/TestGenericOptionsParser.java
rename to hadoop-common/src/test/java/org/apache/hadoop/util/TestGenericOptionsParser.java
diff --git a/common/src/test/core/org/apache/hadoop/util/TestGenericsUtil.java b/hadoop-common/src/test/java/org/apache/hadoop/util/TestGenericsUtil.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/util/TestGenericsUtil.java
rename to hadoop-common/src/test/java/org/apache/hadoop/util/TestGenericsUtil.java
diff --git a/common/src/test/core/org/apache/hadoop/util/TestHostsFileReader.java b/hadoop-common/src/test/java/org/apache/hadoop/util/TestHostsFileReader.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/util/TestHostsFileReader.java
rename to hadoop-common/src/test/java/org/apache/hadoop/util/TestHostsFileReader.java
diff --git a/common/src/test/core/org/apache/hadoop/util/TestIndexedSort.java b/hadoop-common/src/test/java/org/apache/hadoop/util/TestIndexedSort.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/util/TestIndexedSort.java
rename to hadoop-common/src/test/java/org/apache/hadoop/util/TestIndexedSort.java
diff --git a/common/src/test/core/org/apache/hadoop/util/TestOptions.java b/hadoop-common/src/test/java/org/apache/hadoop/util/TestOptions.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/util/TestOptions.java
rename to hadoop-common/src/test/java/org/apache/hadoop/util/TestOptions.java
diff --git a/common/src/test/core/org/apache/hadoop/util/TestProtoUtil.java b/hadoop-common/src/test/java/org/apache/hadoop/util/TestProtoUtil.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/util/TestProtoUtil.java
rename to hadoop-common/src/test/java/org/apache/hadoop/util/TestProtoUtil.java
diff --git a/common/src/test/core/org/apache/hadoop/util/TestPureJavaCrc32.java b/hadoop-common/src/test/java/org/apache/hadoop/util/TestPureJavaCrc32.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/util/TestPureJavaCrc32.java
rename to hadoop-common/src/test/java/org/apache/hadoop/util/TestPureJavaCrc32.java
diff --git a/common/src/test/core/org/apache/hadoop/util/TestReflectionUtils.java b/hadoop-common/src/test/java/org/apache/hadoop/util/TestReflectionUtils.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/util/TestReflectionUtils.java
rename to hadoop-common/src/test/java/org/apache/hadoop/util/TestReflectionUtils.java
diff --git a/common/src/test/core/org/apache/hadoop/util/TestRunJar.java b/hadoop-common/src/test/java/org/apache/hadoop/util/TestRunJar.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/util/TestRunJar.java
rename to hadoop-common/src/test/java/org/apache/hadoop/util/TestRunJar.java
diff --git a/common/src/test/core/org/apache/hadoop/util/TestShell.java b/hadoop-common/src/test/java/org/apache/hadoop/util/TestShell.java
similarity index 99%
rename from common/src/test/core/org/apache/hadoop/util/TestShell.java
rename to hadoop-common/src/test/java/org/apache/hadoop/util/TestShell.java
index 07ca9179c2..96bfb2f731 100644
--- a/common/src/test/core/org/apache/hadoop/util/TestShell.java
+++ b/hadoop-common/src/test/java/org/apache/hadoop/util/TestShell.java
@@ -72,7 +72,7 @@ private void assertInString(String string, String search) {
 
   public void testShellCommandExecutorToString() throws Throwable {
     Shell.ShellCommandExecutor sce=new Shell.ShellCommandExecutor(
-            new String[] { "ls","..","arg 2"});
+            new String[] { "ls", "..","arg 2"});
     String command = sce.toString();
     assertInString(command,"ls");
     assertInString(command, " .. ");
diff --git a/common/src/test/core/org/apache/hadoop/util/TestStringUtils.java b/hadoop-common/src/test/java/org/apache/hadoop/util/TestStringUtils.java
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/util/TestStringUtils.java
rename to hadoop-common/src/test/java/org/apache/hadoop/util/TestStringUtils.java
diff --git a/common/src/test/core-site.xml b/hadoop-common/src/test/resources/core-site.xml
similarity index 100%
rename from common/src/test/core-site.xml
rename to hadoop-common/src/test/resources/core-site.xml
diff --git a/common/src/test/fi-site.xml b/hadoop-common/src/test/resources/fi-site.xml
similarity index 100%
rename from common/src/test/fi-site.xml
rename to hadoop-common/src/test/resources/fi-site.xml
diff --git a/common/src/test/hadoop-policy.xml b/hadoop-common/src/test/resources/hadoop-policy.xml
similarity index 100%
rename from common/src/test/hadoop-policy.xml
rename to hadoop-common/src/test/resources/hadoop-policy.xml
diff --git a/common/src/test/krb5.conf b/hadoop-common/src/test/resources/krb5.conf
similarity index 100%
rename from common/src/test/krb5.conf
rename to hadoop-common/src/test/resources/krb5.conf
diff --git a/common/src/test/log4j.properties b/hadoop-common/src/test/resources/log4j.properties
similarity index 100%
rename from common/src/test/log4j.properties
rename to hadoop-common/src/test/resources/log4j.properties
diff --git a/common/src/test/test-fake-default.xml b/hadoop-common/src/test/resources/test-fake-default.xml
similarity index 100%
rename from common/src/test/test-fake-default.xml
rename to hadoop-common/src/test/resources/test-fake-default.xml
diff --git a/common/src/test/test-patch.properties b/hadoop-common/src/test/resources/test-patch.properties
similarity index 100%
rename from common/src/test/test-patch.properties
rename to hadoop-common/src/test/resources/test-patch.properties
diff --git a/common/src/test/core/org/apache/hadoop/cli/testConf.xml b/hadoop-common/src/test/resources/testConf.xml
similarity index 100%
rename from common/src/test/core/org/apache/hadoop/cli/testConf.xml
rename to hadoop-common/src/test/resources/testConf.xml
diff --git a/common/src/test/test-webapps/static/test.css b/hadoop-common/src/test/resources/webapps/static/test.css
similarity index 100%
rename from common/src/test/test-webapps/static/test.css
rename to hadoop-common/src/test/resources/webapps/static/test.css
diff --git a/common/src/test/test-webapps/test/.gitignore b/hadoop-common/src/test/resources/webapps/test/.gitignore
similarity index 100%
rename from common/src/test/test-webapps/test/.gitignore
rename to hadoop-common/src/test/resources/webapps/test/.gitignore
diff --git a/common/src/test/test-webapps/test/testjsp.jsp b/hadoop-common/src/test/resources/webapps/test/testjsp.jsp
similarity index 100%
rename from common/src/test/test-webapps/test/testjsp.jsp
rename to hadoop-common/src/test/resources/webapps/test/testjsp.jsp
diff --git a/common/src/test/system/aop/org/apache/hadoop/test/system/DaemonProtocolAspect.aj b/hadoop-common/src/test/system/aop/org/apache/hadoop/test/system/DaemonProtocolAspect.aj
similarity index 100%
rename from common/src/test/system/aop/org/apache/hadoop/test/system/DaemonProtocolAspect.aj
rename to hadoop-common/src/test/system/aop/org/apache/hadoop/test/system/DaemonProtocolAspect.aj
diff --git a/common/src/test/system/c++/runAs/Makefile.in b/hadoop-common/src/test/system/c++/runAs/Makefile.in
similarity index 100%
rename from common/src/test/system/c++/runAs/Makefile.in
rename to hadoop-common/src/test/system/c++/runAs/Makefile.in
diff --git a/common/src/test/system/c++/runAs/configure b/hadoop-common/src/test/system/c++/runAs/configure
similarity index 100%
rename from common/src/test/system/c++/runAs/configure
rename to hadoop-common/src/test/system/c++/runAs/configure
diff --git a/common/src/test/system/c++/runAs/configure.ac b/hadoop-common/src/test/system/c++/runAs/configure.ac
similarity index 100%
rename from common/src/test/system/c++/runAs/configure.ac
rename to hadoop-common/src/test/system/c++/runAs/configure.ac
diff --git a/common/src/test/system/c++/runAs/main.c b/hadoop-common/src/test/system/c++/runAs/main.c
similarity index 100%
rename from common/src/test/system/c++/runAs/main.c
rename to hadoop-common/src/test/system/c++/runAs/main.c
diff --git a/common/src/test/system/c++/runAs/runAs.c b/hadoop-common/src/test/system/c++/runAs/runAs.c
similarity index 100%
rename from common/src/test/system/c++/runAs/runAs.c
rename to hadoop-common/src/test/system/c++/runAs/runAs.c
diff --git a/common/src/test/system/c++/runAs/runAs.h.in b/hadoop-common/src/test/system/c++/runAs/runAs.h.in
similarity index 100%
rename from common/src/test/system/c++/runAs/runAs.h.in
rename to hadoop-common/src/test/system/c++/runAs/runAs.h.in
diff --git a/common/src/test/system/conf/hadoop-policy-system-test.xml b/hadoop-common/src/test/system/conf/hadoop-policy-system-test.xml
similarity index 72%
rename from common/src/test/system/conf/hadoop-policy-system-test.xml
rename to hadoop-common/src/test/system/conf/hadoop-policy-system-test.xml
index 6e86a1b97b..b2c3735e28 100644
--- a/common/src/test/system/conf/hadoop-policy-system-test.xml
+++ b/hadoop-common/src/test/system/conf/hadoop-policy-system-test.xml
@@ -1,5 +1,21 @@
 <?xml version="1.0"?>
 <?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
 
 <configuration>
 <!--
diff --git a/common/src/test/system/java/org/apache/hadoop/test/system/AbstractDaemonClient.java b/hadoop-common/src/test/system/java/org/apache/hadoop/test/system/AbstractDaemonClient.java
similarity index 100%
rename from common/src/test/system/java/org/apache/hadoop/test/system/AbstractDaemonClient.java
rename to hadoop-common/src/test/system/java/org/apache/hadoop/test/system/AbstractDaemonClient.java
diff --git a/common/src/test/system/java/org/apache/hadoop/test/system/AbstractDaemonCluster.java b/hadoop-common/src/test/system/java/org/apache/hadoop/test/system/AbstractDaemonCluster.java
similarity index 100%
rename from common/src/test/system/java/org/apache/hadoop/test/system/AbstractDaemonCluster.java
rename to hadoop-common/src/test/system/java/org/apache/hadoop/test/system/AbstractDaemonCluster.java
diff --git a/common/src/test/system/java/org/apache/hadoop/test/system/ControlAction.java b/hadoop-common/src/test/system/java/org/apache/hadoop/test/system/ControlAction.java
similarity index 100%
rename from common/src/test/system/java/org/apache/hadoop/test/system/ControlAction.java
rename to hadoop-common/src/test/system/java/org/apache/hadoop/test/system/ControlAction.java
diff --git a/common/src/test/system/java/org/apache/hadoop/test/system/DaemonProtocol.java b/hadoop-common/src/test/system/java/org/apache/hadoop/test/system/DaemonProtocol.java
similarity index 100%
rename from common/src/test/system/java/org/apache/hadoop/test/system/DaemonProtocol.java
rename to hadoop-common/src/test/system/java/org/apache/hadoop/test/system/DaemonProtocol.java
diff --git a/common/src/test/system/java/org/apache/hadoop/test/system/ProcessInfo.java b/hadoop-common/src/test/system/java/org/apache/hadoop/test/system/ProcessInfo.java
similarity index 100%
rename from common/src/test/system/java/org/apache/hadoop/test/system/ProcessInfo.java
rename to hadoop-common/src/test/system/java/org/apache/hadoop/test/system/ProcessInfo.java
diff --git a/common/src/test/system/java/org/apache/hadoop/test/system/ProcessInfoImpl.java b/hadoop-common/src/test/system/java/org/apache/hadoop/test/system/ProcessInfoImpl.java
similarity index 100%
rename from common/src/test/system/java/org/apache/hadoop/test/system/ProcessInfoImpl.java
rename to hadoop-common/src/test/system/java/org/apache/hadoop/test/system/ProcessInfoImpl.java
diff --git a/common/src/test/system/java/org/apache/hadoop/test/system/ProxyUserDefinitions.java b/hadoop-common/src/test/system/java/org/apache/hadoop/test/system/ProxyUserDefinitions.java
similarity index 100%
rename from common/src/test/system/java/org/apache/hadoop/test/system/ProxyUserDefinitions.java
rename to hadoop-common/src/test/system/java/org/apache/hadoop/test/system/ProxyUserDefinitions.java
diff --git a/common/src/test/system/java/org/apache/hadoop/test/system/process/ClusterProcessManager.java b/hadoop-common/src/test/system/java/org/apache/hadoop/test/system/process/ClusterProcessManager.java
similarity index 100%
rename from common/src/test/system/java/org/apache/hadoop/test/system/process/ClusterProcessManager.java
rename to hadoop-common/src/test/system/java/org/apache/hadoop/test/system/process/ClusterProcessManager.java
diff --git a/common/src/test/system/java/org/apache/hadoop/test/system/process/HadoopDaemonRemoteCluster.java b/hadoop-common/src/test/system/java/org/apache/hadoop/test/system/process/HadoopDaemonRemoteCluster.java
similarity index 100%
rename from common/src/test/system/java/org/apache/hadoop/test/system/process/HadoopDaemonRemoteCluster.java
rename to hadoop-common/src/test/system/java/org/apache/hadoop/test/system/process/HadoopDaemonRemoteCluster.java
diff --git a/common/src/test/system/java/org/apache/hadoop/test/system/process/MultiUserHadoopDaemonRemoteCluster.java b/hadoop-common/src/test/system/java/org/apache/hadoop/test/system/process/MultiUserHadoopDaemonRemoteCluster.java
similarity index 100%
rename from common/src/test/system/java/org/apache/hadoop/test/system/process/MultiUserHadoopDaemonRemoteCluster.java
rename to hadoop-common/src/test/system/java/org/apache/hadoop/test/system/process/MultiUserHadoopDaemonRemoteCluster.java
diff --git a/common/src/test/system/java/org/apache/hadoop/test/system/process/RemoteProcess.java b/hadoop-common/src/test/system/java/org/apache/hadoop/test/system/process/RemoteProcess.java
similarity index 100%
rename from common/src/test/system/java/org/apache/hadoop/test/system/process/RemoteProcess.java
rename to hadoop-common/src/test/system/java/org/apache/hadoop/test/system/process/RemoteProcess.java
diff --git a/common/src/test/system/java/org/apache/hadoop/util/RemoteExecution.java b/hadoop-common/src/test/system/java/org/apache/hadoop/util/RemoteExecution.java
similarity index 100%
rename from common/src/test/system/java/org/apache/hadoop/util/RemoteExecution.java
rename to hadoop-common/src/test/system/java/org/apache/hadoop/util/RemoteExecution.java
diff --git a/common/src/test/system/java/org/apache/hadoop/util/SSHRemoteExecution.java b/hadoop-common/src/test/system/java/org/apache/hadoop/util/SSHRemoteExecution.java
similarity index 100%
rename from common/src/test/system/java/org/apache/hadoop/util/SSHRemoteExecution.java
rename to hadoop-common/src/test/system/java/org/apache/hadoop/util/SSHRemoteExecution.java
diff --git a/common/src/test/system/scripts/pushConfig.sh b/hadoop-common/src/test/system/scripts/pushConfig.sh
similarity index 100%
rename from common/src/test/system/scripts/pushConfig.sh
rename to hadoop-common/src/test/system/scripts/pushConfig.sh
diff --git a/common/src/test/system/validation/org/apache/hadoop/util/TestSSHRemoteExecution.java b/hadoop-common/src/test/system/validation/org/apache/hadoop/util/TestSSHRemoteExecution.java
similarity index 100%
rename from common/src/test/system/validation/org/apache/hadoop/util/TestSSHRemoteExecution.java
rename to hadoop-common/src/test/system/validation/org/apache/hadoop/util/TestSSHRemoteExecution.java
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
new file mode 100644
index 0000000000..753dbe3508
--- /dev/null
+++ b/hadoop-project/pom.xml
@@ -0,0 +1,604 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License. See accompanying LICENSE file.
+-->
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.hadoop</groupId>
+  <artifactId>hadoop-project</artifactId>
+  <version>0.23.0-SNAPSHOT</version>
+  <description>Apache Hadoop Project POM</description>
+  <name>Apache Hadoop Project POM</name>
+  <packaging>pom</packaging>
+
+  <distributionManagement>
+    <repository>
+      <id>apache.releases.https</id>
+      <name>Apache Release Distribution Repository</name>
+      <url>https://repository.apache.org/service/local/staging/deploy/maven2</url>
+    </repository>
+    <snapshotRepository>
+      <id>apache.snapshots.https</id>
+      <name>${distMgmtSnapshotsName}</name>
+      <url>${distMgmtSnapshotsUrl}</url>
+    </snapshotRepository>
+  </distributionManagement>
+
+  <licenses>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+    </license>
+  </licenses>
+
+  <organization>
+    <name>Apache Software Foundation</name>
+    <url>http://www.apache.org</url>
+  </organization>
+
+  <properties>
+    <failIfNoTests>false</failIfNoTests>
+    <maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
+
+    <test.exclude>_</test.exclude>
+    <test.exclude.pattern>_</test.exclude.pattern>
+
+    <!-- platform encoding override -->
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+
+    <!-- These 2 versions are defined here becuase they are used in the *-docs -->
+    <!-- module(s) for JDIFF generation from embedded ant in the antrun plugin -->
+    <hadoop.annotations.version>${project.version}</hadoop.annotations.version>
+    <jdiff.version>1.0.9</jdiff.version>
+
+    <hadoop.assemblies.version>${project.version}</hadoop.assemblies.version>
+
+    <distMgmtSnapshotsName>Apache Development Snapshot Repository</distMgmtSnapshotsName>
+    <distMgmtSnapshotsUrl>https://repository.apache.org/content/repositories/snapshots</distMgmtSnapshotsUrl>
+  </properties>
+
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>jdiff</groupId>
+        <artifactId>jdiff</artifactId>
+        <version>${jdiff.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.hadoop</groupId>
+        <artifactId>hadoop-assemblies</artifactId>
+        <version>${hadoop.assemblies.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.hadoop</groupId>
+        <artifactId>hadoop-annotations</artifactId>
+        <version>${hadoop.annotations.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.hadoop</groupId>
+        <artifactId>hadoop-common-docs</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.hadoop</groupId>
+        <artifactId>hadoop-common</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.hadoop</groupId>
+        <artifactId>hadoop-common</artifactId>
+        <version>${project.version}</version>
+        <type>test-jar</type>
+      </dependency>
+
+      <dependency>
+        <groupId>com.google.guava</groupId>
+        <artifactId>guava</artifactId>
+        <version>r09</version>
+      </dependency>
+      <dependency>
+        <groupId>commons-cli</groupId>
+        <artifactId>commons-cli</artifactId>
+        <version>1.2</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.commons</groupId>
+        <artifactId>commons-math</artifactId>
+        <version>2.1</version>
+      </dependency>
+      <dependency>
+        <groupId>xmlenc</groupId>
+        <artifactId>xmlenc</artifactId>
+        <version>0.52</version>
+      </dependency>
+      <dependency>
+        <groupId>commons-httpclient</groupId>
+        <artifactId>commons-httpclient</artifactId>
+        <version>3.1</version>
+      </dependency>
+      <dependency>
+        <groupId>commons-codec</groupId>
+        <artifactId>commons-codec</artifactId>
+        <version>1.4</version>
+      </dependency>
+      <dependency>
+        <groupId>commons-net</groupId>
+        <artifactId>commons-net</artifactId>
+        <version>1.4.1</version>
+      </dependency>
+      <dependency>
+        <groupId>javax.servlet</groupId>
+        <artifactId>servlet-api</artifactId>
+        <version>2.5</version>
+      </dependency>
+      <dependency>
+        <groupId>org.mortbay.jetty</groupId>
+        <artifactId>jetty</artifactId>
+        <version>6.1.26</version>
+        <exclusions>
+          <exclusion>
+            <groupId>org.mortbay.jetty</groupId>
+            <artifactId>servlet-api</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+      <dependency>
+        <groupId>org.mortbay.jetty</groupId>
+        <artifactId>jetty-util</artifactId>
+        <version>6.1.26</version>
+      </dependency>
+      <dependency>
+        <groupId>tomcat</groupId>
+        <artifactId>jasper-compiler</artifactId>
+        <version>5.5.23</version>
+        <exclusions>
+          <exclusion>
+            <groupId>javax.servlet</groupId>
+            <artifactId>jsp-api</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>ant</groupId>
+            <artifactId>ant</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+      <dependency>
+        <groupId>tomcat</groupId>
+        <artifactId>jasper-runtime</artifactId>
+        <version>5.5.23</version>
+      </dependency>
+      <dependency>
+        <groupId>javax.servlet.jsp</groupId>
+        <artifactId>jsp-api</artifactId>
+        <version>2.1</version>
+      </dependency>
+      <dependency>
+        <groupId>commons-el</groupId>
+        <artifactId>commons-el</artifactId>
+        <version>1.0</version>
+      </dependency>
+      <dependency>
+        <groupId>commons-logging</groupId>
+        <artifactId>commons-logging</artifactId>
+        <version>1.0.4</version>
+        <exclusions>
+          <exclusion>
+            <groupId>avalon-framework</groupId>
+            <artifactId>avalon-framework</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>logkit</groupId>
+            <artifactId>logkit</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+      <dependency>
+        <groupId>commons-logging</groupId>
+        <artifactId>commons-logging-api</artifactId>
+        <version>1.0.4</version>
+      </dependency>
+      <dependency>
+        <groupId>log4j</groupId>
+        <artifactId>log4j</artifactId>
+        <version>1.2.15</version>
+        <exclusions>
+          <exclusion>
+            <groupId>com.sun.jdmk</groupId>
+            <artifactId>jmxtools</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>com.sun.jmx</groupId>
+            <artifactId>jmxri</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>javax.mail</groupId>
+            <artifactId>mail</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>javax.jms</groupId>
+            <artifactId>jmx</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>javax.jms</groupId>
+            <artifactId>jms</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+      <dependency>
+        <groupId>net.java.dev.jets3t</groupId>
+        <artifactId>jets3t</artifactId>
+        <version>0.6.1</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.mina</groupId>
+        <artifactId>mina-core</artifactId>
+        <version>2.0.0-M5</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.ftpserver</groupId>
+        <artifactId>ftplet-api</artifactId>
+        <version>1.0.0</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.ftpserver</groupId>
+        <artifactId>ftpserver-core</artifactId>
+        <version>1.0.0</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.ftpserver</groupId>
+        <artifactId>ftpserver-deprecated</artifactId>
+        <version>1.0.0-M2</version>
+      </dependency>
+      <dependency>
+        <groupId>junit</groupId>
+        <artifactId>junit</artifactId>
+        <version>4.8.1</version>
+      </dependency>
+      <dependency>
+        <groupId>commons-lang</groupId>
+        <artifactId>commons-lang</artifactId>
+        <version>2.5</version>
+      </dependency>
+      <dependency>
+        <groupId>commons-collections</groupId>
+        <artifactId>commons-collections</artifactId>
+        <version>3.2.1</version>
+      </dependency>
+      <dependency>
+        <groupId>commons-configuration</groupId>
+        <artifactId>commons-configuration</artifactId>
+        <version>1.6</version>
+      </dependency>
+      <dependency>
+        <groupId>hsqldb</groupId>
+        <artifactId>hsqldb</artifactId>
+        <version>1.8.0.7</version>
+      </dependency>
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-api</artifactId>
+        <version>1.5.8</version>
+      </dependency>
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-log4j12</artifactId>
+        <version>1.5.8</version>
+      </dependency>
+      <dependency>
+        <groupId>org.eclipse.jdt</groupId>
+        <artifactId>core</artifactId>
+        <version>3.1.1</version>
+      </dependency>
+      <dependency>
+        <groupId>oro</groupId>
+        <artifactId>oro</artifactId>
+        <version>2.0.8</version>
+      </dependency>
+      <dependency>
+        <groupId>org.codehaus.jackson</groupId>
+        <artifactId>jackson-mapper-asl</artifactId>
+        <version>1.5.2</version>
+      </dependency>
+      <dependency>
+        <groupId>org.aspectj</groupId>
+        <artifactId>aspectjrt</artifactId>
+        <version>1.6.5</version>
+      </dependency>
+      <dependency>
+        <groupId>org.mockito</groupId>
+        <artifactId>mockito-all</artifactId>
+        <version>1.8.5</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.hadoop</groupId>
+        <artifactId>avro</artifactId>
+        <version>1.3.2</version>
+        <exclusions>
+          <exclusion>
+            <groupId>org.apache.ant</groupId>
+            <artifactId>ant</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+      <dependency>
+        <groupId>net.sf.kosmosfs</groupId>
+        <artifactId>kfs</artifactId>
+        <version>0.3</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.ant</groupId>
+        <artifactId>ant</artifactId>
+        <version>1.8.1</version>
+      </dependency>
+      <dependency>
+        <groupId>com.google.protobuf</groupId>
+        <artifactId>protobuf-java</artifactId>
+        <version>2.4.0a</version>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-enforcer-plugin</artifactId>
+          <version>1.0</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <version>2.3.2</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-dependency-plugin</artifactId>
+          <version>2.1</version>
+        </plugin>
+        <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>build-helper-maven-plugin</artifactId>
+          <version>1.5</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <version>2.6</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-jar-plugin</artifactId>
+          <version>2.3.1</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-assembly-plugin</artifactId>
+          <version>2.2-beta-3</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-javadoc-plugin</artifactId>
+          <version>2.7</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-antrun-plugin</artifactId>
+          <version>1.6</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-war-plugin</artifactId>
+          <version>2.1</version>
+        </plugin>
+        <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>findbugs-maven-plugin</artifactId>
+          <version>2.3.2</version>
+        </plugin>
+        <plugin>
+          <groupId>com.atlassian.maven.plugins</groupId>
+          <artifactId>maven-clover2-plugin</artifactId>
+          <version>3.0.5</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-checkstyle-plugin</artifactId>
+          <version>2.6</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.rat</groupId>
+          <artifactId>apache-rat-plugin</artifactId>
+          <version>0.7</version>
+        </plugin>
+        <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>native-maven-plugin</artifactId>
+          <version>1.0-alpha-7</version>
+        </plugin>
+        <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>make-maven-plugin</artifactId>
+          <version>1.0-beta-1</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-source-plugin</artifactId>
+          <version>2.1.2</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-enforcer-plugin</artifactId>
+        <inherited>false</inherited>
+        <configuration>
+          <rules>
+            <requireMavenVersion>
+              <version>[3.0.0,)</version>
+            </requireMavenVersion>
+            <requireJavaVersion>
+              <version>1.6</version>
+            </requireJavaVersion>
+            <requireOS>
+              <family>unix</family>
+            </requireOS>
+          </rules>
+        </configuration>
+        <executions>
+          <execution>
+            <id>clean</id>
+            <goals>
+              <goal>enforce</goal>
+            </goals>
+            <phase>pre-clean</phase>
+          </execution>
+          <execution>
+            <id>default</id>
+            <goals>
+              <goal>enforce</goal>
+            </goals>
+            <phase>validate</phase>
+          </execution>
+          <execution>
+            <id>site</id>
+            <goals>
+              <goal>enforce</goal>
+            </goals>
+            <phase>pre-site</phase>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.6</source>
+          <target>1.6</target>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+  <profiles>
+    <profile>
+      <id>os.linux</id>
+      <activation>
+        <os>
+          <family>Linux</family>
+        </os>
+      </activation>
+      <properties>
+        <build.platform>${os.name}-${os.arch}-${sun.arch.data.model}</build.platform>
+      </properties>
+      <dependencies>
+        <dependency>
+          <groupId>jdk.tools</groupId>
+          <artifactId>jdk.tools</artifactId>
+          <version>1.6</version>
+          <scope>system</scope>
+          <systemPath>${env.JAVA_HOME}/lib/tools.jar</systemPath>
+        </dependency>
+      </dependencies>
+    </profile>
+    <profile>
+      <id>os.mac</id>
+      <activation>
+        <os>
+          <family>Mac</family>
+        </os>
+      </activation>
+      <properties>
+        <build.platform>Mac_OS_X-${sun.arch.data.model}</build.platform>
+      </properties>
+    </profile>
+
+    <profile>
+      <id>clover</id>
+      <activation>
+        <activeByDefault>false</activeByDefault>
+        <property>
+          <name>clover</name>
+        </property>
+      </activation>
+      <properties>
+        <cloverLicenseLocation>${user.home}/.clover.license</cloverLicenseLocation>
+        <cloverDatabase>${project.build.directory}/clover/hadoop-coverage.db</cloverDatabase>
+      </properties>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>com.atlassian.maven.plugins</groupId>
+            <artifactId>maven-clover2-plugin</artifactId>
+            <configuration>
+              <includesTestSourceRoots>true</includesTestSourceRoots>
+              <licenseLocation>${cloverLicenseLocation}</licenseLocation>
+              <cloverDatabase>${cloverDatabase}</cloverDatabase>
+              <targetPercentage>50%</targetPercentage>
+              <outputDirectory>${project.build.directory}/clover</outputDirectory>
+              <generateHtml>true</generateHtml>
+              <generateXml>true</generateXml>
+            </configuration>
+            <executions>
+              <execution>
+                <id>setup</id>
+                <phase>generate-sources</phase>
+                <goals>
+                  <goal>setup</goal>
+                </goals>
+              </execution>
+              <execution>
+                <id>clover</id>
+                <phase>test</phase>
+                <goals>
+                  <goal>clover</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <profile>
+      <id>test-patch</id>
+      <activation>
+        <activeByDefault>false</activeByDefault>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-compiler-plugin</artifactId>
+            <configuration>
+              <fork>true</fork>
+              <source>1.6</source>
+              <target>1.6</target>
+              <compilerArguments>
+                <Xlint/>
+                <Xmaxwarns>9999</Xmaxwarns>
+              </compilerArguments>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+
+</project>
diff --git a/hdfs/CHANGES.txt b/hdfs/CHANGES.txt
index 030b9ef08a..01fbbc7ad5 100644
--- a/hdfs/CHANGES.txt
+++ b/hdfs/CHANGES.txt
@@ -626,6 +626,9 @@ Trunk (unreleased changes)
     HDFS-2212. Refactor double-buffering code out of EditLogOutputStreams.
     (todd via eli)
 
+    HDFS-2199. Move blockTokenSecretManager from FSNamesystem to BlockManager.
+    (Uma Maheswara Rao G via szetszwo)
+
   OPTIMIZATIONS
 
     HDFS-1458. Improve checkpoint performance by avoiding unnecessary image
@@ -911,6 +914,9 @@ Trunk (unreleased changes)
 
     HDFS-1776. Bug in Concat code. (Bharath Mundlapudi via Dmytro Molkov)
 
+    HDFS-2196. Make ant build system work with hadoop-common JAR generated
+    by Maven. (Alejandro Abdelnur via tomwhite)
+
   BREAKDOWN OF HDFS-1073 SUBTASKS
 
     HDFS-1521. Persist transaction ID on disk between NN restarts.
diff --git a/hdfs/ivy.xml b/hdfs/ivy.xml
index ecaf026d3e..e63c44029d 100644
--- a/hdfs/ivy.xml
+++ b/hdfs/ivy.xml
@@ -58,6 +58,7 @@
   </publications>
   <dependencies>
     
+    <dependency org="org.apache.hadoop" name="hadoop-annotations" rev="${hadoop-common.version}" conf="compile->default"/>
     <dependency org="org.apache.hadoop" name="hadoop-common" rev="${hadoop-common.version}" conf="common->default">
       <exclude module="ant"/>
     </dependency>
@@ -66,7 +67,11 @@
     </dependency>
     <dependency org="commons-logging" name="commons-logging" rev="${commons-logging.version}" conf="compile->master"/>
     <dependency org="commons-daemon" name="commons-daemon" rev="${commons-daemon.version}" conf="hdfs->default" />
-    <dependency org="log4j" name="log4j" rev="${log4j.version}" conf="common->master"/>
+    <dependency org="log4j" name="log4j" rev="${log4j.version}" conf="common->master">
+      <exclude org="com.sun.jdmk"/>
+      <exclude org="com.sun.jmx"/>
+      <exclude org="javax.jms"/> 
+    </dependency>
     <dependency org="com.google.guava" name="guava" rev="${guava.version}" conf="hdfs->default" />
     <dependency org="com.google.protobuf" name="protobuf-java" rev="2.4.0a" conf="common->master"/>
     <dependency org="org.apache.hadoop" name="avro" rev="${avro.version}" conf="compile->master">
diff --git a/hdfs/src/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java b/hdfs/src/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java
index 88f5a9b99b..c15f9fe384 100644
--- a/hdfs/src/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java
+++ b/hdfs/src/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java
@@ -24,6 +24,7 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -47,6 +48,9 @@
 import org.apache.hadoop.hdfs.protocol.DatanodeInfo;
 import org.apache.hadoop.hdfs.protocol.LocatedBlock;
 import org.apache.hadoop.hdfs.protocol.UnregisteredNodeException;
+import org.apache.hadoop.hdfs.security.token.block.BlockTokenIdentifier;
+import org.apache.hadoop.hdfs.security.token.block.BlockTokenSecretManager;
+import org.apache.hadoop.hdfs.security.token.block.ExportedBlockKeys;
 import org.apache.hadoop.hdfs.server.blockmanagement.UnderReplicatedBlocks.BlockIterator;
 import org.apache.hadoop.hdfs.server.common.HdfsConstants.BlockUCState;
 import org.apache.hadoop.hdfs.server.common.HdfsConstants.ReplicaState;
@@ -58,6 +62,7 @@
 import org.apache.hadoop.hdfs.server.protocol.BlocksWithLocations;
 import org.apache.hadoop.hdfs.server.protocol.BlocksWithLocations.BlockWithLocations;
 import org.apache.hadoop.net.Node;
+import org.apache.hadoop.security.token.Token;
 import org.apache.hadoop.util.Daemon;
 
 /**
@@ -80,7 +85,26 @@ public class BlockManager {
   public volatile long scheduledReplicationBlocksCount = 0L;
   private volatile long excessBlocksCount = 0L;
   private volatile long pendingDeletionBlocksCount = 0L;
+  private boolean isBlockTokenEnabled;
+  private long blockKeyUpdateInterval;
+  private long blockTokenLifetime;
+  private BlockTokenSecretManager blockTokenSecretManager;
+  
+  /** returns the isBlockTokenEnabled - true if block token enabled ,else false */
+  public boolean isBlockTokenEnabled() {
+    return isBlockTokenEnabled;
+  }
 
+  /** get the block key update interval */
+  public long getBlockKeyUpdateInterval() {
+    return blockKeyUpdateInterval;
+  }
+
+  /** get the BlockTokenSecretManager */
+  public BlockTokenSecretManager getBlockTokenSecretManager() {
+    return blockTokenSecretManager;
+  }
+  
   /** Used by metrics */
   public long getPendingReplicationBlocksCount() {
     return pendingReplicationBlocksCount;
@@ -169,7 +193,43 @@ public long getExcessBlocksCount() {
 
   /** for block replicas placement */
   private BlockPlacementPolicy blockplacement;
+  
+  /**
+   * Get access keys
+   * 
+   * @return current access keys
+   */
+  public ExportedBlockKeys getBlockKeys() {
+    return isBlockTokenEnabled ? blockTokenSecretManager.exportKeys()
+        : ExportedBlockKeys.DUMMY_KEYS;
+  }
+  
+  /** Generate block token for a LocatedBlock. */
+  public void setBlockToken(LocatedBlock l) throws IOException {
+    Token<BlockTokenIdentifier> token = blockTokenSecretManager.generateToken(l
+        .getBlock(), EnumSet.of(BlockTokenSecretManager.AccessMode.READ));
+    l.setBlockToken(token);
+  }
 
+  /** Generate block tokens for the blocks to be returned. */
+  public void setBlockTokens(List<LocatedBlock> locatedBlocks) throws IOException {
+    for(LocatedBlock l : locatedBlocks) {
+      setBlockToken(l);
+    }
+  }
+
+  /**
+   * Update access keys.
+   */
+  public void updateBlockKey() throws IOException {
+    this.blockTokenSecretManager.updateKeys();
+    synchronized (namesystem.heartbeats) {
+      for (DatanodeDescriptor nodeInfo : namesystem.heartbeats) {
+        nodeInfo.needKeyUpdate = true;
+      }
+    }
+  }
+  
   public BlockManager(FSNamesystem fsn, Configuration conf) throws IOException {
     namesystem = fsn;
     datanodeManager = new DatanodeManager(fsn, conf);
@@ -179,7 +239,26 @@ public BlockManager(FSNamesystem fsn, Configuration conf) throws IOException {
     pendingReplications = new PendingReplicationBlocks(conf.getInt(
       DFSConfigKeys.DFS_NAMENODE_REPLICATION_PENDING_TIMEOUT_SEC_KEY,
       DFSConfigKeys.DFS_NAMENODE_REPLICATION_PENDING_TIMEOUT_SEC_DEFAULT) * 1000L);
-
+    this.isBlockTokenEnabled = conf.getBoolean(
+        DFSConfigKeys.DFS_BLOCK_ACCESS_TOKEN_ENABLE_KEY, 
+        DFSConfigKeys.DFS_BLOCK_ACCESS_TOKEN_ENABLE_DEFAULT);
+    if (isBlockTokenEnabled) {
+      if (isBlockTokenEnabled) {
+        this.blockKeyUpdateInterval = conf.getLong(
+            DFSConfigKeys.DFS_BLOCK_ACCESS_KEY_UPDATE_INTERVAL_KEY, 
+            DFSConfigKeys.DFS_BLOCK_ACCESS_KEY_UPDATE_INTERVAL_DEFAULT) * 60 * 1000L; // 10 hrs
+        this.blockTokenLifetime = conf.getLong(
+            DFSConfigKeys.DFS_BLOCK_ACCESS_TOKEN_LIFETIME_KEY, 
+            DFSConfigKeys.DFS_BLOCK_ACCESS_TOKEN_LIFETIME_DEFAULT) * 60 * 1000L; // 10 hrs
+      }
+   
+      blockTokenSecretManager = new BlockTokenSecretManager(true,
+          blockKeyUpdateInterval, blockTokenLifetime);
+    }
+    LOG.info("isBlockTokenEnabled=" + isBlockTokenEnabled
+        + " blockKeyUpdateInterval=" + blockKeyUpdateInterval / (60 * 1000)
+        + " min(s), blockTokenLifetime=" + blockTokenLifetime / (60 * 1000)
+        + " min(s)");
     this.maxCorruptFilesReturned = conf.getInt(
       DFSConfigKeys.DFS_DEFAULT_MAX_CORRUPT_FILES_RETURNED_KEY,
       DFSConfigKeys.DFS_DEFAULT_MAX_CORRUPT_FILES_RETURNED);
diff --git a/hdfs/src/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.java b/hdfs/src/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.java
index 15c5026a4a..a1a56ea5b8 100644
--- a/hdfs/src/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.java
+++ b/hdfs/src/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.java
@@ -469,7 +469,7 @@ public void registerDatanode(DatanodeRegistration nodeReg
                                       nodeReg.getInfoPort(),
                                       nodeReg.getIpcPort());
     nodeReg.updateRegInfo(dnReg);
-    nodeReg.exportedKeys = namesystem.getBlockKeys();
+    nodeReg.exportedKeys = namesystem.getBlockManager().getBlockKeys();
       
     NameNode.stateChangeLog.info("BLOCK* NameSystem.registerDatanode: "
         + "node registration from " + nodeReg.getName()
diff --git a/hdfs/src/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java b/hdfs/src/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
index e716c43228..ffede2dfa8 100644
--- a/hdfs/src/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
+++ b/hdfs/src/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
@@ -43,9 +43,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
-import java.util.NavigableMap;
 import java.util.Set;
-import java.util.TreeMap;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
@@ -90,9 +88,7 @@
 import org.apache.hadoop.hdfs.protocol.RecoveryInProgressException;
 import org.apache.hadoop.hdfs.protocol.UnregisteredNodeException;
 import org.apache.hadoop.hdfs.protocol.datatransfer.ReplaceDatanodeOnFailure;
-import org.apache.hadoop.hdfs.security.token.block.BlockTokenIdentifier;
 import org.apache.hadoop.hdfs.security.token.block.BlockTokenSecretManager;
-import org.apache.hadoop.hdfs.security.token.block.ExportedBlockKeys;
 import org.apache.hadoop.hdfs.security.token.delegation.DelegationTokenIdentifier;
 import org.apache.hadoop.hdfs.security.token.delegation.DelegationTokenSecretManager;
 import org.apache.hadoop.hdfs.server.blockmanagement.BlockInfo;
@@ -100,7 +96,6 @@
 import org.apache.hadoop.hdfs.server.blockmanagement.BlockManager;
 import org.apache.hadoop.hdfs.server.blockmanagement.BlockPlacementPolicy;
 import org.apache.hadoop.hdfs.server.blockmanagement.DatanodeDescriptor;
-import org.apache.hadoop.hdfs.server.blockmanagement.DatanodeDescriptor.BlockTargetPair;
 import org.apache.hadoop.hdfs.server.blockmanagement.DatanodeManager;
 import org.apache.hadoop.hdfs.server.blockmanagement.UnderReplicatedBlocks;
 import org.apache.hadoop.hdfs.server.common.GenerationStamp;
@@ -112,15 +107,9 @@
 import org.apache.hadoop.hdfs.server.common.Util;
 import org.apache.hadoop.hdfs.server.namenode.LeaseManager.Lease;
 import org.apache.hadoop.hdfs.server.namenode.metrics.FSNamesystemMBean;
-import org.apache.hadoop.hdfs.server.protocol.BlockCommand;
-import org.apache.hadoop.hdfs.server.protocol.BlockRecoveryCommand;
-import org.apache.hadoop.hdfs.server.protocol.BlockRecoveryCommand.RecoveringBlock;
 import org.apache.hadoop.hdfs.server.protocol.BlocksWithLocations;
-import org.apache.hadoop.hdfs.server.protocol.BlocksWithLocations.BlockWithLocations;
 import org.apache.hadoop.hdfs.server.protocol.DatanodeCommand;
-import org.apache.hadoop.hdfs.server.protocol.DatanodeProtocol;
 import org.apache.hadoop.hdfs.server.protocol.DatanodeRegistration;
-import org.apache.hadoop.hdfs.server.protocol.DisallowedDatanodeException;
 import org.apache.hadoop.hdfs.server.protocol.KeyUpdateCommand;
 import org.apache.hadoop.hdfs.server.protocol.NamenodeCommand;
 import org.apache.hadoop.hdfs.server.protocol.NamenodeRegistration;
@@ -221,10 +210,6 @@ private static final void logAuditEvent(UserGroupInformation ugi,
   private long capacityTotal = 0L, capacityUsed = 0L, capacityRemaining = 0L;
   private long blockPoolUsed = 0L;
   private int totalLoad = 0;
-  boolean isBlockTokenEnabled;
-  BlockTokenSecretManager blockTokenSecretManager;
-  private long blockKeyUpdateInterval;
-  private long blockTokenLifetime;
   
   // Scan interval is not configurable.
   private static final long DELEGATION_TOKEN_REMOVER_SCAN_INTERVAL =
@@ -334,10 +319,6 @@ private void initialize(Configuration conf, FSImage fsImage)
       this.dir = new FSDirectory(fsImage, this, conf);
     }
     this.safeMode = new SafeModeInfo(conf);
-    if (isBlockTokenEnabled) {
-      blockTokenSecretManager = new BlockTokenSecretManager(true,
-          blockKeyUpdateInterval, blockTokenLifetime);
-    }
   }
 
   void activateSecretManager() throws IOException {
@@ -499,21 +480,6 @@ private void setConfigurationParameters(Configuration conf)
     this.accessTimePrecision = conf.getLong(DFSConfigKeys.DFS_NAMENODE_ACCESSTIME_PRECISION_KEY, 0);
     this.supportAppends = conf.getBoolean(DFSConfigKeys.DFS_SUPPORT_APPEND_KEY,
                                       DFSConfigKeys.DFS_SUPPORT_APPEND_DEFAULT);
-    this.isBlockTokenEnabled = conf.getBoolean(
-        DFSConfigKeys.DFS_BLOCK_ACCESS_TOKEN_ENABLE_KEY, 
-        DFSConfigKeys.DFS_BLOCK_ACCESS_TOKEN_ENABLE_DEFAULT);
-    if (isBlockTokenEnabled) {
-      this.blockKeyUpdateInterval = conf.getLong(
-          DFSConfigKeys.DFS_BLOCK_ACCESS_KEY_UPDATE_INTERVAL_KEY, 
-          DFSConfigKeys.DFS_BLOCK_ACCESS_KEY_UPDATE_INTERVAL_DEFAULT) * 60 * 1000L; // 10 hrs
-      this.blockTokenLifetime = conf.getLong(
-          DFSConfigKeys.DFS_BLOCK_ACCESS_TOKEN_LIFETIME_KEY, 
-          DFSConfigKeys.DFS_BLOCK_ACCESS_TOKEN_LIFETIME_DEFAULT) * 60 * 1000L; // 10 hrs
-    }
-    LOG.info("isBlockTokenEnabled=" + isBlockTokenEnabled
-        + " blockKeyUpdateInterval=" + blockKeyUpdateInterval / (60 * 1000)
-        + " min(s), blockTokenLifetime=" + blockTokenLifetime / (60 * 1000)
-        + " min(s)");
 
     this.dtpReplaceDatanodeOnFailure = ReplaceDatanodeOnFailure.get(conf);
   }
@@ -646,15 +612,6 @@ BlocksWithLocations getBlocks(DatanodeID datanode, long size)
     }
   }
 
-  /**
-   * Get access keys
-   * 
-   * @return current access keys
-   */
-  public ExportedBlockKeys getBlockKeys() {
-    return isBlockTokenEnabled ? blockTokenSecretManager.exportKeys()
-        : ExportedBlockKeys.DUMMY_KEYS;
-  }
 
   /////////////////////////////////////////////////////////
   //
@@ -853,9 +810,9 @@ LocatedBlocks getBlockLocationsInternal(INodeFile inode,
           .getBlockLocation(last, n - last.getNumBytes()) : blockManager
           .getBlockLocation(last, n);
           
-      if (isBlockTokenEnabled && needBlockToken) {
-        setBlockTokens(locatedblocks);
-        setBlockToken(lastBlock);
+      if (blockManager.isBlockTokenEnabled() && needBlockToken) {
+        blockManager.setBlockTokens(locatedblocks);
+        blockManager.setBlockToken(lastBlock);
       }
       return new LocatedBlocks(n, inode.isUnderConstruction(), locatedblocks,
           lastBlock, last.isComplete());
@@ -868,19 +825,6 @@ public LocatedBlock createLocatedBlock(final Block b, final DatanodeInfo[] locat
     return new LocatedBlock(getExtendedBlock(b), locations, offset, corrupt);
   }
   
-  /** Generate block tokens for the blocks to be returned. */
-  private void setBlockTokens(List<LocatedBlock> locatedBlocks) throws IOException {
-    for(LocatedBlock l : locatedBlocks) {
-      setBlockToken(l);
-    }
-  }
-  
-  /** Generate block token for a LocatedBlock. */
-  private void setBlockToken(LocatedBlock l) throws IOException {
-    Token<BlockTokenIdentifier> token = blockTokenSecretManager.generateToken(l
-        .getBlock(), EnumSet.of(BlockTokenSecretManager.AccessMode.READ));
-    l.setBlockToken(token);
-  }
 
   /**
    * Moves all the blocks from srcs and appends them to trg
@@ -1369,8 +1313,8 @@ private LocatedBlock startFileInternal(String src,
         LocatedBlock lb = 
           blockManager.convertLastBlockToUnderConstruction(cons);
 
-        if (lb != null && isBlockTokenEnabled) {
-          lb.setBlockToken(blockTokenSecretManager.generateToken(lb.getBlock(), 
+        if (lb != null && blockManager.isBlockTokenEnabled()) {
+          lb.setBlockToken(blockManager.getBlockTokenSecretManager().generateToken(lb.getBlock(), 
               EnumSet.of(BlockTokenSecretManager.AccessMode.WRITE)));
         }
         return lb;
@@ -1659,8 +1603,8 @@ public LocatedBlock getAdditionalBlock(String src,
 
     // Create next block
     LocatedBlock b = new LocatedBlock(getExtendedBlock(newBlock), targets, fileLength);
-    if (isBlockTokenEnabled) {
-      b.setBlockToken(blockTokenSecretManager.generateToken(b.getBlock(), 
+    if (blockManager.isBlockTokenEnabled()) {
+      b.setBlockToken(blockManager.getBlockTokenSecretManager().generateToken(b.getBlock(), 
           EnumSet.of(BlockTokenSecretManager.AccessMode.WRITE)));
     }
     return b;
@@ -1708,8 +1652,8 @@ LocatedBlock getAdditionalDatanode(final String src, final ExtendedBlock blk,
         ).chooseTarget(src, numAdditionalNodes, clientnode, chosen, true,
         excludes, preferredblocksize);
     final LocatedBlock lb = new LocatedBlock(blk, targets);
-    if (isBlockTokenEnabled) {
-      lb.setBlockToken(blockTokenSecretManager.generateToken(lb.getBlock(), 
+    if (blockManager.isBlockTokenEnabled()) {
+      lb.setBlockToken(blockManager.getBlockTokenSecretManager().generateToken(lb.getBlock(), 
           EnumSet.of(BlockTokenSecretManager.AccessMode.COPY)));
     }
     return lb;
@@ -2705,8 +2649,8 @@ public DatanodeCommand[] handleHeartbeat(DatanodeRegistration nodeReg,
   public void addKeyUpdateCommand(final List<DatanodeCommand> cmds,
       final DatanodeDescriptor nodeinfo) {
     // check access key update
-    if (isBlockTokenEnabled && nodeinfo.needKeyUpdate) {
-      cmds.add(new KeyUpdateCommand(blockTokenSecretManager.exportKeys()));
+    if (blockManager.isBlockTokenEnabled() && nodeinfo.needKeyUpdate) {
+      cmds.add(new KeyUpdateCommand(blockManager.getBlockTokenSecretManager().exportKeys()));
       nodeinfo.needKeyUpdate = false;
     }
   }
@@ -2792,17 +2736,6 @@ public void run () {
     }
   }
 
-  /**
-   * Update access keys.
-   */
-  void updateBlockKey() throws IOException {
-    this.blockTokenSecretManager.updateKeys();
-    synchronized (heartbeats) {
-      for (DatanodeDescriptor nodeInfo : heartbeats) {
-        nodeInfo.needKeyUpdate = true;
-      }
-    }
-  }
 
   /**
    * Periodically calls heartbeatCheck() and updateBlockKey()
@@ -2820,8 +2753,9 @@ public void run() {
             heartbeatCheck();
             lastHeartbeatCheck = now;
           }
-          if (isBlockTokenEnabled && (lastBlockKeyUpdate + blockKeyUpdateInterval < now)) {
-            updateBlockKey();
+          if (blockManager.isBlockTokenEnabled()
+              && (lastBlockKeyUpdate + blockManager.getBlockKeyUpdateInterval() < now)) {
+            blockManager.updateBlockKey();
             lastBlockKeyUpdate = now;
           }
         } catch (Exception e) {
@@ -4355,8 +4289,8 @@ LocatedBlock updateBlockForPipeline(ExtendedBlock block,
       // get a new generation stamp and an access token
       block.setGenerationStamp(nextGenerationStamp());
       locatedBlock = new LocatedBlock(block, new DatanodeInfo[0]);
-      if (isBlockTokenEnabled) {
-        locatedBlock.setBlockToken(blockTokenSecretManager.generateToken(
+      if (blockManager.isBlockTokenEnabled()) {
+        locatedBlock.setBlockToken(blockManager.getBlockTokenSecretManager().generateToken(
           block, EnumSet.of(BlockTokenSecretManager.AccessMode.WRITE)));
       }
     } finally {
diff --git a/hdfs/src/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java b/hdfs/src/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java
index 9ae56372c9..3c2f40bb65 100644
--- a/hdfs/src/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java
+++ b/hdfs/src/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java
@@ -631,7 +631,7 @@ public BlocksWithLocations getBlocks(DatanodeInfo datanode, long size)
 
   @Override // NamenodeProtocol
   public ExportedBlockKeys getBlockKeys() throws IOException {
-    return namesystem.getBlockKeys();
+    return namesystem.getBlockManager().getBlockKeys();
   }
 
   @Override // NamenodeProtocol
diff --git a/hdfs/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestBlockTokenWithDFS.java b/hdfs/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestBlockTokenWithDFS.java
index 717f887f30..b1b15cfa3d 100644
--- a/hdfs/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestBlockTokenWithDFS.java
+++ b/hdfs/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestBlockTokenWithDFS.java
@@ -190,7 +190,7 @@ public void testAppend() throws Exception {
       assertEquals(numDataNodes, cluster.getDataNodes().size());
       // set a short token lifetime (1 second)
       SecurityTestUtil.setBlockTokenLifetime(
-          cluster.getNameNode().getNamesystem().blockTokenSecretManager, 1000L);
+          cluster.getNameNode().getNamesystem().getBlockManager().getBlockTokenSecretManager(), 1000L);
       Path fileToAppend = new Path(FILE_TO_APPEND);
       FileSystem fs = cluster.getFileSystem();
 
@@ -246,7 +246,7 @@ public void testWrite() throws Exception {
       assertEquals(numDataNodes, cluster.getDataNodes().size());
       // set a short token lifetime (1 second)
       SecurityTestUtil.setBlockTokenLifetime(
-          cluster.getNameNode().getNamesystem().blockTokenSecretManager, 1000L);
+          cluster.getNameNode().getNamesystem().getBlockManager().getBlockTokenSecretManager(), 1000L);
       Path fileToWrite = new Path(FILE_TO_WRITE);
       FileSystem fs = cluster.getFileSystem();
 
@@ -294,7 +294,9 @@ public void testRead() throws Exception {
       assertEquals(numDataNodes, cluster.getDataNodes().size());
       // set a short token lifetime (1 second) initially
       SecurityTestUtil.setBlockTokenLifetime(
-          cluster.getNameNode().getNamesystem().blockTokenSecretManager, 1000L);
+          cluster.getNameNode()
+          .getNamesystem().getBlockManager().getBlockTokenSecretManager(),
+          1000L);
       Path fileToRead = new Path(FILE_TO_READ);
       FileSystem fs = cluster.getFileSystem();
       createFile(fs, fileToRead);
@@ -349,7 +351,8 @@ public void testRead() throws Exception {
       tryRead(conf, lblock, false);
       // use a valid new token
       lblock.setBlockToken(cluster.getNameNode().getNamesystem()
-          .blockTokenSecretManager.generateToken(lblock.getBlock(),
+          .getBlockManager().getBlockTokenSecretManager().generateToken(
+              lblock.getBlock(),
               EnumSet.of(BlockTokenSecretManager.AccessMode.READ)));
       // read should succeed
       tryRead(conf, lblock, true);
@@ -357,13 +360,15 @@ public void testRead() throws Exception {
       ExtendedBlock wrongBlock = new ExtendedBlock(lblock.getBlock()
           .getBlockPoolId(), lblock.getBlock().getBlockId() + 1);
       lblock.setBlockToken(cluster.getNameNode().getNamesystem()
-          .blockTokenSecretManager.generateToken(wrongBlock,
+          .getBlockManager().getBlockTokenSecretManager().generateToken(wrongBlock,
               EnumSet.of(BlockTokenSecretManager.AccessMode.READ)));
       // read should fail
       tryRead(conf, lblock, false);
       // use a token with wrong access modes
       lblock.setBlockToken(cluster.getNameNode().getNamesystem()
-          .blockTokenSecretManager.generateToken(lblock.getBlock(), EnumSet.of(
+          .getBlockManager().getBlockTokenSecretManager().generateToken(
+              lblock.getBlock(),
+              EnumSet.of(
               BlockTokenSecretManager.AccessMode.WRITE,
               BlockTokenSecretManager.AccessMode.COPY,
               BlockTokenSecretManager.AccessMode.REPLACE)));
@@ -372,7 +377,9 @@ public void testRead() throws Exception {
 
       // set a long token lifetime for future tokens
       SecurityTestUtil.setBlockTokenLifetime(
-          cluster.getNameNode().getNamesystem().blockTokenSecretManager, 600 * 1000L);
+          cluster.getNameNode()
+          .getNamesystem().getBlockManager().getBlockTokenSecretManager(),
+          600 * 1000L);
 
       /*
        * testing that when cached tokens are expired, DFSClient will re-fetch
diff --git a/mapreduce/CHANGES.txt b/mapreduce/CHANGES.txt
index c0f4afa66a..30fe349403 100644
--- a/mapreduce/CHANGES.txt
+++ b/mapreduce/CHANGES.txt
@@ -40,6 +40,9 @@ Trunk (unreleased changes)
 
   IMPROVEMENTS
 
+    MAPREDUCE-2187. Reporter sends progress during sort/merge. (Anupam Seth via
+    acmurthy) 
+
     MAPREDUCE-2365. Add counters to track bytes (read,written) via 
     File(Input,Output)Format. (Siddharth Seth via acmurthy)
  
@@ -206,12 +209,18 @@ Trunk (unreleased changes)
     MAPREDUCE-2602. Allow setting of end-of-record delimiter for
     TextInputFormat for the old API. (Ahmed Radwan via todd)
 
+    MAPREDUCE-2705. Permits parallel multiple task launches. 
+    (Thomas Graves via ddas)
+
   OPTIMIZATIONS
 
     MAPREDUCE-2026. Make JobTracker.getJobCounters() and
     JobInProgress.getCounters() aquire locks in a shorter time period.
     (Joydeep Sen Sarma via schen)
 
+    MAPREDUCE-2740. MultipleOutputs in new API creates needless
+    TaskAttemptContexts. (todd)
+
   BUG FIXES
 
     MAPREDUCE-2603. Disable High-Ram emulation in system tests. 
@@ -362,6 +371,16 @@ Trunk (unreleased changes)
     MAPREDUCE-2463. Job history files are not moved to done folder when job
     history location is hdfs.  (Devaraj K via szetszwo)
 
+    MAPREDUCE-2243. Close streams propely in a finally-block to avoid leakage
+    in CompletedJobStatusStore, TaskLog, EventWriter and TotalOrderPartitioner.
+    (Devaraj K via szetszwo)
+
+    MAPREDUCE-2741. Make ant build system work with hadoop-common JAR
+    generated by Maven. (Alejandro Abdelnur via tomwhite)
+
+    MAPREDUCE-2760. mapreduce.jobtracker.split.metainfo.maxsize typoed
+    in mapred-default.xml. (todd via eli)
+
 Release 0.22.0 - Unreleased
 
   INCOMPATIBLE CHANGES
diff --git a/mapreduce/ivy.xml b/mapreduce/ivy.xml
index 85ee014914..ad9e7357f8 100644
--- a/mapreduce/ivy.xml
+++ b/mapreduce/ivy.xml
@@ -57,6 +57,7 @@
     <artifact conf="master"/>
   </publications>
  <dependencies>
+   <dependency org="org.apache.hadoop" name="hadoop-annotations" rev="${hadoop-common.version}" conf="compile->default"/>
    <dependency org="org.apache.hadoop" name="hadoop-common" 
                rev="${hadoop-common.version}" conf="compile->default"/> 
    <dependency org="org.apache.hadoop" name="hadoop-common-test" 
@@ -105,6 +106,8 @@
       <exclude module="jetty"/>
       <exclude module="slf4j-simple"/>
     </dependency>
+   <dependency org="junit" name="junit" rev="${junit.version}"
+               conf="test->default"/>
    <dependency org="org.mockito" name="mockito-all" rev="${mockito-all.version}" 
                conf="test->default"/>
    <dependency org="org.vafer" name="jdeb" rev="${jdeb.version}" conf="package->master"/>
@@ -116,6 +119,12 @@
    <dependency org="org.aspectj" name="aspectjtools" rev="${aspectj.version}"
                conf="compile->default"/>
 
+   <!-- Exclusions for transitive dependencies pulled in by log4j -->
+   <exclude org="com.sun.jdmk"/>
+   <exclude org="com.sun.jmx"/>
+   <exclude org="javax.jms"/> 
+   <exclude org="javax.mail"/> 
+
  </dependencies>
   
 </ivy-module>
diff --git a/mapreduce/src/contrib/capacity-scheduler/ivy.xml b/mapreduce/src/contrib/capacity-scheduler/ivy.xml
index b8982394d3..ccb8644c5d 100644
--- a/mapreduce/src/contrib/capacity-scheduler/ivy.xml
+++ b/mapreduce/src/contrib/capacity-scheduler/ivy.xml
@@ -41,6 +41,7 @@
     <artifact conf="master"/>
   </publications>
   <dependencies>
+   <dependency org="org.apache.hadoop" name="hadoop-annotations" rev="${hadoop-common.version}" conf="common->default"/>
     <dependency org="org.apache.hadoop" name="hadoop-common" 
                 rev="${hadoop-common.version}" conf="common->default"/>
     <dependency org="org.apache.hadoop" name="hadoop-common-test" 
@@ -75,5 +76,12 @@
       <exclude module="jetty"/>
       <exclude module="slf4j-simple"/>
     </dependency>
+
+   <!-- Exclusions for transitive dependencies pulled in by log4j -->
+   <exclude org="com.sun.jdmk"/>
+   <exclude org="com.sun.jmx"/>
+   <exclude org="javax.jms"/> 
+   <exclude org="javax.mail"/> 
+
   </dependencies>
 </ivy-module>
diff --git a/mapreduce/src/contrib/data_join/ivy.xml b/mapreduce/src/contrib/data_join/ivy.xml
index 9a316f4248..c55443e903 100644
--- a/mapreduce/src/contrib/data_join/ivy.xml
+++ b/mapreduce/src/contrib/data_join/ivy.xml
@@ -41,11 +41,20 @@
     <artifact conf="master"/>
   </publications>
   <dependencies>
+   <dependency org="org.apache.hadoop" name="hadoop-annotations" rev="${hadoop-common.version}" conf="common->default"/>
     <dependency org="org.apache.hadoop" name="hadoop-common" rev="${hadoop-common.version}" conf="common->default"/>
      <dependency org="org.apache.hadoop" name="hadoop-common-test" rev="${hadoop-common.version}" conf="common->default"/>
      <dependency org="org.apache.hadoop" name="hadoop-hdfs" rev="${hadoop-hdfs.version}" conf="common->default"/>
      <dependency org="org.apache.hadoop" name="hadoop-hdfs-test" rev="${hadoop-hdfs.version}" conf="common->default"/>
     <dependency org="commons-logging" name="commons-logging" rev="${commons-logging.version}" conf="common->default"/>
     <dependency org="log4j" name="log4j" rev="${log4j.version}" conf="common->master"/>
+    <dependency org="junit" name="junit" rev="${junit.version}" conf="common->default"/>
+
+   <!-- Exclusions for transitive dependencies pulled in by log4j -->
+   <exclude org="com.sun.jdmk"/>
+   <exclude org="com.sun.jmx"/>
+   <exclude org="javax.jms"/> 
+   <exclude org="javax.mail"/> 
+
   </dependencies>
 </ivy-module>
diff --git a/mapreduce/src/contrib/dynamic-scheduler/ivy.xml b/mapreduce/src/contrib/dynamic-scheduler/ivy.xml
index 21eb6ad398..91b3b0e330 100644
--- a/mapreduce/src/contrib/dynamic-scheduler/ivy.xml
+++ b/mapreduce/src/contrib/dynamic-scheduler/ivy.xml
@@ -37,6 +37,7 @@
   </publications>
 
   <dependencies>
+   <dependency org="org.apache.hadoop" name="hadoop-annotations" rev="${hadoop-common.version}" conf="common->default"/>
     <dependency org="org.apache.hadoop" name="hadoop-common" rev="${hadoop-common.version}" conf="common->default"/>
     <dependency org="org.mortbay.jetty" name="jetty" rev="${jetty.version}" conf="common->master"/>
     <dependency org="org.mortbay.jetty" name="jetty-util" rev="${jetty-util.version}" conf="common->master"/>
@@ -50,5 +51,12 @@
     <dependency org="org.mortbay.jetty" name="servlet-api-2.5" rev="${servlet-api-2.5.version}" conf="common->master"/>
     <dependency org="junit" name="junit" rev="${junit.version}" conf="common->default"/>
     <dependency org="org.slf4j" name="slf4j-api" rev="${slf4j-api.version}" conf="common->master"/>
+
+   <!-- Exclusions for transitive dependencies pulled in by log4j -->
+   <exclude org="com.sun.jdmk"/>
+   <exclude org="com.sun.jmx"/>
+   <exclude org="javax.jms"/> 
+   <exclude org="javax.mail"/> 
+
   </dependencies>
 </ivy-module>
diff --git a/mapreduce/src/contrib/eclipse-plugin/ivy.xml b/mapreduce/src/contrib/eclipse-plugin/ivy.xml
index f39659a440..63ea44c1ae 100644
--- a/mapreduce/src/contrib/eclipse-plugin/ivy.xml
+++ b/mapreduce/src/contrib/eclipse-plugin/ivy.xml
@@ -41,9 +41,17 @@
     <artifact conf="master"/>
   </publications>
   <dependencies>
+   <dependency org="org.apache.hadoop" name="hadoop-annotations" rev="${hadoop-common.version}" conf="common->default"/>
     <dependency org="org.apache.hadoop" name="hadoop-common" rev="${hadoop-common.version}" conf="common->default"/>
     <dependency org="org.apache.hadoop" name="hadoop-hdfs" rev="${hadoop-hdfs.version}" conf="common->default"/>
     <dependency org="commons-logging" name="commons-logging" rev="${commons-logging.version}" conf="common->default"/>
     <dependency org="log4j" name="log4j" rev="${log4j.version}" conf="common->master"/>
+
+   <!-- Exclusions for transitive dependencies pulled in by log4j -->
+   <exclude org="com.sun.jdmk"/>
+   <exclude org="com.sun.jmx"/>
+   <exclude org="javax.jms"/> 
+   <exclude org="javax.mail"/> 
+
   </dependencies>
 </ivy-module>
diff --git a/mapreduce/src/contrib/fairscheduler/ivy.xml b/mapreduce/src/contrib/fairscheduler/ivy.xml
index 57bf435b33..57fd94d0de 100644
--- a/mapreduce/src/contrib/fairscheduler/ivy.xml
+++ b/mapreduce/src/contrib/fairscheduler/ivy.xml
@@ -40,6 +40,7 @@
     <artifact conf="master"/>
   </publications>
   <dependencies>
+   <dependency org="org.apache.hadoop" name="hadoop-annotations" rev="${hadoop-common.version}" conf="common->default"/>
     <dependency org="org.apache.hadoop" name="hadoop-common" 
                 rev="${hadoop-common.version}" conf="common->default"/>
     <dependency org="org.apache.hadoop" name="hadoop-common-test" 
@@ -100,5 +101,12 @@
       name="jsp-2.1"
       rev="${jetty.version}"
       conf="common->master"/>
+
+   <!-- Exclusions for transitive dependencies pulled in by log4j -->
+   <exclude org="com.sun.jdmk"/>
+   <exclude org="com.sun.jmx"/>
+   <exclude org="javax.jms"/> 
+   <exclude org="javax.mail"/> 
+
   </dependencies>
 </ivy-module>
diff --git a/mapreduce/src/contrib/gridmix/ivy.xml b/mapreduce/src/contrib/gridmix/ivy.xml
index ba1b82d056..488e75c375 100644
--- a/mapreduce/src/contrib/gridmix/ivy.xml
+++ b/mapreduce/src/contrib/gridmix/ivy.xml
@@ -36,6 +36,10 @@
     <artifact conf="master"/>
   </publications>
   <dependencies>
+    <dependency org="org.apache.hadoop" 
+      name="hadoop-annotations"
+      rev="${hadoop-common.version}"
+      conf="common->default"/>
     <dependency org="org.apache.hadoop"
       name="hadoop-common"
       rev="${hadoop-common.version}"
@@ -122,5 +126,12 @@
       name="paranamer"
       rev="${paranamer.version}"
       conf="common->default"/>
+
+   <!-- Exclusions for transitive dependencies pulled in by log4j -->
+   <exclude org="com.sun.jdmk"/>
+   <exclude org="com.sun.jmx"/>
+   <exclude org="javax.jms"/> 
+   <exclude org="javax.mail"/> 
+
   </dependencies>
 </ivy-module>
diff --git a/mapreduce/src/contrib/index/ivy.xml b/mapreduce/src/contrib/index/ivy.xml
index bd402dbdc6..e17a683aed 100644
--- a/mapreduce/src/contrib/index/ivy.xml
+++ b/mapreduce/src/contrib/index/ivy.xml
@@ -41,6 +41,7 @@
     <artifact conf="master"/>
   </publications>
   <dependencies>
+   <dependency org="org.apache.hadoop" name="hadoop-annotations" rev="${hadoop-common.version}" conf="common->default"/>
     <dependency org="org.apache.hadoop" name="hadoop-common" rev="${hadoop-common.version}" conf="common->default"/>
      <dependency org="org.apache.hadoop" name="hadoop-common-test" rev="${hadoop-common.version}" conf="common->default"/>
      <dependency org="org.apache.hadoop" name="hadoop-hdfs" rev="${hadoop-hdfs.version}" conf="common->default"/>
@@ -48,5 +49,13 @@
     <dependency org="commons-logging" name="commons-logging" rev="${commons-logging.version}" conf="common->default"/>
     <dependency org="log4j" name="log4j" rev="${log4j.version}" conf="common->master"/>
     <dependency org="org.apache.lucene" name="lucene-core" rev="${lucene-core.version}" conf="common->default"/>
+    <dependency org="junit" name="junit" rev="${junit.version}" conf="common->default"/>
+
+   <!-- Exclusions for transitive dependencies pulled in by log4j -->
+   <exclude org="com.sun.jdmk"/>
+   <exclude org="com.sun.jmx"/>
+   <exclude org="javax.jms"/> 
+   <exclude org="javax.mail"/> 
+
   </dependencies>
 </ivy-module>
diff --git a/mapreduce/src/contrib/mumak/ivy.xml b/mapreduce/src/contrib/mumak/ivy.xml
index dbe744c8ad..fdc95e3a67 100644
--- a/mapreduce/src/contrib/mumak/ivy.xml
+++ b/mapreduce/src/contrib/mumak/ivy.xml
@@ -39,6 +39,10 @@
     <artifact conf="master"/>
   </publications>
   <dependencies>
+    <dependency org="org.apache.hadoop" 
+      name="hadoop-annotations"
+      rev="${hadoop-common.version}"
+      conf="common->default"/>
     <dependency org="org.apache.hadoop" name="hadoop-common" 
                 rev="${hadoop-common.version}" conf="common->default"/>
     <dependency org="org.apache.hadoop" name="hadoop-common-test" 
@@ -122,5 +126,12 @@
       <exclude module="jetty"/>
       <exclude module="slf4j-simple"/>
     </dependency>
+
+   <!-- Exclusions for transitive dependencies pulled in by log4j -->
+   <exclude org="com.sun.jdmk"/>
+   <exclude org="com.sun.jmx"/>
+   <exclude org="javax.jms"/> 
+   <exclude org="javax.mail"/> 
+
   </dependencies>
 </ivy-module>
diff --git a/mapreduce/src/contrib/raid/ivy.xml b/mapreduce/src/contrib/raid/ivy.xml
index ba1b82d056..2fed1c3910 100644
--- a/mapreduce/src/contrib/raid/ivy.xml
+++ b/mapreduce/src/contrib/raid/ivy.xml
@@ -36,6 +36,7 @@
     <artifact conf="master"/>
   </publications>
   <dependencies>
+   <dependency org="org.apache.hadoop" name="hadoop-annotations" rev="${hadoop-common.version}" conf="common->default"/>
     <dependency org="org.apache.hadoop"
       name="hadoop-common"
       rev="${hadoop-common.version}"
@@ -122,5 +123,12 @@
       name="paranamer"
       rev="${paranamer.version}"
       conf="common->default"/>
+
+   <!-- Exclusions for transitive dependencies pulled in by log4j -->
+   <exclude org="com.sun.jdmk"/>
+   <exclude org="com.sun.jmx"/>
+   <exclude org="javax.jms"/> 
+   <exclude org="javax.mail"/> 
+
   </dependencies>
 </ivy-module>
diff --git a/mapreduce/src/contrib/streaming/ivy.xml b/mapreduce/src/contrib/streaming/ivy.xml
index 18cbde9eea..1d6552212a 100644
--- a/mapreduce/src/contrib/streaming/ivy.xml
+++ b/mapreduce/src/contrib/streaming/ivy.xml
@@ -40,6 +40,7 @@
     <artifact conf="master"/>
   </publications>
   <dependencies>
+   <dependency org="org.apache.hadoop" name="hadoop-annotations" rev="${hadoop-common.version}" conf="common->default"/>
     <dependency org="org.apache.hadoop" name="hadoop-common" 
                 rev="${hadoop-common.version}" conf="common->default"/>
     <dependency org="org.apache.hadoop" name="hadoop-common-test" 
@@ -76,5 +77,12 @@
     </dependency>
     <dependency org="org.slf4j" name="slf4j-api" 
                 rev="${slf4j-api.version}" conf="common->master"/>
+
+   <!-- Exclusions for transitive dependencies pulled in by log4j -->
+   <exclude org="com.sun.jdmk"/>
+   <exclude org="com.sun.jmx"/>
+   <exclude org="javax.jms"/> 
+   <exclude org="javax.mail"/>
+
   </dependencies>
 </ivy-module>
diff --git a/mapreduce/src/contrib/vaidya/ivy.xml b/mapreduce/src/contrib/vaidya/ivy.xml
index d338486b0a..73043ef25c 100644
--- a/mapreduce/src/contrib/vaidya/ivy.xml
+++ b/mapreduce/src/contrib/vaidya/ivy.xml
@@ -41,8 +41,16 @@
     <artifact conf="master"/>
   </publications>
   <dependencies>
+   <dependency org="org.apache.hadoop" name="hadoop-annotations" rev="${hadoop-common.version}" conf="common->default"/>
     <dependency org="org.apache.hadoop" name="hadoop-common" rev="${hadoop-common.version}" conf="common->default"/>
     <dependency org="log4j" name="log4j" rev="${log4j.version}" conf="common->master"/>
     <dependency org="commons-logging" name="commons-logging" rev="${commons-logging.version}" conf="common->default"/>
+
+   <!-- Exclusions for transitive dependencies pulled in by log4j -->
+   <exclude org="com.sun.jdmk"/>
+   <exclude org="com.sun.jmx"/>
+   <exclude org="javax.jms"/> 
+   <exclude org="javax.mail"/>
+
   </dependencies>
 </ivy-module>
diff --git a/mapreduce/src/contrib/vertica/ivy.xml b/mapreduce/src/contrib/vertica/ivy.xml
index b49ef4e0dc..a65a7e0698 100644
--- a/mapreduce/src/contrib/vertica/ivy.xml
+++ b/mapreduce/src/contrib/vertica/ivy.xml
@@ -40,6 +40,7 @@
     <artifact conf="master"/>
   </publications>
   <dependencies>
+   <dependency org="org.apache.hadoop" name="hadoop-annotations" rev="${hadoop-common.version}" conf="common->default"/>
     <dependency org="org.apache.hadoop"
       name="hadoop-common"
       rev="${hadoop-common.version}"
@@ -64,5 +65,12 @@
       name="log4j"
       rev="${log4j.version}"
       conf="common->master"/>
+
+   <!-- Exclusions for transitive dependencies pulled in by log4j -->
+   <exclude org="com.sun.jdmk"/>
+   <exclude org="com.sun.jmx"/>
+   <exclude org="javax.jms"/> 
+   <exclude org="javax.mail"/>
+
   </dependencies>
 </ivy-module>
diff --git a/mapreduce/src/java/mapred-default.xml b/mapreduce/src/java/mapred-default.xml
index 0b74e9778c..e70a6c6571 100644
--- a/mapreduce/src/java/mapred-default.xml
+++ b/mapreduce/src/java/mapred-default.xml
@@ -256,7 +256,7 @@
 
 
 <property>
-  <name>mapreduce.job.split.metainfo.maxsize</name>
+  <name>mapreduce.jobtracker.split.metainfo.maxsize</name>
   <value>10000000</value>
   <description>The maximum permissible size of the split metainfo file. 
   The JobTracker won't attempt to read split metainfo files bigger than
@@ -1041,6 +1041,14 @@
 </property>
 <!-- End of TaskTracker DistributedCache configuration -->
 
+<property>
+  <name>mapreduce.task.combine.progress.records</name>
+  <value>10000</value>
+  <description> The number of records to process during combine output collection 
+   before sending a progress notification to the TaskTracker.
+  </description>
+</property>
+
 <property>
   <name>mapreduce.task.merge.progress.records</name>
   <value>10000</value>
diff --git a/mapreduce/src/java/org/apache/hadoop/mapred/CompletedJobStatusStore.java b/mapreduce/src/java/org/apache/hadoop/mapred/CompletedJobStatusStore.java
index 10e4879a20..16b399edee 100644
--- a/mapreduce/src/java/org/apache/hadoop/mapred/CompletedJobStatusStore.java
+++ b/mapreduce/src/java/org/apache/hadoop/mapred/CompletedJobStatusStore.java
@@ -32,6 +32,7 @@
 import org.apache.hadoop.security.AccessControlException;
 import org.apache.hadoop.fs.permission.FsAction;
 import org.apache.hadoop.fs.permission.FsPermission;
+import org.apache.hadoop.io.IOUtils;
 import org.apache.hadoop.util.DiskChecker.DiskErrorException;
 
 /**
@@ -172,8 +173,9 @@ public void store(JobInProgress job) {
     if (active && retainTime > 0) {
       JobID jobId = job.getStatus().getJobID();
       Path jobStatusFile = getInfoFilePath(jobId);
+      FSDataOutputStream dataOut = null;
       try {
-        FSDataOutputStream dataOut = fs.create(jobStatusFile);
+        dataOut = fs.create(jobStatusFile);
 
         job.getStatus().write(dataOut);
 
@@ -189,6 +191,7 @@ public void store(JobInProgress job) {
         }
 
         dataOut.close();
+        dataOut = null; // set dataOut to null explicitly so that close in finally will not be executed again.
       } catch (IOException ex) {
         LOG.warn("Could not store [" + jobId + "] job info : " +
                  ex.getMessage(), ex);
@@ -198,6 +201,8 @@ public void store(JobInProgress job) {
         catch (IOException ex1) {
           //ignore
         }
+      } finally {
+        IOUtils.cleanup(LOG, dataOut);
       }
     }
   }
diff --git a/mapreduce/src/java/org/apache/hadoop/mapred/MapTask.java b/mapreduce/src/java/org/apache/hadoop/mapred/MapTask.java
index 44ba9a7e68..951b45ae70 100644
--- a/mapreduce/src/java/org/apache/hadoop/mapred/MapTask.java
+++ b/mapreduce/src/java/org/apache/hadoop/mapred/MapTask.java
@@ -946,7 +946,7 @@ public MapOutputBuffer(TaskUmbilicalProtocol umbilical, JobConf job,
       if (combinerRunner != null) {
         final Counters.Counter combineOutputCounter =
           reporter.getCounter(TaskCounter.COMBINE_OUTPUT_RECORDS);
-        combineCollector= new CombineOutputCollector<K,V>(combineOutputCounter);
+        combineCollector= new CombineOutputCollector<K,V>(combineOutputCounter, reporter, conf);
       } else {
         combineCollector = null;
       }
diff --git a/mapreduce/src/java/org/apache/hadoop/mapred/ReduceTask.java b/mapreduce/src/java/org/apache/hadoop/mapred/ReduceTask.java
index 0225982139..6256c66273 100644
--- a/mapreduce/src/java/org/apache/hadoop/mapred/ReduceTask.java
+++ b/mapreduce/src/java/org/apache/hadoop/mapred/ReduceTask.java
@@ -352,7 +352,7 @@ public void run(JobConf job, final TaskUmbilicalProtocol umbilical)
       Class combinerClass = conf.getCombinerClass();
       CombineOutputCollector combineCollector = 
         (null != combinerClass) ? 
-            new CombineOutputCollector(reduceCombineOutputCounter) : null;
+ 	     new CombineOutputCollector(reduceCombineOutputCounter, reporter, conf) : null;
 
       Shuffle shuffle = 
         new Shuffle(getTaskID(), job, FileSystem.getLocal(job), umbilical, 
diff --git a/mapreduce/src/java/org/apache/hadoop/mapred/Task.java b/mapreduce/src/java/org/apache/hadoop/mapred/Task.java
index f5abb3022a..8ad56a7d05 100644
--- a/mapreduce/src/java/org/apache/hadoop/mapred/Task.java
+++ b/mapreduce/src/java/org/apache/hadoop/mapred/Task.java
@@ -58,6 +58,7 @@
 import org.apache.hadoop.mapreduce.TaskCounter;
 import org.apache.hadoop.mapreduce.JobStatus;
 import org.apache.hadoop.mapreduce.MRConfig;
+import org.apache.hadoop.mapreduce.MRJobConfig;
 import org.apache.hadoop.mapreduce.lib.reduce.WrappedReducer;
 import org.apache.hadoop.mapreduce.task.ReduceContextImpl;
 import org.apache.hadoop.mapreduce.util.ResourceCalculatorPlugin;
@@ -79,6 +80,7 @@ abstract public class Task implements Writable, Configurable {
     LogFactory.getLog(Task.class);
 
   public static String MERGED_OUTPUT_PREFIX = ".merged";
+  public static final long DEFAULT_COMBINE_RECORDS_BEFORE_PROGRESS = 10000;
 
   /**
    * Counters to measure the usage of the different file systems.
@@ -1176,16 +1178,26 @@ public static class CombineOutputCollector<K extends Object, V extends Object>
   implements OutputCollector<K, V> {
     private Writer<K, V> writer;
     private Counters.Counter outCounter;
-    public CombineOutputCollector(Counters.Counter outCounter) {
+    private Progressable progressable;
+    private long progressBar;
+
+    public CombineOutputCollector(Counters.Counter outCounter, Progressable progressable, Configuration conf) {
       this.outCounter = outCounter;
+      this.progressable=progressable;
+      progressBar = conf.getLong(MRJobConfig.COMBINE_RECORDS_BEFORE_PROGRESS, DEFAULT_COMBINE_RECORDS_BEFORE_PROGRESS);
     }
+    
     public synchronized void setWriter(Writer<K, V> writer) {
       this.writer = writer;
     }
+
     public synchronized void collect(K key, V value)
         throws IOException {
       outCounter.increment(1);
       writer.append(key, value);
+      if ((outCounter.getValue() % progressBar) == 0) {
+        progressable.progress();
+      }
     }
   }
 
diff --git a/mapreduce/src/java/org/apache/hadoop/mapred/TaskLog.java b/mapreduce/src/java/org/apache/hadoop/mapred/TaskLog.java
index 7a5e55bb3e..810eea3a41 100644
--- a/mapreduce/src/java/org/apache/hadoop/mapred/TaskLog.java
+++ b/mapreduce/src/java/org/apache/hadoop/mapred/TaskLog.java
@@ -41,6 +41,7 @@
 import org.apache.hadoop.fs.FileStatus;
 import org.apache.hadoop.fs.FileUtil;
 import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.io.IOUtils;
 import org.apache.hadoop.io.SecureIOUtils;
 import org.apache.hadoop.mapreduce.JobID;
 import org.apache.hadoop.mapreduce.util.ProcessTree;
@@ -111,34 +112,42 @@ private static LogFileDetail getLogFileDetail(TaskAttemptID taskid,
     //stderr:<start-offset in the stderr file> <length>
     //syslog:<start-offset in the syslog file> <length>
     LogFileDetail l = new LogFileDetail();
-    String str = fis.readLine();
-    if (str == null) { //the file doesn't have anything
-      throw new IOException ("Index file for the log of " + taskid+" doesn't exist.");
-    }
-    l.location = str.substring(str.indexOf(LogFileDetail.LOCATION)+
-        LogFileDetail.LOCATION.length());
-    //special cases are the debugout and profile.out files. They are guaranteed
-    //to be associated with each task attempt since jvm reuse is disabled
-    //when profiling/debugging is enabled
-    if (filter.equals(LogName.DEBUGOUT) || filter.equals(LogName.PROFILE)) {
-      l.length = new File(l.location, filter.toString()).length();
-      l.start = 0;
-      fis.close();
-      return l;
-    }
-    str = fis.readLine();
-    while (str != null) {
-      //look for the exact line containing the logname
-      if (str.contains(filter.toString())) {
-        str = str.substring(filter.toString().length()+1);
-        String[] startAndLen = str.split(" ");
-        l.start = Long.parseLong(startAndLen[0]);
-        l.length = Long.parseLong(startAndLen[1]);
-        break;
+    String str = null;
+    try {
+      str = fis.readLine();
+      if (str == null) { // the file doesn't have anything
+        throw new IOException("Index file for the log of " + taskid
+            + " doesn't exist.");
+      }
+      l.location = str.substring(str.indexOf(LogFileDetail.LOCATION)
+          + LogFileDetail.LOCATION.length());
+      // special cases are the debugout and profile.out files. They are
+      // guaranteed
+      // to be associated with each task attempt since jvm reuse is disabled
+      // when profiling/debugging is enabled
+      if (filter.equals(LogName.DEBUGOUT) || filter.equals(LogName.PROFILE)) {
+        l.length = new File(l.location, filter.toString()).length();
+        l.start = 0;
+        fis.close();
+        return l;
       }
       str = fis.readLine();
+      while (str != null) {
+        // look for the exact line containing the logname
+        if (str.contains(filter.toString())) {
+          str = str.substring(filter.toString().length() + 1);
+          String[] startAndLen = str.split(" ");
+          l.start = Long.parseLong(startAndLen[0]);
+          l.length = Long.parseLong(startAndLen[1]);
+          break;
+        }
+        str = fis.readLine();
+      }
+      fis.close();
+      fis = null;
+    } finally {
+      IOUtils.cleanup(LOG, fis);
     }
-    fis.close();
     return l;
   }
   
@@ -189,22 +198,27 @@ private static void writeToIndexFile(String logLocation,
     //LOG_DIR: <the dir where the task logs are really stored>
     //STDOUT: <start-offset in the stdout file> <length>
     //STDERR: <start-offset in the stderr file> <length>
-    //SYSLOG: <start-offset in the syslog file> <length>    
-    dos.writeBytes(LogFileDetail.LOCATION + logLocation + "\n"
-        + LogName.STDOUT.toString() + ":");
-    dos.writeBytes(Long.toString(prevOutLength) + " ");
-    dos.writeBytes(Long.toString(new File(logLocation, LogName.STDOUT
-        .toString()).length() - prevOutLength)
-        + "\n" + LogName.STDERR + ":");
-    dos.writeBytes(Long.toString(prevErrLength) + " ");
-    dos.writeBytes(Long.toString(new File(logLocation, LogName.STDERR
-        .toString()).length() - prevErrLength)
-        + "\n" + LogName.SYSLOG.toString() + ":");
-    dos.writeBytes(Long.toString(prevLogLength) + " ");
-    dos.writeBytes(Long.toString(new File(logLocation, LogName.SYSLOG
-        .toString()).length() - prevLogLength)
-        + "\n");
-    dos.close();
+    //SYSLOG: <start-offset in the syslog file> <length>   
+    try{
+      dos.writeBytes(LogFileDetail.LOCATION + logLocation + "\n"
+          + LogName.STDOUT.toString() + ":");
+      dos.writeBytes(Long.toString(prevOutLength) + " ");
+      dos.writeBytes(Long.toString(new File(logLocation, LogName.STDOUT
+          .toString()).length() - prevOutLength)
+          + "\n" + LogName.STDERR + ":");
+      dos.writeBytes(Long.toString(prevErrLength) + " ");
+      dos.writeBytes(Long.toString(new File(logLocation, LogName.STDERR
+          .toString()).length() - prevErrLength)
+          + "\n" + LogName.SYSLOG.toString() + ":");
+      dos.writeBytes(Long.toString(prevLogLength) + " ");
+      dos.writeBytes(Long.toString(new File(logLocation, LogName.SYSLOG
+          .toString()).length() - prevLogLength)
+          + "\n");
+      dos.close();
+      dos = null;
+    } finally {
+      IOUtils.cleanup(LOG, dos);
+    }
 
     File indexFile = getIndexFile(currentTaskid, isCleanup);
     Path indexFilePath = new Path(indexFile.getAbsolutePath());
diff --git a/mapreduce/src/java/org/apache/hadoop/mapred/TaskTracker.java b/mapreduce/src/java/org/apache/hadoop/mapred/TaskTracker.java
index 65f2a00a42..52ea9162b1 100644
--- a/mapreduce/src/java/org/apache/hadoop/mapred/TaskTracker.java
+++ b/mapreduce/src/java/org/apache/hadoop/mapred/TaskTracker.java
@@ -1253,7 +1253,7 @@ private void localizeJobJarFile(String user, JobID jobId, FileSystem localFs,
     }
   }
 
-  private void launchTaskForJob(TaskInProgress tip, JobConf jobConf,
+  protected void launchTaskForJob(TaskInProgress tip, JobConf jobConf,
       UserGroupInformation ugi) throws IOException {
     synchronized (tip) {
       tip.setJobConf(jobConf);
@@ -2351,30 +2351,35 @@ private TaskInProgress registerTask(LaunchTaskAction action,
    * All exceptions are handled locally, so that we don't mess up the
    * task tracker.
    */
-  void startNewTask(TaskInProgress tip) {
-    try {
-      RunningJob rjob = localizeJob(tip);
-      // Localization is done. Neither rjob.jobConf nor rjob.ugi can be null
-      launchTaskForJob(tip, new JobConf(rjob.jobConf), rjob.ugi); 
-    } catch (Throwable e) {
-      String msg = ("Error initializing " + tip.getTask().getTaskID() + 
-                    ":\n" + StringUtils.stringifyException(e));
-      LOG.warn(msg);
-      tip.reportDiagnosticInfo(msg);
-      try {
-        tip.kill(true);
-        tip.cleanup(true);
-      } catch (IOException ie2) {
-        LOG.info("Error cleaning up " + tip.getTask().getTaskID() + ":\n" +
-                 StringUtils.stringifyException(ie2));          
+  void startNewTask(final TaskInProgress tip) {
+    Thread launchThread = new Thread(new Runnable() {
+      @Override
+      public void run() {
+        try {
+          RunningJob rjob = localizeJob(tip);
+          // Localization is done. Neither rjob.jobConf nor rjob.ugi can be null
+          launchTaskForJob(tip, new JobConf(rjob.getJobConf()), rjob.ugi); 
+        } catch (Throwable e) {
+          String msg = ("Error initializing " + tip.getTask().getTaskID() + 
+                        ":\n" + StringUtils.stringifyException(e));
+          LOG.warn(msg);
+          tip.reportDiagnosticInfo(msg);
+          try {
+            tip.kill(true);
+            tip.cleanup(true);
+          } catch (IOException ie2) {
+            LOG.info("Error cleaning up " + tip.getTask().getTaskID() + ":\n" +
+                     StringUtils.stringifyException(ie2));          
+          }
+          if (e instanceof Error) {
+            LOG.error("TaskLauncher error " +
+                StringUtils.stringifyException(e));
+          }
+        }
       }
+    });
+    launchThread.start();
         
-      // Careful! 
-      // This might not be an 'Exception' - don't handle 'Error' here!
-      if (e instanceof Error) {
-        throw ((Error) e);
-      }
-    }
   }
   
   void addToMemoryManager(TaskAttemptID attemptId, boolean isMap, 
diff --git a/mapreduce/src/java/org/apache/hadoop/mapreduce/MRJobConfig.java b/mapreduce/src/java/org/apache/hadoop/mapreduce/MRJobConfig.java
index bcaeaf147a..0054646caf 100644
--- a/mapreduce/src/java/org/apache/hadoop/mapreduce/MRJobConfig.java
+++ b/mapreduce/src/java/org/apache/hadoop/mapreduce/MRJobConfig.java
@@ -260,6 +260,8 @@ public interface MRJobConfig {
 
   public static final String REDUCE_MEMTOMEM_ENABLED = "mapreduce.reduce.merge.memtomem.enabled";
 
+  public static final String COMBINE_RECORDS_BEFORE_PROGRESS = "mapreduce.task.combine.progress.records";
+
   public static final String JOB_NAMENODES = "mapreduce.job.hdfs-servers";
 
   public static final String JOB_JOBTRACKER_ID = "mapreduce.job.kerberos.jtprinicipal";
diff --git a/mapreduce/src/java/org/apache/hadoop/mapreduce/jobhistory/EventWriter.java b/mapreduce/src/java/org/apache/hadoop/mapreduce/jobhistory/EventWriter.java
index 400bcb2837..d8516a0a0d 100644
--- a/mapreduce/src/java/org/apache/hadoop/mapreduce/jobhistory/EventWriter.java
+++ b/mapreduce/src/java/org/apache/hadoop/mapreduce/jobhistory/EventWriter.java
@@ -22,6 +22,7 @@
 import java.util.Iterator;
 
 import org.apache.hadoop.fs.FSDataOutputStream;
+import org.apache.hadoop.io.IOUtils;
 import org.apache.hadoop.mapreduce.Counter;
 import org.apache.hadoop.mapreduce.CounterGroup;
 import org.apache.hadoop.mapreduce.Counters;
@@ -33,6 +34,8 @@
 import org.apache.avro.specific.SpecificDatumWriter;
 import org.apache.avro.generic.GenericData;
 import org.apache.avro.util.Utf8;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 /**
  * Event Writer is an utility class used to write events to the underlying
@@ -47,6 +50,7 @@ class EventWriter {
   private DatumWriter<Event> writer =
     new SpecificDatumWriter<Event>(Event.class);
   private Encoder encoder;
+  private static final Log LOG = LogFactory.getLog(EventWriter.class);
   
   EventWriter(FSDataOutputStream out) throws IOException {
     this.out = out;
@@ -72,8 +76,13 @@ void flush() throws IOException {
   }
 
   void close() throws IOException {
-    encoder.flush();
-    out.close();
+    try {
+      encoder.flush();
+      out.close();
+      out = null;
+    } finally {
+      IOUtils.cleanup(LOG, out);
+    }
   }
 
   private static final Schema GROUPS =
diff --git a/mapreduce/src/java/org/apache/hadoop/mapreduce/lib/output/MultipleOutputs.java b/mapreduce/src/java/org/apache/hadoop/mapreduce/lib/output/MultipleOutputs.java
index 31dd2818c0..0db94e0475 100644
--- a/mapreduce/src/java/org/apache/hadoop/mapreduce/lib/output/MultipleOutputs.java
+++ b/mapreduce/src/java/org/apache/hadoop/mapreduce/lib/output/MultipleOutputs.java
@@ -132,6 +132,10 @@ public class MultipleOutputs<KEYOUT, VALUEOUT> {
    * Cache for the taskContexts
    */
   private Map<String, TaskAttemptContext> taskContexts = new HashMap<String, TaskAttemptContext>();
+  /**
+   * Cached TaskAttemptContext which uses the job's configured settings
+   */
+  private TaskAttemptContext jobOutputFormatContext;
 
   /**
    * Checks if a named output name is valid token.
@@ -382,11 +386,13 @@ public <K, V> void write(String namedOutput, K key, V value,
   public void write(KEYOUT key, VALUEOUT value, String baseOutputPath) 
       throws IOException, InterruptedException {
     checkBaseOutputPath(baseOutputPath);
-    TaskAttemptContext taskContext = 
-      new TaskAttemptContextImpl(context.getConfiguration(), 
-                                 context.getTaskAttemptID(),
-                                 new WrappedStatusReporter(context));
-    getRecordWriter(taskContext, baseOutputPath).write(key, value);
+    if (jobOutputFormatContext == null) {
+      jobOutputFormatContext = 
+        new TaskAttemptContextImpl(context.getConfiguration(), 
+                                   context.getTaskAttemptID(),
+                                   new WrappedStatusReporter(context));
+    }
+    getRecordWriter(jobOutputFormatContext, baseOutputPath).write(key, value);
   }
 
   // by being synchronized MultipleOutputTask can be use with a
diff --git a/mapreduce/src/java/org/apache/hadoop/mapreduce/lib/partition/TotalOrderPartitioner.java b/mapreduce/src/java/org/apache/hadoop/mapreduce/lib/partition/TotalOrderPartitioner.java
index fe14926b1a..fa12976c26 100644
--- a/mapreduce/src/java/org/apache/hadoop/mapreduce/lib/partition/TotalOrderPartitioner.java
+++ b/mapreduce/src/java/org/apache/hadoop/mapreduce/lib/partition/TotalOrderPartitioner.java
@@ -23,6 +23,8 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.classification.InterfaceAudience;
 import org.apache.hadoop.classification.InterfaceStability;
 import org.apache.hadoop.conf.Configurable;
@@ -30,6 +32,7 @@
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.io.BinaryComparable;
+import org.apache.hadoop.io.IOUtils;
 import org.apache.hadoop.io.NullWritable;
 import org.apache.hadoop.io.SequenceFile;
 import org.apache.hadoop.io.RawComparator;
@@ -56,6 +59,7 @@ public class TotalOrderPartitioner<K extends WritableComparable<?>,V>
   public static final String NATURAL_ORDER = 
     "mapreduce.totalorderpartitioner.naturalorder";
   Configuration conf;
+  private static final Log LOG = LogFactory.getLog(TotalOrderPartitioner.class);
 
   public TotalOrderPartitioner() { }
 
@@ -298,11 +302,16 @@ private K[] readPartitions(FileSystem fs, Path p, Class<K> keyClass,
     ArrayList<K> parts = new ArrayList<K>();
     K key = ReflectionUtils.newInstance(keyClass, conf);
     NullWritable value = NullWritable.get();
-    while (reader.next(key, value)) {
-      parts.add(key);
-      key = ReflectionUtils.newInstance(keyClass, conf);
+    try {
+      while (reader.next(key, value)) {
+        parts.add(key);
+        key = ReflectionUtils.newInstance(keyClass, conf);
+      }
+      reader.close();
+      reader = null;
+    } finally {
+      IOUtils.cleanup(LOG, reader);
     }
-    reader.close();
     return parts.toArray((K[])Array.newInstance(keyClass, parts.size()));
   }
   
diff --git a/mapreduce/src/test/mapred/org/apache/hadoop/mapred/TestTaskLauncherThreaded.java b/mapreduce/src/test/mapred/org/apache/hadoop/mapred/TestTaskLauncherThreaded.java
new file mode 100644
index 0000000000..21378f16dd
--- /dev/null
+++ b/mapreduce/src/test/mapred/org/apache/hadoop/mapred/TestTaskLauncherThreaded.java
@@ -0,0 +1,165 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.mapred;
+
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
+
+import java.io.IOException;
+import java.util.LinkedHashMap;
+import java.util.TreeMap;
+
+import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.mapred.JobConf;
+import org.apache.hadoop.mapred.TaskTracker.TaskInProgress;
+import org.apache.hadoop.mapred.TaskTracker.TaskLauncher;
+import org.apache.hadoop.mapred.TaskTracker.RunningJob;
+import org.apache.hadoop.mapreduce.TaskType;
+import org.apache.hadoop.security.UserGroupInformation;
+import org.junit.Test;
+
+/**
+ * Tests {@link TaskLauncherThreaded}
+ */
+public class TestTaskLauncherThreaded {
+  private static int jobLocalizedCount = 0;
+  private static int jobLaunchCount = 0;
+  private static boolean quitWaiting = false;
+  private static boolean firstJobStarted = false;
+  private static boolean firstJobFinished = false;
+
+  private static class MyTaskTracker extends TaskTracker {
+
+    // stub out functions called from startNewTask
+    @Override
+    RunningJob localizeJob(TaskInProgress tip)
+        throws IOException, InterruptedException {
+      if (firstJobStarted == false) {
+        firstJobStarted = true;
+        while (quitWaiting == false) {
+          Thread.sleep(100);
+        }
+        firstJobFinished = true;
+      }
+      // mock out a RunningJob
+      RunningJob rjob = mock(RunningJob.class);
+      when(rjob.getJobConf()).thenReturn(new JobConf());
+      jobLocalizedCount++;
+
+      return rjob;
+    }
+
+    @Override
+    protected void launchTaskForJob(TaskInProgress tip, JobConf jobConf,
+        UserGroupInformation ugi) throws IOException {
+      jobLaunchCount++;
+    }
+  }
+
+  /**
+   * Tests the case "task localizing doesn't block other tasks".
+   *
+   * Launches one task that simulates a task doing large localization,
+   * then starts a second task and verifies that second task is not
+   * blocked waiting behind the first task.
+   *
+   * @throws IOException
+   */
+  @Test
+  public void testLocalizationNotBlockingOtherTasks() throws IOException {
+    // setup a TaskTracker
+    JobConf ttConf = new JobConf();
+    ttConf.setInt("mapred.tasktracker.map.tasks.maximum", 4);
+    TaskTracker tt = new MyTaskTracker();
+
+    tt.runningJobs = new TreeMap<JobID, TaskTracker.RunningJob>();
+    tt.runningTasks = new LinkedHashMap<TaskAttemptID, TaskInProgress>();
+    tt.setIndexCache(new IndexCache(ttConf));
+    tt.setTaskMemoryManagerEnabledFlag();
+
+    // start map-task launcher with four slots
+    TaskLauncher mapLauncher = tt.new TaskLauncher(TaskType.MAP, 4);
+    mapLauncher.start();
+
+    // launch a task which simulates large localization
+    String jtId = "test";
+    TaskAttemptID attemptID = new TaskAttemptID(jtId, 1, true, 0, 0);
+    Task task = new MapTask(null, attemptID, 0, null, 2);
+    mapLauncher.addToTaskQueue(new LaunchTaskAction(task));
+    // verify that task is added to runningTasks
+    TaskInProgress runningTip = tt.runningTasks.get(attemptID);
+    assertNotNull(runningTip);
+
+    // wait for a while for the first task to start initializing
+    // this loop waits at most for 30 seconds
+    for (int i = 0; i < 300; i++) {
+      if (firstJobStarted == true) {
+        break;
+      }
+      UtilsForTests.waitFor(100);
+    }
+
+    // Now start a second task and make sure it doesn't wait while first one initializes
+    String secondjtId = "test2";
+    TaskAttemptID secondAttemptID = new TaskAttemptID(secondjtId, 1, true, 0, 0);
+    Task secondTask = new MapTask(null, secondAttemptID, 0, null, 2);
+    mapLauncher.addToTaskQueue(new LaunchTaskAction(secondTask));
+    // verify that task is added to runningTasks
+    TaskInProgress secondRunningTip = tt.runningTasks.get(secondAttemptID);
+    assertNotNull(secondRunningTip);
+
+    // wait for a while for the second task to be launched
+    // this loop waits at most for 30 seconds
+    for (int i = 0; i < 300; i++) {
+      if (jobLaunchCount > 0) {
+        break;
+      }
+      UtilsForTests.waitFor(100);
+    }
+
+    assertEquals("Second task didn't run or both ran", 1, jobLocalizedCount);
+    assertEquals("second task didn't try to launch", 1, jobLaunchCount);
+    assertFalse("Second task didn't finish first task initializing", firstJobFinished);
+
+    // tell first task to stop waiting
+    quitWaiting = true;
+
+    // wait for a while for the first task finishes initializing
+    // this loop waits at most for 30 seconds
+    for (int i = 0; i < 300; i++) {
+      if (firstJobFinished == true) {
+        break;
+      }
+      UtilsForTests.waitFor(100);
+    }
+    assertTrue("First task didn't finish initializing", firstJobFinished);
+
+    // wait for a while for the first task finishes
+    // this loop waits at most for 30 seconds
+    for (int i = 0; i < 300; i++) {
+      if (jobLaunchCount > 1) {
+        break;
+      }
+      UtilsForTests.waitFor(100);
+    }
+    assertEquals("Both tasks didn't run", 2, jobLocalizedCount);
+    assertEquals("First task didn't try to launch", 2, jobLaunchCount);
+
+  }
+
+}
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000000..ba41a928c3
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License. See accompanying LICENSE file.
+-->
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.hadoop</groupId>
+  <artifactId>hadoop-main</artifactId>
+  <version>0.23.0-SNAPSHOT</version>
+  <description>Apache Hadoop Main</description>
+  <name>Apache Hadoop Main</name>
+  <packaging>pom</packaging>
+
+  <licenses>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+    </license>
+  </licenses>
+
+  <organization>
+    <name>Apache Software Foundation</name>
+    <url>http://www.apache.org</url>
+  </organization>
+
+  <modules>
+    <module>hadoop-project</module>
+    <module>hadoop-assemblies</module>
+    <module>hadoop-annotations</module>
+    <module>hadoop-common</module>
+  </modules>
+
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-enforcer-plugin</artifactId>
+          <version>1.0</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-assembly-plugin</artifactId>
+          <version>2.2-beta-3</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.rat</groupId>
+          <artifactId>apache-rat-plugin</artifactId>
+          <version>0.7</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-enforcer-plugin</artifactId>
+        <inherited>false</inherited>
+        <configuration>
+          <rules>
+            <requireMavenVersion>
+              <version>[3.0.0,)</version>
+            </requireMavenVersion>
+            <requireJavaVersion>
+              <version>1.6</version>
+            </requireJavaVersion>
+            <requireOS>
+              <family>unix</family>
+            </requireOS>
+          </rules>
+        </configuration>
+        <executions>
+          <execution>
+            <id>clean</id>
+            <goals>
+              <goal>enforce</goal>
+            </goals>
+            <phase>pre-clean</phase>
+          </execution>
+          <execution>
+            <id>default</id>
+            <goals>
+              <goal>enforce</goal>
+            </goals>
+            <phase>validate</phase>
+          </execution>
+          <execution>
+            <id>site</id>
+            <goals>
+              <goal>enforce</goal>
+            </goals>
+            <phase>pre-site</phase>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.rat</groupId>
+        <artifactId>apache-rat-plugin</artifactId>
+        <configuration>
+          <includes>
+            <include>dev-support/*</include>
+            <include>pom.xml</include>
+          </includes>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>