Author: travis
Date: Wed Aug 15 23:10:43 2012
New Revision: 1373670
URL: http://svn.apache.org/viewvc?rev=1373670&view=rev
Log:
HCAT-467 Templeton scripts point to wrong jar name
Modified:
incubator/hcatalog/trunk/CHANGES.txt
incubator/hcatalog/trunk/webhcat/svr/src/main/bin/templeton_config.sh
incubator/hcatalog/trunk/webhcat/svr/src/main/bin/templeton_server.sh
Modified: incubator/hcatalog/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/incubator/hcatalog/trunk/CHANGES.txt?rev=1373670&r1=1373669&r2=1373670&view=diff
==============================================================================
--- incubator/hcatalog/trunk/CHANGES.txt (original)
+++ incubator/hcatalog/trunk/CHANGES.txt Wed Aug 15 23:10:43 2012
@@ -75,6 +75,8 @@ Trunk (unreleased changes)
OPTIMIZATIONS
BUG FIXES
+ HCAT-467 Templeton scripts point to wrong jar name (jghoman via
traviscrawford)
+
HCAT-436 JSON SerDe column misnaming on CTAS (khorgath via gates)
HCAT-449 HCatLoader is mistakenly identifying Configuration parameters to
store (cdrome via traviscrawford)
Modified: incubator/hcatalog/trunk/webhcat/svr/src/main/bin/templeton_config.sh
URL:
http://svn.apache.org/viewvc/incubator/hcatalog/trunk/webhcat/svr/src/main/bin/templeton_config.sh?rev=1373670&r1=1373669&r2=1373670&view=diff
==============================================================================
--- incubator/hcatalog/trunk/webhcat/svr/src/main/bin/templeton_config.sh
(original)
+++ incubator/hcatalog/trunk/webhcat/svr/src/main/bin/templeton_config.sh Wed
Aug 15 23:10:43 2012
@@ -32,7 +32,7 @@ ERROR_LOG=${TEMPLETON_LOG_DIR}/templeton
CONSOLE_LOG=${TEMPLETON_LOG_DIR}/templeton-console.log
# The name of the templeton jar file
-TEMPLETON_JAR=templeton-0.1.0-dev.jar
+TEMPLETON_JAR=webhcat-0.5.0-SNAPSHOT.jar
# How long to wait before testing that the process started correctly
SLEEP_TIME_AFTER_START=10
@@ -61,7 +61,7 @@ fi
if [ -e "${TEMPLETON_PREFIX}/conf/templeton-env.sh" ]; then
DEFAULT_CONF_DIR=${TEMPLETON_PREFIX}/"conf"
else
- DEFAULT_CONF_DIR="/etc/templeton"
+ DEFAULT_CONF_DIR="/etc/hcatalog"
fi
TEMPLETON_CONF_DIR="${TEMPLETON_CONF_DIR:-$DEFAULT_CONF_DIR}"
Modified: incubator/hcatalog/trunk/webhcat/svr/src/main/bin/templeton_server.sh
URL:
http://svn.apache.org/viewvc/incubator/hcatalog/trunk/webhcat/svr/src/main/bin/templeton_server.sh?rev=1373670&r1=1373669&r2=1373670&view=diff
==============================================================================
--- incubator/hcatalog/trunk/webhcat/svr/src/main/bin/templeton_server.sh
(original)
+++ incubator/hcatalog/trunk/webhcat/svr/src/main/bin/templeton_server.sh Wed
Aug 15 23:10:43 2012
@@ -58,7 +58,7 @@ function log() {
# Find the templeton jar
function find_jar_path() {
- for dir in "." "build/templeton" "share/templeton/"; do
+ for dir in "." "build" "share/hcatalog/"; do
local jar="$base_dir/$dir/$TEMPLETON_JAR"
if [[ -f $jar ]]; then
echo $jar
@@ -70,7 +70,7 @@ function find_jar_path() {
# Find the templeton classpath
function find_classpath() {
local classpath=""
- for dir in "share/templeton/lib" "build/ivy/lib/templeton" "conf" ; do
+ for dir in "share/hcatalog" "build/ivy/lib/templeton" "conf" ; do
local path="$base_dir/$dir"
if [[ -d $path ]]; then
