incubator-bigtop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@apache.org
Subject svn commit: r1225978 - in /incubator/bigtop/branches/hadoop-0.23: ./ bigtop-deploy/puppet/modules/hadoop-hive/manifests/ bigtop-packages/src/common/hive/ bigtop-packages/src/deb/hive/ bigtop-packages/src/rpm/hive/SPECS/ bigtop-tests/test-artifacts/pack...
Date Sat, 31 Dec 2011 00:02:04 GMT
Author: rvs
Date: Sat Dec 31 00:02:03 2011
New Revision: 1225978

URL: http://svn.apache.org/viewvc?rev=1225978&view=rev
Log:
BIGTOP-329. rename hadoop-hive package into hive

Added:
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hive/hive-metastore.default
      - copied, changed from r1225977, incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hive/hadoop-hive-metastore.default
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hive/hive-server.default
      - copied, changed from r1225977, incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hive/hadoop-hive-server.default
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hive/hive.sh
      - copied, changed from r1225977, incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hive/hadoop-hive.sh
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hive/hive.sh.suse
      - copied, changed from r1225977, incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hive/hadoop-hive.sh.suse
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hive/hive.dirs
      - copied, changed from r1225977, incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hive/hadoop-hive.dirs
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hive/hive.postinst
      - copied, changed from r1225977, incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hive/hadoop-hive.postinst
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hive/hive.preinst
      - copied, changed from r1225977, incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hive/hadoop-hive.preinst
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hive/hive.prerm
      - copied, changed from r1225977, incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hive/hadoop-hive.prerm
