Author: cdouglas
Date: Mon Nov 10 11:52:10 2008
New Revision: 712729
URL: http://svn.apache.org/viewvc?rev=712729&view=rev
Log:
HADOOP-4621. Fix javadoc warnings caused by duplicate jars. Contributed by Kan
Zhang.
Removed:
hadoop/core/trunk/src/contrib/hdfsproxy/lib/
Modified:
hadoop/core/trunk/CHANGES.txt
hadoop/core/trunk/src/contrib/hdfsproxy/build.xml
Modified: hadoop/core/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/core/trunk/CHANGES.txt?rev=712729&r1=712728&r2=712729&view=diff
==============================================================================
--- hadoop/core/trunk/CHANGES.txt (original)
+++ hadoop/core/trunk/CHANGES.txt Mon Nov 10 11:52:10 2008
@@ -107,6 +107,9 @@
HADOOP-4377. Fix a race condition in directory creation in
NativeS3FileSystem. (David Phillips via cdouglas)
+ HADOOP-4621. Fix javadoc warnings caused by duplicate jars. (Kan Zhang via
+ cdouglas)
+
Release 0.19.0 - Unreleased
INCOMPATIBLE CHANGES
Modified: hadoop/core/trunk/src/contrib/hdfsproxy/build.xml
URL:
http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/hdfsproxy/build.xml?rev=712729&r1=712728&r2=712729&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/hdfsproxy/build.xml (original)
+++ hadoop/core/trunk/src/contrib/hdfsproxy/build.xml Mon Nov 10 11:52:10 2008
@@ -76,8 +76,22 @@
</fileset>
</copy>
<copy todir="${build.dir}/${final.name}/lib"
includeEmptyDirs="false">
- <fileset dir="${lib.dir}">
- <exclude name="**/native/**"/>
+ <fileset dir="${hadoop.root}/lib">
+ <include name="commons-logging-1.0.4.jar"/>
+ <include name="commons-logging-api-1.0.4.jar"/>
+ <include name="jetty-5.1.4.jar"/>
+ <include name="junit-3.8.1.jar"/>
+ <include name="log4j-1.2.15.jar"/>
+ <include name="servlet-api.jar"/>
+ <include name="slf4j-api-1.4.3.jar"/>
+ <include name="slf4j-log4j12-1.4.3.jar"/>
+ <include name="xmlenc-0.52.jar"/>
+ </fileset>
+ <fileset dir="${hadoop.root}/lib/jetty-ext">
+ <include name="commons-el.jar"/>
+ <include name="jasper-compiler.jar"/>
+ <include name="jasper-runtime.jar"/>
+ <include name="jsp-api.jar"/>
</fileset>
</copy>
