BIGTOP-327. rename hadoop-hbase package into hbase

git-svn-id: https://svn.apache.org/repos/asf/incubator/bigtop/trunk@1226886 13f79535-47bb-0310-9956-ffa450edef68

15 files changed, 30 insertions, 28 deletions

diff --git a/bigtop-packages/src/deb/hbase/control b/bigtop-packages/src/deb/hbase/control
index 661d1225..ef8d1727 100644
--- a/bigtop-packages/src/deb/hbase/control
+++ b/bigtop-packages/src/deb/hbase/control
@@ -12,7 +12,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-Source: hadoop-hbase
+Source: hbase
 Section: misc
 Priority: extra
 Maintainer: Bigtop <bigtop-dev@incubator.apache.org>
@@ -20,7 +20,7 @@ Build-Depends: debhelper (>= 6), git-core, adduser
 Standards-Version: 3.8.0
 Homepage: http://hbase.apache.org/
 
-Package: hadoop-hbase
+Package: hbase
 Architecture: all
 Depends: adduser, zookeeper (>= 3.3.1), hadoop, bigtop-utils
 Recommends: ntp
@@ -29,28 +29,28 @@ Description: HBase is the Hadoop database
  This project's goal is the hosting of very large tables -- billions of rows  
  X millions of columns -- atop clusters of commodity hardware.
 
-Package: hadoop-hbase-doc
+Package: hbase-doc
 Architecture: all
 Section: doc
 Description: Documentation for HBase
  This package contains the HBase manual and JavaDoc.
 
-Package: hadoop-hbase-master
+Package: hbase-master
 Architecture: all
-Depends: hadoop-hbase (= ${source:Version}) 
+Depends: hbase (= ${source:Version}) 
 Description: HMaster is the "master server" for a HBase
  There is only one HMaster for a single HBase deployment.
 
-Package: hadoop-hbase-regionserver
+Package: hbase-regionserver
 Architecture: all
-Depends: hadoop-hbase (= ${source:Version}) 
+Depends: hbase (= ${source:Version}) 
 Description: HRegionServer makes a set of HRegions available to clients
  It checks in with the HMaster. There are many HRegionServers in a single 
  HBase deployment.
 
-Package: hadoop-hbase-thrift
+Package: hbase-thrift
 Architecture: all
-Depends: hadoop-hbase (= ${source:Version}) 
+Depends: hbase (= ${source:Version}) 
 Description: Provides an HBase Thrift service
  This package provides a Thrift service interface to the HBase distributed
  database.
