Repository: oozie Updated Branches: refs/heads/master 417894d6a -> be37ecaa2
OOZIE-3143 AG_Install.twiki needs some refinement (kmarton via andras.piros) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/be37ecaa Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/be37ecaa Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/be37ecaa Branch: refs/heads/master Commit: be37ecaa26dabe846627396f95e4ce455f144063 Parents: 417894d Author: Andras Piros <[email protected]> Authored: Fri Dec 15 13:51:26 2017 +0100 Committer: Andras Piros <[email protected]> Committed: Fri Dec 15 13:51:26 2017 +0100 ---------------------------------------------------------------------- docs/src/site/twiki/AG_Install.twiki | 8 ++++---- docs/src/site/twiki/DG_QuickStart.twiki | 2 +- release-log.txt | 1 + 3 files changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/be37ecaa/docs/src/site/twiki/AG_Install.twiki ---------------------------------------------------------------------- diff --git a/docs/src/site/twiki/AG_Install.twiki b/docs/src/site/twiki/AG_Install.twiki index e073c58..508949d 100644 --- a/docs/src/site/twiki/AG_Install.twiki +++ b/docs/src/site/twiki/AG_Install.twiki @@ -72,10 +72,10 @@ Usage : oozie-setup.sh <Command and OPTIONS> (without options prints this usage information) </verbatim> -If a directory =libext/= is present in Oozie installation directory, the =oozie-setup.sh= script -include all JARs in the =libext/= directory in Oozie WAR file. +If a directory =libext/= is present in Oozie installation directory, the =oozie-setup.sh= script will +include all JARs in Jetty's =webapp/WEB_INF/lib/= directory. -If the ExtJS ZIP file is present in the =libext/= directory, it will be added to Oozie WAR as well. +If the ExtJS ZIP file is present in the =libext/= directory, it will be added to the Jetty's =webapp/= directory as well. The ExtJS library file name be =ext-2.2.zip=. ---+++ Setting Up Oozie with an Alternate Tomcat @@ -507,7 +507,7 @@ The oozie-[version]-hcataloglibs.tar.gz in the oozie distribution bundles the re needs to be placed in the Oozie server classpath. If using a version of HCatalog bundled in Oozie hcataloglibs/, copy the corresponding HCatalog jars from hcataloglibs/ to the libext/ directory. If using a different version of HCatalog, copy the required HCatalog jars from such version in the libext/ directory. -This needs to be done before running the =oozie-setup.sh= script so that these jars get added to the Oozie WAR file. +This needs to be done before running the =oozie-setup.sh= script so that these jars get added for Oozie. *Configure HCatalog URI Handling:* http://git-wip-us.apache.org/repos/asf/oozie/blob/be37ecaa/docs/src/site/twiki/DG_QuickStart.twiki ---------------------------------------------------------------------- diff --git a/docs/src/site/twiki/DG_QuickStart.twiki b/docs/src/site/twiki/DG_QuickStart.twiki index 2189c3c..08b574f 100644 --- a/docs/src/site/twiki/DG_QuickStart.twiki +++ b/docs/src/site/twiki/DG_QuickStart.twiki @@ -36,7 +36,7 @@ $ bin/mkdistro.sh [-DskipTests] Running =mkdistro.sh= will create the binary distribution of Oozie. By default, oozie war will not contain hadoop and hcatalog libraries, however they are required for oozie to work. There are 2 options to add these libraries: -1. At install time, copy the hadoop and hcatalog libraries to libext and run oozie-setup.sh to setup oozie war. This is +1. At install time, copy the hadoop and hcatalog libraries to libext and run oozie-setup.sh to setup Oozie. This is suitable when same oozie package needs to be used in multiple set-ups with different hadoop/hcatalog versions. 2. Build with -Puber which will bundle the required libraries in the oozie war. Further, the following options are http://git-wip-us.apache.org/repos/asf/oozie/blob/be37ecaa/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 7e7dec0..5e2f3d7 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 5.0.0 release (trunk - unreleased) +OOZIE-3143 AG_Install.twiki needs some refinement (kmarton via andras.piros) OOZIE-3127 Remove redundant check for user (satishsaley) OOZIE-3139 Oozie validates workflow incorrectly (dionusos via pbacsko) OOZIE-2869 amend Ability to add/remove MapReduce jars from action classpath (andras.piros)
