svn commit: r24417 [2/3] - in /release/oozie/5.0.0-beta1: ./ oozie-5.0.0-beta1.tar.gz oozie-5.0.0-beta1.tar.gz.asc oozie-5.0.0-beta1.tar.gz.md5 rat_report release-log.txt

2018-01-24 Thread rkanter 
Added: release/oozie/5.0.0-beta1/rat_report
==
--- release/oozie/5.0.0-beta1/rat_report (added)
+++ release/oozie/5.0.0-beta1/rat_report Wed Jan 24 18:29:37 2018
@@ -0,0 +1,1531 @@
+
+*
+Summary
+---
+Generated at: 2018-01-17T16:07:24+01:00
+Notes: 6
+Binaries: 11
+Archives: 2
+Standards: 1471
+
+Apache Licensed: 1471
+Generated Documents: 0
+
+JavaDocs are generated and so license header is optional
+Generated files do not required license headers
+
+0 Unknown Licenses
+
+***
+
+Unapproved licenses:
+
+
+***
+
+Archives:
+
+ + sharelib/spark/src/test/resources/py4j-0.9-src.zip
+ 
+ + sharelib/spark/src/test/resources/pyspark.zip
+ 
+*
+  Files with Apache License headers will be marked AL
+  Binary files (which do not require AL headers) will be marked B
+  Compressed archives will be marked A
+  Notices, licenses etc will be marked N
+  ALbuilds/runHudsonCIBuild.sh
+  ALclient/pom.xml
+  ALclient/src/main/bin/oozie
+  ALclient/src/main/conf/oozie-client-env.sh
+  ALclient/src/main/java/org/apache/oozie/AppType.java
+  ALclient/src/main/java/org/apache/oozie/BuildInfo.java
+  ALclient/src/main/java/org/apache/oozie/cli/CLIParser.java
+  ALclient/src/main/java/org/apache/oozie/cli/OozieCLI.java
+  ALclient/src/main/java/org/apache/oozie/cli/OozieCLIException.java
+  ALclient/src/main/java/org/apache/oozie/cli/ValidationUtil.java
+  ALclient/src/main/java/org/apache/oozie/client/AuthOozieClient.java
+  ALclient/src/main/java/org/apache/oozie/client/BulkResponse.java
+  ALclient/src/main/java/org/apache/oozie/client/BundleJob.java
+  ALclient/src/main/java/org/apache/oozie/client/CoordinatorAction.java
+  ALclient/src/main/java/org/apache/oozie/client/CoordinatorJob.java
+  ALclient/src/main/java/org/apache/oozie/client/CoordinatorWfAction.java
+  ALclient/src/main/java/org/apache/oozie/client/event/Event.java
+  AL
client/src/main/java/org/apache/oozie/client/event/jms/JMSHeaderConstants.java
+  AL
client/src/main/java/org/apache/oozie/client/event/jms/JMSMessagingUtils.java
+  AL
client/src/main/java/org/apache/oozie/client/event/jms/JSONMessageDeserializer.java
+  AL
client/src/main/java/org/apache/oozie/client/event/jms/MessageDeserializer.java
+  ALclient/src/main/java/org/apache/oozie/client/event/JobEvent.java
+  AL
client/src/main/java/org/apache/oozie/client/event/message/CoordinatorActionMessage.java
+  AL
client/src/main/java/org/apache/oozie/client/event/message/EventMessage.java
+  AL
client/src/main/java/org/apache/oozie/client/event/message/JobMessage.java
+  AL
client/src/main/java/org/apache/oozie/client/event/message/SLAMessage.java
+  AL
client/src/main/java/org/apache/oozie/client/event/message/WorkflowJobMessage.java
+  ALclient/src/main/java/org/apache/oozie/client/event/SLAEvent.java
+  ALclient/src/main/java/org/apache/oozie/client/JMSConnectionInfo.java
+  AL
client/src/main/java/org/apache/oozie/client/JMSConnectionInfoWrapper.java
+  ALclient/src/main/java/org/apache/oozie/client/Job.java
+  ALclient/src/main/java/org/apache/oozie/client/OozieClient.java
+  ALclient/src/main/java/org/apache/oozie/client/OozieClientException.java
+  ALclient/src/main/java/org/apache/oozie/client/rest/JsonTags.java
+  ALclient/src/main/java/org/apache/oozie/client/rest/JsonToBean.java
+  ALclient/src/main/java/org/apache/oozie/client/rest/JsonUtils.java
+  ALclient/src/main/java/org/apache/oozie/client/rest/RestConstants.java
+  AL
client/src/main/java/org/apache/oozie/client/retry/ConnectionRetriableClient.java
+  ALclient/src/main/java/org/apache/oozie/client/SLAEvent.java
+  ALclient/src/main/java/org/apache/oozie/client/WorkflowAction.java
+  ALclient/src/main/java/org/apache/oozie/client/WorkflowJob.java
+  ALclient/src/main/java/org/apache/oozie/client/XOozieClient.java
+  ALclient/src/main/resources/distcp-action-0.1.xsd
+  ALclient/src/main/resources/distcp-action-0.2.xsd
+  ALclient/src/main/resources/email-action-0.1.xsd
+  ALclient/src/main/resources/email-action-0.2.xsd
+  ALclient/src/main/resources/gms-oozie-sla-0.1.xsd
+  ALclient/src/main/resources/hive-action-0.2.xsd
+  ALclient/src/main/resources/hive-action-0.3.xsd
+  ALclient/src/main/resources/hive-action-0.4.xsd
+  ALclient/src/main/resources/hive-action-0.5.xsd
+  ALclient/src/main/resources/hive-action-0.6.xsd
+  ALclient/src/main/resources/hive-action-1.0.xsd
+  ALclient/src/main/resources/hive2-action-0.1.xsd
+  ALclient/src/main/resources/hive2-action-0.2.xsd
+  ALclient/src/main/resources/hive2-action-1.0.xsd
+  AL

