You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by th...@apache.org on 2014/05/12 20:56:11 UTC
svn commit: r1594052 - in /hive/trunk/hcatalog/webhcat/svr/src/main:
config/webhcat-default.xml
java/org/apache/hive/hcatalog/templeton/AppConfig.java
Author: thejas
Date: Mon May 12 18:56:10 2014
New Revision: 1594052
URL: http://svn.apache.org/r1594052
Log:
HIVE-6549 : remove templeton.jar from webhcat-default.xml, remove hcatalog/bin/hive-config.sh (Eugene Koifman via Thejas Nair)
Modified:
hive/trunk/hcatalog/webhcat/svr/src/main/config/webhcat-default.xml
hive/trunk/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/AppConfig.java
Modified: hive/trunk/hcatalog/webhcat/svr/src/main/config/webhcat-default.xml
URL: http://svn.apache.org/viewvc/hive/trunk/hcatalog/webhcat/svr/src/main/config/webhcat-default.xml?rev=1594052&r1=1594051&r2=1594052&view=diff
==============================================================================
--- hive/trunk/hcatalog/webhcat/svr/src/main/config/webhcat-default.xml (original)
+++ hive/trunk/hcatalog/webhcat/svr/src/main/config/webhcat-default.xml Mon May 12 18:56:10 2014
@@ -38,12 +38,6 @@
</property>
<property>
- <name>templeton.jar</name>
- <value>${env.TEMPLETON_HOME}/share/webhcat/svr/webhcat-0.6.0-SNAPSHOT.jar</value>
- <description>The path to the Templeton jar file.</description>
- </property>
-
- <property>
<name>templeton.libjars</name>
<value>${env.TEMPLETON_HOME}/share/webhcat/svr/lib/zookeeper-3.4.3.jar</value>
<description>Jars to add to the classpath.</description>
Modified: hive/trunk/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/AppConfig.java
URL: http://svn.apache.org/viewvc/hive/trunk/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/AppConfig.java?rev=1594052&r1=1594051&r2=1594052&view=diff
==============================================================================
--- hive/trunk/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/AppConfig.java (original)
+++ hive/trunk/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/AppConfig.java Mon May 12 18:56:10 2014
@@ -120,7 +120,6 @@ public class AppConfig extends Configura
public static final String PIG_ARCHIVE_NAME = "templeton.pig.archive";
public static final String PIG_PATH_NAME = "templeton.pig.path";
public static final String STREAMING_JAR_NAME = "templeton.streaming.jar";
- public static final String TEMPLETON_JAR_NAME = "templeton.jar";
public static final String OVERRIDE_JARS_NAME = "templeton.override.jars";
public static final String OVERRIDE_JARS_ENABLED = "templeton.override.enabled";
public static final String TEMPLETON_CONTROLLER_MR_CHILD_OPTS
@@ -241,7 +240,6 @@ public class AppConfig extends Configura
return false;
}
- public String templetonJar() { return get(TEMPLETON_JAR_NAME); }
public String libJars() { return get(LIB_JARS_NAME); }
public String hadoopQueueName() { return get(HADOOP_QUEUE_NAME); }
public String clusterHadoop() { return get(HADOOP_NAME); }