From 27210468e71dcc87b1fa8fe298d6f254865cb073 Mon Sep 17 00:00:00 2001
From: yeongeon <yeongeon@gmail.com>
Date: Thu, 14 Apr 2016 17:09:35 +0900
Subject: [PATCH] BIGTOP-2394. Upgrade Tajo version to 0.11.2

---
 bigtop-packages/src/common/tajo/install_tajo.sh  | 7 -------
 bigtop-packages/src/common/tajo/tajo-env.default | 1 +
 bigtop-packages/src/deb/tajo/tajo.install        | 2 +-
 bigtop.bom                                       | 2 +-
 4 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/bigtop-packages/src/common/tajo/install_tajo.sh b/bigtop-packages/src/common/tajo/install_tajo.sh
index 1aa7422379..9c1af54bbf 100644
--- a/bigtop-packages/src/common/tajo/install_tajo.sh
+++ b/bigtop-packages/src/common/tajo/install_tajo.sh
@@ -93,7 +93,6 @@ install -d -m 0755 $PREFIX/$LIB_DIR
 install -d -m 0755 $PREFIX/$LIB_DIR/bin
 install -d -m 0755 $PREFIX/$LIB_DIR/lib
 install -d -m 0755 $PREFIX/$LIB_DIR/extlib
-install -d -m 0755 $PREFIX/$LIB_DIR/hive
 install -d -m 0755 $PREFIX/$LIB_DIR/share
 install -d -m 0755 $PREFIX/$LIB_DIR/share/jdbc-dist
 install -d -m 0755 $PREFIX/$CONF_DIR
@@ -122,12 +121,6 @@ for module in ${BUILD_DIR}/extlib/*; do
     cp -ra ${BUILD_DIR}/extlib/$x $PREFIX/${LIB_DIR}/extlib/
   fi
 done
-for module in ${BUILD_DIR}/hive/*; do
-  if [ -f $module ]; then
-    x=$(basename $module)
-    cp -ra ${BUILD_DIR}/hive/$x $PREFIX/${LIB_DIR}/hive/
-  fi
-done
 for module in ${BUILD_DIR}/share/jdbc-dist/*; do
   if [ -f $module ]; then
     x=$(basename $module)
diff --git a/bigtop-packages/src/common/tajo/tajo-env.default b/bigtop-packages/src/common/tajo/tajo-env.default
index e2760e486d..53692421be 100644
--- a/bigtop-packages/src/common/tajo/tajo-env.default
+++ b/bigtop-packages/src/common/tajo/tajo-env.default
@@ -80,6 +80,7 @@ export TAJO_PID_DIR=/var/run/tajo
 
 # A string representing this instance of tajo. $USER by default.
 # export TAJO_IDENT_STRING=$USER
+export TAJO_IDENT_STRING=tajo
 
 # The scheduling priority for daemon processes.  See 'man nice'.
 # export TAJO_NICENESS=10
diff --git a/bigtop-packages/src/deb/tajo/tajo.install b/bigtop-packages/src/deb/tajo/tajo.install
index 2a01b3b219..fe85d65ae4 100644
--- a/bigtop-packages/src/deb/tajo/tajo.install
+++ b/bigtop-packages/src/deb/tajo/tajo.install
@@ -5,8 +5,8 @@
 /usr/lib/tajo/bin/*
 /usr/lib/tajo/extlib
 /usr/lib/tajo/conf
-/usr/lib/tajo/hive/*.jar
 /usr/lib/tajo/lib/*.jar
+/usr/lib/tajo/logs
 /usr/lib/tajo/share/jdbc-dist/*.jar
 /var/lib/tajo
 /var/log/tajo
diff --git a/bigtop.bom b/bigtop.bom
index 56db5b0e20..4aa7cc21d5 100644
--- a/bigtop.bom
+++ b/bigtop.bom
@@ -405,7 +405,7 @@ bigtop {
     'tajo' {
       name    = 'tajo'
       relNotes = 'Apache Tajo'
-      version { base = '0.11.1'; pkg = base; release = 1 }
+      version { base = '0.11.2'; pkg = base; release = 1 }
       tarball { source      = "$name-${version.base}-src.tar.gz"
                 destination = "$name-${version.base}.tar.gz" }
       url     { download_path = "/$name/$name-${version.base}"