From e1cac293a32ee1baf0cdbd49c2d73c930781a6a3 Mon Sep 17 00:00:00 2001
From: Pino Toscano <ptoscano@redhat.com>
Date: Wed, 8 Apr 2015 18:59:11 +0200
Subject: [PATCH] Switch to the extjs element

Migrate the hadoop-cloudera and hadoop-mapr elements to use the new
extjs element, configuring it using environment.d snippets.

Change-Id: I354cf3ce5e816746e8d228d1af1b0da126c285d7
---
 diskimage-create/diskimage-create.sh          |  2 --
 elements/hadoop-cloudera/element-deps         |  1 +
 .../environment.d/00-configure-extjs          |  1 +
 .../install.d/60-install-extjs                | 16 ----------------
 elements/hadoop-mapr/element-deps             |  1 +
 .../environment.d/00-configure-extjs          |  2 ++
 elements/hadoop-mapr/install.d/44-oozie-libs  | 19 -------------------
 7 files changed, 5 insertions(+), 37 deletions(-)
 create mode 100644 elements/hadoop-cloudera/environment.d/00-configure-extjs
 delete mode 100755 elements/hadoop-cloudera/install.d/60-install-extjs
 create mode 100644 elements/hadoop-mapr/environment.d/00-configure-extjs
 delete mode 100755 elements/hadoop-mapr/install.d/44-oozie-libs

diff --git a/diskimage-create/diskimage-create.sh b/diskimage-create/diskimage-create.sh
index 9027afa3..62ec5244 100755
--- a/diskimage-create/diskimage-create.sh
+++ b/diskimage-create/diskimage-create.sh
@@ -543,7 +543,6 @@ fi
 #########################
 
 if [ -z "$PLUGIN" -o "$PLUGIN" = "cloudera" ]; then
-    export EXTJS_DOWNLOAD_URL=${EXTJS_DOWNLOAD_URL:-"http://extjs.com/deploy/ext-2.2.zip"}
     if [ -z "$BASE_IMAGE_OS" -o "$BASE_IMAGE_OS" = "ubuntu" ]; then
         if [ -z "$HADOOP_VERSION" -o "$HADOOP_VERSION" = "5.0" ]; then
             cloudera_5_0_ubuntu_image_name=${cloudera_5_0_ubuntu_image_name:-ubuntu_sahara_cloudera_5_0_0}
@@ -624,7 +623,6 @@ if [ -z "$PLUGIN" -o "$PLUGIN" = "cloudera" ]; then
         fi
         unset REG_METHOD REG_HALT_UNREGISTER
     fi
-    unset EXTJS_DOWNLOAD_URL
 fi
 
 ##########################
diff --git a/elements/hadoop-cloudera/element-deps b/elements/hadoop-cloudera/element-deps
index 9ebb5ec7..d5e2cf8c 100644
--- a/elements/hadoop-cloudera/element-deps
+++ b/elements/hadoop-cloudera/element-deps
@@ -1 +1,2 @@
+extjs
 ssh
diff --git a/elements/hadoop-cloudera/environment.d/00-configure-extjs b/elements/hadoop-cloudera/environment.d/00-configure-extjs
new file mode 100644
index 00000000..f8d84197
--- /dev/null
+++ b/elements/hadoop-cloudera/environment.d/00-configure-extjs
@@ -0,0 +1 @@
+export EXTJS_DESTINATION_DIR="/var/lib/oozie"
diff --git a/elements/hadoop-cloudera/install.d/60-install-extjs b/elements/hadoop-cloudera/install.d/60-install-extjs
deleted file mode 100755
index ca4c928d..00000000
--- a/elements/hadoop-cloudera/install.d/60-install-extjs
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-if [ "${DIB_DEBUG_TRACE:-0}" -gt 0 ]; then
-    set -x
-fi
-set -eu
-set -o pipefail
-
-install-packages wget unzip
-
-OOZIE_WEBAPP_DIRECTORY="/var/lib/oozie"
-EXTJS_FILENAME=$(basename $EXTJS_DOWNLOAD_URL)
-pushd $OOZIE_WEBAPP_DIRECTORY
-wget "$EXTJS_DOWNLOAD_URL"
-unzip $EXTJS_FILENAME
-popd
diff --git a/elements/hadoop-mapr/element-deps b/elements/hadoop-mapr/element-deps
index 339da4b9..6c4f1980 100644
--- a/elements/hadoop-mapr/element-deps
+++ b/elements/hadoop-mapr/element-deps
@@ -1,2 +1,3 @@
+extjs
 java
 mysql
diff --git a/elements/hadoop-mapr/environment.d/00-configure-extjs b/elements/hadoop-mapr/environment.d/00-configure-extjs
new file mode 100644
index 00000000..10de1c84
--- /dev/null
+++ b/elements/hadoop-mapr/environment.d/00-configure-extjs
@@ -0,0 +1,2 @@
+export EXTJS_DESTINATION_DIR="/opt/mapr-repository/"
+export EXTJS_NO_UNPACK=1
diff --git a/elements/hadoop-mapr/install.d/44-oozie-libs b/elements/hadoop-mapr/install.d/44-oozie-libs
deleted file mode 100755
index eb23968f..00000000
--- a/elements/hadoop-mapr/install.d/44-oozie-libs
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-
-if [ "${DIB_DEBUG_TRACE:-0}" -gt 0 ]; then
-    set -x
-fi
-set -eu
-set -o pipefail
-
-echo "START: downloading ExtJS library"
-
-install-packages wget
-
-MAPR_REPO_DIR="/opt/mapr-repository/"
-EXT_JS_URL="http://extjs.com/deploy/ext-2.2.zip"
-
-mkdir -p ${MAPR_REPO_DIR}
-sudo wget ${EXT_JS_URL} -P ${MAPR_REPO_DIR}
-
-echo "END: downloading ExtJS library"