Author: cdouglas
Date: Thu May 28 01:08:08 2009
New Revision: 779383
URL: http://svn.apache.org/viewvc?rev=779383&view=rev
Log:
Revert HADOOP-5792
Added:
hadoop/core/trunk/lib/jsp-2.1/
- copied from r774223, hadoop/core/trunk/lib/jsp-2.1/
hadoop/core/trunk/lib/jsp-2.1/jsp-2.1.jar
- copied unchanged from r774223, hadoop/core/trunk/lib/jsp-2.1/jsp-2.1.jar
hadoop/core/trunk/lib/jsp-2.1/jsp-api-2.1.jar
- copied unchanged from r774223,
hadoop/core/trunk/lib/jsp-2.1/jsp-api-2.1.jar
Modified:
hadoop/core/trunk/.eclipse.templates/.classpath
hadoop/core/trunk/CHANGES.txt
hadoop/core/trunk/ivy.xml
hadoop/core/trunk/src/contrib/hdfsproxy/bin/hdfsproxy
hadoop/core/trunk/src/contrib/hdfsproxy/build.xml
Modified: hadoop/core/trunk/.eclipse.templates/.classpath
URL:
http://svn.apache.org/viewvc/hadoop/core/trunk/.eclipse.templates/.classpath?rev=779383&r1=779382&r2=779383&view=diff
==============================================================================
--- hadoop/core/trunk/.eclipse.templates/.classpath (original)
+++ hadoop/core/trunk/.eclipse.templates/.classpath Thu May 28 01:08:08 2009
@@ -17,8 +17,8 @@
<classpathentry kind="lib" path="lib/commons-cli-2.0-SNAPSHOT.jar"/>
<classpathentry kind="lib" path="lib/hsqldb-1.8.0.10.jar"/>
<classpathentry kind="lib" path="lib/kfs-0.2.2.jar"/>
- <classpathentry kind="lib"
path="build/ivy/lib/Hadoop/common/jsp-2.1-6.1.14.jar"/>
- <classpathentry kind="lib"
path="build/ivy/lib/Hadoop/common/jsp-api-2.1-6.1.14.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"/>
Modified: hadoop/core/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/core/trunk/CHANGES.txt?rev=779383&r1=779382&r2=779383&view=diff
==============================================================================
--- hadoop/core/trunk/CHANGES.txt (original)
+++ hadoop/core/trunk/CHANGES.txt Thu May 28 01:08:08 2009
@@ -349,8 +349,6 @@
HADOOP-5780. Improve per block message prited by "-metaSave" in HDFS.
(Raghu Angadi)
-
- HADOOP-5792. To resolve jsp-2.1 jars through ivy (Giridharan Kesavan)
HADOOP-5823. Added a new class DeprecatedUTF8 to help with removing
UTF8 related javac warnings. These warnings are removed in
Modified: hadoop/core/trunk/ivy.xml
URL:
http://svn.apache.org/viewvc/hadoop/core/trunk/ivy.xml?rev=779383&r1=779382&r2=779383&view=diff
==============================================================================
--- hadoop/core/trunk/ivy.xml (original)
+++ hadoop/core/trunk/ivy.xml Thu May 28 01:08:08 2009
@@ -149,14 +149,11 @@
name="jasper-compiler"
rev="${jasper.version}"
conf="jetty->master"/>
- <dependency org="org.mortbay.jetty"
- name="jsp-api-2.1"
- rev="${jetty.version}"
- conf="jetty->master"/>
- <dependency org="org.mortbay.jetty"
- name="jsp-2.1"
- rev="${jetty.version}"
- conf="jetty->master"/>
+<!-- this is resolved locally from the lib folder
+ <dependency org="tomcat"
+ name="jsp-api"
+ rev="${jsp-api.version}"
+ conf="jetty->master"/> -->
<dependency org="commons-el"
name="commons-el"
rev="${commons-el.version}"
Modified: hadoop/core/trunk/src/contrib/hdfsproxy/bin/hdfsproxy
URL:
http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/hdfsproxy/bin/hdfsproxy?rev=779383&r1=779382&r2=779383&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/hdfsproxy/bin/hdfsproxy (original)
+++ hadoop/core/trunk/src/contrib/hdfsproxy/bin/hdfsproxy Thu May 28 01:08:08
2009
@@ -114,12 +114,17 @@
CLASSPATH=${CLASSPATH}:$f;
done
fi
-
if [ -d "$HDFSPROXY_HOME/../../lib" ]; then
for f in $HDFSPROXY_HOME/../../lib/*.jar; do
CLASSPATH=${CLASSPATH}:$f;
done
fi
+if [ -d "$HDFSPROXY_HOME/../../lib/jsp-2.1" ]; then
+ for f in $HDFSPROXY_HOME/../../lib/jsp-2.1/*.jar; do
+ CLASSPATH=${CLASSPATH}:$f;
+ done
+fi
+
# add user-specified CLASSPATH last
if [ "$HDFSPROXY_CLASSPATH" != "" ]; then
Modified: hadoop/core/trunk/src/contrib/hdfsproxy/build.xml
URL:
http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/hdfsproxy/build.xml?rev=779383&r1=779382&r2=779383&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/hdfsproxy/build.xml (original)
+++ hadoop/core/trunk/src/contrib/hdfsproxy/build.xml Thu May 28 01:08:08 2009
@@ -123,7 +123,7 @@
<include name="slf4j-api-${slf4j-api.version}.jar"/>
<include name="slf4j-log4j12-${slf4j-log4j12.version}.jar"/>
<include name="xmlenc-${xmlenc.version}.jar"/>
- <include name="core-${core.version}.jar"/>
+ <include name="core-${core.vesion}.jar"/>
</lib>
<classes dir="${proxy.conf.dir}" excludes="**/*.example
**/*.template **/*.sh hadoop-site.xml"/>
<classes dir="${build.classes}"/>
@@ -143,7 +143,7 @@
<include name="slf4j-api-${slf4j-api.version}.jar"/>
<include name="slf4j-log4j12-${slf4j-log4j12.version}.jar"/>
<include name="xmlenc-${xmlenc.version}.jar"/>
- <include name="core-${core.version}.jar"/>
+ <include name="core-${core.vesion}.jar"/>
</lib>
<classes dir="${proxy.conf.dir}" excludes="**/*.example
**/*.template **/*.sh hadoop-site.xml"/>
<classes dir="${build.classes}"/>
@@ -347,10 +347,12 @@
<include name="jetty-util-${jetty-util.version}.jar"/>
<include name="jetty-${jetty.version}.jar"/>
<include name="servlet-api-2.5-${servlet-api-2.5.version}.jar"/>
- <include name="core-${core.version}.jar"/>
- <include name="jsp-${jsp.version}-${jetty.version}.jar"/>
- <include name="jsp-api-${jsp.version}-${jetty.version}.jar"/>
- </fileset>
+ <include name="core-${core.vesion}.jar"/>
+ </fileset>
+ <fileset dir="${hadoop.root}/lib/jsp-${jsp.version}">
+ <include name="jsp-${jsp.version}.jar"/>
+ <include name="jsp-api-${jsp.version}.jar"/>
+ </fileset>
</copy>
<copy todir="${build.dir}/${final.name}/lib"
includeEmptyDirs="false">
