You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by vi...@apache.org on 2012/07/27 02:50:33 UTC
svn commit: r1366253 - in /incubator/oozie/trunk:
docs/src/site/twiki/CoordinatorFunctionalSpec.twiki
docs/src/site/twiki/WebServicesAPI.twiki
docs/src/site/twiki/WorkflowFunctionalSpec.twiki release-log.txt
Author: virag
Date: Fri Jul 27 00:50:32 2012
New Revision: 1366253
URL: http://svn.apache.org/viewvc?rev=1366253&view=rev
Log:
OOZIE-928 Clarify the documentation for submitting coordinator jobs using web services API (rkanter via virag)
Modified:
incubator/oozie/trunk/docs/src/site/twiki/CoordinatorFunctionalSpec.twiki
incubator/oozie/trunk/docs/src/site/twiki/WebServicesAPI.twiki
incubator/oozie/trunk/docs/src/site/twiki/WorkflowFunctionalSpec.twiki
incubator/oozie/trunk/release-log.txt
Modified: incubator/oozie/trunk/docs/src/site/twiki/CoordinatorFunctionalSpec.twiki
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/docs/src/site/twiki/CoordinatorFunctionalSpec.twiki?rev=1366253&r1=1366252&r2=1366253&view=diff
==============================================================================
--- incubator/oozie/trunk/docs/src/site/twiki/CoordinatorFunctionalSpec.twiki (original)
+++ incubator/oozie/trunk/docs/src/site/twiki/CoordinatorFunctionalSpec.twiki Fri Jul 27 00:50:32 2012
@@ -2443,265 +2443,7 @@ If you add *sla* tags to the Coordinator
---++ 13. Web Services API
----+++ 13.1 System Status
-
-*Request:*
-
-<verbatim>
-GET oozie/v1/admin/status
-</verbatim>
-
-*Response:*
-
-<verbatim>
-{"systemMode":"NORMAL"}
-</verbatim>
-
----+++ 13.2 List Jobs
----++++ Workflow Jobs
-
-*Request:*
-
-<verbatim>
-POST oozie/v1/jobs?jobtype=wf&len=50&offset=1
-</verbatim>
-
-*Response:*
-<verbatim>
-{
- "total":2,
- "workflows":[
- {
- "appPath":null,
- "status":"KILLED",
- "createdTime":"Tue, 27 Apr 2010 01:50:45 GMT",
- "conf":null,
- "lastModTime":"Tue, 27 Apr 2010 01:51:04 GMT",
- "endTime":"Tue, 27 Apr 2010 01:51:04 GMT",
- "run":0,
- "externalId":null,
- "appName":"map-reduce-wf",
- "id":"0000000-100426185037406-oozie-dani-W",
- "startTime":"Tue, 27 Apr 2010 01:50:47 GMT",
- "group":"users",
- "consoleUrl":"http:\/\/localhost:8080\/oozie?job=jobid1-W",
- "user":"danielwo",
- "actions":[
-
- ]
- },
- {
- "appPath":null,
- "status":"KILLED",
- "createdTime":"Mon, 26 Apr 2010 22:31:15 GMT",
- "conf":null,
- "lastModTime":"Wed, 28 Apr 2010 22:39:18 GMT",
- "endTime":"Wed, 28 Apr 2010 22:39:18 GMT",
- "run":0,
- "externalId":null,
- "appName":"map-reduce-wf",
- "id":"0000005-100426151754515-oozie-dani-W",
- "startTime":null,
- "group":"users",
- "consoleUrl":"http:\/\/localhost:8080\/oozie?job=jobd2-W",
- "user":"danielwo",
- "actions":[
-
- ]
- }
- ],
- "len":50,
- "offset":1
-}
-</verbatim>
-
----++++ Coordinator Jobs
-
-*Request:*
-<verbatim>
-POST oozie/v1/jobs?jobtype=coord&len=50&offset=1
-</verbatim>
-
-*Response:*
-<verbatim>
-{
- "total":2,
- "coordinatorjobs":[
- {
- "lastAction":"Sun, 01 Feb 2009 01:00:00 GMT",
- "coordJobName":"my_coord_job",
- "status":"SUCCEEDED",
- "coordJobPath":"hdfs:\/\/localhost:9000\/user\/danielwo\/coord",
- "timeZone":"UTC",
- "conf":null,
- "frequency":60,
- "endTime":"Sun, 01 Feb 2009 00:05:00 GMT",
- "executionPolicy":"LIFO",
- "startTime":"Sun, 01 Feb 2009 00:00:00 GMT",
- "timeOut":-1,
- "nextMaterializedTime":"Sun, 01 Feb 2009 01:00:00 GMT",
- "timeUnit":"MINUTE",
- "concurrency":-1,
- "coordJobId":"0000000-100426180048624-oozie-dani-C",
- "coordExternalId":null,
- "group":"users",
- "consoleUrl":null,
- "user":"danielwo",
- "actions":[
-
- ]
- },
- {
- "lastAction":"Sun, 01 Feb 2009 01:00:00 GMT",
- "coordJobName":"my_coord_job",
- "status":"SUCCEEDED",
- "coordJobPath":"hdfs:\/\/localhost:9000\/user\/danielwo\/coord",
- "timeZone":"UTC",
- "conf":null,
- "frequency":60,
- "endTime":"Sun, 01 Feb 2009 00:05:00 GMT",
- "executionPolicy":"LIFO",
- "startTime":"Sun, 01 Feb 2009 00:00:00 GMT",
- "timeOut":-1,
- "nextMaterializedTime":"Sun, 01 Feb 2009 01:00:00 GMT",
- "timeUnit":"MINUTE",
- "concurrency":-1,
- "coordJobId":"0000000-100426145525486-oozie-dani-C",
- "coordExternalId":null,
- "group":"users",
- "consoleUrl":null,
- "user":"danielwo",
- "actions":[
-
- ]
- }
- ],
- "len":50,
- "offset":1
-}
-</verbatim>
-
-
----+++ 13.3 Job Submission
-
-<verbatim>
-PUT oozie/v1/jobs?action=start
-</verbatim>
-
----+++ 13.4 Job Information
-
----++++ Workflow Job Information
-*Request:*
-<verbatim>
-GET oozie/v1/job/0000000-100426185037406-oozie-jobid-W?show=info&len=0&offset=0
-</verbatim>
-
-*Response:*
-<verbatim>
-{
- "appPath":"hdfs:\/\/localhost:9000\/user\/danielwo\/workflow",
- "status":"KILLED",
- "createdTime":"Tue, 27 Apr 2010 01:50:45 GMT",
- "conf":"<configuration>...<\/configuration>",
- "lastModTime":"Tue, 27 Apr 2010 01:51:04 GMT",
- "endTime":"Tue, 27 Apr 2010 01:51:04 GMT",
- "run":0,
- "externalId":null,
- "appName":"map-reduce-wf",
- "id":"0000000-100426185037406-oozie-dani-W",
- "startTime":"Tue, 27 Apr 2010 01:50:47 GMT",
- "group":"users",
- "consoleUrl":"http:\/\/localhost:8080\/oozie?job=...",
- "user":"danielwo",
- "actions":[
- {
- "errorMessage":"Output directory already exists",
- "status":"ERROR",
- "data":null,
- "transition":"fail",
- "externalStatus":"FAILED\/KILLED",
- "conf":"<map-reduce xmlns=\"uri:oozie:workflow:0.2\"> ...<\/map-reduce>",
- "type":"map-reduce",
- "endTime":"Tue, 27 Apr 2010 01:51:04 GMT",
- "externalId":"job_201004261212_0025",
- "id":"0000000-100426185037406-oozie-dani-W@hadoop1",
- "startTime":"Tue, 27 Apr 2010 01:50:49 GMT",
- "name":"hadoop1",
- "errorCode":"JA018",
- "retries":0,
- "trackerUri":"localhost:9001",
- "consoleUrl":"http:\/\/localhost:50030\/jobdetails.jsp?jobid=..."
- }
- ]
-}
-</verbatim>
-
----++++ Coordinator Job Information
-*Request:*
-<verbatim>
-GET oozie/v1/job/0000000-100426185037406-oozie-jobid-C?show=info&len=0&offset=0
-</verbatim>
-
-*Response:*
-<verbatim>
-{
- "lastAction":null,
- "coordJobName":"my_coord_job",
- "status":"SUCCEEDED",
- "coordJobPath":"hdfs:\/\/localhost:9000\/user\/danielwo\/coord",
- "timeZone":"UTC",
- "conf":"<configuration>...<\/configuration>",
- "frequency":60,
- "endTime":null,
- "executionPolicy":"LIFO",
- "startTime":null,
- "timeOut":-1,
- "nextMaterializedTime":null,
- "timeUnit":"MINUTE",
- "concurrency":-1,
- "coordJobId":"0000000-100426180048624-oozie-dani-C",
- "coordExternalId":null,
- "group":"users",
- "consoleUrl":null,
- "user":"danielwo",
- "actions":[
- {
- "errorMessage":null,
- "lastModifiedTime":"Tue, 27 Apr 2010 01:01:30 GMT",
- "createdTime":"Tue, 27 Apr 2010 01:01:12 GMT",
- "status":"KILLED",
- "externalStatus":null,
- "type":null,
- "externalId":"0000001-100426180048624-oozie-dani-W",
- "id":"0000000-100426180048624-oozie-dani-C@1",
- "createdConf":"<configuration>...<\/configuration>",
- "actionNumber":1,
- "errorCode":null,
- "trackerUri":null,
- "coordJobId":"0000000-100426180048624-oozie-dani-C",
- "consoleUrl":null
- }
- ]
-}
-</verbatim>
-
----+++ 13.5 Job Definition
-
-<verbatim>
-GET oozie/v1/job/0000005-100426151754515-oozie-jobid-W?show=definition
-</verbatim>
-
----+++ 13.6 Job Log
-
-<verbatim>
-GET oozie/v1/job/0000005-100426151754515-oozie-jobid-W?show=log
-</verbatim>
-
----+++ 13.7 KIll a Job
-
-<verbatim>
-PUT oozie/v1/job/0000005-100426151754515-oozie-jobid-W?action=kill
-</verbatim>
+See the [[WebServicesAPI][Web Services API]] page.
---++ 14. Coordinator Rerun
---+++ Rerunning a Coordinator Action or Multiple Actions
Modified: incubator/oozie/trunk/docs/src/site/twiki/WebServicesAPI.twiki
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/docs/src/site/twiki/WebServicesAPI.twiki?rev=1366253&r1=1366252&r2=1366253&view=diff
==============================================================================
--- incubator/oozie/trunk/docs/src/site/twiki/WebServicesAPI.twiki (original)
+++ incubator/oozie/trunk/docs/src/site/twiki/WebServicesAPI.twiki Fri Jul 27 00:50:32 2012
@@ -392,6 +392,9 @@ the POST URL, the job will be started im
Coordinator jobs with start time in the future they will not create any action until the start time
happens.
+A coordinator job will remain in =PREP= status until it's triggered, in which case it will change to =RUNNING= status.
+The 'action=start' parameter is not valid for coordinator jobs.
+
---++++ Managing a Job
A HTTP PUT request starts, suspends, resumes or kills a job.
Modified: incubator/oozie/trunk/docs/src/site/twiki/WorkflowFunctionalSpec.twiki
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/docs/src/site/twiki/WorkflowFunctionalSpec.twiki?rev=1366253&r1=1366252&r2=1366253&view=diff
==============================================================================
--- incubator/oozie/trunk/docs/src/site/twiki/WorkflowFunctionalSpec.twiki (original)
+++ incubator/oozie/trunk/docs/src/site/twiki/WorkflowFunctionalSpec.twiki Fri Jul 27 00:50:32 2012
@@ -2037,489 +2037,9 @@ applications to perform custom logic at
(i.e. by passing the value of the =wf:run()= function as a parameter to the task).
#OozieWSAPI
----++ 11 Oozie Web Services API, V0
+---++ 11 Oozie Web Services API
-The Oozie Web Services API is a HTTP REST JSON API.
-
-All responses are in =UTF-8=.
-
-Assuming Oozie is runing at =OOZIE_URL=, the following web services end points are supported:
-
- * <OOZIE_URL>/versions
- * <OOZIE_URL>/v0/admin
- * <OOZIE_URL>/v0/job
- * <OOZIE_URL>/v0/jobs
-
----+++ 11.1 Versions End-Point
-
-This endpoint is for clients to perform protocol negotiation.
-
-It support only HTTP GET request and not sub-resources.
-
-It returns the supported Oozie protocol versions by the server.
-
-Current returned value is =0=.
-
-*Request:*
-
-<verbatim>
-GET /oozie/versions
-</verbatim>
-
-*Response:*
-
-<verbatim>
-HTTP/1.1 200 OK
-Content-Type: application/json;charset=UTF-8
-.
-[0]
-</verbatim>
-
----+++ 11.2 Admin End-Point
-
-This endpoint is for obtaining Oozie system status and configuration information.
-
-It supports the following sub-resources: =status, os-env, sys-props, configuration, instrumentation=.
-
----++++ 11.2.1 System Status
-
-A HTTP GET request returns the system status.
-
-*Request:*
-
-<verbatim>
-GET /oozie/v0/admin/status
-</verbatim>
-
-*Response:*
-
-<verbatim>
-HTTP/1.1 200 OK
-Content-Type: application/json;charset=UTF-8
-.
-{"safeMode":false}
-</verbatim>
-
-With a HTTP PUT request it is possible to bring in and out hte system from safemode.
-
-*Request:*
-
-<verbatim>
-PUT /oozie/v0/admin/status?safemode=true
-</verbatim>
-
-*Response:*
-
-<verbatim>
-HTTP/1.1 200 OK
-</verbatim>
-
----++++ 11.2.2 OS Environment
-
-A HTTP GET request returns the Oozie system OS environment.
-
-*Request:*
-
-<verbatim>
-GET /oozie/v0/admin/os-env
-</verbatim>
-
-*Response:*
-
-<verbatim>
-HTTP/1.1 200 OK
-Content-Type: application/json;charset=UTF-8
-.
-{
- TERM: "xterm",
- JAVA_HOME: "/usr/java/latest",
- XCURSOR_SIZE: "",
- SSH_CLIENT: "::ffff:127.0.0.1 49082 22",
- XCURSOR_THEME: "default",
- INPUTRC: "/etc/inputrc",
- HISTSIZE: "1000",
- PATH: "/usr/java/latest/bin"
- KDE_FULL_SESSION: "true",
- LANG: "en_US.UTF-8",
- ...
-}
-</verbatim>
-
----++++ 11.2.2 Java System Properties
-
-A HTTP GET request returns the Oozie Java system properties.
-
-*Request:*
-
-<verbatim>
-GET /oozie/v0/admin/java-sys-properties
-</verbatim>
-
-*Response:*
-
-<verbatim>
-HTTP/1.1 200 OK
-Content-Type: application/json;charset=UTF-8
-.
-{
- java.vm.version: "11.0-b15",
- sun.jnu.encoding: "UTF-8",
- java.vendor.url: "http://java.sun.com/",
- java.vm.info: "mixed mode",
- ...
-}
-</verbatim>
-
----++++ 11.2.2 Oozie Configuration
-
-A HTTP GET request returns the Oozie system configuration.
-
-*Request:*
-
-<verbatim>
-GET /oozie/v0/admin/configuration
-</verbatim>
-
-*Response:*
-
-<verbatim>
-HTTP/1.1 200 OK
-Content-Type: application/json;charset=UTF-8
-.
-{
- oozie.service.SchedulerService.threads: "5",
- oozie.service.ActionService.executor.classes: "
- org.apache.oozie.wf.action.decision.DecisionActionExecutor,
- org.apache.oozie.wf.action.hadoop.HadoopActionExecutor,
- org.apache.oozie.wf.action.hadoop.FsActionExecutor
- ",
- oozie.service.CallableQueueService.threads.min: "10",
- oozie.service.DBLiteWorkflowStoreService.oozie.autoinstall: "true",
- ...
-}
-</verbatim>
-
----++++ 11.2.3 Oozie Instrumentation
-
-A HTTP GET request returns the Oozie instrumentation information.
-
-*Request:*
-
-<verbatim>
-GET /oozie/v0/admin/instrumentation
-</verbatim>
-
-*Response:*
-
-<verbatim>
-HTTP/1.1 200 OK
-Content-Type: application/json;charset=UTF-8
-.
-{
- timers: [
- {
- group: "db",
- data: [
- {
- ownMinTime: 2,
- ownTimeStdDev: 0,
- totalTimeStdDev: 0,
- ownTimeAvg: 3,
- ticks: 117,
- name: "update-workflow",
- ownMaxTime: 32,
- totalMinTime: 2,
- totalMaxTime: 32,
- totalTimeAvg: 3
- },
- ...
- ]
- },
- ...
- ],
- samplers: [
- {
- group: "callablequeue",
- data: [
- {
- name: "threads.active",
- value: 1.8333333333333333
- },
- {
- name: "delayed.queue.size",
- value: 0
- },
- {
- name: "queue.size",
- value: 0
- }
- ]
- },
- ...
- ],
- variables: [
- {
- group: "jvm",
- data: [
- {
- name: "max.memory",
- value: 506920960
- },
- {
- name: "total.memory",
- value: 56492032
- },
- {
- name: "free.memory",
- value: 45776800
- }
- ]
- },
- ...
- ]
-}
-</verbatim>
-
----++++ 11.2.4 Version
-
-A HTTP GET request returns the Oozie build version.
-
-*Request:*
-
-<verbatim>
-GET /oozie/v0/admin/build-version
-</verbatim>
-
-*Response:*
-
-<verbatim>
-HTTP/1.1 200 OK
-Content-Type: application/json;charset=UTF-8
-.
-{buildVersion: "0.18.3.o0.1" }
-</verbatim>
-
-
----+++ 11.3 Job and Jobs End-Points
-
-These endpoints is for submitting, managing and retrieving information of jobs.
-
----++++ 11.3.1 Job Submission
-
-A HTTP POST request with an XML configuration as payload creates a job.
-
-*Request:*
-
-<verbatim>
-POST /oozie/v0/jobs
-Content-Type: application/xml;charset=UTF-8
-.
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
- <property>
- <name>user.name</name>
- <value>tucu</value>
- </property>
- <property>
- <name>oozie.wf.application.path</name>
- <value>hdfs://foo:9000/user/tucu/myapp/</value>
- </property>
- ...
-</configuration>
-</verbatim>
-
-*Response:*
-
-<verbatim>
-HTTP/1.1 201 CREATED
-Content-Type: application/json;charset=UTF-8
-.
-{
- id: "job-3"
-}
-</verbatim>
-
-The created job is in PREP status.
-
-If the query string parameter 'action=start' is provided in the POST URL, the job will be started immediatly and its
-status will be RUNNING.
-
----++++ 11.3.1 Managing the Job
-
-A HTTP PUT request starts, suspends, resumes or kills a job.
-
-*Request:*
-
-<verbatim>
-PUT /oozie/v0/job/job-3?action=start
-</verbatim>
-
-*Response:*
-
-<verbatim>
-HTTP/1.1 200 OK
-</verbatim>
-
-Valid values for the 'action' parameter are 'start', 'suspend', 'resume' and 'kill'.
-
----++++ 11.3.1 Job Information
-
-A HTTP GET request retrieves the job information.
-
-*Request:*
-
-<verbatim>
-GET /oozie/v0/job/job-3?show=info
-</verbatim>
-
-*Response:*
-
-<verbatim>
-HTTP/1.1 200 OK
-Content-Type: application/json;charset=UTF-8
-.
-{
- id: "0-200905191240-oozie-tucu",
- appName: "indexer-workflow",
- appPath: "hdfs://user/tucu/indexer.wf",
- externalId: "0-200905191230-oozie-pepe",
- user: "tucu",
- group: "other",
- status: "RUNNING",
- conf: "<configuration> ... </configuration>",
- createdTime: "Thu, 01 Jan 2009 00:00:00 GMT",
- startTime: "Fri, 02 Jan 2009 00:00:00 GMT",
- endTime: null,
- run: 0,
- actions: [
- {
- id: "0-200905191240-oozie-tucu@indexer",
- name: "indexer",
- type: "map-reduce",
- conf: "<configuration> ...</configuration>",
- startTime: "Thu, 01 Jan 2009 00:00:00 GMT",
- endTime: "Fri, 02 Jan 2009 00:00:00 GMT",
- status: "OK",
- externalId: "job-123-200903101010",
- externalStatus: "SUCCEEDED",
- trackerUri: "foo:9001",
- consoleUrl: "http://foo:50040/jobdetailshistory.jsp?jobId=...",
- transition: "reporter",
- data: null,
- errorCode: null,
- errorMessage: null,
- retries: 0
- },
- ...
- ]
-}
-</verbatim>
-
----++++ 11.3.2 Job Definition
-
-A HTTP GET request retrieves the workflow job definition file.
-
-*Request:*
-
-<verbatim>
-GET /oozie/v0/job/job-3?show=definition
-</verbatim>
-
-*Response:*
-
-<verbatim>
-HTTP/1.1 200 OK
-Content-Type: application/xml;charset=UTF-8
-.
-<?xml version="1.0" encoding="UTF-8"?>
-<workflow-app name='xyz-app' xmlns="uri:oozie:workflow:0.1">
- <start to='firstaction' />
- ...
- <end name='end' />
-</workflow-app>
-</verbatim>
-
----++++ 11.3.3 Job Log
-
-A HTTP GET request retrieves the job log.
-
-*Request:*
-
-<verbatim>
-GET /oozie/v0/job/job-3?show=log
-</verbatim>
-
-*Response:*
-
-<verbatim>
-HTTP/1.1 200 OK
-Content-Type: text/plain;charset=UTF-8
-.
-...
-23:21:31,272 TRACE oozieapp:526 - USER[tucu] GROUP[other] TOKEN[-] APP[test-wf] JOB[0-20090518232130-oozie-tucu] ACTION[mr-1] Start
-23:21:31,305 TRACE oozieapp:526 - USER[tucu] GROUP[other] TOKEN[-] APP[test-wf] JOB[0-20090518232130-oozie-tucu] ACTION[mr-1] End
-...
-</verbatim>
-
----++++ 11.3.4 Jobs Information
-
-A HTTP GET request retrieves the jobs information.
-
-*Request:*
-
-<verbatim>
-GET /oozie/v0/jobs?filter=user%3Dtucu&offset=1&len=50
-</verbatim>
-
-Note that the filter is URL encoded, its decoded value is <code>user=tucu</code>.
-*Response:*
-
-<verbatim>
-HTTP/1.1 200 OK
-Content-Type: application/json;charset=UTF-8
-.
-{
- offset: 1,
- len: 50,
- total: 1002,
- workflows: [
- {
- id: "0-200905191240-oozie-tucu",
- appName: "indexer-workflow",
- appPath: "hdfs://user/tucu/indexer-wf",
- user: "tucu",
- group: "other",
- acl: "other",
- status: "RUNNING",
- conf: "<configuration> ... </configuration>",
- createdTime: "Thu, 01 Jan 2009 00:00:00 GMT",
- startTime: "Fri, 02 Jan 2009 00:00:00 GMT",
- endTime: null,
- run: 0,
- actions: [ ]
- },
- ...
- ]
-}
-</verbatim>
-
-No action information is returned when querying for multiple jobs.
-
-The syntax for the filter is <verbatim>[NAME=VALUE][;NAME=VALUE]*</verbatim>
-
-Valid filter names are:
-
- * name: the workflow application name from the workflow definition
- * user: the user that submitted the job
- * group: DEPRECATED, it does a NOP
- * status: the status of the job
-
-The query will do an AND among all the filter names.
-
-The query will do an OR among all the filter values for the same name. Multiple values must be specified as different
-name value pairs.
-
-Additionaly the =start= and =len= parameters can be used for pagination. The start parameter is base 1.
+See the [[WebServicesAPI][Web Services API]] page.
---++ 12 Client API
Modified: incubator/oozie/trunk/release-log.txt
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/release-log.txt?rev=1366253&r1=1366252&r2=1366253&view=diff
==============================================================================
--- incubator/oozie/trunk/release-log.txt (original)
+++ incubator/oozie/trunk/release-log.txt Fri Jul 27 00:50:32 2012
@@ -1,5 +1,6 @@
-- Oozie 3.3.0 release (trunk - unreleased)
+OOZIE-928 Clarify the documentation for submitting coordinator jobs using web services API (rkanter via virag)
OOZIE-920 Incorrect error message for multiple start instances in coordinator xml (bcyr via tucu)
OOZIE-925 Change default logging level for oozie to INFO (rkanter via tucu)
OOZIE-924 CATALINA_OPTS should include $CATALINA_OPTS in oozie-env.sh (rkanter via tucu)