Author: rvs
Date: Mon Apr 23 23:14:51 2012
New Revision: 1329502
URL: http://svn.apache.org/viewvc?rev=1329502&view=rev
Log:
BIGTOP-557. /etc/oozie/conf and oozie-conf alternative should belong to oozie
instead of oozie-client
Modified:
incubator/bigtop/trunk/bigtop-packages/src/deb/oozie/rules
incubator/bigtop/trunk/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec
incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/package_data.xml
Modified: incubator/bigtop/trunk/bigtop-packages/src/deb/oozie/rules
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/oozie/rules?rev=1329502&r1=1329501&r2=1329502&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/oozie/rules (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/oozie/rules Mon Apr 23
23:14:51 2012
@@ -52,7 +52,7 @@ install: install-indep
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
+ 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/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
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=1329502&r1=1329501&r2=1329502&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 Mon
Apr 23 23:14:51 2012
@@ -156,12 +156,14 @@ 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 %{data_oozie} oozie >/dev/null
%post
+%{alternatives_cmd} --install %{conf_oozie} %{name}-conf %{conf_oozie_dist} 30
/sbin/chkconfig --add oozie
%preun
if [ "$1" = 0 ]; then
/sbin/service oozie stop > /dev/null
/sbin/chkconfig --del oozie
+ %{alternatives_cmd} --remove %{name}-conf %{conf_oozie_dist} || :
fi
%postun
@@ -169,16 +171,9 @@ if [ $1 -ge 1 ]; then
/sbin/service oozie condrestart > /dev/null
fi
-%post client
-%{alternatives_cmd} --install %{conf_oozie} %{name}-conf %{conf_oozie_dist} 30
-
-%preun client
-if [ "$1" = 0 ]; then
- %{alternatives_cmd} --remove %{name}-conf %{conf_oozie_dist} || :
-fi
-
%files
%defattr(-,root,root)
+%config(noreplace) %{conf_oozie_dist}
%{lib_oozie}/bin/oozie-sys.sh
%{lib_oozie}/bin/oozie-env.sh
%{lib_oozie}/bin/oozied.sh
@@ -197,7 +192,6 @@ fi
%files client
%defattr(-,root,root)
-%config(noreplace) %{conf_oozie_dist}
%{usr_bin}/oozie
%dir %{lib_oozie}/bin
%{lib_oozie}/bin/oozie
Modified:
incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/package_data.xml
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/package_data.xml?rev=1329502&r1=1329501&r2=1329502&view=diff
==============================================================================
---
incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/package_data.xml
(original)
+++
incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/package_data.xml
Mon Apr 23 23:14:51 2012
@@ -235,6 +235,14 @@ Java Servlet and JavaServer Pages techno
<user>oozie</user>
</oozie>
</groups>
+ <alternatives>
+ <oozie-conf>
+ <status>auto</status>
+ <link>/etc/oozie/conf</link>
+ <value>/etc/oozie/conf.dist</value>
+ <alt>/etc/oozie/conf.dist</alt>
+ </oozie-conf>
+ </alternatives>
</oozie>
<oozie-client>
<metadata>
@@ -249,14 +257,6 @@ you to validate any worflows before they
server.</description>
<url>http://incubator.apache.org/oozie/</url>
</metadata>
- <alternatives>
- <oozie-conf>
- <status>auto</status>
- <link>/etc/oozie/conf</link>
- <value>/etc/oozie/conf.dist</value>
- <alt>/etc/oozie/conf.dist</alt>
- </oozie-conf>
- </alternatives>
<deps>
<hadoop/>
<bigtop-utils/>
