incubator-bigtop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@apache.org
Subject svn commit: r1229288 [1/4] - in /incubator/bigtop/branches/RCs: ./ bigtop-deploy/puppet/modules/hadoop-hbase/manifests/ bigtop-deploy/puppet/modules/hadoop-hive/manifests/ bigtop-deploy/puppet/modules/hadoop-pig/manifests/ bigtop-deploy/puppet/modules/...
Date Mon, 09 Jan 2012 18:40:59 GMT
Author: rvs
Date: Mon Jan  9 18:40:56 2012
New Revision: 1229288

URL: http://svn.apache.org/viewvc?rev=1229288&view=rev
Log:
Hadoop 1.0.0 and HBase 0.92.0 RC3

Added:
    incubator/bigtop/branches/RCs/bigtop-packages/src/common/hive/hive-metastore.default
      - copied, changed from r1220936, incubator/bigtop/branches/RCs/bigtop-packages/src/common/hive/hadoop-hive-metastore.default
    incubator/bigtop/branches/RCs/bigtop-packages/src/common/hive/hive-server.default
      - copied, changed from r1220936, incubator/bigtop/branches/RCs/bigtop-packages/src/common/hive/hadoop-hive-server.default
    incubator/bigtop/branches/RCs/bigtop-packages/src/common/hive/hive.sh
      - copied, changed from r1220936, incubator/bigtop/branches/RCs/bigtop-packages/src/common/hive/hadoop-hive.sh
    incubator/bigtop/branches/RCs/bigtop-packages/src/common/zookeeper/zookeeper-server.sh
      - copied, changed from r1220936, incubator/bigtop/branches/RCs/bigtop-packages/src/common/zookeeper/hadoop-zookeeper.sh
    incubator/bigtop/branches/RCs/bigtop-packages/src/common/zookeeper/zookeeper-server.sh.suse
      - copied, changed from r1220936, incubator/bigtop/branches/RCs/bigtop-packages/src/common/zookeeper/hadoop-zookeeper.sh.suse
    incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/hadoop.postinst
      - copied, changed from r1220936, incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/hadoop-hbase.postinst
    incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/hbase-doc.dirs
    incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/hbase-doc.install
    incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/hbase.dirs
      - copied, changed from r1220936, incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/hadoop-hbase.dirs
    incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/hbase.install
      - copied, changed from r1220936, incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/hadoop-hbase.install
    incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/hbase.manpages
      - copied, changed from r1220936, incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/hadoop-hbase.manpages
    incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/hbase.preinst
      - copied, changed from r1220936, incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/hadoop-hbase.preinst
    incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hive/hive.dirs
      - copied, changed from r1220936, incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hive/hadoop-hive.dirs
    incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hive/hive.postinst
      - copied, changed from r1220936, incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hive/hadoop-hive.postinst
    incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hive/hive.preinst
      - copied, changed from r1220936, incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hive/hadoop-hive.preinst
    incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hive/hive.prerm
      - copied, changed from r1220936, incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hive/hadoop-hive.prerm
    incubator/bigtop/branches/RCs/bigtop-packages/src/deb/pig/pig.postinst
      - copied, changed from r1220936, incubator/bigtop/branches/RCs/bigtop-packages/src/deb/pig/hadoop-pig.postinst
    incubator/bigtop/branches/RCs/bigtop-packages/src/deb/pig/pig.preinst
      - copied, changed from r1220936, incubator/bigtop/branches/RCs/bigtop-packages/src/deb/pig/hadoop-pig.preinst
    incubator/bigtop/branches/RCs/bigtop-packages/src/deb/pig/pig.prerm
      - copied, changed from r1220936, incubator/bigtop/branches/RCs/bigtop-packages/src/deb/pig/hadoop-pig.prerm
    incubator/bigtop/branches/RCs/bigtop-packages/src/deb/zookeeper/zookeeper-server.init
      - copied, changed from r1220936, incubator/bigtop/branches/RCs/bigtop-packages/src/deb/zookeeper/hadoop-zookeeper-server.init
    incubator/bigtop/branches/RCs/bigtop-packages/src/deb/zookeeper/zookeeper.postinst
      - copied, changed from r1220936, incubator/bigtop/branches/RCs/bigtop-packages/src/deb/zookeeper/hadoop-zookeeper.postinst
    incubator/bigtop/branches/RCs/bigtop-packages/src/deb/zookeeper/zookeeper.prerm
      - copied, changed from r1220936, incubator/bigtop/branches/RCs/bigtop-packages/src/deb/zookeeper/hadoop-zookeeper.prerm
    incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/hbase/SOURCES/hbase.sh
      - copied, changed from r1220936, incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/hbase/SOURCES/hadoop-hbase.sh
    incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/hbase/SOURCES/hbase.sh.suse
      - copied, changed from r1220936, incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/hbase/SOURCES/hadoop-hbase.sh.suse
Removed:
    incubator/bigtop/branches/RCs/bigtop-packages/src/common/hive/hadoop-hive-metastore.default
    incubator/bigtop/branches/RCs/bigtop-packages/src/common/hive/hadoop-hive-server.default
    incubator/bigtop/branches/RCs/bigtop-packages/src/common/hive/hadoop-hive.sh
    incubator/bigtop/branches/RCs/bigtop-packages/src/common/zookeeper/hadoop-zookeeper.sh
    incubator/bigtop/branches/RCs/bigtop-packages/src/common/zookeeper/hadoop-zookeeper.sh.suse
    incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/hadoop-hbase-doc.dirs
    incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/hadoop-hbase-doc.install
    incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/hadoop-hbase.dirs
    incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/hadoop-hbase.install
    incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/hadoop-hbase.manpages
    incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/hadoop-hbase.postinst
    incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/hadoop-hbase.preinst
    incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hive/hadoop-hive.dirs
    incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hive/hadoop-hive.postinst
    incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hive/hadoop-hive.preinst
    incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hive/hadoop-hive.prerm
    incubator/bigtop/branches/RCs/bigtop-packages/src/deb/pig/hadoop-pig.postinst
    incubator/bigtop/branches/RCs/bigtop-packages/src/deb/pig/hadoop-pig.preinst
    incubator/bigtop/branches/RCs/bigtop-packages/src/deb/pig/hadoop-pig.prerm
    incubator/bigtop/branches/RCs/bigtop-packages/src/deb/zookeeper/hadoop-zookeeper-server.init
    incubator/bigtop/branches/RCs/bigtop-packages/src/deb/zookeeper/hadoop-zookeeper.postinst
    incubator/bigtop/branches/RCs/bigtop-packages/src/deb/zookeeper/hadoop-zookeeper.prerm
    incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/hbase/SOURCES/hadoop-hbase.sh
    incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/hbase/SOURCES/hadoop-hbase.sh.suse
