You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by cw...@apache.org on 2012/06/11 22:32:40 UTC
svn commit: r1348995 - in /hive/trunk: ./ eclipse-templates/
Author: cws
Date: Mon Jun 11 20:32:40 2012
New Revision: 1348995
URL: http://svn.apache.org/viewvc?rev=1348995&view=rev
Log:
HIVE-3013 [jira] TestCliDriver cannot be debugged with eclipse since hadoop_home is set wrongly
Summary:
HIVE-3013
fix typo
cp Fix
cp
Test Plan: EMPTY
Reviewers: JIRA, njain, kevinwilfong
Differential Revision: https://reviews.facebook.net/D3555
Added:
hive/trunk/eclipse-templates/HiveServer.launchtemplate
- copied, changed from r1348993, hive/trunk/eclipse-templates/HiveCLI.launchtemplate
Modified:
hive/trunk/build.properties
hive/trunk/build.xml
hive/trunk/eclipse-templates/.classpath
hive/trunk/eclipse-templates/HiveCLI.launchtemplate
hive/trunk/eclipse-templates/TestCliDriver.launchtemplate
hive/trunk/eclipse-templates/TestEmbeddedHiveMetaStore.launchtemplate
hive/trunk/eclipse-templates/TestHBaseCliDriver.launchtemplate
hive/trunk/eclipse-templates/TestHive.launchtemplate
hive/trunk/eclipse-templates/TestHiveMetaStoreChecker.launchtemplate
hive/trunk/eclipse-templates/TestJdbc.launchtemplate
hive/trunk/eclipse-templates/TestMTQueries.launchtemplate
hive/trunk/eclipse-templates/TestRemoteHiveMetaStore.launchtemplate
hive/trunk/eclipse-templates/TestTruncate.launchtemplate
Modified: hive/trunk/build.properties
URL: http://svn.apache.org/viewvc/hive/trunk/build.properties?rev=1348995&r1=1348994&r2=1348995&view=diff
==============================================================================
--- hive/trunk/build.properties (original)
+++ hive/trunk/build.properties Mon Jun 11 20:32:40 2012
@@ -98,3 +98,9 @@ mvn.license.dir=${build.dir.hive}/maven/
#
datanucleus.repo=http://www.datanucleus.org/downloads/maven2
+#
+# Eclipse Properties
+#
+
+# JVM arguments for Eclipse launch configurations
+eclipse.launch.jvm.args=-Xms256m -Xmx1024m
Modified: hive/trunk/build.xml
URL: http://svn.apache.org/viewvc/hive/trunk/build.xml?rev=1348995&r1=1348994&r2=1348995&view=diff
==============================================================================
--- hive/trunk/build.xml (original)
+++ hive/trunk/build.xml Mon Jun 11 20:32:40 2012
@@ -577,6 +577,14 @@
<matches string="${hadoop.version.ant-internal}" pattern="^0\.20\..*" />
</condition>
+
+ <!-- Construct the classpath needed for testutils/hadoop launch script -->
+ <path id="hive.hadoop.test.classpath">
+ <fileset dir="${hive.root}/build/ivy/lib/hadoop0.${hadoop.mr.rev}.shim" includes="*.jar" />
+ <fileset dir="${hive.root}/build/ivy/lib/default" includes="*.jar" excludes="hive*.jar" />
+ </path>
+ <property name="hive.hadoop.test.classpath" refid="hive.hadoop.test.classpath"/>
+
<pathconvert property="eclipse.project">
<path path="${basedir}"/>
<regexpmapper from="^.*/([^/]+)$$" to="\1" handledirsep="yes"/>
@@ -595,6 +603,9 @@
<filter token="JETTYUTILJAR" value="${jetty.util.jar}"/>
<filter token="SERVLETAPIJAR" value="${servlet-api.jar}"/>
<filter token="HIVE_VERSION" value="${version}"/>
+ <filter token="HIVE_HADOOP_TEST_CLASSPATH" value="${hive.hadoop.test.classpath}"/>
+ <filter token="HADOOP_BIN_PATH" value="${hive.root}/testutils/hadoop"/>
+ <filter token="JVM_ARGS" value="${eclipse.launch.jvm.args}"/>
</filterset>
</copy>
<move todir="." includeemptydirs="false">
Modified: hive/trunk/eclipse-templates/.classpath
URL: http://svn.apache.org/viewvc/hive/trunk/eclipse-templates/.classpath?rev=1348995&r1=1348994&r2=1348995&view=diff
==============================================================================
--- hive/trunk/eclipse-templates/.classpath (original)
+++ hive/trunk/eclipse-templates/.classpath Mon Jun 11 20:32:40 2012
@@ -46,6 +46,8 @@
<classpathentry kind="lib" path="build/ivy/lib/hadoop0.20.shim/oro-2.0.8.jar"/>
<classpathentry kind="lib" path="build/ivy/lib/hadoop0.20.shim/servlet-api-2.5-6.1.14.jar"/>
<classpathentry kind="lib" path="build/ivy/lib/hadoop0.20.shim/xmlenc-0.52.jar"/>
+ <classpathentry kind="lib" path="build/ivy/lib/default/avro-@avro.version@.jar"/>
+ <classpathentry kind="lib" path="build/ivy/lib/default/avro-mapred-@avro.version@.jar"/>
<classpathentry kind="lib" path="build/ivy/lib/default/jline-@jline.version@.jar"/>
<classpathentry kind="lib" path="build/ivy/lib/default/json-@json.version@.jar"/>
<classpathentry kind="lib" path="build/ivy/lib/default/asm-@asm.version@.jar"/>
Modified: hive/trunk/eclipse-templates/HiveCLI.launchtemplate
URL: http://svn.apache.org/viewvc/hive/trunk/eclipse-templates/HiveCLI.launchtemplate?rev=1348995&r1=1348994&r2=1348995&view=diff
==============================================================================
--- hive/trunk/eclipse-templates/HiveCLI.launchtemplate (original)
+++ hive/trunk/eclipse-templates/HiveCLI.launchtemplate Mon Jun 11 20:32:40 2012
@@ -20,7 +20,7 @@
<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="false"/>
<mapAttribute key="org.eclipse.debug.core.environmentVariables">
<mapEntry key="JAVA_HOME" value="${system_property:java.home}"/>
- <mapEntry key="HADOOP_HOME" value="${workspace_loc:@PROJECT@}/build/ivy/lib/hadoop.@HADOOPVER@.shim"/>
+ <mapEntry key="HIVE_HADOOP_TEST_CLASSPATH" value="@HIVE_HADOOP_TEST_CLASSPATH@"/>
</mapAttribute>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
@@ -35,6 +35,7 @@
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry containerPath="org.eclipse.jdt.launching.JRE_CONTAINER" javaProject="@PROJECT@" path="1" type="4"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/@PROJECT@/conf" path="3" type="2"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/@PROJECT@/common/src/java/conf" path="3" type="2"/> "/>
+ <listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/@PROJECT@/build/metastore/hive-metastore-@HIVE_VERSION@.jar" path="3" type="2"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry id="org.eclipse.jdt.launching.classpathentry.defaultClasspath"> <memento exportedEntriesOnly="false" project="@PROJECT@"/> </runtimeClasspathEntry> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/@PROJECT@/build/ql/hive-exec-@HIVE_VERSION@.jar" path="3" type="2"/> "/>
</listAttribute>
@@ -43,6 +44,7 @@
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.apache.hadoop.hive.cli.CliDriver"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="@PROJECT@"/>
- <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dhive.root.logger=INFO,console"/>
+ <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS"
+ value="@JVM_ARGS@ -Dhive.root.logger=INFO,console -Dhadoop.bin.path=@HADOOP_BIN_PATH@"/>
</launchConfiguration>
Copied: hive/trunk/eclipse-templates/HiveServer.launchtemplate (from r1348993, hive/trunk/eclipse-templates/HiveCLI.launchtemplate)
URL: http://svn.apache.org/viewvc/hive/trunk/eclipse-templates/HiveServer.launchtemplate?p2=hive/trunk/eclipse-templates/HiveServer.launchtemplate&p1=hive/trunk/eclipse-templates/HiveCLI.launchtemplate&r1=1348993&r2=1348995&rev=1348995&view=diff
==============================================================================
--- hive/trunk/eclipse-templates/HiveCLI.launchtemplate (original)
+++ hive/trunk/eclipse-templates/HiveServer.launchtemplate Mon Jun 11 20:32:40 2012
@@ -20,11 +20,11 @@
<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="false"/>
<mapAttribute key="org.eclipse.debug.core.environmentVariables">
<mapEntry key="JAVA_HOME" value="${system_property:java.home}"/>
- <mapEntry key="HADOOP_HOME" value="${workspace_loc:@PROJECT@}/build/ivy/lib/hadoop.@HADOOPVER@.shim"/>
+ <mapEntry key="HIVE_HADOOP_TEST_CLASSPATH" value="@HIVE_HADOOP_TEST_CLASSPATH@"/>
</mapAttribute>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
- <listEntry value="/hive/cli/src/java/org/apache/hadoop/hive/cli/CliDriver.java"/>
+ <listEntry value="/hive/service/src/java/org/apache/hadoop/hive/service/HiveServer.java"/>
</listAttribute>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
@@ -35,14 +35,16 @@
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry containerPath="org.eclipse.jdt.launching.JRE_CONTAINER" javaProject="@PROJECT@" path="1" type="4"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/@PROJECT@/conf" path="3" type="2"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/@PROJECT@/common/src/java/conf" path="3" type="2"/> "/>
+ <listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/@PROJECT@/build/metastore/hive-metastore-@HIVE_VERSION@.jar" path="3" type="2"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry id="org.eclipse.jdt.launching.classpathentry.defaultClasspath"> <memento exportedEntriesOnly="false" project="@PROJECT@"/> </runtimeClasspathEntry> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/@PROJECT@/build/ql/hive-exec-@HIVE_VERSION@.jar" path="3" type="2"/> "/>
</listAttribute>
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
- <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.apache.hadoop.hive.cli.CliDriver"/>
+ <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.apache.hadoop.hive.service.HiveServer"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="@PROJECT@"/>
- <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dhive.root.logger=INFO,console"/>
+ <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS"
+ value="@JVM_ARGS@ -Dhive.root.logger=INFO,console -Dhadoop.bin.path=@HADOOP_BIN_PATH@"/>
</launchConfiguration>
Modified: hive/trunk/eclipse-templates/TestCliDriver.launchtemplate
URL: http://svn.apache.org/viewvc/hive/trunk/eclipse-templates/TestCliDriver.launchtemplate?rev=1348995&r1=1348994&r2=1348995&view=diff
==============================================================================
--- hive/trunk/eclipse-templates/TestCliDriver.launchtemplate (original)
+++ hive/trunk/eclipse-templates/TestCliDriver.launchtemplate Mon Jun 11 20:32:40 2012
@@ -20,7 +20,7 @@
<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="false"/>
<mapAttribute key="org.eclipse.debug.core.environmentVariables">
<mapEntry key="JAVA_HOME" value="${system_property:java.home}"/>
- <mapEntry key="HADOOP_HOME" value="${workspace_loc:@PROJECT@}/build/ivy/lib/hadoop.@HADOOPVER@.shim"/>
+ <mapEntry key="HIVE_HADOOP_TEST_CLASSPATH" value="@HIVE_HADOOP_TEST_CLASSPATH@"/>
</mapAttribute>
<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
@@ -37,6 +37,7 @@
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.apache.hadoop.hive.cli.TestCliDriver"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="@PROJECT@"/>
- <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dhive.root.logger=INFO,console -Dtest.tmp.dir="${workspace_loc:@PROJECT@}/build/ql/tmp" -Dtest.warehouse.dir="pfile://${workspace_loc:@PROJECT@}/build/test/data/warehouse" -Dbuild.dir="${workspace_loc:@PROJECT@}/build/ql" -Dbuild.dir.hive="${workspace_loc:@PROJECT@}/build" -Dversion="@HIVE_VERSION@""/>
+ <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS"
+ value="@JVM_ARGS@ -Dhive.root.logger=INFO,console -Dhadoop.bin.path=@HADOOP_BIN_PATH@ -Dtest.tmp.dir="${workspace_loc:@PROJECT@}/build/ql/tmp" -Dtest.warehouse.dir="pfile://${workspace_loc:@PROJECT@}/build/test/data/warehouse" -Dbuild.dir="${workspace_loc:@PROJECT@}/build/ql" -Dbuild.dir.hive="${workspace_loc:@PROJECT@}/build" -Dversion="@HIVE_VERSION@""/>
<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:@PROJECT@}/ql"/>
</launchConfiguration>
Modified: hive/trunk/eclipse-templates/TestEmbeddedHiveMetaStore.launchtemplate
URL: http://svn.apache.org/viewvc/hive/trunk/eclipse-templates/TestEmbeddedHiveMetaStore.launchtemplate?rev=1348995&r1=1348994&r2=1348995&view=diff
==============================================================================
--- hive/trunk/eclipse-templates/TestEmbeddedHiveMetaStore.launchtemplate (original)
+++ hive/trunk/eclipse-templates/TestEmbeddedHiveMetaStore.launchtemplate Mon Jun 11 20:32:40 2012
@@ -20,7 +20,7 @@
<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="false"/>
<mapAttribute key="org.eclipse.debug.core.environmentVariables">
<mapEntry key="JAVA_HOME" value="${system_property:java.home}"/>
- <mapEntry key="HADOOP_HOME" value="${workspace_loc:@PROJECT@}/build/ivy/lib/hadoop.@HADOOPVER@.shim"/>
+ <mapEntry key="HIVE_HADOOP_TEST_CLASSPATH" value="@HIVE_HADOOP_TEST_CLASSPATH@"/>
</mapAttribute>
<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
@@ -37,6 +37,7 @@
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.apache.hadoop.hive.metastore.TestEmbeddedHiveMetaStore"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="@PROJECT@"/>
- <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dhive.root.logger=INFO,console -Dtest.tmp.dir="${workspace_loc:@PROJECT@}/build/ql/tmp" -Dtest.warehouse.dir="pfile://${workspace_loc:@PROJECT@}/build/test/data/warehouse" -Dbuild.dir="${workspace_loc:@PROJECT@}/build/ql" -Dbuild.dir.hive="${workspace_loc:@PROJECT@}/build" -Dversion="@HIVE_VERSION@""/>
+ <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS"
+ value="@JVM_ARGS@ -Dhive.root.logger=INFO,console -Dhadoop.bin.path=@HADOOP_BIN_PATH@ -Dtest.tmp.dir="${workspace_loc:@PROJECT@}/build/ql/tmp" -Dtest.warehouse.dir="pfile://${workspace_loc:@PROJECT@}/build/test/data/warehouse" -Dbuild.dir="${workspace_loc:@PROJECT@}/build/ql" -Dbuild.dir.hive="${workspace_loc:@PROJECT@}/build" -Dversion="@HIVE_VERSION@""/>
<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:@PROJECT@}/ql"/>
</launchConfiguration>
Modified: hive/trunk/eclipse-templates/TestHBaseCliDriver.launchtemplate
URL: http://svn.apache.org/viewvc/hive/trunk/eclipse-templates/TestHBaseCliDriver.launchtemplate?rev=1348995&r1=1348994&r2=1348995&view=diff
==============================================================================
--- hive/trunk/eclipse-templates/TestHBaseCliDriver.launchtemplate (original)
+++ hive/trunk/eclipse-templates/TestHBaseCliDriver.launchtemplate Mon Jun 11 20:32:40 2012
@@ -20,7 +20,7 @@
<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="false"/>
<mapAttribute key="org.eclipse.debug.core.environmentVariables">
<mapEntry key="JAVA_HOME" value="${system_property:java.home}"/>
- <mapEntry key="HADOOP_HOME" value="${workspace_loc:@PROJECT@}/build/ivy/lib/hadoop.@HADOOPVER@.shim"/>
+ <mapEntry key="HIVE_HADOOP_TEST_CLASSPATH" value="@HIVE_HADOOP_TEST_CLASSPATH@"/>
</mapAttribute>
<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
@@ -37,6 +37,7 @@
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.apache.hadoop.hive.cli.TestHBaseCliDriver"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="@PROJECT@"/>
- <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dhive.root.logger=INFO,console -Dtest.tmp.dir="${workspace_loc:@PROJECT@}/build/ql/tmp" -Dbuild.dir="${workspace_loc:@PROJECT@}/build/ql" -Dbuild.dir.hive="${workspace_loc:@PROJECT@}/build" -Dversion="@HIVE_VERSION@""/>
+ <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS"
+ value="@JVM_ARGS@ -Dhive.root.logger=INFO,console -Dhadoop.bin.path=@HADOOP_BIN_PATH@ -Dtest.tmp.dir="${workspace_loc:@PROJECT@}/build/ql/tmp" -Dbuild.dir="${workspace_loc:@PROJECT@}/build/ql" -Dbuild.dir.hive="${workspace_loc:@PROJECT@}/build" -Dversion="@HIVE_VERSION@""/>
<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:@PROJECT@}/ql"/>
</launchConfiguration>
Modified: hive/trunk/eclipse-templates/TestHive.launchtemplate
URL: http://svn.apache.org/viewvc/hive/trunk/eclipse-templates/TestHive.launchtemplate?rev=1348995&r1=1348994&r2=1348995&view=diff
==============================================================================
--- hive/trunk/eclipse-templates/TestHive.launchtemplate (original)
+++ hive/trunk/eclipse-templates/TestHive.launchtemplate Mon Jun 11 20:32:40 2012
@@ -20,7 +20,7 @@
<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="false"/>
<mapAttribute key="org.eclipse.debug.core.environmentVariables">
<mapEntry key="JAVA_HOME" value="${system_property:java.home}"/>
- <mapEntry key="HADOOP_HOME" value="${workspace_loc:@PROJECT@}/build/ivy/lib/hadoop.@HADOOPVER@.shim"/>
+ <mapEntry key="HIVE_HADOOP_TEST_CLASSPATH" value="@HIVE_HADOOP_TEST_CLASSPATH@"/>
</mapAttribute>
<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
@@ -37,6 +37,7 @@
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.apache.hadoop.hive.ql.metadata.TestHive"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="@PROJECT@"/>
- <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dhive.root.logger=INFO,console -Dtest.tmp.dir="${workspace_loc:@PROJECT@}/build/ql/tmp" -Dtest.warehouse.dir="pfile://${workspace_loc:@PROJECT@}/build/test/data/warehouse" -Dbuild.dir="${workspace_loc:@PROJECT@}/build/ql" -Dbuild.dir.hive="${workspace_loc:@PROJECT@}/build" -Dversion="@HIVE_VERSION@""/>
+ <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS"
+ value="@JVM_ARGS@ -Dhive.root.logger=INFO,console -Dhadoop.bin.path=@HADOOP_BIN_PATH@ -Dtest.tmp.dir="${workspace_loc:@PROJECT@}/build/ql/tmp" -Dtest.warehouse.dir="pfile://${workspace_loc:@PROJECT@}/build/test/data/warehouse" -Dbuild.dir="${workspace_loc:@PROJECT@}/build/ql" -Dbuild.dir.hive="${workspace_loc:@PROJECT@}/build" -Dversion="@HIVE_VERSION@""/>
<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:@PROJECT@}/ql"/>
</launchConfiguration>
Modified: hive/trunk/eclipse-templates/TestHiveMetaStoreChecker.launchtemplate
URL: http://svn.apache.org/viewvc/hive/trunk/eclipse-templates/TestHiveMetaStoreChecker.launchtemplate?rev=1348995&r1=1348994&r2=1348995&view=diff
==============================================================================
--- hive/trunk/eclipse-templates/TestHiveMetaStoreChecker.launchtemplate (original)
+++ hive/trunk/eclipse-templates/TestHiveMetaStoreChecker.launchtemplate Mon Jun 11 20:32:40 2012
@@ -20,7 +20,7 @@
<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="false"/>
<mapAttribute key="org.eclipse.debug.core.environmentVariables">
<mapEntry key="JAVA_HOME" value="${system_property:java.home}"/>
- <mapEntry key="HADOOP_HOME" value="${workspace_loc:@PROJECT@}/build/ivy/lib/hadoop.@HADOOPVER@.shim"/>
+ <mapEntry key="HIVE_HADOOP_TEST_CLASSPATH" value="@HIVE_HADOOP_TEST_CLASSPATH@"/>
</mapAttribute>
<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
@@ -37,6 +37,7 @@
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.apache.hadoop.hive.ql.metadata.TestHiveMetaStoreChecker"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="@PROJECT@"/>
- <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dhive.root.logger=INFO,console -Dtest.tmp.dir="${workspace_loc:@PROJECT@}/build/ql/tmp" -Dtest.warehouse.dir="pfile://${workspace_loc:@PROJECT@}/build/test/data/warehouse" -Dbuild.dir="${workspace_loc:@PROJECT@}/build/ql" -Dbuild.dir.hive="${workspace_loc:@PROJECT@}/build" -Dversion="@HIVE_VERSION@""/>
+ <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS"
+ value="@JVM_ARGS@ -Dhive.root.logger=INFO,console -Dhadoop.bin.path=@HADOOP_BIN_PATH@ -Dtest.tmp.dir="${workspace_loc:@PROJECT@}/build/ql/tmp" -Dtest.warehouse.dir="pfile://${workspace_loc:@PROJECT@}/build/test/data/warehouse" -Dbuild.dir="${workspace_loc:@PROJECT@}/build/ql" -Dbuild.dir.hive="${workspace_loc:@PROJECT@}/build" -Dversion="@HIVE_VERSION@""/>
<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:@PROJECT@}/ql"/>
</launchConfiguration>
Modified: hive/trunk/eclipse-templates/TestJdbc.launchtemplate
URL: http://svn.apache.org/viewvc/hive/trunk/eclipse-templates/TestJdbc.launchtemplate?rev=1348995&r1=1348994&r2=1348995&view=diff
==============================================================================
--- hive/trunk/eclipse-templates/TestJdbc.launchtemplate (original)
+++ hive/trunk/eclipse-templates/TestJdbc.launchtemplate Mon Jun 11 20:32:40 2012
@@ -20,7 +20,7 @@
<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="false"/>
<mapAttribute key="org.eclipse.debug.core.environmentVariables">
<mapEntry key="JAVA_HOME" value="${system_property:java.home}"/>
- <mapEntry key="HADOOP_HOME" value="${workspace_loc:@PROJECT@}/build/ivy/lib/hadoop.@HADOOPVER@.shim"/>
+ <mapEntry key="HIVE_HADOOP_TEST_CLASSPATH" value="@HIVE_HADOOP_TEST_CLASSPATH@"/>
</mapAttribute>
<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
@@ -37,7 +37,8 @@
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.apache.hadoop.hive.jdbc.TestJdbcDriver"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="@PROJECT@"/>
- <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dhive.root.logger=INFO,console -Dtest.tmp.dir="${workspace_loc:@PROJECT@}/build/ql/tmp" -Dbuild.dir="${workspace_loc:@PROJECT@}/build/ql" -Dbuild.dir.hive="${workspace_loc:@PROJECT@}/build" -Dversion="@HIVE_VERSION@" -Dtest.warehouse.dir="${workspace_loc:@PROJECT@}/build/ql/test/data/warehouse""/>
+ <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS"
+ value="@JVM_ARGS@ -Dhive.root.logger=INFO,console -Dhadoop.bin.path=@HADOOP_BIN_PATH@ -Dtest.tmp.dir="${workspace_loc:@PROJECT@}/build/ql/tmp" -Dbuild.dir="${workspace_loc:@PROJECT@}/build/ql" -Dbuild.dir.hive="${workspace_loc:@PROJECT@}/build" -Dversion="@HIVE_VERSION@" -Dtest.warehouse.dir="${workspace_loc:@PROJECT@}/build/ql/test/data/warehouse""/>
<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:@PROJECT@}/ql"/>
</launchConfiguration>
Modified: hive/trunk/eclipse-templates/TestMTQueries.launchtemplate
URL: http://svn.apache.org/viewvc/hive/trunk/eclipse-templates/TestMTQueries.launchtemplate?rev=1348995&r1=1348994&r2=1348995&view=diff
==============================================================================
--- hive/trunk/eclipse-templates/TestMTQueries.launchtemplate (original)
+++ hive/trunk/eclipse-templates/TestMTQueries.launchtemplate Mon Jun 11 20:32:40 2012
@@ -20,7 +20,7 @@
<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="false"/>
<mapAttribute key="org.eclipse.debug.core.environmentVariables">
<mapEntry key="JAVA_HOME" value="${system_property:java.home}"/>
- <mapEntry key="HADOOP_HOME" value="${workspace_loc:@PROJECT@}/build/ivy/lib/hadoop.@HADOOPVER@.shim"/>
+ <mapEntry key="HIVE_HADOOP_TEST_CLASSPATH" value="@HIVE_HADOOP_TEST_CLASSPATH@"/>
</mapAttribute>
<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
@@ -37,6 +37,7 @@
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.apache.hadoop.hive.ql.TestMTQueries"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="@PROJECT@"/>
- <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dhive.root.logger=INFO,console -Dtest.tmp.dir="${workspace_loc:@PROJECT@}/build/ql/tmp" -Dbuild.dir="${workspace_loc:@PROJECT@}/build/ql" -Dbuild.dir.hive="${workspace_loc:@PROJECT@}/build" -Dversion="@HIVE_VERSION@""/>
+ <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS"
+ value="@JVM_ARGS@ -Dhive.root.logger=INFO,console -Dhadoop.bin.path=@HADOOP_BIN_PATH@ -Dtest.tmp.dir="${workspace_loc:@PROJECT@}/build/ql/tmp" -Dbuild.dir="${workspace_loc:@PROJECT@}/build/ql" -Dbuild.dir.hive="${workspace_loc:@PROJECT@}/build" -Dversion="@HIVE_VERSION@""/>
<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:@PROJECT@}/ql"/>
</launchConfiguration>
Modified: hive/trunk/eclipse-templates/TestRemoteHiveMetaStore.launchtemplate
URL: http://svn.apache.org/viewvc/hive/trunk/eclipse-templates/TestRemoteHiveMetaStore.launchtemplate?rev=1348995&r1=1348994&r2=1348995&view=diff
==============================================================================
--- hive/trunk/eclipse-templates/TestRemoteHiveMetaStore.launchtemplate (original)
+++ hive/trunk/eclipse-templates/TestRemoteHiveMetaStore.launchtemplate Mon Jun 11 20:32:40 2012
@@ -20,7 +20,7 @@
<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="false"/>
<mapAttribute key="org.eclipse.debug.core.environmentVariables">
<mapEntry key="JAVA_HOME" value="${system_property:java.home}"/>
- <mapEntry key="HADOOP_HOME" value="${workspace_loc:@PROJECT@}/build/ivy/lib/hadoop.@HADOOPVER@.shim"/>
+ <mapEntry key="HIVE_HADOOP_TEST_CLASSPATH" value="@HIVE_HADOOP_TEST_CLASSPATH@"/>
</mapAttribute>
<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
@@ -37,6 +37,7 @@
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.apache.hadoop.hive.metastore.TestRemoteHiveMetaStore"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="@PROJECT@"/>
- <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dhive.root.logger=INFO,console -Dtest.tmp.dir="${workspace_loc:@PROJECT@}/build/ql/tmp" -Dtest.warehouse.dir="pfile://${workspace_loc:@PROJECT@}/build/test/data/warehouse" -Dbuild.dir="${workspace_loc:@PROJECT@}/build/ql" -Dbuild.dir.hive="${workspace_loc:@PROJECT@}/build" -Dversion="@HIVE_VERSION@""/>
+ <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS"
+ value="@JVM_ARGS@ -Dhive.root.logger=INFO,console -Dhadoop.bin.path=@HADOOP_BIN_PATH@ -Dtest.tmp.dir="${workspace_loc:@PROJECT@}/build/ql/tmp" -Dtest.warehouse.dir="pfile://${workspace_loc:@PROJECT@}/build/test/data/warehouse" -Dbuild.dir="${workspace_loc:@PROJECT@}/build/ql" -Dbuild.dir.hive="${workspace_loc:@PROJECT@}/build" -Dversion="@HIVE_VERSION@""/>
<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:@PROJECT@}/ql"/>
</launchConfiguration>
Modified: hive/trunk/eclipse-templates/TestTruncate.launchtemplate
URL: http://svn.apache.org/viewvc/hive/trunk/eclipse-templates/TestTruncate.launchtemplate?rev=1348995&r1=1348994&r2=1348995&view=diff
==============================================================================
--- hive/trunk/eclipse-templates/TestTruncate.launchtemplate (original)
+++ hive/trunk/eclipse-templates/TestTruncate.launchtemplate Mon Jun 11 20:32:40 2012
@@ -20,7 +20,7 @@
<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="false"/>
<mapAttribute key="org.eclipse.debug.core.environmentVariables">
<mapEntry key="JAVA_HOME" value="${system_property:java.home}"/>
- <mapEntry key="HADOOP_HOME" value="${workspace_loc:@PROJECT@}/build/ivy/lib/hadoop.@HADOOPVER@.shim"/>
+ <mapEntry key="HIVE_HADOOP_TEST_CLASSPATH" value="@HIVE_HADOOP_TEST_CLASSPATH@"/>
</mapAttribute>
<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
@@ -37,6 +37,7 @@
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.apache.hadoop.hive.metastore.TestTruncate"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="@PROJECT@"/>
- <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dhive.root.logger=INFO,console -Dtest.tmp.dir="${workspace_loc:@PROJECT@}/build/ql/tmp" -Dbuild.dir="${workspace_loc:@PROJECT@}/build/ql" -Dbuild.dir.hive="${workspace_loc:@PROJECT@}/build" -Dversion="@HIVE_VERSION@""/>
+ <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS"
+ value="@JVM_ARGS@ -Dhive.root.logger=INFO,console -Dhadoop.bin.path=@HADOOP_BIN_PATH@ -Dtest.tmp.dir="${workspace_loc:@PROJECT@}/build/ql/tmp" -Dbuild.dir="${workspace_loc:@PROJECT@}/build/ql" -Dbuild.dir.hive="${workspace_loc:@PROJECT@}/build" -Dversion="@HIVE_VERSION@""/>
<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:@PROJECT@}/ql"/>
</launchConfiguration>