Skip to content
Browse files

HIVE-986 Ant "eclipse-files" target is broken for Hadoop 0.20

(Zheng Shao via namit)



git-svn-id: https://svn.apache.org/repos/asf/hadoop/hive/trunk@894292 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information...
1 parent e78a370 commit e099099295232ddcef8dca476a715b693f1625f5 Namit Jain committed
Showing with 24 additions and 4 deletions.
  1. +3 −0 CHANGES.txt
  2. +1 −1 build.properties
  3. +17 −1 build.xml
  4. +3 −2 eclipse-templates/.classpath
View
3 CHANGES.txt
@@ -372,6 +372,9 @@ Trunk - Unreleased
HIVE-1009 bug in union along with transform
(Ning Zhang via namit)
+ HIVE-986 Ant "eclipse-files" target is broken for Hadoop 0.20
+ (Zheng Shao via namit)
+
Release 0.4.0 - Unreleased
INCOMPATIBLE CHANGES
View
2 build.properties
@@ -3,7 +3,7 @@ name=hive
version=0.5.0
year=2009
-hadoop.version=0.19.0
+hadoop.version=0.20.0
hadoop.mirror=http://archive.apache.org/dist
build.dir.hive=${hive.root}/build
View
18 build.xml
@@ -267,7 +267,7 @@
<target name="eclipse-files" depends="init"
description="Generate files for Eclipse">
- <condition property="hadoop.version.ant-internal" value="0.19">
+ <condition property="hadoop.version.ant-internal" value="0.20">
<not>
<isset property="hadoop.version.ant-internal"/>
</not>
@@ -279,6 +279,19 @@
<getversionpref property="hadoop.version.ant-internal.prefix" input="${hadoop.version.ant-internal}"/>
+ <condition property="jetty.jar" value="jetty-6.1.14.jar" else="jetty-5.1.4.jar">
+ <equals arg1="${hadoop.version.ant-internal.prefix}" arg2="0.20" />
+ </condition>
+
+ <condition property="jetty.util.jar" value="jetty-util-6.1.14.jar" else="jetty-ext/jsp-api.jar">
+ <!-- hadoop 0.19 and earlier does not have jetty-util.jar, so we just load another jar -->
+ <equals arg1="${hadoop.version.ant-internal.prefix}" arg2="0.20" />
+ </condition>
+
+ <condition property="servlet-api.jar" value="servlet-api-2.5-6.1.14.jar" else="servlet-api.jar">
+ <equals arg1="${hadoop.version.ant-internal.prefix}" arg2="0.20" />
+ </condition>
+
<pathconvert property="eclipse.project">
<path path="${basedir}"/>
<regexpmapper from="^.*/([^/]+)$$" to="\1" handledirsep="yes"/>
@@ -292,6 +305,9 @@
<filter token="PROJECT" value="${eclipse.project}"/>
<filter token="HADOOPVER" value="${hadoop.version.ant-internal}"/>
<filter token="HADOOPVERPREF" value="${hadoop.version.ant-internal.prefix}"/>
+ <filter token="JETTYJAR" value="${jetty.jar}"/>
+ <filter token="JETTYUTILJAR" value="${jetty.util.jar}"/>
+ <filter token="SERVLETAPIJAR" value="${servlet-api.jar}"/>
</filterset>
</copy>
<move todir="." includeemptydirs="false">
View
5 eclipse-templates/.classpath
@@ -3,8 +3,9 @@
<classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry exported="true" kind="lib" path="build/hadoopcore/hadoop-@HADOOPVER@/hadoop-@HADOOPVER@-core.jar"/>
<classpathentry exported="true" kind="lib" path="build/hadoopcore/hadoop-@HADOOPVER@/hadoop-@HADOOPVER@-test.jar"/>
- <classpathentry exported="true" kind="lib" path="build/hadoopcore/hadoop-@HADOOPVER@/lib/servlet-api.jar"/>
- <classpathentry exported="true" kind="lib" path="build/hadoopcore/hadoop-@HADOOPVER@/lib/jetty-5.1.4.jar"/>
+ <classpathentry exported="true" kind="lib" path="build/hadoopcore/hadoop-@HADOOPVER@/lib/@SERVLETAPIJAR@"/>
+ <classpathentry exported="true" kind="lib" path="build/hadoopcore/hadoop-@HADOOPVER@/lib/@JETTYJAR@"/>
+ <classpathentry exported="true" kind="lib" path="build/hadoopcore/hadoop-@HADOOPVER@/lib/@JETTYUTILJAR@"/>
<classpathentry exported="true" kind="lib" path="cli/lib/jline-0.9.94.jar"/>
<classpathentry exported="true" kind="lib" path="lib/json.jar"/>
<classpathentry exported="true" kind="lib" path="lib/asm-3.1.jar"/>

0 comments on commit e099099

Please sign in to comment.
Something went wrong with that request. Please try again.