diff --git a/bigtop-packages/src/deb/hbase/hadoop-hbase-doc.dirs b/bigtop-packages/src/deb/hbase/hadoop-hbase-doc.dirs
deleted file mode 100644
index bef810f1..00000000
--- a/bigtop-packages/src/deb/hbase/hadoop-hbase-doc.dirs
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/doc/hadoop-hbase-doc/
diff --git a/bigtop-packages/src/deb/hbase/hadoop-hbase-doc.install b/bigtop-packages/src/deb/hbase/hadoop-hbase-doc.install
deleted file mode 100644
index a379d05e..00000000
--- a/bigtop-packages/src/deb/hbase/hadoop-hbase-doc.install
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/doc/hadoop-hbase-doc
diff --git a/bigtop-packages/src/deb/hbase/hadoop-hbase.postinst b/bigtop-packages/src/deb/hbase/hadoop.postinst
index 8c15ce66..8c15ce66 100644
--- a/bigtop-packages/src/deb/hbase/hadoop-hbase.postinst
+++ b/bigtop-packages/src/deb/hbase/hadoop.postinst
diff --git a/bigtop-packages/src/deb/hbase/hbase-doc.dirs b/bigtop-packages/src/deb/hbase/hbase-doc.dirs
new file mode 100644
index 00000000..9eacc655
--- /dev/null
+++ b/bigtop-packages/src/deb/hbase/hbase-doc.dirs
@@ -0,0 +1 @@
+/usr/share/doc/hbase-doc/
diff --git a/bigtop-packages/src/deb/hbase/hbase-doc.install b/bigtop-packages/src/deb/hbase/hbase-doc.install
new file mode 100644
index 00000000..655130cf
--- /dev/null
+++ b/bigtop-packages/src/deb/hbase/hbase-doc.install
@@ -0,0 +1 @@
+/usr/share/doc/hbase-doc
diff --git a/bigtop-packages/src/deb/hbase/hadoop-hbase.dirs b/bigtop-packages/src/deb/hbase/hbase.dirs
index 37311ecd..37311ecd 100644
--- a/bigtop-packages/src/deb/hbase/hadoop-hbase.dirs
+++ b/bigtop-packages/src/deb/hbase/hbase.dirs
diff --git a/bigtop-packages/src/deb/hbase/hadoop-hbase.install b/bigtop-packages/src/deb/hbase/hbase.install
index 04c77134..04c77134 100644
--- a/bigtop-packages/src/deb/hbase/hadoop-hbase.install
+++ b/bigtop-packages/src/deb/hbase/hbase.install
diff --git a/bigtop-packages/src/deb/hbase/hadoop-hbase.manpages b/bigtop-packages/src/deb/hbase/hbase.manpages
index 1ba4c0d7..1ba4c0d7 100644
--- a/bigtop-packages/src/deb/hbase/hadoop-hbase.manpages
+++ b/bigtop-packages/src/deb/hbase/hbase.manpages
diff --git a/bigtop-packages/src/deb/hbase/hadoop-hbase.preinst b/bigtop-packages/src/deb/hbase/hbase.preinst
index 3f28d461..3f28d461 100644
--- a/bigtop-packages/src/deb/hbase/hadoop-hbase.preinst
+++ b/bigtop-packages/src/deb/hbase/hbase.preinst
diff --git a/bigtop-packages/src/deb/hbase/install_init_scripts.sh b/bigtop-packages/src/deb/hbase/install_init_scripts.sh
index c9b892dd..c0b4da86 100755
--- a/bigtop-packages/src/deb/hbase/install_init_scripts.sh
+++ b/bigtop-packages/src/deb/hbase/install_init_scripts.sh
@@ -15,7 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-SRC_PKG=hadoop-hbase
+SRC_PKG=hbase
 for node in master regionserver thrift ; do
     service_pkgdir=debian/$SRC_PKG-$node
     debdir=$service_pkgdir/DEBIAN
diff --git a/bigtop-packages/src/deb/hbase/rules b/bigtop-packages/src/deb/hbase/rules
index 29964ff0..af252e11 100755
--- a/bigtop-packages/src/deb/hbase/rules
+++ b/bigtop-packages/src/deb/hbase/rules
@@ -23,6 +23,11 @@ export DH_VERBOSE=1
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
 
+hadoop_home=/usr/lib/hadoop
+zookeeper_home=/usr/lib/zookeeper
+hbase_pkg_name=hbase
+hbase_jar_deps=${hadoop_home}/hadoop-core.jar ${zookeeper_home}/zookeeper.jar
+
 patch: patch-stamp
 patch-stamp:	
 	touch $@
@@ -44,28 +49,25 @@ install: build
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-	cp debian/hbase.default debian/hadoop-hbase/etc/default/hbase
+	cp debian/hbase.default debian/${hbase_pkg_name}/etc/default/${hbase_pkg_name}
 	sh -x debian/install_hbase.sh \
 		--build-dir=. \
-		--doc-dir=usr/share/doc/hadoop-hbase-doc \
+		--doc-dir=usr/share/doc/${hbase_pkg_name}-doc \
 		--prefix=debian/tmp
 	mkdir -p debian/tmp/etc/security/limits.d
-	cp debian/hbase.nofiles.conf debian/tmp/etc/security/limits.d
+	cp debian/hbase.nofiles.conf debian/tmp/etc/security/limits.d/${hbase_pkg_name}.nofiles.conf
 	# Symlink in the dependency jars from their packages. Both of these packages
 	# provide an unversioned symlink foo.jar -> foo-0.1.2.jar.
