@@ -14,26 +14,29 @@ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="var" path="ANT_HOME/lib/ant.jar"/> <classpathentry kind="lib" path="lib/commons-cli-2.0-SNAPSHOT.jar"/> - <classpathentry kind="lib" path="lib/commons-codec-1.3.jar"/> - <classpathentry kind="lib" path="lib/commons-httpclient-3.0.1.jar"/> - <classpathentry kind="lib" path="lib/commons-logging-1.0.4.jar"/> - <classpathentry kind="lib" path="lib/commons-logging-api-1.0.4.jar"/> - <classpathentry kind="lib" path="lib/commons-net-1.4.1.jar"/> <classpathentry kind="lib" path="lib/hsqldb-1.8.0.10.jar"/> - <classpathentry kind="lib" path="lib/jets3t-0.6.1.jar"/> - <classpathentry kind="lib" path="lib/junit-3.8.1.jar"/> <classpathentry kind="lib" path="lib/kfs-0.2.2.jar"/> - <classpathentry kind="lib" path="lib/log4j-1.2.15.jar"/> - <classpathentry kind="lib" path="lib/oro-2.0.8.jar"/> - <classpathentry kind="lib" path="lib/jetty-6.1.14.jar"/> - <classpathentry kind="lib" path="lib/jetty-util-6.1.14.jar"/> - <classpathentry kind="lib" path="lib/servlet-api-2.5-6.1.14.jar"/> - <classpathentry kind="lib" path="lib/jsp-2.1/core-3.1.1.jar"/> - <classpathentry kind="lib" path="lib/jsp-2.1/jsp-2.1.jar"/> - <classpathentry kind="lib" path="lib/jsp-2.1/jsp-api-2.1.jar"/> - <classpathentry kind="lib" path="lib/slf4j-api-1.4.3.jar"/> - <classpathentry kind="lib" path="lib/slf4j-log4j12-1.4.3.jar"/> - <classpathentry kind="lib" path="lib/xmlenc-0.52.jar"/> + <classpathentry kind="lib" path="lib/jsp-2.1/jsp-2.1.jar"/> + <classpathentry kind="lib" path="lib/jsp-2.1/jsp-api-2.1.jar"/> + <classpathentry kind="lib" path="build/ivy/lib/Hadoop/common/commons-codec-1.3.jar"/> + <classpathentry kind="lib" path="build/ivy/lib/Hadoop/common/commons-httpclient-3.0.1.jar"/> + <classpathentry kind="lib" path="build/ivy/lib/Hadoop/common/commons-el-1.0.jar"/> + <classpathentry kind="lib" path="build/ivy/lib/Hadoop/common/jasper-compiler-5.5.12.jar"/> + <classpathentry kind="lib" path="build/ivy/lib/Hadoop/common/jasper-runtime-5.5.12.jar"/> + <classpathentry kind="lib" path="build/ivy/lib/Hadoop/common/commons-logging-1.0.4.jar"/> + <classpathentry kind="lib" path="build/ivy/lib/Hadoop/common/commons-logging-api-1.0.4.jar"/> + <classpathentry kind="lib" path="build/ivy/lib/Hadoop/common/commons-net-1.4.1.jar"/> + <classpathentry kind="lib" path="build/ivy/lib/Hadoop/common/jets3t-0.6.1.jar"/> + <classpathentry kind="lib" path="build/ivy/lib/Hadoop/common/junit-3.8.1.jar"/> + <classpathentry kind="lib" path="build/ivy/lib/Hadoop/common/log4j-1.2.15.jar"/> + <classpathentry kind="lib" path="build/ivy/lib/Hadoop/common/oro-2.0.8.jar"/> + <classpathentry kind="lib" path="build/ivy/lib/Hadoop/common/jetty-6.1.14.jar"/> + <classpathentry kind="lib" path="build/ivy/lib/Hadoop/common/jetty-util-6.1.14.jar"/> + <classpathentry kind="lib" path="build/ivy/lib/Hadoop/common/servlet-api-2.5-6.1.14.jar"/> + <classpathentry kind="lib" path="build/ivy/lib/Hadoop/common/core-3.1.1.jar"/> + <classpathentry kind="lib" path="build/ivy/lib/Hadoop/common/slf4j-api-1.4.3.jar"/> + <classpathentry kind="lib" path="build/ivy/lib/Hadoop/common/slf4j-log4j12-1.4.3.jar"/> + <classpathentry kind="lib" path="build/ivy/lib/Hadoop/common/xmlenc-0.52.jar"/> <classpathentry kind="lib" path="src/test/lib/ftplet-api-1.0.0-SNAPSHOT.jar"/> <classpathentry kind="lib" path="src/test/lib/ftpserver-core-1.0.0-SNAPSHOT.jar"/> <classpathentry kind="lib" path="src/test/lib/ftpserver-server-1.0.0-SNAPSHOT.jar"/> .eclipse.templates/.classpath @@ -447,6 +447,10 @@ Release 0.20.0 - Unreleased HADOOP-4791. Fix rpm build process for Chukwa. (Eric Yang via cdouglas) + HADOOP-4878. Fix eclipse plugin classpath file to point to ivy's resolved + lib directory and added the same to test-patch.sh. (Giridharan Kesavan via + acmurthy) + Release 0.19.1 - Unreleased IMPROVEMENTS CHANGES.txt @@ -50,6 +50,19 @@ <echo message="eclipse.home unset: skipping eclipse plugin"/> </target> + <target name="compile" depends="init, ivy-retrieve-common" unless="skip.contrib"> + <echo message="contrib: ${name}"/> + <javac + encoding="${build.encoding}" + srcdir="${src.dir}" + includes="**/*.java" + destdir="${build.classes}" + debug="${javac.debug}" + deprecation="${javac.deprecation}"> + <classpath refid="classpath"/> + </javac> + </target> + <!-- Override jar target to specify manifest --> <target name="jar" depends="compile" unless="skip.contrib"> <mkdir dir="${build.dir}/lib"/> src/contrib/eclipse-plugin/build.xml @@ -493,7 +493,7 @@ runCoreTests () { ### Tests parts of contrib specific to the eclipse files checkJarFilesDeclaredInEclipse () { export DECLARED_JARS=$(sed -n 's@.*kind="lib".*path="\(.*jar\)".*@\1@p' < .eclipse.templates/.classpath) - export PRESENT_JARS=$(find lib/ src/test/lib/ -name '*.jar' |sort) + export PRESENT_JARS=$(find build/ivy/lib/Hadoop/common/ lib/ src/test/lib/ -name '*.jar' |sort) # When run by Hudson, consider libs from ${SUPPORT_DIR} declared if [[ ${HUDSON} == "true" ]]; then DECLARED_JARS="${DECLARED_JARS} $(cd "${SUPPORT_DIR}"; find lib -name '*.jar')" src/test/bin/test-patch.sh 886606525f421cb86a207a44f2ffe5552daa2f37 Arun Murthy acmurthy@apache.org http://github.com/yahoo/hadoop/commit/71127ad28040a789a1eb44c965f6f6e33238209c 71127ad28040a789a1eb44c965f6f6e33238209c 2008-12-16T19:16:50-08:00 2008-12-16T19:16:50-08:00 Merge -r 727254:727255 from trunk to branch-0.20 to fix HADOOP-4878. git-svn-id: https://svn.eu.apache.org/repos/asf/hadoop/core/branches/branch-0.20@727256 13f79535-47bb-0310-9956-ffa450edef68 16ae84a1d7df279d70b84e79d52bb6c841fc3079 Arun Murthy acmurthy@apache.org