svn commit: r1179805 - in /hive/branches/branch-0.8/pdk: build.xml scripts/build-plugin.xml

[jv...@apache.org]

Author: jvs
Date: Thu Oct  6 20:07:51 2011
New Revision: 1179805

URL: http://svn.apache.org/viewvc?rev=1179805&view=rev
Log:
HIVE-2488. PDK tests failing on Hudson because HADOOP_HOME is not defined
(Carl Steinbach via jvs)


Modified:
    hive/branches/branch-0.8/pdk/build.xml
    hive/branches/branch-0.8/pdk/scripts/build-plugin.xml

Modified: hive/branches/branch-0.8/pdk/build.xml
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.8/pdk/build.xml?rev=1179805&r1=1179804&r2=1179805&view=diff
==============================================================================
--- hive/branches/branch-0.8/pdk/build.xml (original)
+++ hive/branches/branch-0.8/pdk/build.xml Thu Oct  6 20:07:51 2011
@@ -49,10 +49,12 @@
     <ant antfile="${build.dir}/test-plugin/build.xml"
          target="package" inheritAll="false" inheritRefs="false">
       <property name="hive.install.dir" value="${build.dir.hive}/dist"/>
+      <property name="hadoop.home" value="${hadoop.root}"/>
     </ant>
     <ant antfile="${build.dir}/test-plugin/build.xml"
          target="test" inheritAll="false" inheritRefs="false">
       <property name="hive.install.dir" value="${build.dir.hive}/dist"/>
+      <property name="hadoop.home" value="${hadoop.root}"/>
     </ant>
   </target>
 

Modified: hive/branches/branch-0.8/pdk/scripts/build-plugin.xml
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.8/pdk/scripts/build-plugin.xml?rev=1179805&r1=1179804&r2=1179805&view=diff
==============================================================================
--- hive/branches/branch-0.8/pdk/scripts/build-plugin.xml (original)
+++ hive/branches/branch-0.8/pdk/scripts/build-plugin.xml Thu Oct  6 20:07:51 2011
@@ -30,20 +30,21 @@
             value="${plugin.libname}-${plugin.version}.jar"/>
 
   <property environment="env"/>
+  <property name="hadoop.home" value="${env.HADOOP_HOME}"/>
 
   <path id="plugin.classpath">
     <fileset dir="${install.dir}" includes="lib/hive-exec-*.jar"/>
     <fileset dir="${install.dir}" includes="lib/hive-pdk-*.jar"/>
     <fileset dir="${install.dir}" includes="lib/commons-lang-*.jar"/>
     <fileset dir="${install.dir}" includes="lib/commons-logging-*.jar"/>
-    <fileset dir="${env.HADOOP_HOME}" includes="hadoop-*-core.jar"/>
+    <fileset dir="${hadoop.home}" includes="hadoop-*-core.jar"/>
     <pathelement location="${build.classes}"/>
   </path>
 
   <path id="plugin.test.classpath">
     <pathelement path="${install.dir}/conf"/>
     <fileset dir="${install.dir}" includes="lib/*.jar"/>
-    <fileset dir="${env.HADOOP_HOME}" includes="hadoop-*-core.jar"/>
+    <fileset dir="${hadoop.home}" includes="hadoop-*-core.jar"/>
     <fileset dir="${build.dir}" includes="${plugin.jar.basename}"/>
   </path>
 
@@ -118,7 +119,7 @@
       <classpath refid="plugin.test.classpath"/>
       <sysproperty key="hive.plugin.root.dir" value="${plugin.dir}"/>
       <sysproperty key="hive.plugin.class.list" value="${class.list}"/>
-      <env key="HADOOP_HOME" value="${env.HADOOP_HOME}"/>
+      <env key="HADOOP_HOME" value="${hadoop.home}"/>
       <env key="HIVE_CONF_DIR" value="${install.dir}/conf"/>
       <env key="HIVE_HOME" value="${install.dir}"/>
       <env key="HIVE_PLUGIN_ROOT_DIR" value="${plugin.dir}"/>