Author: suresh
Date: Mon Apr 29 02:23:29 2013
New Revision: 1476878
URL: http://svn.apache.org/r1476878
Log:
HADOOP-9472. Cleanup hadoop-config.cmd. Contributed by Ivan Mitic.
Modified:
hadoop/common/branches/branch-1-win/CHANGES.branch-1-win.txt
hadoop/common/branches/branch-1-win/bin/hadoop-config.cmd
Modified: hadoop/common/branches/branch-1-win/CHANGES.branch-1-win.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1-win/CHANGES.branch-1-win.txt?rev=1476878&r1=1476877&r2=1476878&view=diff
==============================================================================
--- hadoop/common/branches/branch-1-win/CHANGES.branch-1-win.txt (original)
+++ hadoop/common/branches/branch-1-win/CHANGES.branch-1-win.txt Mon Apr 29
02:23:29 2013
@@ -263,6 +263,8 @@ Branch-hadoop-1-win (branched from branc
HADOOP-9452. Windows install scripts bugfixes. (Ivan Mitic via suresh)
+ HADOOP-9472. Cleanup hadoop-config.cmd. (Ivan Mitic via suresh)
+
Merged from branch-1
HDFS-385. Backport: Add support for an experimental API that allows a
Modified: hadoop/common/branches/branch-1-win/bin/hadoop-config.cmd
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1-win/bin/hadoop-config.cmd?rev=1476878&r1=1476877&r2=1476878&view=diff
==============================================================================
--- hadoop/common/branches/branch-1-win/bin/hadoop-config.cmd (original)
+++ hadoop/common/branches/branch-1-win/bin/hadoop-config.cmd Mon Apr 29
02:23:29 2013
@@ -203,66 +203,6 @@ if defined JAVA_LIBRARY_PATH (
set HADOOP_OPTS=%HADOOP_OPTS% -Dhadoop.policy.file=%HADOOP_POLICYFILE%
@rem
-@rem put hdfs in classpath if present
-@rem
-
-if not defined HADOOP_HDFS_HOME (
- if exist %HADOOP_HOME%\hdfs (
- set HADOOP_HDFS_HOME=%HADOOP_HOME%\hdfs
- )
-)
-
-if defined HADOOP_HDFS_HOME (
- for %%i in (%HADOOP_HDFS_HOME%\hadoop-hdfs-*.jar) do (
- set CLASSPATH=!CLASSPATH!;%%i
- )
-
- for %%i in (%HADOOP_HDFS_HOME%\lib\*.jar) do (
- set CLASSPATH=!CLASSPATH!;%%i
- )
-
- if exist %HADOOP_HDFS_HOME%\build\classes (
- set CLASSPATH=%CLASSPATH%;%HADOOP_HDFS_HOME%\build\classes
- )
-)
-
-@rem
-@rem set mapred home if mapred is present
-@rem
-
-if not defined HADOOP_MAPRED_HOME (
- if exist %HADOOP_HOME%\mapred (
- set HADOOP_MAPRED_HOME=%HADOOP_HOME%\mapred
- )
-)
-
-if defined HADOOP_MAPRED_HOME (
- for %%i in (%HADOOP_MAPRED_HOME%\hadoop-mapred-*.jar) do (
- set CLASSPATH=!CLASSPATH!;%%i
- )
-
- for %%i in (%HADOOP_MAPRED_HOME%\lib\*.jar) do (
- set CLASSPATH=!CLASSPATH!;%%i
- )
-
- if exist %HADOOP_MAPRED_HOME%\build\classes (
- set CLASSPATH=%CLASSPATH%;%HADOOP_MAPRED_HOME%\build\classes
- )
-
- if exist %HADOOP_MAPRED_HOME%\build\tools (
- set CLASSPATH=%CLASSPATH%;%HADOOP_MAPRED_HOME%\build\tools
- )
-
- for %%i in (%HADOOP_MAPRED_HOME%\hadoop-mapred-tools-*.jar) do (
- set TOOL_PATH=!TOOL_PATH!;%%i
- )
-
- for %%i in (%HADOOP_MAPRED_HOME%\build\hadoop-mapred-tools-*.jar) do (
- set TOOL_PATH=!TOOL_PATH!;%%i
- )
-)
-
-@rem
@rem add user-specified CLASSPATH last
@rem
