Updated Branches: refs/heads/master 094dbe896 -> c8293a4ff
BIGTOP-968. oozie is now part of the core hue Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/c8293a4f Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/c8293a4f Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/c8293a4f Branch: refs/heads/master Commit: c8293a4ff7f66da1864f88452858e8e42ffc4377 Parents: 094dbe8 Author: Roman Shaposhnik <[email protected]> Authored: Tue May 7 12:42:33 2013 -0700 Committer: Roman Shaposhnik <[email protected]> Committed: Tue May 7 12:55:34 2013 -0700 ---------------------------------------------------------------------- bigtop-packages/src/common/hue/install_hue.sh | 2 +- bigtop-packages/src/deb/hue/control | 10 +----- bigtop-packages/src/deb/hue/hue-oozie.install | 1 - bigtop-packages/src/deb/hue/rules | 2 +- bigtop-packages/src/rpm/hue/SPECS/hue.spec | 24 +------------- .../package/src/main/resources/package_data.xml | 14 -------- 6 files changed, 5 insertions(+), 48 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/c8293a4f/bigtop-packages/src/common/hue/install_hue.sh ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/hue/install_hue.sh b/bigtop-packages/src/common/hue/install_hue.sh index a3e327d..42bbd2f 100644 --- a/bigtop-packages/src/common/hue/install_hue.sh +++ b/bigtop-packages/src/common/hue/install_hue.sh @@ -111,7 +111,7 @@ cp -f $BUILD_DIR/apps/shell/src/shell/build/setuid $PREFIX/$LIB_DIR/apps/shell/s # Remove Hue database and then recreate it, but with just the "right" apps rm -f $PREFIX/$LIB_DIR/desktop/desktop.db $PREFIX/$LIB_DIR/app.reg -APPS="about filebrowser jobbrowser help jobsub proxy useradmin shell" +APPS="about filebrowser help proxy useradmin shell oozie jobbrowser jobsub" export DESKTOP_LOG_DIR=$BUILD_DIR export DESKTOP_LOGLEVEL=WARN export ROOT=$PREFIX/$LIB_DIR http://git-wip-us.apache.org/repos/asf/bigtop/blob/c8293a4f/bigtop-packages/src/deb/hue/control ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/hue/control b/bigtop-packages/src/deb/hue/control index 582ee81..c1cfaeb 100644 --- a/bigtop-packages/src/deb/hue/control +++ b/bigtop-packages/src/deb/hue/control @@ -31,7 +31,7 @@ Description: A browser-based desktop interface for Hadoop Package: hue Architecture: all -Depends: hue-common (= ${source:Version}), hue-server (= ${source:Version}), hue-beeswax (= ${source:Version}), hue-oozie (= ${source:Version}), hue-pig (= ${source:Version}) +Depends: hue-common (= ${source:Version}), hue-server (= ${source:Version}), hue-beeswax (= ${source:Version}), hue-pig (= ${source:Version}) Description: The hue metapackage Hue is a browser-based desktop interface for interacting with Hadoop. It supports a file browser, job tracker interface, cluster health monitor, and more. @@ -51,14 +51,6 @@ Description: A UI for Hive on Hue It allows users to construct and run queries on Hive, manage tables, and import and export data. -Package: hue-oozie -Architecture: all -Depends: ${shlibs:Depends}, ${misc:Depends}, python (>= 2.4), python (<< 3), make (>= 3.8), hue-common (= ${source:Version}) -Description: A UI for Oozie on Hue - A web interface for Oozie. - . - It allows users to construct and run Oozie workflows without explicitly managing the XML specification. - Package: hue-pig Architecture: all Depends: ${shlibs:Depends}, ${misc:Depends}, python (>= 2.4), python (<< 3), make (>= 3.8), hue-common (= ${source:Version}) http://git-wip-us.apache.org/repos/asf/bigtop/blob/c8293a4f/bigtop-packages/src/deb/hue/hue-oozie.install ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/hue/hue-oozie.install b/bigtop-packages/src/deb/hue/hue-oozie.install deleted file mode 100644 index 2e09243..0000000 --- a/bigtop-packages/src/deb/hue/hue-oozie.install +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/hue/apps/oozie http://git-wip-us.apache.org/repos/asf/bigtop/blob/c8293a4f/bigtop-packages/src/deb/hue/rules ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/hue/rules b/bigtop-packages/src/deb/hue/rules index a4fbd4c..c96d421 100755 --- a/bigtop-packages/src/deb/hue/rules +++ b/bigtop-packages/src/deb/hue/rules @@ -23,7 +23,7 @@ # Implicit targets SHELL := /bin/bash -APPS=beeswax oozie pig +APPS=beeswax pig $(APPS:%=debian/hue-%.postinst): debian/hue-app.postinst.tpl sed -e 's#@APP@#$(patsubst debian/hue-%.postinst,%,$@)#' < $< > $@ http://git-wip-us.apache.org/repos/asf/bigtop/blob/c8293a4f/bigtop-packages/src/rpm/hue/SPECS/hue.spec ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/rpm/hue/SPECS/hue.spec b/bigtop-packages/src/rpm/hue/SPECS/hue.spec index ae175c4..acf8e67 100644 --- a/bigtop-packages/src/rpm/hue/SPECS/hue.spec +++ b/bigtop-packages/src/rpm/hue/SPECS/hue.spec @@ -30,7 +30,6 @@ URL: http://github.com/cloudera/hue Requires: %{name}-common = %{version}-%{release} Requires: %{name}-server = %{version}-%{release} Requires: %{name}-beeswax = %{version}-%{release} -Requires: %{name}-oozie = %{version}-%{release} Requires: %{name}-pig = %{version}-%{release} ################ RPM CUSTOMIZATION ############################## @@ -264,13 +263,13 @@ fi %{useradmin_app_dir} %{shell_app_dir} %{catalog_app_dir} +%{oozie_app_dir} %attr(4750,root,hue) %{shell_app_dir}/src/shell/build/setuid %attr(0755,%{username},%{username}) /var/log/hue %attr(0755,%{username},%{username}) /var/lib/hue -# beeswax, oozie are packaged as a plugin app +# beeswax and pig are packaged as a plugin app %exclude %{beeswax_app_dir} -%exclude %{oozie_app_dir} %exclude %{pig_app_dir} ############################################################ @@ -329,25 +328,6 @@ and import and export data. %defattr(-, %{username}, %{username}) %{beeswax_app_dir} -#### HUE-OOZIE PLUGIN ###### -%package -n %{name}-oozie -Summary: A UI for Oozie on Hue -Group: Applications/Engineering -Requires: make -Requires: %{name}-common = %{version}-%{release} - -%description -n %{name}-oozie -A web interface for Oozie. - -It allows users to construct and run Oozie workflows without explicitly -managing the XML specification. - -%app_post_macro oozie -%app_preun_macro oozie - -%files -n %{name}-oozie -%{oozie_app_dir} - #### HUE-PIG PLUGIN ###### %package -n %{name}-pig Summary: A UI for Pig on Hue http://git-wip-us.apache.org/repos/asf/bigtop/blob/c8293a4f/bigtop-tests/test-artifacts/package/src/main/resources/package_data.xml ---------------------------------------------------------------------- diff --git a/bigtop-tests/test-artifacts/package/src/main/resources/package_data.xml b/bigtop-tests/test-artifacts/package/src/main/resources/package_data.xml index c89c244..f8bd9f6 100644 --- a/bigtop-tests/test-artifacts/package/src/main/resources/package_data.xml +++ b/bigtop-tests/test-artifacts/package/src/main/resources/package_data.xml @@ -959,20 +959,6 @@ and import and export data.</description> <make/> </deps> </hue-beeswax> - <hue-oozie> - <metadata> - <summary>A UI for Oozie on Hue</summary> - <description>A web interface for Oozie. - -It allows users to construct and run Oozie workflows without explicitly -managing the XML specification.</description> - <url>http://github.com/cloudera/hue</url> - </metadata> - <deps> - <hue-common>/self</hue-common> - <make/> - </deps> - </hue-oozie> <hue-pig> <metadata> <summary>A UI for Pig on Hue</summary>
