Author: rvs
Date: Fri Mar 2 18:39:41 2012
New Revision: 1296380
URL: http://svn.apache.org/viewvc?rev=1296380&view=rev
Log:
BIGTOP-417. webapps shipped by bigtop components should be using a
system-provided Tomcat
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop-httpfs.default
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/install_hadoop.sh
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/oozie/install_oozie.sh
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/control
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/oozie/control
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/oozie/rules
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
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/hadoop/hadoop-httpfs.default
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop-httpfs.default?rev=1296380&r1=1296379&r2=1296380&view=diff
==============================================================================
---
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop-httpfs.default
(original)
+++
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop-httpfs.default
Fri Mar 2 18:39:41 2012
@@ -19,5 +19,6 @@ export HTTPFS_TEMP=/var/run/hadoop-httpf
export CATALINA_PID=/var/run/hadoop-httpfs/hadoop-httpfs.pid
export CATALINA_BASE=/usr/lib/hadoop-httpfs
export CATALINA_TMPDIR=/var/run/hadoop-httpfs/
+export CATALINA_HOME=/usr/lib/bigtop-tomcat
# HTTPFS_HTTP_PORT
# HTTPFS_ADMIN_PORT
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/install_hadoop.sh
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/install_hadoop.sh?rev=1296380&r1=1296379&r2=1296380&view=diff
==============================================================================
---
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/install_hadoop.sh
(original)
+++
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/install_hadoop.sh
Fri Mar 2 18:39:41 2012
@@ -240,8 +240,11 @@ install -d -m 0755 ${HTTPFS_DIR}/sbin
mv ${HADOOP_SBIN_DIR}/httpfs.sh ${HTTPFS_DIR}/sbin/
install -d -m 0755 ${HTTPFS_DIR}/libexec
mv ${SYSTEM_LIBEXEC_DIR}/httpfs-config.sh ${HTTPFS_DIR}/libexec/
-cp -r ${BUILD_DIR}/share/hadoop/httpfs/tomcat/* ${HTTPFS_DIR}/
+cp -r ${BUILD_DIR}/share/hadoop/httpfs/tomcat/webapps ${HTTPFS_DIR}/
+cp -r ${BUILD_DIR}/share/hadoop/httpfs/tomcat/conf ${HTTPFS_DIR}/
chmod 644 ${HTTPFS_DIR}/conf/*
+# FIXME: bug in HADOOP
+ln -s /usr/lib/bigtop-tomcat/bin ${HTTPFS_DIR}/bin
install -d -m 0755 $HTTPFS_ETC_DIR/conf.empty
mv $HADOOP_ETC_DIR/conf.empty/httpfs* $HTTPFS_ETC_DIR/conf.empty
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=1296380&r1=1296379&r2=1296380&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:41 2012
@@ -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-server ${OOZIE_SERVER_DIR}
-failIfNotOK
install -d -m 0755 ${OOZIE_DATA}/oozie-server
failIfNotOK
mv ${OOZIE_SERVER_DIR}/oozie-server/conf ${OOZIE_DATA}/oozie-server/
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/control
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/control?rev=1296380&r1=1296379&r2=1296380&view=diff
==============================================================================
---
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/control
(original)
+++
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/control
Fri Mar 2 18:39:41 2012
@@ -196,7 +196,7 @@ Description: Development support for lib
Package: hadoop-httpfs
Provides: hadoop-httpfs
Architecture: all
-Depends: hadoop-hdfs (= ${source:Version})
+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.
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/oozie/control
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/oozie/control?rev=1296380&r1=1296379&r2=1296380&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/oozie/control
(original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/oozie/control
Fri Mar 2 18:39:41 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, 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/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=1296380&r1=1296379&r2=1296380&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
Fri Mar 2 18:39:41 2012
@@ -53,6 +53,7 @@ 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-client/etc/oozie/conf.dist
+ ln -s /usr/lib/bigtop-tomcat ./debian/oozie/usr/lib/oozie/oozie-server
dh_install -i
binary-common:
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec?rev=1296380&r1=1296379&r2=1296380&view=diff
==============================================================================
---
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
(original)
+++
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
Fri Mar 2 18:39:41 2012
@@ -284,7 +284,7 @@ blocks of data over the network to Hadoo
%package httpfs
Summary: HTTPFS for Hadoop
Group: System/Daemons
-Requires: %{name}-hdfs = %{version}-%{release}
+Requires: %{name}-hdfs = %{version}-%{release}, bigtop-tomcat
Requires(pre): %{name} = %{version}-%{release}
%description httpfs
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=1296380&r1=1296379&r2=1296380&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
Fri Mar 2 18:39:41 2012
@@ -61,9 +61,9 @@ Source4: oozie-env.sh
Source5: oozie.init
Patch0: patch
Requires(pre): /usr/sbin/groupadd, /usr/sbin/useradd
-Requires(post): /sbin/chkconfig, hadoop
+Requires(post): /sbin/chkconfig
Requires(preun): /sbin/chkconfig, /sbin/service
-Requires: zip, unzip, oozie-client = %{version}
+Requires: oozie-client = %{version}, hadoop, bigtop-tomcat
BuildArch: noarch
%description
@@ -138,6 +138,8 @@ Requires: bigtop-utils
%__rm -rf $RPM_BUILD_ROOT
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 /usr/lib/bigtop-tomcat $RPM_BUILD_ROOT/usr/lib/oozie/oozie-server
+
%__install -d -m 0755 $RPM_BUILD_ROOT/usr/bin
%__install -d -m 0755 %{buildroot}/%{_localstatedir}/log/oozie