svn commit: r24417 [3/3] - in /release/oozie/5.0.0-beta1: ./ oozie-5.0.0-beta1.tar.gz oozie-5.0.0-beta1.tar.gz.asc oozie-5.0.0-beta1.tar.gz.md5 rat_report release-log.txt

2018-01-24 Thread rkanter 
Added: release/oozie/5.0.0-beta1/release-log.txt
==
--- release/oozie/5.0.0-beta1/release-log.txt (added)
+++ release/oozie/5.0.0-beta1/release-log.txt Wed Jan 24 18:29:37 2018
@@ -0,0 +1,1685 @@
+-- Oozie 5.0.0-beta1 release
+
+OOZIE-3159 Spark Action fails because of absence of hadoop mapreduce jar(s) 
(asasvari)
+OOZIE-3083 Make improved version Info backward compatible (gezapeti via 
asasvari)
+OOZIE-3142 Integer Overflows in Purge retentionTime (Prabhu Joseph via 
andras.piros)
+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)
+OOZIE-2969 Drop support for Java 1.7 (dbist13 via gezapeti, pbacsko)
+OOZIE-2681 Fix javadoc to compile on JDK8 (dbist13, abhisekbafna, gezapeti)
+OOZIE-3112 SparkConfigrationService overwrites properties provided via 
--properties-file option in SparkAction (gezapeti)
+OOZIE-3126 Add option to allow list of users to access system config 
(satishsaley)
+OOZIE-2900 Retrieve tokens for oozie.launcher.mapreduce.job.hdfs-servers 
before submission (asasvari)
+OOZIE-3132 Instrument SLACalculatorMemory (andras.piros)
+OOZIE-2945 Update SpotBugs to stable version after GA (dbist13 via gezapeti)
+OOZIE-3114 Fix javadoc for warning: no @return (dbist13 via gezapeti)
+OOZIE-3107 org.apache.oozie.action.hadoop.TestHiveMain#testMain is flaky 
(dbist13 via pbacsko)
+OOZIE-3125 amend TestDBLoadDump.testImportInvalidDataLeavesTablesEmpty fails 
(asasvari)
+OOZIE-3106 amend upgrade surefire-plugin to 2.20.1 (dbist13 via asasvari)
+OOZIE-2869 Ability to add/remove MapReduce jars from action classpath 
(gezapeti)
+OOZIE-2296 Add an Oozie diagnostic bundle tool (asasvari)
+OOZIE-3125 TestDBLoadDump.testImportInvalidDataLeavesTablesEmpty fails 
(asasvari)
+OOZIE-3106 upgrade surefire-plugin to 2.20.1 (dbist13 via asasvari)
+OOZIE-2061 Remove CoordJobDeleteJPAExecutor (dbist13 via gezapeti)
+OOZIE-2997 files contain trailing white spaces in client lib (dbist13 via 
gezapeti)
+OOZIE-3101 Oozie should add error message to the response body (satishsaley)
+OOZIE-2964 Add -Xdoclint:all to javadoc opts (dbist13 via andras.piros)
+OOZIE-3022 Fix for warning has no file and won't be listed in dependency files 
details (dbist13 via gezapeti and andras.piros)
+OOZIE-3001 Core has many Javadoc warnings (lines with trailing spaces and 
longer than 132 chars) (dbist13 via andras.piros)
+OOZIE-2996 Add options for GC overhead limit error to maven.test.java.opts 
(dbist13 via andras.piros)
+OOZIE-2897 LauncherAM should support ACLs (pbacsko)
+OOZIE-2962 bump maven-javadoc-plugin to 2.10.4 (dbist13 via andras.piros)
+OOZIE-3103 Improve log message regarding max concurrency for coordinators 
(asasvari via rkanter)
+OOZIE-3102 External Link to "EL Expression Language Quick Reference" not found 
(asasvari)
+OOZIE-2618 Include hive-common in hive-beeline as compile component for 
hive-server2 (hive2 action) (wutaklon via andras.piros)
+OOZIE-1401 PurgeCommand should purge the workflow jobs w/o end_time (asasvari)
+OOZIE-3084 Add missing JVM properties to Jetty startup script (andras.piros)
+OOZIE-3097 Change version in pom in master to 5.0.0-beta1 (dbist13 via 
gezapeti)
+OOZIE-3098 Allow to use the rest api to get the creation time of the 
Coordinator (chiwen via andras.piros)
+OOZIE-3100 Upgrade javax.mail:mail to 1.4.7 (andras.piros)
+OOZIE-2929 Coordinator SLA should support configuration variable (chiwen via 
andras.piros)
+OOZIE-2896 Ensure compatibility for existing LauncherMapper settings 
(andras.piros)
+OOZIE-3095 Job submit command is not logged in audit log (puru)
+OOZIE-3096 Pre-commit job is timing out regularly (gezapeti)
+OOZIE-2406 Completely rewrite GraphGenerator code (andras.piros via gezapeti)
+OOZIE-3081 testSubmitWithLauncherQueue fails when FairScheduler is used 
(asasvari)
+OOZIE-3082 Move org.apache.oozie.action.hadoop.ActionStats to Oozie ShareLib 
(asasvari)
+OOZIE-3077 SLA documentation fixes (satishsaley)
+OOZIE-3031 Coord job with only unresolved dependencies doesn't timeout (puru 
via satishsaley)
+OOZIE-3079 Filtering coordinators returns bundle id as null (satishsaley)
+OOZIE-3078 PasswordMasker throws NPE with null arguments (asasvari)
+OOZIE-3075 Follow-up on OOZIE-3054: create the lib directory if it doesn't 
exist (pbacsko)
+OOZIE-3072 oozie.service.HadoopAccessorService.action.configurations   should 
overwrite default values set in Hadoop's configuration files (gezapeti)
+OOZIE-2963 Use net.hydromatic instead of org.pentaho aggdesigner-algorithmin 
pomfilesi (dbist13 via gezapeti)
+OOZIE-3070 Remove references to org.mortbay.jetty (pbacsko)
+OOZIE-2885 Running Spark actions should not need Hive on the classpath 
(satishsaley)
+OOZIE-2909 amend Fix license