Modified:
    incubator/bigtop/branches/RCs/.gitignore
    incubator/bigtop/branches/RCs/bigtop-deploy/puppet/modules/hadoop-hbase/manifests/init.pp
    incubator/bigtop/branches/RCs/bigtop-deploy/puppet/modules/hadoop-hive/manifests/init.pp
    incubator/bigtop/branches/RCs/bigtop-deploy/puppet/modules/hadoop-pig/manifests/init.pp
    incubator/bigtop/branches/RCs/bigtop-deploy/puppet/modules/hadoop-zookeeper/manifests/init.pp
    incubator/bigtop/branches/RCs/bigtop-deploy/vm/boxgrinder/bigtop_hadoop.appl
    incubator/bigtop/branches/RCs/bigtop-packages/src/common/hbase/do-component-build
    incubator/bigtop/branches/RCs/bigtop-packages/src/common/sqoop/sqoop-metastore.sh.suse
    incubator/bigtop/branches/RCs/bigtop-packages/src/common/zookeeper/zookeeper.1
    incubator/bigtop/branches/RCs/bigtop-packages/src/deb/flume/control
    incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/control
    incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/install_init_scripts.sh
    incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/rules
    incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/service-init.d.tpl
    incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/service-postinst.tpl
    incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/service-postrm.tpl
    incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hive/control
    incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hive/install_init_scripts.sh
    incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hive/rules
    incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hive/service-init.d.tpl
    incubator/bigtop/branches/RCs/bigtop-packages/src/deb/pig/control
    incubator/bigtop/branches/RCs/bigtop-packages/src/deb/pig/copyright
    incubator/bigtop/branches/RCs/bigtop-packages/src/deb/pig/rules
    incubator/bigtop/branches/RCs/bigtop-packages/src/deb/zookeeper/control
    incubator/bigtop/branches/RCs/bigtop-packages/src/deb/zookeeper/rules
    incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/flume/SOURCES/init.d.suse
    incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/flume/SPECS/flume.spec
    incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec
    incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/hive/SPECS/hive.spec
    incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/pig/SPECS/pig.spec
    incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/zookeeper/SPECS/zookeeper.spec
    incubator/bigtop/branches/RCs/bigtop-test-framework/src/main/groovy/org/apache/bigtop/itest/pmanager/DEBPackage.groovy
    incubator/bigtop/branches/RCs/bigtop-tests/test-artifacts/hbase/src/main/groovy/org/apache/bigtop/itest/hbase/system/TestLoadAndVerify.java
    incubator/bigtop/branches/RCs/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/CDHServices.groovy
    incubator/bigtop/branches/RCs/bigtop-tests/test-artifacts/package/src/main/resources/package_data_apt.xml
    incubator/bigtop/branches/RCs/bigtop-tests/test-artifacts/package/src/main/resources/package_data_urpmi.xml
    incubator/bigtop/branches/RCs/bigtop-tests/test-artifacts/package/src/main/resources/package_data_yum.xml
    incubator/bigtop/branches/RCs/bigtop-tests/test-artifacts/package/src/main/resources/package_data_zypper.xml
    incubator/bigtop/branches/RCs/bigtop.mk

Modified: incubator/bigtop/branches/RCs/.gitignore
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/.gitignore?rev=1229288&r1=1229287&r2=1229288&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/.gitignore (original)
+++ incubator/bigtop/branches/RCs/.gitignore Mon Jan  9 18:40:56 2012
@@ -3,3 +3,7 @@ dl
 dist
 output
 target
+*~
+*.project
+*.settings
+*.classpath
\ No newline at end of file