-	rm debian/tmp/usr/lib/hbase/lib/zookeeper-*.jar
-	rm debian/tmp/usr/lib/hbase/lib/hadoop-*.jar
-	ln -s /usr/lib/zookeeper/zookeeper.jar debian/tmp/usr/lib/hbase/lib/zookeeper.jar
-	ln -s /usr/lib/hadoop/hadoop-core.jar debian/tmp/usr/lib/hbase/lib/hadoop-core.jar
-	ln -s /var/log/hbase debian/tmp/usr/lib/hbase/logs
-	ln -s /var/run/hbase debian/tmp/usr/lib/hbase/pids
+	ln -f -s ${hbase_jar_deps} debian/tmp/usr/lib/${hbase_pkg_name}/lib/
+	ln -s /var/log/${hbase_pkg_name} debian/tmp/usr/lib/${hbase_pkg_name}/logs
+	ln -s /var/run/${hbase_pkg_name} debian/tmp/usr/lib/${hbase_pkg_name}/pids
 
 	# Wage war on "executable-not-elf-or-script" warnings:
 	### ruby scripts should not be executable - they require
 	### hbase org.jruby.Main <script>
-	find debian/tmp/usr/lib/hbase/bin debian/tmp/usr/lib/hbase/lib -name \*.rb -exec chmod 644 {} \;
+	find debian/tmp/usr/lib/${hbase_pkg_name}/bin debian/tmp/usr/lib/${hbase_pkg_name}/lib -name \*.rb -exec chmod 644 {} \;
 	### webapps should not be executable either
-	find debian/tmp/usr/lib/hbase/hbase-webapps -type f -exec chmod 644 {} \;
+	find debian/tmp/usr/lib/${hbase_pkg_name}/hbase-webapps -type f -exec chmod 644 {} \;
 
 	(dh_lintian) || /bin/true
 
@@ -89,7 +91,7 @@ binary-common:
 	dh_installinit --onlyscripts
 	# dh_installinit has a bug whereby it makes preinst/postinst files
 	# even for subpackages that don't have an init script!
-	rm -f debian/hadoop-hbase-doc*debhelper debian/hadoop-hbase.*debhelper || :
+	rm -f debian/${hbase_pkg_name}-doc*debhelper debian/${hbase_pkg_name}.*debhelper || :
 
 	dh_installdeb
 	dh_shlibdeps
diff --git a/bigtop-packages/src/deb/hbase/service-init.d.tpl b/bigtop-packages/src/deb/hbase/service-init.d.tpl
index 1d2b1a80..0221d323 100644
--- a/bigtop-packages/src/deb/hbase/service-init.d.tpl
+++ b/bigtop-packages/src/deb/hbase/service-init.d.tpl
@@ -49,8 +49,8 @@ export HBASE_HOME=/usr/lib/hbase
 export HBASE_PID_DIR=/var/run/hbase
 
 # Include HBase defaults if available
-if [ -f /etc/default/hadoop-hbase ] ; then
-  . /etc/default/hadoop-hbase
+if [ -f /etc/default/hbase ] ; then
+  . /etc/default/hbase
 fi
 
 if [ -f /usr/lib/hbase/bin/hbase-config.sh ] ; then
diff --git a/bigtop-packages/src/deb/hbase/service-postinst.tpl b/bigtop-packages/src/deb/hbase/service-postinst.tpl
index 690b27d4..b5648626 100644
--- a/bigtop-packages/src/deb/hbase/service-postinst.tpl
+++ b/bigtop-packages/src/deb/hbase/service-postinst.tpl
@@ -36,7 +36,7 @@ set -e
 
 case "$1" in
     configure)
-        update-rc.d hadoop-hbase-@HBASE_DAEMON@ defaults >/dev/null || exit 1
+        update-rc.d hbase-@HBASE_DAEMON@ defaults >/dev/null || exit 1
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)
diff --git a/bigtop-packages/src/deb/hbase/service-postrm.tpl b/bigtop-packages/src/deb/hbase/service-postrm.tpl
index 635fbbd3..5ad13b56 100644
--- a/bigtop-packages/src/deb/hbase/service-postrm.tpl
+++ b/bigtop-packages/src/deb/hbase/service-postrm.tpl
@@ -37,7 +37,7 @@ set -e
 
 case "$1" in
     purge)
-        update-rc.d -f hadoop-hbase-@HBASE_DAEMON@ remove > /dev/null || exit 1
+        update-rc.d -f hbase-@HBASE_DAEMON@ remove > /dev/null || exit 1
     ;;
     remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
     ;;