svn commit: r24417 [1/3] - in /release/oozie/5.0.0-beta1: ./ oozie-5.0.0-beta1.tar.gz oozie-5.0.0-beta1.tar.gz.asc oozie-5.0.0-beta1.tar.gz.md5 rat_report release-log.txt

2018-01-24 Thread rkanter 
Author: rkanter
Date: Wed Jan 24 18:29:37 2018
New Revision: 24417

Log:
Adding Oozie 5.0.0-beta1 release artifacts

Added:
release/oozie/5.0.0-beta1/
release/oozie/5.0.0-beta1/oozie-5.0.0-beta1.tar.gz   (with props)
release/oozie/5.0.0-beta1/oozie-5.0.0-beta1.tar.gz.asc
release/oozie/5.0.0-beta1/oozie-5.0.0-beta1.tar.gz.md5
release/oozie/5.0.0-beta1/rat_report
release/oozie/5.0.0-beta1/release-log.txt

Added: release/oozie/5.0.0-beta1/oozie-5.0.0-beta1.tar.gz
==
Binary file - no diff available.

Propchange: release/oozie/5.0.0-beta1/oozie-5.0.0-beta1.tar.gz
--
svn:mime-type = application/octet-stream

Added: release/oozie/5.0.0-beta1/oozie-5.0.0-beta1.tar.gz.asc
==
--- release/oozie/5.0.0-beta1/oozie-5.0.0-beta1.tar.gz.asc (added)
+++ release/oozie/5.0.0-beta1/oozie-5.0.0-beta1.tar.gz.asc Wed Jan 24 18:29:37 
2018
@@ -0,0 +1,11 @@
+-BEGIN PGP SIGNATURE-
+
+iQEzBAABCAAdFiEEyvMEVyPT+C//UKD5msPTKuwKQXAFAlpfZq4ACgkQmsPTKuwK
+QXCR/QgA2JWGtcHhFS1IVI4w/lyPYc0LIb4RZkvFy67wGDflxbdgiKB7/apLQSgm
+wa3qVXst13LwXiDyqeYZ1nw9U53HueEtlGB3RiWvhvfEf6UCkFaxahPMNzDmjfjI
+2iqaFSLo8rSmO4mNNbB7Q6sbCif+VwejmGXnWTIE0wNDTtkqxiAkzVQAofGhqEQZ
+rhRelX2CFm3REtL8GgE5KBKZrRlVCKypG6x8uqNMCYbfMCSJ0C64/FoGY10vIktf
+XrQtDRVy62obgEOyunYGQRmD2vGA1VghHgQq+WRHnBgpq/8OcSx/W9/1GIr5SHwC
+WKWKd5hynKBfpiT1Itd1hmAJEygJLw==
+=D7yl
+-END PGP SIGNATURE-

