diff --git webhcat/svr/src/main/bin/templeton_config.sh webhcat/svr/src/main/bin/templeton_config.sh index 6ca1b36..fff987e 100644 --- webhcat/svr/src/main/bin/templeton_config.sh +++ webhcat/svr/src/main/bin/templeton_config.sh @@ -32,7 +32,7 @@ ERROR_LOG=${TEMPLETON_LOG_DIR}/templeton-console-error.log 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}" diff --git webhcat/svr/src/main/bin/templeton_server.sh webhcat/svr/src/main/bin/templeton_server.sh index 1620773..c50c59c 100755 --- webhcat/svr/src/main/bin/templeton_server.sh +++ webhcat/svr/src/main/bin/templeton_server.sh @@ -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