incubator-bigtop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@apache.org
Subject svn commit: r1326670 [6/47] - in /incubator/bigtop/trunk: ./ bigtop-deploy/puppet/manifests/ bigtop-deploy/puppet/modules/hadoop-hbase/manifests/ bigtop-deploy/puppet/modules/hadoop-hbase/templates/ bigtop-deploy/puppet/modules/hadoop-oozie/manifests/ ...
Date Mon, 16 Apr 2012 16:10:32 GMT
Modified: incubator/bigtop/trunk/bigtop-packages/src/common/pig/do-component-build
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/common/pig/do-component-build?rev=1326670&r1=1326669&r2=1326670&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/common/pig/do-component-build (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/common/pig/do-component-build Mon Apr 16 16:10:22 2012
@@ -16,6 +16,6 @@
 
 set -ex
 
-ant -Djavac.version=1.6 -Djava5.home=${JAVA5_HOME} -Dforrest.home=${FORREST_HOME} -Dversion=${PIG_BASE_VERSION} package "$@"
+ant -Djavac.version=1.6 -Djava5.home=${JAVA5_HOME} -Dforrest.home=${FORREST_HOME} -Dversion=${PIG_BASE_VERSION} -Dhadoopversion=23 package "$@"
 
 

Modified: incubator/bigtop/trunk/bigtop-packages/src/common/pig/install_pig.sh
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/common/pig/install_pig.sh?rev=1326670&r1=1326669&r2=1326670&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/common/pig/install_pig.sh (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/common/pig/install_pig.sh Mon Apr 16 16:10:22 2012
@@ -126,7 +126,6 @@ ln -s /etc/pig/conf $LIB_DIR/conf
 install -d -m 0755 $BIN_DIR
 cat > $BIN_DIR/pig <<EOF
 #!/bin/sh
-. /etc/default/hadoop
 
 # Autodetect JAVA_HOME if not defined
 if [ -e /usr/libexec/bigtop-detect-javahome ]; then
@@ -145,6 +144,7 @@ gzip -c pig.1 > $MAN_DIR/pig.1.gz
 # Copy in the docs
 install -d -m 0755 $DOC_DIR
 (cd $BUILD_DIR/docs && tar -cf - .)|(cd $DOC_DIR && tar -xf -)
+mv $LIB_DIR/license $DOC_DIR
 
 install -d -m 0755 $EXAMPLES_DIR
 (cd $LIB_DIR ; mv pig*withouthadoop.jar `echo pig*withouthadoop.jar | sed -e 's#withouthadoop#core#'`)

Modified: incubator/bigtop/trunk/bigtop-packages/src/common/sqoop/do-component-build
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/common/sqoop/do-component-build?rev=1326670&r1=1326669&r2=1326670&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/common/sqoop/do-component-build (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/common/sqoop/do-component-build Mon Apr 16 16:10:22 2012
@@ -16,6 +16,4 @@
 
 set -ex
 
-ant -f build.xml -Dhadoopversion=100 -Dhbase.version=0.92.0 -Dhadoop.version=1.0.1 -Dzookeeper.version=3.4.3 package "$@"
-
-
+ant -f build.xml -Dhadoopversion=23 -Dhadoop.version=0.23.1 -Dhbase.version=0.92.0 -Dzookeeper.version=3.4.3 package "$@"

Modified: incubator/bigtop/trunk/bigtop-packages/src/common/sqoop/install_sqoop.sh
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/common/sqoop/install_sqoop.sh?rev=1326670&r1=1326669&r2=1326670&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/common/sqoop/install_sqoop.sh (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/common/sqoop/install_sqoop.sh Mon Apr 16 16:10:22 2012
@@ -131,13 +131,12 @@ cp -r $BUILD_DIR/docs/images $PREFIX/${D
 install -d -m 0755 $PREFIX/$MAN_DIR
 for i in sqoop sqoop-codegen sqoop-export sqoop-import-all-tables sqoop-version sqoop-create-hive-table sqoop-help sqoop-list-databases sqoop-eval sqoop-import sqoop-list-tables sqoop-job sqoop-metastore sqoop-merge
 	do echo "Copying manpage $i"
-	cp $BUILD_DIR/docs/man/$i* $PREFIX/$MAN_DIR
+	cp ${BUILD_DIR}/docs/man/$i* $PREFIX/$MAN_DIR
 	echo "Creating wrapper for $i"
 	wrapper=$PREFIX/usr/bin/$i
 	mkdir -p `dirname $wrapper`
 	cat > $wrapper <<EOF
 #!/bin/sh
-. /etc/default/hadoop
 
 # Autodetect JAVA_HOME if not defined
 if [ -e /usr/libexec/bigtop-detect-javahome ]; then

Modified: incubator/bigtop/trunk/bigtop-packages/src/common/zookeeper/zookeeper-server.sh
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/common/zookeeper/zookeeper-server.sh?rev=1326670&r1=1326669&r2=1326670&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/common/zookeeper/zookeeper-server.sh (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/common/zookeeper/zookeeper-server.sh Mon Apr 16 16:10:22 2012
@@ -163,11 +163,19 @@ case "$1" in
 	    exit 1
 	fi
 	;;
-
+    init)
+        if hadoop_check_pidfile $PID_FILE ; then
+          echo "Error: $DESC is running. Stop it first." >&2
+          exit 1
+        else
+          shift
+          su -s /bin/sh zookeeper -c "zookeeper-server-initialize $*"
+        fi
+	;;
     *)
 	N=/etc/init.d/$NAME
   # echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2
-	echo "Usage: $N {start|stop|restart|force-reload|status|force-stop|condrestart|try-restart}" >&2
+	echo "Usage: $N {start|stop|restart|force-reload|status|force-stop|condrestart|try-restart|init}" >&2
 
 	exit 1
 	;;

Modified: incubator/bigtop/trunk/bigtop-packages/src/common/zookeeper/zookeeper-server.sh.suse
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/common/zookeeper/zookeeper-server.sh.suse?rev=1326670&r1=1326669&r2=1326670&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/common/zookeeper/zookeeper-server.sh.suse (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/common/zookeeper/zookeeper-server.sh.suse Mon Apr 16 16:10:22 2012
@@ -126,8 +126,18 @@ case "$1" in
   condrestart|try-restart)
     condrestart
     ;;
+  init)
+    checkstatus
+    if [ "$?" = "$STATUS_RUNNING" ] ; then
+      echo "Error: $DESC is running. Stop it first." >&2
+      exit 1
+    else
+      shift
+      su -s /bin/sh $USER -c "zookeeper-server-initialize $*"
+    fi
+    ;;
   *)
-    echo $"Usage: $0 {start|stop|status|restart|try-restart|condrestart}"
+    echo $"Usage: $0 {start|stop|status|restart|try-restart|condrestart|init}"
     exit 1
 esac
 

Modified: incubator/bigtop/trunk/bigtop-packages/src/common/zookeeper/zookeeper.1
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/common/zookeeper/zookeeper.1?rev=1326670&r1=1326669&r2=1326670&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/common/zookeeper/zookeeper.1 (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/common/zookeeper/zookeeper.1 Mon Apr 16 16:10:22 2012
@@ -27,7 +27,10 @@
 [-server host:port(,host:port)*] COMMAND [OPTIONS]
 .RS 0
 .B zookeeper-server
-<start|stop|restart|status>
+<start|start-foreground|stop|restart|status|upgrade|print-cmd>
+.RS 0
+.B zookeeper-server-initialize
+[--configfile=<file>] [--myid=###] [--force]
 
 .SH DESCRIPTION
 
@@ -45,8 +48,22 @@ For more information about ZooKeeper, se
 .RS 0
 http://zookeeper.apache.org/.
 
-To find the list of available commands and options for \fBzookeeper-client\fR type:
-\fBzookeeper-client help\fR
+\fBzookeeper-server\fR starts/stops/etc... the ZooKeeper server. To
+find the list of available commands and options for
+\fBzookeeper-server\fR type: \fBzookeeper-server help\fR
+
+\fBzookeeper-server-initialize\fR initializes the ZooKeeper data
+directory. This must be run after configuring the server, prior to
+starting the service (the server will not start on an uninitialized
+data directory). On a production system it is important to run
+zookeeper-server-initialize under the same user id used for running
+zookeeper-server (sudo -u zookeeper). To find the list of available
+commands and options for \fBzookeeper-server-initialize\fR type:
+\fBzookeeper-server-initialize -h\fR
+
+\fBzookeeper-client\fR starts the ZooKeeper client shell. To find the
+list of available commands and options for \fBzookeeper-client\fR
+type: \fBzookeeper-client help\fR
 
 .SH ENVIRONMENT
 
@@ -54,10 +71,10 @@ To find the list of available commands a
 Alternate home directory. Default is /usr/lib/zookeeper.
 
 .IP ZOOKEEPER_CONF
-Alternate conf dir. Default is /etc/zookeeper.
+Alternate conf dir. Default is /etc/zookeeper/conf.
 
 .IP ZOOPIDFILE
 Alternate server PID file. Default is /var/run/zookeeper/zookeeper-server.pid.
 
 .SH COPYRIGHT
-Copyright (C) 2010 The Apache Software Foundation. All rights reserved.
+Copyright (C) 2010-2012 The Apache Software Foundation. All rights reserved.

Added: incubator/bigtop/trunk/bigtop-packages/src/deb/bigtop-jsvc/bigtop-jsvc.install
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/bigtop-jsvc/bigtop-jsvc.install?rev=1326670&view=auto
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/bigtop-jsvc/bigtop-jsvc.install (added)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/bigtop-jsvc/bigtop-jsvc.install Mon Apr 16 16:10:22 2012
@@ -0,0 +1,2 @@
+/usr/lib/bigtop-utils
+/usr/share/doc/bigtop-jsvc

Added: incubator/bigtop/trunk/bigtop-packages/src/deb/bigtop-jsvc/changelog
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/bigtop-jsvc/changelog?rev=1326670&view=auto
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/bigtop-jsvc/changelog (added)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/bigtop-jsvc/changelog Mon Apr 16 16:10:22 2012
@@ -0,0 +1 @@
+--- This is auto-generated 

Propchange: incubator/bigtop/trunk/bigtop-packages/src/deb/bigtop-jsvc/changelog
------------------------------------------------------------------------------
    svn:executable = *

Added: incubator/bigtop/trunk/bigtop-packages/src/deb/bigtop-jsvc/compat
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/bigtop-jsvc/compat?rev=1326670&view=auto
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/bigtop-jsvc/compat (added)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/bigtop-jsvc/compat Mon Apr 16 16:10:22 2012
@@ -0,0 +1 @@
+6

Propchange: incubator/bigtop/trunk/bigtop-packages/src/deb/bigtop-jsvc/compat
------------------------------------------------------------------------------
    svn:executable = *

Copied: incubator/bigtop/trunk/bigtop-packages/src/deb/bigtop-jsvc/control (from r1325587, incubator/bigtop/trunk/bigtop-packages/src/common/hive/do-component-build)
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/bigtop-jsvc/control?p2=incubator/bigtop/trunk/bigtop-packages/src/deb/bigtop-jsvc/control&p1=incubator/bigtop/trunk/bigtop-packages/src/common/hive/do-component-build&r1=1325587&r2=1326670&rev=1326670&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/common/hive/do-component-build (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/bigtop-jsvc/control Mon Apr 16 16:10:22 2012
@@ -1,4 +1,3 @@
-#!/bin/sh
 # 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.
@@ -13,7 +12,15 @@
 # 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: bigtop-jsvc 
+Section: misc
+Priority: extra
+Maintainer: Bigtop <bigtop-dev@incubator.apache.org>
+Build-Depends: debhelper (>= 6), autoconf, automake, gcc
+Standards-Version: 3.8.0
+Homepage: http://commons.apache.org/daemon/
 
-set -ex
-
-ant -f src/build.xml -Dhadoop.mirror=http://archive.cloudera.com/hive-deps package "$@"
+Package: bigtop-jsvc
+Architecture: any 
+Description: Application to launch java daemon
+ jsvc executes classfile that implements a Daemon interface.

Propchange: incubator/bigtop/trunk/bigtop-packages/src/deb/bigtop-jsvc/control
------------------------------------------------------------------------------
    svn:executable = *

Added: incubator/bigtop/trunk/bigtop-packages/src/deb/bigtop-jsvc/copyright
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/bigtop-jsvc/copyright?rev=1326670&view=auto
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/bigtop-jsvc/copyright (added)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/bigtop-jsvc/copyright Mon Apr 16 16:10:22 2012
@@ -0,0 +1,15 @@
+Format: http://dep.debian.net/deps/dep5
+Source: http://commons.apache.org/daemon/
+Upstream-Name: Apache Commons Daemon
+
+Files: *
+Copyright: 2008-2012, The Apache Software Foundation
+License: Apache-2.0
+
+Files debian/*
+Copyright: 2012, The Apache Software Foundation
+License: Apache-2.0
+
+License: Apache-2.0
+ On Debian systems, the complete text of the Apache 2.0 license
+ can be found in "/usr/share/common-licenses/Apache-2.0".

Propchange: incubator/bigtop/trunk/bigtop-packages/src/deb/bigtop-jsvc/copyright
------------------------------------------------------------------------------
    svn:executable = *

Copied: incubator/bigtop/trunk/bigtop-packages/src/deb/bigtop-jsvc/rules (from r1325587, incubator/bigtop/trunk/bigtop-packages/src/deb/oozie/rules)
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/bigtop-jsvc/rules?p2=incubator/bigtop/trunk/bigtop-packages/src/deb/bigtop-jsvc/rules&p1=incubator/bigtop/trunk/bigtop-packages/src/deb/oozie/rules&r1=1325587&r2=1326670&rev=1326670&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/oozie/rules (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/bigtop-jsvc/rules Mon Apr 16 16:10:22 2012
@@ -21,7 +21,9 @@
 export DH_VERBOSE=1
 
 # This has to be exported to make some magic below work.
-export DH_OPTIONS
+export DH_OPTIONS=-s
+
+jsvc_pkg_name=bigtop-jsvc
 
 patch: patch-stamp
 patch-stamp:	
@@ -32,35 +34,28 @@ clean:	
 	dh_testroot
 	rm -f *-stamp
 	dh_clean
-	rm -Rf debian/tmp debian/oozie
+	rm -Rf debian/tmp debian/$(jsvc_pkg_name)
 	find debian -name .\*swp -exec rm -f {} \;
 
-
-# we need to set 'maven.repo.local' otherwise the build with
-# fakeroot fails because it tries to use /root/.m2
-
-build-indep: build-indep-stamp
-build-indep-stamp: patch-stamp
-	mkdir -p distro/downloads
-	env DO_MAVEN_DEPLOY="" FULL_VERSION=${OOZIE_BASE_VERSION} bash -x debian/do-component-build
-	mkdir -p debian/tmp
-	tar cf - --exclude=debian/\* . | (cd debian/tmp && tar xf -)
+build: build-stamp
+build-stamp: patch-stamp
+	bash debian/do-component-build -Divy.home=${HOME}/.ivy2
 	touch $@
 
-install: install-indep
-install-indep:
+install-arch: 
 	dh_testdir
 	dh_testroot
-	sh -x debian/install_oozie.sh --extra-dir=debian/ --build-dir=. --server-dir=./debian/oozie --client-dir=./debian/oozie-client --docs-dir=./debian/oozie-client/usr/share/doc/oozie --initd-dir=./debian/oozie/etc/init.d --conf-dir=./debian/oozie/etc/oozie/conf.dist
-	dh_install -i
+	sh -x debian/install_jsvc.sh \
+	  --build-dir=.              \
+	  --prefix=debian/tmp
+	dh_install -s --sourcedir=debian/tmp
 
-binary-common:
+binary-common:	
 	dh_testdir
 	dh_testroot
 	dh_installchangelogs
 	dh_installdocs
 	dh_installman
-	dh_installdirs
 	dh_link
 	dh_strip
 	dh_compress
@@ -73,9 +68,9 @@ binary-common:
 	dh_md5sums
 	dh_builddeb
 
-binary-indep: build-indep install-indep
-	$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
+# Build architecture dependant packages using the common target.
+binary: binary-arch
+binary-arch: build install-arch binary-common
+	@echo Build is done
 
-binary-arch:
-binary: binary-indep
-.PHONY: build clean binary-indep binary install-indep binary-arc
+.PHONY: build clean binary-indep binary install-indep binary-arch

Added: incubator/bigtop/trunk/bigtop-packages/src/deb/bigtop-tomcat/changelog
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/bigtop-tomcat/changelog?rev=1326670&view=auto
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/bigtop-tomcat/changelog (added)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/bigtop-tomcat/changelog Mon Apr 16 16:10:22 2012
@@ -0,0 +1 @@
+--- This is auto-generated 

Added: incubator/bigtop/trunk/bigtop-packages/src/deb/bigtop-tomcat/compat
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/bigtop-tomcat/compat?rev=1326670&view=auto
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/bigtop-tomcat/compat (added)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/bigtop-tomcat/compat Mon Apr 16 16:10:22 2012
@@ -0,0 +1 @@
+6

Copied: incubator/bigtop/trunk/bigtop-packages/src/deb/bigtop-tomcat/control (from r1325587, incubator/bigtop/trunk/bigtop-packages/src/common/hive/do-component-build)
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/bigtop-tomcat/control?p2=incubator/bigtop/trunk/bigtop-packages/src/deb/bigtop-tomcat/control&p1=incubator/bigtop/trunk/bigtop-packages/src/common/hive/do-component-build&r1=1325587&r2=1326670&rev=1326670&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/common/hive/do-component-build (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/bigtop-tomcat/control Mon Apr 16 16:10:22 2012
@@ -1,4 +1,3 @@
-#!/bin/sh
 # 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.
@@ -13,7 +12,16 @@
 # 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: bigtop-tomcat
+Section: misc
+Priority: extra
+Maintainer: Bigtop <bigtop-dev@incubator.apache.org>
+Build-Depends: debhelper (>= 6)
+Standards-Version: 3.8.0
+Homepage: http://tomcat.apache.org/
 
-set -ex
-
-ant -f src/build.xml -Dhadoop.mirror=http://archive.cloudera.com/hive-deps package "$@"
+Package: bigtop-tomcat
+Architecture: all
+Description: Apache Tomcat 
+ Apache Tomcat is an open source software implementation of the
+ Java Servlet and JavaServer Pages technologies. 

Added: incubator/bigtop/trunk/bigtop-packages/src/deb/bigtop-tomcat/copyright
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/bigtop-tomcat/copyright?rev=1326670&view=auto
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/bigtop-tomcat/copyright (added)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/bigtop-tomcat/copyright Mon Apr 16 16:10:22 2012
@@ -0,0 +1,15 @@
+Format: http://dep.debian.net/deps/dep5
+Source: http://tomcat.apache.org/
+Upstream-Name: Apache Tomcat
+
+Files: *
+Copyright: 2010-2011, The Apache Software Foundation
+License: Apache-2.0
+
+Files debian/*
+Copyright: 2011, The Apache Software Foundation
+License: Apache-2.0
+
+License: Apache-2.0
+ On Debian systems, the complete text of the Apache 2.0 license
+ can be found in "/usr/share/common-licenses/Apache-2.0".

Copied: incubator/bigtop/trunk/bigtop-packages/src/deb/bigtop-tomcat/rules (from r1325587, incubator/bigtop/trunk/bigtop-packages/src/deb/mahout/rules)
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/bigtop-tomcat/rules?p2=incubator/bigtop/trunk/bigtop-packages/src/deb/bigtop-tomcat/rules&p1=incubator/bigtop/trunk/bigtop-packages/src/deb/mahout/rules&r1=1325587&r2=1326670&rev=1326670&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/mahout/rules (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/bigtop-tomcat/rules Mon Apr 16 16:10:22 2012
@@ -32,29 +32,22 @@ clean:	
 	dh_testroot
 	rm -f *-stamp
 	dh_clean
-	rm -Rf debian/tmp debian/mahout
+	rm -Rf debian/tmp debian/bigtop-tomcat
 	find debian -name .\*swp -exec rm -f {} \;
 
 build-indep: build-indep-stamp
 build-indep-stamp: patch-stamp
-	# we'll just use the build from the tarball.
 	bash debian/do-component-build -Dmaven.repo.local=${HOME}/.m2/repository
-	mkdir -p debian/tmp
-	(cd distribution/target/mahout-distribution-${MAHOUT_BASE_VERSION}/mahout-distribution-${MAHOUT_BASE_VERSION} && tar cf - --exclude=debian/\* .) | (cd debian/tmp && tar xf -)
-#	(cd debian/tmp && tar xvzf ../../distribution/target/mahout-distribution-${MAHOUT_BASE_VERSION}.tar.gz)
 	touch $@
 
 install: install-indep
 install-indep:	
 	dh_testdir
 	dh_testroot
-	sh -x debian/install_mahout.sh \
-	  --build-dir=debian/tmp \
-          --doc-dir=/usr/share/doc/mahout \
-	  --prefix=debian/mahout
-	rm debian/mahout/usr/lib/mahout/lib/hadoop-*.jar
-	ln -s /usr/lib/hadoop/hadoop-core.jar debian/mahout/usr/lib/mahout/lib/hadoop-core.jar
-	dh_install -i
+	bash -x debian/install_tomcat.sh                             \
+	  --build-dir=build                                          \
+	  --doc-dir=debian/bigtop-tomcat/usr/share/doc/bigtop-tomcat \
+	  --prefix=debian/bigtop-tomcat
 	(dh_lintian) || /bin/true
 
 binary-common:	

Modified: incubator/bigtop/trunk/bigtop-packages/src/deb/flume/control
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/flume/control?rev=1326670&r1=1326669&r2=1326670&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/flume/control (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/flume/control Mon Apr 16 16:10:22 2012
@@ -23,7 +23,7 @@ Homepage: http://incubator.apache.org/pr
 
 Package: flume
 Architecture: all
-Depends: adduser, hadoop, bigtop-utils
+Depends: adduser, hadoop-hdfs, 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/trunk/bigtop-packages/src/deb/flume/rules
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/flume/rules?rev=1326670&r1=1326669&r2=1326670&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/flume/rules (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/flume/rules Mon Apr 16 16:10:22 2012
@@ -55,10 +55,11 @@ install-indep:
 	dh_testroot
 	sh -x debian/install_flume.sh \
 	  --build-dir=${PWD} \
-	  --prefix=debian/flume 
+	  --prefix=debian/flume
 	# Remove hadoop dependency and instead symlink in the hadoop jar
-	rm debian/flume/usr/lib/flume/lib/hadoop-core-*
-	ln -s /usr/lib/hadoop/hadoop-core.jar debian/flume/usr/lib/flume/lib/hadoop-core.jar
+	rm debian/flume/usr/lib/flume/lib/hadoop-*
+	ln -s /usr/lib/hadoop/hadoop-common.jar debian/flume/usr/lib/flume/lib/hadoop-common.jar
+	ln -s /usr/lib/hadoop/hadoop-auth.jar debian/flume/usr/lib/flume/lib/hadoop-auth.jar
 	dh_install -i
 
 binary-common:	

Modified: incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/control
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/control?rev=1326670&r1=1326669&r2=1326670&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/control (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/control Mon Apr 16 16:10:22 2012
@@ -24,8 +24,7 @@ Homepage: http://hadoop.apache.org/core/
 Package: hadoop
 Provides: hadoop
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, bigtop-utils
-Recommends: hadoop-native
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, bigtop-utils, zookeeper (>= 3.4.0)
 Description: A software platform for processing vast amounts of data
  Hadoop is a software platform that lets one easily write and
  run applications that process vast amounts of data.
@@ -47,34 +46,43 @@ Description: A software platform for pro
  nodes around the cluster. MapReduce can then process the data where it is
  located.
 
-Package: hadoop-native
-Provides: hadoop-native
-Architecture: i386 amd64
-Depends: ${shlibs:Depends}, hadoop (= ${source:Version}), liblzo2-2, libzip1
-Enhances: hadoop
-Description: Native libraries for Hadoop (e.g., compression)
- This optional package contains native libraries that increase the performance
- of Hadoop's compression.
-
-Package: hadoop-sbin
-Provides: hadoop-sbin
-Architecture: i386 amd64
-Depends: ${shlibs:Depends}, hadoop (= ${source:Version})
-Enhances: hadoop
-Description: Server-side binaries necessary for secured Hadoop clusters
- This package contains a setuid program, 'task-controller', which is used for
- launching MapReduce tasks in a secured MapReduce cluster. This program allows
- the tasks to run as the Unix user who submitted the job, rather than the
- Unix user running the MapReduce daemons.
+Package: hadoop-hdfs
+Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, bigtop-utils, hadoop (= ${source:Version}), bigtop-jsvc
+Description: The Hadoop Distributed File System
+ Hadoop Distributed File System (HDFS) is the primary storage system used by 
+ Hadoop applications. HDFS creates multiple replicas of data blocks and distributes 
+ them on compute nodes throughout a cluster to enable reliable, extremely rapid 
+ computations.
+
+Package: hadoop-yarn
+Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, bigtop-utils, hadoop (= ${source:Version})
+Description: The Hadoop NextGen MapReduce (YARN)
+ YARN (Hadoop NextGen MapReduce) is a general purpose data-computation framework.
+ The fundamental idea of YARN is to split up the two major functionalities of the 
+ JobTracker, resource management and job scheduling/monitoring, into separate daemons:
+ ResourceManager and NodeManager.
+ .
+ The ResourceManager is the ultimate authority that arbitrates resources among all 
+ the applications in the system. The NodeManager is a per-node slave managing allocation
+ of computational resources on a single node. Both work in support of per-application 
+ ApplicationMaster (AM).
  .
- This package also contains 'jsvc', a daemon wrapper necessary to allow
- DataNodes to bind to a low (privileged) port and then drop root privileges
- before continuing operation.
+ An ApplicationMaster is, in effect, a framework specific library and is tasked with 
+ negotiating resources from the ResourceManager and working with the NodeManager(s) to 
+ execute and monitor the tasks. 
+
+Package: hadoop-mapreduce
+Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, bigtop-utils, hadoop-yarn (= ${source:Version})
+Description: The Hadoop MapReduce (MRv2)
+ Hadoop MapReduce is a programming model and software framework for writing applications 
+ that rapidly process vast amounts of data in parallel on large clusters of compute nodes.
 
-Package: hadoop-fuse
-Provides: hadoop-fuse
+Package: hadoop-hdfs-fuse
 Architecture: i386 amd64
-Depends: ${shlibs:Depends}, hadoop (= ${source:Version}), libfuse2, fuse-utils
+Depends: ${shlibs:Depends}, hadoop-hdfs (= ${source:Version}), hadoop-client (= ${source:Version}), libfuse2, fuse-utils
 Enhances: hadoop
 Description: HDFS exposed over a Filesystem in Userspace
  These projects (enumerated below) allow HDFS to be mounted (on most flavors 
@@ -91,74 +99,75 @@ Description: Documentation for Hadoop
  This package contains the Java Documentation for Hadoop and its relevant
  APIs.
 
-Package: hadoop-source
-Provides: hadoop-source
-Architecture: all
-Description: Source code for Hadoop
- This package contains the source code for Hadoop and its contrib modules.
-
 Package: hadoop-conf-pseudo
 Provides: hadoop-conf-pseudo
 Architecture: all
-Depends: hadoop (= ${source:Version}), hadoop-namenode (= ${source:Version}), hadoop-datanode (= ${source:Version}), hadoop-secondarynamenode (= ${source:Version}), hadoop-jobtracker (= ${source:Version}), hadoop-tasktracker (= ${source:Version})
+Depends: hadoop (= ${source:Version}), hadoop-hdfs-namenode (= ${source:Version}),
+         hadoop-hdfs-datanode (= ${source:Version}), hadoop-hdfs-secondarynamenode (= ${source:Version}),
+         hadoop-yarn-resourcemanager (= ${source:Version}), hadoop-yarn-nodemanager (= ${source:Version}),
+         hadoop-mapreduce-historyserver (= ${source:Version})
 Description: Pseudo-distributed Hadoop configuration
  Contains configuration files for a "pseudo-distributed" Hadoop deployment.
  In this mode, each of the hadoop components runs as a separate Java process,
  but all on the same machine.
 
-Package: hadoop-tasktracker
-Provides: hadoop-tasktracker
+Package: hadoop-mapreduce-historyserver
+Provides: hadoop-mapreduce-historyserver
 Architecture: all
-Depends: hadoop (= ${source:Version})
-Description: Task Tracker for Hadoop
- The Task Tracker is the Hadoop service that accepts MapReduce tasks and
- computes results. Each node in a Hadoop cluster that should be doing
- computation should run a Task Tracker.
-
-Package: hadoop-jobtracker
-Provides: hadoop-jobtracker
-Architecture: all
-Depends: hadoop (= ${source:Version})
-Description: Job Tracker for Hadoop
- The jobtracker is a central service which is responsible for managing
- the tasktracker services running on all nodes in a Hadoop Cluster.
- The jobtracker allocates work to the tasktracker nearest to the data
- with an available work slot.
+Depends: hadoop-mapreduce (= ${source:Version})
+Description: MapReduce History Server
+ The History server keeps records of the different activities being performed 
+ on a Apache Hadoop cluster.
 
-Package: hadoop-namenode
-Provides: hadoop-namenode
+Package: hadoop-yarn-nodemanager
+Provides: hadoop-yarn-nodemanager
 Architecture: all
-Depends: hadoop (= ${source:Version})
+Depends: hadoop-yarn (= ${source:Version})
+Description: Node manager for Hadoop
+ The NodeManager is the per-machine framework agent who is responsible for
+ containers, monitoring their resource usage (cpu, memory, disk, network) and
+ reporting the same to the ResourceManager/Scheduler.
+
+Package: hadoop-yarn-resourcemanager
+Provides: hadoop-yarn-resourcemanager
+Architecture: all
+Depends: hadoop-yarn (= ${source:Version})
+Description: Resource manager for Hadoop
+ The resource manager manages the global assignment of compute resources to applications.
+
+Package: hadoop-yarn-proxyserver
+Provides: hadoop-yarn-proxyserver
+Architecture: all
+Depends: hadoop-yarn (= ${source:Version})
+Description: Web proxy for YARN
+ The web proxy server sits in front of the YARN application master web UI.
+
+Package: hadoop-hdfs-namenode
+Provides: hadoop-hdfs-namenode
+Architecture: all
+Depends: hadoop-hdfs (= ${source:Version})
 Description: Name Node for Hadoop
  The Hadoop Distributed Filesystem (HDFS) requires one unique server, the
  namenode, which manages the block locations of files on the filesystem.
 
-Package: hadoop-secondarynamenode
-Provides: hadoop-secondarynamenode
+Package: hadoop-hdfs-secondarynamenode
+Provides: hadoop-hdfs-secondarynamenode
 Architecture: all
-Depends: hadoop (= ${source:Version})
+Depends: hadoop-hdfs (= ${source:Version})
 Description: Secondary Name Node for Hadoop
  The Secondary Name Node is responsible for checkpointing file system images.
  It is _not_ a failover pair for the namenode, and may safely be run on the
  same machine.
 
-Package: hadoop-datanode
-Provides: hadoop-datanode
+Package: hadoop-hdfs-datanode
+Provides: hadoop-hdfs-datanode
 Architecture: all
-Depends: hadoop (= ${source:Version})
+Depends: hadoop-hdfs (= ${source:Version})
 Description: Data Node for Hadoop
  The Data Nodes in the Hadoop Cluster are responsible for serving up
  blocks of data over the network to Hadoop Distributed Filesystem
  (HDFS) clients.
 
-Package: hadoop-pipes
-Provides: hadoop-pipes
-Architecture: any
-Depends: hadoop (= ${source:Version})
-Description: Interface to author Hadoop MapReduce jobs in C++
- Contains Hadoop Pipes, a library which allows Hadoop MapReduce jobs to be
- written in C++.
-
 Package: libhdfs0
 Architecture: any
 Depends: hadoop (= ${source:Version}), ${shlibs:Depends}
@@ -171,3 +180,19 @@ Section: libdevel
 Depends: hadoop (= ${source:Version}), libhdfs0 (= ${binary:Version})
 Description: Development support for libhdfs0
  Includes examples and header files for accessing HDFS from C
+
+Package: hadoop-httpfs
+Provides: hadoop-httpfs
+Architecture: all
+Depends: hadoop-hdfs (= ${source:Version}), bigtop-tomcat
+Description: HTTPFS for Hadoop
+  The server providing HTTP REST API support for the complete FileSystem/FileContext
+  interface in HDFS.
+
+Package: hadoop-client
+Provides: hadoop-client
+Architecture: all
+Depends: hadoop (= ${source:Version}), hadoop-hdfs (= ${source:Version}),
+         hadoop-yarn (= ${source:Version}), hadoop-mapreduce (= ${source:Version})
+Description: Hadoop client side dependencies
+ Installation of this package will provide you with all the dependencies for Hadoop clients.

Modified: incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/docs
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/docs?rev=1326670&r1=1326669&r2=1326670&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/docs (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/docs Mon Apr 16 16:10:22 2012
@@ -2,4 +2,3 @@ CHANGES.txt
 LICENSE.txt
 NOTICE.txt
 README.txt
-README.txt

Added: incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-client.install
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-client.install?rev=1326670&view=auto
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-client.install (added)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-client.install Mon Apr 16 16:10:22 2012
@@ -0,0 +1 @@
+/usr/lib/hadoop/client

Modified: incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-conf-pseudo.postinst
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-conf-pseudo.postinst?rev=1326670&r1=1326669&r2=1326670&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-conf-pseudo.postinst (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-conf-pseudo.postinst Mon Apr 16 16:10:22 2012
@@ -37,9 +37,6 @@ set -e
 case "$1" in
     configure)
         update-alternatives --install /etc/hadoop/conf hadoop-conf /etc/hadoop/conf.pseudo 30
-        if [ ! -e /etc/hadoop/conf ]; then 
-          ln -s /etc/hadoop/conf.pseudo /etc/hadoop/conf 
-        fi
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

Modified: incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-doc.install
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-doc.install?rev=1326670&r1=1326669&r2=1326670&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-doc.install (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-doc.install Mon Apr 16 16:10:22 2012
@@ -1,3 +1 @@
-#DOCS#
 /usr/share/doc/hadoop-doc
-

Added: incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-hdfs-fuse.dirs
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-hdfs-fuse.dirs?rev=1326670&view=auto
==============================================================================
    (empty)

Copied: incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-hdfs-fuse.install (from r1325587, incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-fuse.install)
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-hdfs-fuse.install?p2=incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-hdfs-fuse.install&p1=incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-fuse.install&r1=1325587&r2=1326670&rev=1326670&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-fuse.install (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-hdfs-fuse.install Mon Apr 16 16:10:22 2012
@@ -1,4 +1,4 @@
 /etc/default/hadoop-fuse
 /usr/bin/hadoop-fuse-dfs
 /usr/lib/hadoop/bin/fuse_dfs
-/usr/lib/hadoop/contrib/fuse-dfs
+/usr/lib/hadoop/bin/fuse_dfs_wrapper.sh

Copied: incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-hdfs-fuse.lintian-overrides (from r1325587, incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-fuse.lintian-overrides)
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-hdfs-fuse.lintian-overrides?p2=incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-hdfs-fuse.lintian-overrides&p1=incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-fuse.lintian-overrides&r1=1325587&r2=1326670&rev=1326670&view=diff
==============================================================================
    (empty)

Copied: incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-hdfs-fuse.manpages (from r1325587, incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-fuse.manpages)
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-hdfs-fuse.manpages?p2=incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-hdfs-fuse.manpages&p1=incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-fuse.manpages&r1=1325587&r2=1326670&rev=1326670&view=diff
==============================================================================
    (empty)

Added: incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-hdfs.dirs
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-hdfs.dirs?rev=1326670&view=auto
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-hdfs.dirs (added)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-hdfs.dirs Mon Apr 16 16:10:22 2012
@@ -0,0 +1,7 @@
+/etc/hadoop/conf.empty/
+/usr/lib/hadoop/libexec
+/usr/lib/hadoop-hdfs
+/usr/bin
+/var/lib/hadoop-hdfs/cache
+/var/log/hadoop-hdfs
+/var/run/hadoop-hdfs

Added: incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-hdfs.install
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-hdfs.install?rev=1326670&view=auto
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-hdfs.install (added)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-hdfs.install Mon Apr 16 16:10:22 2012
@@ -0,0 +1,8 @@
+/etc/security/limits.d/hdfs.conf
+/etc/hadoop/conf.empty/hdfs-site.xml
+/usr/lib/hadoop-hdfs
+/usr/lib/hadoop/libexec/hdfs-config.sh
+/usr/bin/hdfs
+/var/lib/hadoop-hdfs
+/var/log/hadoop-hdfs
+/var/run/hadoop-hdfs

Copied: incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-hdfs.postinst (from r1325587, incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-sbin.postinst)
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-hdfs.postinst?p2=incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-hdfs.postinst&p1=incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-sbin.postinst&r1=1325587&r2=1326670&rev=1326670&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-sbin.postinst (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-hdfs.postinst Mon Apr 16 16:10:22 2012
@@ -21,8 +21,11 @@ set -e
 
 case "$1" in
     configure)
-        find /usr/lib/hadoop -name task-controller -exec chown root:mapred {} \;
-        find /usr/lib/hadoop -name task-controller -exec chmod 4750 {} \;
+	mkdir -p /var/log/hadoop-hdfs /var/run/hadoop-hdfs || :
+	chgrp -R hadoop /var/log/hadoop-hdfs /var/run/hadoop-hdfs
+	chmod g+w /var/run/hadoop-hdfs /var/log/hadoop-hdfs
+	chown hdfs:hadoop /var/lib/hadoop-hdfs/ /var/lib/hadoop-hdfs/cache
+	chmod 1777 /var/lib/hadoop-hdfs/cache
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

Copied: incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-hdfs.preinst (from r1325587, incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop.preinst)
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-hdfs.preinst?p2=incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-hdfs.preinst&p1=incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop.preinst&r1=1325587&r2=1326670&rev=1326670&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop.preinst (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-hdfs.preinst Mon Apr 16 16:10:22 2012
@@ -32,28 +32,17 @@ set -e
 
 case "$1" in
     install|upgrade)
-        addgroup --system hadoop >/dev/null 2>/dev/null || :
         if ! getent passwd hdfs >/dev/null; then
             # Adding system user: hdfs.
             adduser \
                 --system \
                 --group \
-                --home /usr/lib/hadoop \
+                --home /var/lib/hdfs \
                 --gecos "Hadoop HDFS" \
                 --shell /bin/bash \
                 hdfs >/dev/null 2>/dev/null || :
             usermod --append --groups hadoop hdfs || :
         fi
-        if ! getent passwd mapred >/dev/null; then
-            adduser \
-                --system \
-                --group \
-                --home /usr/lib/hadoop \
-                --gecos "Hadoop MapReduce" \
-                --shell /bin/bash \
-                mapred >/dev/null 2>/dev/null || :
-            usermod --append --groups hadoop mapred || :
-        fi
     ;;
 
     abort-upgrade)

Added: incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-httpfs.dirs
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-httpfs.dirs?rev=1326670&view=auto
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-httpfs.dirs (added)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-httpfs.dirs Mon Apr 16 16:10:22 2012
@@ -0,0 +1,4 @@
+/etc/hadoop-httpfs
+/usr/lib/hadoop-httpfs
+/var/log/hadoop-httpfs
+/var/run/hadoop-httpfs

Added: incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-httpfs.install
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-httpfs.install?rev=1326670&view=auto
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-httpfs.install (added)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-httpfs.install Mon Apr 16 16:10:22 2012
@@ -0,0 +1,4 @@
+/etc/default/hadoop-httpfs
+/etc/hadoop-httpfs
+/usr/lib/hadoop/libexec/httpfs-config.sh
+/usr/lib/hadoop-httpfs

Copied: incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-httpfs.postinst (from r1325587, incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-sbin.postinst)
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-httpfs.postinst?p2=incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-httpfs.postinst&p1=incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-sbin.postinst&r1=1325587&r2=1326670&rev=1326670&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-sbin.postinst (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-httpfs.postinst Mon Apr 16 16:10:22 2012
@@ -21,8 +21,8 @@ set -e
 
 case "$1" in
     configure)
-        find /usr/lib/hadoop -name task-controller -exec chown root:mapred {} \;
-        find /usr/lib/hadoop -name task-controller -exec chmod 4750 {} \;
+        chown httpfs:httpfs /var/run/hadoop-httpfs /var/log/hadoop-httpfs
+        update-alternatives --install /etc/hadoop-httpfs/conf hadoop-httpfs-conf /etc/hadoop-httpfs/conf.empty 10
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

Copied: incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-httpfs.preinst (from r1325587, incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop.preinst)
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-httpfs.preinst?p2=incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-httpfs.preinst&p1=incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop.preinst&r1=1325587&r2=1326670&rev=1326670&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop.preinst (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-httpfs.preinst Mon Apr 16 16:10:22 2012
@@ -15,7 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# preinst script for hadoop
+# preinst script for hadoop-httpfs
 #
 # see: dh_installdeb(1)
 
@@ -32,27 +32,14 @@ set -e
 
 case "$1" in
     install|upgrade)
-        addgroup --system hadoop >/dev/null 2>/dev/null || :
-        if ! getent passwd hdfs >/dev/null; then
-            # Adding system user: hdfs.
+        if ! getent passwd httpfs >/dev/null; then
             adduser \
                 --system \
                 --group \
-                --home /usr/lib/hadoop \
-                --gecos "Hadoop HDFS" \
+                --home /var/run/hadoop-httpfs \
+                --gecos "Hadoop HTTPFS" \
                 --shell /bin/bash \
-                hdfs >/dev/null 2>/dev/null || :
-            usermod --append --groups hadoop hdfs || :
-        fi
-        if ! getent passwd mapred >/dev/null; then
-            adduser \
-                --system \
-                --group \
-                --home /usr/lib/hadoop \
-                --gecos "Hadoop MapReduce" \
-                --shell /bin/bash \
-                mapred >/dev/null 2>/dev/null || :
-            usermod --append --groups hadoop mapred || :
+                httpfs >/dev/null 2>/dev/null || :
         fi
     ;;
 

Copied: incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-httpfs.prerm (from r1325587, incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-conf-pseudo.postinst)
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-httpfs.prerm?p2=incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-httpfs.prerm&p1=incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-conf-pseudo.postinst&r1=1325587&r2=1326670&rev=1326670&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-conf-pseudo.postinst (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-httpfs.prerm Mon Apr 16 16:10:22 2012
@@ -14,39 +14,35 @@
 # 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.
-#
-# postinst script for hadoop
+
+# prerm script for hadoop-httpfs
 #
 # see: dh_installdeb(1)
 
 set -e
 
 # summary of how this script can be called:
-#        * <postinst> `configure' <most-recently-configured-version>
-#        * <old-postinst> `abort-upgrade' <new version>
-#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-#          <new-version>
-#        * <postinst> `abort-remove'
-#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-#          <failed-install-package> <version> `removing'
+#        * <prerm> `remove'
+#        * <old-prerm> `upgrade' <new-version>
+#        * <new-prerm> `failed-upgrade' <old-version>
+#        * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
+#        * <deconfigured's-prerm> `deconfigure' `in-favour'
+#          <package-being-installed> <version> `removing'
 #          <conflicting-package> <version>
 # for details, see http://www.debian.org/doc/debian-policy/ or
 # the debian-policy package
 
 
 case "$1" in
-    configure)
-        update-alternatives --install /etc/hadoop/conf hadoop-conf /etc/hadoop/conf.pseudo 30
-        if [ ! -e /etc/hadoop/conf ]; then 
-          ln -s /etc/hadoop/conf.pseudo /etc/hadoop/conf 
-        fi
+    remove|upgrade|deconfigure)
+      update-alternatives --remove hadoop-httpfs-conf /etc/hadoop-httpfs/conf.empty || :
     ;;
 
-    abort-upgrade|abort-remove|abort-deconfigure)
+    failed-upgrade)
     ;;
 
     *)
-        echo "postinst called with unknown argument \`$1'" >&2
+        echo "prerm called with unknown argument \`$1'" >&2
         exit 1
     ;;
 esac

Added: incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-mapreduce.dirs
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-mapreduce.dirs?rev=1326670&view=auto
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-mapreduce.dirs (added)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-mapreduce.dirs Mon Apr 16 16:10:22 2012
@@ -0,0 +1,7 @@
+/etc/hadoop/conf.empty/
+/usr/lib/hadoop/libexec
+/usr/lib/hadoop-mapreduce
+/usr/bin
+/var/lib/hadoop-mapreduce/cache
+/var/log/hadoop-mapreduce
+/var/run/hadoop-mapreduce

Added: incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-mapreduce.install
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-mapreduce.install?rev=1326670&view=auto
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-mapreduce.install (added)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-mapreduce.install Mon Apr 16 16:10:22 2012
@@ -0,0 +1,7 @@
+/etc/security/limits.d/mapreduce.conf
+/usr/lib/hadoop-mapreduce
+/usr/lib/hadoop/libexec/mapred-config.sh
+/usr/bin/mapred
+/var/lib/hadoop-mapreduce
+/var/log/hadoop-mapreduce
+/var/run/hadoop-mapreduce

Copied: incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-mapreduce.postinst (from r1325587, incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-sbin.postinst)
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-mapreduce.postinst?p2=incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-mapreduce.postinst&p1=incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-sbin.postinst&r1=1325587&r2=1326670&rev=1326670&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-sbin.postinst (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-mapreduce.postinst Mon Apr 16 16:10:22 2012
@@ -21,8 +21,11 @@ set -e
 
 case "$1" in
     configure)
-        find /usr/lib/hadoop -name task-controller -exec chown root:mapred {} \;
-        find /usr/lib/hadoop -name task-controller -exec chmod 4750 {} \;
+	mkdir -p /var/log/hadoop-mapreduce /var/run/hadoop-mapreduce || :
+	chgrp -R hadoop /var/log/hadoop-mapreduce /var/run/hadoop-mapreduce
+	chmod g+w /var/run/hadoop-mapreduce /var/log/hadoop-mapreduce
+	chown mapred:hadoop /var/lib/hadoop-mapreduce /var/lib/hadoop-mapreduce/cache
+	chmod 1777 /var/lib/hadoop-mapreduce/cache
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

Copied: incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-mapreduce.preinst (from r1325587, incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop.preinst)
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-mapreduce.preinst?p2=incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-mapreduce.preinst&p1=incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop.preinst&r1=1325587&r2=1326670&rev=1326670&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop.preinst (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-mapreduce.preinst Mon Apr 16 16:10:22 2012
@@ -32,23 +32,11 @@ set -e
 
 case "$1" in
     install|upgrade)
-        addgroup --system hadoop >/dev/null 2>/dev/null || :
-        if ! getent passwd hdfs >/dev/null; then
-            # Adding system user: hdfs.
-            adduser \
-                --system \
-                --group \
-                --home /usr/lib/hadoop \
-                --gecos "Hadoop HDFS" \
-                --shell /bin/bash \
-                hdfs >/dev/null 2>/dev/null || :
-            usermod --append --groups hadoop hdfs || :
-        fi
         if ! getent passwd mapred >/dev/null; then
             adduser \
                 --system \
                 --group \
-                --home /usr/lib/hadoop \
+                --home /var/lib/hadoop-mapreduce \
                 --gecos "Hadoop MapReduce" \
                 --shell /bin/bash \
                 mapred >/dev/null 2>/dev/null || :

Added: incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-yarn.dirs
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-yarn.dirs?rev=1326670&view=auto
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-yarn.dirs (added)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-yarn.dirs Mon Apr 16 16:10:22 2012
@@ -0,0 +1,7 @@
+/etc/hadoop/conf.empty/
+/usr/lib/hadoop/libexec
+/usr/lib/hadoop-yarn
+/usr/bin
+/var/lib/hadoop-yarn/cache
+/var/log/hadoop-yarn
+/var/run/hadoop-yarn

Added: incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-yarn.install
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-yarn.install?rev=1326670&view=auto
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-yarn.install (added)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-yarn.install Mon Apr 16 16:10:22 2012
@@ -0,0 +1,9 @@
+/etc/security/limits.d/yarn.conf
+/etc/hadoop/conf.empty/yarn-env.sh
+/etc/hadoop/conf.empty/yarn-site.xml
+/usr/lib/hadoop-yarn
+/usr/lib/hadoop/libexec/yarn-config.sh
+/usr/bin/yarn
+/var/lib/hadoop-yarn
+/var/log/hadoop-yarn
+/var/run/hadoop-yarn

Copied: incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-yarn.postinst (from r1325587, incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-sbin.postinst)
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-yarn.postinst?p2=incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-yarn.postinst&p1=incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-sbin.postinst&r1=1325587&r2=1326670&rev=1326670&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-sbin.postinst (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-yarn.postinst Mon Apr 16 16:10:22 2012
@@ -21,8 +21,13 @@ set -e
 
 case "$1" in
     configure)
-        find /usr/lib/hadoop -name task-controller -exec chown root:mapred {} \;
-        find /usr/lib/hadoop -name task-controller -exec chmod 4750 {} \;
+	chown root:yarn /usr/lib/hadoop-yarn/bin/container-executor
+	chmod 6050 /usr/lib/hadoop-yarn/bin/container-executor
+	mkdir -p /var/log/hadoop-yarn /var/run/hadoop-yarn /var/lib/hadoop-yarn/cache || :
+	chgrp -R hadoop /var/log/hadoop-yarn /var/run/hadoop-yarn
+	chmod g+w /var/log/hadoop-yarn /var/run/hadoop-yarn
+	chown yarn:hadoop /var/lib/hadoop-yarn/ /var/lib/hadoop-yarn/cache
+	chmod 1777 /var/lib/hadoop-yarn/cache
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

Copied: incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-yarn.preinst (from r1325587, incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop.preinst)
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-yarn.preinst?p2=incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-yarn.preinst&p1=incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop.preinst&r1=1325587&r2=1326670&rev=1326670&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop.preinst (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-yarn.preinst Mon Apr 16 16:10:22 2012
@@ -32,27 +32,16 @@ set -e
 
 case "$1" in
     install|upgrade)
-        addgroup --system hadoop >/dev/null 2>/dev/null || :
-        if ! getent passwd hdfs >/dev/null; then
-            # Adding system user: hdfs.
+        if ! getent passwd yarn >/dev/null; then
+            # Adding system user: yarn.
             adduser \
                 --system \
                 --group \
-                --home /usr/lib/hadoop \
-                --gecos "Hadoop HDFS" \
+                --home /var/lib/yarn \
+                --gecos "Hadoop YARN" \
                 --shell /bin/bash \
-                hdfs >/dev/null 2>/dev/null || :
-            usermod --append --groups hadoop hdfs || :
-        fi
-        if ! getent passwd mapred >/dev/null; then
-            adduser \
-                --system \
-                --group \
-                --home /usr/lib/hadoop \
-                --gecos "Hadoop MapReduce" \
-                --shell /bin/bash \
-                mapred >/dev/null 2>/dev/null || :
-            usermod --append --groups hadoop mapred || :
+                yarn >/dev/null 2>/dev/null || :
+            usermod --append --groups hadoop yarn || :
         fi
     ;;
 

Modified: incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop.dirs
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop.dirs?rev=1326670&r1=1326669&r2=1326670&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop.dirs (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop.dirs Mon Apr 16 16:10:22 2012
@@ -1,7 +1,4 @@
+/etc/hadoop/conf.empty/
 /usr/lib/hadoop
-/var/log/hadoop
 /usr/bin
-/var/run/hadoop
-/var/lib/hadoop
-/var/lib/hadoop/cache/hadoop
 /usr/share/doc/hadoop

Modified: incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop.install
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop.install?rev=1326670&r1=1326669&r2=1326670&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop.install (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop.install Mon Apr 16 16:10:22 2012
@@ -1,7 +1,17 @@
-/usr/bin
-/usr/lib/hadoop
-/etc/hadoop/conf.empty
+/etc/hadoop/conf.empty/hadoop-metrics.properties
+/etc/hadoop/conf.empty/hadoop-metrics2.properties
+/etc/hadoop/conf.empty/log4j.properties
+/etc/hadoop/conf.empty/slaves
+/etc/hadoop/conf.empty/ssl-client.xml.example
+/etc/hadoop/conf.empty/ssl-server.xml.example
+/etc/hadoop/conf.empty/core-site.xml
 /etc/default/hadoop
-/etc/security/limits.d/hdfs.conf
-/etc/security/limits.d/mapred.conf
-/usr/share/doc/hadoop
+/usr/lib/hadoop/etc
+/usr/lib/hadoop/libexec/hadoop-config.sh
+/usr/lib/hadoop/libexec/hadoop-layout.sh
+/usr/lib/hadoop/*.jar
+/usr/lib/hadoop/lib
+/usr/lib/hadoop/sbin
+/usr/lib/hadoop/bin
+/usr/bin/hadoop
+/usr/share/man/man1/hadoop.1.*

Modified: incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop.postinst
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop.postinst?rev=1326670&r1=1326669&r2=1326670&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop.postinst (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop.postinst Mon Apr 16 16:10:22 2012
@@ -23,21 +23,8 @@ case "$1" in
     configure)
 	# We used to chown /usr/lib/hadoop here, but with security we don't want to do that -
 	# things like task-controller are very particular about ownership
-        chown -R root:hadoop /etc/hadoop
-	chgrp -R hadoop /var/log/hadoop /var/run/hadoop
-	chmod g+w /var/run/hadoop /var/log/hadoop 
-
-	# Change the ownership of old logs so that we don't fail rotation on next startup
-	find /var/log/hadoop/ | egrep 'jobtracker|tasktracker|userlogs|history' | xargs --no-run-if-empty chown mapred
-	find /var/log/hadoop/ | egrep 'namenode|datanode' | xargs --no-run-if-empty chown hdfs
-
-        # We don't want to do this recursively since we may be reinstalling, in which case
-        # users have their own cache/<username> directories which shouldn't be stolen
-        chown root:hadoop /var/lib/hadoop/ /var/lib/hadoop/cache/ /var/lib/hadoop/cache/hadoop/
-        # Ensure group write on this directory or we can't start/format namenode or datanode
-        chmod 775 /var/lib/hadoop/cache/hadoop
-        chmod 1777 /var/lib/hadoop/cache/
-        update-alternatives --install /etc/hadoop/conf hadoop-conf /etc/hadoop/conf.empty 10
+	chown -R root:hadoop /etc/hadoop
+	update-alternatives --install /etc/hadoop/conf hadoop-conf /etc/hadoop/conf.empty 10
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

Modified: incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop.preinst
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop.preinst?rev=1326670&r1=1326669&r2=1326670&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop.preinst (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop.preinst Mon Apr 16 16:10:22 2012
@@ -33,27 +33,6 @@ set -e
 case "$1" in
     install|upgrade)
         addgroup --system hadoop >/dev/null 2>/dev/null || :
-        if ! getent passwd hdfs >/dev/null; then
-            # Adding system user: hdfs.
-            adduser \
-                --system \
-                --group \
-                --home /usr/lib/hadoop \
-                --gecos "Hadoop HDFS" \
-                --shell /bin/bash \
-                hdfs >/dev/null 2>/dev/null || :
-            usermod --append --groups hadoop hdfs || :
-        fi
-        if ! getent passwd mapred >/dev/null; then
-            adduser \
-                --system \
-                --group \
-                --home /usr/lib/hadoop \
-                --gecos "Hadoop MapReduce" \
-                --shell /bin/bash \
-                mapred >/dev/null 2>/dev/null || :
-            usermod --append --groups hadoop mapred || :
-        fi
     ;;
 
     abort-upgrade)

Added: incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/libhdfs0-dev.install
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/libhdfs0-dev.install?rev=1326670&view=auto
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/libhdfs0-dev.install (added)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/libhdfs0-dev.install Mon Apr 16 16:10:22 2012
@@ -0,0 +1,4 @@
+#/usr/include/hdfs*
+#/usr/lib/libhdfs.la
+#/usr/lib/libhdfs.so
+#/usr/share/doc/libhdfs-devel

Modified: incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/rules
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/rules?rev=1326670&r1=1326669&r2=1326670&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/rules (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/rules Mon Apr 16 16:10:22 2012
@@ -24,8 +24,7 @@
 export DH_OPTIONS
 
 
-hadoop_version=${HADOOP_VERSION}
-hadoop_build_path=$(shell pwd)/build/hadoop-${hadoop_version}
+hadoop_version=${HADOOP_BASE_VERSION}
 
 ifeq (${DEB_BUILD_ARCH},amd64)
   native_dir=Linux-amd64-64
@@ -34,10 +33,13 @@ ifeq (${DEB_BUILD_ARCH},i386)
   native_dir=Linux-i386-32
 endif
 
+patch: patch-stamp
+patch-stamp:	
+	touch $@
 
 #Architecture
 build: build-stamp
-build-stamp:
+build-stamp: patch-stamp
 	dh_testdir
 	env HADOOP_VERSION=${hadoop_version} HADOOP_ARCH=${native_dir} \
 		bash debian/do-component-build -Divy.home=${HOME}/.ivy2
@@ -47,7 +49,6 @@ clean:  
 	dh_testdir
 	dh_testroot
 	rm -f build-arch-stamp build-indep-stamp build-stamp
-	ant clean
 
 	dh_clean
 
@@ -58,56 +59,56 @@ install: build
 	dh_installdirs
 
 	bash debian/install_hadoop.sh \
+	  --prefix=debian/tmp/ \
 	  --distro-dir=debian \
-	  --build-dir=${hadoop_build_path} \
-	  --src-dir=debian/tmp/usr/src/hadoop \
-	  --lib-dir=debian/tmp/usr/lib/hadoop \
-	  --etc-dir=debian/tmp/etc/hadoop \
-	  --prefix=debian/tmp \
+	  --build-dir=${PWD}/build \
+	  --httpfs-dir=debian/tmp/usr/lib/hadoop-httpfs \
+	  --httpfs-etc-dir=debian/tmp/etc/hadoop-httpfs \
+	  --system-lib-dir=debian/tmp/usr/lib/ \
+	  --system-libexec-dir=debian/tmp/usr/lib/hadoop/libexec/ \
+	  --system-include-dir=debian/tmp/usr/include \
 	  --doc-dir=debian/tmp/usr/share/doc/hadoop-doc \
+          --man-dir=debian/tmp/usr/share/man \
 	  --example-dir=debian/tmp/usr/share/doc/hadoop/examples \
 	  --native-build-string=${native_dir} \
 	  --installed-lib-dir=/usr/lib/hadoop
 
+	# Forcing Zookeeper dependency to be on the packaged jar
+	ln -sf /usr/lib/zookeeper/zookeeper.jar debian/tmp/usr/lib/hadoop/lib/zookeeper*.jar
+
 # Run dh_lintian if we've got it - this doesn't exist on debhelper 6 (eg Ubuntu Hardy)
 	(dh_lintian) || /bin/true
 
-
-namenode_user=hdfs
-secondarynamenode_user=hdfs
-datanode_user=hdfs
-jobtracker_user=mapred
-tasktracker_user=mapred
-
-namenode secondarynamenode jobtracker tasktracker datanode: debian/service-init.d.tpl
-	sed -e "s|@HADOOP_DAEMON@|$@|" \
-            -e "s|@HADOOP_MAJOR_VERSION@|$hadoop_version|" \
-	    -e "s|@DAEMON_USER@|$($@_user)|" $< > debian/hadoop-$@.init
+hadoop_svcs=hdfs-namenode hdfs-secondarynamenode hdfs-datanode \
+            yarn-resourcemanager yarn-nodemanager yarn-proxyserver \
+            mapreduce-historyserver httpfs
+
+$(hadoop_svcs): debian/init.d.tmpl
+	bash $< debian/hadoop-$@.svc > debian/hadoop-$@.init
+	cp debian/$(firstword $(subst -, ,$@)).default debian/tmp/etc/default/hadoop-$@
+	echo /etc/default/hadoop-$@ >> debian/hadoop-$@.install
 	# FIXME: workaround for BIGTOP-105
-	sed -e "s|@HADOOP_DAEMON@|$@|" < debian/hadoop.daemon.postinst.tpl > debian/hadoop-$@.postinst
+	[ -f debian/hadoop-$@.postinst ] || cp debian/hadoop.daemon.postinst.tpl debian/hadoop-$@.postinst
+	sed -i -e "s|@HADOOP_DAEMON@|$@|" debian/hadoop-$@.postinst
 
-install-indep: namenode secondarynamenode jobtracker tasktracker datanode
+install-indep: $(hadoop_svcs) 
 	mkdir -p debian/tmp/etc/default
 	cp debian/hadoop.default debian/tmp/etc/default/hadoop
+	# FIXME: BIGTOP-463
+	echo 'export JSVC_HOME=/usr/lib/bigtop-utils' >> debian/tmp/etc/default/hadoop
 
 	dh_install --sourcedir=debian/tmp -i
 
-	rm -Rf debian/hadoop/usr/lib/hadoop/lib/native
-	rm -Rf debian/hadoop/usr/lib/hadoop/sbin
-
 	rm -Rf debian/hadoop/usr/lib/hadoop/bin/fuse_dfs 
-	rm -Rf debian/hadoop/usr/bin/hadoop-fuse-dfs
+#	rm -Rf debian/hadoop/usr/bin/hadoop-fuse-dfs
 	rm -Rf debian/hadoop/usr/lib/hadoop/contrib/fuse-dfs
-
-	# FIXME: The following is a workaround for BIGTOP-139
-	rm -Rf debian/hadoop/usr/lib/hadoop/libexec/jsvc*
-	rm -Rf debian/hadoop/usr/lib/hadoop/bin/task-controller
+	rm -Rf debian/hadoop/usr/lib/hadoop/hdfs/contrib/fuse-dfs
 
 install-arch:
 	mkdir -p debian/tmp/etc/default
 	cp debian/hadoop-fuse.default debian/tmp/etc/default/hadoop-fuse
 	mkdir -p debian/tmp/etc/security/limits.d
-	cp debian/hdfs.conf debian/mapred.conf debian/tmp/etc/security/limits.d
+	cp debian/hdfs.conf debian/yarn.conf debian/mapreduce.conf debian/tmp/etc/security/limits.d
 	dh_install --sourcedir=debian/tmp -s
 
 # Must not depend on anything. This is to be called by
@@ -116,9 +117,9 @@ install-arch:
 binary-common:  
 	dh_testdir
 	dh_testroot
-	dh_installchangelogs CHANGES.txt -phadoop
-	dh_installdocs
-	sh debian/append_licenses.sh
+	#dh_installchangelogs CHANGES.txt -phadoop
+#	dh_installdocs   ## PL this line and the above/below are only temp
+#	#sh debian/append_licenses.sh
 #	dh_installexamples
 #	dh_installmenu
 #	dh_installdebconf

Modified: incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/control
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/control?rev=1326670&r1=1326669&r2=1326670&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/control (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/control Mon Apr 16 16:10:22 2012
@@ -22,7 +22,7 @@ Homepage: http://hbase.apache.org/
 
 Package: hbase
 Architecture: all
-Depends: adduser, zookeeper (>= 3.3.1), hadoop, bigtop-utils
+Depends: adduser, zookeeper (>= 3.3.1), hadoop-hdfs, bigtop-utils
 Recommends: ntp
 Description: HBase is the Hadoop database
  Use it when you need random, realtime read/write access to your Big Data. 

Modified: incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/rules
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/rules?rev=1326670&r1=1326669&r2=1326670&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/rules (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/rules Mon Apr 16 16:10:22 2012
@@ -16,6 +16,7 @@
 # limitations under the License.
 # 
 # -*- makefile -*-
+SHELL=/bin/bash
 
 # Uncomment this to turn on verbose mode.
 export DH_VERBOSE=1
@@ -26,10 +27,11 @@ 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
+hbase_jar_deps_hadoop=hadoop-annotations,hadoop-auth,hadoop-common,hadoop-hdfs,hadoop-mapreduce-client-common,hadoop-mapreduce-client-core,hadoop-yarn-api,hadoop-yarn-common
 
 patch: patch-stamp
 patch-stamp:	
+	patch -p0 < debian/HBASE-5212.patch
 	touch $@
 
 clean:	
@@ -39,7 +41,7 @@ clean:	
 	dh_clean
 	find debian -name .\*swp -exec rm -f {} \;
 
-build:
+build: patch
 	dh_testdir
 	bash debian/do-component-build -Dmaven.repo.local=${HOME}/.m2/repository  
 
@@ -59,9 +61,8 @@ install: build
 	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 -f debian/tmp/usr/lib/hadoop-*
-	rm -f debian/tmp/usr/lib/zookeeper-*
-	ln -f -s ${hbase_jar_deps} debian/tmp/usr/lib/${hbase_pkg_name}/lib/
+	rm -f debian/tmp/usr/lib/${hbase_pkg_name}/lib/{${hbase_jar_deps_hadoop},zookeeper}*.jar
+	ln -f -s ${hadoop_home}/{${hbase_jar_deps_hadoop}}.jar ${zookeeper_home}/zookeeper.jar 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
 

Modified: incubator/bigtop/trunk/bigtop-packages/src/deb/hive/control
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/hive/control?rev=1326670&r1=1326669&r2=1326670&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/hive/control (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/hive/control Mon Apr 16 16:10:22 2012
@@ -23,7 +23,7 @@ Homepage: http://hive.apache.org/
 
 Package: hive
 Architecture: all
-Depends: adduser, hadoop, bigtop-utils
+Depends: adduser, hadoop-client, bigtop-utils
 Description: A data warehouse infrastructure built on top of Hadoop
  Hive is a data warehouse infrastructure built on top of Hadoop that
  provides tools to enable easy data summarization, adhoc querying and

Modified: incubator/bigtop/trunk/bigtop-packages/src/deb/hive/hive.postinst
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/hive/hive.postinst?rev=1326670&r1=1326669&r2=1326670&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/hive/hive.postinst (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/hive/hive.postinst Mon Apr 16 16:10:22 2012
@@ -35,7 +35,7 @@ case "$1" in
 
         # Ensure sticky bit on metastore dir - debian likes this to be done in postinst rather than the package
         chmod 1777 /var/lib/hive/metastore
-
+	chown hive:hive -R /var/lib/hive
         if [ "$2" ]; then
           old_metastore="/var/lib/hive/metastore/\${user.name}_db"
           new_metastore="/var/lib/hive/metastore/metastore_db"

Modified: incubator/bigtop/trunk/bigtop-packages/src/deb/hive/rules
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/hive/rules?rev=1326670&r1=1326669&r2=1326670&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/hive/rules (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/hive/rules Mon Apr 16 16:10:22 2012
@@ -28,7 +28,6 @@ hive_pkg_name=hive
 clean:	
 	dh_testdir
 	dh_testroot
-	ant -f src/build.xml clean
 	rm -f *-stamp
 	rm -Rf debian/.ivy
 	dh_clean
@@ -36,7 +35,7 @@ clean:	
 build-indep: build-indep-stamp
 build-indep-stamp:
 	mkdir -p /tmp/debian-hive/.ivy
-	bash debian/do-component-build -Divy.home=${HOME}/.ivy2
+	bash debian/do-component-build  -Divy.home=${HOME}/.ivy2
 	touch $@
 
 server metastore: debian/service-init.d.tpl

Modified: incubator/bigtop/trunk/bigtop-packages/src/deb/mahout/control
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/mahout/control?rev=1326670&r1=1326669&r2=1326670&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/mahout/control (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/mahout/control Mon Apr 16 16:10:22 2012
@@ -23,7 +23,7 @@ Homepage: http://mahout.apache.org
 
 Package:  mahout
 Architecture: all
-Depends: hadoop, bigtop-utils
+Depends: hadoop-client, bigtop-utils
 Description: A set of Java libraries for scalable machine learning.
  Mahout's goal is to build scalable machine learning libraries. 
  With scalable we mean:

Modified: incubator/bigtop/trunk/bigtop-packages/src/deb/mahout/rules
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/mahout/rules?rev=1326670&r1=1326669&r2=1326670&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/mahout/rules (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/mahout/rules Mon Apr 16 16:10:22 2012
@@ -25,6 +25,7 @@ export DH_OPTIONS
 
 patch: patch-stamp
 patch-stamp:	
+	patch -p0 < debian/MAHOUT-822.patch
 	touch $@
 
 clean:	
@@ -39,9 +40,6 @@ build-indep: build-indep-stamp
 build-indep-stamp: patch-stamp
 	# we'll just use the build from the tarball.
 	bash debian/do-component-build -Dmaven.repo.local=${HOME}/.m2/repository
-	mkdir -p debian/tmp
-	(cd distribution/target/mahout-distribution-${MAHOUT_BASE_VERSION}/mahout-distribution-${MAHOUT_BASE_VERSION} && tar cf - --exclude=debian/\* .) | (cd debian/tmp && tar xf -)
-#	(cd debian/tmp && tar xvzf ../../distribution/target/mahout-distribution-${MAHOUT_BASE_VERSION}.tar.gz)
 	touch $@
 
 install: install-indep
@@ -49,7 +47,7 @@ install-indep:	
 	dh_testdir
 	dh_testroot
 	sh -x debian/install_mahout.sh \
-	  --build-dir=debian/tmp \
+	  --build-dir=build \
           --doc-dir=/usr/share/doc/mahout \
 	  --prefix=debian/mahout
 	rm debian/mahout/usr/lib/mahout/lib/hadoop-*.jar

Modified: incubator/bigtop/trunk/bigtop-packages/src/deb/oozie/control
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/oozie/control?rev=1326670&r1=1326669&r2=1326670&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/oozie/control (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/oozie/control Mon Apr 16 16:10:22 2012
@@ -32,7 +32,7 @@ Description: Command line utility that a
 
 Package: oozie
 Architecture: all
-Depends: oozie-client (= ${source:Version}), hadoop, zip, unzip
+Depends: oozie-client (= ${source:Version}), hadoop-client, bigtop-tomcat
 Description: A workflow and coordinator sytem for Hadoop jobs.
  Oozie workflows are actions arranged in a control dependency DAG (Direct
  Acyclic Graph).

Modified: incubator/bigtop/trunk/bigtop-packages/src/deb/oozie/rules
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/oozie/rules?rev=1326670&r1=1326669&r2=1326670&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/oozie/rules (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/oozie/rules Mon Apr 16 16:10:22 2012
@@ -25,6 +25,7 @@ export DH_OPTIONS
 
 patch: patch-stamp
 patch-stamp:	
+	patch -p0 < debian/patch
 	touch $@
 
 clean:	
@@ -51,8 +52,11 @@ install: install-indep
 install-indep:
 	dh_testdir
 	dh_testroot
-	sh -x debian/install_oozie.sh --extra-dir=debian/ --build-dir=. --server-dir=./debian/oozie --client-dir=./debian/oozie-client --docs-dir=./debian/oozie-client/usr/share/doc/oozie --initd-dir=./debian/oozie/etc/init.d --conf-dir=./debian/oozie/etc/oozie/conf.dist
+	sh -x debian/install_oozie.sh --extra-dir=debian/ --build-dir=. --server-dir=./debian/oozie --client-dir=./debian/oozie-client --docs-dir=./debian/oozie-client/usr/share/doc/oozie --initd-dir=./debian/oozie/etc/init.d --conf-dir=./debian/oozie-client/etc/oozie/conf.dist
 	dh_install -i
+	ln -s -f /var/lib/oozie/ext-2.2 debian/oozie/usr/lib/oozie/webapps/oozie/ext-2.2
+	rm -rf                        debian/oozie/usr/lib/oozie/webapps/oozie/docs
+	ln -s -f /usr/share/doc/oozie debian/oozie/usr/lib/oozie/webapps/oozie/docs
 
 binary-common:
 	dh_testdir

Modified: incubator/bigtop/trunk/bigtop-packages/src/deb/pig/control
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/pig/control?rev=1326670&r1=1326669&r2=1326670&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/pig/control (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/pig/control Mon Apr 16 16:10:22 2012
@@ -23,7 +23,7 @@ Homepage: http://pig.apache.org/
 
 Package: pig
 Architecture: all
-Depends: hadoop, bigtop-utils
+Depends: hadoop-client, bigtop-utils
 Description: A platform for analyzing large data sets using Hadoop
  Pig is a platform for analyzing large data sets that consists of a high-level language
  for expressing data analysis programs, coupled with infrastructure for evaluating these

Modified: incubator/bigtop/trunk/bigtop-packages/src/deb/sqoop/control
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/sqoop/control?rev=1326670&r1=1326669&r2=1326670&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/sqoop/control (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/sqoop/control Mon Apr 16 16:10:22 2012
@@ -22,7 +22,7 @@ Homepage: http://incubator.apache.org/sq
 
 Package:  sqoop
 Architecture: all
-Depends: hadoop, bigtop-utils
+Depends: hadoop-client, bigtop-utils
 Description: Tool for easy imports and exports of data sets between databases and HDFS
  Sqoop is a tool that provides the ability to import and export data sets between
  the Hadoop Distributed File System (HDFS) and relational databases.

Added: incubator/bigtop/trunk/bigtop-packages/src/rpm/bigtop-jsvc/.gitignore
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/bigtop-jsvc/.gitignore?rev=1326670&view=auto
==============================================================================
    (empty)

Added: incubator/bigtop/trunk/bigtop-packages/src/rpm/bigtop-jsvc/RPMS/.gitignore
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/bigtop-jsvc/RPMS/.gitignore?rev=1326670&view=auto
==============================================================================
    (empty)

Added: incubator/bigtop/trunk/bigtop-packages/src/rpm/bigtop-jsvc/SPECS/.gitignore
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/bigtop-jsvc/SPECS/.gitignore?rev=1326670&view=auto
==============================================================================
    (empty)

Added: incubator/bigtop/trunk/bigtop-packages/src/rpm/bigtop-jsvc/SPECS/bigtop-jsvc.spec
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/bigtop-jsvc/SPECS/bigtop-jsvc.spec?rev=1326670&view=auto
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/rpm/bigtop-jsvc/SPECS/bigtop-jsvc.spec (added)
+++ incubator/bigtop/trunk/bigtop-packages/src/rpm/bigtop-jsvc/SPECS/bigtop-jsvc.spec Mon Apr 16 16:10:22 2012
@@ -0,0 +1,67 @@
+# 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.
+%define man_dir %{_mandir}
+
+%if  %{?suse_version:1}0
+%define bin_jsvc /usr/lib/bigtop-utils
+%define doc_jsvc %{_docdir}/%{name}
+%else
+%define bin_jsvc %{_libexecdir}/bigtop-utils
+%define doc_jsvc %{_docdir}/%{name}-%{bigtop_jsvc_version}
+%endif
+
+Name: bigtop-jsvc
+Version: %{bigtop_jsvc_version}
+Release: %{bigtop_jsvc_release}
+Summary: Application to launch java daemon
+URL: http://commons.apache.org/daemon/
+Group: Development/Libraries
+Buildroot: %{_topdir}/INSTALL/%{name}-%{version}
+License: ASL 2.0
+Source0: commons-daemon-%{bigtop_jsvc_base_version}.tar.gz
+Source1: do-component-build
+Source2: install_jsvc.sh
+BuildRequires: ant, autoconf, automake, gcc
+Provides: jsvc
+
+%description 
+jsvc executes classfile that implements a Daemon interface.
+
+%prep
+%setup -n commons-daemon-%{bigtop_jsvc_base_version}-native-src
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%build
+bash %{SOURCE1}
+
+%install
+%__rm -rf $RPM_BUILD_ROOT
+sh %{SOURCE2} \
+          --build-dir=.                         \
+          --bin-dir=$RPM_BUILD_ROOT/%{bin_jsvc} \
+          --doc-dir=$RPM_BUILD_ROOT/%{doc_jsvc} \
+          --man-dir=$RPM_BUILD_ROOT/%{man_dir}  \
+          --prefix=$RPM_BUILD_ROOT
+
+%files
+%defattr(-,root,root)
+%{bin_jsvc}
+%doc %{doc_jsvc}
+
+
+%changelog
+

Added: incubator/bigtop/trunk/bigtop-packages/src/rpm/bigtop-jsvc/SRPMS/.gitignore
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/bigtop-jsvc/SRPMS/.gitignore?rev=1326670&view=auto
==============================================================================
    (empty)

Added: incubator/bigtop/trunk/bigtop-packages/src/rpm/bigtop-tomcat/BUILD/.gitignore
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/bigtop-tomcat/BUILD/.gitignore?rev=1326670&view=auto
==============================================================================
    (empty)

Added: incubator/bigtop/trunk/bigtop-packages/src/rpm/bigtop-tomcat/RPMS/.gitignore
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/bigtop-tomcat/RPMS/.gitignore?rev=1326670&view=auto
==============================================================================
    (empty)

Added: incubator/bigtop/trunk/bigtop-packages/src/rpm/bigtop-tomcat/SOURCES/.gitignore
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/bigtop-tomcat/SOURCES/.gitignore?rev=1326670&view=auto
==============================================================================
    (empty)

Added: incubator/bigtop/trunk/bigtop-packages/src/rpm/bigtop-tomcat/SPECS/bigtop-tomcat.spec
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/bigtop-tomcat/SPECS/bigtop-tomcat.spec?rev=1326670&view=auto
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/rpm/bigtop-tomcat/SPECS/bigtop-tomcat.spec (added)
+++ incubator/bigtop/trunk/bigtop-packages/src/rpm/bigtop-tomcat/SPECS/bigtop-tomcat.spec Mon Apr 16 16:10:22 2012
@@ -0,0 +1,59 @@
+# 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.
+%define lib_tomcat %{_usr}/lib/%{name}
+
+%if  %{?suse_version:1}0
+  %define doc_tomcat %{_docdir}/%{name}
+%else
+  %define doc_tomcat %{_docdir}/%{name}-%{version}
+%endif
+
+Name: bigtop-tomcat
+Version: %{bigtop_tomcat_version}
+Release: %{bigtop_tomcat_release}
+Summary: Apache Tomcat
+URL: http://tomcat.apache.org/
+Group: Development/Libraries
+BuildArch: noarch
+Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+License: ASL 2.0 
+Source0: apache-tomcat-%{bigtop_tomcat_base_version}.tar.gz
+Source1: do-component-build
+Source2: install_tomcat.sh
+
+%description 
+Apache Tomcat is an open source software implementation of the
+Java Servlet and JavaServer Pages technologies.
+
+%prep
+%setup -n apache-tomcat-%{bigtop_tomcat_base_version}-src
+
+%build
+bash %{SOURCE1}
+
+%install
+%__rm -rf $RPM_BUILD_ROOT
+bash %{SOURCE2} \
+          --build-dir=build \
+	  --doc-dir=$RPM_BUILD_ROOT%{doc_tomcat} \
+          --prefix=$RPM_BUILD_ROOT
+
+%files 
+%defattr(-,root,root)
+%attr(0755,root,root) %{lib_tomcat}
+%doc %{doc_tomcat}
+
+%changelog
+

Added: incubator/bigtop/trunk/bigtop-packages/src/rpm/bigtop-tomcat/SRPMS/.gitignore
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/bigtop-tomcat/SRPMS/.gitignore?rev=1326670&view=auto
==============================================================================
    (empty)



Mime
View raw message