Author: rvs
Date: Wed Mar 21 22:18:16 2012
New Revision: 1303602
URL: http://svn.apache.org/viewvc?rev=1303602&view=rev
Log:
BIGTOP-474. improve Oozie integration with Hadoop 0.23
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/oozie/catalina.properties
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/oozie/install_oozie.sh
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
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/oozie/catalina.properties
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/oozie/catalina.properties?rev=1303602&r1=1303601&r2=1303602&view=diff
==============================================================================
---
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/oozie/catalina.properties
(original)
+++
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/oozie/catalina.properties
Wed Mar 21 22:18:16 2012
@@ -44,7 +44,7 @@ package.definition=sun.,java.,org.apache
# "foo/*.jar": Add all the JARs of the specified folder as class
# repositories
# "foo/bar.jar": Add bar.jar as a class repository
-common.loader=/var/lib/oozie/hadoop-client/*.jar,/usr/lib/oozie/server-core/*.jar,${catalina.home}/lib,${catalina.home}/lib/*.jar
+common.loader=/var/lib/oozie/*.jar,/usr/lib/hadoop/client/*.jar,/usr/lib/oozie/libserver/*.jar,${catalina.home}/lib,${catalina.home}/lib/*.jar
#
# List of comma-separated paths defining the contents of the "server"
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=1303602&r1=1303601&r2=1303602&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
Wed Mar 21 22:18:16 2012
@@ -206,9 +206,11 @@ failIfNotOK
install -d -m 0755 ${OOZIE_CONF}
failIfNotOK
-cp -R ${OOZIE_BUILD_DIR}/conf/* ${OOZIE_CONF}
+cp ${OOZIE_BUILD_DIR}/conf/* ${OOZIE_CONF}
+sed -i -e
'/oozie.service.HadoopAccessorService.hadoop.configurations/,/<\/property>/s#<value>\*=hadoop-conf</value>#<value>*=/etc/hadoop/conf</value>#g'
\
+ ${OOZIE_CONF}/oozie-site.xml
failIfNotOK
-cp -R ${EXTRADIR}/oozie-env.sh ${OOZIE_CONF}
+cp ${EXTRADIR}/oozie-env.sh ${OOZIE_CONF}
failIfNotOK
if [ "${OOZIE_INITD}" != "" ]; then
install -d -m 0755 ${OOZIE_INITD}
@@ -231,7 +233,7 @@ mkdir ${OOZIE_WEBAPP}
failIfNotOK
unzip -d ${OOZIE_WEBAPP} ${OOZIE_BUILD_DIR}/oozie.war
failIfNotOK
-mv -f ${OOZIE_WEBAPP}/WEB-INF/lib ${OOZIE_SERVER_DIR}/server-core
+mv -f ${OOZIE_WEBAPP}/WEB-INF/lib ${OOZIE_SERVER_DIR}/libserver
failIfNotOK
touch ${OOZIE_SERVER_DIR}/webapps/oozie.war
failIfNotOK
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/oozie/rules
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/oozie/rules?rev=1303602&r1=1303601&r2=1303602&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/oozie/rules
(original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/oozie/rules
Wed Mar 21 22:18:16 2012
@@ -55,6 +55,7 @@ install-indep:
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:
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec?rev=1303602&r1=1303601&r2=1303602&view=diff
==============================================================================
---
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec
(original)
+++
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec
Wed Mar 21 22:18:16 2012
@@ -59,6 +59,8 @@ Source2: install_oozie.sh
Source3: oozie.1
Source4: oozie-env.sh
Source5: oozie.init
+Source6: catalina.properties
+Source7: context.xml
Patch0: patch
Requires(pre): /usr/sbin/groupadd, /usr/sbin/useradd
Requires(post): /sbin/chkconfig
@@ -139,6 +141,7 @@ Requires: bigtop-utils
sh %{SOURCE2} --extra-dir=$RPM_SOURCE_DIR --build-dir=.
--server-dir=$RPM_BUILD_ROOT --client-dir=$RPM_BUILD_ROOT
--docs-dir=$RPM_BUILD_ROOT%{doc_oozie} --initd-dir=$RPM_BUILD_ROOT%{initd_dir}
--conf-dir=$RPM_BUILD_ROOT%{conf_oozie_dist}
%__ln_s -f %{data_oozie}/ext-2.2
$RPM_BUILD_ROOT/%{lib_oozie}/webapps/oozie/ext-2.2
+%__rm -rf $RPM_BUILD_ROOT/%{lib_oozie}/webapps/oozie/docs
%__ln_s -f %{doc_oozie} $RPM_BUILD_ROOT/%{lib_oozie}/webapps/oozie/docs
@@ -186,6 +189,7 @@ fi
%{lib_oozie}/bin/ooziedb.sh
%{lib_oozie}/webapps
%{lib_oozie}/libtools
+%{lib_oozie}/libserver
%{lib_oozie}/oozie-sharelib.tar.gz
%{lib_oozie}/oozie-server
%{initd_dir}/oozie
