diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 51ecb08..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,10 +0,0 @@
-*.swp
-*.pyc
-*.class
-
-target/*
-hadoop-swiftn-driver/target/*
-
-.classpath
-.settings
-.project
diff --git a/.gitreview b/.gitreview
deleted file mode 100644
index 1b92e99..0000000
--- a/.gitreview
+++ /dev/null
@@ -1,4 +0,0 @@
-[gerrit]
-host=review.openstack.org
-port=29418
-project=stackforge/MRaaS.git
diff --git a/README.md b/README.md
deleted file mode 100644
index 9b98897..0000000
--- a/README.md
+++ /dev/null
@@ -1,18 +0,0 @@
-MapReduce as a Service
-======================
-
-There are three main parts:
-
-1. Core service layer
-2. Hadoop-Swift native driver
-3. REST client interface
-
-## Hadoop Swift Native Driver
-
-hadoop-swiftn-driver includes source code base for native driver to stream data from/to Swift object store. It has been tested with Hadoop 1.0.3. To use this driver:
-
-1. Put driver source code into Hadoop source base (tested with Hadoop 1.0.3)
-2. Put hpswift.jar into lib directory
-3. Build Hadoop
-4. Edit conf files accordingly
- 
\ No newline at end of file
diff --git a/README.rst b/README.rst
new file mode 100644
index 0000000..9006052
--- /dev/null
+++ b/README.rst
@@ -0,0 +1,7 @@
+This project is no longer maintained.
+
+The contents of this repository are still available in the Git source code
+management system. To see the contents of this repository before it reached
+its end of life, please check out the previous commit with 
+"git checkout HEAD^1".
+
diff --git a/hadoop-swiftn-driver/build.xml b/hadoop-swiftn-driver/build.xml
deleted file mode 100644
index e073aa3..0000000
--- a/hadoop-swiftn-driver/build.xml
+++ /dev/null
@@ -1,2824 +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" default="compile" 
-   xmlns:artifact="urn:maven-artifact-ant"
-   xmlns:ivy="antlib:org.apache.ivy.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="Name" value="Hadoop"/>
-  <property name="name" value="hadoop"/>
-  <property name="version" value="1.0.4-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="http.proxyHost" value="proxy-ccy.houston.hp.com"/>
-	<property name="http.proxyPort" value="8080"/>
-	
-  <property name="core.final.name" value="${name}-core-${version}"/>
-  <property name="test.final.name" value="${name}-test-${version}"/>
-  <property name="examples.final.name" value="${name}-examples-${version}"/>
-  <property name="tools.final.name" value="${name}-tools-${version}"/>
-  <property name="ant.final.name" value="${name}-ant-${version}"/>
-  <property name="streaming.final.name" value="${name}-streaming-${version}"/>
-  <property name="hadoop-client.final.name" value="${name}-client-${version}"/>
-  <property name="hadoop-minicluster.final.name" value="${name}-minicluster-${version}"/>
-
-  <property name="src.dir" value="${basedir}/src"/>  	
-  <property name="core.src.dir" value="${src.dir}/core"/>
-  <property name="mapred.src.dir" value="${src.dir}/mapred"/> 
-  <property name="hdfs.src.dir" value="${src.dir}/hdfs"/>
-  <property name="native.src.dir" value="${basedir}/src/native"/>
-  <property name="examples.dir" value="${basedir}/src/examples"/>
-  <property name="anttasks.dir" value="${basedir}/src/ant"/>
-  <property name="lib.dir" value="${basedir}/lib"/>
-  <property name="conf.dir" value="${basedir}/conf"/>
-  <property name="contrib.dir" value="${basedir}/src/contrib"/>
-  <property name="docs.src" value="${basedir}/src/docs"/>
-  <property name="src.docs.cn" value="${basedir}/src/docs/cn"/>
-  <property name="changes.src" value="${docs.src}/changes"/>
-  <property name="c++.src" value="${basedir}/src/c++"/>
-  <property name="c++.utils.src" value="${c++.src}/utils"/>
-  <property name="c++.pipes.src" value="${c++.src}/pipes"/>
-  <property name="c++.examples.pipes.src" value="${examples.dir}/pipes"/>
-  <property name="c++.libhdfs.src" value="${c++.src}/libhdfs"/>
-  <property name="librecordio.src" value="${c++.src}/librecordio"/>
-  <property name="tools.src" value="${basedir}/src/tools"/>
-  <property name="hpswift.lib.dir" value="${basedir}/lib" />
-  <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="xercescroot" value=""/> 
-  <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.tools" value="${build.dir}/tools"/>
-  <property name="build.webapps" value="${build.dir}/webapps"/>
-  <property name="build.examples" value="${build.dir}/examples"/>
-  <property name="build.anttasks" value="${build.dir}/ant"/>
-  <property name="build.librecordio" value="${build.dir}/librecordio"/>
-  <!-- convert spaces to _ so that mac os doesn't break things -->
-  <exec executable="sed" inputstring="${os.name}" 
-        outputproperty="nonspace.os">
-     <arg value="s/ /_/g"/>
-  </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.c++" value="${build.dir}/c++-build/${build.platform}"/>
-  <property name="build.c++.utils" value="${build.c++}/utils"/>
-  <property name="build.c++.pipes" value="${build.c++}/pipes"/>
-  <property name="build.c++.libhdfs" value="${build.c++}/libhdfs"/>
-  <property name="build.c++.examples.pipes" 
-            value="${build.c++}/examples/pipes"/>
-  <property name="build.docs" value="${build.dir}/docs"/>
-  <property name="build.docs.cn" value="${build.dir}/docs/cn"/>
-  <property name="build.javadoc" value="${build.docs}/api"/>
-  <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="install.c++.examples" 
-            value="${build.dir}/c++-examples/${build.platform}"/>
-
-  <property name="test.src.dir" value="${basedir}/src/test"/>
-  <property name="test.lib.dir" value="${basedir}/src/test/lib"/>
-  <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.testjar" value="${test.build.dir}/testjar"/>
-  <property name="test.build.testshell" value="${test.build.dir}/testshell"/>
-  <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.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.tools.input.dir" value="${basedir}/src/test/tools/data"/>
-  
-  <property name="test.commit.tests.file" value="${test.src.dir}/commit-tests" />
-  <property name="test.smoke.tests.file" value="${test.src.dir}/smoke-tests" />
-  <property name="test.all.tests.file" value="${test.src.dir}/all-tests" />
-
-  <property name="test.libhdfs.conf.dir" value="${c++.libhdfs.src}/tests/conf"/>
-  <property name="test.libhdfs.dir" value="${test.build.dir}/libhdfs"/>
-
-  <property name="librecordio.test.dir" value="${test.build.dir}/librecordio"/>
-  <property name="web.src.dir" value="${basedir}/src/web"/>
-  <property name="src.webapps" value="${basedir}/src/webapps"/>
-
-  <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.stable" value="1.0.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"/>
-
-  <property name="jsvc.build.dir" value="${build.dir}/jsvc.${os.arch}" />
-  <property name="jsvc.install.dir" value="${dist.dir}/libexec" /> 
-  <condition property="os-arch" value="x86_64">
-    <and>
-      <os arch="amd64" />
-    </and>
-  </condition>
-  <condition property="os-arch" value="i386">
-    <or>
-      <os arch="i386" />
-      <os arch="i486" />
-      <os arch="i586" />
-      <os arch="i686" />
-      <os arch="x86" />
-    </or>
-  </condition>
-  <property name="jsvc.location" value="http://archive.apache.org/dist/commons/daemon/binaries/1.0.2/linux/commons-daemon-1.0.2-bin-linux-${os-arch}.tar.gz" />
-  <property name="jsvc.dest.name" value="jsvc.${os.arch}.tar.gz" />
-
-  <!-- task-controller properties set here -->
-  <!-- Source directory from where configure is run and files are copied
-  -->
-	
-  <property name="c++.task-controller.src" 
-    value="${basedir}/src/c++/task-controller" />
-  <!-- directory where autoconf files + temporary files and src is 
-    stored for compilation -->
-  <property name="build.c++.task-controller" 
-    value="${build.c++}/task-controller" />
-  <property name="task-controller.prefix.dir" value="${dist.dir}" />
-  <!-- the configuration directory for the linux task controller -->
-  <property name="hadoop.conf.dir" value="/etc/hadoop"/>
-
-  <!-- end of task-controller properties -->
-       
-  <!-- These args are passed along to FindBugs -->
-  <property name="findbugs.jvmargs" value="-Xmx512M" />
-
-  <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"/>
-
-  <!-- IVY properteis set here -->
-  <property name="ivy.dir" location="ivy" />
-  <loadproperties srcfile="${ivy.dir}/libraries.properties"/>
-  <property name="mvnrepo" value="http://repo2.maven.org/maven2"/>
-  <property name="asfrepo" value="https://repository.apache.org"/> 
-  <property name="ivy.jar" location="${ivy.dir}/ivy-${ivy.version}.jar"/>
-  <property name="ivy_repo_url" 
-    value="${mvnrepo}/org/apache/ivy/ivy/${ivy.version}/ivy-${ivy.version}.jar"/>
-  <property name="ant_task.jar" 
-    location="${ivy.dir}/maven-ant-tasks-${ant-task.version}.jar"/>
-  <property name="tsk.org" value="/org/apache/maven/maven-ant-tasks/"/>
-  <property name="ant_task_repo_url"
-    value="${mvnrepo}${tsk.org}${ant-task.version}/maven-ant-tasks-${ant-task.version}.jar"/>
-  <property name="repo" value="snapshots"/>
-  <property name="asfsnapshotrepo" 
-    value="${asfrepo}/content/repositories/snapshots"/> 
-  <property name="asfstagingrepo"
-    value="${asfrepo}/service/local/staging/deploy/maven2"/> 
-  <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="hadoop-core.pom" location="${ivy.dir}/hadoop-core-pom.xml"/>
-  <property name="hadoop-core-pom-template.xml" 
-    location="${ivy.dir}/hadoop-core-pom-template.xml"/>
-  <property name="hadoop-core.jar" location="${build.dir}/${core.final.name}.jar"/>
-  <property name="hadoop-test.pom" location="${ivy.dir}/hadoop-test-pom.xml"/>
-  <property name="hadoop-test-pom-template.xml" 
-    location="${ivy.dir}/hadoop-test-pom-template.xml" />
-  <property name="hadoop-test.jar" location="${build.dir}/${test.final.name}.jar"/>
-  <property name="hadoop-tools.pom" location="${ivy.dir}/hadoop-tools-pom.xml"/>
-  <property name="hadoop-tools-pom-template.xml" 
-    location="${ivy.dir}/hadoop-tools-pom-template.xml" />
-  <property name="hadoop-tools.jar" location="${build.dir}/${tools.final.name}.jar"/>
-  <property name="hadoop-examples.pom" location="${ivy.dir}/hadoop-examples-pom.xml"/>
-  <property name="hadoop-examples-pom-template.xml" 
-    location="${ivy.dir}/hadoop-examples-pom-template.xml"/>
-  <property name="hadoop-examples.jar" 
-    location="${build.dir}/${examples.final.name}.jar"/>
-  <property name="hadoop-streaming.pom" 
-    location="${ivy.dir}/hadoop-streaming-pom.xml"/>
-  <property name="hadoop-streaming-pom-template.xml" 
-    location="${ivy.dir}/hadoop-streaming-pom-template.xml"/>
-  <property name="hadoop-streaming.jar" 
-    location="${build.dir}/contrib/streaming/${streaming.final.name}.jar"/>
-  <property name="hadoop-client.pom"
-    location="${ivy.dir}/hadoop-client-pom.xml"/>
-  <property name="hadoop-client-pom-template.xml"
-    location="${ivy.dir}/hadoop-client-pom-template.xml"/>
-  <property name="hadoop-client.jar"
-    location="${build.dir}/${hadoop-client.final.name}.jar"/>
-  <property name="hadoop-minicluster.pom"
-    location="${ivy.dir}/hadoop-minicluster-pom.xml"/>
-  <property name="hadoop-minicluster-pom-template.xml"
-    location="${ivy.dir}/hadoop-minicluster-pom-template.xml"/>
-  <property name="hadoop-minicluster.jar"
-    location="${build.dir}/${hadoop-minicluster.final.name}.jar"/>
-   
-  <!--this is the naming policy for artifacts we want pulled down-->
-  <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="hadoop-[revision]-core.[ext]"/>
-
-  <!-- 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"/>
-  <property name="build.dir.eclipse-example-classes" value="${build.dir.eclipse}/classes-example"/>
-  <property name="build.dir.eclipse-tools-classes" value="${build.dir.eclipse}/classes-tools"/>
-  <property name="build.dir.eclipse-contrib-classes" value="${build.dir.eclipse}/classes-contrib"/>
-  <property name="build.dir.eclipse-test-resources" value="${build.dir.eclipse}/test-resources/"/>
-  <property name="build.dir.eclipse-test-resources-webapps" value="${build.dir.eclipse}/test-resources/webapps"/>
-
-  <!-- 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>
-
-  <!-- the normal classpath -->
-  <path id="classpath">
-    <pathelement location="${build.classes}"/>
-    <path refid="src.lib.classpath"/>
-    <pathelement location="${conf.dir}"/>
-  	<pathelement location="${hpswift.lib.dir}/hpswift.jar"/>
-  	<pathelement location="${lib.dir}/httpcore-4.2.1.jar"/>
-  	<pathelement location="${lib.dir}/jackson-all-1.9.9.jar"/>
-  	<pathelement location="${lib.dir}/httpclient-4.2.1.jar"/>
-  	
-  </path>
-
-  <path id="src.lib.classpath">
-    <fileset dir="${lib.dir}">
-      <include name="**/*.jar" />
-      <exclude name="**/excluded/" />
-    </fileset>
-    <path refid="ivy-common.classpath"/>
-  </path>
-
-  <path id="test.lib.classpath">
-    <fileset dir="${test.lib.dir}">
-      <include name="**/*.jar"/>
-      <exclude name="**/excluded/"/>
-    </fileset>
-  </path>
-
-  <!-- the unit test classpath: uses test.src.dir for configuration -->
-  <path id="test.classpath">
-    <pathelement location="${test.build.extraconf}"/>
-    <pathelement location="${test.build.classes}" />
-    <pathelement location="${test.src.dir}"/>
-    <pathelement location="${build.dir}"/>
-    <pathelement location="${build.examples}"/>
-    <pathelement location="${build.tools}"/>
-    <pathelement path="${clover.jar}"/>
-    <path refid="test.lib.classpath"/>
-    <pathelement location="${hadoop-core.jar}"/>
-    <path refid="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.tools}"/>
-    <mkdir dir="${build.src}"/>
-    <mkdir dir="${build.webapps}/task/WEB-INF"/>
-    <mkdir dir="${build.webapps}/job/WEB-INF"/>
-    <mkdir dir="${build.webapps}/history/WEB-INF"/>
-    <mkdir dir="${build.webapps}/hdfs/WEB-INF"/>
-    <mkdir dir="${build.webapps}/datanode/WEB-INF"/>
-    <mkdir dir="${build.webapps}/secondary/WEB-INF"/>
-    <mkdir dir="${build.examples}"/>
-    <mkdir dir="${build.anttasks}"/>
-    <mkdir dir="${build.dir}/c++"/>
- 
-    <mkdir dir="${test.build.dir}"/>
-    <mkdir dir="${test.build.classes}"/>
-    <mkdir dir="${test.build.testjar}"/>
-    <mkdir dir="${test.build.testshell}"/>
-    <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"/>
-      <fileset dir="${contrib.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" />
-      </fileset>
-    </copy>
-
-    <copy todir="${conf.dir}" verbose="true">
-      <fileset dir="${conf.dir}" includes="**/*.template"/>
-      <mapper type="glob" from="*.template" to="*"/>
-    </copy>
-
-    <copy todir="${contrib.dir}" verbose="true">
-      <fileset dir="${contrib.dir}" includes="**/*.template"/>
-      <mapper type="glob" from="*.template" to="*"/>
-    </copy>
-
-    <exec executable="sh">
-       <arg line="src/saveVersion.sh ${version} ${build.dir}"/>
-    </exec>
-	
-   <exec executable="sh">
-       <arg line="src/fixFontsPath.sh ${src.docs.cn}"/>
-   </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="${core.src.dir}/org/apache/hadoop/record/compiler/generated/rcc.jj"
-          outputdirectory="${core.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="${core.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">
-     <taskdef classname="org.apache.jasper.JspC" name="jsp-compile" >
-        <classpath refid="test.classpath"/>
-     </taskdef>
-    <!-- Compile Java files (excluding JSPs) checking warnings -->
-  	<property name="myclasspath" refid="classpath"/>
-	<!-- Emit the property to the ant console -->
-	<!--echo message="**Classpath*** = ${myclasspath}"/-->
-
-    <javac 
-     encoding="${build.encoding}" 
-     srcdir="${core.src.dir}"	
-     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>
-	
-  	<property name="myclasspath" refid="classpath"/>
-	<!-- Emit the property to the ant console -->
-	<echo message="Classpath = ${myclasspath}"/>
-	
-    <copy todir="${build.classes}">
-      <fileset dir="${core.src.dir}" includes="**/*.properties"/>
-      <fileset dir="${core.src.dir}" includes="core-default.xml"/>
-    </copy>
-     
-  </target>
-
-  <target name="compile-mapred-classes" depends="compile-core-classes,compile-hdfs-classes">
-    <taskdef classname="org.apache.jasper.JspC" name="jsp-compile" >
-       <classpath refid="classpath"/>
-    </taskdef>
-    <jsp-compile
-     uriroot="${src.webapps}/task"
-     outputdir="${build.src}"
-     package="org.apache.hadoop.mapred"
-     webxml="${build.webapps}/task/WEB-INF/web.xml">
-    </jsp-compile>
-
-    <!-- Compile Java files (excluding JSPs) checking warnings -->
-    <jsp-compile
-     uriroot="${src.webapps}/history"
-     outputdir="${build.src}"
-     package="org.apache.hadoop.mapred"
-     webxml="${build.webapps}/history/WEB-INF/web.xml">
-    </jsp-compile>
-    
-    <copy todir="${build.webapps}/job">
-      <fileset dir="${src.webapps}/job" includes="**/*.jsp"/>
-      <fileset dir="${src.webapps}/history" includes="**/*.jsp"/>
-    </copy>
-     
-    <jsp-compile
-     uriroot="${build.webapps}/job"
-     outputdir="${build.src}"
-     package="org.apache.hadoop.mapred"
-     webxml="${build.webapps}/job/WEB-INF/web.xml">
-    </jsp-compile>
-
-    <!-- Compile Java files (excluding JSPs) checking warnings -->
-    <javac 
-     encoding="${build.encoding}" 
-     srcdir="${mapred.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="${mapred.src.dir}" includes="**/*.properties"/>
-      <fileset dir="${mapred.src.dir}" includes="mapred-default.xml"/>
-    </copy>
-  </target>
-
-  <target name="compile-hdfs-classes" depends="compile-core-classes">
-    <jsp-compile
-     uriroot="${src.webapps}/hdfs"
-     outputdir="${build.src}"
-     package="org.apache.hadoop.hdfs.server.namenode"
-     webxml="${build.webapps}/hdfs/WEB-INF/web.xml">
-    </jsp-compile>
-
-    <jsp-compile
-     uriroot="${src.webapps}/datanode"
-     outputdir="${build.src}"
-     package="org.apache.hadoop.hdfs.server.datanode"
-     webxml="${build.webapps}/datanode/WEB-INF/web.xml">
-    </jsp-compile>
-
-    <!-- Compile Java files (excluding JSPs) checking warnings -->
-    <javac 
-     encoding="${build.encoding}" 
-     srcdir="${hdfs.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="${hdfs.src.dir}" includes="**/*.properties"/>
-     <fileset dir="${hdfs.src.dir}" includes="hdfs-default.xml"/>
-    </copy>
-  </target>
-
-  <target name="compile-tools" depends="init">
-    <javac 
-     encoding="${build.encoding}" 
-     srcdir="${tools.src}"
-     includes="org/apache/hadoop/**/*.java"
-     destdir="${build.tools}"
-     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.tools}">
-      <fileset 
-        dir="${tools.src}" 
-        includes="**/*.properties"
-      />
-    </copy>
-  </target>
-
-  <target name="compile-native">
-    <antcall target="compile-core-native">
-      <param name="compile.native" value="true"/>
-    </antcall> 
-  </target>
-
-  <target name="create-native-configure">
-    <exec executable="autoreconf" dir="${native.src.dir}" searchpath="yes" 
-          failonerror="yes">
-       <arg value="-if"/>
-    </exec>
-  </target>
-
-  <target name="compile-core-native" depends="create-native-configure, compile-core-classes"
-          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/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.JniBasedUnixGroupsMapping" />
-  	</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="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"/>
-    </exec>
-
-    <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-mapred-classes,
-  	compile-hdfs-classes,compile-core-native,compile-c++" 
-  	description="Compile core only">
-  </target>
-
-  <target name="compile-contrib" depends="compile-core,tools-jar,compile-c++-libhdfs">
-     <subant target="compile">
-        <property name="version" value="${version}"/>
-        <fileset file="${contrib.dir}/build.xml"/>
-     </subant>  	
-  </target>
-  
-  <target name="compile" depends="compile-core, compile-contrib, compile-ant-tasks, compile-tools" description="Compile core, contrib">
-  </target>
-
-  <target name="compile-examples" 
-          depends="compile-core,compile-tools,compile-c++-examples">
-    <javac 
-     encoding="${build.encoding}" 
-     srcdir="${examples.dir}"
-     includes="org/apache/hadoop/**/*.java"
-     destdir="${build.examples}"
-     debug="${javac.debug}"
-     optimize="${javac.optimize}"
-     target="${javac.version}"
-     source="${javac.version}"
-     deprecation="${javac.deprecation}">
-      <compilerarg line="${javac.args} ${javac.args.warnings}" />
-      <classpath>
-        <path refid="classpath"/>
-        <pathelement location="${build.tools}"/>
-      </classpath>
-    </javac>    
-  </target>
-
-  <!-- ================================================================== -->
-  <!-- Make hadoop.jar                                                     -->
-  <!-- ================================================================== -->
-  <!--                                                                    -->
-  <!-- ================================================================== -->
-  <target name="jar" depends="compile-core" description="Make hadoop.jar">
-    <tar compression="gzip" destfile="${build.classes}/bin.tgz">
-      <tarfileset dir="bin" mode="755"/>
-    </tar>
-    <property name="jar.properties.list"
-      value="commons-logging.properties, log4j.properties, hadoop-metrics.properties"/>
-    <jar jarfile="${build.dir}/${core.final.name}.jar"
-         basedir="${build.classes}">
-      <manifest>
-        <section name="org/apache/hadoop">
-          <attribute name="Implementation-Title" value="Hadoop"/>
-          <attribute name="Implementation-Version" value="${version}"/>
-          <attribute name="Implementation-Vendor" value="Apache"/>
-        </section>
-      </manifest>
-      <service type="org.apache.hadoop.security.token.TokenRenewer">
-        <provider classname="org.apache.hadoop.hdfs.DFSClient$Renewer"/>
-        <provider classname="org.apache.hadoop.mapred.JobClient$Renewer"/>
-        <provider classname="org.apache.hadoop.hdfs.security.token.block.BlockTokenIdentifier$Renewer"/>
-        <provider classname="org.apache.hadoop.mapreduce.security.token.JobTokenIdentifier$Renewer"/>
-        <provider classname="org.apache.hadoop.hdfs.HftpFileSystem$TokenManager"/>
-        <provider classname="org.apache.hadoop.hdfs.web.WebHdfsFileSystem$DtRenewer"/>
-      </service>
-      <fileset dir="${conf.dir}" includes="${jar.properties.list}" />
-      <fileset file="${jar.extra.properties.list}" />
-      <zipfileset dir="${build.webapps}" prefix="webapps"/>
-    </jar>
-    <mkdir dir="${build.dir}/empty"/>
-    <jar jarfile="${build.dir}/${hadoop-client.final.name}.jar"
-         basedir="${build.dir}/empty">
-      <manifest>
-        <section name="org/apache/hadoop">
-          <attribute name="Implementation-Title" value="Hadoop Client"/>
-          <attribute name="Implementation-Version" value="${version}"/>
-          <attribute name="Implementation-Vendor" value="Apache"/>
-        </section>
-      </manifest>
-    </jar>
-    <jar jarfile="${build.dir}/${hadoop-minicluster.final.name}.jar"
-         basedir="${build.dir}/empty">
-      <manifest>
-        <section name="org/apache/hadoop">
-          <attribute name="Implementation-Title" value="Hadoop Minicluster"/>
-          <attribute name="Implementation-Version" value="${version}"/>
-          <attribute name="Implementation-Vendor" value="Apache"/>
-        </section>
-      </manifest>
-    </jar>
-  </target>
-
-  <!-- ================================================================== -->
-  <!-- Make the Hadoop examples jar.                                      -->
-  <!-- ================================================================== -->
-  <!--                                                                    -->
-  <!-- ================================================================== -->
-  <target name="examples" depends="jar, compile-examples" description="Make the Hadoop examples jar.">
-    <macro-jar-examples
-      build.dir="${build.dir}"
-      basedir="${build.examples}">
-    </macro-jar-examples>
-  </target>
-
-  <macrodef name="macro-jar-examples">
-    <attribute name="build.dir" />
-    <attribute name="basedir" />
-    <sequential>
-      <jar jarfile="@{build.dir}/${examples.final.name}.jar"
-           basedir="@{basedir}">
-        <manifest>
-          <attribute name="Main-Class"
-                    value="org/apache/hadoop/examples/ExampleDriver"/>
-        </manifest>
-      </jar>
-    </sequential>
-  </macrodef>
-
-  <target name="tools-jar" depends="jar, compile-tools" 
-          description="Make the Hadoop tools jar.">
-    <jar jarfile="${build.dir}/${tools.final.name}.jar"
-         basedir="${build.tools}">
-      <manifest>
-        <attribute name="Main-Class" 
-                   value="org/apache/hadoop/examples/ExampleDriver"/>
-      </manifest>
-    </jar>
-  </target>
-
-  <!-- ================================================================== -->
-  <!-- Make the Hadoop metrics plugin dev/sdk jar. (for use outside Hadoop)              -->
-  <!-- ================================================================== -->
-  <!--                                                                    -->
-  <!-- ================================================================== -->
-  <target name="metrics.jar" depends="compile-core" description="Make the Hadoop metrics plugin dev/sdk jar. (for use outside Hadoop)">
-    <jar jarfile="${build.dir}/hadoop-metrics-dev-${version}.jar"
-         basedir="${build.classes}">
-      <include name="**/metrics2/*.class" />
-      <include name="**/metrics2/util/*.class" />
-    </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>
-  
-  <!-- ================================================================== -->
-  <!-- Compile test code                                                  --> 
-  <!-- ================================================================== -->
-  <target name="compile-core-test" depends="compile-examples, compile-tools, generate-test-records">
-    <javac 
-     encoding="${build.encoding}" 
-     srcdir="${test.generated.dir}"
-     includes="org/apache/hadoop/**/*.java"
-     destdir="${test.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}"
-     includes="org/apache/hadoop/**/*.java"
-     destdir="${test.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> 
-    <javac
-     encoding="${build.encoding}"
-     srcdir="${test.src.dir}/testjar"
-     includes="*.java"
-     destdir="${test.build.testjar}"
-     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>                                 
-    <delete file="${test.build.testjar}/testjob.jar"/> 
-    <jar jarfile="${test.build.testjar}/testjob.jar"
-     basedir="${test.build.testjar}">
-    </jar>
-    <javac 
-     encoding="${build.encoding}"
-     srcdir="${test.src.dir}/testshell"
-     includes="*.java"
-     destdir="${test.build.testshell}"
-     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>
-     <delete file="${test.build.testshell}/testshell.jar"/>
-     <jar jarfile="${test.build.testshell}/testshell.jar"
-      basedir="${test.build.testshell}">
-     </jar>
-                                                              
-    <delete dir="${test.cache.data}"/>
-    <mkdir dir="${test.cache.data}"/>
-    <delete dir="${test.debug.data}"/>
-    <mkdir dir="${test.debug.data}"/>
-    <copy file="${test.src.dir}/org/apache/hadoop/mapred/testscript.txt" todir="${test.debug.data}"/>
-    <copy file="${test.src.dir}/org/apache/hadoop/mapred/test.txt" todir="${test.cache.data}"/>
-    <copy file="${test.src.dir}/org/apache/hadoop/mapred/test.jar" todir="${test.cache.data}"/>
-    <copy file="${test.src.dir}/org/apache/hadoop/mapred/test.zip" todir="${test.cache.data}"/>
-    <copy file="${test.src.dir}/org/apache/hadoop/mapred/test.tar" todir="${test.cache.data}"/>
-    <copy file="${test.src.dir}/org/apache/hadoop/mapred/test.tgz" todir="${test.cache.data}"/>
-    <copy file="${test.src.dir}/org/apache/hadoop/mapred/test.tar.gz" todir="${test.cache.data}"/>
-    <copy file="${test.src.dir}/org/apache/hadoop/hdfs/hadoop-14-dfs-dir.tgz" todir="${test.cache.data}"/>
-    <copy file="${test.src.dir}/org/apache/hadoop/hdfs/hadoop-dfs-dir.txt" todir="${test.cache.data}"/>
-    <copy file="${test.src.dir}/org/apache/hadoop/cli/testConf.xml" todir="${test.cache.data}"/>
-    <copy file="${test.src.dir}/org/apache/hadoop/cli/clitest_data/data15bytes" todir="${test.cache.data}"/>
-    <copy file="${test.src.dir}/org/apache/hadoop/cli/clitest_data/data30bytes" todir="${test.cache.data}"/>
-    <copy file="${test.src.dir}/org/apache/hadoop/cli/clitest_data/data60bytes" todir="${test.cache.data}"/>
-    <copy file="${test.src.dir}/org/apache/hadoop/cli/clitest_data/data120bytes" todir="${test.cache.data}"/>
-  </target>
-
-  <!-- ================================================================== -->
-  <!-- Make hadoop-test.jar                                               -->
-  <!-- ================================================================== -->
-  <!--                                                                    -->
-  <!-- ================================================================== -->
-  <target name="jar-test" depends="jar,compile-core-test" description="Make hadoop-test.jar">
-    <jar jarfile="${build.dir}/${test.final.name}.jar"
-         basedir="${test.build.classes}">
-         <manifest>
-           <attribute name="Main-Class"
-                      value="org/apache/hadoop/test/AllTestDriver"/>
-          <section name="org/apache/hadoop">
-            <attribute name="Implementation-Title" value="Hadoop"/>
-            <attribute name="Implementation-Version" value="${version}"/>
-            <attribute name="Implementation-Vendor" value="Apache"/>
-          </section>
-         </manifest>
-    </jar>
-  </target>
-
-  <!-- ================================================================== -->
-  <!-- Fault injection customization section.
-       These targets ought to be copied over to other projects and modified
-       as needed -->
-  <!-- ================================================================== -->
-  <target name="-classes-compilation" depends="compile-core-classes,
-      compile-hdfs-classes, compile-mapred-classes, compile-core-test"/>
-  <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="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="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.testcase.fi">
-    <and>
-      <istrue value="${test.fault.inject}" />
-      <isset property="testcase" />
-    </and>
-  </condition>
-  <!-- ================================================================== -->
-  <!-- Define exclude lists for different kinds of testing -->
-  <!-- ================================================================== -->
-  <patternset id="empty.exclude.list.id" />
-    <patternset id="commit.smoke.exclude.list.id">
-    <excludesfile name="${test.commit.tests.file}"/>
-    <excludesfile name="${test.smoke.tests.file}"/>
-  </patternset>
-
-  <!-- ================================================================== -->
-  <!-- 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" default="" />
-    <attribute name="test.krb5.conf.filename" default="" />
-    <attribute name="exclude.list.id" default="empty.exclude.list.id" />
-    <sequential>
-      <delete file="${test.build.dir}/testsfailed"/>
-      <delete dir="@{test.dir}/data" />
-      <mkdir dir="@{test.dir}/data" />
-      <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">
-        <sysproperty key="test.build.data" value="${test.build.data}" />
-        <sysproperty key="test.tools.input.dir"
-                     value="${test.tools.input.dir}" />
-        <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="taskcontroller-path" value="${taskcontroller-path}" />
-        <sysproperty key="taskcontroller-ugi" value="${taskcontroller-ugi}" />
-        <sysproperty key="test.build.extraconf"
-                     value="@{test.dir}/extraconf" />
-        <sysproperty key="@{test.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}:${lib.file.path}:${snappy.lib}" />
-        <sysproperty key="install.c++.examples"
-                     value="${install.c++.examples}" />
-        <sysproperty key="testjar"
-                     value="@{test.dir}/testjar" />
-        <!-- System properties that are specifically set for system tests -->
-        <sysproperty key="test.system.hdrc.deployed.hadoopconfdir"
-                     value="@{hadoop.conf.dir.deployed}" />
-        <!-- 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}" />
-        <syspropertyset id="FaultProbabilityProperties">
-          <propertyref regex="fi.*" />
-        </syspropertyset>
-        <formatter type="${test.junit.output.format}" />
-        <batchtest todir="@{test.dir}" if="tests.notestcase">
-          <fileset dir="@{fileset.dir}"
-                   excludes="**/${test.exclude}.java aop/** system/**">
-            <patternset>
-              <includesfile name="@{test.file}"/>
-            </patternset>
-            <patternset refid="@{exclude.list.id}"/>
-          </fileset>
-        </batchtest>
-        <batchtest todir="${test.build.dir}" if="tests.notestcase.fi">
-          <fileset dir="${test.src.dir}/aop"
-                   includes="**/${test.include}.java"
-                   excludes="**/${test.exclude}.java" />
-        </batchtest>
-        <batchtest todir="@{test.dir}" if="tests.testcase">
-          <fileset dir="@{fileset.dir}"
-            includes="**/${testcase}.java" excludes="aop/** system/**"/>
-        </batchtest>
-        <batchtest todir="${test.build.dir}" if="tests.testcase.fi">
-          <fileset dir="${test.src.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="${test.src.dir}" includes="**/${testcase}.java" />
-        </batchtest>
-      </junit>
-      <antcall target="checkfailure"/>
-    </sequential>
-  </macrodef>
-
-  <target name="test-core" depends="test-commit, test-smoke,
-    test-core-excluding-commit-and-smoke,
-    test-core-all-withtestcaseonly, jar-test"
-    description="Run core unit tests">
-  </target>
-
-  <target name="test-core-all-withtestcaseonly" depends="jar-test" if="testcase">
-    <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="java.security.krb5.conf"
-                       test.krb5.conf.filename="${test.src.dir}/krb5.conf"
-                       >
-    </macro-test-runner>
-  </target>
-
-  <target name="test-core-excluding-commit-and-smoke" depends="jar-test"
-    unless="testcase">
-    <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="java.security.krb5.conf"
-                       test.krb5.conf.filename="${test.src.dir}/krb5.conf"
-                       exclude.list.id="commit.smoke.exclude.list.id"
-                       >
-    </macro-test-runner>
-  </target>   
-
-  <target name="test-commit" depends="jar-test" 
-    description="Run approx 10-minute set of unit tests prior to commiting"
-    unless="testcase">
-    <macro-test-runner test.file="${test.commit.tests.file}"
-                       classpath="${test.classpath.id}"
-                       test.dir="${test.build.dir}"
-                       fileset.dir="${test.src.dir}"
-                       test.krb5.conf="java.security.krb5.conf"
-                       test.krb5.conf.filename="${test.src.dir}/krb5.conf"
-                       >
-    </macro-test-runner>
-  </target>
-
-  <target name="test-smoke" depends="jar-test"
-    description="Run approx 30-minute set of functional tests prior to
-      guarantee that the build is not DOA" unless="testcase">
-    <macro-test-runner test.file="${test.smoke.tests.file}"
-                       classpath="${test.classpath.id}"
-                       test.dir="${test.build.dir}"
-                       fileset.dir="${test.src.dir}"
-                       test.krb5.conf="java.security.krb5.conf"
-                       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-contrib" depends="compile, compile-core-test" description="Run contrib unit tests">
-    <subant target="test">
-       <property name="version" value="${version}"/>
-       <property name="clover.jar" value="${clover.jar}"/>
-       <fileset file="${contrib.dir}/build.xml"/>
-    </subant> 
-  </target>
-	  
-  <target name="test" description="Run core, contrib, fault injection tests">
-    <delete file="${test.build.dir}/testsfailed"/>
-    <property name="continueOnFailure" value="true"/>
-    <antcall target="test-core"/>
-    <antcall target="test-contrib"/>
-    <available file="${test.build.dir}/testsfailed" property="testsfailed"/>
-    <fail if="testsfailed">Tests failed!</fail>
-  </target>
-
-  <!-- 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="${core.src.dir}" includes="**/*.java" excludes="**/generated/**"/>
-      <fileset dir="${mapred.src.dir}" includes="**/*.java" excludes="**/generated/**"/>
-      <fileset dir="${hdfs.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, tar" 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="${findbugs.jvmargs}">
-      <auxClasspath>
-        <fileset dir="${lib.dir}">
-          <include name="**/*.jar"/>
-        </fileset>
-        <fileset dir="${build.ivy.lib.dir}/${ant.project.name}/common">
-          <include name="**/*.jar"/>
-        </fileset>
-      </auxClasspath>
-      <sourcePath path="${core.src.dir}"/>
-      <sourcePath path="${mapred.src.dir}"/>
-      <sourcePath path="${hdfs.src.dir}"/>
-      <sourcePath path="${examples.dir}" />
-      <sourcePath path="${tools.src}" />
-      <sourcePath path="${basedir}/src/contrib/streaming/src/java" />
-      <class location="${build.dir}/${core.final.name}.jar" />
-      <class location="${build.dir}/${examples.final.name}.jar" />
-      <class location="${build.dir}/${tools.final.name}.jar" />
-      <class location="${build.dir}/contrib/streaming/${streaming.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">
-    <echo file="${build.dir}/hadoop.ent" append="false">
-      &lt;!ENTITY HadoopVersion "${version}"&gt; 
-    </echo>
-    <exec dir="${docs.src}" executable="${forrest.home}/bin/forrest"
-	  failonerror="true">
-      <env key="JAVA_HOME" value="${java5.home}"/>
-    </exec>
-    <copy todir="${build.docs}">
-      <fileset dir="${docs.src}/build/site/" />
-    </copy>
-    <copy file="${docs.src}/releasenotes.html" todir="${build.docs}"/>
-    <style basedir="${core.src.dir}" destdir="${build.docs}"
-           includes="core-default.xml" style="conf/configuration.xsl"/>
-    <style basedir="${hdfs.src.dir}" destdir="${build.docs}"
-           includes="hdfs-default.xml" style="conf/configuration.xsl"/>
-    <style basedir="${mapred.src.dir}" destdir="${build.docs}"
-           includes="mapred-default.xml" style="conf/configuration.xsl"/>
-    <antcall target="changes-to-html"/>
-  </target>
-
-  <target name="cn-docs" depends="forrest.check, init" 
-       description="Generate forrest-based Chinese documentation. To use, specify -Dforrest.home=&lt;base of Apache Forrest installation&gt; on the command line." 
-        if="forrest.home">
-    <exec dir="${src.docs.cn}" executable="${forrest.home}/bin/forrest" failonerror="true">
-      <env key="LANG" value="en_US.utf8"/>
-      <env key="JAVA_HOME" value="${java5.home}"/>
-    </exec>
-    <copy todir="${build.docs.cn}">
-      <fileset dir="${src.docs.cn}/build/site/" />
-    </copy>
-    <style basedir="${core.src.dir}" destdir="${build.docs.cn}"
-           includes="core-default.xml" style="conf/configuration.xsl"/>
-    <style basedir="${hdfs.src.dir}" destdir="${build.docs.cn}"
-           includes="hdfs-default.xml" style="conf/configuration.xsl"/>
-    <style basedir="${mapred.src.dir}" destdir="${build.docs.cn}"
-           includes="mapred-default.xml" style="conf/configuration.xsl"/>
-    <antcall target="changes-to-html"/>
-  </target>
-
-  <target name="forrest.check" unless="forrest.home" depends="java5.check">
-    <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="java5.check" unless="java5.home">
-    <fail message="'java5.home' is not defined.  Forrest requires Java 5.  Please pass -Djava5.home=&lt;base of Java 5 distribution&gt; to Ant on the command-line." />
-  </target>
-	
-  <target name="javadoc-dev" description="Generate javadoc for hadoop developers">
-    <mkdir dir="${build.javadoc.dev}"/>
-    <javadoc
-      overview="${core.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="${core.src.dir}"/>
-        <packageset dir="${mapred.src.dir}"/>
-        <packageset dir="${hdfs.src.dir}"/>        	
-    	<packageset dir="${examples.dir}"/>
-
-    	<packageset dir="src/contrib/streaming/src/java"/>
-    	<packageset dir="src/contrib/data_join/src/java"/>
-    	<packageset dir="src/contrib/index/src/java"/>
-
-        <link href="${javadoc.link.java}"/>
-
-        <classpath >
-          <path refid="classpath" />
-          <fileset dir="src/contrib/">
-            <include name="*/lib/*.jar" />
-          </fileset>
-          <pathelement path="${java.class.path}"/>
-        </classpath>
-
-    	<group title="Core" packages="org.apache.*"/>
-    	<group title="Examples" packages="org.apache.hadoop.examples*"/>
-
-       <group title="contrib: Streaming" packages="org.apache.hadoop.streaming*"/>
-       <group title="contrib: DataJoin" packages="org.apache.hadoop.contrib.utils.join*"/>
-       <group title="contrib: Index" packages="org.apache.hadoop.contrib.index*"/>
-
-    </javadoc>
-  </target>	
-
-  <target name="javadoc" depends="compile, ivy-retrieve-javadoc" description="Generate javadoc">
-    <mkdir dir="${build.javadoc}"/>
-    <javadoc
-      overview="${core.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="${core.src.dir}"/>
-        <packageset dir="${mapred.src.dir}"/>
-    	<packageset dir="${examples.dir}"/>
-
-    	<packageset dir="src/contrib/streaming/src/java"/>
-    	<packageset dir="src/contrib/data_join/src/java"/>
-    	<packageset dir="src/contrib/index/src/java"/>
-	<packageset dir="src/contrib/failmon/src/java/"/> 
-	
-        <link href="${javadoc.link.java}"/>
-
-        <classpath >
-          <path refid="classpath" />
-          <fileset dir="src/contrib/">
-            <include name="*/lib/*.jar" />
-          </fileset>
-          <path refid="javadoc-classpath"/>
-          <pathelement path="${java.class.path}"/>
-          <pathelement location="${build.tools}"/>
-        </classpath>
-
-    	<group title="Core" packages="org.apache.*"/>
-    	<group title="Examples" packages="org.apache.hadoop.examples*"/>
-
-       <group title="contrib: Streaming" packages="org.apache.hadoop.streaming*"/>
-       <group title="contrib: DataJoin" packages="org.apache.hadoop.contrib.utils.join*"/>
-       <group title="contrib: Index" packages="org.apache.hadoop.contrib.index*"/>
-       <group title="contrib: FailMon" packages="org.apache.hadoop.contrib.failmon*"/>
-    </javadoc>
-  </target>	
-
-  <target name="api-xml" depends="ivy-retrieve-jdiff,javadoc,write-null">
-    <javadoc maxmemory="${javadoc.maxmemory}">
-       <doclet name="jdiff.JDiff"
-               path="${jdiff.jar}:${xerces.jar}">
-         <param name="-apidir" value="${jdiff.xml.dir}"/>
-         <param name="-apiname" value="hadoop ${version}"/>
-       </doclet>
-       <packageset dir="src/core"/>
-       <packageset dir="src/mapred"/>
-       <packageset dir="src/tools"/>
-       <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/core,src/hdfs,src,mapred,src/tools"
-             destdir="${jdiff.build.dir}"
-	     sourceFiles="${jdiff.home}/Null.java"
-	     maxmemory="${javadoc.maxmemory}">
-       <doclet name="jdiff.JDiff"
-               path="${jdiff.jar}:${xerces.jar}">
-         <param name="-oldapi" value="hadoop ${jdiff.stable}"/>
-         <param name="-newapi" value="hadoop ${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"/>
-       </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, cn-docs, api-report, examples, tools-jar, jar-test, ant-tasks, package-librecordio"
-	  description="assembles multi-platform artifacts for distribution">
-    <delete dir="${dist.dir}"/>
-    <mkdir dir="${dist.dir}"/>
-    <mkdir dir="${dist.dir}/bin"/>
-    <mkdir dir="${dist.dir}/contrib"/>
-    <mkdir dir="${dist.dir}/docs"/>
-    <mkdir dir="${dist.dir}/docs/api"/>
-    <mkdir dir="${dist.dir}/docs/jdiff"/>
-    <mkdir dir="${dist.dir}/lib"/>
-    <mkdir dir="${dist.dir}/libexec"/>
-    <mkdir dir="${dist.dir}/sbin"/>
-    <mkdir dir="${dist.dir}/share/${name}/templates/conf"/>
-
-    <copy todir="${dist.dir}/share/${name}/templates/conf" includeEmptyDirs="false">
-      <fileset dir="${basedir}/src/packages/templates/conf">
-        <include name="*"/>
-      </fileset>
-    </copy>
-
-    <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>
-
-    <subant target="package">
-      <!--Pass down the version in case its needed again and the target
-      distribution directory so contribs know where to install to.-->
-      <property name="version" value="${version}"/>
-      <property name="dist.dir" value="${dist.dir}"/>
-      <fileset file="${contrib.dir}/build.xml"/>
-    </subant>  	
-
-    <copy todir="${dist.dir}/webapps">
-      <fileset dir="${build.webapps}"/>
-    </copy>
-
-    <copy todir="${dist.dir}"> 
-      <fileset file="${build.dir}/${name}-*-${version}.jar"/>
-    </copy>
-    
-    <copy todir="${dist.dir}/bin">
-      <fileset dir="bin"/>
-    </copy>
-
-    <copy todir="${dist.dir}/libexec">
-      <fileset dir="bin">
-        <include name="hadoop-config.sh"/>
-      </fileset>
-    </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}">
-      <fileset dir=".">
-        <include name="*.txt" />
-      </fileset>
-    </copy>
-
-    <copy todir="${dist.dir}/sbin">
-      <fileset dir="${basedir}/src/packages">
-        <include name="*.sh" />
-      </fileset>
-    </copy>
-
-    <copy todir="${dist.dir}/src" includeEmptyDirs="true">
-      <fileset dir="src" excludes="**/*.template **/docs/build/**/*"/>
-    </copy>
-  	
-    <copy todir="${dist.dir}/c++" includeEmptyDirs="false">
-      <fileset dir="${build.dir}/c++"/>
-    </copy>
-
-    <copy todir="${dist.dir}/" file="build.xml"/>
-
-    <subant target="task-controller">
-      <fileset dir="." includes="build.xml"/>
-    </subant>
-
-    <subant target="jsvc">
-      <fileset dir="." includes="build.xml"/>
-    </subant>
-
-    <chmod perm="ugo+x" type="file" parallel="false">
-        <fileset dir="${dist.dir}/bin"/>
-        <fileset dir="${dist.dir}/sbin"/>
-        <fileset dir="${dist.dir}/src/contrib/">
-          <include name="*/bin/*" />
-        </fileset>
-        <fileset dir="${dist.dir}/src/contrib/ec2/bin/image"/>
-    </chmod>
-    <chmod perm="ugo+x" type="file">
-        <fileset dir="${dist.dir}/src/c++/pipes/debug"/>
-    </chmod>
-
-  </target>
-
-  <!-- ================================================================== -->
-  <!-- Make release tarball                                               -->
-  <!-- ================================================================== -->
-  <target name="tar" depends="package" description="Make multi-platform release tarballs, both source and binary">
-    <!-- build source 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}/sbin/*" />
-          <exclude name="${final.name}/libexec/*" />
-          <exclude name="${final.name}/contrib/*/bin/*" />
-          <exclude name="${final.name}/src/contrib/ec2/bin/*" />
-          <exclude name="${final.name}/src/contrib/ec2/bin/image/*" />
-          <include name="${final.name}/**" />
-        </tarfileset>
-        <tarfileset dir="${build.dir}" mode="755">
-          <include name="${final.name}/bin/*" />
-          <include name="${final.name}/sbin/*" />
-          <include name="${final.name}/libexec/*" />
-          <include name="${final.name}/contrib/*/bin/*" />
-          <include name="${final.name}/src/contrib/ec2/bin/*" />
-          <include name="${final.name}/src/contrib/ec2/bin/image/*" />
-        </tarfileset>
-      </param.listofitems>
-    </macro_tar>
-    <!-- build multi-platform binary tarball -->
-    <macro_tar param.destfile="${build.dir}/${final.name}-bin.tar.gz">
-      <param.listofitems>
-        <tarfileset dir="${build.dir}" mode="664">
-          <exclude name="${final.name}/src/**" />
-          <exclude name="${final.name}/docs/**" />
-          <exclude name="${final.name}/bin/*" />
-          <exclude name="${final.name}/sbin/*" />
-          <exclude name="${final.name}/libexec/*" />
-          <exclude name="${final.name}/contrib/*/bin/*" />
-          <include name="${final.name}/**" />
-        </tarfileset>
-        <tarfileset dir="${build.dir}" mode="755">
-          <include name="${final.name}/bin/*" />
-          <include name="${final.name}/sbin/*" />
-          <include name="${final.name}/libexec/*" />
-          <include name="${final.name}/contrib/*/bin/*" />
-          <include name="${final.name}/src/contrib/ec2/bin/*" />
-          <include name="${final.name}/src/contrib/ec2/bin/image/*" />
-        </tarfileset>
-      </param.listofitems>
-    </macro_tar>
-  </target>
-
-  <target name="bin-package" depends="compile, jar, examples, tools-jar, jar-test, ant-tasks, package-librecordio" 
-		description="assembles platform-specific artifacts for binary targets">
-    <delete dir="${dist.dir}"/>
-    <mkdir dir="${dist.dir}"/>
-    <mkdir dir="${dist.dir}/bin"/>
-    <mkdir dir="${dist.dir}/etc/hadoop"/>
-    <mkdir dir="${dist.dir}/lib"/>
-    <mkdir dir="${dist.dir}/lib64"/>
-    <mkdir dir="${dist.dir}/libexec"/>
-    <mkdir dir="${dist.dir}/sbin"/>
-    <mkdir dir="${dist.dir}/share/${name}/contrib"/>
-    <mkdir dir="${dist.dir}/share/${name}/webapps"/>
-    <mkdir dir="${dist.dir}/share/${name}/templates/conf"/>
-
-    <copy todir="${dist.dir}/share/${name}/templates/conf" includeEmptyDirs="false">
-      <fileset dir="${basedir}/src/packages/templates/conf">
-        <include name="*"/>
-      </fileset>
-    </copy>
-
-    <copy todir="${dist.dir}/share/${name}/lib" includeEmptyDirs="false" flatten="true">
-      <fileset dir="${common.ivy.lib.dir}"/>
-    </copy>
-
-    <copy todir="${dist.dir}/share/${name}/lib" includeEmptyDirs="false">
-      <fileset dir="lib">
-        <exclude name="**/native/**"/>
-      </fileset>
-    </copy>
-
-    <condition property="lib.data.model" value="lib64" else="lib" >
-      <and>
-        <equals arg1="${sun.arch.data.model}" arg2="64" />
-      </and>
-    </condition>
-
-    <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.data.model}"/>
-      <env key="NATIVE_PLATFORM" value="${build.platform}" />
-      <arg line="${native.src.dir}/packageBinNativeHadoop.sh"/>
-    </exec>
-
-    <subant target="package">
-      <!--Pass down the version in case its needed again and the target
-      distribution directory so contribs know where to install to.-->
-      <property name="version" value="${version}"/>
-      <property name="dist.dir" value="${dist.dir}/share/${name}"/>
-      <fileset file="${contrib.dir}/build.xml"/>
-    </subant>  	
-
-    <copy todir="${dist.dir}/share/${name}/webapps">
-      <fileset dir="${build.webapps}"/>
-    </copy>
-
-    <copy todir="${dist.dir}/share/${name}"> 
-      <fileset file="${build.dir}/${name}-*-${version}.jar"/>
-    </copy>
-    
-    <copy file="bin/hadoop" todir="${dist.dir}/bin"/>
-
-    <copy todir="${dist.dir}/sbin">
-      <fileset dir="bin">
-        <include name="*"/>
-        <exclude name="hadoop"/>
-        <exclude name="hadoop-config.sh"/>
-      </fileset>
-    </copy>
-
-    <copy todir="${dist.dir}/libexec">
-      <fileset dir="bin">
-        <include name="hadoop-config.sh"/>
-      </fileset>
-    </copy>
-
-    <copy todir="${dist.dir}/etc/hadoop">
-      <fileset dir="${conf.dir}" excludes="**/*.template"/>
-    </copy>
-
-    <copy todir="${dist.dir}/share/doc/${name}">
-      <fileset dir=".">
-        <include name="*.txt" />
-      </fileset>
-    </copy>
-  	
-    <copy todir="${dist.dir}/sbin">
-      <fileset dir="${basedir}/src/packages">
-        <include name="*.sh" />
-      </fileset>
-    </copy>
-
-    <copy todir="${dist.dir}/include/${name}" includeEmptyDirs="false" flatten="true">
-      <fileset dir="${build.dir}/c++">
-        <include name="**/include/${name}/*"/>
-      </fileset>
-    </copy>
-
-    <copy todir="${dist.dir}/${lib.data.model}" includeEmptyDirs="false" flatten="true">
-      <fileset dir="${build.dir}/c++">
-        <include name="${build.platform}/lib/*"/>
-      </fileset>
-    </copy>
-
-    <subant target="task-controller">
-      <fileset dir="." includes="build.xml"/>
-    </subant>
-
-    <subant target="jsvc">
-      <fileset dir="." includes="build.xml"/>
-    </subant>
-
-    <chmod perm="ugo+x" type="file" parallel="false">
-        <fileset dir="${dist.dir}/bin"/>
-        <fileset dir="${dist.dir}/libexec"/>
-        <fileset dir="${dist.dir}/sbin"/>
-    </chmod>
-  </target>
-
-  <target name="binary-system" depends="bin-package, jar-system, jar-test-system"
-     description="make platform-specific system test package for deployment">
-    <copy todir="${system-test-build-dir}/${final.name}">
-      <fileset dir="${dist.dir}">
-      </fileset>
-    </copy>
-    <copy todir="${system-test-build-dir}/${final.name}" 
-      file="${system-test-build-dir}/${core.final.name}.jar" overwrite="true"/>
-    <copy todir="${system-test-build-dir}/${final.name}"
-      file="${system-test-build-dir}/${test.final.name}.jar" overwrite="true"/>
-    <macro_tar 
-      param.destfile="${system-test-build-dir}/${final.name}-${os-arch}-bin.tar.gz">
-        <param.listofitems>
-          <tarfileset dir="${system-test-build-dir}" mode="664">
-            <exclude name="${final.name}/bin/*" />
-            <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/*" />
-          </tarfileset>
-        </param.listofitems>
-      </macro_tar>
-  </target>
-  
-  <target name="binary" depends="bin-package" description="Make platform-specific binary tarball without source and documentation">
-    <macro_tar param.destfile="${build.dir}/${final.name}-${os-arch}-bin.tar.gz">
-      <param.listofitems>
-        <tarfileset dir="${build.dir}" mode="664">
-          <exclude name="${final.name}/bin/*" />
-          <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/*" />
-        </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" />
-    <macro_tar param.destfile="${package.buildroot}/SOURCES/${final.name}-script.tar.gz">
-      <param.listofitems>
-        <tarfileset dir="${basedir}/src/packages/rpm/init.d" mode="755">
-          <include name="*" />
-        </tarfileset>
-      </param.listofitems>
-    </macro_tar>
-    <copy todir="${package.buildroot}/SOURCES">
-      <fileset dir="${build.dir}">
-        <include name="${final.name}-${os-arch}-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="build.arch" value="${os-arch}" />
-          <token key="version" value="${hadoop.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>
-    <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="**/${name}*.rpm" />
-      </fileset>
-      <fileset dir="${package.buildroot}/SRPMS">
-        <include name="**/${name}*.rpm" />
-      </fileset>
-    </copy>
-    <delete dir="${package.buildroot}" quiet="true" verbose="false"/>
-  </target>
-
-  <target name="deb" depends="ant-tasks, bin-package" description="Make deb package">
-    <taskdef name="deb"
-           classname="org.vafer.jdeb.ant.DebAntTask">
-      <classpath refid="classpath" />
-    </taskdef>
-
-    <mkdir dir="${package.build.dir}/hadoop.control" />
-    <mkdir dir="${package.buildroot}/${package.prefix}/share/hadoop" />
-    <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="${hadoop.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}_${hadoop.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="sbin/*" />
-        <exclude name="libexec/*" />
-        <exclude name="contrib/*/bin/*" />
-        <exclude name="src/contrib/ec2/bin/*" />
-        <exclude name="src/contrib/ec2/bin/image/*" />
-        <exclude name="etc" />
-        <exclude name="etc/**" />
-        <include name="**" />
-      </tarfileset>
-      <tarfileset dir="${build.dir}/${final.name}" filemode="755" prefix="${package.prefix}">
-        <include name="bin/*" />
-        <include name="sbin/*" />
-        <include name="libexec/*" />
-        <include name="contrib/*/bin/*" />
-        <include name="src/contrib/ec2/bin/*" />
-        <include name="src/contrib/ec2/bin/image/*" />
-      </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>
-      <tarfileset dir="${basedir}/src/packages/deb/init.d" filemode="755" prefix="/etc/init.d">
-        <include name="**" />
-      </tarfileset>
-    </deb>
-
-    <copy todir="${build.dir}/" flatten="true">
-      <fileset dir="${package.buildroot}">
-        <include name="**/${name}*.deb" />
-      </fileset>
-    </copy>
-    <delete dir="${package.buildroot}" quiet="true" verbose="false"/>
-  </target>
-
-  <!-- ================================================================== -->
-  <!-- Perform audit activities for the release                           -->
-  <!-- ================================================================== -->
-  <target name="releaseaudit" depends="package,ivy-retrieve-releaseaudit" description="Release Audit activities">
-    <fail unless="rat.present" message="Failed to load class [${rat.reporting.classname}]."/>
-    <java classname="${rat.reporting.classname}" fork="true">
-      <classpath refid="releaseaudit-classpath"/>
-      <arg value="${build.dir}/${final.name}"/>
-    </java>
-  </target>
-
-  <!-- ================================================================== -->
-  <!-- Clean.  Delete the build files, and their directories              -->
-  <!-- ================================================================== -->
-  <target name="clean" depends="clean-contrib, clean-sign, clean-fi" description="Clean.  Delete the build files, and their directories">
-    <delete dir="${build.dir}"/>
-    <delete dir="${docs.src}/build"/>
-    <delete dir="${src.docs.cn}/build"/>
-    <delete dir="${package.buildroot}"/>
-    <delete file="${basedir}/ivy/hadoop-core-pom.xml"/>
-    <delete file="${basedir}/ivy/hadoop-test-pom.xml"/>
-    <delete file="${basedir}/ivy/hadoop-examples-pom.xml"/>
-    <delete file="${basedir}/ivy/hadoop-tools-pom.xml"/>
-    <delete file="${basedir}/ivy/hadoop-streaming-pom.xml"/>
-    <delete file="${basedir}/ivy/hadoop-client-pom.xml"/>
-    <delete file="${basedir}/ivy/hadoop-minicluster-pom.xml"/>
-  </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>
-
-
-  <!-- ================================================================== -->
-  <!-- Clean contrib target. For now, must be called explicitly           -->
-  <!-- Using subant instead of ant as a workaround for 30569              -->
-  <!-- ================================================================== -->
-  <target name="clean-contrib">
-     <subant target="clean">        
-        <fileset file="src/contrib/build.xml"/>
-     </subant>  	
-  </target>
-	
- <target name="test-c++-libhdfs" depends="compile-c++-libhdfs, compile-core" if="islibhdfs">
-    <delete dir="${test.libhdfs.dir}"/>
-    <mkdir dir="${test.libhdfs.dir}"/>
-    <mkdir dir="${test.libhdfs.dir}/logs"/>
-    <mkdir dir="${test.libhdfs.dir}/hdfs/name"/>
-
-    <exec dir="${build.c++.libhdfs}" executable="${make.cmd}" failonerror="true">
-        <env key="OS_NAME" value="${os.name}"/>
-        <env key="OS_ARCH" value="${os.arch}"/>
-        <env key="JVM_ARCH" value="${jvm.arch}"/>
-        <env key="LIBHDFS_BUILD_DIR" value="${build.c++.libhdfs}"/>
-        <env key="HADOOP_HOME" value="${basedir}"/>
-        <env key="HADOOP_CONF_DIR" value="${test.libhdfs.conf.dir}"/>
-        <env key="HADOOP_LOG_DIR" value="${test.libhdfs.dir}/logs"/>
-        <env key="LIBHDFS_SRC_DIR" value="${c++.libhdfs.src}"/>
-        <env key="LIBHDFS_INSTALL_DIR" value="${install.c++}/lib"/>  
-        <env key="LIB_DIR" value="${common.ivy.lib.dir}"/>
-		<arg value="test"/>
-    </exec>
-  </target>
-
-<!-- ================================================================== -->
-<!-- librecordio targets.                                               -->
-<!-- ================================================================== -->		
-
-  <target name="compile-librecordio" depends="init" if="librecordio" >
-     <mkdir dir="${build.librecordio}"/>
-     <exec dir="${librecordio.src}" executable="${make.cmd}" failonerror="true">
-        <env key="XERCESCROOT" value="${xercescroot}"/>
-        <env key="LIBRECORDIO_BUILD_DIR" value="${build.librecordio}"/>
-     </exec>
-  </target>
-  	
-  <target name="test-librecordio" depends="compile-librecordio, compile-core" if="librecordio">
-    <delete dir="${librecordio.test.dir}"/>
-    <mkdir dir="${librecordio.test.dir}"/>
-    <exec dir="${librecordio.src}/test" executable="${make.cmd}" failonerror="true">
-        <env key="HADOOP_HOME" value="${basedir}"/>
-	<env key="XERCESCROOT" value="${xercescroot}"/>
-        <env key="LIBRECORDIO_BUILD_DIR" value="${build.librecordio}"/> 	
-        <env key="LIBRECORDIO_TEST_DIR" value="${librecordio.test.dir}"/>
-      		<arg value="all"/>		
-    </exec>
-  </target>
-
-  <target name="package-librecordio" depends="compile-librecordio" if="librecordio">
-    <mkdir dir="${dist.dir}/lib/librecordio"/> 
-    <copy todir="${dist.dir}/lib/librecordio">
-       <fileset dir="${build.librecordio}" casesensitive="yes" followsymlinks="false">
-          <exclude name="**/tests/**"/>
-          <exclude name="*.so"/> 
-          <exclude name="*.o"/>
-       </fileset>
-    </copy>
-    <chmod perm="ugo+x" type="file">
-       <fileset dir="${dist.dir}/lib/librecordio"/>
-    </chmod>
-  </target>
- 
-  <target name="create-c++-configure" depends="init" if="compile.c++">
-    <exec executable="autoreconf" dir="${c++.utils.src}" searchpath="yes" 
-          failonerror="yes">
-       <arg value="-if"/>
-    </exec>
-    <exec executable="autoreconf" dir="${c++.pipes.src}" searchpath="yes" 
-          failonerror="yes">
-       <arg value="-if"/>
-    </exec>
-    <exec executable="autoreconf" dir="${c++.examples.pipes.src}" 
-          searchpath="yes" failonerror="yes">
-       <arg value="-if"/>
-    </exec>
-    <antcall target="create-c++-configure-libhdfs"/>
-  </target>
-   
-  <target name="create-c++-configure-libhdfs" depends="check-c++-libhdfs" if="islibhdfs">
-    <exec executable="autoreconf" dir="${c++.libhdfs.src}" 
-          searchpath="yes" failonerror="yes">
-       <arg value="-if"/>
-    </exec>
-  </target>
-
-  <target name="check-c++-makefiles" depends="init" if="compile.c++">
-    <condition property="need.c++.utils.makefile">
-       <not> <available file="${build.c++.utils}/Makefile"/> </not>
-    </condition>
-    <condition property="need.c++.pipes.makefile">
-       <not> <available file="${build.c++.pipes}/Makefile"/> </not>
-    </condition>
-    <condition property="need.c++.examples.pipes.makefile">
-       <not> <available file="${build.c++.examples.pipes}/Makefile"/> </not>
-    </condition>
-  </target>
-
-  <target name="check-c++-libhdfs">
-    <condition property="islibhdfs">
-      <and>
-        <isset property="compile.c++"/>
-        <isset property="libhdfs"/>
-      </and>
-    </condition>
-  </target>
-
-  <target name="check-c++-makefile-libhdfs" depends="init,check-c++-libhdfs" if="islibhdfs">
-    <condition property="need.c++.libhdfs.makefile">
-       <not> <available file="${build.c++.libhdfs}/Makefile"/> </not>
-    </condition>
-  </target>
-
-  <target name="create-c++-libhdfs-makefile" depends="check-c++-makefile-libhdfs" 
-                                           if="need.c++.libhdfs.makefile">
-    <mkdir dir="${build.c++.libhdfs}"/>
-    <chmod file="${c++.libhdfs.src}/configure" perm="ugo+x"/>
-    <exec executable="${c++.libhdfs.src}/configure" dir="${build.c++.libhdfs}"
-          failonerror="yes">
-      <env key="ac_cv_func_malloc_0_nonnull" value="yes"/>
-      <env key="JVM_ARCH" value="${jvm.arch}"/>
-      <arg value="--prefix=${install.c++}"/>
-    </exec>
-  </target>
-
-  <target name="create-c++-utils-makefile" depends="check-c++-makefiles" 
-                                           if="need.c++.utils.makefile">
-    <mkdir dir="${build.c++.utils}"/>
-    <chmod file="${c++.utils.src}/configure" perm="ugo+x"/>
-    <exec executable="${c++.utils.src}/configure" dir="${build.c++.utils}"
-          failonerror="yes">
-      <arg value="--prefix=${install.c++}"/>
-    </exec>
-  </target>
-
-  <target name="compile-c++-utils" depends="create-c++-utils-makefile"
-                                   if="compile.c++">
-    <exec executable="${make.cmd}" dir="${build.c++.utils}" searchpath="yes" 
-          failonerror="yes">
-      <arg  value="install"/>
-    </exec>
-  </target>
-
-  <target name="create-c++-pipes-makefile" depends="check-c++-makefiles" 
-                                           if="need.c++.pipes.makefile">
-    <mkdir dir="${build.c++.pipes}"/>
-    <chmod file="${c++.pipes.src}/configure" perm="ugo+x"/>
-    <exec executable="${c++.pipes.src}/configure" dir="${build.c++.pipes}"
-          failonerror="yes">
-      <arg value="--prefix=${install.c++}"/>
-    </exec>
-  </target>
-
-  <target name="compile-c++-pipes" 
-          depends="create-c++-pipes-makefile,compile-c++-utils"
-          if="compile.c++">
-    <exec executable="${make.cmd}" dir="${build.c++.pipes}" searchpath="yes" 
-          failonerror="yes">
-      <arg value="install"/>
-    </exec>
-  </target>
-
-  <target name="compile-c++" 
-          depends="create-c++-configure,compile-c++-pipes"/>
-
-  <target name="create-c++-examples-pipes-makefile" 
-          depends="check-c++-makefiles" 
-          if="need.c++.examples.pipes.makefile">
-    <mkdir dir="${build.c++.examples.pipes}"/>
-    <chmod file="${c++.examples.pipes.src}/configure" perm="ugo+x"/>
-    <exec executable="${c++.examples.pipes.src}/configure" 
-          dir="${build.c++.examples.pipes}"
-          failonerror="yes">
-      <arg value="--prefix=${install.c++.examples}"/>
-      <arg value="--with-hadoop-utils=${install.c++}"/>
-      <arg value="--with-hadoop-pipes=${install.c++}"/>
-    </exec>
-  </target>
-
-  <target name="compile-c++-examples-pipes" 
-          depends="create-c++-examples-pipes-makefile,compile-c++-pipes"
-          if="compile.c++">
-    <exec executable="${make.cmd}" dir="${build.c++.examples.pipes}" searchpath="yes" 
-          failonerror="yes">
-      <arg  value="install"/>
-    </exec>
-  </target>
-
-  <target name="compile-c++-examples" 
-          depends="compile-c++-examples-pipes"/>
-
-  <target name="compile-c++-libhdfs" depends="create-c++-libhdfs-makefile" if="islibhdfs">
-    <exec executable="${make.cmd}" dir="${build.c++.libhdfs}" searchpath="yes"
-          failonerror="yes">
-      <env key="ac_cv_func_malloc_0_nonnull" value="yes"/>
-      <env key="JVM_ARCH" value="${jvm.arch}"/>
-      <arg value="install"/>
-    </exec>
-  </target>
-
-
-
-  <target name="compile-ant-tasks" depends="compile-core">
-    <javac
-        encoding="${build.encoding}"
-        srcdir="${anttasks.dir}"
-        includes="org/apache/hadoop/ant/**/*.java"
-        destdir="${build.anttasks}"
-        debug="${javac.debug}"
-        optimize="${javac.optimize}"
-        target="${javac.version}"
-        source="${javac.version}"
-        deprecation="${javac.deprecation}">
-        <compilerarg line="${javac.args}"/>
-        <classpath refid="classpath"/>
-    </javac>
-  </target>
-
-  <target name="ant-tasks" depends="jar, compile-ant-tasks">
-    <copy file="${anttasks.dir}/org/apache/hadoop/ant/antlib.xml"
-          todir="${build.anttasks}/org/apache/hadoop/ant"/>
-    <jar destfile="${build.dir}/${ant.final.name}.jar">
-      <fileset dir="${build.anttasks}"/>
-    </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="core/**/* tools/**/* hdfs/**/* mapred/**/*"/>
-     <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}"/>
-    <arg value="${java5.home}"/>
-  </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="${python.home}"/>
-    <arg value="${basedir}"/>
-    <arg value="${trigger.url}"/>
-    <arg value="${jira.passwd}"/>
-    <arg value="${java5.home}"/>
-  </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">
-	     <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="${src.dir}/core"
-                output="${build.dir.eclipse-main-classes}" />
-        <source path="${src.dir}/hdfs"
-                output="${build.dir.eclipse-main-classes}" />
-        <source path="${src.dir}/mapred"
-                output="${build.dir.eclipse-main-classes}" />
-        <source path="${test.src.dir}/"
-                output="${build.dir.eclipse-test-classes}" 
-                excluding="aop/|mapred/|system/|bin/|ddl/|lib/|tools/"/>
-        <source path="${test.src.dir}/aop"
-                output="${build.dir.eclipse-test-classes}" />
-        <source path="${test.generated.dir}"
-                output="${build.dir.eclipse-test-generated-classes}" />
-        <source path="${tools.src}"
-                output="${build.dir.eclipse-tools-classes}" />
-        <source path="${examples.dir}"
-                output="${build.dir.eclipse-example-classes}" />
-        <source path="${contrib.dir}/data_join/src/examples"
-                output="${build.dir.eclipse-contrib-classes}/data_join/examples" />
-        <source path="${contrib.dir}/data_join/src/test"
-                output="${build.dir.eclipse-contrib-classes}/data_join/test" />
-        <source path="${contrib.dir}/data_join/src/java"
-                output="${build.dir.eclipse-contrib-classes}/data_join/java" />
-        <source path="${contrib.dir}/streaming/src/java"
-                output="${build.dir.eclipse-contrib-classes}/streaming/main" />
-        <source path="${contrib.dir}/streaming/src/test"
-                output="${build.dir.eclipse-contrib-classes}/streaming/test" 
-                excluding="system/"/>
-        <source path="${contrib.dir}/vaidya/src/java"
-                output="${build.dir.eclipse-contrib-classes}/vaidya/main" />
-        <source path="${contrib.dir}/fairscheduler/src/java"
-                output="${build.dir.eclipse-contrib-classes}/fairscheduler/main" />
-        <source path="${contrib.dir}/fairscheduler/src/test"
-                output="${build.dir.eclipse-contrib-classes}/fairscheduler/test" />
-        <source path="${contrib.dir}/gridmix/src/java"
-                output="${build.dir.eclipse-contrib-classes}/gridmix/main" />
-        <source path="${contrib.dir}/gridmix/src/test"
-                output="${build.dir.eclipse-contrib-classes}/gridmix/test"
-                excluding="system/"/>
-       <source path="${contrib.dir}/capacity-scheduler/src/java"
-                output="${build.dir.eclipse-contrib-classes}/capacity-scheduler/main" />
-        <source path="${contrib.dir}/capacity-scheduler/src/test"
-                output="${build.dir.eclipse-contrib-classes}/capacity-scheduler/test" />
-        <output path="${build.dir.eclipse-main-classes}" />
-        <library pathref="src.lib.classpath" exported="false" />
-        <library pathref="test.lib.classpath" exported="false" />
-        <variable path="ANT_HOME/lib/ant.jar" exported="false" />
-        <library path="${conf.dir}" exported="false" />
-        <library path="${build.dir.eclipse-test-resources}" exported="false" />
-      </classpath>
-    </eclipse>
-    <copy todir="." overwrite="true">
-      <fileset dir=".eclipse.templates">
-        <exclude name="**/README.txt"/>
-      </fileset>
-      <filterset>
-        <filter token="PROJECT" value="${eclipse.project}"/>
-      </filterset>
-    </copy>
-    <!-- copy all of the jsp and static files -->
-    <copy todir="${build.dir.eclipse-test-resources-webapps}">
-      <fileset dir="${build.webapps}">
-      </fileset>
-    </copy>
-  </target>
-
-  <target name="ivy-init-dirs">
-    <mkdir dir="${build.ivy.dir}" />
-    <mkdir dir="${build.ivy.lib.dir}" />
-    <mkdir dir="${build.ivy.report.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>
-
-
-  <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'/>
-  </target>
-
-  <target name="ivy-resolve" depends="ivy-init">
-    <ivy:resolve settingsRef="${ant.project.name}.ivy.settings"/>
-  </target>
-
-  <target name="ivy-resolve-javadoc" depends="ivy-init">
-    <ivy:resolve settingsRef="${ant.project.name}.ivy.settings" conf="javadoc"/>
-  </target>
-
-  <target name="ivy-resolve-releaseaudit" depends="ivy-init">
-    <ivy:resolve settingsRef="${ant.project.name}.ivy.settings" conf="releaseaudit"/>
-  </target>
-
-  <target name="ivy-resolve-test" depends="ivy-init">
-    <ivy:resolve settingsRef="${ant.project.name}.ivy.settings" conf="test" />
-  </target>
-
-  <target name="ivy-resolve-common" depends="ivy-init">
-    <ivy:resolve settingsRef="${ant.project.name}.ivy.settings" conf="common" />
-  </target>
-
-  <target name="ivy-resolve-jdiff" depends="ivy-init">
-    <ivy:resolve settingsRef="${ant.project.name}.ivy.settings" conf="jdiff" />
-  </target>
-
-  <target name="ivy-resolve-checkstyle" depends="ivy-init">
-    <ivy:resolve settingsRef="${ant.project.name}.ivy.settings" conf="checkstyle"/>
-  </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}"/>
-  </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}"/>
-    <ivy:cachepath pathid="checkstyle-classpath" conf="checkstyle"/>
-  </target>
-
-  <target name="ivy-retrieve-jdiff" depends="ivy-resolve-jdiff"
-    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}"/>
-    <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}"/>
-    <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}"/>
-    <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}"/>
-    <ivy:cachepath pathid="ivy-common.classpath" conf="common"/>
-  </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}" />
-    <ivy:cachepath pathid="releaseaudit-classpath" conf="releaseaudit"/>
-    <available classname="${rat.reporting.classname}" 
-      classpathref="releaseaudit-classpath" property="rat.present" value="true"/>
-  </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>
-
-  <target name="ant-task-download" description="To download mvn-ant-task">
-    <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,bin-package,set-version"
-     description="To install hadoop core and test jars to local filesystem's m2 cache">
-     <artifact:pom file="${hadoop-core.pom}" id="hadoop.core"/>
-     <artifact:pom file="${hadoop-test.pom}" id="hadoop.test"/>
-     <artifact:pom file="${hadoop-examples.pom}" id="hadoop.examples"/>
-     <artifact:pom file="${hadoop-tools.pom}" id="hadoop.tools"/>
-     <artifact:pom file="${hadoop-streaming.pom}" id="hadoop.streaming"/>
-     <artifact:pom file="${hadoop-client.pom}" id="hadoop.client"/>
-     <artifact:pom file="${hadoop-minicluster.pom}" id="hadoop.minicluster"/>
-
-     <artifact:install file="${hadoop-core.jar}">
-        <pom refid="hadoop.core"/>
-     </artifact:install>
-     <artifact:install file="${hadoop-test.jar}">
-        <pom refid="hadoop.test"/>
-     </artifact:install>
-     <artifact:install file="${hadoop-tools.jar}">
-        <pom refid="hadoop.tools"/>
-     </artifact:install>
-     <artifact:install file="${hadoop-examples.jar}">
-        <pom refid="hadoop.examples"/>
-     </artifact:install>
-     <artifact:install file="${hadoop-streaming.jar}">
-        <pom refid="hadoop.streaming"/>
-     </artifact:install>
-     <artifact:install file="${hadoop-client.jar}">
-        <pom refid="hadoop.client"/>
-     </artifact:install>
-     <artifact:install file="${hadoop-minicluster.jar}">
-        <pom refid="hadoop.minicluster"/>
-     </artifact:install>
-  </target>
-
-  <target name="mvn-deploy" depends="mvn-taskdef, bin-package, set-version, signanddeploy, simpledeploy"
-     description="To deploy hadoop core and test jar's to apache maven repository"/>
-
-  <target name="signanddeploy" if="staging" depends="sign">
-     <artifact:pom file="${hadoop-core.pom}" id="hadoop.core"/>
-     <artifact:pom file="${hadoop-test.pom}" id="hadoop.core.test"/>
-     <artifact:pom file="${hadoop-examples.pom}" id="hadoop.examples"/>
-     <artifact:pom file="${hadoop-tools.pom}" id="hadoop.tools"/>
-     <artifact:pom file="${hadoop-streaming.pom}" id="hadoop.streaming"/>
-     <artifact:pom file="${hadoop-client.pom}" id="hadoop.client"/>
-     <artifact:pom file="${hadoop-minicluster.pom}" id="hadoop.minicluster"/>
-     <artifact:install-provider artifactId="wagon-http"
-       version="${wagon-http.version}"/>
-     <artifact:deploy file="${hadoop-core.jar}">
-         <remoteRepository id="apache.staging.https" url="${asfstagingrepo}"/>
-         <pom refid="hadoop.core"/>
-         <attach file="${hadoop-core.jar}.asc" type="jar.asc"/>
-         <attach file="${hadoop-core.pom}.asc" type="pom.asc"/>
-     </artifact:deploy>
-     <artifact:deploy file="${hadoop-test.jar}">
-         <remoteRepository id="apache.staging.https" url="${asfstagingrepo}"/> 
-         <pom refid="hadoop.core.test"/>
-         <attach file="${hadoop-test.jar}.asc" type="jar.asc"/>
-         <attach file="${hadoop-test.pom}.asc" type="pom.asc"/>
-     </artifact:deploy>
-     <artifact:deploy file="${hadoop-tools.jar}">
-         <remoteRepository id="apache.staging.https" url="${asfstagingrepo}"/> 
-         <pom refid="hadoop.tools"/>
-         <attach file="${hadoop-tools.jar}.asc" type="jar.asc"/>
-         <attach file="${hadoop-tools.pom}.asc" type="pom.asc"/>
-     </artifact:deploy>
-     <artifact:deploy file="${hadoop-examples.jar}">
-         <remoteRepository id="apache.staging.https" url="${asfstagingrepo}"/> 
-         <pom refid="hadoop.examples"/>
-         <attach file="${hadoop-examples.jar}.asc" type="jar.asc"/>
-         <attach file="${hadoop-examples.pom}.asc" type="pom.asc"/>
-     </artifact:deploy>
-     <artifact:deploy file="${hadoop-streaming.jar}">
-         <remoteRepository id="apache.staging.https" url="${asfstagingrepo}"/> 
-         <pom refid="hadoop.streaming"/>
-         <attach file="${hadoop-streaming.jar}.asc" type="jar.asc"/>
-         <attach file="${hadoop-streaming.pom}.asc" type="pom.asc"/>
-     </artifact:deploy>
-     <artifact:deploy file="${hadoop-client.jar}">
-         <remoteRepository id="apache.staging.https" url="${asfstagingrepo}"/>
-         <pom refid="hadoop.client"/>
-         <attach file="${hadoop-client.jar}.asc" type="jar.asc"/>
-         <attach file="${hadoop-client.pom}.asc" type="pom.asc"/>
-     </artifact:deploy>
-     <artifact:deploy file="${hadoop-minicluster.jar}">
-         <remoteRepository id="apache.minicluster.https" url="${asfstagingrepo}"/>
-         <pom refid="hadoop.minicluster"/>
-         <attach file="${hadoop-minicluster.jar}.asc" type="jar.asc"/>
-         <attach file="${hadoop-minicluster.pom}.asc" type="pom.asc"/>
-     </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-core.jar}" 
-     output.file="${hadoop-core.jar}.asc" gpg.passphrase="${gpg.passphrase}"/>
-    <sign-artifact input.file="${hadoop-test.jar}" 
-     output.file="${hadoop-test.jar}.asc" gpg.passphrase="${gpg.passphrase}"/>
-    <sign-artifact input.file="${hadoop-tools.jar}" 
-     output.file="${hadoop-tools.jar}.asc" gpg.passphrase="${gpg.passphrase}"/>
-    <sign-artifact input.file="${hadoop-examples.jar}" 
-     output.file="${hadoop-examples.jar}.asc" gpg.passphrase="${gpg.passphrase}"/>
-    <sign-artifact input.file="${hadoop-streaming.jar}" 
-     output.file="${hadoop-streaming.jar}.asc" gpg.passphrase="${gpg.passphrase}"/>
-    <sign-artifact input.file="${hadoop-client.jar}" 
-     output.file="${hadoop-client.jar}.asc" gpg.passphrase="${gpg.passphrase}"/>
-    <sign-artifact input.file="${hadoop-minicluster.jar}" 
-     output.file="${hadoop-minicluster.jar}.asc" gpg.passphrase="${gpg.passphrase}"/>
-    <sign-artifact input.file="${hadoop-core.pom}" 
-     output.file="${hadoop-core.pom}.asc" gpg.passphrase="${gpg.passphrase}"/>
-    <sign-artifact input.file="${hadoop-test.pom}" 
-     output.file="${hadoop-test.pom}.asc" gpg.passphrase="${gpg.passphrase}"/>
-    <sign-artifact input.file="${hadoop-tools.pom}" 
-     output.file="${hadoop-tools.pom}.asc" gpg.passphrase="${gpg.passphrase}"/>
-    <sign-artifact input.file="${hadoop-examples.pom}" 
-     output.file="${hadoop-examples.pom}.asc" gpg.passphrase="${gpg.passphrase}"/>
-    <sign-artifact input.file="${hadoop-streaming.pom}" 
-     output.file="${hadoop-streaming.pom}.asc" gpg.passphrase="${gpg.passphrase}"/>
-    <sign-artifact input.file="${hadoop-client.pom}"
-     output.file="${hadoop-client.pom}.asc" gpg.passphrase="${gpg.passphrase}"/>
-    <sign-artifact input.file="${hadoop-minicluster.pom}"
-     output.file="${hadoop-minicluster.pom}.asc" gpg.passphrase="${gpg.passphrase}"/>
-  </target>
-
-  <target name="simpledeploy" unless="staging">
-     <artifact:pom file="${hadoop-core.pom}" id="hadoop.core"/>
-     <artifact:pom file="${hadoop-test.pom}" id="hadoop.test"/>
-     <artifact:pom file="${hadoop-examples.pom}" id="hadoop.examples"/>
-     <artifact:pom file="${hadoop-tools.pom}" id="hadoop.tools"/>
-     <artifact:pom file="${hadoop-streaming.pom}" id="hadoop.streaming"/>
-     <artifact:pom file="${hadoop-client.pom}" id="hadoop.client"/>
-     <artifact:pom file="${hadoop-minicluster.pom}" id="hadoop.minicluster"/>
-
-     <artifact:install-provider artifactId="wagon-http" version="${wagon-http.version}"/>
-     <artifact:deploy file="${hadoop-core.jar}">
-         <remoteRepository id="apache.snapshots.https" url="${asfsnapshotrepo}"/>
-         <pom refid="hadoop.core"/>
-     </artifact:deploy>
-     <artifact:deploy file="${hadoop-test.jar}">
-         <remoteRepository id="apache.snapshots.https" url="${asfsnapshotrepo}"/>
-         <pom refid="hadoop.test"/>
-     </artifact:deploy> 
-     <artifact:deploy file="${hadoop-examples.jar}">
-         <remoteRepository id="apache.snapshots.https" url="${asfsnapshotrepo}"/>
-         <pom refid="hadoop.examples"/>
-     </artifact:deploy>
-     <artifact:deploy file="${hadoop-tools.jar}">
-         <remoteRepository id="apache.snapshots.https" url="${asfsnapshotrepo}"/>
-         <pom refid="hadoop.tools"/>
-     </artifact:deploy>
-     <artifact:deploy file="${hadoop-streaming.jar}">
-         <remoteRepository id="apache.snapshots.https" url="${asfsnapshotrepo}"/>
-         <pom refid="hadoop.streaming"/>
-     </artifact:deploy>
-     <artifact:deploy file="${hadoop-client.jar}">
-         <remoteRepository id="apache.snapshots.https" url="${asfsnapshotrepo}"/>
-         <pom refid="hadoop.client"/>
-     </artifact:deploy>
-     <artifact:deploy file="${hadoop-minicluster.jar}">
-         <remoteRepository id="apache.snapshots.https" url="${asfsnapshotrepo}"/>
-         <pom refid="hadoop.minicluster"/>
-     </artifact:deploy>
-  </target>
-
-  <target name="set-version">
-    <delete file="${hadoop-core.pom}"/>
-    <delete file="${hadoop-test.pom}"/>
-    <delete file="${hadoop-examples.pom}"/>
-    <delete file="${hadoop-tools.pom}"/>
-    <delete file="${hadoop-streaming.pom}"/>
-    <delete file="${hadoop-client.pom}"/>
-    <delete file="${hadoop-minicluster.pom}"/>
-    <copy file="${hadoop-core-pom-template.xml}" tofile="${hadoop-core.pom}"/>
-    <copy file="${hadoop-test-pom-template.xml}" tofile="${hadoop-test.pom}"/>
-    <copy file="${hadoop-examples-pom-template.xml}" tofile="${hadoop-examples.pom}"/>
-    <copy file="${hadoop-tools-pom-template.xml}" tofile="${hadoop-tools.pom}"/>
-    <copy file="${hadoop-streaming-pom-template.xml}" tofile="${hadoop-streaming.pom}"/>
-    <copy file="${hadoop-client-pom-template.xml}" tofile="${hadoop-client.pom}"/>
-    <copy file="${hadoop-minicluster-pom-template.xml}" tofile="${hadoop-minicluster.pom}"/>
-    <replaceregexp byline="true">
-      <regexp pattern="@version"/>
-      <substitution expression="${version}"/>
-      <fileset dir="${basedir}/ivy">
-        <include name="hadoop-core-pom.xml"/>
-        <include name="hadoop-test-pom.xml"/>
-        <include name="hadoop-tools-pom.xml"/>
-        <include name="hadoop-examples-pom.xml"/>
-        <include name="hadoop-streaming-pom.xml"/>
-        <include name="hadoop-client-pom.xml"/>
-        <include name="hadoop-minicluster-pom.xml"/>
-      </fileset>
-    </replaceregexp>
-  </target>
-
-  <!-- taskcontroller targets -->
-  <target name="task-controller" depends="init">
-    <exec executable="autoreconf" 
-          dir="${c++.task-controller.src}"
-          searchpath="yes" failonerror="yes">
-      <arg value="-i"/>
-    </exec>
-    <mkdir dir="${build.c++.task-controller}" />
-    <exec executable="/bin/sh"
-          dir="${build.c++.task-controller}">
-      <arg value="${c++.task-controller.src}/configure"/>
-      <arg value="--prefix=${task-controller.prefix.dir}"/>
-      <env key="CFLAGS" 
-           value="-DHADOOP_CONF_DIR=${hadoop.conf.dir}"/>
-    </exec>
-    <!-- delete main in case HADOOP_CONF_DIR is different -->
-    <delete file="${build.c++.task-controller}/impl/main.o"
-            quiet="true" failonerror="false"/>
-    <exec executable="make"
-          dir="${build.c++.task-controller}"
-          searchpath="yes" failonerror="yes">
-      <arg value="install"/>
-    </exec>
-  </target>
-
-  <target name="test-task-controller" depends="init,task-controller">
-    <exec executable="make"
-          dir="${build.c++.task-controller}"
-          searchpath="yes" failonerror="yes">
-      <arg value="check"/>
-    </exec>
-  </target>
-
-  <!-- end of task-controller targets -->
-
-  <target name="jsvc" >
-    <mkdir dir="${jsvc.build.dir}" />
-    <get src="${jsvc.location}" dest="${jsvc.build.dir}/${jsvc.dest.name}" />
-
-    <untar compression="gzip" src="${jsvc.build.dir}/${jsvc.dest.name}" dest="${jsvc.build.dir}" />
-
-    <copy file="${jsvc.build.dir}/jsvc" toFile="${jsvc.install.dir}/jsvc.${os.arch}" verbose="true" />
-    <chmod perm="ugo+x" type="file">
-      <fileset file="${jsvc.install.dir}/jsvc.${os.arch}"/>
-    </chmod>
- </target>
-
-</project>
diff --git a/hadoop-swiftn-driver/conf/core-default.xml b/hadoop-swiftn-driver/conf/core-default.xml
deleted file mode 100644
index 6025e56..0000000
--- a/hadoop-swiftn-driver/conf/core-default.xml
+++ /dev/null
@@ -1,519 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
-
-<!-- Do not modify this file directly.  Instead, copy entries that you -->
-<!-- wish to modify from this file into core-site.xml and change them -->
-<!-- there.  If core-site.xml does not already exist, create it.      -->
-
-<configuration>
-
-<!--- global properties -->
-
-<property>
-  <name>hadoop.tmp.dir</name>
-  <value>/tmp/hadoop-${user.name}</value>
-  <description>A base for other temporary directories.</description>
-</property>
-
-<property>
-  <name>hadoop.native.lib</name>
-  <value>true</value>
-  <description>Should native hadoop libraries, if present, be used.</description>
-</property>
-
-<property>
-  <name>hadoop.http.filter.initializers</name>
-  <value></value>
-  <description>A comma separated list of class names. Each class in the list 
-  must extend org.apache.hadoop.http.FilterInitializer. The corresponding 
-  Filter will be initialized. Then, the Filter will be applied to all user 
-  facing jsp and servlet web pages.  The ordering of the list defines the 
-  ordering of the filters.</description>
-</property>
-
- <property>
-  <name>hadoop.security.group.mapping</name>
-  <value>org.apache.hadoop.security.ShellBasedUnixGroupsMapping</value>
-  <description>Class for user to group mapping (get groups for a given user)
-  </description>
-</property>
-
-<property>
-  <name>hadoop.security.authorization</name>
-  <value>false</value>
-  <description>Is service-level authorization enabled?</description>
-</property>
-
-<property>
-  <name>hadoop.security.authentication</name>
-  <value>simple</value>
-  <description>Possible values are simple (no authentication), and kerberos
-  </description>
-</property>
-
-<property>
-  <name>hadoop.security.token.service.use_ip</name>
-  <value>true</value>
-  <description>Controls whether tokens always use IP addresses.  DNS changes
-  will not be detected if this option is enabled.  Existing client connections
-  that break will always reconnect to the IP of the original host.  New clients
-  will connect to the host's new IP but fail to locate a token.  Disabling
-  this option will allow existing and new clients to detect an IP change and
-  continue to locate the new host's token.
-  </description>
-</property>
-
-<!--
-<property>
-  <name>hadoop.security.service.user.name.key</name>
-  <value></value>
-  <description>Name of the kerberos principal of the user that owns
-  a given service daemon
-  </description>
-</property>
--->
-
-<!--- logging properties -->
-
-<property>
-  <name>hadoop.logfile.size</name>
-  <value>10000000</value>
-  <description>The max size of each log file</description>
-</property>
-
-<property>
-  <name>hadoop.logfile.count</name>
-  <value>10</value>
-  <description>The max number of log files</description>
-</property>
-
-<!-- i/o properties -->
-<property>
-  <name>io.file.buffer.size</name>
-  <value>4096</value>
-  <description>The size of buffer for use in sequence files.
-  The size of this buffer should probably be a multiple of hardware
-  page size (4096 on Intel x86), and it determines how much data is
-  buffered during read and write operations.</description>
-</property>
-  
-<property>
-  <name>io.bytes.per.checksum</name>
-  <value>512</value>
-  <description>The number of bytes per checksum.  Must not be larger than
-  io.file.buffer.size.</description>
-</property>
-
-<property>
-  <name>io.skip.checksum.errors</name>
-  <value>false</value>
-  <description>If true, when a checksum error is encountered while
-  reading a sequence file, entries are skipped, instead of throwing an
-  exception.</description>
-</property>
-
-<property>
-  <name>io.compression.codecs</name>
-  <value>org.apache.hadoop.io.compress.DefaultCodec,org.apache.hadoop.io.compress.GzipCodec,org.apache.hadoop.io.compress.BZip2Codec,org.apache.hadoop.io.compress.SnappyCodec</value>
-  <description>A list of the compression codec classes that can be used 
-               for compression/decompression.</description>
-</property>
-
-<property>
-  <name>io.serializations</name>
-  <value>org.apache.hadoop.io.serializer.WritableSerialization</value>
-  <description>A list of serialization classes that can be used for
-  obtaining serializers and deserializers.</description>
-</property>
-
-<!-- file system properties -->
-
-<property>
-  <name>fs.default.name</name>
-  <!--value>file:///</value-->
-  <value>swiftn:///</value>
-  <description>The name of the default file system.  A URI whose
-  scheme and authority determine the FileSystem implementation.  The
-  uri's scheme determines the config property (fs.SCHEME.impl) naming
-  the FileSystem implementation class.  The uri's authority is used to
-  determine the host, port, etc. for a filesystem.</description>
-</property>
-
-<property>
- <name>fs.default.name</name>
- <value>swiftn://testStore/</value>
-</property>
-
-<property>
- <name>fs.swiftn.openstackAccessKeyId</name>
- <value></value>
-</property>
-
-<property>
- <name>fs.swiftn.openstackSecretKey</name>
- <value></value>
-</property>
-
-<property>
- <name>fs.swiftn.openStackTenantId</name>
- <value></value>
-</property>
-
-<property>
- <name>fs.swiftn.openstackauthUri</name>
- <value>https://region-a.geo-1.identity.hpcloudsvc.com:35357/v2.0/</value>
-</property>
-
-<property>
-  <name>fs.trash.interval</name>
-  <value>0</value>
-  <description>Number of minutes between trash checkpoints.
-  If zero, the trash feature is disabled.
-  </description>
-</property>
-
-<property>
-  <name>fs.file.impl</name>
-  <value>org.apache.hadoop.fs.LocalFileSystem</value>
-  <description>The FileSystem for file: uris.</description>
-</property>
-
-<property>
-  <name>fs.hdfs.impl</name>
-  <value>org.apache.hadoop.hdfs.DistributedFileSystem</value>
-  <description>The FileSystem for hdfs: uris.</description>
-</property>
-
-<property>
-  <name>fs.s3.impl</name>
-  <value>org.apache.hadoop.fs.s3.S3FileSystem</value>
-  <description>The FileSystem for s3: uris.</description>
-</property>
-
-<property>
-  <name>fs.s3n.impl</name>
-  <value>org.apache.hadoop.fs.s3native.NativeS3FileSystem</value>
-  <description>The FileSystem for s3n: (Native S3) uris.</description>
-</property>
-
-<property>
-  <name>fs.swiftn.impl</name>
-  <value>org.apache.hadoop.fs.swiftnative.NativeSwiftFileSystem</value>
-  <description>The FileSystem for swift: (Native Swift) uris.</description>
-</property>
-
-<property>
-  <name>fs.kfs.impl</name>
-  <value>org.apache.hadoop.fs.kfs.KosmosFileSystem</value>
-  <description>The FileSystem for kfs: uris.</description>
-</property>
-
-<property>
-  <name>fs.hftp.impl</name>
-  <value>org.apache.hadoop.hdfs.HftpFileSystem</value>
-</property>
-
-<property>
-  <name>fs.hsftp.impl</name>
-  <value>org.apache.hadoop.hdfs.HsftpFileSystem</value>
-</property>
-
-<property>
-  <name>fs.webhdfs.impl</name>
-  <value>org.apache.hadoop.hdfs.web.WebHdfsFileSystem</value>
-</property>
-
-<property>
-  <name>fs.ftp.impl</name>
-  <value>org.apache.hadoop.fs.ftp.FTPFileSystem</value>
-  <description>The FileSystem for ftp: uris.</description>
-</property>
-
-<property>
-  <name>fs.ramfs.impl</name>
-  <value>org.apache.hadoop.fs.InMemoryFileSystem</value>
-  <description>The FileSystem for ramfs: uris.</description>
-</property>
-
-<property>
-  <name>fs.har.impl</name>
-  <value>org.apache.hadoop.fs.HarFileSystem</value>
-  <description>The filesystem for Hadoop archives. </description>
-</property>
-
-<property>
-  <name>fs.har.impl.disable.cache</name>
-  <value>true</value>
-  <description>Don't cache 'har' filesystem instances.</description>
-</property>
-
-<property>
-  <name>fs.checkpoint.dir</name>
-  <value>${hadoop.tmp.dir}/dfs/namesecondary</value>
-  <description>Determines where on the local filesystem the DFS secondary
-      name node should store the temporary images to merge.
-      If this is a comma-delimited list of directories then the image is
-      replicated in all of the directories for redundancy.
-  </description>
-</property>
-
-<property>
-  <name>fs.checkpoint.edits.dir</name>
-  <value>${fs.checkpoint.dir}</value>
-  <description>Determines where on the local filesystem the DFS secondary
-      name node should store the temporary edits to merge.
-      If this is a comma-delimited list of directoires then teh edits is
-      replicated in all of the directoires for redundancy.
-      Default value is same as fs.checkpoint.dir
-  </description>
-</property>
-
-<property>
-  <name>fs.checkpoint.period</name>
-  <value>3600</value>
-  <description>The number of seconds between two periodic checkpoints.
-  </description>
-</property>
-
-<property>
-  <name>fs.checkpoint.size</name>
-  <value>67108864</value>
-  <description>The size of the current edit log (in bytes) that triggers
-       a periodic checkpoint even if the fs.checkpoint.period hasn't expired.
-  </description>
-</property>
-
-
-
-<property>
-  <name>fs.s3.block.size</name>
-  <value>67108864</value>
-  <description>Block size to use when writing files to S3.</description>
-</property>
-
-<property>
-  <name>fs.s3.buffer.dir</name>
-  <value>${hadoop.tmp.dir}/s3</value>
-  <description>Determines where on the local filesystem the S3 filesystem
-  should store files before sending them to S3
-  (or after retrieving them from S3).
-  </description>
-</property>
-
-<property>
-  <name>fs.s3.maxRetries</name>
-  <value>4</value>
-  <description>The maximum number of retries for reading or writing files to S3, 
-  before we signal failure to the application.
-  </description>
-</property>
-
-<property>
-  <name>fs.s3.sleepTimeSeconds</name>
-  <value>10</value>
-  <description>The number of seconds to sleep between each S3 retry.
-  </description>
-</property>
-
-
-<property>
-  <name>local.cache.size</name>
-  <value>10737418240</value>
-  <description>The limit on the size of cache you want to keep, set by default
-  to 10GB. This will act as a soft limit on the cache directory for out of band data.
-  </description>
-</property>
-            
-<property>
-  <name>io.seqfile.compress.blocksize</name>
-  <value>1000000</value>
-  <description>The minimum block size for compression in block compressed 
-          SequenceFiles.
-  </description>
-</property>
-
-<property>
-  <name>io.seqfile.lazydecompress</name>
-  <value>true</value>
-  <description>Should values of block-compressed SequenceFiles be decompressed
-          only when necessary.
-  </description>
-</property>
-
-<property>
-  <name>io.seqfile.sorter.recordlimit</name>
-  <value>1000000</value>
-  <description>The limit on number of records to be kept in memory in a spill 
-          in SequenceFiles.Sorter
-  </description>
-</property>
-
- <property>
-  <name>io.mapfile.bloom.size</name>
-  <value>1048576</value>
-  <description>The size of BloomFilter-s used in BloomMapFile. Each time this many
-  keys is appended the next BloomFilter will be created (inside a DynamicBloomFilter).
-  Larger values minimize the number of filters, which slightly increases the performance,
-  but may waste too much space if the total number of keys is usually much smaller
-  than this number.
-  </description>
-</property>
-
-<property>
-  <name>io.mapfile.bloom.error.rate</name>
-  <value>0.005</value>
-  <description>The rate of false positives in BloomFilter-s used in BloomMapFile.
-  As this value decreases, the size of BloomFilter-s increases exponentially. This
-  value is the probability of encountering false positives (default is 0.5%).
-  </description>
-</property>
-
-<property>
-  <name>hadoop.util.hash.type</name>
-  <value>murmur</value>
-  <description>The default implementation of Hash. Currently this can take one of the
-  two values: 'murmur' to select MurmurHash and 'jenkins' to select JenkinsHash.
-  </description>
-</property>
-
-
-<!-- ipc properties -->
-
-<property>
-  <name>ipc.client.idlethreshold</name>
-  <value>4000</value>
-  <description>Defines the threshold number of connections after which
-               connections will be inspected for idleness.
-  </description>
-</property>
-
-<property>
-  <name>ipc.client.kill.max</name>
-  <value>10</value>
-  <description>Defines the maximum number of clients to disconnect in one go.
-  </description>
-</property>
-
-<property>
-  <name>ipc.client.connection.maxidletime</name>
-  <value>10000</value>
-  <description>The maximum time in msec after which a client will bring down the
-               connection to the server.
-  </description>
-</property>
-
-<property>
-  <name>ipc.client.connect.max.retries</name>
-  <value>10</value>
-  <description>Indicates the number of retries a client will make to establish
-               a server connection.
-  </description>
-</property>
-
-<property>
-  <name>ipc.server.listen.queue.size</name>
-  <value>128</value>
-  <description>Indicates the length of the listen queue for servers accepting
-               client connections.
-  </description>
-</property>
-
-<property>
-  <name>ipc.server.tcpnodelay</name>
-  <value>false</value>
-  <description>Turn on/off Nagle's algorithm for the TCP socket connection on 
-  the server. Setting to true disables the algorithm and may decrease latency
-  with a cost of more/smaller packets. 
-  </description>
-</property>
-
-<property>
-  <name>ipc.client.tcpnodelay</name>
-  <value>false</value>
-  <description>Turn on/off Nagle's algorithm for the TCP socket connection on 
-  the client. Setting to true disables the algorithm and may decrease latency
-  with a cost of more/smaller packets. 
-  </description>
-</property>
-
-
-<!-- Web Interface Configuration -->
-
-<property>
-  <name>webinterface.private.actions</name>
-  <value>false</value>
-  <description> If set to true, the web interfaces of JT and NN may contain 
-                actions, such as kill job, delete file, etc., that should 
-                not be exposed to public. Enable this option if the interfaces 
-                are only reachable by those who have the right authorization.
-  </description>
-</property>
-
-<!-- Proxy Configuration -->
-
-<property>
-  <name>hadoop.rpc.socket.factory.class.default</name>
-  <value>org.apache.hadoop.net.StandardSocketFactory</value>
-  <description> Default SocketFactory to use. This parameter is expected to be
-    formatted as "package.FactoryClassName".
-  </description>
-</property>
-
-<property>
-  <name>hadoop.rpc.socket.factory.class.ClientProtocol</name>
-  <value></value>
-  <description> SocketFactory to use to connect to a DFS. If null or empty, use
-    hadoop.rpc.socket.class.default. This socket factory is also used by
-    DFSClient to create sockets to DataNodes.
-  </description>
-</property>
-
-
-
-<property>
-  <name>hadoop.socks.server</name>
-  <value></value>
-  <description> Address (host:port) of the SOCKS server to be used by the
-    SocksSocketFactory.
-  </description>
-</property>
-
-<!-- Rack Configuration -->
-
-<property>
-  <name>topology.node.switch.mapping.impl</name>
-  <value>org.apache.hadoop.net.ScriptBasedMapping</value>
-  <description> The default implementation of the DNSToSwitchMapping. It
-    invokes a script specified in topology.script.file.name to resolve
-    node names. If the value for topology.script.file.name is not set, the
-    default value of DEFAULT_RACK is returned for all node names.
-  </description>
-</property>
-
-<property>
-  <name>topology.script.file.name</name>
-  <value></value>
-  <description> The script name that should be invoked to resolve DNS names to
-    NetworkTopology names. Example: the script would take host.foo.bar as an
-    argument, and return /rack1 as the output.
-  </description>
-</property>
-
-<property>
-  <name>topology.script.number.args</name>
-  <value>100</value>
-  <description> The max number of args that the script configured with 
-    topology.script.file.name should be run with. Each arg is an
-    IP address.
-  </description>
-</property>
-
-<property>
-  <name>hadoop.security.uid.cache.secs</name>
-  <value>14400</value>
-  <description> NativeIO maintains a cache from UID to UserName. This is
-  the timeout for an entry in that cache. </description>
-</property>
-
-
-</configuration>
diff --git a/hadoop-swiftn-driver/conf/core-site.xml b/hadoop-swiftn-driver/conf/core-site.xml
deleted file mode 100644
index 7605cfa..0000000
--- a/hadoop-swiftn-driver/conf/core-site.xml
+++ /dev/null
@@ -1,41 +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>swiftn:///</value-->
-		<!--value>file:///</value-->
-                <value>hdfs://localhost:9000</value>
-	</property>
-        <property>
-		<name>fs.swiftn.openstackAccessKeyId</name>
-		<value></value>
-	</property>
-	<property>
-		<name>fs.swiftn.openstackSecretKey</name>
-		<value></value>
-	</property>
-	<property>
-		<name>fs.swiftn.openStackTenantId</name>
-		<value></value>
-	</property>
-	<property>
-		<name>fs.swiftn.openstackauthUri</name>
-		<value>https://region-a.geo-1.identity.hpcloudsvc.com:35357/v2.0/</value>
-	</property>
-	 <property>
-	    	<name>hadoop.tmp.dir</name>
-	       	<value>/home/hadoop/tmpdir</value>
-	  </property>
-	  <property>
-	       <name>fs.swift.buffer.dir</name>
-		<value>/home/hadoop/tmp</value>
-	 </property>
-	 <property>
-	 	<name>hadoop.job.history.user.location</name>
-	 	<value>/home/hadoop</value>
-	 </property>
-</configuration>
diff --git a/hadoop-swiftn-driver/conf/hdfs-site.xml b/hadoop-swiftn-driver/conf/hdfs-site.xml
deleted file mode 100644
index f652a37..0000000
--- a/hadoop-swiftn-driver/conf/hdfs-site.xml
+++ /dev/null
@@ -1,15 +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>dfs.replication</name>
-		<value>1</value>
-	</property>
-	<property>
-		<name>fs.swift.buffer.dir</name>
-                <value>/home/hadoop/tmp</value>
-	</property>
-</configuration>
diff --git a/hadoop-swiftn-driver/conf/mapred-site.xml b/hadoop-swiftn-driver/conf/mapred-site.xml
deleted file mode 100644
index 52cf7f5..0000000
--- a/hadoop-swiftn-driver/conf/mapred-site.xml
+++ /dev/null
@@ -1,15 +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>mapred.job.tracker</name>
-		<value>localhost:9001</value>
-	</property>
-	<property>
-		<name>fs.swift.buffer.dir</name>
-                <value>/home/hadoop/tmp</value>
-	</property>
-</configuration>
diff --git a/hadoop-swiftn-driver/lib/hpswift.jar b/hadoop-swiftn-driver/lib/hpswift.jar
deleted file mode 100644
index 2176744..0000000
Binary files a/hadoop-swiftn-driver/lib/hpswift.jar and /dev/null differ
diff --git a/hadoop-swiftn-driver/pom.xml b/hadoop-swiftn-driver/pom.xml
deleted file mode 100644
index 12be28b..0000000
--- a/hadoop-swiftn-driver/pom.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>hadoop-swiftn-driver</groupId>
-  <artifactId>hadoop-swiftn-driver</artifactId>
-  <version>0.0.1-SNAPSHOT</version>
-  <name>hadoop swift native driver</name>
-  
- <dependencies>
-	 <dependency>
-	    <groupId>org.apache.hadoop</groupId>
-	    <artifactId>hadoop-core</artifactId>
-	    <version>1.0.3</version>
-	</dependency>
-	<dependency>
-	    <groupId>org.apache.httpcomponents</groupId>
-	    <artifactId>httpcore</artifactId>
-	    <version>4.2.3</version>
-	</dependency>
-	<dependency>
-	    <groupId>org.apache.httpcomponents</groupId>
-	    <artifactId>httpclient</artifactId>
-	    <version>4.2.2</version>
-	</dependency>
-	<dependency>
-	    <groupId>org.apache.hadoop</groupId>
-	    <artifactId>hadoop-test</artifactId>
-	    <version>1.0.3</version>
-	</dependency>
-</dependencies> 
-</project>
\ No newline at end of file
diff --git a/hadoop-swiftn-driver/src/main/java/org/apache/hadoop/fs/swift/SwiftCredentials.java b/hadoop-swiftn-driver/src/main/java/org/apache/hadoop/fs/swift/SwiftCredentials.java
deleted file mode 100644
index 87aefbf..0000000
--- a/hadoop-swiftn-driver/src/main/java/org/apache/hadoop/fs/swift/SwiftCredentials.java
+++ /dev/null
@@ -1,80 +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.
- */
-
-package org.apache.hadoop.fs.swift;
-
-import java.net.URI;
-
-import org.apache.hadoop.conf.Configuration;
-import org.hpswift.service.Credentials;
-
-/**
- * <p>
- * Extracts OpenStack credentials from the configuration.
- * </p>
- */
-public class SwiftCredentials {
-
-    private String secretKey;
-    private String accessKey; 
-    private String tenantId;
-    private String authUri;
-
-    /**
-     * @throws IllegalArgumentException if credentials for Swift cannot be
-     * determined.
-     */
-    public Credentials initialize(URI uri, Configuration conf) {
-
-        String scheme = uri.getScheme();
-        String accessKeyProperty = String.format("fs.%s.openstackAccessKeyId", scheme);
-        String secretKeyProperty = String.format("fs.%s.openstackSecretKey", scheme);
-        String tenantIdProperty = String.format("fs.%s.openStackTenantId", scheme);
-        String authUriProperty = String.format("fs.%s.openstackauthUri", scheme);
-
-        accessKey = conf.get(accessKeyProperty);
-        secretKey = conf.get(secretKeyProperty);
-        tenantId = conf.get(tenantIdProperty);
-        authUri = conf.get(authUriProperty);
-
-
-        if (accessKey == null || secretKey == null || tenantId == null || authUri == null) {
-            System.out.println("**" + accessKey +  secretKey + tenantId + authUri);
-
-            throw new IllegalArgumentException("OpenStack Swift must specify all of: secretKey, accessKey, tentantId, authUri");
-        }
-        Credentials hpCredentials = new Credentials(accessKey, secretKey, tenantId, authUri);
-        return hpCredentials;
-    }
-
-    public String getSecretKey(){
-        return secretKey;
-    }
-    
-    public String getAccessKey(){
-        return accessKey;
-    }
-    
-    public String getTenantId(){
-        return tenantId;
-    }
-    
-    public String getAuthUri(){
-        return authUri;
-    }
-}
diff --git a/hadoop-swiftn-driver/src/main/java/org/apache/hadoop/fs/swift/SwiftException.java b/hadoop-swiftn-driver/src/main/java/org/apache/hadoop/fs/swift/SwiftException.java
deleted file mode 100644
index 03249e2..0000000
--- a/hadoop-swiftn-driver/src/main/java/org/apache/hadoop/fs/swift/SwiftException.java
+++ /dev/null
@@ -1,29 +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.
- */
-
-package org.apache.hadoop.fs.swift;
-
-/**
- * Thrown if there is a problem communicating with Amazon S3.
- */
-public class SwiftException extends RuntimeException {
-
-    public SwiftException(Throwable t) {
-        super(t);
-    }
-}
diff --git a/hadoop-swiftn-driver/src/main/java/org/apache/hadoop/fs/swiftnative/FileMetadata.java b/hadoop-swiftn-driver/src/main/java/org/apache/hadoop/fs/swiftnative/FileMetadata.java
deleted file mode 100644
index 6d6a540..0000000
--- a/hadoop-swiftn-driver/src/main/java/org/apache/hadoop/fs/swiftnative/FileMetadata.java
+++ /dev/null
@@ -1,53 +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.
- */
-
-package org.apache.hadoop.fs.swiftnative;
-
-/**
- * <p>
- * Holds basic metadata for a file stored in a {@link NativeFileSystemStore}.
- * </p>
- */
-class FileMetadata {
-    private final String key;
-    private final long length;
-    private final long lastModified;
-
-    public FileMetadata(String key, long length, long lastModified) {
-        this.key = key;
-        this.length = length;
-        this.lastModified = lastModified;
-    }
-
-    public String getKey() {
-        return key;
-    }
-
-    public long getLength() {
-        return length;
-    }
-
-    public long getLastModified() {
-        return lastModified;
-    }
-
-    @Override
-    public String toString() {
-        return "FileMetadata[" + key + ", " + length + ", " + lastModified + "]";
-    }
-}
diff --git a/hadoop-swiftn-driver/src/main/java/org/apache/hadoop/fs/swiftnative/NativeFileSystemStore.java b/hadoop-swiftn-driver/src/main/java/org/apache/hadoop/fs/swiftnative/NativeFileSystemStore.java
deleted file mode 100644
index bd6b882..0000000
--- a/hadoop-swiftn-driver/src/main/java/org/apache/hadoop/fs/swiftnative/NativeFileSystemStore.java
+++ /dev/null
@@ -1,63 +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.
- */
-
-package org.apache.hadoop.fs.swiftnative;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URI;
-
-import org.apache.hadoop.conf.Configuration;
-
-/**
- * <p>
- * An abstraction for a key-based {@link File} store.
- * </p>
- */
-interface NativeFileSystemStore {
-
-    public void initialize(URI uri, Configuration conf) throws IOException;
-
-    public void storeFile(String key, File file, byte[] md5Hash) throws IOException;
-    public void storeEmptyFile(String key) throws IOException;
-
-    public FileMetadata retrieveMetadata(String key) throws IOException;
-    public InputStream retrieve(String key) throws IOException;
-    public InputStream retrieve(String key, long byteRangeStart) throws IOException;
-
-    public PartialListing list(String prefix, int maxListingLength) throws IOException;
-    public PartialListing list(String prefix, int maxListingLength, String priorLastKey) throws IOException;    
-    public PartialListing listAll(String prefix, int maxListingLength, String priorLastKey) throws IOException;
-
-    public void delete(String key) throws IOException;
-
-    public void rename(String srcKey, String dstKey) throws IOException;
-
-    /**
-     * Delete all keys with the given prefix. Used for testing.
-     * @throws IOException
-     */
-    public void purge(String prefix) throws IOException;
-
-    /**
-     * Diagnostic method to dump state to the console.
-     * @throws IOException
-     */
-    public void dump() throws IOException;
-}
diff --git a/hadoop-swiftn-driver/src/main/java/org/apache/hadoop/fs/swiftnative/NativeSwiftFileSystem.java b/hadoop-swiftn-driver/src/main/java/org/apache/hadoop/fs/swiftnative/NativeSwiftFileSystem.java
deleted file mode 100644
index 6d85fdc..0000000
--- a/hadoop-swiftn-driver/src/main/java/org/apache/hadoop/fs/swiftnative/NativeSwiftFileSystem.java
+++ /dev/null
@@ -1,583 +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.
- */
-
-package org.apache.hadoop.fs.swiftnative;
-
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.URI;
-import java.security.DigestOutputStream;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeSet;
-import java.util.concurrent.TimeUnit;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.BufferedFSInputStream;
-import org.apache.hadoop.fs.FSDataInputStream;
-import org.apache.hadoop.fs.FSDataOutputStream;
-import org.apache.hadoop.fs.FSInputStream;
-import org.apache.hadoop.fs.FileStatus;
-import org.apache.hadoop.fs.FileSystem;
-import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.fs.permission.FsPermission;
-import org.apache.hadoop.fs.swift.SwiftException;
-import org.apache.hadoop.io.retry.RetryPolicies;
-import org.apache.hadoop.io.retry.RetryPolicy;
-import org.apache.hadoop.io.retry.RetryProxy;
-import org.apache.hadoop.util.Progressable;
-
-/**
- * <p>
- * A {@link FileSystem} for reading and writing files stored on
- * OpenStack Swift</a>.
- * Unlike {@link org.apache.hadoop.fs.SwiftFileSystem.SwiftFileSystem} this implementation
- * stores files on Swift in their
- * native form so they can be read by other Swift tools.
- * </p>
- * @see org.apache.hadoop.fs.SwiftFileSystem.SwiftFileSystem
- */
-public class NativeSwiftFileSystem extends FileSystem {
-
-    public static final Log LOG = LogFactory.getLog(NativeSwiftFileSystem.class);
-
-    private static final String FOLDER_SUFFIX = "_$folder$";
-    private static final long MAX_SWIFT_FILE_SIZE = 5 * 1024 * 1024 * 1024L;
-    static final String PATH_DELIMITER = Path.SEPARATOR;
-    private static final int SWIFT_MAX_LISTING_LENGTH = 1000;
-
-    private class NativeSwiftFsInputStream extends FSInputStream {
-
-        private InputStream in;
-        private final String key;
-        private long pos = 0;
-
-        public NativeSwiftFsInputStream(InputStream in, String key) {
-            this.in = in;
-            this.key = key;
-        }
-
-        public synchronized int read() throws IOException {
-            int result = in.read();
-            if (result != -1) {
-                pos++;
-            }
-            return result;
-        }
-        public synchronized int read(byte[] b, int off, int len)
-                throws IOException {
-
-            int result = in.read(b, off, len);
-            if (result > 0) {
-                pos += result;
-            }
-            return result;
-        }
-
-        public void close() throws IOException {
-            in.close();
-        }
-
-        public synchronized void seek(long pos) throws IOException {
-            in.close();
-            in = store.retrieve(key, pos);
-            this.pos = pos;
-        }
-        public synchronized long getPos() throws IOException {
-            return pos;
-        }
-        public boolean seekToNewSource(long targetPos) throws IOException {
-            return false;
-        }
-    }
-
-    private class NativeSwiftFsOutputStream extends OutputStream {
-
-        private Configuration conf;
-        private String key;
-        private File backupFile;
-        private OutputStream backupStream;
-        private MessageDigest digest;
-        private boolean closed;
-
-        public NativeSwiftFsOutputStream(Configuration conf,
-                                         NativeFileSystemStore store, 
-                                         String key, 
-                                         Progressable progress,
-                                         int bufferSize) throws IOException {
-            this.conf = conf;
-            this.key = key;
-            this.backupFile = newBackupFile();
-            
-            try {
-                this.digest = MessageDigest.getInstance("MD5");
-                this.backupStream = new BufferedOutputStream(new DigestOutputStream(
-                        new FileOutputStream(backupFile), this.digest));
-            } catch (NoSuchAlgorithmException e) {
-                LOG.warn("Cannot load MD5 digest algorithm, skipping message integrity check.", e);
-                this.backupStream = new BufferedOutputStream(new FileOutputStream(backupFile));
-            }
-        }
-
-        private File newBackupFile() throws IOException {
-            File dir = new File(conf.get("fs.swift.buffer.dir"));
-            if (!dir.mkdirs() && !dir.exists()) {
-                throw new IOException("Cannot create Swift buffer directory: " + dir);
-            }
-            File result = File.createTempFile("output-", ".tmp", dir);
-            result.deleteOnExit();
-            return result;
-        }
-
-        @Override
-        public void flush() throws IOException {
-            backupStream.flush();
-        }
-
-        @Override
-        public synchronized void close() throws IOException {
-            if (closed) {
-                return;
-            }
-
-            backupStream.close();
-
-            try {
-                byte[] md5Hash = digest == null ? null : digest.digest();
-                store.storeFile(key, backupFile, md5Hash);
-            } finally {
-                if (!backupFile.delete()) {
-                    LOG.warn("Could not delete temporary swiftn file: " + backupFile);
-                }
-                super.close();
-                closed = true;
-            } 
-
-        }
-
-        @Override
-        public void write(int b) throws IOException {
-            backupStream.write(b);
-        }
-
-        @Override
-        public void write(byte[] b, int off, int len) throws IOException {
-            backupStream.write(b, off, len);
-        }
-
-
-    }
-
-    private URI uri;
-    private NativeFileSystemStore store;
-    private Path workingDir;
-
-    public NativeSwiftFileSystem() {
-        // set store in initialize()
-    }
-
-    public NativeSwiftFileSystem(NativeFileSystemStore store) {
-        this.store = store;
-    }
-
-    @Override
-    public void initialize(URI uri, Configuration conf) throws IOException {
-        super.initialize(uri, conf);
-        if (store == null) {
-            store = createDefaultStore(conf);
-        }
-        store.initialize(uri, conf);
-        setConf(conf);
-        this.uri = URI.create(uri.getScheme() + "://" + uri.getAuthority());
-        this.workingDir = new Path("/user", System.getProperty("user.name")).makeQualified(this);
-    }
-
-    private static NativeFileSystemStore createDefaultStore(Configuration conf) {
-        NativeFileSystemStore store = new SwiftNativeFileSystemStore();
-
-        RetryPolicy basePolicy = RetryPolicies.retryUpToMaximumCountWithFixedSleep(
-                conf.getInt("fs.swift.maxRetries", 4),
-                conf.getLong("fs.swift.sleepTimeSeconds", 10), TimeUnit.SECONDS);
-        Map<Class<? extends Exception>, RetryPolicy> exceptionToPolicyMap =
-                new HashMap<Class<? extends Exception>, RetryPolicy>();
-        exceptionToPolicyMap.put(IOException.class, basePolicy);
-        exceptionToPolicyMap.put(SwiftException.class, basePolicy);
-
-        RetryPolicy methodPolicy = RetryPolicies.retryByException(
-                RetryPolicies.TRY_ONCE_THEN_FAIL, exceptionToPolicyMap);
-        Map<String, RetryPolicy> methodNameToPolicyMap =
-                new HashMap<String, RetryPolicy>();
-        methodNameToPolicyMap.put("storeFile", methodPolicy);
-
-        return (NativeFileSystemStore) RetryProxy.create(NativeFileSystemStore.class, 
-                                                         store,
-                                                         methodNameToPolicyMap);
-    }
-
-    private static String pathToKey(Path path) {
-        if (path.toUri().getScheme() != null && "".equals(path.toUri().getPath())) {
-            // allow uris without trailing slash after bucket to refer to root,
-            // like swiftn://mybucket
-            return "";
-        }
-        if (!path.isAbsolute()) {
-            throw new IllegalArgumentException("Path must be absolute: " + path);
-        }
-        return path.toUri().getPath().substring(1); // remove initial slash
-    }
-
-    private static Path keyToPath(String key) {
-        return new Path("/" + key);
-    }
-
-    private Path makeAbsolute(Path path) {
-        if (path.isAbsolute()) {
-            return path;
-        }
-        return new Path(workingDir, path);
-    }
-
-    /** This optional operation is not yet supported. */
-    public FSDataOutputStream append(Path f, int bufferSize,
-            Progressable progress) throws IOException {
-        throw new IOException("Not supported"); 
-    }
-
-    @Override
-    public FSDataOutputStream create(Path f, FsPermission permission,
-            boolean overwrite, int bufferSize, short replication, long blockSize,
-            Progressable progress) throws IOException {
-
-        if (exists(f) && !overwrite) {
-            throw new IOException("File already exists:"+f);
-        }
-        
-        Path absolutePath = makeAbsolute(f);
-        String key = pathToKey(absolutePath);
-        return new FSDataOutputStream(new NativeSwiftFsOutputStream(getConf(), store,
-                key, progress, bufferSize), statistics);
-    }
-
-    @Override
-    @Deprecated
-    public boolean delete(Path path) throws IOException {
-        return delete(path, true);
-    }
-
-    @Override
-    public boolean delete(Path f, boolean recursive) throws IOException {
-        FileStatus status;
-        try {
-            status = getFileStatus(f);
-        } catch (FileNotFoundException e) {
-            return false;
-        }
-        
-        Path absolutePath = makeAbsolute(f);
-        String key = pathToKey(absolutePath);
-        if (status.isDir()) {
-            FileStatus[] contents = listStatus(f);
-            if (!recursive && contents.length > 0) {
-                throw new IOException("Directory " + f.toString() + " is not empty.");
-            }
-            
-            for (FileStatus p : contents) {
-                if (!delete(p.getPath(), recursive)) {
-                    return false;
-                }
-            }
-            store.delete(key + FOLDER_SUFFIX);
-        } else {
-            store.delete(key);
-        }
-        
-        return true;
-    }
-
-    @Override
-    public FileStatus getFileStatus(Path f) throws IOException {
-
-        Path absolutePath = makeAbsolute(f);
-        String key = pathToKey(absolutePath);
-
-        if (key.length() == 0) { // root always exists
-            return newDirectory(absolutePath);
-        }
-
-        FileMetadata meta = store.retrieveMetadata(key);
-        if (meta != null) {
-            return newFile(meta, absolutePath);
-        }
-        
-        if (store.retrieveMetadata(key + FOLDER_SUFFIX) != null) {
-            return newDirectory(absolutePath);
-        }
-
-        PartialListing listing = store.list(key, 1);
-        if (listing.getFiles().length > 0 || listing.getCommonPrefixes().length > 0) {
-            return newDirectory(absolutePath);
-        }
-
-        throw new FileNotFoundException(absolutePath + ": No such file or directory.");
-
-    }
-
-    @Override
-    public URI getUri() {
-        return uri;
-    }
-
-    /**
-     * <p>
-     * If <code>f</code> is a file, this method will make a single call to Swift.
-     * If <code>f</code> is a directory, this method will make a maximum of
-     * (<i>n</i> / 1000) + 2 calls to Swift, where <i>n</i> is the total number of
-     * files and directories contained directly in <code>f</code>.
-     * </p>
-     */
-    @Override
-    public FileStatus[] listStatus(Path f) throws IOException {
-
-        Path absolutePath = makeAbsolute(f);
-        String key = pathToKey(absolutePath);
-
-        if (key.length() > 0) {
-            FileMetadata meta = store.retrieveMetadata(key);
-            if (meta != null) {
-                return new FileStatus[] { newFile(meta, absolutePath) };
-            }
-        }
-
-        URI pathUri = absolutePath.toUri();
-        Set<FileStatus> status = new TreeSet<FileStatus>();
-        String priorLastKey = null;
-        do {
-            PartialListing listing = store.list(key, SWIFT_MAX_LISTING_LENGTH, priorLastKey);
-            for (FileMetadata fileMetadata : listing.getFiles()) {
-                Path subpath = keyToPath(fileMetadata.getKey());
-                String relativePath = pathUri.relativize(subpath.toUri()).getPath();
-                if (relativePath.endsWith(FOLDER_SUFFIX)) {
-                    status.add(newDirectory(new Path(absolutePath, 
-                            relativePath.substring(0,relativePath.indexOf(FOLDER_SUFFIX)))));
-                } else {
-                    status.add(newFile(fileMetadata, subpath));
-                }
-            }
-            
-            for (String commonPrefix : listing.getCommonPrefixes()) {
-                Path subpath = keyToPath(commonPrefix);
-                String relativePath = pathUri.relativize(subpath.toUri()).getPath();
-                status.add(newDirectory(new Path(absolutePath, relativePath)));
-            }
-            priorLastKey = listing.getPriorLastKey();
-        } while (priorLastKey != null);
-
-        if (status.isEmpty() &&
-                store.retrieveMetadata(key + FOLDER_SUFFIX) == null) {
-            return null;
-        }
-
-        return status.toArray(new FileStatus[0]);
-    }
-
-    private FileStatus newFile(FileMetadata meta, Path path) {
-        return new FileStatus(meta.getLength(), false, 1, MAX_SWIFT_FILE_SIZE,
-                              meta.getLastModified(), path.makeQualified(this));
-    }
-
-    private FileStatus newDirectory(Path path) {
-        return new FileStatus(0, true, 1, MAX_SWIFT_FILE_SIZE, 0,
-                path.makeQualified(this));
-    }
-
-    @Override
-    public boolean mkdirs(Path f, FsPermission permission) throws IOException {
-        Path absolutePath = makeAbsolute(f);
-        List<Path> paths = new ArrayList<Path>();
-        do {
-            paths.add(0, absolutePath);
-            absolutePath = absolutePath.getParent();
-        } while (absolutePath != null);
-
-        boolean result = true;
-        for (Path path : paths) {
-            result &= mkdir(path);
-        }
-        return result;
-    }
-
-    private boolean mkdir(Path f) throws IOException {
-        try {
-            FileStatus fileStatus = getFileStatus(f);
-            if (!fileStatus.isDir()) {
-                throw new IOException(String.format(
-                        "Can't make directory for path %s since it is a file.", f));
-
-            }
-        } catch (FileNotFoundException e) {
-            String key = pathToKey(f) + FOLDER_SUFFIX;
-            store.storeEmptyFile(key);    
-        }
-        return true;
-    }
-
-    @Override
-    public FSDataInputStream open(Path f, int bufferSize) throws IOException {
-        if (!exists(f)) {
-            throw new FileNotFoundException(f.toString());
-        }
-        Path absolutePath = makeAbsolute(f);
-        String key = pathToKey(absolutePath);
-
-        return new FSDataInputStream(new BufferedFSInputStream(
-                new NativeSwiftFsInputStream(store.retrieve(key), key), bufferSize));
-    }
-
-    // rename() and delete() use this method to ensure that the parent directory
-    // of the source does not vanish.
-    private void createParent(Path path) throws IOException {
-        Path parent = path.getParent();
-        if (parent != null) {
-            String key = pathToKey(makeAbsolute(parent));
-            if (key.length() > 0) {
-                store.storeEmptyFile(key + FOLDER_SUFFIX);
-            }
-        }
-    }
-
-    private boolean existsAndIsFile(Path f) throws IOException {
-        Path absolutePath = makeAbsolute(f);
-        String key = pathToKey(absolutePath);
-
-        if (key.length() == 0) {
-            return false;
-        }
-
-        FileMetadata meta = store.retrieveMetadata(key);
-        if (meta != null) {
-            // Swift object with given key exists, so this is a file
-            return true;
-        }
-
-        if (store.retrieveMetadata(key + FOLDER_SUFFIX) != null) {
-            // Signifies empty directory
-            return false;
-        }
-
-        PartialListing listing = store.list(key, 1, null);
-        if (listing.getFiles().length > 0 ||
-                listing.getCommonPrefixes().length > 0) {
-            // Non-empty directory
-            return false;
-        }
-
-        throw new FileNotFoundException(absolutePath +
-                ": No such file or directory");
-    }
-
-
-    @Override
-    public boolean rename(Path src, Path dst) throws IOException {
-        String srcKey = pathToKey(makeAbsolute(src));
-
-        if (srcKey.length() == 0) {
-            // Cannot rename root of file system
-            return false;
-        }
-
-        // Figure out the final destination
-        String dstKey;
-        try {
-            boolean dstIsFile = existsAndIsFile(dst);
-            if (dstIsFile) {
-                // Attempting to overwrite a file using rename()
-                return false;
-            } else {
-                // Move to within the existent directory
-                dstKey = pathToKey(makeAbsolute(new Path(dst, src.getName())));
-            }
-        } catch (FileNotFoundException e) {
-            // dst doesn't exist, so we can proceed
-            dstKey = pathToKey(makeAbsolute(dst));
-            try {
-                if (!getFileStatus(dst.getParent()).isDir()) {
-                    return false; // parent dst is a file
-                }
-            } catch (FileNotFoundException ex) {
-                return false; // parent dst does not exist
-            }
-        }
-
-        try {
-            boolean srcIsFile = existsAndIsFile(src);
-            if (srcIsFile) {
-                store.rename(srcKey, dstKey);
-            } else {
-                // Move the folder object
-                store.delete(srcKey + FOLDER_SUFFIX);
-                store.storeEmptyFile(dstKey + FOLDER_SUFFIX);
-
-                // Move everything inside the folder
-                String priorLastKey = null;
-                do {
-                    PartialListing listing = store.listAll(srcKey, SWIFT_MAX_LISTING_LENGTH,
-                            priorLastKey);
-                    for (FileMetadata file : listing.getFiles()) {
-                        store.rename(file.getKey(), dstKey
-                                + file.getKey().substring(srcKey.length()));
-                    }
-                    priorLastKey = listing.getPriorLastKey();
-                } while (priorLastKey != null);
-            }
-
-            createParent(src);
-            return true;
-
-        } catch (FileNotFoundException e) {
-            // Source file does not exist;
-            return false;
-        }
-    }
-
-
-    /**
-     * Set the working directory to the given directory.
-     */
-    @Override
-    public void setWorkingDirectory(Path newDir) {
-        workingDir = newDir;
-    }
-
-    @Override
-    public Path getWorkingDirectory() {
-        return workingDir;
-    }
-
-}
diff --git a/hadoop-swiftn-driver/src/main/java/org/apache/hadoop/fs/swiftnative/PartialListing.java b/hadoop-swiftn-driver/src/main/java/org/apache/hadoop/fs/swiftnative/PartialListing.java
deleted file mode 100644
index d9fb752..0000000
--- a/hadoop-swiftn-driver/src/main/java/org/apache/hadoop/fs/swiftnative/PartialListing.java
+++ /dev/null
@@ -1,58 +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.
- */
-
-package org.apache.hadoop.fs.swiftnative;
-
-/**
- * <p>
- * Holds information on a directory listing for a
- * {@link NativeFileSystemStore}.
- * This includes the {@link FileMetadata files} and directories
- * (their names) contained in a directory.
- * </p>
- * <p>
- * This listing may be returned in chunks, so a <code>priorLastKey</code>
- * is provided so that the next chunk may be requested.
- * </p>
- * @see NativeFileSystemStore#list(String, int, String)
- */
-class PartialListing {
-
-    private final String priorLastKey;
-    private final FileMetadata[] files;
-    private final String[] commonPrefixes;
-
-    public PartialListing(String priorLastKey, FileMetadata[] files, String[] commonPrefixes) {
-        this.priorLastKey = priorLastKey;
-        this.files = files;
-        this.commonPrefixes = commonPrefixes;
-    }
-
-    public FileMetadata[] getFiles() {
-        return files;
-    }
-
-    public String[] getCommonPrefixes() {
-        return commonPrefixes;
-    }
-
-    public String getPriorLastKey() {
-        return priorLastKey;
-    }
-
-}
diff --git a/hadoop-swiftn-driver/src/main/java/org/apache/hadoop/fs/swiftnative/SwiftNativeFileSystemStore.java b/hadoop-swiftn-driver/src/main/java/org/apache/hadoop/fs/swiftnative/SwiftNativeFileSystemStore.java
deleted file mode 100644
index ae8574a..0000000
--- a/hadoop-swiftn-driver/src/main/java/org/apache/hadoop/fs/swiftnative/SwiftNativeFileSystemStore.java
+++ /dev/null
@@ -1,250 +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.
- */
-
-package org.apache.hadoop.fs.swiftnative;
-
-import static org.apache.hadoop.fs.swiftnative.NativeSwiftFileSystem.PATH_DELIMITER;
-
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URI;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.TimeZone;
-
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.swift.SwiftCredentials;
-import org.apache.hadoop.fs.swift.SwiftException;
-import org.codehaus.jackson.JsonNode;
-
-import org.hpswift.service.Credentials;
-import org.hpswift.service.Swift;
-
-
-class SwiftNativeFileSystemStore implements NativeFileSystemStore {
-
-    private SwiftCredentials swiftCredentials;
-    private Swift swift;
-    private String container;
-
-    public void initialize(URI uri, Configuration conf) throws IOException {
-        try {
-            swiftCredentials = new SwiftCredentials();
-            Credentials hpswiftCredentials = swiftCredentials.initialize(uri, conf);
-            swift = new Swift(hpswiftCredentials);
-        } catch (Exception e) {
-            if (e.getCause() instanceof IOException) {
-                throw (IOException) e.getCause();
-            }
-            throw new SwiftException(e);
-        }
-        container = uri.getHost();
-    }
-
-    public void storeFile(String key, File  file, byte[] md5Hash)
-            throws IOException {
-
-        BufferedInputStream in = null;
-        try {
-            in = new BufferedInputStream(new FileInputStream(file));
-            try {
-                swift.putStream(container, key, in, md5Hash);
-            } catch (Exception e) {
-                if (e.getCause() instanceof IOException) {
-                    throw (IOException) e.getCause();
-                }
-                throw new SwiftException(e);
-            }
-        } finally {
-            if (in != null) {
-                try {
-                    in.close();
-                } catch (IOException e) {
-                    // ignore
-                }
-            }
-        }
-    }
-
-    public void storeEmptyFile(String key) throws IOException {
-        try {
-            swift.put(container, key, new byte[0]);
-        } catch (Exception e) {
-            if (e.getCause() instanceof IOException) {
-                throw (IOException) e.getCause();
-            }
-            throw new SwiftException(e);
-        }
-    }
-
-    public FileMetadata retrieveMetadata(String key) throws IOException {
-        try {
-            org.hpswift.service.SwiftMetadata metadata = swift.getMetaData(container, key);
-            if (metadata == null) return null;
-            return new FileMetadata(key,metadata.getLength(),metadata.getLastModified());
-        } catch (Exception e) {
-            if (e.getCause() instanceof IOException) {
-                throw (IOException) e.getCause();
-            }
-            throw new SwiftException(e);
-        }
-    }
-
-    public InputStream retrieve(String key) throws IOException {
-        try {
-            // returns null if not found
-            return swift.getS(container,key);
-        } catch (Exception e) {
-            if (e instanceof IOException) {
-                throw (IOException) e;
-            }
-            throw new SwiftException(e);
-        }
-    }
-
-    public InputStream retrieve(String key, long byteRangeStart)
-            throws IOException {
-        try {
-            // returns null if not found
-            return swift.getS(container,key,byteRangeStart);
-        } catch (Exception e) {
-            if (e instanceof IOException) {
-                throw (IOException) e;
-            }
-            throw new SwiftException(e);
-        }
-    }
-
-    public PartialListing list(String prefix, int maxListingLength)
-            throws IOException {
-        return list(prefix, maxListingLength, null);
-    }
-
-    public PartialListing list(String prefix, int maxListingLength,
-            String priorLastKey) throws IOException {
-
-        return list(prefix, PATH_DELIMITER, maxListingLength, priorLastKey);
-    }
-
-    public PartialListing listAll(String prefix, int maxListingLength,
-            String priorLastKey) throws IOException {
-
-        return list(prefix, null, maxListingLength, priorLastKey);
-    }
-
-    private PartialListing list(String prefix, String delimiter,
-            int maxListingLength, String priorLastKey) throws IOException {
-        try {
-            String lastKey = null;
-            if (prefix.length() > 0 && !prefix.endsWith(PATH_DELIMITER)) {
-                prefix += PATH_DELIMITER;
-            }
-
-            JsonNode list = swift.list(container, prefix, delimiter, maxListingLength, priorLastKey);
-
-            int size = list.size();
-            FileMetadata[] metadata = new FileMetadata[size];
-            String[] keys = new String[size];
-
-            for (int i =0; i < size; i++) {
-                JsonNode item = list.get(i);
-                String key = item.get("name").getTextValue();
-                long len = item.get("bytes").getLongValue();
-                String lm = item.get("last_modified").getTextValue();
-                SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSSSS");
-                format.setTimeZone(TimeZone.getTimeZone("GMT"));
-                Date date = format.parse(lm);
-                long lastMod = date.getTime();
-                keys[i] = key;
-                metadata[i] = new FileMetadata(key,len,lastMod);
-                lastKey = key;
-            }
-
-            return new PartialListing(lastKey,metadata,keys);
-        } catch (Exception e) {
-            if (e.getCause() instanceof IOException) {
-                throw (IOException) e.getCause();
-            }
-            e.printStackTrace();
-            throw new SwiftException(e);
-        }
-    }
-
-    public void delete(String key) throws IOException {
-        try {
-            swift.delete(container,key);
-        } catch (Exception e) {
-            if (e instanceof IOException) {
-                throw (IOException) e;
-            }
-            throw new SwiftException(e);
-        }
-    }
-
-    public void rename(String srcKey, String dstKey) throws IOException {
-        try {
-            swift.copy(container,srcKey,dstKey);
-            swift.delete(container,srcKey);
-        } catch (Exception e) {
-            if (e instanceof IOException) {
-                throw (IOException) e;
-            }
-            throw new SwiftException(e);
-        }     
-    }
-
-    public void purge(String prefix) throws IOException {
-        try {
-            JsonNode list = swift.list(container, prefix, null, 0, null);
-            int size = list.size();
-            for (int i = 0; i < size; i++) {
-                JsonNode item = list.get(i);
-                String key = item.get("name").getTextValue();
-                swift.delete(container, key);
-            }
-        } catch (Exception e) {
-            if (e.getCause() instanceof IOException) {
-                throw (IOException) e.getCause();
-            }
-            throw new SwiftException(e);
-        }
-    }
-
-    public void dump() throws IOException {
-        StringBuilder sb = new StringBuilder("Swift Native Filesystem, ");
-        sb.append(container).append("\n");
-        try {
-            JsonNode list = swift.list(container, null, null, 0, null);
-            int size = list.size();
-            for (int i = 0; i < size; i++) {
-                JsonNode item = list.get(i);
-                String key = item.get("name").getTextValue();
-                sb.append(key).append("\n");
-            }
-        } catch (Exception e) {
-            if (e.getCause() instanceof IOException) {
-                throw (IOException) e.getCause();
-            }
-            throw new SwiftException(e);
-        }
-    }
-
-}
diff --git a/hadoop-swiftn-driver/src/main/java/org/hpswift/service/Credentials.java b/hadoop-swiftn-driver/src/main/java/org/hpswift/service/Credentials.java
deleted file mode 100644
index ecd4c14..0000000
--- a/hadoop-swiftn-driver/src/main/java/org/hpswift/service/Credentials.java
+++ /dev/null
@@ -1,140 +0,0 @@
-package org.hpswift.service;
-
-import java.io.BufferedReader;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.StringWriter;
-
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpHost;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.conn.params.ConnRoutePNames;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.client.DefaultHttpClient;
-import org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager;
-import org.codehaus.jackson.JsonNode;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.node.JsonNodeFactory;
-import org.codehaus.jackson.node.ObjectNode;
-
-public class Credentials {
-    private String accessKey;
-    private String secretKey;
-    private String tenantId;
-    private String authUri;
-
-    public HttpClient client = null;
-
-    private static JsonNodeFactory fact = JsonNodeFactory.instance;
-    private static ObjectMapper m = new ObjectMapper();
-
-
-    public Credentials(String aKey, String sKey, String tId, String aUri){
-        accessKey = aKey;
-        secretKey  =  sKey;
-        tenantId = tId;
-        authUri = aUri;
-        ThreadSafeClientConnManager cm = new ThreadSafeClientConnManager();
-        cm.setMaxTotal(500);
-        cm.setDefaultMaxPerRoute(500);
-        client = new DefaultHttpClient(cm);
-        HttpHost proxy = new HttpHost("proxy-ccy.houston.hp.com", 8080);
-        client.getParams().setParameter(ConnRoutePNames.DEFAULT_PROXY, proxy);
-    }
-
-    public void checkCode(HttpResponse response,int code,String msg) throws Exception {
-        if (code >= 200 && code < 300) {
-            return;
-        }
-
-        int len = 0;
-        HttpEntity ent = response.getEntity();
-        if (ent != null) {
-            len = (int) ent.getContentLength();
-        }
-
-        if (len != 0) {
-            StringBuilder sb = new StringBuilder();
-            BufferedReader rd = new BufferedReader(new InputStreamReader(response.getEntity().getContent()));
-            String line = null;
-            while ((line = rd.readLine()) != null) {
-                sb.append(line + "\n");
-            }
-            rd.close();
-            String s = sb.toString();
-
-            // System.out.println(s);
-        }
-        throw new Exception(code + " - " + msg);
-    }
-
-    public JsonNode getAuth(String type) throws Exception {
-        // TODO return same token if not expired
-        ObjectNode info = fact.objectNode();
-        ObjectNode auth = fact.objectNode();
-        ObjectNode cred = fact.objectNode();
-
-        info.put("auth", auth);
-        auth.put("apiAccessKeyCredentials", cred);
-        cred.put("accessKey", accessKey);
-        cred.put("secretKey", secretKey);
-        auth.put("tenantId", tenantId);
-
-        StringWriter w = new StringWriter();
-        m.writeValue(w, info);
-        String infos = w.toString();
-
-        HttpPost post = new HttpPost(authUri + "tokens");
-        HttpEntity e = new StringEntity(infos);
-        post.setEntity(e);
-        post.setHeader("Accept", "application/json");
-        post.setHeader("Content-Type", "application/json");
-
-        HttpResponse response = client.execute(post);
-        int code = response.getStatusLine().getStatusCode();
-        checkCode(response, code, "AUTH");
-
-        InputStream r = response.getEntity().getContent();
-        ObjectNode n = m.readValue(r, ObjectNode.class);
-        String authToken = n.get("access").get("token").get("id").getTextValue();
-        String storageUrl = "";
-        JsonNode cat = n.get("access").get("serviceCatalog");
-
-        for (int i = 0; i < cat.size(); i++) {
-            JsonNode service = cat.get(i);
-            if (service.get("type").getTextValue().equals(type)) {
-                JsonNode ep = service.get("endpoints");
-                JsonNode ep0 = ep.get(0);
-                JsonNode puburl = ep0.get("publicURL");
-                storageUrl = puburl.getTextValue();
-                break;
-            }
-        }
-
-        r.close();
-        post.abort();   
-
-        ObjectNode result = fact.objectNode();
-        result.put("token",authToken);
-        result.put("url",storageUrl);
-        return result;
-    }
-
-    public String getAccessKey(){
-        return accessKey;
-    }
-
-    public String getSecretKey(){
-        return secretKey;
-    }
-
-    public String getTenantId(){
-        return tenantId;
-    }
-
-    String getAuthUri(){
-        return authUri;
-    }
-}
diff --git a/hadoop-swiftn-driver/src/main/java/org/hpswift/service/Swift.java b/hadoop-swiftn-driver/src/main/java/org/hpswift/service/Swift.java
deleted file mode 100644
index f4ecb50..0000000
--- a/hadoop-swiftn-driver/src/main/java/org/hpswift/service/Swift.java
+++ /dev/null
@@ -1,281 +0,0 @@
-package org.hpswift.service;
-
-import java.io.BufferedReader;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.URLEncoder;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Formatter;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Arrays;
-import java.util.TimeZone;
-
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.methods.HttpDelete;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpHead;
-import org.apache.http.client.methods.HttpPut;
-import org.apache.http.entity.ByteArrayEntity;
-import org.apache.http.entity.InputStreamEntity;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager;
-import org.codehaus.jackson.JsonNode;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.node.ArrayNode;
-import org.codehaus.jackson.node.JsonNodeFactory;
-
-public class Swift {
-
-    private Credentials credentials = null;
-    private HttpClient client = null;
-
-    private String authToken = "";
-    private String storageUrl = "";
-
-    private static JsonNodeFactory fact = JsonNodeFactory.instance;
-    private static ObjectMapper m = new ObjectMapper();
-
-
-    private void getAuth() throws Exception {
-        JsonNode auth = credentials.getAuth("object-store");
-        authToken = auth.get("token").getTextValue();
-        storageUrl = auth.get("url").getTextValue();
-    }
-
-
-    /*
-    public byte[] get(String container, String key) throws Exception {
-        getAuth();
-        HttpGet cmd = new HttpGet(storageUrl + "/" + container +"/" + key);
-        cmd.setHeader("X-Auth-Token", authToken);
-        HttpResponse response = client.execute(cmd);
-        int code = response.getStatusLine().getStatusCode();
-        credentials.checkCode(response,code,"GET:" + container +":" + key);
-        int len = (int) response.getEntity().getContentLength();
-        byte buff[] = new byte[len];
-        InputStream r = response.getEntity().getContent();
-        int off = 0;
-        while (true) {
-            int len1 = r.read(buff, off, len);
-            if (len1 <= 0) break;
-            off += len1;
-            len -= len1;
-        }
-        r.close();
-        //cmd.abort();    
-        return buff;
-    }
-     */
-
-    public InputStream getS(String container, String key) throws Exception {
-        HttpGet cmd = new HttpGet(storageUrl + "/" + container +"/" + key);
-        cmd.setHeader("X-Auth-Token", authToken);
-
-        HttpResponse response = client.execute(cmd);
-        int code = response.getStatusLine().getStatusCode();
-        if (code == 404) {
-            return null;
-        }
-
-        credentials.checkCode(response,code,"GET:" + container +":" + key);
-        InputStream r = response.getEntity().getContent();
-        return r;
-    }
-
-
-    public InputStream getS(String container, String key,long start) throws Exception {
-        HttpGet cmd = new HttpGet(storageUrl + "/" + container +"/" + key);
-        cmd.setHeader("X-Auth-Token", authToken);
-        cmd.setHeader("Range","bytes="+start+"-");
-
-        HttpResponse response = client.execute(cmd);
-        int code = response.getStatusLine().getStatusCode();
-        if (code == 404) {
-            return null;
-        }
-
-        credentials.checkCode(response,code,"GET:" + container +":" + key);
-        InputStream r = response.getEntity().getContent();
-        return r;
-    }
-
-    public SwiftMetadata getMetaData(String container, String key) throws Exception {
-        getAuth();
-        HttpHead cmd = new HttpHead(storageUrl + "/" + container +"/" + key);
-        cmd.setHeader("X-Auth-Token", authToken);
-
-        HttpResponse response = client.execute(cmd);
-        int code = response.getStatusLine().getStatusCode();
-        if (code == 404) {
-            cmd.abort();
-            return null; //not found
-        }
-
-        credentials.checkCode(response,code,"HEAD:" + container +":" + key);
-        String slen = response.getHeaders("Content-Length")[0].getValue();
-        String smod = response.getHeaders("Last-Modified")[0].getValue();
-
-        // TODO decode len and mod
-        long len = slen.length();
-        SimpleDateFormat format = new SimpleDateFormat("EEE, d MMM yyyy HH:mm:ss Z");
-        format.setTimeZone(TimeZone.getTimeZone("GMT"));
-        Date date = format.parse(smod);
-        long mod =  date.getTime();  
-        cmd.abort();
-
-        return new SwiftMetadata(len, mod);
-    }
-
-    public void put(String container, String key, byte val[]) throws Exception {
-        getAuth();
-        HttpPut cmd = new HttpPut(storageUrl + "/" + container +"/" + key);
-        cmd.setHeader("X-Auth-Token", authToken);
-
-        HttpEntity e = new ByteArrayEntity(val);
-        cmd.setEntity(e);
-
-        HttpResponse response = client.execute(cmd);
-        int code = response.getStatusLine().getStatusCode();
-
-        credentials.checkCode(response,code,"PUT:" + container +":" + key);
-        cmd.abort();    
-    }
-
-    public void copy(String container, String srcKey, String dstKey) throws Exception {
-        getAuth();
-        HttpPut cmd = new HttpPut(storageUrl + "/" + container +"/" + dstKey);
-        cmd.setHeader("X-Auth-Token", authToken);
-        cmd.setHeader("X-Copy-From", "/" + container +"/" + srcKey);
-        HttpEntity e = new StringEntity("");
-        cmd.setEntity(e);
-
-        HttpResponse response = client.execute(cmd);
-        int code = response.getStatusLine().getStatusCode();
-
-        credentials.checkCode(response,code,"COPY:" + container +":" + srcKey +":" + dstKey);
-        cmd.abort();    
-    }
-
-    private static String bytesToHexString(byte[] bytes) {
-        StringBuilder sb = new StringBuilder(bytes.length * 2);
-        Formatter formatter = new Formatter(sb);
-        for (byte b : bytes) {
-            formatter.format("%02x", b);
-        }
-        return sb.toString();
-    }
-
-    public void putStream(String container, String key, InputStream in,byte[] md5) throws Exception {
-        // Note: value size must be less than 5GB
-        getAuth();
-        HttpPut cmd = new HttpPut(storageUrl + "/" + container +"/" + key);
-        cmd.setHeader("X-Auth-Token", authToken);
-        cmd.setHeader("ETag", bytesToHexString(md5));
-        HttpEntity e = new InputStreamEntity(in,-1);
-        cmd.setEntity(e);
-
-        HttpResponse response = client.execute(cmd);
-        int code = response.getStatusLine().getStatusCode();
-
-        credentials.checkCode(response,code,"PUT:" + container +":" + key);
-        cmd.abort();    
-    }
-
-    public void delete(String container, String key) throws Exception {
-        getAuth();
-        HttpDelete cmd = new HttpDelete(storageUrl + "/" + container +"/" + key);
-        cmd.setHeader("X-Auth-Token", authToken);
-
-        HttpResponse response = client.execute(cmd);
-        int code = response.getStatusLine().getStatusCode();
-
-        credentials.checkCode(response,code,"DELETE:" + container +":" + key);
-        cmd.abort();    
-    }
-
-    public JsonNode list(String container,String prefix, String delimiter, int limit, String marker) throws Exception {
-        String q = "?format=json";
-        if (limit > 0) {
-            q = q + ("&limit=" + limit);
-        }
-
-        if (prefix != null) {
-            q = q + ("&prefix=" + URLEncoder.encode(prefix,"UTF-8"));
-        }
-
-        if (delimiter != null) {
-            q = q + ("&delimiter=" + URLEncoder.encode(delimiter,"UTF-8"));
-        }
-
-        if (marker != null) {
-            q = q + ("&marker=" + marker);
-        }
-
-        getAuth();
-        HttpGet cmd = new HttpGet(storageUrl + "/" + container + q);
-        cmd.setHeader("X-Auth-Token", authToken);
-
-        HttpResponse response = client.execute(cmd);
-        int len = 0;
-        HttpEntity ent = response.getEntity();
-        if (ent != null) {
-            len = (int) ent.getContentLength();
-        }
-
-        if (len == 0) {
-            return fact.arrayNode();
-        }
-
-        StringBuilder sb = new StringBuilder();
-        BufferedReader rd = new BufferedReader(new InputStreamReader(response.getEntity().getContent()));
-        String line = null;
-        while ((line = rd.readLine()) != null) {
-            sb.append(line + "\n");
-        }
-        rd.close();
-
-        String rs = sb.toString();  
-        ArrayNode result = (ArrayNode) m.readValue(rs,JsonNode.class);
-        return result;
-    }
-
-
-    public List<String> allContainers() throws Exception {
-        getAuth();
-        HttpGet cmd = new HttpGet(storageUrl);
-        cmd.setHeader("X-Auth-Token", authToken);
-
-        HttpResponse response = client.execute(cmd);
-        int len = 0;
-        HttpEntity ent = response.getEntity();
-        if (ent != null) {
-            len = (int) ent.getContentLength();
-        }
-        if (len == 0) {
-            return new ArrayList<String>();
-        }
-
-        StringBuilder sb = new StringBuilder();
-        BufferedReader rd = new BufferedReader(new InputStreamReader(response.getEntity().getContent()));
-        String line = null;
-        while ((line = rd.readLine()) != null) {
-            sb.append(line + "\n");
-        }
-        rd.close();
-        cmd.abort();    
-
-        String result = sb.toString();   
-        ArrayList<String> al = new ArrayList<String>(Arrays.asList(result.split("\n")));
-        return al;
-    }
-
-
-    public Swift(Credentials credentials) throws Exception {
-        this.credentials = credentials;
-        client = credentials.client;
-    }
-}
diff --git a/hadoop-swiftn-driver/src/main/java/org/hpswift/service/SwiftMetadata.java b/hadoop-swiftn-driver/src/main/java/org/hpswift/service/SwiftMetadata.java
deleted file mode 100644
index 9ff3393..0000000
--- a/hadoop-swiftn-driver/src/main/java/org/hpswift/service/SwiftMetadata.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package org.hpswift.service;
-
-public class SwiftMetadata {
-    private final long length;
-    private final long lastModified;
-
-    public SwiftMetadata(long length, long lastModified) {
-        this.length = length;
-        this.lastModified = lastModified;
-    }
-
-    public long getLength() {
-        return length;
-    }
-
-    public long getLastModified() {
-        return lastModified;
-    }
-
-    @Override
-    public String toString() {
-        return "SwiftMetadata[" + length + ", " + lastModified + "]";
-    }
-
-}
diff --git a/hadoop-swiftn-driver/src/test/java/org/apache/hadoop/fs/swift/TestSwiftNativeCredentials.java b/hadoop-swiftn-driver/src/test/java/org/apache/hadoop/fs/swift/TestSwiftNativeCredentials.java
deleted file mode 100644
index e598813..0000000
--- a/hadoop-swiftn-driver/src/test/java/org/apache/hadoop/fs/swift/TestSwiftNativeCredentials.java
+++ /dev/null
@@ -1,37 +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.
- */
-package org.apache.hadoop.fs.swift;
-
-import java.net.URI;
-
-import junit.framework.TestCase;
-
-import org.apache.hadoop.conf.Configuration;
-
-public class TestSwiftNativeCredentials extends TestCase {
-    
-    public void testInvalidHostnameWithUnderscores() throws Exception {
-        SwiftCredentials swiftCredentials = new SwiftCredentials();
-        try {
-            swiftCredentials.initialize(new URI("swiftn://a:b@c_d"), new Configuration());
-            fail("Should throw IllegalArgumentException");
-        } catch (IllegalArgumentException e) {
-            //assertEquals("Invalid hostname in URI swiftn://a:b@c_d", e.getMessage());
-        }
-    }
-}
diff --git a/hadoop-swiftn-driver/src/test/java/org/apache/hadoop/fs/swiftnative/NativeSwiftFileSystemContractBaseTest.java b/hadoop-swiftn-driver/src/test/java/org/apache/hadoop/fs/swiftnative/NativeSwiftFileSystemContractBaseTest.java
deleted file mode 100644
index 03f65ad..0000000
--- a/hadoop-swiftn-driver/src/test/java/org/apache/hadoop/fs/swiftnative/NativeSwiftFileSystemContractBaseTest.java
+++ /dev/null
@@ -1,58 +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.
- */
-
-package org.apache.hadoop.fs.swiftnative;
-
-import java.io.IOException;
-import java.net.URI;
-
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.FileStatus;
-import org.apache.hadoop.fs.FileSystemContractBaseTest;
-import org.apache.hadoop.fs.Path;
-
-public abstract class NativeSwiftFileSystemContractBaseTest extends FileSystemContractBaseTest {
-
-    private NativeFileSystemStore store;
-
-    abstract NativeFileSystemStore getNativeFileSystemStore() throws IOException;
-
-    @Override
-    protected void setUp() throws Exception {
-        Configuration conf = new Configuration();
-        store = getNativeFileSystemStore();
-        fs = new NativeSwiftFileSystem(store);
-        fs.initialize(URI.create(conf.get("test.fs.swiftn.name")), conf);
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        store.purge("test");
-        super.tearDown();
-    }
-
-    public void testListStatusForRoot() throws Exception {
-        Path testDir = path("/test");
-        assertTrue(fs.mkdirs(testDir));
-
-        FileStatus[] paths = fs.listStatus(path("/"));
-        assertEquals(1, paths.length);
-        assertEquals(path("/test"), paths[0].getPath());
-    }
-
-}
diff --git a/hadoop-swiftn-driver/src/test/java/org/apache/hadoop/fs/swiftnative/SwiftNativeFileSystemContractTest.java b/hadoop-swiftn-driver/src/test/java/org/apache/hadoop/fs/swiftnative/SwiftNativeFileSystemContractTest.java
deleted file mode 100644
index 99c62b6..0000000
--- a/hadoop-swiftn-driver/src/test/java/org/apache/hadoop/fs/swiftnative/SwiftNativeFileSystemContractTest.java
+++ /dev/null
@@ -1,29 +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.
- */
-
-package org.apache.hadoop.fs.swiftnative;
-
-import java.io.IOException;
-
-public class SwiftNativeFileSystemContractTest extends NativeSwiftFileSystemContractBaseTest {
-
-    @Override
-    NativeFileSystemStore getNativeFileSystemStore() throws IOException {
-        return new SwiftNativeFileSystemStore();
-    }
-}
diff --git a/hadoop-swiftn-driver/swift-examples b/hadoop-swiftn-driver/swift-examples
deleted file mode 100755
index 5b47ab2..0000000
--- a/hadoop-swiftn-driver/swift-examples
+++ /dev/null
@@ -1,16 +0,0 @@
-#remove word out if it exists
-bin/hadoop fs -rmr swiftn://output/wordout
-# input and output from HPCloud Object store
-bin/hadoop jar build/hadoop-examples-*.jar wordcount swiftn://input swiftn://output/wordout
-
-bin/hadoop fs -cat swiftn://output/wordout/*
-
-bin/hadoop fs -lsr swiftn://input
-
-#input from swift and output to local file system
-bin/hadoop jar build/hadoop-examples-*.jar wordcount swiftn://input file:///home/output
- 
-bin/hadoop fs -rmr /cloudout
-
-#input from swift and output to hdfs
-bin/hadoop jar build/hadoop-examples-*.jar wordcount swiftn://input hdfs://localhost:9000/cloudout