You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by dd...@apache.org on 2011/09/18 06:19:16 UTC
svn commit: r1172192 - in /hadoop/common/branches/branch-0.20-security:
CHANGES.txt src/contrib/capacity-scheduler/build.xml
src/contrib/fairscheduler/build.xml src/contrib/thriftfs/build.xml
src/packages/templates/conf/hadoop-env.sh
Author: ddas
Date: Sun Sep 18 04:19:16 2011
New Revision: 1172192
URL: http://svn.apache.org/viewvc?rev=1172192&view=rev
Log:
HADOOP-7615. Fixes to have contrib jars in the HADOOP_CLASSPATH for the binary layout case. Contributed by Eric Yang.
Modified:
hadoop/common/branches/branch-0.20-security/CHANGES.txt
hadoop/common/branches/branch-0.20-security/src/contrib/capacity-scheduler/build.xml
hadoop/common/branches/branch-0.20-security/src/contrib/fairscheduler/build.xml
hadoop/common/branches/branch-0.20-security/src/contrib/thriftfs/build.xml
hadoop/common/branches/branch-0.20-security/src/packages/templates/conf/hadoop-env.sh
Modified: hadoop/common/branches/branch-0.20-security/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/CHANGES.txt?rev=1172192&r1=1172191&r2=1172192&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.20-security/CHANGES.txt Sun Sep 18 04:19:16 2011
@@ -190,6 +190,9 @@ Release 0.20.205.0 - unreleased
HADOOP-7630. Fixes hadoop-metrics2.properties to have a property
*.period set to a default value. (Eric Yang via ddas)
+ HADOOP-7615. Fixes to have contrib jars in the HADOOP_CLASSPATH
+ for the binary layout case. (Eric Yang via ddas)
+
IMPROVEMENTS
MAPREDUCE-2187. Reporter sends progress during sort/merge. (Anupam Seth via
Modified: hadoop/common/branches/branch-0.20-security/src/contrib/capacity-scheduler/build.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/src/contrib/capacity-scheduler/build.xml?rev=1172192&r1=1172191&r2=1172192&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security/src/contrib/capacity-scheduler/build.xml (original)
+++ hadoop/common/branches/branch-0.20-security/src/contrib/capacity-scheduler/build.xml Sun Sep 18 04:19:16 2011
@@ -25,4 +25,15 @@ to call at top-level: ant deploy-contrib
<import file="../build-contrib.xml"/>
+ <!-- ====================================================== -->
+ <!-- Package a Hadoop contrib -->
+ <!-- ====================================================== -->
+ <target name="package" depends="jar, jar-examples" unless="skip.contrib">
+ <copy todir="${dist.dir}/lib" includeEmptyDirs="false" flatten="true">
+ <fileset dir="${build.dir}">
+ <include name="hadoop-${name}-${version}.jar" />
+ </fileset>
+ </copy>
+ </target>
+
</project>
Modified: hadoop/common/branches/branch-0.20-security/src/contrib/fairscheduler/build.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/src/contrib/fairscheduler/build.xml?rev=1172192&r1=1172191&r2=1172192&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security/src/contrib/fairscheduler/build.xml (original)
+++ hadoop/common/branches/branch-0.20-security/src/contrib/fairscheduler/build.xml Sun Sep 18 04:19:16 2011
@@ -25,4 +25,15 @@ to call at top-level: ant deploy-contrib
<import file="../build-contrib.xml"/>
+ <!-- ====================================================== -->
+ <!-- Package a Hadoop contrib -->
+ <!-- ====================================================== -->
+ <target name="package" depends="jar, jar-examples" unless="skip.contrib">
+ <copy todir="${dist.dir}/lib" includeEmptyDirs="false" flatten="true">
+ <fileset dir="${build.dir}">
+ <include name="hadoop-${name}-${version}.jar" />
+ </fileset>
+ </copy>
+ </target>
+
</project>
Modified: hadoop/common/branches/branch-0.20-security/src/contrib/thriftfs/build.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/src/contrib/thriftfs/build.xml?rev=1172192&r1=1172191&r2=1172192&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security/src/contrib/thriftfs/build.xml (original)
+++ hadoop/common/branches/branch-0.20-security/src/contrib/thriftfs/build.xml Sun Sep 18 04:19:16 2011
@@ -60,5 +60,15 @@ to call at top-level: ant deploy-contrib
</antcall>
</target>
+ <!-- ====================================================== -->
+ <!-- Package a Hadoop contrib -->
+ <!-- ====================================================== -->
+ <target name="package" depends="jar, jar-examples" unless="skip.contrib">
+ <copy todir="${dist.dir}/lib" includeEmptyDirs="false" flatten="true">
+ <fileset dir="${build.dir}">
+ <include name="hadoop-${name}-${version}.jar" />
+ </fileset>
+ </copy>
+ </target>
</project>
Modified: hadoop/common/branches/branch-0.20-security/src/packages/templates/conf/hadoop-env.sh
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/src/packages/templates/conf/hadoop-env.sh?rev=1172192&r1=1172191&r2=1172192&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security/src/packages/templates/conf/hadoop-env.sh (original)
+++ hadoop/common/branches/branch-0.20-security/src/packages/templates/conf/hadoop-env.sh Sun Sep 18 04:19:16 2011
@@ -9,15 +9,6 @@
export JAVA_HOME=${JAVA_HOME}
export HADOOP_CONF_DIR=${HADOOP_CONF_DIR:-"/etc/hadoop"}
-# Extra Java CLASSPATH elements. Automatically insert capacity-scheduler.
-for f in $HADOOP_HOME/contrib/capacity-scheduler/*.jar; do
- if [ "$HADOOP_CLASSPATH" ]; then
- export HADOOP_CLASSPATH=$HADOOP_CLASSPATH:$f
- else
- export HADOOP_CLASSPATH=$f
- fi
-done
-
# The maximum amount of heap to use, in MB. Default is 1000.
#export HADOOP_HEAPSIZE=
#export HADOOP_NAMENODE_INIT_HEAPSIZE=""