bigtop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@apache.org
Subject svn commit: r1225924 - in /incubator/bigtop/branches/hadoop-0.23: ./ bigtop-deploy/puppet/modules/hadoop-zookeeper/manifests/ bigtop-packages/src/common/zookeeper/ bigtop-packages/src/deb/flume/ bigtop-packages/src/deb/hbase/ bigtop-packages/src/deb/zo...
Date Fri, 30 Dec 2011 21:21:08 GMT
Author: rvs
Date: Fri Dec 30 21:21:07 2011
New Revision: 1225924

URL: http://svn.apache.org/viewvc?rev=1225924&view=rev
Log:
BIGTOP-317. rename hadoop-zookeeper package into zookeeper

Added:
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/zookeeper/zookeeper-server.sh
      - copied, changed from r1225714, incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/zookeeper/hadoop-zookeeper.sh
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/zookeeper/zookeeper-server.sh.suse
      - copied, changed from r1225714, incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/zookeeper/hadoop-zookeeper.sh.suse
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/zookeeper/zookeeper-server.init
      - copied, changed from r1225714, incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/zookeeper/hadoop-zookeeper-server.init
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/zookeeper/zookeeper.postinst
      - copied, changed from r1225714, incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/zookeeper/hadoop-zookeeper.postinst
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/zookeeper/zookeeper.prerm
      - copied, changed from r1225714, incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/zookeeper/hadoop-zookeeper.prerm
Removed:
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/zookeeper/hadoop-zookeeper.sh
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/zookeeper/hadoop-zookeeper.sh.suse
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/zookeeper/hadoop-zookeeper-server.init
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/zookeeper/hadoop-zookeeper.postinst
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/zookeeper/hadoop-zookeeper.prerm
Modified:
    incubator/bigtop/branches/hadoop-0.23/bigtop-deploy/puppet/modules/hadoop-zookeeper/manifests/init.pp
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/flume/control
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hbase/control
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/zookeeper/control
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/zookeeper/rules
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/flume/SPECS/flume.spec
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/zookeeper/SPECS/zookeeper.spec
    incubator/bigtop/branches/hadoop-0.23/bigtop-test-framework/src/main/groovy/org/apache/bigtop/itest/pmanager/DEBPackage.groovy
    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-zookeeper/manifests/init.pp
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-deploy/puppet/modules/hadoop-zookeeper/manifests/init.pp?rev=1225924&r1=1225923&r2=1225924&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-deploy/puppet/modules/hadoop-zookeeper/manifests/init.pp
(original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-deploy/puppet/modules/hadoop-zookeeper/manifests/init.pp
Fri Dec 30 21:21:07 2011
@@ -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"],
     }
   }
 }

