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 ac...@apache.org on 2012/06/11 15:59:07 UTC

svn commit: r1348851 - in /hadoop/common/branches/branch-1-win: CHANGES.txt bin/hadoop-config.cmd

Author: acmurthy
Date: Mon Jun 11 13:59:06 2012
New Revision: 1348851

URL: http://svn.apache.org/viewvc?rev=1348851&view=rev
Log:
HADOOP-8424. Fix classpath so that web-ui works on Windows. Contributed by Bikas Saha.

Modified:
    hadoop/common/branches/branch-1-win/CHANGES.txt
    hadoop/common/branches/branch-1-win/bin/hadoop-config.cmd

Modified: hadoop/common/branches/branch-1-win/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1-win/CHANGES.txt?rev=1348851&r1=1348850&r2=1348851&view=diff
==============================================================================
--- hadoop/common/branches/branch-1-win/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1-win/CHANGES.txt Mon Jun 11 13:59:06 2012
@@ -1,7 +1,3 @@
-
-
-
-
 Hadoop Change Log
 
 branch-hadoop-1-win - unreleased
@@ -29,6 +25,9 @@ branch-hadoop-1-win - unreleased
 
     HDFS-3424 TestDatanodeBlockScanner and TestReplication fail intermittently on Windows (Bikas Saha via Sanjay)
 
+    HADOOP-8424. Fix classpath so that web-ui works on Windows. (Bikas Saha
+    via acmurthy) 
+
 Release 1.1.0 - unreleased
 
   NEW FEATURES

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=1348851&r1=1348850&r2=1348851&view=diff
==============================================================================
--- hadoop/common/branches/branch-1-win/bin/hadoop-config.cmd (original)
+++ hadoop/common/branches/branch-1-win/bin/hadoop-config.cmd Mon Jun 11 13:59:06 2012
@@ -102,17 +102,6 @@ set CLASSPATH=%CLASSPATH%;%JAVA_HOME%\li
 @rem for developers, add Hadoop classes to CLASSPATH
 @rem
 
-if exist %HADOOP_CORE_HOME%\build (
-  for %%i in (%HADOOP_CORE_HOME%\build\*.jar) do (
-    set CLASSPATH=!CLASSPATH!;%%i
-  )
-  if exist %HADOOP_CORE_HOME%\build\ivy\lib\Hadoop\common (
-    for %%i in (%HADOOP_CORE_HOME%\build\ivy\lib\Hadoop\common\*.jar) do (
-      set CLASSPATH=!CLASSPATH!;%%i
-    )
-  )
-)
-
 if exist %HADOOP_CORE_HOME%\build\classes (
   set CLASSPATH=%CLASSPATH%;%HADOOP_CORE_HOME%\build\classes
 )
@@ -129,6 +118,13 @@ if exist %HADOOP_CORE_HOME%\build\test\c
   set CLASSPATH=%CLASSPATH%;%HADOOP_CORE_HOME%\build\test\core\classes
 )
 
+for %%i in (%HADOOP_CORE_HOME%\build\*.jar) do (
+  set CLASSPATH=!CLASSPATH!;%%i
+)
+for %%i in (%HADOOP_CORE_HOME%\build\ivy\lib\Hadoop\common\*.jar) do (
+  set CLASSPATH=!CLASSPATH!;%%i
+)
+
 @rem
 @rem for releases, add core hadoop jar & webapps to CLASSPATH
 @rem