Return-Path: X-Original-To: apmail-incubator-bigtop-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-bigtop-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E01817836 for ; Wed, 26 Oct 2011 22:40:01 +0000 (UTC) Received: (qmail 54439 invoked by uid 500); 26 Oct 2011 22:40:01 -0000 Delivered-To: apmail-incubator-bigtop-commits-archive@incubator.apache.org Received: (qmail 54410 invoked by uid 500); 26 Oct 2011 22:40:01 -0000 Mailing-List: contact bigtop-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: bigtop-dev@incubator.apache.org Delivered-To: mailing list bigtop-commits@incubator.apache.org Received: (qmail 54403 invoked by uid 99); 26 Oct 2011 22:40:01 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 26 Oct 2011 22:40:01 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 26 Oct 2011 22:40:00 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 2D703238889B; Wed, 26 Oct 2011 22:39:40 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1189511 - in /incubator/bigtop/trunk/bigtop-packages/src: common/hbase/install_hbase.sh deb/hbase/control rpm/hbase/SOURCES/hadoop-hbase.sh rpm/hbase/SOURCES/hadoop-hbase.sh.suse rpm/hbase/SPECS/hbase.spec Date: Wed, 26 Oct 2011 22:39:39 -0000 To: bigtop-commits@incubator.apache.org From: bmahe@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111026223940.2D703238889B@eris.apache.org> Author: bmahe Date: Wed Oct 26 22:39:39 2011 New Revision: 1189511 URL: http://svn.apache.org/viewvc?rev=1189511&view=rev Log: BIGTOP-175. All of HBase wrapper scripts and init.d scripts need to start include find-java code from bigtop-utils Modified: incubator/bigtop/trunk/bigtop-packages/src/common/hbase/install_hbase.sh incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/control incubator/bigtop/trunk/bigtop-packages/src/rpm/hbase/SOURCES/hadoop-hbase.sh incubator/bigtop/trunk/bigtop-packages/src/rpm/hbase/SOURCES/hadoop-hbase.sh.suse incubator/bigtop/trunk/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec Modified: incubator/bigtop/trunk/bigtop-packages/src/common/hbase/install_hbase.sh URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/common/hbase/install_hbase.sh?rev=1189511&r1=1189510&r2=1189511&view=diff ============================================================================== --- incubator/bigtop/trunk/bigtop-packages/src/common/hbase/install_hbase.sh (original) +++ incubator/bigtop/trunk/bigtop-packages/src/common/hbase/install_hbase.sh Wed Oct 26 22:39:39 2011 @@ -120,12 +120,22 @@ wrapper=$PREFIX/usr/bin/hbase mkdir -p `dirname $wrapper` cat > $wrapper <= 3.3.1), hadoop +Depends: adduser, hadoop-zookeeper (>= 3.3.1), hadoop, bigtop-utils Recommends: ntp Description: HBase is the Hadoop database Use it when you need random, realtime read/write access to your Big Data. Modified: incubator/bigtop/trunk/bigtop-packages/src/rpm/hbase/SOURCES/hadoop-hbase.sh URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/hbase/SOURCES/hadoop-hbase.sh?rev=1189511&r1=1189510&r2=1189511&view=diff ============================================================================== --- incubator/bigtop/trunk/bigtop-packages/src/rpm/hbase/SOURCES/hadoop-hbase.sh (original) +++ incubator/bigtop/trunk/bigtop-packages/src/rpm/hbase/SOURCES/hadoop-hbase.sh Wed Oct 26 22:39:39 2011 @@ -34,6 +34,13 @@ set -e source /etc/default/hadoop source /etc/default/hbase +# 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 DAEMON_SCRIPT="/usr/lib/hbase/bin/hbase-daemon.sh" NAME=HBase Modified: incubator/bigtop/trunk/bigtop-packages/src/rpm/hbase/SOURCES/hadoop-hbase.sh.suse URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/hbase/SOURCES/hadoop-hbase.sh.suse?rev=1189511&r1=1189510&r2=1189511&view=diff ============================================================================== --- incubator/bigtop/trunk/bigtop-packages/src/rpm/hbase/SOURCES/hadoop-hbase.sh.suse (original) +++ incubator/bigtop/trunk/bigtop-packages/src/rpm/hbase/SOURCES/hadoop-hbase.sh.suse Wed Oct 26 22:39:39 2011 @@ -36,6 +36,12 @@ source /lib/lsb/init-functions source /etc/default/hadoop source /etc/default/hbase +# 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 Modified: incubator/bigtop/trunk/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec?rev=1189511&r1=1189510&r2=1189511&view=diff ============================================================================== --- incubator/bigtop/trunk/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec (original) +++ incubator/bigtop/trunk/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec Wed Oct 26 22:39:39 2011 @@ -68,7 +68,8 @@ Source4: hadoop-hbase.sh.suse Source5: hbase.default Source6: hbase.nofiles.conf BuildArch: noarch -Requires: coreutils, /usr/sbin/useradd, /sbin/chkconfig, /sbin/service, hadoop-zookeeper, hadoop >= 0.20.2, hadoop-zookeeper >= 3.3.1 +Requires: coreutils, /usr/sbin/useradd, /sbin/chkconfig, /sbin/service +Requires: hadoop >= 0.20.2, hadoop-zookeeper >= 3.3.1, bigtop-utils %if 0%{?mgaversion} Requires: bsh-utils