Modified: incubator/bigtop/branches/RCs/bigtop-deploy/puppet/modules/hadoop-hbase/manifests/init.pp
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-deploy/puppet/modules/hadoop-hbase/manifests/init.pp?rev=1229288&r1=1229287&r2=1229288&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-deploy/puppet/modules/hadoop-hbase/manifests/init.pp (original)
+++ incubator/bigtop/branches/RCs/bigtop-deploy/puppet/modules/hadoop-hbase/manifests/init.pp Mon Jan  9 18:40:56 2012
@@ -15,7 +15,7 @@
 
 class hadoop-hbase {
   class client-package  {
-    package { "hadoop-hbase":
+    package { "hbase":
       ensure => latest,
     } 
   }
@@ -25,11 +25,11 @@ class hadoop-hbase {
 
     file { "/etc/hbase/conf/hbase-site.xml":
       content => template("hadoop-hbase/hbase-site.xml"),
-      require => Package["hadoop-hbase"],
+      require => Package["hbase"],
     }
     file { "/etc/hbase/conf/hbase-env.sh":
       content => template("hadoop-hbase/hbase-env.sh"),
-      require => Package["hadoop-hbase"],
+      require => Package["hbase"],
     }
   }
 
@@ -40,13 +40,13 @@ class hadoop-hbase {
   define server($rootdir, $zookeeper_quorum, $kerberos_realm = "") {
     include common-server-config
 
-    package { "hadoop-hbase-regionserver":
+    package { "hbase-regionserver":
       ensure => latest,
     }
 
-    service { "hadoop-hbase-regionserver":
+    service { "hbase-regionserver":
       ensure => running,
-      require => Package["hadoop-hbase-regionserver"],
+      require => Package["hbase-regionserver"],
       subscribe => File["/etc/hbase/conf/hbase-site.xml", "/etc/hbase/conf/hbase-env.sh"],
       hasrestart => true,
       hasstatus => true,
@@ -56,13 +56,13 @@ class hadoop-hbase {
   define master($rootdir, $zookeeper_quorum, $kerberos_realm = "") {
     include common-server-config
 
-    package { "hadoop-hbase-master":
+    package { "hbase-master":
       ensure => latest,
     }
 
-    service { "hadoop-hbase-master":
+    service { "hbase-master":
       ensure => running,
-      require => Package["hadoop-hbase-master"],
+      require => Package["hbase-master"],
       subscribe => File["/etc/hbase/conf/hbase-site.xml", "/etc/hbase/conf/hbase-env.sh"],
       hasrestart => true,
       hasstatus => true,

Modified: incubator/bigtop/branches/RCs/bigtop-deploy/puppet/modules/hadoop-hive/manifests/init.pp
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-deploy/puppet/modules/hadoop-hive/manifests/init.pp?rev=1229288&r1=1229287&r2=1229288&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-deploy/puppet/modules/hadoop-hive/manifests/init.pp (original)
+++ incubator/bigtop/branches/RCs/bigtop-deploy/puppet/modules/hadoop-hive/manifests/init.pp Mon Jan  9 18:40:56 2012
@@ -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"],
     }
   }
 }

Modified: incubator/bigtop/branches/RCs/bigtop-deploy/puppet/modules/hadoop-pig/manifests/init.pp
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-deploy/puppet/modules/hadoop-pig/manifests/init.pp?rev=1229288&r1=1229287&r2=1229288&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-deploy/puppet/modules/hadoop-pig/manifests/init.pp (original)
+++ incubator/bigtop/branches/RCs/bigtop-deploy/puppet/modules/hadoop-pig/manifests/init.pp Mon Jan  9 18:40:56 2012
@@ -15,14 +15,14 @@
 
 class hadoop-pig {
   define client {
-    package { "hadoop-pig":
+    package { "pig":
       ensure => latest,
       require => Package["hadoop"],
     } 
  
     file { "/etc/pig/conf/pig.properties":
       content => template('hadoop-pig/pig.properties'),
-      require => Package["hadoop-pig"],
+      require => Package["pig"],
       owner => "root", /* FIXME: I'm really no sure about these -- we might end  */
       mode => "755",   /*        up deploying/testing a different thing compared */
                        /*        to a straight rpm/deb deployment                */

Modified: incubator/bigtop/branches/RCs/bigtop-deploy/puppet/modules/hadoop-zookeeper/manifests/init.pp
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-deploy/puppet/modules/hadoop-zookeeper/manifests/init.pp?rev=1229288&r1=1229287&r2=1229288&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-deploy/puppet/modules/hadoop-zookeeper/manifests/init.pp (original)
+++ incubator/bigtop/branches/RCs/bigtop-deploy/puppet/modules/hadoop-zookeeper/manifests/init.pp Mon Jan  9 18:40:56 2012
@@ -15,19 +15,19 @@
 
 class hadoop-zookeeper {
   define client {
-    package { "hadoop-zookeeper":
+    package { "zookeeper":
       ensure => latest,
     } 
   }
 
   define server($myid, $ensemble = ["localhost:2888:3888"]) {
-    package { "hadoop-zookeeper-server":
+    package { "zookeeper-server":
       ensure => latest,
     }
 
-    service { "hadoop-zookeeper-server":
+    service { "zookeeper-server":
       ensure => running,
-      require => Package["hadoop-zookeeper-server"],
+      require => Package["zookeeper-server"],
       subscribe => File["/etc/zookeeper/conf/zoo.cfg"],
       hasrestart => true,
       hasstatus => true,
@@ -35,12 +35,12 @@ class hadoop-zookeeper {
 
     file { "/etc/zookeeper/conf/zoo.cfg":
       content => template("hadoop-zookeeper/zoo.cfg"),
-      require => Package["hadoop-zookeeper-server"],
+      require => Package["zookeeper-server"],
     }
 
     file { "/var/lib/zookeeper/myid":
       content => inline_template("<%= myid %>"),
-      require => Package["hadoop-zookeeper-server"],
+      require => Package["zookeeper-server"],
     }
   }
 }

Modified: incubator/bigtop/branches/RCs/bigtop-deploy/vm/boxgrinder/bigtop_hadoop.appl
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-deploy/vm/boxgrinder/bigtop_hadoop.appl?rev=1229288&r1=1229287&r2=1229288&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-deploy/vm/boxgrinder/bigtop_hadoop.appl (original)
+++ incubator/bigtop/branches/RCs/bigtop-deploy/vm/boxgrinder/bigtop_hadoop.appl Mon Jan  9 18:40:56 2012
@@ -1,3 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+#
 name: bigtop_hadoop
 summary: Apache Bigtop VM with Apache Hadoop
 version: 2
@@ -12,9 +27,8 @@ hardware:
       size: 2
       type: ext3
 repos:
-  - name: "Bigtop-jenkins"
+  - name: "Apache Bigtop - incubating"
     baseurl: "http://www.apache.org/dist/incubator/bigtop/stable/repos/centos6/"
-    ephemeral: true
 packages:
   - @core
   - shadow-utils

Modified: incubator/bigtop/branches/RCs/bigtop-packages/src/common/hbase/do-component-build
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-packages/src/common/hbase/do-component-build?rev=1229288&r1=1229287&r2=1229288&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-packages/src/common/hbase/do-component-build (original)
+++ incubator/bigtop/branches/RCs/bigtop-packages/src/common/hbase/do-component-build Mon Jan  9 18:40:56 2012
@@ -16,5 +16,5 @@
 
 set -ex
 
-mvn clean -DskipTests -Dhbase.version=${HBASE_VERSION} -Dhadoop.version=1.0.0rc3 install assembly:assembly "$@"
+mvn clean -DskipTests -Dhbase.version=${HBASE_VERSION} -Dhadoop.version=1.0.0 install assembly:assembly "$@"
 tar --strip-components=1 -xzf target/hbase*.tar.gz

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

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

Copied: incubator/bigtop/branches/RCs/bigtop-packages/src/common/hive/hive.sh (from r1220936, incubator/bigtop/branches/RCs/bigtop-packages/src/common/hive/hadoop-hive.sh)
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-packages/src/common/hive/hive.sh?p2=incubator/bigtop/branches/RCs/bigtop-packages/src/common/hive/hive.sh&p1=incubator/bigtop/branches/RCs/bigtop-packages/src/common/hive/hadoop-hive.sh&r1=1220936&r2=1229288&rev=1229288&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-packages/src/common/hive/hadoop-hive.sh (original)
+++ incubator/bigtop/branches/RCs/bigtop-packages/src/common/hive/hive.sh Mon Jan  9 18:40:56 2012
@@ -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=$?
 
@@ -109,19 +109,19 @@ hive_status() {
 
     case "$status" in
       $STATUS_RUNNING)
-        log_success_msg "@HADOOP_DAEMON@ is running"
+        log_success_msg "@HIVE_DAEMON@ is running"
         ;;
       $STATUS_DEAD)
-        log_failure_msg "@HADOOP_DAEMON@ is dead and pid file exists"
+        log_failure_msg "@HIVE_DAEMON@ is dead and pid file exists"
         ;;
       $STATUS_DEAD_AND_LOCK)
-        log_failure_msg "@HADOOP_DAEMON@ is dead and lock file exists"
+        log_failure_msg "@HIVE_DAEMON@ is dead and lock file exists"
         ;;
       $STATUS_NOT_RUNNING)
-        log_failure_msg "@HADOOP_DAEMON@ is not running"
+        log_failure_msg "@HIVE_DAEMON@ is not running"
         ;;
       *)
-        log_failure_msg "@HADOOP_DAEMON@ status is unknown"
+        log_failure_msg "@HIVE_DAEMON@ status is unknown"
         ;;
     esac
     return $status

Modified: incubator/bigtop/branches/RCs/bigtop-packages/src/common/sqoop/sqoop-metastore.sh.suse
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-packages/src/common/sqoop/sqoop-metastore.sh.suse?rev=1229288&r1=1229287&r2=1229288&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-packages/src/common/sqoop/sqoop-metastore.sh.suse (original)
+++ incubator/bigtop/branches/RCs/bigtop-packages/src/common/sqoop/sqoop-metastore.sh.suse Mon Jan  9 18:40:56 2012
@@ -15,7 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Starts a Hadoop @HADOOP_DAEMON@
+# Starts a Sqoop metastore 
 #
 # chkconfig: 2345 90 10
 # description: Sqoop allows easy imports and exports of data sets between \

Copied: incubator/bigtop/branches/RCs/bigtop-packages/src/common/zookeeper/zookeeper-server.sh (from r1220936, incubator/bigtop/branches/RCs/bigtop-packages/src/common/zookeeper/hadoop-zookeeper.sh)
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-packages/src/common/zookeeper/zookeeper-server.sh?p2=incubator/bigtop/branches/RCs/bigtop-packages/src/common/zookeeper/zookeeper-server.sh&p1=incubator/bigtop/branches/RCs/bigtop-packages/src/common/zookeeper/hadoop-zookeeper.sh&r1=1220936&r2=1229288&rev=1229288&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-packages/src/common/zookeeper/hadoop-zookeeper.sh (original)
+++ incubator/bigtop/branches/RCs/bigtop-packages/src/common/zookeeper/zookeeper-server.sh Mon Jan  9 18:40:56 2012
@@ -20,7 +20,7 @@
 # processname: java
 # pidfile: /var/run/zookeeper/zookeeper-server.pid
 ### BEGIN INIT INFO
-# Provides:          hadoop-zookeeper-server
+# Provides:          zookeeper-server
 # Required-Start:    $network $local_fs
 # Required-Stop:
 # Should-Start:      $named
@@ -41,7 +41,7 @@ fi
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 DAEMON_SCRIPT="/usr/bin/zookeeper-server"
 
-NAME=hadoop-zookeeper-server
+NAME=zookeeper-server
 DESC="ZooKeeper daemon"
 PID_FILE=/var/run/zookeeper/zookeeper_server.pid
 install -d -m 0755 -o zookeeper -g zookeeper /var/run/zookeeper/

Copied: incubator/bigtop/branches/RCs/bigtop-packages/src/common/zookeeper/zookeeper-server.sh.suse (from r1220936, incubator/bigtop/branches/RCs/bigtop-packages/src/common/zookeeper/hadoop-zookeeper.sh.suse)
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-packages/src/common/zookeeper/zookeeper-server.sh.suse?p2=incubator/bigtop/branches/RCs/bigtop-packages/src/common/zookeeper/zookeeper-server.sh.suse&p1=incubator/bigtop/branches/RCs/bigtop-packages/src/common/zookeeper/hadoop-zookeeper.sh.suse&r1=1220936&r2=1229288&rev=1229288&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-packages/src/common/zookeeper/hadoop-zookeeper.sh.suse (original)
+++ incubator/bigtop/branches/RCs/bigtop-packages/src/common/zookeeper/zookeeper-server.sh.suse Mon Jan  9 18:40:56 2012
@@ -21,7 +21,7 @@
 # description: Summary: ZooKeeper is a centralized service for maintaining configuration information, naming, providing distributed synchronization, and providing group services. All of these kinds of services are used in some form or another by distributed applications. Each time they are implemented there is a lot of work that goes into fixing the bugs and race conditions that are inevitable. Because of the difficulty of implementing these kinds of services, applications initially usually skimp on them ,which make them brittle in the presence of change and difficult to manage. Even when done correctly, different implementations of these services lead to management complexity when the applications are deployed.
 #
 ### BEGIN INIT INFO
-# Provides:          hadoop-zookeeper-server
+# Provides:          zookeeper-server
 # Required-Start:    $network $local_fs
 # Should-Start:      $named
 # Required-Stop:     $syslog $remote_fs
@@ -49,7 +49,7 @@ ERROR_PROGRAM_NOT_INSTALLED=5
 
 RETVAL=0
 EXEC_PATH="/usr/bin/zookeeper-server"
-NAME=hadoop-zookeeper-server
+NAME=zookeeper-server
 DESC="$NAME"
 PIDFILE=/var/run/zookeeper/zookeeper_server.pid
 LOCKFILE="/var/lock/subsys/zookeeper"

Modified: incubator/bigtop/branches/RCs/bigtop-packages/src/common/zookeeper/zookeeper.1
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-packages/src/common/zookeeper/zookeeper.1?rev=1229288&r1=1229287&r2=1229288&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-packages/src/common/zookeeper/zookeeper.1 (original)
+++ incubator/bigtop/branches/RCs/bigtop-packages/src/common/zookeeper/zookeeper.1 Mon Jan  9 18:40:56 2012
@@ -43,7 +43,7 @@ these services lead to management comple
 
 For more information about ZooKeeper, see
 .RS 0
-http://hadoop.apache.org/zookeeper/.
+http://zookeeper.apache.org/.
 
 To find the list of available commands and options for \fBzookeeper-client\fR type:
 \fBzookeeper-client help\fR

Modified: incubator/bigtop/branches/RCs/bigtop-packages/src/deb/flume/control
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-packages/src/deb/flume/control?rev=1229288&r1=1229287&r2=1229288&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-packages/src/deb/flume/control (original)
+++ incubator/bigtop/branches/RCs/bigtop-packages/src/deb/flume/control Mon Jan  9 18:40:56 2012
@@ -23,7 +23,7 @@ Homepage: http://incubator.apache.org/pr
 
 Package: flume
 Architecture: all
-Depends: hadoop-zookeeper (>= 3.3.1), adduser, hadoop, bigtop-utils
+Depends: zookeeper (>= 3.3.1), adduser, hadoop, bigtop-utils
 Description: reliable, scalable, and manageable distributed data collection application
  Flume is a reliable, scalable, and manageable distributed data collection
  application for collecting data such as logs and delivering it to data stores

Modified: incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/control
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/control?rev=1229288&r1=1229287&r2=1229288&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/control (original)
+++ incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/control Mon Jan  9 18:40:56 2012
@@ -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,37 +20,37 @@ Build-Depends: debhelper (>= 6), git-cor
 Standards-Version: 3.8.0
 Homepage: http://hbase.apache.org/
 
-Package: hadoop-hbase
+Package: hbase
 Architecture: all
-Depends: adduser, hadoop-zookeeper (>= 3.3.1), hadoop, bigtop-utils
+Depends: adduser, 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. 
  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.

Copied: incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/hadoop.postinst (from r1220936, incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/hadoop-hbase.postinst)
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/hadoop.postinst?p2=incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/hadoop.postinst&p1=incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/hadoop-hbase.postinst&r1=1220936&r2=1229288&rev=1229288&view=diff
==============================================================================
    (empty)

Added: incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/hbase-doc.dirs
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/hbase-doc.dirs?rev=1229288&view=auto
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/hbase-doc.dirs (added)
+++ incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/hbase-doc.dirs Mon Jan  9 18:40:56 2012
@@ -0,0 +1 @@
+/usr/share/doc/hbase-doc/

Added: incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/hbase-doc.install
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/hbase-doc.install?rev=1229288&view=auto
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/hbase-doc.install (added)
+++ incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/hbase-doc.install Mon Jan  9 18:40:56 2012
@@ -0,0 +1 @@
+/usr/share/doc/hbase-doc

Copied: incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/hbase.dirs (from r1220936, incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/hadoop-hbase.dirs)
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/hbase.dirs?p2=incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/hbase.dirs&p1=incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/hadoop-hbase.dirs&r1=1220936&r2=1229288&rev=1229288&view=diff
==============================================================================
    (empty)

Copied: incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/hbase.install (from r1220936, incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/hadoop-hbase.install)
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/hbase.install?p2=incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/hbase.install&p1=incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/hadoop-hbase.install&r1=1220936&r2=1229288&rev=1229288&view=diff
==============================================================================
    (empty)

Copied: incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/hbase.manpages (from r1220936, incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/hadoop-hbase.manpages)
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/hbase.manpages?p2=incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/hbase.manpages&p1=incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/hadoop-hbase.manpages&r1=1220936&r2=1229288&rev=1229288&view=diff
==============================================================================
    (empty)

Copied: incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/hbase.preinst (from r1220936, incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/hadoop-hbase.preinst)
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/hbase.preinst?p2=incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/hbase.preinst&p1=incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/hadoop-hbase.preinst&r1=1220936&r2=1229288&rev=1229288&view=diff
==============================================================================
    (empty)

Modified: incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/install_init_scripts.sh
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/install_init_scripts.sh?rev=1229288&r1=1229287&r2=1229288&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/install_init_scripts.sh (original)
+++ incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/install_init_scripts.sh Mon Jan  9 18:40:56 2012
@@ -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

Modified: incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/rules
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/rules?rev=1229288&r1=1229287&r2=1229288&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/rules (original)
+++ incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/rules Mon Jan  9 18:40:56 2012
@@ -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

Modified: incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/service-init.d.tpl
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/service-init.d.tpl?rev=1229288&r1=1229287&r2=1229288&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/service-init.d.tpl (original)
+++ incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/service-init.d.tpl Mon Jan  9 18:40:56 2012
@@ -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

Modified: incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/service-postinst.tpl
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/service-postinst.tpl?rev=1229288&r1=1229287&r2=1229288&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/service-postinst.tpl (original)
+++ incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/service-postinst.tpl Mon Jan  9 18:40:56 2012
@@ -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)

Modified: incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/service-postrm.tpl
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/service-postrm.tpl?rev=1229288&r1=1229287&r2=1229288&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/service-postrm.tpl (original)
+++ incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/service-postrm.tpl Mon Jan  9 18:40:56 2012
@@ -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)
     ;;

Modified: incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hive/control
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hive/control?rev=1229288&r1=1229287&r2=1229288&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hive/control (original)
+++ incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hive/control Mon Jan  9 18:40:56 2012
@@ -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/RCs/bigtop-packages/src/deb/hive/hive.dirs (from r1220936, incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hive/hadoop-hive.dirs)
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hive/hive.dirs?p2=incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hive/hive.dirs&p1=incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hive/hadoop-hive.dirs&r1=1220936&r2=1229288&rev=1229288&view=diff
==============================================================================
    (empty)

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

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

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

Modified: incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hive/install_init_scripts.sh
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hive/install_init_scripts.sh?rev=1229288&r1=1229287&r2=1229288&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hive/install_init_scripts.sh (original)
+++ incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hive/install_init_scripts.sh Mon Jan  9 18:40:56 2012
@@ -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/RCs/bigtop-packages/src/deb/hive/rules
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hive/rules?rev=1229288&r1=1229287&r2=1229288&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hive/rules (original)
+++ incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hive/rules Mon Jan  9 18:40:56 2012
@@ -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
@@ -38,7 +40,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	
@@ -49,13 +51,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/RCs/bigtop-packages/src/deb/hive/service-init.d.tpl
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hive/service-init.d.tpl?rev=1229288&r1=1229287&r2=1229288&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hive/service-init.d.tpl (original)
+++ incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hive/service-init.d.tpl Mon Jan  9 18:40:56 2012
@@ -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=$?
 
@@ -117,19 +117,19 @@ hive_status() {
 
     case "$status" in
       $STATUS_RUNNING)
-        log_success_msg "@HADOOP_DAEMON@ is running"
+        log_success_msg "@HIVE_DAEMON@ is running"
         ;;
       $STATUS_DEAD)
-        log_failure_msg "@HADOOP_DAEMON@ is dead and pid file exists"
+        log_failure_msg "@HIVE_DAEMON@ is dead and pid file exists"
         ;;
       $STATUS_DEAD_AND_LOCK)
-        log_failure_msg "@HADOOP_DAEMON@ is dead and lock file exists"
+        log_failure_msg "@HIVE_DAEMON@ is dead and lock file exists"
         ;;
       $STATUS_NOT_RUNNING|$STATUS_DEBIAN_NOT_RUNNING)
-        log_failure_msg "@HADOOP_DAEMON@ is not running"
+        log_failure_msg "@HIVE_DAEMON@ is not running"
         ;;
       *)
-        log_failure_msg "@HADOOP_DAEMON@ status is unknown"
+        log_failure_msg "@HIVE_DAEMON@ status is unknown"
         ;;
     esac
     return $status

Modified: incubator/bigtop/branches/RCs/bigtop-packages/src/deb/pig/control
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-packages/src/deb/pig/control?rev=1229288&r1=1229287&r2=1229288&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-packages/src/deb/pig/control (original)
+++ incubator/bigtop/branches/RCs/bigtop-packages/src/deb/pig/control Mon Jan  9 18:40:56 2012
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-Source: hadoop-pig
+Source: pig
 Section: misc
 Priority: extra
 Maintainer: Bigtop <bigtop-dev@incubator.apache.org>
@@ -21,7 +21,7 @@ Build-Depends: debhelper (>= 6), ant, an
 Standards-Version: 3.8.0
 Homepage: http://pig.apache.org/
 
-Package: hadoop-pig
+Package: pig
 Architecture: all
 Depends: hadoop, bigtop-utils
 Description: A platform for analyzing large data sets using Hadoop

Modified: incubator/bigtop/branches/RCs/bigtop-packages/src/deb/pig/copyright
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-packages/src/deb/pig/copyright?rev=1229288&r1=1229287&r2=1229288&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-packages/src/deb/pig/copyright (original)
+++ incubator/bigtop/branches/RCs/bigtop-packages/src/deb/pig/copyright Mon Jan  9 18:40:56 2012
@@ -1,5 +1,5 @@
 Format: http://dep.debian.net/deps/dep5
-Source: http://hadoop.apache.org/pig
+Source: http://pig.apache.org/
 Upstream-Name: Apache Pig
 
 Files: *

Copied: incubator/bigtop/branches/RCs/bigtop-packages/src/deb/pig/pig.postinst (from r1220936, incubator/bigtop/branches/RCs/bigtop-packages/src/deb/pig/hadoop-pig.postinst)
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-packages/src/deb/pig/pig.postinst?p2=incubator/bigtop/branches/RCs/bigtop-packages/src/deb/pig/pig.postinst&p1=incubator/bigtop/branches/RCs/bigtop-packages/src/deb/pig/hadoop-pig.postinst&r1=1220936&r2=1229288&rev=1229288&view=diff
==============================================================================
    (empty)

Copied: incubator/bigtop/branches/RCs/bigtop-packages/src/deb/pig/pig.preinst (from r1220936, incubator/bigtop/branches/RCs/bigtop-packages/src/deb/pig/hadoop-pig.preinst)
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-packages/src/deb/pig/pig.preinst?p2=incubator/bigtop/branches/RCs/bigtop-packages/src/deb/pig/pig.preinst&p1=incubator/bigtop/branches/RCs/bigtop-packages/src/deb/pig/hadoop-pig.preinst&r1=1220936&r2=1229288&rev=1229288&view=diff
==============================================================================
    (empty)

Copied: incubator/bigtop/branches/RCs/bigtop-packages/src/deb/pig/pig.prerm (from r1220936, incubator/bigtop/branches/RCs/bigtop-packages/src/deb/pig/hadoop-pig.prerm)
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-packages/src/deb/pig/pig.prerm?p2=incubator/bigtop/branches/RCs/bigtop-packages/src/deb/pig/pig.prerm&p1=incubator/bigtop/branches/RCs/bigtop-packages/src/deb/pig/hadoop-pig.prerm&r1=1220936&r2=1229288&rev=1229288&view=diff
==============================================================================
    (empty)

Modified: incubator/bigtop/branches/RCs/bigtop-packages/src/deb/pig/rules
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-packages/src/deb/pig/rules?rev=1229288&r1=1229287&r2=1229288&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-packages/src/deb/pig/rules (original)
+++ incubator/bigtop/branches/RCs/bigtop-packages/src/deb/pig/rules Mon Jan  9 18:40:56 2012
@@ -23,6 +23,8 @@
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
 
+pig_pkg_name=pig
+
 patch: patch-stamp
 patch-stamp:	
 	touch $@
@@ -33,7 +35,7 @@ clean:	
 	ant clean
 	rm -f *-stamp
 	dh_clean
-	rm -Rf debian/tmp debian/hadoop-pig debian/pig
+	rm -Rf debian/tmp debian/${pig_pkg_name}
 	find debian -name .\*swp -exec rm -f {} \;
 
 build-indep: build-indep-stamp
@@ -50,9 +52,9 @@ install-indep:	
 	cp debian/pig.1 .
 	sh -x debian/install_pig.sh \
 	  --build-dir=build/pig-${PIG_BASE_VERSION} \
-	  --prefix=debian/hadoop-pig \
-          --doc-dir=debian/hadoop-pig/usr/share/doc/hadoop-pig \
-          --examples-dir=debian/hadoop-pig/usr/share/doc/hadoop-pig/examples
+	  --prefix=debian/${pig_pkg_name} \
+          --doc-dir=debian/${pig_pkg_name}/usr/share/doc/${pig_pkg_name} \
+          --examples-dir=debian/${pig_pkg_name}/usr/share/doc/${pig_pkg_name}/examples
 
 	dh_install -i
 	(dh_lintian) || /bin/true

Modified: incubator/bigtop/branches/RCs/bigtop-packages/src/deb/zookeeper/control
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-packages/src/deb/zookeeper/control?rev=1229288&r1=1229287&r2=1229288&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-packages/src/deb/zookeeper/control (original)
+++ incubator/bigtop/branches/RCs/bigtop-packages/src/deb/zookeeper/control Mon Jan  9 18:40:56 2012
@@ -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-zookeeper
+Source: zookeeper
 Section: misc
 Priority: extra
 Maintainer: Bigtop <bigtop-dev@incubator.apache.org>
@@ -20,15 +20,13 @@ Build-Depends: debhelper (>= 6), ant, an
 Standards-Version: 3.8.0
 Homepage: http://zookeeper.apache.org/
 
-Package: hadoop-zookeeper
+Package: zookeeper
 Architecture: all
-Conflicts: zookeeper
-Replaces: zookeeper
 Depends: bigtop-utils
 Description: A high-performance coordination service for distributed applications.
  ZooKeeper is a centralized service for maintaining configuration information, naming, providing distributed synchronization, and providing group services.  All of these kinds of services are used in some form or another by distributed applications. Each time they are implemented there is a lot of work that goes into fixing the bugs and race conditions that are inevitable. Because of the difficulty of implementing these kinds of services, applications initially usually skimp on them ,which make them brittle in the presence of change and difficult to manage. Even when done correctly, different implementations of these services lead to management complexity when the applications are deployed.
 
-Package: hadoop-zookeeper-server
+Package: zookeeper-server
 Architecture: all
-Depends: hadoop-zookeeper (= ${source:Version})
+Depends: zookeeper (= ${source:Version})
 Description: This runs the zookeeper server on startup.

Modified: incubator/bigtop/branches/RCs/bigtop-packages/src/deb/zookeeper/rules
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-packages/src/deb/zookeeper/rules?rev=1229288&r1=1229287&r2=1229288&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-packages/src/deb/zookeeper/rules (original)
+++ incubator/bigtop/branches/RCs/bigtop-packages/src/deb/zookeeper/rules Mon Jan  9 18:40:56 2012
@@ -23,6 +23,8 @@ export DH_VERBOSE=1
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
 
+zookeeper_pkg_name=zookeeper
+
 patch: patch-stamp
 patch-stamp:	
 	touch $@
@@ -32,7 +34,7 @@ clean:	
 	dh_testroot
 	rm -f *-stamp
 	dh_clean
-	rm -Rf debian/tmp debian/hadoop-zookeeper debian/zookeeper
+	rm -Rf debian/tmp debian/$(zookeeper_pkg_name)
 	find debian -name .\*swp -exec rm -f {} \;
 
 build-indep: build-indep-stamp
@@ -49,7 +51,7 @@ install-indep:	
 	cp debian/zookeeper.1 debian/zoo.cfg .
 	sh -x debian/install_zookeeper.sh \
 	  --build-dir=build/zookeeper-${ZOOKEEPER_BASE_VERSION} \
-	  --prefix=debian/hadoop-zookeeper 
+	  --prefix=debian/$(zookeeper_pkg_name)
 	dh_install -i
 
 binary-common:	

Copied: incubator/bigtop/branches/RCs/bigtop-packages/src/deb/zookeeper/zookeeper-server.init (from r1220936, incubator/bigtop/branches/RCs/bigtop-packages/src/deb/zookeeper/hadoop-zookeeper-server.init)
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-packages/src/deb/zookeeper/zookeeper-server.init?p2=incubator/bigtop/branches/RCs/bigtop-packages/src/deb/zookeeper/zookeeper-server.init&p1=incubator/bigtop/branches/RCs/bigtop-packages/src/deb/zookeeper/hadoop-zookeeper-server.init&r1=1220936&r2=1229288&rev=1229288&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-packages/src/deb/zookeeper/hadoop-zookeeper-server.init (original)
+++ incubator/bigtop/branches/RCs/bigtop-packages/src/deb/zookeeper/zookeeper-server.init Mon Jan  9 18:40:56 2012
@@ -20,7 +20,7 @@
 # processname: java
 # pidfile: /var/run/zookeeper/zookeeper-server.pid
 ### BEGIN INIT INFO
-# Provides:          hadoop-zookeeper-server
+# Provides:          zookeeper-server
 # Required-Start:    $network $local_fs
 # Required-Stop:
 # Should-Start:      $named
@@ -34,7 +34,7 @@ set -e
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 DAEMON_SCRIPT="/usr/bin/zookeeper-server"
 
-NAME=hadoop-zookeeper-server
+NAME=zookeeper-server
 DESC="ZooKeeper daemon"
 PID_FILE=/var/run/zookeeper/zookeeper_server.pid
 install -d -m 0755 -o zookeeper -g zookeeper /var/run/zookeeper/

Copied: incubator/bigtop/branches/RCs/bigtop-packages/src/deb/zookeeper/zookeeper.postinst (from r1220936, incubator/bigtop/branches/RCs/bigtop-packages/src/deb/zookeeper/hadoop-zookeeper.postinst)
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-packages/src/deb/zookeeper/zookeeper.postinst?p2=incubator/bigtop/branches/RCs/bigtop-packages/src/deb/zookeeper/zookeeper.postinst&p1=incubator/bigtop/branches/RCs/bigtop-packages/src/deb/zookeeper/hadoop-zookeeper.postinst&r1=1220936&r2=1229288&rev=1229288&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-packages/src/deb/zookeeper/hadoop-zookeeper.postinst (original)
+++ incubator/bigtop/branches/RCs/bigtop-packages/src/deb/zookeeper/zookeeper.postinst Mon Jan  9 18:40:56 2012
@@ -17,12 +17,14 @@
 
 # postinst script for zookeeper
 
+zookeeper_pkg_name=zookeeper
+
 set -e
 
 case "$1" in
     configure)
         # Install config alternatives
-        update-alternatives  --install /etc/zookeeper/conf hadoop-zookeeper-conf /etc/zookeeper/conf.dist 30
+        update-alternatives  --install /etc/${zookeeper_pkg_name}/conf ${zookeeper_pkg_name}-conf /etc/${zookeeper_pkg_name}/conf.dist 30
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

Copied: incubator/bigtop/branches/RCs/bigtop-packages/src/deb/zookeeper/zookeeper.prerm (from r1220936, incubator/bigtop/branches/RCs/bigtop-packages/src/deb/zookeeper/hadoop-zookeeper.prerm)
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-packages/src/deb/zookeeper/zookeeper.prerm?p2=incubator/bigtop/branches/RCs/bigtop-packages/src/deb/zookeeper/zookeeper.prerm&p1=incubator/bigtop/branches/RCs/bigtop-packages/src/deb/zookeeper/hadoop-zookeeper.prerm&r1=1220936&r2=1229288&rev=1229288&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-packages/src/deb/zookeeper/hadoop-zookeeper.prerm (original)
+++ incubator/bigtop/branches/RCs/bigtop-packages/src/deb/zookeeper/zookeeper.prerm Mon Jan  9 18:40:56 2012
@@ -19,11 +19,13 @@
 #
 # see: dh_installdeb(1)
 
+zookeeper_pkg_name=zookeeper
+
 set -e
 
 case "$1" in
     remove|upgrade|deconfigure)
-      update-alternatives --remove hadoop-zookeeper-conf /etc/zookeeper/conf.dist || :
+      update-alternatives --remove ${zookeeper_pkg_name}-conf /etc/${zookeeper_pkg_name}/conf.dist || :
     ;;
 
     failed-upgrade)

Modified: incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/flume/SOURCES/init.d.suse
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/flume/SOURCES/init.d.suse?rev=1229288&r1=1229287&r2=1229288&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/flume/SOURCES/init.d.suse (original)
+++ incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/flume/SOURCES/init.d.suse Mon Jan  9 18:40:56 2012
@@ -53,7 +53,7 @@ EXEC_PATH=${FLUME_HOME}/bin/flume-daemon
 DOTIME=3
 FLUME_RUN=/var/run/flume
 FLUME_PID=/var/run/flume/flume-flume-@FLUME_DAEMON@.pid
-LOCKFILE="/var/lock/subsys/hadoop-@HADOOP_DAEMON@"
+LOCKFILE="/var/lock/subsys/flume-@FLUME_DAEMON@"
 desc="Flume @FLUME_DAEMON@ daemon"
 install -d -m 0755 -o flume -g flume ${FLUME_RUN} 
 USER=flume

Modified: incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/flume/SPECS/flume.spec
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/flume/SPECS/flume.spec?rev=1229288&r1=1229287&r2=1229288&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/flume/SPECS/flume.spec (original)
+++ incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/flume/SPECS/flume.spec Mon Jan  9 18:40:56 2012
@@ -64,7 +64,7 @@ Source1: do-component-build
 Source2: install_%{name}.sh
 Source3: init.d
 Source4: init.d.suse
-Requires: coreutils, /usr/sbin/useradd, hadoop-zookeeper >= 3.3.1, hadoop >= 0.20.2
+Requires: coreutils, /usr/sbin/useradd, zookeeper >= 3.3.1, hadoop >= 0.20.2
 Requires: bigtop-utils
 BuildRequires: ant xml-commons xml-commons-apis
 

Copied: incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/hbase/SOURCES/hbase.sh (from r1220936, incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/hbase/SOURCES/hadoop-hbase.sh)
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/hbase/SOURCES/hbase.sh?p2=incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/hbase/SOURCES/hbase.sh&p1=incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/hbase/SOURCES/hadoop-hbase.sh&r1=1220936&r2=1229288&rev=1229288&view=diff
==============================================================================
    (empty)

Copied: incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/hbase/SOURCES/hbase.sh.suse (from r1220936, incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/hbase/SOURCES/hadoop-hbase.sh.suse)
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/hbase/SOURCES/hbase.sh.suse?p2=incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/hbase/SOURCES/hbase.sh.suse&p1=incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/hbase/SOURCES/hadoop-hbase.sh.suse&r1=1220936&r2=1229288&rev=1229288&view=diff
==============================================================================
    (empty)

Modified: incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec?rev=1229288&r1=1229287&r2=1229288&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec (original)
+++ incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec Mon Jan  9 18:40:56 2012
@@ -12,8 +12,8 @@
 # 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.
-%define etc_hbase /etc/hbase
-%define hbase_home /usr/lib/hbase
+%define etc_hbase /etc/%{name}
+%define hbase_home /usr/lib/%{name}
 %define bin_hbase %{hbase_home}/bin
 %define lib_hbase %{hbase_home}/lib
 %define conf_hbase %{hbase_home}/conf
@@ -23,6 +23,9 @@
 %define man_dir %{_mandir}
 %define hbase_username hbase
 %define hbase_services master regionserver thrift
+%define hadoop_home /usr/lib/hadoop
+%define zookeeper_home /usr/lib/zookeeper
+%define hbase_jar_deps %{hadoop_home}/hadoop-core.jar %{zookeeper_home}/zookeeper.jar
 
 %if  %{?suse_version:1}0
 
@@ -41,35 +44,35 @@
     /usr/lib/rpm/brp-compress ; \
     %{nil}
 
-%define doc_hbase %{_docdir}/hbase
+%define doc_hbase %{_docdir}/%{name}
 %global initd_dir %{_sysconfdir}/rc.d
 
 %else
 
-%define doc_hbase %{_docdir}/hbase-%{hbase_version}
+%define doc_hbase %{_docdir}/%{name}-%{hbase_version}
 %global initd_dir %{_sysconfdir}/rc.d/init.d
 
 %endif
 
 
-Name: hadoop-hbase
+Name: hbase
 Version: %{hbase_version}
 Release: %{hbase_release}
 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. 
-URL: http://hadoop.apache.org/hbase/
+URL: http://hbase.apache.org/
 Group: Development/Libraries
 Buildroot: %{_topdir}/INSTALL/%{name}-%{version}
 License: APL2
-Source0: hbase-%{hbase_base_version}.tar.gz
+Source0: %{name}-%{hbase_base_version}.tar.gz
 Source1: do-component-build
 Source2: install_hbase.sh
-Source3: hadoop-hbase.sh
-Source4: hadoop-hbase.sh.suse
+Source3: hbase.sh
+Source4: hbase.sh.suse
 Source5: hbase.default
 Source6: hbase.nofiles.conf
 BuildArch: noarch
 Requires: coreutils, /usr/sbin/useradd, /sbin/chkconfig, /sbin/service
-Requires: hadoop >= 0.20.2, hadoop-zookeeper >= 3.3.1, bigtop-utils
+Requires: hadoop >= 0.20.2, zookeeper >= 3.3.1, bigtop-utils
 
 %if  0%{?mgaversion}
 Requires: bsh-utils
@@ -93,7 +96,7 @@ HBase is an open-source, distributed, co
 %package master
 Summary: The Hadoop HBase master Server.
 Group: System/Daemons
-Provides: hbase-master
+Provides: %{name}-master
 Requires: %{name} = %{version}-%{release}
 
 %if  %{?suse_version:1}0
@@ -119,7 +122,7 @@ HMaster is the "master server" for a HBa
 %package regionserver
 Summary: The Hadoop HBase RegionServer server.
 Group: System/Daemons
-Provides: hbase-regionserver
+Provides: %{name}-regionserver
 Requires: %{name} = %{version}-%{release}
 
 %if  %{?suse_version:1}0
@@ -146,7 +149,7 @@ HRegionServer makes a set of HRegions av
 %package thrift
 Summary: The Hadoop HBase Thrift Interface
 Group: System/Daemons
-Provides: hbase-thrift
+Provides: %{name}-thrift
 Requires: %{name} = %{version}-%{release}
 
 %if  %{?suse_version:1}0
@@ -182,7 +185,7 @@ Documentation for Hbase
 
 
 %prep
-%setup -n hbase-%{hbase_base_version}
+%setup -n %{name}-%{hbase_base_version}
 
 %build
 env HBASE_VERSION=%{version} bash %{SOURCE1}
@@ -197,21 +200,21 @@ sh %{SOURCE2} \
 %__install -d -m 0755 $RPM_BUILD_ROOT/%{initd_dir}/
 
 %__install -d -m 0755 $RPM_BUILD_ROOT/etc/default/
-%__install -m 0644 $RPM_SOURCE_DIR/hbase.default $RPM_BUILD_ROOT/etc/default/hbase
+%__install -m 0644 %{SOURCE5} $RPM_BUILD_ROOT/etc/default/%{name}
 
 %__install -d -m 0755 $RPM_BUILD_ROOT/etc/security/limits.d
-%__install -m 0644 %{SOURCE6} $RPM_BUILD_ROOT/etc/security/limits.d/hbase.nofiles.conf
+%__install -m 0644 %{SOURCE6} $RPM_BUILD_ROOT/etc/security/limits.d/%{name}.nofiles.conf
 
-%__install -d  -m 0755  %{buildroot}/%{_localstatedir}/log/hbase
-ln -s %{_localstatedir}/log/hbase %{buildroot}/%{logs_hbase}
+%__install -d  -m 0755  %{buildroot}/%{_localstatedir}/log/%{name}
+ln -s %{_localstatedir}/log/%{name} %{buildroot}/%{logs_hbase}
 
-%__install -d  -m 0755  %{buildroot}/%{_localstatedir}/run/hbase
-ln -s %{_localstatedir}/run/hbase %{buildroot}/%{pids_hbase}
+%__install -d  -m 0755  %{buildroot}/%{_localstatedir}/run/%{name}
+ln -s %{_localstatedir}/run/%{name} %{buildroot}/%{pids_hbase}
 
 %if  %{?suse_version:1}0
-orig_init_file=$RPM_SOURCE_DIR/hadoop-hbase.sh.suse
+orig_init_file=%{SOURCE4}
 %else
-orig_init_file=$RPM_SOURCE_DIR/hadoop-hbase.sh
+orig_init_file=%{SOURCE3}
 %endif
 
 for service in %{hbase_services}
@@ -225,10 +228,7 @@ done
 %__install -d -m 0755 $RPM_BUILD_ROOT/usr/bin
 
 # Pull zookeeper and hadoop from their packages
-rm -f $RPM_BUILD_ROOT/usr/lib/hbase/lib/hadoop* \
-      $RPM_BUILD_ROOT/usr/lib/hbase/lib/zookeeper*
-ln -s /usr/lib/hadoop/hadoop-core.jar $RPM_BUILD_ROOT/usr/lib/hbase/lib/hadoop-core.jar
-ln -s /usr/lib/zookeeper/zookeeper.jar $RPM_BUILD_ROOT/usr/lib/hbase/lib/zookeeper.jar
+ln -f -s %{hbase_jar_deps} $RPM_BUILD_ROOT/%{lib_hbase}
 
 %pre
 getent group hbase 2>/dev/null >/dev/null || /usr/sbin/groupadd -r hbase

Modified: incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/hive/SPECS/hive.spec
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/hive/SPECS/hive.spec?rev=1229288&r1=1229287&r2=1229288&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/hive/SPECS/hive.spec (original)
+++ incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/hive/SPECS/hive.spec Mon Jan  9 18:40:56 2012
@@ -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
 Requires: hadoop >= 0.20.2, bigtop-utils
 Obsoletes: %{name}-webinterface
@@ -78,7 +78,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
@@ -96,7 +96,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
@@ -113,7 +113,7 @@ This optional package hosts a metadata s
 
 
 %prep
-%setup -n hive-%{hive_base_version}
+%setup -n %{name}-%{hive_base_version}
 
 %build
 bash %{SOURCE1}
@@ -133,13 +133,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/%{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
@@ -148,14 +151,11 @@ done
 getent group hive >/dev/null || groupadd -r hive
 getent passwd hive >/dev/null || useradd -c "Hive" -s /sbin/nologin -g hive -r -d %{var_lib_hive} hive 2> /dev/null || :
 
-%__install -d -m 0755 -o hive -g hive /var/log/hive
-%__install -d -m 0755 -o hive -g hive /var/run/hive
-
 # Manage configuration symlink
 %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
@@ -169,13 +169,9 @@ 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
 
-%__rmdir /var/log/hive 2>/dev/null || :
-%__rmdir /var/run/hive 2>/dev/null || : 
-
-
 #######################
 #### FILES SECTION ####
 #######################
@@ -185,6 +181,8 @@ fi
 %{usr_lib_hive}
 %{bin_hive}/hive
 %{var_lib_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/RCs/bigtop-packages/src/rpm/pig/SPECS/pig.spec
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/pig/SPECS/pig.spec?rev=1229288&r1=1229287&r2=1229288&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/pig/SPECS/pig.spec (original)
+++ incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/pig/SPECS/pig.spec Mon Jan  9 18:40:56 2012
@@ -66,12 +66,12 @@
 %endif
 
 
-Name: hadoop-pig
+Name: pig
 Version: %{pig_version}
 Release: %{pig_release}
 Summary: Pig is a platform for analyzing large data sets
 License: Apache License v2.0
-URL: http://hadoop.apache.org/pig/
+URL: http://pig.apache.org/
 Group: Development/Libraries
 Buildroot: %{_topdir}/INSTALL/%{name}-%{version}
 BuildArch: noarch

Modified: incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/zookeeper/SPECS/zookeeper.spec
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/zookeeper/SPECS/zookeeper.spec?rev=1229288&r1=1229287&r2=1229288&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/zookeeper/SPECS/zookeeper.spec (original)
+++ incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/zookeeper/SPECS/zookeeper.spec Mon Jan  9 18:40:56 2012
@@ -12,11 +12,13 @@
 # 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.
-%define etc_zookeeper /etc/zookeeper
+%define etc_zookeeper /etc/%{name}
 %define bin_zookeeper %{_bindir}
-%define lib_zookeeper /usr/lib/zookeeper
-%define log_zookeeper /var/log/zookeeper
-%define run_zookeeper /var/run/zookeeper
+%define lib_zookeeper /usr/lib/%{name}
+%define log_zookeeper /var/log/%{name}
+%define run_zookeeper /var/run/%{name}
+%define vlb_zookeeper /var/lib/%{name}
+%define svc_zookeeper %{name}-server
 %define man_dir %{_mandir}
 
 %if  %{?suse_version:1}0
@@ -37,7 +39,7 @@
     %{nil}
 
 
-%define doc_zookeeper %{_docdir}/zookeeper
+%define doc_zookeeper %{_docdir}/%{name}
 %define alternatives_cmd update-alternatives
 %define alternatives_dep update-alternatives
 %define chkconfig_dep    aaa_base
@@ -46,7 +48,7 @@
 
 %else
 
-%define doc_zookeeper %{_docdir}/zookeeper-%{zookeeper_version}
+%define doc_zookeeper %{_docdir}/%{name}-%{zookeeper_version}
 %define alternatives_cmd alternatives
 %define alternatives_dep chkconfig 
 %define chkconfig_dep    chkconfig
@@ -57,19 +59,19 @@
 
 
 
-Name: hadoop-zookeeper
+Name: zookeeper
 Version: %{zookeeper_version}
 Release: %{zookeeper_release}
 Summary: A high-performance coordination service for distributed applications.
-URL: http://hadoop.apache.org/zookeeper/
+URL: http://zookeeper.apache.org/
 Group: Development/Libraries
 Buildroot: %{_topdir}/INSTALL/%{name}-%{version}
 License: APL2
-Source0: zookeeper-%{zookeeper_base_version}.tar.gz
+Source0: %{name}-%{zookeeper_base_version}.tar.gz
 Source1: do-component-build
 Source2: install_zookeeper.sh
-Source3: hadoop-zookeeper.sh
-Source4: hadoop-zookeeper.sh.suse
+Source3: zookeeper-server.sh
+Source4: zookeeper-server.sh.suse
 Source5: zookeeper.1
 Source6: zoo.cfg
 BuildArch: noarch
@@ -92,8 +94,8 @@ difficult to manage. Even when done corr
 %package server
 Summary: The Hadoop Zookeeper server
 Group: System/Daemons
-Provides: hadoop-zookeeper-server
-Requires: hadoop-zookeeper = %{version}-%{release}
+Provides: %{svc_zookeeper}
+Requires: %{name} = %{version}-%{release}
 Requires(post): %{chkconfig_dep}
 Requires(preun): %{service_dep}, %{chkconfig_dep}
 BuildArch: noarch
@@ -120,7 +122,7 @@ Requires: redhat-lsb
 This package starts the zookeeper server on startup
 
 %prep
-%setup -n zookeeper-%{zookeeper_base_version}
+%setup -n %{name}-%{zookeeper_base_version}
 
 %build
 bash %{SOURCE1} -Dversion=%{version}
@@ -129,19 +131,19 @@ bash %{SOURCE1} -Dversion=%{version}
 %__rm -rf $RPM_BUILD_ROOT
 cp $RPM_SOURCE_DIR/zookeeper.1 $RPM_SOURCE_DIR/zoo.cfg .
 sh %{SOURCE2} \
-          --build-dir=build/zookeeper-%{zookeeper_version} \
+          --build-dir=build/%{name}-%{zookeeper_version} \
           --doc-dir=%{doc_zookeeper} \
           --prefix=$RPM_BUILD_ROOT
 
 
 %if  %{?suse_version:1}0
-orig_init_file=$RPM_SOURCE_DIR/hadoop-zookeeper.sh.suse
+orig_init_file=%{SOURCE4}
 %else
-orig_init_file=$RPM_SOURCE_DIR/hadoop-zookeeper.sh
+orig_init_file=%{SOURCE3}
 %endif
 
 %__install -d -m 0755 $RPM_BUILD_ROOT/%{initd_dir}/
-init_file=$RPM_BUILD_ROOT/%{initd_dir}/hadoop-zookeeper-server
+init_file=$RPM_BUILD_ROOT/%{initd_dir}/%{svc_zookeeper}
 %__cp $orig_init_file $init_file
 chmod 755 $init_file
 
@@ -151,12 +153,12 @@ getent group zookeeper >/dev/null || gro
 getent passwd zookeeper > /dev/null || useradd -c "ZooKeeper" -s /sbin/nologin -g zookeeper -r -d %{run_zookeeper} zookeeper 2> /dev/null || :
 
 %__install -d -o zookeeper -g zookeeper -m 0755 %{run_zookeeper}
-%__install -d -o zookeeper -g zookeeper -m 0755 /var/log/zookeeper
+%__install -d -o zookeeper -g zookeeper -m 0755 %{log_zookeeper}
 
 # Manage configuration symlink
 %post
 %{alternatives_cmd} --install %{etc_zookeeper}/conf %{name}-conf %{etc_zookeeper}/conf.dist 30
-%__install -d -o zookeeper -g zookeeper -m 0755 /var/lib/zookeeper
+%__install -d -o zookeeper -g zookeeper -m 0755 %{vlb_zookeeper}
 
 %preun
 if [ "$1" = 0 ]; then
@@ -164,21 +166,21 @@ if [ "$1" = 0 ]; then
 fi
 
 %post server
-	chkconfig --add hadoop-zookeeper-server
+	chkconfig --add %{svc_zookeeper}
 
 %preun server
 if [ $1 = 0 ] ; then
-	service hadoop-zookeeper-server stop > /dev/null 2>&1
-	chkconfig --del hadoop-zookeeper-server
+	service %{svc_zookeeper} stop > /dev/null 2>&1
+	chkconfig --del %{svc_zookeeper}
 fi
 
 %postun server
 if [ $1 -ge 1 ]; then
-        service hadoop-zookeeper-server condrestart > /dev/null 2>&1
+        service %{svc_zookeeper} condrestart > /dev/null 2>&1
 fi
 
 %files server
-	%attr(0755,root,root) %{initd_dir}/hadoop-zookeeper-server
+	%attr(0755,root,root) %{initd_dir}/%{svc_zookeeper}
 
 #######################
 #### FILES SECTION ####

Modified: incubator/bigtop/branches/RCs/bigtop-test-framework/src/main/groovy/org/apache/bigtop/itest/pmanager/DEBPackage.groovy
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-test-framework/src/main/groovy/org/apache/bigtop/itest/pmanager/DEBPackage.groovy?rev=1229288&r1=1229287&r2=1229288&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-test-framework/src/main/groovy/org/apache/bigtop/itest/pmanager/DEBPackage.groovy (original)
+++ incubator/bigtop/branches/RCs/bigtop-test-framework/src/main/groovy/org/apache/bigtop/itest/pmanager/DEBPackage.groovy Mon Jan  9 18:40:56 2012
@@ -105,7 +105,7 @@ class DEBPackage extends ManagedPackage 
 
   Map<String, String> getDeps() {
     Map<String, String> res = [:];
-    // sample input: sun-java6-jre | sun-java6-sdk, hadoop-zookeeper (= 3.3.1+8), hadoop-0.20 (>= 0.20.2+700)
+    // sample input: sun-java6-jre | sun-java6-sdk, zookeeper (= 3.3.1+8), hadoop-0.20 (>= 0.20.2+700)
     // NOTE: we currently do NOT support alternative specification i.e. sun-java6-jre | sun-java6-sdk
     shUser.exec("dpkg -s $name | sed -ne 's#^Depends: ##p'").getOut().join(' ').split(',').each {
       def matcher = (it =~ /(\S+)( \(.+\))*/);



Mime
View raw message