svn commit: r1211738 - in /hadoop/common/branches/branch-1.0: CHANGES.txt bin/hadoop src/docs/releasenotes.html

[ma...@apache.org]

Author: mattf
Date: Thu Dec  8 02:10:13 2011
New Revision: 1211738

URL: http://svn.apache.org/viewvc?rev=1211738&view=rev
Log:
Revert HADOOP-7810.

Modified:
    hadoop/common/branches/branch-1.0/CHANGES.txt
    hadoop/common/branches/branch-1.0/bin/hadoop
    hadoop/common/branches/branch-1.0/src/docs/releasenotes.html

Modified: hadoop/common/branches/branch-1.0/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.0/CHANGES.txt?rev=1211738&r1=1211737&r2=1211738&view=diff
==============================================================================
--- hadoop/common/branches/branch-1.0/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1.0/CHANGES.txt Thu Dec  8 02:10:13 2011
@@ -47,8 +47,6 @@ Release 1.0.0 - 2011.11.27
 
     HDFS-2552. Add Forrest doc for WebHDFS REST API.  (szetszwo)
 
-    HADOOP-7810. Add tools jar to the end of classpath. (John George via omalley)
-
     HDFS-2246. Shortcut a local client reads to a Datanodes files directly. 
     (Andrew Purtell, Suresh, Jitendra)
 

Modified: hadoop/common/branches/branch-1.0/bin/hadoop
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.0/bin/hadoop?rev=1211738&r1=1211737&r2=1211738&view=diff
==============================================================================
--- hadoop/common/branches/branch-1.0/bin/hadoop (original)
+++ hadoop/common/branches/branch-1.0/bin/hadoop Thu Dec  8 02:10:13 2011
@@ -210,9 +210,6 @@ if [ "$HADOOP_USER_CLASSPATH_FIRST" = ""
   CLASSPATH=${CLASSPATH}:${HADOOP_CLASSPATH}
 fi
 
-# adding TOOL_PATH to CLASSPATH. TOOL_PATH is added after HADOOP_CLASSPATH.
-CLASSPATH=${CLASSPATH}:${TOOL_PATH}
-
 # default log directory & file
 if [ "$HADOOP_LOG_DIR" = "" ]; then
   HADOOP_LOG_DIR="$HADOOP_HOME/logs"
@@ -295,12 +292,14 @@ elif [ "$COMMAND" = "jar" ] ; then
   HADOOP_OPTS="$HADOOP_OPTS $HADOOP_CLIENT_OPTS"
 elif [ "$COMMAND" = "distcp" ] ; then
   CLASS=org.apache.hadoop.tools.DistCp
+  CLASSPATH=${CLASSPATH}:${TOOL_PATH}
   HADOOP_OPTS="$HADOOP_OPTS $HADOOP_CLIENT_OPTS"
 elif [ "$COMMAND" = "daemonlog" ] ; then
   CLASS=org.apache.hadoop.log.LogLevel
   HADOOP_OPTS="$HADOOP_OPTS $HADOOP_CLIENT_OPTS"
 elif [ "$COMMAND" = "archive" ] ; then
   CLASS=org.apache.hadoop.tools.HadoopArchives
+  CLASSPATH=${CLASSPATH}:${TOOL_PATH}
   HADOOP_OPTS="$HADOOP_OPTS $HADOOP_CLIENT_OPTS"
 elif [ "$COMMAND" = "sampler" ] ; then
   CLASS=org.apache.hadoop.mapred.lib.InputSampler

Modified: hadoop/common/branches/branch-1.0/src/docs/releasenotes.html
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.0/src/docs/releasenotes.html?rev=1211738&r1=1211737&r2=1211738&view=diff
==============================================================================
--- hadoop/common/branches/branch-1.0/src/docs/releasenotes.html (original)
+++ hadoop/common/branches/branch-1.0/src/docs/releasenotes.html Thu Dec  8 02:10:13 2011
@@ -110,11 +110,6 @@ Previous hftp feature was a read-only Fi
      <b>enable hadoop config generator to set dfs.block.local-path-access.user to enable short circuit read</b><br>
      <blockquote>we have a new config that allows to select which user can have access for short circuit read. We should make that configurable through the config generator scripts.</blockquote></li>
 
-<li> <a href="https://issues.apache.org/jira/browse/HADOOP-7810">HADOOP-7810</a>.
-     Blocker bug reported by johnvijoe and fixed by johnvijoe <br>
-     <b>move hadoop archive to core from tools</b><br>
-     <blockquote>&quot;The HadoopArchieves classes are included in the $HADOOP_HOME/hadoop_tools.jar, but this file is not found in `hadoop classpath`.<br><br>A Pig script using HCatalog&apos;s dynamic partitioning with HAR enabled will therefore fail if a jar with HAR is not included in the pig call&apos;s &apos;-cp&apos; and &apos;-Dpig.additional.jars&apos; arguments.&quot;<br><br>I am not aware of any reason to not include hadoop-tools.jar in &apos;hadoop classpath&apos;. Will attach a patch soon.</blockquote></li>
-
 <li> <a href="https://issues.apache.org/jira/browse/HADOOP-7815">HADOOP-7815</a>.
      Minor bug reported by rramya and fixed by rramya (conf)<br>
      <b>Map memory mb is being incorrectly set by hadoop-setup-conf.sh</b><br>