Added: release/oozie/5.0.0-beta1/oozie-5.0.0-beta1.tar.gz.md5
==
--- release/oozie/5.0.0-beta1/oozie-5.0.0-beta1.tar.gz.md5 (added)
+++ release/oozie/5.0.0-beta1/oozie-5.0.0-beta1.tar.gz.md5 Wed Jan 24 18:29:37 
2018
@@ -0,0 +1,2 @@
+$ md5 oozie-5.0.0-beta1.tar.gz
+MD5 (oozie-5.0.0-beta1.tar.gz) = 3feb2b64ff5fad637a324d06b3518eca

svn commit: r1024248 - /websites/production/oozie/content/

2018-01-24 Thread asasvari 
Author: asasvari
Date: Wed Jan 24 14:10:48 2018
New Revision: 1024248

Log:
Publishing svnmucc operation to oozie site by asasvari

Added:
websites/production/oozie/content/
  - copied from r1024247, websites/staging/oozie/trunk/content/

svn commit: r1822101 - in /oozie/site/trunk: ./ content/ content/resources/docs/5.0.0-beta1/ content/resources/docs/5.0.0-beta1/client/ content/resources/docs/5.0.0-beta1/client/apidocs/ content/resou

2018-01-24 Thread asasvari 
Author: asasvari
Date: Wed Jan 24 13:37:21 2018
New Revision: 1822101

URL: http://svn.apache.org/viewvc?rev=1822101=rev
Log:
Adding docs for Oozie 5.0.0-beta1 release


[This commit notification would consist of 628 parts, 
which exceeds the limit of 50 ones, so it was shortened to the summary.]

oozie git commit: OOZIE-3166 Remove tomcat alias from AG_Install.twiki: To use a Self-Signed Certificate part (kmarton via andras.piros)

2018-01-24 Thread andras 
Repository: oozie
Updated Branches:
  refs/heads/master 53b2f26bc -> acdf291ae


