svn commit: r1189557 - in /incubator/bigtop/trunk/bigtop-packages/src: common/oozie/do-component-build deb/oozie/control deb/oozie/oozie.postinst rpm/oozie/SPECS/oozie.spec

[rv...@apache.org]

Author: rvs
Date: Thu Oct 27 00:40:24 2011
New Revision: 1189557

URL: http://svn.apache.org/viewvc?rev=1189557&view=rev
Log:
BIGTOP-158. oozie build pulls into oozie.war incorrect version of hadoop-core jar file

Modified:
    incubator/bigtop/trunk/bigtop-packages/src/common/oozie/do-component-build
    incubator/bigtop/trunk/bigtop-packages/src/deb/oozie/control
    incubator/bigtop/trunk/bigtop-packages/src/deb/oozie/oozie.postinst
    incubator/bigtop/trunk/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec

Modified: incubator/bigtop/trunk/bigtop-packages/src/common/oozie/do-component-build
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/common/oozie/do-component-build?rev=1189557&r1=1189556&r2=1189557&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/common/oozie/do-component-build (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/common/oozie/do-component-build Thu Oct 27 00:40:24 2011
@@ -84,7 +84,7 @@ if [ "${DO_MAVEN_DEPLOY}" = "deploy" ]; 
 fi
 
 # Invoke Oozie build script with CDH options
-${WORKDIR}/bin/mkdistro.sh -DincludeHadoopJars -DskipTests -Dnot.cdh.release.build=false ${EXTRA_GOALS} "$@"
+${WORKDIR}/bin/mkdistro.sh -DskipTests -Dnot.cdh.release.build=false ${EXTRA_GOALS} "$@"
 MKDISTRO_RESULT=$?
 if [ "${MKDISTRO_RESULT}" != "0" ]; then
   echo "ERROR: mkdistro.sh failed with error ${MKDISTRO_RESULT}"

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=1189557&r1=1189556&r2=1189557&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/oozie/control (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/oozie/control Thu Oct 27 00:40:24 2011
@@ -32,7 +32,7 @@ Description: Command line utility that a
 
 Package: oozie
 Architecture: all
-Depends: oozie-client (= ${source:Version})
+Depends: oozie-client (= ${source:Version}), hadoop
 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/oozie.postinst
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/oozie/oozie.postinst?rev=1189557&r1=1189556&r2=1189557&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/oozie/oozie.postinst (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/oozie/oozie.postinst Thu Oct 27 00:40:24 2011
@@ -38,6 +38,7 @@ case "$1" in
     configure)
         chown -R oozie:oozie /var/lib/oozie /var/log/oozie
         update-rc.d oozie defaults >/dev/null || exit 1
+        /usr/lib/oozie/bin/oozie-setup.sh -hadoop 0.20.200 /usr/lib/hadoop
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

Modified: incubator/bigtop/trunk/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec?rev=1189557&r1=1189556&r2=1189557&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec Thu Oct 27 00:40:24 2011
@@ -38,7 +38,7 @@ Source0: %{name}-%{oozie_base_version}.t
 Source1: do-component-build
 Source2: create-package-layout
 Requires(pre): /usr/sbin/groupadd, /usr/sbin/useradd
-Requires(post): /sbin/chkconfig
+Requires(post): /sbin/chkconfig, hadoop
 Requires(preun): /sbin/chkconfig, /sbin/service
 Requires: oozie-client = %{version}
 BuildArch: noarch
@@ -127,6 +127,7 @@ getent group oozie >/dev/null || /usr/sb
 getent passwd oozie >/dev/null || /usr/sbin/useradd --comment "Oozie User" --shell /bin/false -M -r -g oozie --home /var/run/oozie oozie >/dev/null
 
 %post 
+%{lib_oozie}/bin/oozie-setup.sh -hadoop 0.20.200 /usr/lib/hadoop
 /sbin/chkconfig --add oozie 
 
 %preun