svn commit: r1189519 - in /incubator/bigtop/trunk/bigtop-packages/src: common/sqoop/install_sqoop.sh common/sqoop/sqoop-metastore.sh common/sqoop/sqoop-metastore.sh.suse deb/sqoop/control rpm/sqoop/SPECS/sqoop.spec

[bm...@apache.org]

Author: bmahe
Date: Wed Oct 26 22:53:18 2011
New Revision: 1189519

URL: http://svn.apache.org/viewvc?rev=1189519&view=rev
Log:
BIGTOP-184. All of Sqoop wrapper scripts and init.d scripts need to start include find-java code from bigtop-utils

Modified:
    incubator/bigtop/trunk/bigtop-packages/src/common/sqoop/install_sqoop.sh
    incubator/bigtop/trunk/bigtop-packages/src/common/sqoop/sqoop-metastore.sh
    incubator/bigtop/trunk/bigtop-packages/src/common/sqoop/sqoop-metastore.sh.suse
    incubator/bigtop/trunk/bigtop-packages/src/deb/sqoop/control
    incubator/bigtop/trunk/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec

Modified: incubator/bigtop/trunk/bigtop-packages/src/common/sqoop/install_sqoop.sh
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/common/sqoop/install_sqoop.sh?rev=1189519&r1=1189518&r2=1189519&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/common/sqoop/install_sqoop.sh (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/common/sqoop/install_sqoop.sh Wed Oct 26 22:53:18 2011
@@ -136,6 +136,14 @@ for i in sqoop sqoop-codegen sqoop-expor
 	cat > $wrapper <<EOF
 #!/bin/sh
 . /etc/default/hadoop
+
+# Autodetect JAVA_HOME if not defined
+if [ -e /usr/libexec/bigtop-detect-javahome ]; then
+  source /usr/libexec/bigtop-detect-javahome
+elif [ -e /usr/lib/bigtop-utils/bigtop-detect-javahome ]; then
+  source /usr/lib/bigtop-utils/bigtop-detect-javahome
+fi
+
 export SQOOP_HOME=$LIB_DIR
 exec $BIN_DIR/$i "\$@"
 EOF

Modified: incubator/bigtop/trunk/bigtop-packages/src/common/sqoop/sqoop-metastore.sh
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/common/sqoop/sqoop-metastore.sh?rev=1189519&r1=1189518&r2=1189519&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/common/sqoop/sqoop-metastore.sh (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/common/sqoop/sqoop-metastore.sh Wed Oct 26 22:53:18 2011
@@ -34,6 +34,13 @@
 ### END INIT INFO
 set -e
 
+# Autodetect JAVA_HOME if not defined
+if [ -e /usr/libexec/bigtop-detect-javahome ]; then
+  source /usr/libexec/bigtop-detect-javahome
+elif [ -e /usr/lib/bigtop-utils/bigtop-detect-javahome ]; then
+  source /usr/lib/bigtop-utils/bigtop-detect-javahome
+fi
+
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 
 NAME=sqoop-metastore

Modified: incubator/bigtop/trunk/bigtop-packages/src/common/sqoop/sqoop-metastore.sh.suse
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/common/sqoop/sqoop-metastore.sh.suse?rev=1189519&r1=1189518&r2=1189519&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/common/sqoop/sqoop-metastore.sh.suse (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/common/sqoop/sqoop-metastore.sh.suse Wed Oct 26 22:53:18 2011
@@ -37,6 +37,13 @@
 
 source /lib/lsb/init-functions
 
+# Autodetect JAVA_HOME if not defined
+if [ -e /usr/libexec/bigtop-detect-javahome ]; then
+  source /usr/libexec/bigtop-detect-javahome
+elif [ -e /usr/lib/bigtop-utils/bigtop-detect-javahome ]; then
+  source /usr/lib/bigtop-utils/bigtop-detect-javahome
+fi
+
 STATUS_RUNNING=0
 STATUS_DEAD=1
 STATUS_DEAD_AND_LOCK=2

Modified: incubator/bigtop/trunk/bigtop-packages/src/deb/sqoop/control
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/sqoop/control?rev=1189519&r1=1189518&r2=1189519&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/sqoop/control (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/sqoop/control Wed Oct 26 22:53:18 2011
@@ -22,7 +22,7 @@ Homepage: http://www.cloudera.com
 
 Package:  sqoop
 Architecture: all
-Depends: hadoop
+Depends: hadoop, bigtop-utils
 Description: Tool for easy imports and exports of data sets between databases and HDFS
  Sqoop is a tool that provides the ability to import and export data sets between
  the Hadoop Distributed File System (HDFS) and relational databases.

Modified: incubator/bigtop/trunk/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec?rev=1189519&r1=1189518&r2=1189519&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec Wed Oct 26 22:53:18 2011
@@ -42,8 +42,8 @@ Source2: install_%{name}.sh
 Source3: sqoop-metastore.sh
 Source4: sqoop-metastore.sh.suse
 Buildarch: noarch
-BuildRequires:  asciidoc, xmlto
-Prereq: hadoop
+BuildRequires: asciidoc, xmlto
+Requires: hadoop, bigtop-utils
 
 %description 
 Sqoop allows easy imports and exports of data sets between databases and the Hadoop Distributed File System (HDFS).