Removed:
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hive/hadoop-hive-metastore.default
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hive/hadoop-hive-server.default
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hive/hadoop-hive.sh
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hive/hadoop-hive.sh.suse
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hive/hadoop-hive.dirs
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hive/hadoop-hive.postinst
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hive/hadoop-hive.preinst
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hive/hadoop-hive.prerm
Modified:
    incubator/bigtop/branches/hadoop-0.23/bigtop-deploy/puppet/modules/hadoop-hive/manifests/init.pp
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hive/control
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hive/install_init_scripts.sh
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hive/rules
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hive/service-init.d.tpl
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hive/SPECS/hive.spec
    incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/package_data_apt.xml
    incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/package_data_urpmi.xml
    incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/package_data_yum.xml
    incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/package_data_zypper.xml
    incubator/bigtop/branches/hadoop-0.23/bigtop.mk

Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-deploy/puppet/modules/hadoop-hive/manifests/init.pp
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-deploy/puppet/modules/hadoop-hive/manifests/init.pp?rev=1225978&r1=1225977&r2=1225978&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-deploy/puppet/modules/hadoop-hive/manifests/init.pp
(original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-deploy/puppet/modules/hadoop-hive/manifests/init.pp
Sat Dec 31 00:02:03 2011
@@ -15,13 +15,13 @@
 
 class hadoop-hive {
   define client($hbase_master = "", $hbase_zookeeper_quorum = "") {
-    package { "hadoop-hive":
+    package { "hive":
       ensure => latest,
     } 
 
     file { "/etc/hive/conf/hive-site.xml":
       content => template('hadoop-hive/hive-site.xml'),
-      require => Package["hadoop-hive"],
+      require => Package["hive"],
     }
   }
 }

Copied: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hive/hive-metastore.default
(from r1225977, incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hive/hadoop-hive-metastore.default)
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hive/hive-metastore.default?p2=incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hive/hive-metastore.default&p1=incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hive/hadoop-hive-metastore.default&r1=1225977&r2=1225978&rev=1225978&view=diff
==============================================================================
    (empty)

Copied: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hive/hive-server.default
(from r1225977, incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hive/hadoop-hive-server.default)
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hive/hive-server.default?p2=incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hive/hive-server.default&p1=incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hive/hadoop-hive-server.default&r1=1225977&r2=1225978&rev=1225978&view=diff
==============================================================================
    (empty)

Copied: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hive/hive.sh (from
r1225977, incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hive/hadoop-hive.sh)
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hive/hive.sh?p2=incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hive/hive.sh&p1=incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hive/hadoop-hive.sh&r1=1225977&r2=1225978&rev=1225978&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hive/hadoop-hive.sh (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hive/hive.sh Sat Dec
31 00:02:03 2011
@@ -24,7 +24,7 @@
 # processname: hive
 # pidfile: /var/run/hive/hive-@HIVE_DAEMON@.pid
 ### BEGIN INIT INFO
-# Provides:          hadoop-hive-@HIVE_DAEMON@
+# Provides:          hive-@HIVE_DAEMON@
 # Required-Start:    $syslog $remote_fs
 # Should-Start:
 # Required-Stop:     $syslog $remote_fs
@@ -54,16 +54,16 @@ ERROR_PROGRAM_NOT_INSTALLED=5
 ERROR_PROGRAM_NOT_CONFIGURED=6
 
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-SYS_FILE="/etc/default/hadoop-hive-@HIVE_DAEMON@"
+NAME="hive-@HIVE_DAEMON@"
+DESC="Hive @HIVE_DAEMON@ daemon"
+SYS_FILE="/etc/default/${NAME}"
 EXE_FILE="/usr/lib/hive/bin/hive"
-PID_FILE="/var/run/hive/hive-@HIVE_DAEMON@.pid"
-LOCKFILE="/var/lock/subsys/hadoop-hive-@HIVE_DAEMON@"
-LOG_FILE="/var/log/hive/hive-@HIVE_DAEMON@.log"
+PID_FILE="/var/run/hive/${NAME}.pid"
+LOCKFILE="/var/lock/subsys/${NAME}"
+LOG_FILE="/var/log/hive/${NAME}.log"
 HIVE_USER="hive"
 HIVE_HOME="`eval echo ~$HIVE_USER`"
 NICENESS="+0"
-NAME="hadoop-hive-@HIVE_DAEMON@"
-DESC="Hive @HIVE_DAEMON@ daemon"
 TIMEOUT=3
 
 [ -f $SYS_FILE ] && . $SYS_FILE
@@ -77,7 +77,7 @@ hive_start() {
       exec_env="HADOOP_OPTS=\"-Dhive.log.dir=`dirname $LOG_FILE`\""
     fi
 
-    log_success_msg "Starting $desc (hadoop-hive-@HIVE_DAEMON@): "
+    log_success_msg "Starting $desc (${NAME}): "
     start_daemon -u $HIVE_USER -p $PID_FILE -n $NICENESS  /bin/sh -c "cd $HIVE_HOME ; $exec_env
nohup \
            $EXE_FILE --service $service_name $PORT \
              > $LOG_FILE 2>&1 < /dev/null & "'echo $! '"> $PID_FILE"
@@ -88,7 +88,7 @@ hive_start() {
 }
 
 hive_stop() {
-    log_success_msg "Stopping $desc (hadoop-hive-@HIVE_DAEMON@): "
+    log_success_msg "Stopping $desc (${NAME}): "
     killproc -p $PID_FILE java
     RETVAL=$?
 

Copied: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hive/hive.sh.suse
(from r1225977, incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hive/hadoop-hive.sh.suse)
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hive/hive.sh.suse?p2=incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hive/hive.sh.suse&p1=incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hive/hadoop-hive.sh.suse&r1=1225977&r2=1225978&rev=1225978&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hive/hadoop-hive.sh.suse
(original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hive/hive.sh.suse Sat
Dec 31 00:02:03 2011
@@ -22,7 +22,7 @@
 # processname: hive
 #
 ### BEGIN INIT INFO
-# Provides:          hadoop-hive-@HIVE_DAEMON@
+# Provides:          hive-@HIVE_DAEMON@
 # Required-Start:    $syslog $remote_fs
 # Should-Start:
 # Required-Stop:     $syslog $remote_fs
@@ -44,14 +44,14 @@ fi
 # Modelled after $HADOOP_HOME/bin/hadoop-daemon.sh
 
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-SYS_FILE="/etc/default/hadoop-hive-@HIVE_DAEMON@"
+NAME="hive-@HIVE_DAEMON@"
+SYS_FILE="/etc/default/${NAME}"
 EXE_FILE="/usr/lib/hive/bin/hive"
-PID_FILE="/var/run/hive/hive-@HIVE_DAEMON@.pid"
-LOCKFILE="/var/lock/subsys/hadoop-hive-@HBASE_DAEMON@"
-LOG_FILE="/var/log/hive/hive-@HIVE_DAEMON@.log"
+PID_FILE="/var/run/hive/${NAME}.pid"
+LOCKFILE="/var/lock/subsys/${NAME}"
+LOG_FILE="/var/log/hive/${NAME}.log"
 HIVE_USER="hive"
 NICENESS="0"
-NAME="hadoop-hive-@HIVE_DAEMON@"
 DESC="Hive daemon"
  
 DODTIME=3
@@ -126,7 +126,7 @@ hive_start() {
     ERROR_PROGRAM_NOT_INSTALLED=5
 
     [ -x $EXE_FILE ] || exit $ERROR_PROGRAM_NOT_INSTALLED
-    log_success_msg "Starting $desc (hadoop-hive-@HIVE_DAEMON@): "
+    log_success_msg "Starting $desc (${NAME}): "
 
     if hive_check_pidfile $PID_FILE ; then
       exit 0
@@ -150,7 +150,7 @@ hive_start() {
     return $RETVAL
 }
 hive_stop() {
-    log_success_msg "Stopping $desc (hadoop-hive-@HIVE_DAEMON@): "
+    log_success_msg "Stopping $desc (${NAME}): "
     if [ -f $PID_FILE ]; then
       hive_stop_pidfile $PID_FILE
       RETVAL=$?
@@ -168,7 +168,7 @@ hive_status() {
     local STATUS_DEAD=1
     local STATUS_DEAD_AND_LOCK=2
     local STATUS_NOT_RUNNING=3
-    local DAEMON="hadoop-hive-@HIVE_DAEMON@"
+    local DAEMON="${NAME}"
 
     pidofproc -p $PID_FILE java > /dev/null
     status=$?

Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hive/control
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hive/control?rev=1225978&r1=1225977&r2=1225978&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hive/control (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hive/control Sat Dec 31
00:02:03 2011
@@ -13,15 +13,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-Source: hadoop-hive
+Source: hive
 Section: misc
 Priority: extra
 Maintainer: Bigtop <bigtop-dev@incubator.apache.org>
 Build-Depends: debhelper (>= 6), ant, python-support, git-core
 Standards-Version: 3.8.0
-Homepage: http://hadoop.apache.org/hive/
+Homepage: http://hive.apache.org/
 
-Package: hadoop-hive
+Package: hive
 Architecture: all
 Depends: adduser, hadoop, bigtop-utils
 Description: A data warehouse infrastructure built on top of Hadoop
@@ -45,14 +45,14 @@ XS-Python-Version: >= 2.4
 Description: Python client library to talk to the Hive Metastore
  This is a generated Thrift client to talk to the Hive Metastore.
 
-Package: hadoop-hive-server
+Package: hive-server
 Architecture: all
-Depends: hadoop-hive (= ${source:Version})
+Depends: hive (= ${source:Version})
 Description: Provides a Hive Thrift service
  This optional package hosts a Thrift server for Hive clients across a network to use.
 
-Package: hadoop-hive-metastore
+Package: hive-metastore
 Architecture: all
-Depends: hadoop-hive (= ${source:Version})
+Depends: hive (= ${source:Version})
 Description: Shared metadata repository for Hive
  This optional package hosts a metadata server for Hive clients across a network to use.

Copied: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hive/hive.dirs (from
r1225977, incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hive/hadoop-hive.dirs)
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hive/hive.dirs?p2=incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hive/hive.dirs&p1=incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hive/hadoop-hive.dirs&r1=1225977&r2=1225978&rev=1225978&view=diff
==============================================================================
    (empty)

Copied: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hive/hive.postinst (from
r1225977, incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hive/hadoop-hive.postinst)
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hive/hive.postinst?p2=incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hive/hive.postinst&p1=incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hive/hadoop-hive.postinst&r1=1225977&r2=1225978&rev=1225978&view=diff
==============================================================================
    (empty)

Copied: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hive/hive.preinst (from
r1225977, incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hive/hadoop-hive.preinst)
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hive/hive.preinst?p2=incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hive/hive.preinst&p1=incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hive/hadoop-hive.preinst&r1=1225977&r2=1225978&rev=1225978&view=diff
==============================================================================
    (empty)

Copied: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hive/hive.prerm (from
r1225977, incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hive/hadoop-hive.prerm)
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hive/hive.prerm?p2=incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hive/hive.prerm&p1=incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hive/hadoop-hive.prerm&r1=1225977&r2=1225978&rev=1225978&view=diff
==============================================================================
    (empty)

Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hive/install_init_scripts.sh
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hive/install_init_scripts.sh?rev=1225978&r1=1225977&r2=1225978&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hive/install_init_scripts.sh
(original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hive/install_init_scripts.sh
Sat Dec 31 00:02:03 2011
@@ -15,7 +15,7 @@
 # limitations under the License.
 
 
-SRC_PKG=hadoop-hive
+SRC_PKG=hive
 for node in server metastore ; do
     service_pkgdir=debian/$SRC_PKG-$node
     debdir=$service_pkgdir/DEBIAN

Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hive/rules
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hive/rules?rev=1225978&r1=1225977&r2=1225978&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hive/rules (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hive/rules Sat Dec 31 00:02:03
2011
@@ -23,6 +23,8 @@
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
 
+hive_pkg_name=hive
+
 clean:	
 	dh_testdir
 	dh_testroot
@@ -37,7 +39,7 @@ build-indep-stamp:
 	touch $@
 
 server metastore: debian/service-init.d.tpl
-	sed -e "s|@HIVE_DAEMON@|$@|" $< > debian/hadoop-hive-$@.init
+	sed -e "s|@HIVE_DAEMON@|$@|" $< > debian/${hive_pkg_name}-$@.init
 
 install: install-indep
 install-indep: metastore server	
@@ -48,13 +50,13 @@ install-indep: metastore server	
 	cp debian/hive-site.xml .
 	cp debian/hive.1 .
 	sh debian/install_hive.sh \
-	  --prefix=debian/hadoop-hive \
+	  --prefix=debian/${hive_pkg_name} \
 	  --build-dir=src/build/dist \
-	  --doc-dir=debian/hadoop-hive/usr/share/doc/hive \
-	  --python-dir=debian/python-hive/usr/share/python-support/python-hive/hive
+	  --doc-dir=debian/${hive_pkg_name}/usr/share/doc/${hive_pkg_name} \
+	  --python-dir=debian/python-${hive_pkg_name}/usr/share/python-support/python-${hive_pkg_name}/${hive_pkg_name}
 	dh_pysupport
 	dh_install -i
-	ls -ld debian/hadoop-hive/var/lib/hive/metastore
+	ls -ld debian/${hive_pkg_name}/var/lib/${hive_pkg_name}/metastore
 	(dh_lintian) || /bin/true
 
 binary-common:	

Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hive/service-init.d.tpl
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hive/service-init.d.tpl?rev=1225978&r1=1225977&r2=1225978&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hive/service-init.d.tpl
(original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hive/service-init.d.tpl
Sat Dec 31 00:02:03 2011
@@ -30,7 +30,7 @@
 # processname: hive
 #
 ### BEGIN INIT INFO
-# Provides:          hadoop-hive-@HIVE_DAEMON@
+# Provides:          hive-@HIVE_DAEMON@
 # Required-Start:    $syslog $remote_fs
 # Should-Start:
 # Required-Stop:     $syslog $remote_fs
@@ -61,16 +61,16 @@ ERROR_PROGRAM_NOT_INSTALLED=5
 ERROR_PROGRAM_NOT_CONFIGURED=6
 
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-SYS_FILE="/etc/default/hadoop-hive-@HIVE_DAEMON@"
+NAME="hive-@HIVE_DAEMON@"
+DESC="Hive @HIVE_DAEMON@ daemon"
+SYS_FILE="/etc/default/${NAME}"
 EXE_FILE="/usr/lib/hive/bin/hive"
-PID_FILE="/var/run/hive/hive-@HIVE_DAEMON@.pid"
-LOCKFILE="/var/lock/subsys/hadoop-hive-@HIVE_DAEMON@"
-LOG_FILE="/var/log/hive/hive-@HIVE_DAEMON@.log"
+PID_FILE="/var/run/hive/${NAME}.pid"
+LOCKFILE="/var/lock/subsys/${NAME}"
+LOG_FILE="/var/log/hive/${NAME}.log"
 HIVE_USER="hive"
 HIVE_HOME="`eval echo ~$HIVE_USER`"
 NICENESS="+0"
-NAME="hadoop-hive-@HIVE_DAEMON@"
-DESC="Hive @HIVE_DAEMON@ daemon"
 TIMEOUT=3
 
 [ -f $SYS_FILE ] && . $SYS_FILE
@@ -84,7 +84,7 @@ hive_start() {
       exec_env="HADOOP_OPTS=\"-Dhive.log.dir=`dirname $LOG_FILE`\""
     fi
 
-    log_success_msg "Starting $desc (hadoop-hive-@HIVE_DAEMON@): "
+    log_success_msg "Starting $desc (${NAME}): "
     /sbin/start-stop-daemon --quiet --oknodo --start --user $HIVE_USER --name java --background
\
        --chuid $HIVE_USER --nicelevel $NICENESS --chdir $HIVE_HOME \
        --make-pidfile --pidfile $PID_FILE --startas /bin/sh -- \
@@ -96,7 +96,7 @@ hive_start() {
 }
 
 hive_stop() {
-    log_success_msg "Stopping $desc (hadoop-hive-@HIVE_DAEMON@): "
+    log_success_msg "Stopping $desc (${NAME}): "
     killproc -p $PID_FILE java
     RETVAL=$?
 

Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hive/SPECS/hive.spec
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hive/SPECS/hive.spec?rev=1225978&r1=1225977&r2=1225978&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hive/SPECS/hive.spec (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hive/SPECS/hive.spec Sat
Dec 31 00:02:03 2011
@@ -13,10 +13,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 %define hadoop_username hadoop
-%define etc_hive /etc/hive
+%define etc_hive /etc/%{name}
 %define config_hive %{etc_hive}/conf
-%define usr_lib_hive /usr/lib/hive
-%define var_lib_hive /var/lib/hive
+%define usr_lib_hive /usr/lib/%{name}
+%define var_lib_hive /var/lib/%{name}
 %define bin_hive /usr/bin
 %define hive_config_virtual hive_active_configuration
 %define man_dir %{_mandir}
@@ -26,7 +26,7 @@
 
 %if  %{!?suse_version:1}0
 
-%define doc_hive %{_docdir}/hive-%{hive_version}
+%define doc_hive %{_docdir}/%{name}-%{hive_version}
 %define alternatives_cmd alternatives
 
 %global initd_dir %{_sysconfdir}/rc.d/init.d
@@ -38,7 +38,7 @@
 %define suse_check \# Define an empty suse_check for compatibility with older sles
 %endif
 
-%define doc_hive %{_docdir}/hive
+%define doc_hive %{_docdir}/%{name}
 %define alternatives_cmd update-alternatives
 
 %global initd_dir %{_sysconfdir}/rc.d
@@ -51,23 +51,23 @@
 %endif
 
 
-Name: hadoop-hive
+Name: hive
 Provides: hive
 Version: %{hive_version}
 Release: %{hive_release}
 Summary: Hive is a data warehouse infrastructure built on top of Hadoop
 License: Apache License v2.0
-URL: http://hadoop.apache.org/hive/
+URL: http://hive.apache.org/
 Group: Development/Libraries
 Buildroot: %{_topdir}/INSTALL/%{name}-%{version}
 BuildArch: noarch
-Source0: hive-%{hive_base_version}.tar.gz
+Source0: %{name}-%{hive_base_version}.tar.gz
 Source1: do-component-build
 Source2: install_hive.sh
-Source3: hadoop-hive.sh
+Source3: hive.sh
 Source4: hive-site.xml
-Source5: hadoop-hive-server.default
-Source6: hadoop-hive-metastore.default
+Source5: hive-server.default
+Source6: hive-metastore.default
 Source7: hive.1
 Source8: hive-site.xml
 Requires: hadoop >= 0.20.2, bigtop-utils
@@ -79,7 +79,7 @@ Hive is a data warehouse infrastructure 
 %package server
 Summary: Provides a Hive Thrift service.
 Group: System/Daemons
-Provides: hadoop-hive-server
+Provides: %{name}-server
 Requires: %{name} = %{version}-%{release}
 
 %if  %{?suse_version:1}0
@@ -97,7 +97,7 @@ This optional package hosts a Thrift ser
 %package metastore
 Summary: Shared metadata repository for Hive.
 Group: System/Daemons
-Provides: hadoop-hive-metastore
+Provides: %{name}-metastore
 Requires: %{name} = %{version}-%{release}
 
 %if  %{?suse_version:1}0
@@ -114,7 +114,7 @@ This optional package hosts a metadata s
 
 
 %prep
-%setup -n hive-%{hive_version}
+%setup -n %{name}-%{hive_base_version}
 
 %build
 bash %{SOURCE1}
@@ -134,16 +134,16 @@ cp $RPM_SOURCE_DIR/hive-site.xml .
 
 %__install -d -m 0755 $RPM_BUILD_ROOT/%{initd_dir}/
 %__install -d -m 0755 $RPM_BUILD_ROOT/etc/default/
-%__install -m 0644 $RPM_SOURCE_DIR/hadoop-hive-metastore.default $RPM_BUILD_ROOT/etc/default/hadoop-hive-metastore
-%__install -m 0644 $RPM_SOURCE_DIR/hadoop-hive-server.default $RPM_BUILD_ROOT/etc/default/hadoop-hive-server
+%__install -m 0644 %{SOURCE6} $RPM_BUILD_ROOT/etc/default/%{name}-metastore
+%__install -m 0644 %{SOURCE5} $RPM_BUILD_ROOT/etc/default/%{name}-server
 
-%__install -d -m 0755 $RPM_BUILD_ROOT/%{_localstatedir}/log/hive
-%__install -d -m 0755 $RPM_BUILD_ROOT/%{_localstatedir}/run/hive
+%__install -d -m 0755 $RPM_BUILD_ROOT/%{_localstatedir}/log/%{name}
+%__install -d -m 0755 $RPM_BUILD_ROOT/%{_localstatedir}/run/%{name}
 
 for service in %{hive_services}
 do
         init_file=$RPM_BUILD_ROOT/%{initd_dir}/%{name}-${service}
-        %__cp $RPM_SOURCE_DIR/hadoop-hive.sh $init_file
+        %__cp %{SOURCE3} $init_file
         %__sed -i -e "s|@HIVE_DAEMON@|${service}|" $init_file
         chmod 755 $init_file
 done
@@ -156,7 +156,7 @@ getent passwd hive >/dev/null || useradd
 %post
 
 # Install config alternatives
-%{alternatives_cmd} --install %{config_hive} hive-conf %{etc_hive}/conf.dist 30
+%{alternatives_cmd} --install %{config_hive} %{name}-conf %{etc_hive}/conf.dist 30
 
 
 # Upgrade
@@ -170,7 +170,7 @@ fi
 
 %preun
 if [ "$1" = 0 ]; then
-  %{alternatives_cmd} --remove hive-conf %{etc_hive}/conf.dist || :
+  %{alternatives_cmd} --remove %{name}-conf %{etc_hive}/conf.dist || :
 fi
 
 #######################
@@ -182,8 +182,8 @@ fi
 %{usr_lib_hive}
 %{bin_hive}/hive
 %{var_lib_hive}
-%attr(0755,hive,hive) %dir %{_localstatedir}/log/hive
-%attr(0755,hive,hive) %dir %{_localstatedir}/run/hive
+%attr(0755,hive,hive) %dir %{_localstatedir}/log/%{name}
+%attr(0755,hive,hive) %dir %{_localstatedir}/run/%{name}
 %attr(1777,root,root) %{var_lib_hive}/metastore
 %doc %{doc_hive}
 %{man_dir}/man1/hive.1.*

Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/package_data_apt.xml
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/package_data_apt.xml?rev=1225978&r1=1225977&r2=1225978&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/package_data_apt.xml
(original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/package_data_apt.xml
Sat Dec 31 00:02:03 2011
@@ -6774,7 +6774,7 @@
     </pig-conf>
   </alternatives>
 </pig>
-<hadoop-hive>
+<hive>
   <metadata>
     <summary>A data warehouse infrastructure built on top of Hadoop</summary>
     <description>Hive is a data warehouse infrastructure built on top of Hadoop that
@@ -6808,9 +6808,9 @@
     <file name="/usr/bin/hive" owners="1" perm="-rwxr-xr-x" user="root" group="root"/>
     <file name="/usr/share" owners="426" perm="drwxr-xr-x" user="root" group="root"/>
     <file name="/usr/share/doc" owners="426" perm="drwxr-xr-x" user="root" group="root"/>
-    <file name="/usr/share/doc/hadoop-hive" owners="1" perm="drwxr-xr-x" user="root" group="root"/>
-    <file name="/usr/share/doc/hadoop-hive/copyright" owners="1" perm="-rw-r--r--" user="root"
group="root"/>
-    <file name="/usr/share/doc/hadoop-hive/changelog.Debian.gz" owners="1" perm="-rw-r--r--"
user="root" group="root"/>
+    <file name="/usr/share/doc/hive" owners="1" perm="drwxr-xr-x" user="root" group="root"/>
+    <file name="/usr/share/doc/hive/copyright" owners="1" perm="-rw-r--r--" user="root"
group="root"/>
+    <file name="/usr/share/doc/hive/changelog.Debian.gz" owners="1" perm="-rw-r--r--"
user="root" group="root"/>
     <file name="/usr/share/doc/hive" owners="1" perm="drwxr-xr-x" user="root" group="root"/>
     <file name="/usr/share/doc/hive/examples" owners="1" perm="drwxr-xr-x" user="root"
group="root"/>
     <file name="/usr/share/doc/hive/examples/files" owners="1" perm="drwxr-xr-x" user="root"
group="root"/>
@@ -7092,7 +7092,7 @@
       <alt>/etc/hive/conf.dist</alt>
     </hive-conf>
   </alternatives>
-</hadoop-hive>
+</hive>
 <hbase>
   <metadata>
     <summary>HBase is the Hadoop database</summary>

Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/package_data_urpmi.xml
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/package_data_urpmi.xml?rev=1225978&r1=1225977&r2=1225978&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/package_data_urpmi.xml
(original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/package_data_urpmi.xml
Sat Dec 31 00:02:03 2011
@@ -6704,7 +6704,7 @@ difficult to manage. Even when done corr
     </pig-conf>
   </alternatives>
 </pig>
-<hadoop-hive>
+<hive>
   <metadata>
     <summary>Hive is a data warehouse infrastructure built on top of Hadoop</summary>
     <description>Hive is a data warehouse infrastructure built on top of Hadoop that
@@ -7143,7 +7143,7 @@ difficult to manage. Even when done corr
       <alt>/etc/hive/conf.dist</alt>
     </hive-conf>
   </alternatives>
-</hadoop-hive>
+</hive>
 <hbase>
   <metadata>
     <summary>HBase is the Hadoop database. Use it when you need random, realtime read/write
access to your Big Data. This project's goal is the hosting of very large tables -- billions
of rows X millions of columns -- atop clusters of commodity hardware.</summary>

Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/package_data_yum.xml
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/package_data_yum.xml?rev=1225978&r1=1225977&r2=1225978&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/package_data_yum.xml
(original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/package_data_yum.xml
Sat Dec 31 00:02:03 2011
@@ -8458,7 +8458,7 @@ difficult to manage. Even when done corr
       </pig-conf>
     </alternatives>
   </pig>
-  <hadoop-hive>
+  <hive>
     <metadata>
       <summary>Hive is a data warehouse infrastructure built on top of Hadoop</summary>
       <description>Hive is a data warehouse infrastructure built on top of Hadoop that
@@ -8913,7 +8913,7 @@ difficult to manage. Even when done corr
         <alt>/etc/hive/conf.dist</alt>
       </hive-conf>
     </alternatives>
-  </hadoop-hive>
+  </hive>
   <hbase>
     <metadata>
       <summary>HBase is the Hadoop database. Use it when you need random, realtime
read/write access to your Big Data. This project's goal is the hosting of very large tables
-- billions of rows X millions of columns -- atop clusters of commodity hardware.</summary>

Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/package_data_zypper.xml
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/package_data_zypper.xml?rev=1225978&r1=1225977&r2=1225978&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/package_data_zypper.xml
(original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/package_data_zypper.xml
Sat Dec 31 00:02:03 2011
@@ -6704,7 +6704,7 @@ difficult to manage. Even when done corr
     </pig>
   </alternatives>
 </pig>
-<hadoop-hive>
+<hive>
   <metadata>
     <summary>Hive is a data warehouse infrastructure built on top of Hadoop</summary>
     <description>Hive is a data warehouse infrastructure built on top of Hadoop that
@@ -7063,7 +7063,7 @@ difficult to manage. Even when done corr
       <alt>/etc/hive/conf.dist</alt>
     </hive-conf>
   </alternatives>
-</hadoop-hive>
+</hive>
 <hbase>
   <metadata>
     <summary>HBase is the Hadoop database. Use it when you need random, realtime read/write
access to your Big Data. This project's goal is the hosting of very large tables -- billions
of rows X millions of columns -- atop clusters of commodity hardware.</summary>

Modified: incubator/bigtop/branches/hadoop-0.23/bigtop.mk
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop.mk?rev=1225978&r1=1225977&r2=1225978&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop.mk (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop.mk Sat Dec 31 00:02:03 2011
@@ -70,7 +70,7 @@ $(eval $(call PACKAGE,pig,PIG))
 # Hive
 HIVE_NAME=hive
 HIVE_RELNOTES_NAME=Apache Hive
-HIVE_PKG_NAME=hadoop-hive
+HIVE_PKG_NAME=hive
 HIVE_BASE_VERSION=0.8.0
 HIVE_PKG_VERSION=$(HIVE_BASE_VERSION)
 HIVE_RELEASE_VERSION=1



Mime
View raw message