OOZIE-3166 Remove tomcat alias from AG_Install.twiki: To use a Self-Signed 
Certificate part (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/acdf291a
Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/acdf291a
Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/acdf291a

Branch: refs/heads/master
Commit: acdf291aef48fd0f9a5b0e3270afacb7ee4a1543
Parents: 53b2f26
Author: Andras Piros 
Authored: Wed Jan 24 10:20:29 2018 -0300
Committer: Andras Piros 
Committed: Wed Jan 24 10:20:29 2018 -0300

--
 docs/src/site/twiki/AG_Install.twiki | 8 
 release-log.txt  | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/oozie/blob/acdf291a/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 508949d..8f331e4 100644
--- a/docs/src/site/twiki/AG_Install.twiki
+++ b/docs/src/site/twiki/AG_Install.twiki
@@ -722,23 +722,23 @@ match; =password= is the default.
 
 For example, if your Oozie server was at oozie.int.example.com, then you would 
do this:
 
-keytool -genkeypair -alias tomcat -keyalg RSA -dname 
"CN=oozie.int.example.com" -storepass password -keypass password
+keytool -genkeypair -alias jetty -keyalg RSA -dname "CN=oozie.int.example.com" 
-storepass password -keypass password
 
 If you're going to be using Oozie HA, it's simplest if you have a single 
certificate that all Oozie servers in the HA group can use.
 To do that, you'll need to use a wildcard on the subdomain it belongs to:
 
-keytool -genkeypair -alias tomcat -keyalg RSA -dname "CN=*.int.example.com" 
-storepass password -keypass password
+keytool -genkeypair -alias jetty -keyalg RSA -dname "CN=*.int.example.com" 
-storepass password -keypass password
 
 The above would work on any server in the int.example.com domain.
 
 2. Run the following command (as the Oozie user) to export a certificate file 
from the keystore file:
 
-keytool -exportcert -alias tomcat -file path/to/anywhere/certificate.cert 
-storepass password
+keytool -exportcert -alias jetty -file path/to/anywhere/certificate.cert 
-storepass password
 
 
 3. Run the following command (as any user) to create a truststore containing 
the certificate we just exported:
 
-keytool -import -alias tomcat -file path/to/certificate.cert -keystore 
/path/to/anywhere/oozie.truststore -storepass password2
+keytool -import -alias jetty -file path/to/certificate.cert -keystore 
/path/to/anywhere/oozie.truststore -storepass password2
 
 You'll need the =oozie.truststore= later if you're using the Oozie client (or 
other Java-based client); otherwise, you can skip
 this step.  The =storepass= value here is only used to verify or change the 
truststore and isn't typically required when only

http://git-wip-us.apache.org/repos/asf/oozie/blob/acdf291a/release-log.txt
--
diff --git a/release-log.txt b/release-log.txt
index 38e4da2..7e42c7f 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,5 +1,6 @@
 -- Oozie 5.0.0 release (trunk - unreleased)
 
+OOZIE-3166 Remove tomcat alias from AG_Install.twiki: To use a Self-Signed 
Certificate part (kmarton via andras.piros)
 OOZIE-2775 Oozie server does not stop if there is an exception during service 
initalization at startup (asasvari) 
 OOZIE-3145 >git status< should be clean after >mvn test< was called (kmarton 
via gezapeti)
 OOZIE-3162 amend Precommit build fails to add comment to JIRA (asasvari)

[oozie] Git Push Summary

2018-01-24 Thread asasvari 
Repository: oozie
Updated Tags:  refs/tags/release-5.0.0-beta1 [created] ab8987fdb

oozie git commit: OOZIE-2775 Oozie server does not stop if there is an exception during service initalization at startup (asasvari)

2018-01-24 Thread asasvari 
Repository: oozie
Updated Branches:
  refs/heads/master 823ddbe64 -> 53b2f26bc


OOZIE-2775 Oozie server does not stop if there is an exception during service 
initalization at startup (asasvari)


Project: http://git-wip-us.apache.org/repos/asf/oozie/repo
Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/53b2f26b
Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/53b2f26b
Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/53b2f26b

Branch: refs/heads/master
Commit: 53b2f26bcae9b0ccabf224c4d08680bb0bc968b7
Parents: 823ddbe
Author: Attila Sasvari 
Authored: Wed Jan 24 09:57:30 2018 +0100
Committer: Attila Sasvari 
Committed: Wed Jan 24 09:57:30 2018 +0100

--
 .../java/org/apache/oozie/service/Services.java |  2 +-
 release-log.txt |  1 +
 .../oozie/server/EmbeddedOozieServer.java   | 37 
 .../oozie/server/guice/ServicesProvider.java|  9 +++--
 4 files changed, 38 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/oozie/blob/53b2f26b/core/src/main/java/org/apache/oozie/service/Services.java
--
diff --git a/core/src/main/java/org/apache/oozie/service/Services.java 
b/core/src/main/java/org/apache/oozie/service/Services.java
index 1ca3bf5..7391605 100644
--- a/core/src/main/java/org/apache/oozie/service/Services.java
+++ b/core/src/main/java/org/apache/oozie/service/Services.java
@@ -304,7 +304,7 @@ public class Services {
 setService(entry.getValue().getClass());
 }
 } catch (RuntimeException rex) {
-log.fatal("Runtime Exception during Services Load. Check your list 
of '{0}' or '{1}'",
+log.fatal("Runtime Exception during Services Load. Check your list 
of [{0}] or [{1}]",
 CONF_SERVICE_CLASSES, CONF_SERVICE_EXT_CLASSES, rex);
 throw new ServiceException(ErrorCode.E0103, rex.getMessage(), rex);
 }

http://git-wip-us.apache.org/repos/asf/oozie/blob/53b2f26b/release-log.txt
--
diff --git a/release-log.txt b/release-log.txt
index 8f68ae9..38e4da2 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,5 +1,6 @@
 -- Oozie 5.0.0 release (trunk - unreleased)
 
+OOZIE-2775 Oozie server does not stop if there is an exception during service 
initalization at startup (asasvari) 
 OOZIE-3145 >git status< should be clean after >mvn test< was called (kmarton 
via gezapeti)
 OOZIE-3162 amend Precommit build fails to add comment to JIRA (asasvari)
 OOZIE-3159 Spark Action fails because of absence of hadoop mapreduce jar(s) 
(asasvari)

http://git-wip-us.apache.org/repos/asf/oozie/blob/53b2f26b/server/src/main/java/org/apache/oozie/server/EmbeddedOozieServer.java
--
diff --git 
a/server/src/main/java/org/apache/oozie/server/EmbeddedOozieServer.java 
b/server/src/main/java/org/apache/oozie/server/EmbeddedOozieServer.java
index b6b59b6..a0c27b8 100644
--- a/server/src/main/java/org/apache/oozie/server/EmbeddedOozieServer.java
+++ b/server/src/main/java/org/apache/oozie/server/EmbeddedOozieServer.java
@@ -22,6 +22,7 @@ import com.google.common.base.Preconditions;
 import com.google.inject.Guice;
 import com.google.inject.Inject;
 import com.google.inject.Injector;
+import com.google.inject.ProvisionException;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.oozie.server.guice.OozieGuiceModule;
 import org.apache.oozie.service.ConfigurationService;
@@ -199,6 +200,19 @@ public class EmbeddedOozieServer {
 LOG.info("Server started.");
 }
 
+public void shutdown() throws Exception {
+LOG.info("Shutting down.");
+if (serviceController != null) {
+serviceController.destroy();
+LOG.info("Oozie services stopped.");
+}
+
+if (server != null) {
+server.stop();
+LOG.info("Server stopped.");
+}
+}
+
 public void join() throws InterruptedException {
 server.join();
 }
@@ -206,9 +220,11 @@ public class EmbeddedOozieServer {
 public void addShutdownHook() {
 Runtime.getRuntime().addShutdownHook(new Thread() {
 public void run() {
-LOG.info("Shutting down.");
-serviceController.destroy();
-LOG.info("Oozie services stopped.");
+try {
+shutdown();
+} catch (final Exception e) {
+LOG.error(String.format("There were errors during 
shutdown. Error message: %s", e.getMessage()));
+}
 }
 });
 }
@@ -216,14 +232,21 @@ public class EmbeddedOozieServer {