Author: rvs
Date: Fri Mar 2 18:39:28 2012
New Revision: 1296378
URL: http://svn.apache.org/viewvc?rev=1296378&view=rev
Log:
BIGTOP-424. Bump version of Oozie to 3.1.3
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/oozie/do-component-build
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/oozie/install_oozie.sh
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/oozie/oozie-env.sh
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/oozie/patch
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/oozie/oozie.postinst
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/oozie/oozie.postrm
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/oozie/rules
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec
incubator/bigtop/branches/hadoop-0.23/bigtop.mk
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/oozie/do-component-build
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/oozie/do-component-build?rev=1296378&r1=1296377&r2=1296378&view=diff
==============================================================================
---
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/oozie/do-component-build
(original)
+++
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/oozie/do-component-build
Fri Mar 2 18:39:28 2012
@@ -14,13 +14,13 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-
+set -x
#
# Resolve source directory
#
# $0 may be a softlink
-PRG="${0}"
+PRG="$0"
while [ -h "${PRG}" ]; do
ls=`ls -ld "${PRG}"`
link=`expr "$ls" : '.*-> \(.*\)$'`
@@ -34,10 +34,12 @@ done
RELEASE_DIR=`dirname ${PRG}`
RELEASE_DIR=`cd ${RELEASE_DIR}/..;pwd`
+RELEASE_DIR=$PWD
+
#
# Resolve build version
#
-OOZIE_VERSION=2.3.0
+OOZIE_VERSION=3.1.3-incubating
RELEASE_ENV_FILENAME=release.env
RELEASE_ENV_FILE=${RELEASE_DIR}/cloudera/${RELEASE_ENV_FILENAME}
if [ -f "${RELEASE_ENV_FILE}" ]; then
@@ -84,7 +86,7 @@ if [ "${DO_MAVEN_DEPLOY}" = "deploy" ];
fi
# Invoke Oozie build script with CDH options
-${WORKDIR}/bin/mkdistro.sh -Pmr2 -Dhadoop.version=0.23.1-SNAPSHOT -DskipTests
-Dnot.cdh.release.build=false ${EXTRA_GOALS} "$@"
+${WORKDIR}/bin/mkdistro.sh -DskipTests -Dhadoop.version=0.23.1 ${EXTRA_GOALS}
-Dmaven.repo.local=${HOME}/.m2/repository "$@"
MKDISTRO_RESULT=$?
if [ "${MKDISTRO_RESULT}" != "0" ]; then
echo "ERROR: mkdistro.sh failed with error ${MKDISTRO_RESULT}"
@@ -115,10 +117,6 @@ fi
cd ${EXPDIR}
rm -rf ${EXPDIR}/oozie-client-*.tar.gz
-# creating the examples installer script for TAR distros, if doing DEB/RPM the
script
-# is overriden in the create-package-layout directory
-cp ${RELEASE_DIR}/cloudera/oozie-examples.sh ${EXPDIR}/bin/
-
SRCDIR=${EXPDIR}/src
mkdir -p ${SRCDIR}
for srcfile in ${WORKDIR}/*
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/oozie/install_oozie.sh
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/oozie/install_oozie.sh?rev=1296378&r1=1296377&r2=1296378&view=diff
==============================================================================
---
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/oozie/install_oozie.sh
(original)
+++
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/oozie/install_oozie.sh
Fri Mar 2 18:39:28 2012
@@ -151,8 +151,6 @@ install -d -m 0755 ${OOZIE_MAN_DIR}
failIfNotOK
gzip -c ${EXTRADIR}/oozie.1 > ${OOZIE_MAN_DIR}/oozie.1.gz
failIfNotOK
-cp -R ${EXTRADIR}/oozie-examples.sh ${OOZIE_CLIENT_DIR}/bin
-failIfNotOK
# Create the /usr/bin/oozie wrapper
install -d -m 0755 $BIN_DIR
@@ -202,8 +200,10 @@ failIfNotOK
install -d -m 0755 ${OOZIE_DATA}
failIfNotOK
cp -R ${OOZIE_BUILD_DIR}/bin/*.sh ${OOZIE_SERVER_DIR}/bin
-
failIfNotOK
+cp -R ${OOZIE_BUILD_DIR}/libtools ${OOZIE_SERVER_DIR}
+failIfNotOK
+
install -d -m 0755 ${OOZIE_CONF}
failIfNotOK
cp -R ${OOZIE_BUILD_DIR}/conf/* ${OOZIE_CONF}
@@ -218,8 +218,6 @@ if [ "${OOZIE_INITD}" != "" ]; then
fi
cp -R ${OOZIE_BUILD_DIR}/oozie-sharelib*.tar.gz
${OOZIE_SERVER_DIR}/oozie-sharelib.tar.gz
failIfNotOK
-cp -R ${OOZIE_BUILD_DIR}/oozie.war ${OOZIE_SERVER_DIR}
-failIfNotOK
cp -R ${OOZIE_BUILD_DIR}/oozie-server ${OOZIE_SERVER_DIR}
failIfNotOK
install -d -m 0755 ${OOZIE_DATA}/oozie-server
@@ -233,3 +231,22 @@ failIfNotOK
chmod 755 ${OOZIE_SERVER_DIR}/bin/oozie-env.sh
failIfNotOK
+# Unpack oozie.war some place reasonable
+OOZIE_WEBAPP=${OOZIE_SERVER_DIR}/webapps
+OOZIE_WEBAPP_TMPL=${OOZIE_DATA}/oozie-server/webapps
+mv ${OOZIE_WEBAPP_TMPL} ${OOZIE_WEBAPP}
+cp ${OOZIE_BUILD_DIR}/oozie.war ${OOZIE_WEBAPP}
+mkdir ${OOZIE_WEBAPP}/oozie
+unzip -d ${OOZIE_WEBAPP}/oozie ${OOZIE_BUILD_DIR}/oozie.war
+
+# Create an exploded-war oozie deployment in /var/lib/oozie
+sed -i -e 's#<Context#<Context allowLinking="true"#g'
${OOZIE_DATA}/oozie-server/conf/context.xml
+mkdir ${OOZIE_DATA}/oozie-server/lib
+ln -s /usr/lib/oozie/webapps ${OOZIE_DATA}/oozie-server/webapps
+
+# Finally do a trick where all the libs go to a writable place
+mv -f ${OOZIE_WEBAPP}/oozie/WEB-INF/lib ${OOZIE_DATA}/oozie-libs
+ln -s /var/lib/oozie/oozie-libs ${OOZIE_WEBAPP}/oozie/WEB-INF/lib
+for i in `cd ${OOZIE_SERVER_DIR} ; echo lib/* libtools/*` ; do
+ ln -fs /usr/lib/oozie/$i ${OOZIE_DATA}/oozie-libs/${i#*/}
+done
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/oozie/oozie-env.sh
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/oozie/oozie-env.sh?rev=1296378&r1=1296377&r2=1296378&view=diff
==============================================================================
---
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/oozie/oozie-env.sh
(original)
+++
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/oozie/oozie-env.sh
Fri Mar 2 18:39:28 2012
@@ -15,7 +15,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-export OOZIE_CONFIG=/etc/oozie
+export OOZIE_CONFIG=/etc/oozie/conf
export OOZIE_DATA=/var/lib/oozie
export OOZIE_LOG=/var/log/oozie
export CATALINA_BASE=${OOZIE_DATA}/oozie-server