Copied: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/zookeeper/zookeeper-server.sh
(from r1225714, incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/zookeeper/hadoop-zookeeper.sh)
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/zookeeper/zookeeper-server.sh?p2=incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/zookeeper/zookeeper-server.sh&p1=incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/zookeeper/hadoop-zookeeper.sh&r1=1225714&r2=1225924&rev=1225924&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/zookeeper/hadoop-zookeeper.sh
(original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/zookeeper/zookeeper-server.sh
Fri Dec 30 21:21:07 2011
@@ -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/hadoop-0.23/bigtop-packages/src/common/zookeeper/zookeeper-server.sh.suse
(from r1225714, incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/zookeeper/hadoop-zookeeper.sh.suse)
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/zookeeper/zookeeper-server.sh.suse?p2=incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/zookeeper/zookeeper-server.sh.suse&p1=incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/zookeeper/hadoop-zookeeper.sh.suse&r1=1225714&r2=1225924&rev=1225924&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/zookeeper/hadoop-zookeeper.sh.suse
(original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/zookeeper/zookeeper-server.sh.suse
Fri Dec 30 21:21:07 2011
@@ -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/hadoop-0.23/bigtop-packages/src/deb/flume/control
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/flume/control?rev=1225924&r1=1225923&r2=1225924&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/flume/control (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/flume/control Fri Dec 30
21:21:07 2011
@@ -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/hadoop-0.23/bigtop-packages/src/deb/hbase/control
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hbase/control?rev=1225924&r1=1225923&r2=1225924&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hbase/control (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hbase/control Fri Dec 30
21:21:07 2011
@@ -22,7 +22,7 @@ Homepage: http://hbase.apache.org/
 
 Package: hadoop-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. 

Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/zookeeper/control
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/zookeeper/control?rev=1225924&r1=1225923&r2=1225924&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/zookeeper/control (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/zookeeper/control Fri Dec
30 21:21:07 2011
@@ -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/hadoop-0.23/bigtop-packages/src/deb/zookeeper/rules
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/zookeeper/rules?rev=1225924&r1=1225923&r2=1225924&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/zookeeper/rules (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/zookeeper/rules Fri Dec
30 21:21:07 2011
@@ -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/hadoop-0.23/bigtop-packages/src/deb/zookeeper/zookeeper-server.init
(from r1225714, incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/zookeeper/hadoop-zookeeper-server.init)
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/zookeeper/zookeeper-server.init?p2=incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/zookeeper/zookeeper-server.init&p1=incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/zookeeper/hadoop-zookeeper-server.init&r1=1225714&r2=1225924&rev=1225924&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/zookeeper/hadoop-zookeeper-server.init
(original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/zookeeper/zookeeper-server.init
Fri Dec 30 21:21:07 2011
@@ -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/hadoop-0.23/bigtop-packages/src/deb/zookeeper/zookeeper.postinst
(from r1225714, incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/zookeeper/hadoop-zookeeper.postinst)
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/zookeeper/zookeeper.postinst?p2=incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/zookeeper/zookeeper.postinst&p1=incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/zookeeper/hadoop-zookeeper.postinst&r1=1225714&r2=1225924&rev=1225924&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/zookeeper/hadoop-zookeeper.postinst
(original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/zookeeper/zookeeper.postinst
Fri Dec 30 21:21:07 2011
@@ -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/hadoop-0.23/bigtop-packages/src/deb/zookeeper/zookeeper.prerm
(from r1225714, incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/zookeeper/hadoop-zookeeper.prerm)
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/zookeeper/zookeeper.prerm?p2=incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/zookeeper/zookeeper.prerm&p1=incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/zookeeper/hadoop-zookeeper.prerm&r1=1225714&r2=1225924&rev=1225924&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/zookeeper/hadoop-zookeeper.prerm
(original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/zookeeper/zookeeper.prerm
Fri Dec 30 21:21:07 2011
@@ -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/hadoop-0.23/bigtop-packages/src/rpm/flume/SPECS/flume.spec
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/flume/SPECS/flume.spec?rev=1225924&r1=1225923&r2=1225924&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/flume/SPECS/flume.spec (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/flume/SPECS/flume.spec Fri
Dec 30 21:21:07 2011
@@ -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
 

Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec?rev=1225924&r1=1225923&r2=1225924&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec Fri
Dec 30 21:21:07 2011
@@ -87,7 +87,7 @@ 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

Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/zookeeper/SPECS/zookeeper.spec
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/zookeeper/SPECS/zookeeper.spec?rev=1225924&r1=1225923&r2=1225924&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/zookeeper/SPECS/zookeeper.spec
(original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/zookeeper/SPECS/zookeeper.spec
Fri Dec 30 21:21:07 2011
@@ -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,7 +59,7 @@
 
 
 
-Name: hadoop-zookeeper
+Name: zookeeper
 Version: %{zookeeper_version}
 Release: %{zookeeper_release}
 Summary: A high-performance coordination service for distributed applications.
@@ -65,11 +67,11 @@ URL: http://hadoop.apache.org/zookeeper/
 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/hadoop-0.23/bigtop-test-framework/src/main/groovy/org/apache/bigtop/itest/pmanager/DEBPackage.groovy
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-test-framework/src/main/groovy/org/apache/bigtop/itest/pmanager/DEBPackage.groovy?rev=1225924&r1=1225923&r2=1225924&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-test-framework/src/main/groovy/org/apache/bigtop/itest/pmanager/DEBPackage.groovy
(original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-test-framework/src/main/groovy/org/apache/bigtop/itest/pmanager/DEBPackage.groovy
Fri Dec 30 21:21:07 2011
@@ -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+)( \(.+\))*/);

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=1225924&r1=1225923&r2=1225924&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
Fri Dec 30 21:21:07 2011
@@ -820,7 +820,7 @@
   </metadata>
   <deps>
     <sun-java6-jre/>
-    <hadoop-zookeeper/>
+    <zookeeper/>
     <adduser/>
     <hadoop>>=0.20.2+720</hadoop>
   </deps>
@@ -2385,7 +2385,7 @@
     <file name="/usr/lib/oozie/lib/commons-lang-2.4.jar" owners="1" perm="-rw-r--r--"
user="root" group="root"/>
   </content>
 </oozie-client>
-<hadoop-zookeeper>
+<zookeeper>
   <metadata>
     <summary>A high-performance coordination service for distributed applications.</summary>
     <description>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.
@@ -2422,9 +2422,9 @@
     <file name="/usr/lib/zookeeper/zookeeper.jar" owners="1" perm="lrwxrwxrwx" user="root"
group="root" target="zookeeper-3.3.3-cdh3u1-SNAPSHOT.jar"/>
     <file name="/usr/share" owners="418" perm="drwxr-xr-x" user="root" group="root"/>
     <file name="/usr/share/doc" owners="418" perm="drwxr-xr-x" user="root" group="root"/>
-    <file name="/usr/share/doc/hadoop-zookeeper" owners="1" perm="drwxr-xr-x" user="root"
group="root"/>
-    <file name="/usr/share/doc/hadoop-zookeeper/changelog.Debian.gz" owners="1" perm="-rw-r--r--"
user="root" group="root"/>
-    <file name="/usr/share/doc/hadoop-zookeeper/copyright" owners="1" perm="-rw-r--r--"
user="root" group="root"/>
+    <file name="/usr/share/doc/zookeeper" owners="1" perm="drwxr-xr-x" user="root" group="root"/>
+    <file name="/usr/share/doc/zookeeper/changelog.Debian.gz" owners="1" perm="-rw-r--r--"
user="root" group="root"/>
+    <file name="/usr/share/doc/zookeeper/copyright" owners="1" perm="-rw-r--r--" user="root"
group="root"/>
     <file name="/usr/share/doc/zookeeper" owners="1" perm="drwxr-xr-x" user="root" group="root"/>
     <file name="/usr/share/doc/zookeeper/api" owners="1" perm="drwxr-xr-x" user="root"
group="root"/>
     <file name="/usr/share/doc/zookeeper/api/allclasses-frame.html" owners="1" perm="-rw-r--r--"
user="root" group="root"/>
@@ -2774,15 +2774,15 @@
     </zookeeper>
   </users>
   <alternatives>
-    <hadoop-zookeeper-conf>
+    <zookeeper-conf>
       <status>auto</status>
       <link>/etc/zookeeper/conf</link>
       <value>/etc/zookeeper/conf.dist</value>
       <alt>/etc/zookeeper/conf.dist</alt>
-    </hadoop-zookeeper-conf>
+    </zookeeper-conf>
   </alternatives>
-</hadoop-zookeeper>
-<hadoop-zookeeper-server>
+</zookeeper>
+<zookeeper-server>
   <metadata>
     <!-- license>APL2</license -->
     <!-- arch>universal</arch -->
@@ -2796,19 +2796,19 @@
     <!-- provides>zookeeper</provides -->
   </metadata>
   <deps>
-    <hadoop-zookeeper>/self</hadoop-zookeeper>
+    <zookeeper>/self</zookeeper>
   </deps>
   <services>
-    <hadoop-zookeeper-server>
+    <zookeeper-server>
       <runlevel>2</runlevel><runlevel>3</runlevel><runlevel>4</runlevel><runlevel>5</runlevel>
       <oninstall>start</oninstall>
       <configured>true</configured>
-    </hadoop-zookeeper-server>
+    </zookeeper-server>
   </services>
   <content>
-    <config name="/etc/init.d/hadoop-zookeeper-server" owners="1" perm="-rwxr-xr-x" user="root"
group="root"/>
-    <file name="/usr/share/doc/hadoop-zookeeper-server/changelog.Debian.gz" owners="1"
perm="-rw-r--r--" user="root" group="root"/>
-    <file name="/usr/share/doc/hadoop-zookeeper-server/copyright" owners="1" perm="-rw-r--r--"
user="root" group="root"/>
+    <config name="/etc/init.d/zookeeper-server" owners="1" perm="-rwxr-xr-x" user="root"
group="root"/>
+    <file name="/usr/share/doc/zookeeper-server/changelog.Debian.gz" owners="1" perm="-rw-r--r--"
user="root" group="root"/>
+    <file name="/usr/share/doc/zookeeper-server/copyright" owners="1" perm="-rw-r--r--"
user="root" group="root"/>
 
     <file name="/." owners="0" perm="drwxr-xr-x" user="root" group="root"/>
     <file name="/etc" owners="119" perm="drwxr-xr-x" user="root" group="root"/>
@@ -2816,9 +2816,9 @@
     <file name="/usr" owners="418" perm="drwxr-xr-x" user="root" group="root"/>
     <file name="/usr/share" owners="418" perm="drwxr-xr-x" user="root" group="root"/>
     <file name="/usr/share/doc" owners="418" perm="drwxr-xr-x" user="root" group="root"/>
-    <file name="/usr/share/doc/hadoop-zookeeper-server" owners="1" perm="drwxr-xr-x" user="root"
group="root"/>
+    <file name="/usr/share/doc/zookeeper-server" owners="1" perm="drwxr-xr-x" user="root"
group="root"/>
   </content>
-</hadoop-zookeeper-server>
+</zookeeper-server>
 <hadoop-pig>
   <metadata>
     <summary>A platform for analyzing large data sets using Hadoop</summary>
@@ -7105,7 +7105,7 @@
   <deps>
     <adduser/>
     <sun-java6-jre/>
-    <hadoop-zookeeper>>=3.3.1+8</hadoop-zookeeper>
+    <zookeeper>>=3.3.1+8</zookeeper>
     <hadoop>>=0.20.2+700</hadoop>
   </deps>
   <content>

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=1225924&r1=1225923&r2=1225924&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
Fri Dec 30 21:21:07 2011
@@ -813,7 +813,7 @@ also on potential use cases. Come to the
     <tag name="/usr/bin/env"/>
     <tag name="/usr/sbin/useradd"/>
     <hadoop>>=0.20.2+710</hadoop>
-    <hadoop-zookeeper>>=3.3.1+10</hadoop-zookeeper>
+    <zookeeper>>=3.3.1+10</zookeeper>
     <jre>>=1.6</jre>
     <sh-utils/>
     <textutils/>
@@ -2345,7 +2345,7 @@ also on potential use cases. Come to the
     <doc  name="/usr/share/man/man1/oozie.1.gz" owners="1" perm="-rw-r--r--" user="root"
group="root"/>
   </content>
 </oozie-client>
-<hadoop-zookeeper>
+<zookeeper>
   <metadata>
     <summary>A high-performance coordination service for distributed applications.</summary>
     <description>ZooKeeper is a centralized service for maintaining configuration information,
@@ -2726,15 +2726,15 @@ difficult to manage. Even when done corr
     </zookeeper>
   </users>
   <alternatives>
-    <hadoop-zookeeper-conf>
+    <zookeeper-conf>
       <status>auto</status>
       <link>/etc/zookeeper/conf</link>
       <value>/etc/zookeeper/conf.dist</value>
       <alt>/etc/zookeeper/conf.dist</alt>
-    </hadoop-zookeeper-conf>
+    </zookeeper-conf>
   </alternatives>
-</hadoop-zookeeper>
-<hadoop-zookeeper-server>
+</zookeeper>
+<zookeeper-server>
   <metadata>
     <!-- license>APL2</license -->
     <!-- arch>universal</arch -->
@@ -2751,20 +2751,20 @@ difficult to manage. Even when done corr
   <deps>
     <tag name="/bin/bash"/>
     <tag name="/bin/sh"/>
-    <hadoop-zookeeper>/self</hadoop-zookeeper>
+    <zookeeper>/self</zookeeper>
     <redhat-lsb/>
   </deps>
   <services>
-    <hadoop-zookeeper-server>
+    <zookeeper-server>
       <runlevel>2</runlevel><runlevel>3</runlevel><runlevel>4</runlevel><runlevel>5</runlevel>
       <oninstall>stop</oninstall>
       <configured>true</configured>
-    </hadoop-zookeeper-server>
+    </zookeeper-server>
   </services>
   <content>
-    <file name="/etc/rc.d/init.d/hadoop-zookeeper-server" owners="1" perm="-rwxr-xr-x"
user="root" group="root"/>
+    <file name="/etc/rc.d/init.d/zookeeper-server" owners="1" perm="-rwxr-xr-x" user="root"
group="root"/>
   </content>
-</hadoop-zookeeper-server>
+</zookeeper-server>
 <hadoop-pig>
   <metadata>
     <summary>Pig is a platform for analyzing large data sets</summary>
@@ -7167,7 +7167,7 @@ difficult to manage. Even when done corr
     <tag name="/usr/bin/env"/>
     <tag name="/usr/sbin/useradd"/>
     <hadoop>>=0.20.2+700</hadoop>
-    <hadoop-zookeeper>>=3.3.1+8</hadoop-zookeeper>
+    <zookeeper>>=3.3.1+8</zookeeper>
     <jre>>=1.6</jre>
     <sh-utils/>
     <textutils/>

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=1225924&r1=1225923&r2=1225924&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
Fri Dec 30 21:21:07 2011
@@ -1069,7 +1069,7 @@ also on potential use cases. Come to the
       <tag name="/usr/bin/env"/>
       <tag name="/usr/sbin/useradd"/>
       <hadoop>&gt;=0.20.2+710</hadoop>
-      <hadoop-zookeeper>&gt;=3.3.1+10</hadoop-zookeeper>
+      <zookeeper>&gt;=3.3.1+10</zookeeper>
       <jre>&gt;=1.6</jre>
       <sh-utils/>
       <textutils/>
@@ -4160,7 +4160,7 @@ also on potential use cases. Come to the
       <doc name="/usr/share/man/man1/oozie.1.gz" perm="-rw-r--r--" group="root" owners="-1"
user="root"/>
     </content>
   </oozie-client>
-  <hadoop-zookeeper>
+  <zookeeper>
     <metadata>
       <summary>A high-performance coordination service for distributed applications.</summary>
       <description>ZooKeeper is a centralized service for maintaining configuration
information,
@@ -4538,15 +4538,15 @@ difficult to manage. Even when done corr
       </zookeeper>
     </users>
     <alternatives>
-      <hadoop-zookeeper-conf>
+      <zookeeper-conf>
         <status>auto</status>
         <link>/etc/zookeeper/conf</link>
         <value>/etc/zookeeper/conf.dist</value>
         <alt>/etc/zookeeper/conf.dist</alt>
-      </hadoop-zookeeper-conf>
+      </zookeeper-conf>
     </alternatives>
-  </hadoop-zookeeper>
-  <hadoop-zookeeper-server>
+  </zookeeper>
+  <zookeeper-server>
     <metadata>
       <summary>The Hadoop Zookeeper server</summary>
       <description>This package starts the zookeeper server on startup</description>
@@ -4555,23 +4555,23 @@ difficult to manage. Even when done corr
     <deps>
       <tag name="/bin/bash"/>
       <tag name="/bin/sh"/>
-      <hadoop-zookeeper>/self</hadoop-zookeeper>
+      <zookeeper>/self</zookeeper>
       <redhat-lsb/>
     </deps>
     <services>
-      <hadoop-zookeeper-server>
+      <zookeeper-server>
         <runlevel>2</runlevel>
         <runlevel>3</runlevel>
         <runlevel>4</runlevel>
         <runlevel>5</runlevel>
         <oninstall>stop</oninstall>
         <configured>true</configured>
-      </hadoop-zookeeper-server>
+      </zookeeper-server>
     </services>
     <content>
-      <file name="/etc/rc.d/init.d/hadoop-zookeeper-server" perm="-rwxr-xr-x" group="root"
owners="-1" user="root"/>
+      <file name="/etc/rc.d/init.d/zookeeper-server" perm="-rwxr-xr-x" group="root" owners="-1"
user="root"/>
     </content>
-  </hadoop-zookeeper-server>
+  </zookeeper-server>
   <hadoop-pig>
     <metadata>
       <summary>Pig is a platform for analyzing large data sets</summary>
@@ -8936,7 +8936,7 @@ difficult to manage. Even when done corr
       <tag name="/usr/bin/env"/>
       <tag name="/usr/sbin/useradd"/>
       <hadoop>&gt;=0.20.2+700</hadoop>
-      <hadoop-zookeeper>&gt;=3.3.1+8</hadoop-zookeeper>
+      <zookeeper>&gt;=3.3.1+8</zookeeper>
       <jre>&gt;=1.6</jre>
       <sh-utils/>
       <textutils/>

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=1225924&r1=1225923&r2=1225924&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
Fri Dec 30 21:21:07 2011
@@ -812,7 +812,7 @@ also on potential use cases. Come to the
     <tag name="/usr/sbin/useradd"/>
     <tag name="/sbin/chkconfig"/>
     <tag name="/sbin/service"/>
-    <hadoop-zookeeper>>=3.3.1+10</hadoop-zookeeper>
+    <zookeeper>>=3.3.1+10</zookeeper>
     <hadoop>>=0.20.2+710</hadoop>
     <jre>>=1.6</jre>
     <tag name="/bin/sh"/>
@@ -2345,7 +2345,7 @@ also on potential use cases. Come to the
     <doc  name="/usr/share/man/man1/oozie.1.gz" owners="1" perm="-rw-r--r--" user="root"
group="root"/>
   </content>
 </oozie-client>
-<hadoop-zookeeper>
+<zookeeper>
   <metadata>
     <summary>A high-performance coordination service for distributed applications.</summary>
     <description>ZooKeeper is a centralized service for maintaining configuration information,
@@ -2726,15 +2726,15 @@ difficult to manage. Even when done corr
     </zookeeper>
   </users>
   <alternatives>
-    <hadoop-zookeeper-conf>
+    <zookeeper-conf>
       <status>auto</status>
       <link>/etc/zookeeper</link>
       <value>/etc/zookeeper.dist</value>
       <alt>/etc/zookeeper.dist</alt>
-    </hadoop-zookeeper-conf>
+    </zookeeper-conf>
   </alternatives>
-</hadoop-zookeeper>
-<hadoop-zookeeper-server>
+</zookeeper>
+<zookeeper-server>
   <metadata>
     <!-- license>APL2</license -->
     <!-- arch>universal</arch -->
@@ -2749,22 +2749,22 @@ difficult to manage. Even when done corr
     <!-- provides>zookeeper</provides -->
   </metadata>
   <deps>
-    <hadoop-zookeeper>/self</hadoop-zookeeper>
+    <zookeeper>/self</zookeeper>
     <insserv/>
     <tag name="/bin/sh"/>
     <tag name="/bin/bash"/>
   </deps>
   <services>
-    <hadoop-zookeeper-server>
+    <zookeeper-server>
       <!-- BUG https://jira.cloudera.com/browse/KITCHEN-1095 --><runlevel>3</runlevel><runlevel>4</runlevel><runlevel>5</runlevel>
       <oninstall>stop</oninstall>
       <configured>true</configured>
-    </hadoop-zookeeper-server>
+    </zookeeper-server>
   </services>
   <content>
-    <file name="/etc/rc.d/hadoop-zookeeper-server" owners="1" perm="-rwxr-xr-x" user="root"
group="root"/>
+    <file name="/etc/rc.d/zookeeper-server" owners="1" perm="-rwxr-xr-x" user="root" group="root"/>
   </content>
-</hadoop-zookeeper-server>
+</zookeeper-server>
 <hadoop-pig>
   <metadata>
     <summary>Pig is a platform for analyzing large data sets</summary>
@@ -7086,7 +7086,7 @@ difficult to manage. Even when done corr
     <tag name="/usr/sbin/useradd"/>
     <tag name="/sbin/chkconfig"/>
     <tag name="/sbin/service"/>
-    <hadoop-zookeeper>>=3.3.1+8</hadoop-zookeeper>
+    <zookeeper>>=3.3.1+8</zookeeper>
     <hadoop>>=0.20.2+700</hadoop>
     <jre>>=1.6</jre>
     <tag name="/bin/sh"/>

Modified: incubator/bigtop/branches/hadoop-0.23/bigtop.mk
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop.mk?rev=1225924&r1=1225923&r2=1225924&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop.mk (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop.mk Fri Dec 30 21:21:07 2011
@@ -31,7 +31,7 @@ $(eval $(call PACKAGE,hadoop,HADOOP))
 # ZooKeeper
 ZOOKEEPER_NAME=zookeeper
 ZOOKEEPER_RELNOTES_NAME=Apache Zookeeper
-ZOOKEEPER_PKG_NAME=hadoop-zookeeper
+ZOOKEEPER_PKG_NAME=zookeeper
 ZOOKEEPER_BASE_VERSION=3.4.2
 ZOOKEEPER_PKG_VERSION=3.4.2
 ZOOKEEPER_RELEASE_VERSION=1



Mime
View raw message