Author: rvs
Date: Fri Mar 9 17:35:23 2012
New Revision: 1298940
URL: http://svn.apache.org/viewvc?rev=1298940&view=rev
Log:
BIGTOP-432. BIGTOP424 broke oozie build
Modified:
incubator/bigtop/trunk/bigtop-packages/src/common/oozie/install_oozie.sh
incubator/bigtop/trunk/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec
Modified:
incubator/bigtop/trunk/bigtop-packages/src/common/oozie/install_oozie.sh
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/common/oozie/install_oozie.sh?rev=1298940&r1=1298939&r2=1298940&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/common/oozie/install_oozie.sh
(original)
+++ incubator/bigtop/trunk/bigtop-packages/src/common/oozie/install_oozie.sh
Fri Mar 9 17:35:23 2012
@@ -201,9 +201,6 @@ 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,31 +215,18 @@ 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
failIfNotOK
-cp -R ${OOZIE_BUILD_DIR}/oozie-server/conf ${OOZIE_DATA}/oozie-server/conf
+mv ${OOZIE_SERVER_DIR}/oozie-server/conf ${OOZIE_DATA}/oozie-server/
failIfNotOK
-cp -R ${OOZIE_BUILD_DIR}/oozie-server/webapps ${OOZIE_SERVER_DIR}/webapps
+mv ${OOZIE_SERVER_DIR}/oozie-server/webapps ${OOZIE_DATA}/oozie-server/
failIfNotOK
cp -R ${EXTRADIR}/oozie-env.sh ${OOZIE_SERVER_DIR}/bin
failIfNotOK
chmod 755 ${OOZIE_SERVER_DIR}/bin/oozie-env.sh
failIfNotOK
-# Unpack oozie.war some place reasonable
-OOZIE_WEBAPP=${OOZIE_SERVER_DIR}/webapps/oozie
-mkdir ${OOZIE_WEBAPP}
-unzip -d ${OOZIE_WEBAPP} ${OOZIE_BUILD_DIR}/oozie.war
-touch ${OOZIE_SERVER_DIR}/webapps/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}/WEB-INF/lib ${OOZIE_DATA}/oozie-libs
-ln -s /var/lib/oozie/oozie-libs ${OOZIE_WEBAPP}/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/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=1298940&r1=1298939&r2=1298940&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 Fri
Mar 9 17:35:23 2012
@@ -177,9 +177,7 @@ fi
%{lib_oozie}/bin/oozie-sys.sh
%{lib_oozie}/bin/oozie-env.sh
%{lib_oozie}/bin/oozied.sh
-%{lib_oozie}/bin/ooziedb.sh
-%{lib_oozie}/webapps
-%{lib_oozie}/libtools
+%{lib_oozie}/oozie.war
%{lib_oozie}/oozie-sharelib.tar.gz
%{lib_oozie}/oozie-server
%{initd_dir}/oozie
