OOZIE-2753 Update Docs for Jetty Tomcat changes (asasvari via abhishekbafna)
Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/7c404ad0 Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/7c404ad0 Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/7c404ad0 Branch: refs/heads/oya Commit: 7c404ad0ea4c61e90e8c86015de25ef196168c29 Parents: 890f69e Author: abhisek bafna <aba...@hortonworks.com> Authored: Wed Mar 29 19:30:27 2017 +0530 Committer: abhisek bafna <aba...@hortonworks.com> Committed: Wed Mar 29 19:30:27 2017 +0530 ---------------------------------------------------------------------- core/src/main/conf/oozie-env.cmd | 2 +- core/src/main/conf/oozie-env.sh | 28 -------- core/src/main/resources/oozie-default.xml | 3 +- distro/src/main/bin/oozie-setup.sh | 4 -- distro/src/main/bin/oozie-sys.sh | 56 ---------------- docs/src/site/twiki/AG_Install.twiki | 68 +++++++------------- docs/src/site/twiki/DG_CommandLineTool.twiki | 35 +++++----- .../site/twiki/DG_CustomActionExecutor.twiki | 2 +- docs/src/site/twiki/DG_QuickStart.twiki | 10 +-- docs/src/site/twiki/ENG_Building.twiki | 5 +- docs/src/site/twiki/index.twiki | 2 +- release-log.txt | 3 +- 12 files changed, 55 insertions(+), 163 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/7c404ad0/core/src/main/conf/oozie-env.cmd ---------------------------------------------------------------------- diff --git a/core/src/main/conf/oozie-env.cmd b/core/src/main/conf/oozie-env.cmd index 85e1da5..0238cb6 100644 --- a/core/src/main/conf/oozie-env.cmd +++ b/core/src/main/conf/oozie-env.cmd @@ -17,7 +17,7 @@ @rem Set Oozie specific environment variables here. -@rem Settings for the Embedded Tomcat that runs Oozie +@rem Settings for the Embedded Jetty that runs Oozie @rem Java System properties for Oozie should be specified in this variable @rem set CATALINA_OPTS=%CATALINA_OPTS% -Xmx1024m http://git-wip-us.apache.org/repos/asf/oozie/blob/7c404ad0/core/src/main/conf/oozie-env.sh ---------------------------------------------------------------------- diff --git a/core/src/main/conf/oozie-env.sh b/core/src/main/conf/oozie-env.sh index 033c87b..3cdfbe2 100644 --- a/core/src/main/conf/oozie-env.sh +++ b/core/src/main/conf/oozie-env.sh @@ -38,31 +38,3 @@ # Reload interval of the Log4J configuration file, in seconds # # export OOZIE_LOG4J_RELOAD=10 - -# The port Oozie server runs -# -# export OOZIE_HTTP_PORT=11000 - -# The port Oozie server runs if using SSL (HTTPS) -# -# export OOZIE_HTTPS_PORT=11443 - -# The host name Oozie server runs on -# -# export OOZIE_HTTP_HOSTNAME=`hostname -f` - -# The base URL for callback URLs to Oozie -# -# export OOZIE_BASE_URL="http://${OOZIE_HTTP_HOSTNAME}:${OOZIE_HTTP_PORT}/oozie"; - -# The location of the keystore for the Oozie server if using SSL (HTTPS) -# -# export OOZIE_HTTPS_KEYSTORE_FILE=${HOME}/.keystore - -# The password of the keystore for the Oozie server if using SSL (HTTPS) -# -# export OOZIE_HTTPS_KEYSTORE_PASS=password - -# The Oozie Instance ID -# -# export OOZIE_INSTANCE_ID="${OOZIE_HTTP_HOSTNAME}" http://git-wip-us.apache.org/repos/asf/oozie/blob/7c404ad0/core/src/main/resources/oozie-default.xml ---------------------------------------------------------------------- diff --git a/core/src/main/resources/oozie-default.xml b/core/src/main/resources/oozie-default.xml index c2e6ec2..c2f874f 100644 --- a/core/src/main/resources/oozie-default.xml +++ b/core/src/main/resources/oozie-default.xml @@ -2647,8 +2647,7 @@ will be the requeue interval for the actions which are waiting for a long time w <name>oozie.instance.id</name> <value>${oozie.http.hostname}</value> <description> - Each Oozie server should have its own unique instance id. The default is system property - =${OOZIE_HTTP_HOSTNAME}= (i.e. the hostname). + Each Oozie server should have its own unique instance id. </description> </property> http://git-wip-us.apache.org/repos/asf/oozie/blob/7c404ad0/distro/src/main/bin/oozie-setup.sh ---------------------------------------------------------------------- diff --git a/distro/src/main/bin/oozie-setup.sh b/distro/src/main/bin/oozie-setup.sh index b8d8016..e431acc 100644 --- a/distro/src/main/bin/oozie-setup.sh +++ b/distro/src/main/bin/oozie-setup.sh @@ -20,8 +20,6 @@ function printUsage() { echo echo " Usage : oozie-setup.sh <Command and OPTIONS>" - echo " prepare-war [-d directory] [-secure] (-d identifies an alternative directory for processing jars" - echo " -secure will configure the war file to use HTTPS (SSL))" echo " sharelib create -fs FS_URI [-locallib SHARED_LIBRARY] [-concurrency CONCURRENCY]" echo " (create sharelib for oozie," echo " FS_URI is the fs.default.name" @@ -169,8 +167,6 @@ do elif [ "$1" = "-d" ]; then shift additionalDir=$1 - elif [ "$1" = "prepare-war" ]; then - prepareWar=true else printUsage exit -1 http://git-wip-us.apache.org/repos/asf/oozie/blob/7c404ad0/distro/src/main/bin/oozie-sys.sh ---------------------------------------------------------------------- diff --git a/distro/src/main/bin/oozie-sys.sh b/distro/src/main/bin/oozie-sys.sh index 90bffba..7d6cb08 100755 --- a/distro/src/main/bin/oozie-sys.sh +++ b/distro/src/main/bin/oozie-sys.sh @@ -160,62 +160,6 @@ else print "Using OOZIE_LOG4J_RELOAD: ${OOZIE_LOG4J_RELOAD}" fi -if [ "${OOZIE_HTTP_HOSTNAME}" = "" ]; then - export OOZIE_HTTP_HOSTNAME=`hostname -f` - print "Setting OOZIE_HTTP_HOSTNAME: ${OOZIE_HTTP_HOSTNAME}" -else - print "Using OOZIE_HTTP_HOSTNAME: ${OOZIE_HTTP_HOSTNAME}" -fi - -if [ "${OOZIE_HTTP_PORT}" = "" ]; then - export OOZIE_HTTP_PORT=11000 - print "Setting OOZIE_HTTP_PORT: ${OOZIE_HTTP_PORT}" -else - print "Using OOZIE_HTTP_PORT: ${OOZIE_HTTP_PORT}" -fi - -if [ "${OOZIE_ADMIN_PORT}" = "" ]; then - export OOZIE_ADMIN_PORT=`expr $OOZIE_HTTP_PORT + 1` - print "Setting OOZIE_ADMIN_PORT: ${OOZIE_ADMIN_PORT}" -else - print "Using OOZIE_ADMIN_PORT: ${OOZIE_ADMIN_PORT}" -fi - -if [ "${OOZIE_HTTPS_PORT}" = "" ]; then - export OOZIE_HTTPS_PORT=11443 - print "Setting OOZIE_HTTPS_PORT: ${OOZIE_HTTPS_PORT}" -else - print "Using OOZIE_HTTPS_PORT: ${OOZIE_HTTPS_PORT}" -fi - -if [ "${OOZIE_BASE_URL}" = "" ]; then - export OOZIE_BASE_URL="http://${OOZIE_HTTP_HOSTNAME}:${OOZIE_HTTP_PORT}/oozie"; - print "Setting OOZIE_BASE_URL: ${OOZIE_BASE_URL}" -else - print "Using OOZIE_BASE_URL: ${OOZIE_BASE_URL}" -fi - -if [ "${OOZIE_HTTPS_KEYSTORE_FILE}" = "" ]; then - export OOZIE_HTTPS_KEYSTORE_FILE=${HOME}/.keystore - print "Setting OOZIE_HTTPS_KEYSTORE_FILE: ${OOZIE_HTTPS_KEYSTORE_FILE}" -else - print "Using OOZIE_HTTPS_KEYSTORE_FILE: ${OOZIE_HTTPS_KEYSTORE_FILE}" -fi - -if [ "${OOZIE_HTTPS_KEYSTORE_PASS}" = "" ]; then - export OOZIE_HTTPS_KEYSTORE_PASS=password - print "Setting OOZIE_HTTPS_KEYSTORE_PASS: ${OOZIE_HTTPS_KEYSTORE_PASS}" -else - print "Using OOZIE_HTTPS_KEYSTORE_PASS: ${OOZIE_HTTPS_KEYSTORE_PASS}" -fi - -if [ "${OOZIE_INSTANCE_ID}" = "" ]; then - export OOZIE_INSTANCE_ID="${OOZIE_HTTP_HOSTNAME}" - print "Setting OOZIE_INSTANCE_ID: ${OOZIE_INSTANCE_ID}" -else - print "Using OOZIE_INSTANCE_ID: ${OOZIE_INSTANCE_ID}" -fi - print setup_ooziedb() { http://git-wip-us.apache.org/repos/asf/oozie/blob/7c404ad0/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 026b5d1..a863d46 100644 --- a/docs/src/site/twiki/AG_Install.twiki +++ b/docs/src/site/twiki/AG_Install.twiki @@ -14,10 +14,10 @@ Follow the instructions at [[DG_QuickStart][Oozie Quick Start]]. *IMPORTANT:* Oozie ignores any set value for =OOZIE_HOME=, Oozie computes its home automatically. -When running Oozie with its embedded Tomcat server, the =conf/oozie-env.sh= file can be +When running Oozie with its embedded Jetty server, the =conf/oozie-env.sh= file can be used to configure the following environment variables used by Oozie: -*CATALINA_OPTS* : settings for the Embedded Tomcat that runs Oozie Java System properties +*JETTY_OPTS* : settings for the Embedded Jetty that runs Oozie. Java System properties for Oozie should be specified in this variable. No default value. *OOZIE_CONFIG_FILE* : Oozie configuration file to load from Oozie configuration directory. @@ -32,42 +32,21 @@ Default value =oozie-log4j.properties=. *OOZIE_LOG4J_RELOAD* : Reload interval of the Log4J configuration file, in seconds. Default value =10= -*OOZIE_HTTP_PORT* : The port Oozie server runs. Default value =11000=. - -*OOZIE_ADMIN_PORT* : The admin port Oozie server runs. Default value =11001=. - -*OOZIE_HTTP_HOSTNAME* : The host name Oozie server runs on. Default value is the output of the -command =hostname -f=. - -*OOZIE_BASE_URL* : The base URL for actions callback URLs to Oozie. The default value -is =http://${OOZIE_HTTP_HOSTNAME}:${OOZIE_HTTP_PORT}/oozie=. - *OOZIE_CHECK_OWNER* : If set to =true=, Oozie setup/start/run/stop scripts will check that the owner of the Oozie installation directory matches the user invoking the script. The default value is undefined and interpreted as a =false=. -If Oozie is configured to use HTTPS (SSL), then the following environment variables are also used: - -*OOZIE_HTTPS_PORT* : The port Oozie server runs when using HTTPS. Default value =11443=. - -*OOZIE_HTTPS_KEYSTORE_FILE* : The location of the keystore file containing the certificate information. -Default value =${HOME}/.keystore= (i.e. the home dir of the Oozie user). - -*OOZIE_HTTPS_KEYSTORE_PASS* : The password of the keystore file. Default value =password=. - *OOZIE_INSTANCE_ID* : The instance id of the Oozie server. When using HA, each server instance should have a unique instance id. Default value =${OOZIE_HTTP_HOSTNAME}= ---++ Oozie Server Setup -The =oozie-setup.sh= script prepares the embedded Tomcat server to run Oozie. +The =oozie-setup.sh= script prepares the embedded Jetty server to run Oozie. The =oozie-setup.sh= script options are: <verbatim> Usage : oozie-setup.sh <Command and OPTIONS> - prepare-war [-d directory] [-secure] (-d identifies an alternative directory for processing jars - -secure will configure the war file to use HTTPS (SSL)) sharelib create -fs FS_URI [-locallib SHARED_LIBRARY] [-concurrency CONCURRENCY] (create sharelib for oozie, FS_URI is the fs.default.name @@ -102,7 +81,7 @@ The ExtJS library file name be =ext-2.2.zip=. ---+++ Setting Up Oozie with an Alternate Tomcat Use the =addtowar.sh= script to prepare the Oozie server only if Oozie will run with a different -servlet container than the embedded Tomcat provided with the distribution. +servlet container than the embedded Jetty provided with the distribution. The =addtowar.sh= script adds Hadoop JARs, JDBC JARs and the ExtJS library to the Oozie WAR file. @@ -149,7 +128,7 @@ it must be added to Oozie WAR file using the =bin/addtowar.sh= or the =oozie-set *IMPORTANT:* It is recommended to set the database's timezone to GMT (consult your database's documentation on how to do this). Databases don't handle Daylight Saving Time shifts correctly, and may cause problems if you run any Coordinators with actions scheduled to materialize during the 1 hour period where we "fall back". For Derby, you can add '-Duser.timezone=GMT' -to =CATALINA_OPTS= in oozie-env.sh to set this. Alternatively, if using MySQL, you can have Oozie use GMT with MySQL without +to =JETTY_OPTS= in oozie-env.sh to set this. Alternatively, if using MySQL, you can have Oozie use GMT with MySQL without setting MySQL's timezone to GMT by adding 'useLegacyDatetimeCode=false&serverTimezone=GMT' arguments to the JDBC URL, =oozie.service.JPAService.jdbc.url=. Be advised that changing the timezone on an existing Oozie database while Coordinators are already running may cause Coordinators to shift by the offset of their timezone from GMT once after making this change. @@ -301,7 +280,7 @@ Oozie logs in 4 different files: * oozie-instrumentation.log: instrumentation data, every 60 seconds (configurable) * oozie-audit.log: audit messages, workflow jobs changes -The embedded Tomcat and embedded Derby log files are also written to Oozie's =logs/= directory. +The embedded Jetty and embedded Derby log files are also written to Oozie's =logs/= directory. ---+++ Oozie User Authentication Configuration @@ -703,11 +682,11 @@ included with your JRE. If it's not on your path, you should be able to find it 1. Run the following command (as the Oozie user) to create the keystore file, which will be named =.keystore= and located in the Oozie user's home directory. <verbatim> -keytool -genkeypair -alias tomcat -keyalg RSA -dname "CN=hostname" -storepass password -keypass password +keytool -genkeypair -alias jetty -keyalg RSA -dname "CN=hostname" -storepass password -keypass password </verbatim> The =hostname= should be the host name of the Oozie Server or a wildcard on the subdomain it belongs to. Make sure to include the "CN=" part. You can change =storepass= and =keypass= values, but they should be the same. If you do want to use something -other than password, you'll also need to change the =OOZIE_HTTPS_KEYSTORE_PASS= environment variable in oozie-env.sh to +other than password, you'll also need to change the value of the =oozie.https.keystore.pass= property in =oozie-site.xml= to match; =password= is the default. For example, if your Oozie server was at oozie.int.example.com, then you would do this: @@ -742,7 +721,7 @@ servers in the HA group can use. To do that, you'll need to use a wild on the s 2. Once you have your .cert file, run the following command (as the Oozie user) to create a keystore file from your certificate: <verbatim> -keytool -import -alias tomcat -file path/to/certificate.cert +keytool -import -alias jetty -file path/to/certificate.cert </verbatim> The keystore file will be named =.keystore= and located in the Oozie user's home directory. @@ -750,11 +729,18 @@ The keystore file will be named =.keystore= and located in the Oozie user's home 1. Make sure the Oozie server isn't running -2. Run the following command (as the Oozie user): -<verbatim> -oozie-setup.sh prepare-war -secure -</verbatim> -This will configure Oozie to use HTTPS instead of HTTP. To revert back to HTTP, simply rerun the command without =-secure=. +2. Configure settings necessary for enabling SSL/TLS support in =oozie-site.xml=. + +2a. Set =oozie.https.enabled= to =true=. To revert back to HTTP, set =oozie.https.enabled= to =false=. +2b. Set location and password for both the keystore and truststore by setting =oozie.https.keystore.file=, +=oozie.https.keystore.pass=, =oozie.https.truststore.file= and =oozie.https.truststore.pass=. + +The default HTTPS port Oozie listens on for secure connections is 11443; it can be changed via =oozie.https.port=. + +It is possible to specify other HTTPS settings via =oozie-site.xml=: +- To include / exclude cipher suites, set =oozie.https.include.cipher.suites= / =oozie.https.exclude.cipher.suites=. +- To include / exclude TLS protocols, set =oozie.https.include.protocols= / =oozie.https.exclude.protocols=. +*Note:* Exclude is always preferred over include (i.e. if you both include and exclude an entity, it will be excluded). 3. Start the Oozie server @@ -1071,7 +1057,7 @@ reached. Maximum job id sequence is configured as =oozie.service.ZKUUIDService.j ---++ Starting and Stopping Oozie -Use the standard Tomcat commands to start and stop Oozie. +Use the standard commands to start and stop Oozie. ---++ Oozie Command Line Installation @@ -1188,10 +1174,8 @@ environment variables (shown with their default values): export OOZIE_CONFIG=${OOZIE_HOME}/conf export OOZIE_DATA={OOZIE_HOME}/data export OOZIE_LOG={OOZIE_HOME}/logs -export CATALINA_BASE=${OOZIE_HOME}/oozie-server -export CATALINA_TMPDIR=${OOZIE_HOME}/oozie-server/temp -export CATALINA_OUT=${OOZIE_LOGS}/catalina.out -export CATALINA_PID=/tmp/oozie.pid +export JETTY_OUT=${OOZIE_LOGS}/jetty.out +export JETTY_PID=/tmp/oozie.pid </verbatim> Sample values to make Oozie follow Unix standard filesystem hierarchy: @@ -1200,9 +1184,7 @@ Sample values to make Oozie follow Unix standard filesystem hierarchy: export OOZIE_CONFIG=/etc/oozie export OOZIE_DATA=/var/lib/oozie export OOZIE_LOG=/var/log/oozie -export CATALINA_BASE=${OOZIE_DATA}/oozie-server -export CATALINA_TMPDIR=/tmp -export CATALINA_PID=/tmp/oozie.pid +export JETTY_PID=/tmp/oozie.pid </verbatim> [[index][::Go back to Oozie Documentation Index::]] http://git-wip-us.apache.org/repos/asf/oozie/blob/7c404ad0/docs/src/site/twiki/DG_CommandLineTool.twiki ---------------------------------------------------------------------- diff --git a/docs/src/site/twiki/DG_CommandLineTool.twiki b/docs/src/site/twiki/DG_CommandLineTool.twiki index 6a9e4b4..d404767 100644 --- a/docs/src/site/twiki/DG_CommandLineTool.twiki +++ b/docs/src/site/twiki/DG_CommandLineTool.twiki @@ -1332,13 +1332,17 @@ Example: <verbatim> $ oozie admin -oozie http://localhost:11000/oozie -osenv -Apple_PubSub_Socket_Render : /private/tmp/com.apple.launchd.V2oxXoP55M/Render -CATALINA_BASE : /Users/rkanter/dev/oozie/oozie-server -CATALINA_OUT : /Users/rkanter/dev/oozie/logs/catalina.out -CATALINA_PID : /Users/rkanter/dev/oozie/oozie-server/temp/oozie.pid -HADOOP_HOME : /Users/rkanter/dev/hadoop -HADOOP_HOME_WARN_SUPPRESS : TRUE -HADOOP_OPTS : -Djava.security.krb5.realm=OX.AC.UK -Djava.security.krb5.kdc=kdc0.ox.ac.uk:kdc1.ox.ac.uk +... +JETTY_OPTS : -Doozie.home.dir=/Users/asasvari/dev/oozie -Doozie.config.dir=/Users/asasvari/dev/oozie/conf -Doozie.log.dir=/Users/asasvari/dev/oozie/logs -Doozie.data.dir=/Users/asasvari/dev/oozie/data -Doozie.config.file=oozie-site.xml -Doozie.log4j.file=oozie-log4j.properties -Doozie.log4j.reload=10 -Djava.library.path= -cp /Users/asasvari/dev/oozie/embedded-oozie-server/*:/Users/asasvari/dev/oozie/embedded-oozie-server/dependency/*:/Users/asasvari/dev/oozie/lib/*:/Users/asasvari/dev/oozie/libtools/*:/Users/asasvari/dev/oozie/embedded-oozie-server +JETTY_OUT : /Users/asasvari/dev/oozie/logs/jetty.out +JETTY_PID_FILE : /Users/asasvari/dev/oozie/embedded-oozie-server/oozie.pid +OOZIE_CONFIG : /Users/asasvari/dev/oozie/conf +OOZIE_CONFIG_FILE : oozie-site.xml +OOZIE_DATA : /Users/asasvari/dev/oozie/data +OOZIE_HOME : /Users/asasvari/dev/oozie +OOZIE_LOG : /Users/asasvari/dev/oozie/logs +OOZIE_LOG4J_FILE : oozie-log4j.properties +OOZIE_LOG4J_RELOAD : 10 ... </verbatim> @@ -1350,15 +1354,14 @@ Example: <verbatim> $ oozie admin -oozie http://localhost:11000/oozie -javasysprops -awt.toolkit : sun.lwawt.macosx.LWCToolkit -catalina.base : /Users/rkanter/dev/oozie/oozie-server -catalina.home : /Users/rkanter/dev/oozie/oozie-server -catalina.useNaming : true -common.loader : ${catalina.base}/lib,${catalina.base}/lib/*.jar,${catalina.home}/lib,${catalina.home}/lib/*.jar -derby.stream.error.file : /Users/rkanter/dev/oozie/logs/derby.log -file.encoding : UTF-8 -file.encoding.pkg : sun.io -file.separator : / +... +oozie.config.dir : /Users/asasvari/dev/oozie/conf +oozie.config.file : oozie-site.xml +oozie.data.dir : /Users/asasvari/dev/oozie/data +oozie.home.dir : /Users/asasvari/dev/oozie +oozie.log.dir : /Users/asasvari/dev/oozie/logs +oozie.log4j.file : oozie-log4j.properties +oozie.log4j.reload : 10 ... </verbatim> http://git-wip-us.apache.org/repos/asf/oozie/blob/7c404ad0/docs/src/site/twiki/DG_CustomActionExecutor.twiki ---------------------------------------------------------------------- diff --git a/docs/src/site/twiki/DG_CustomActionExecutor.twiki b/docs/src/site/twiki/DG_CustomActionExecutor.twiki index 93cda00..4acbf0d 100644 --- a/docs/src/site/twiki/DG_CustomActionExecutor.twiki +++ b/docs/src/site/twiki/DG_CustomActionExecutor.twiki @@ -66,7 +66,7 @@ Any configuration properties to be made available to this class should also be a The XML schema (XSD) for the new Actions should be added to oozie-site.xml, under the property 'oozie.service.WorkflowSchemaService.ext.schemas'. A comma separated list for multiple Action schemas. -The executor class should be placed along with the oozie webapp in the correct path. Once Tomcat is restarted, the custom action node can be used in workflows. +The executor class should be placed along with the oozie webapp in the correct path. Once Oozie is restarted, the custom action node can be used in workflows. http://git-wip-us.apache.org/repos/asf/oozie/blob/7c404ad0/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 2b9dc3b..fdc8374 100644 --- a/docs/src/site/twiki/DG_QuickStart.twiki +++ b/docs/src/site/twiki/DG_QuickStart.twiki @@ -4,7 +4,7 @@ ---+!! Oozie Quick Start -These instructions install and run Oozie using an embedded Tomcat server and an embedded Derby database. +These instructions install and run Oozie using an embedded Jetty server and an embedded Derby database. For detailed install and configuration instructions refer to [[AG_Install][Oozie Install]]. @@ -52,7 +52,7 @@ profile depending on the hadoop version used. -Dpig.classifier=<classifier> - default none -Dsqoop.version=<version> - default 1.4.3 -Dsqoop.classifier=<classifier> - default hadoop100 --Dtomcat.version=<version> - default 6.0.47 +-Djetty.version=<version> - default 9.2.19.v20160908 -Dopenjpa.version=<version> - default 2.2.2 -Dxerces.version=<version> - default 2.10.0 -Dcurator.version=<version> - default 2.5.0 @@ -139,17 +139,13 @@ Sharelib files are copied to new lib_<timestamped> directory. At start, server p While starting server also purge sharelib directory which is older than sharelib retention days (defined as oozie.service.ShareLibService.temp.sharelib.retention.days and 7 days is default). -"prepare-war [-d directory]" command is for creating war files for oozie with an optional alternative directory other -than libext. - db create|upgrade|postupgrade -run [-sqlfile <FILE>] command is for create, upgrade or postupgrade oozie db with an optional sql file Run the =oozie-setup.sh= script to configure Oozie with all the components added to the *libext/* directory. <verbatim> -$ bin/oozie-setup.sh prepare-war [-d directory] [-secure] - sharelib create -fs <FS_URI> [-locallib <PATH>] +$ bin/oozie-setup.sh sharelib create -fs <FS_URI> [-locallib <PATH>] sharelib upgrade -fs <FS_URI> [-locallib <PATH>] db create|upgrade|postupgrade -run [-sqlfile <FILE>] </verbatim> http://git-wip-us.apache.org/repos/asf/oozie/blob/7c404ad0/docs/src/site/twiki/ENG_Building.twiki ---------------------------------------------------------------------- diff --git a/docs/src/site/twiki/ENG_Building.twiki b/docs/src/site/twiki/ENG_Building.twiki index dda829b..019f8f1 100644 --- a/docs/src/site/twiki/ENG_Building.twiki +++ b/docs/src/site/twiki/ENG_Building.twiki @@ -203,8 +203,7 @@ the 'SKIPPING TEST..." message would appear in the testcase log file of both tes ---++ Building an Oozie Distribution -An Oozie distribution bundles an embedded Tomcat server. The Oozie distro module downloads Tomcat TAR.GZ from Apache -once (in the =distro/downloads/= directory) and uses it when creating the distro. +An Oozie distribution bundles an embedded Jetty server. The simplest way to build Oozie is to run the =mkdistro.sh= script: <verbatim> @@ -223,7 +222,7 @@ as the execution engine for those applications. -Dpig.classifier=<classifier> - default none -Dsqoop.version=<version> - default 1.4.3 -Dsqoop.classifier=<classifier> - default hadoop100 --Dtomcat.version=<version> - default 6.0.47 +-jetty.version=<version> - default 9.2.19.v20160908 -Dopenjpa.version=<version> - default 2.2.2 -Dxerces.version=<version> - default 2.10.0 -Dcurator.version=<version> - default 2.5.0 http://git-wip-us.apache.org/repos/asf/oozie/blob/7c404ad0/docs/src/site/twiki/index.twiki ---------------------------------------------------------------------- diff --git a/docs/src/site/twiki/index.twiki b/docs/src/site/twiki/index.twiki index 8591530..b7c962d 100644 --- a/docs/src/site/twiki/index.twiki +++ b/docs/src/site/twiki/index.twiki @@ -86,7 +86,7 @@ Oozie is distributed under [[http://www.apache.org/licenses/LICENSE-2.0][Apache For details on the license of the dependent components, refer to the [[./dependencies.html#Licenses][Dependencies Report, Licenses section]]. -Oozie bundles an embedded Apache Tomcat 6.x. +Oozie bundles an embedded Jetty 9.x. Some of the components in the dependencies report don't mention their license in the published POM. They are: http://git-wip-us.apache.org/repos/asf/oozie/blob/7c404ad0/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 17c9895..1451d60 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,6 +1,7 @@ -- Oozie 4.4.0 release (trunk - unreleased) -OOZIE-2841 Limit FindBugs diff errors in JIRA comments +OOZIE-2753 Update Docs for Jetty Tomcat changes (asasvari via abhishekbafna) +OOZIE-2841 Limit FindBugs diff errors in JIRA comments (andras.piros via gezapeti) OOZIE-2739 Remove property expansion pattern from ShellMain's log4j properties content (harsh) OOZIE-2817 amend Increase test case stability in pre-commit job (abhishekbafna) OOZIE-2838 TestClassUtils,TestJsonUtils,TestWritableUtils,TestXmlUtils shall not be an Oozie XTestCase (asasvari via pbacsko)
