You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by rk...@apache.org on 2015/06/13 01:53:53 UTC

[2/4] oozie git commit: OOZIE-2178 fix javadoc to compile on JDK8 (rkanter)

http://git-wip-us.apache.org/repos/asf/oozie/blob/fcbab934/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 5857055..829d5f5 100644
--- a/core/src/main/java/org/apache/oozie/service/Services.java
+++ b/core/src/main/java/org/apache/oozie/service/Services.java
@@ -40,14 +40,14 @@ import java.io.IOException;
 import java.io.File;
 
 /**
- * Services is a singleton that manages the lifecycle of all registered {@link Services}. <p/> It has 2 built in
- * services: {@link XLogService} and {@link ConfigurationService}. <p/> The rest of the services are loaded from the
+ * Services is a singleton that manages the lifecycle of all registered {@link Services}. <p> It has 2 built in
+ * services: {@link XLogService} and {@link ConfigurationService}. <p> The rest of the services are loaded from the
  * {@link #CONF_SERVICE_CLASSES} configuration property. The services class names must be separated by commas (spaces
- * and enters are allowed). <p/> The {@link #CONF_SYSTEM_MODE} configuration property is any of
- * NORMAL/SAFEMODE/NOWEBSERVICE. <p/> Services are loaded and initialized in the order they are defined in the in
- * configuration property. <p/> After all services are initialized, if the Instrumentation service is present, all
- * services that implement the {@link Instrumentable} are instrumented. <p/> Services are destroyed in reverse order.
- * <p/> If services initialization fail, initialized services are immediatly destroyed.
+ * and enters are allowed). <p> The {@link #CONF_SYSTEM_MODE} configuration property is any of
+ * NORMAL/SAFEMODE/NOWEBSERVICE. <p> Services are loaded and initialized in the order they are defined in the in
+ * configuration property. <p> After all services are initialized, if the Instrumentation service is present, all
+ * services that implement the {@link Instrumentable} are instrumented. <p> Services are destroyed in reverse order.
+ * <p> If services initialization fail, initialized services are immediatly destroyed.
  */
 public class Services {
     private static final int MAX_SYSTEM_ID_LEN = 10;
@@ -96,7 +96,7 @@ public class Services {
     }
 
     /**
-     * Create a services. <p/> The built in services are initialized.
+     * Create a services. <p> The built in services are initialized.
      *
      * @throws ServiceException thrown if any of the built in services could not initialize.
      */
@@ -146,7 +146,7 @@ public class Services {
     }
 
     /**
-     * Return active system mode. <p/> .
+     * Return active system mode. <p> .
      *
      * @return
      */
@@ -156,7 +156,7 @@ public class Services {
     }
 
     /**
-     * Return the runtime directory of the Oozie instance. <p/> The directory is created under TMP and it is always a
+     * Return the runtime directory of the Oozie instance. <p> The directory is created under TMP and it is always a
      * new directory per Services initialization.
      *
      * @return the runtime directory of the Oozie instance.
@@ -361,7 +361,7 @@ public class Services {
     }
 
     /**
-     * Set a service programmatically. <p/> The service will be initialized by the services. <p/> If a service is
+     * Set a service programmatically. <p> The service will be initialized by the services. <p> If a service is
      * already defined with the same public interface it will be destroyed.
      *
      * @param klass service klass

http://git-wip-us.apache.org/repos/asf/oozie/blob/fcbab934/core/src/main/java/org/apache/oozie/service/ShareLibService.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/oozie/service/ShareLibService.java b/core/src/main/java/org/apache/oozie/service/ShareLibService.java
index 96c4be2..b783379 100644
--- a/core/src/main/java/org/apache/oozie/service/ShareLibService.java
+++ b/core/src/main/java/org/apache/oozie/service/ShareLibService.java
@@ -709,7 +709,7 @@ public class ShareLibService implements Service, Instrumentable {
 
     /**
      * Instruments the log service.
-     * <p/>
+     * <p>
      * It sets instrumentation variables indicating the location of the sharelib and launcherlib
      *
      * @param instr instrumentation to use.
@@ -818,7 +818,7 @@ public class ShareLibService implements Service, Instrumentable {
 
     /**
      * Returns file system for shared libraries.
-     * <p/>
+     * <p>
      * If WorkflowAppService#getSystemLibPath doesn't have authority then a default one assumed
      *
      * @return file system for shared libraries

http://git-wip-us.apache.org/repos/asf/oozie/blob/fcbab934/core/src/main/java/org/apache/oozie/service/StatusTransitService.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/oozie/service/StatusTransitService.java b/core/src/main/java/org/apache/oozie/service/StatusTransitService.java
index 85ab668..4c4a022 100644
--- a/core/src/main/java/org/apache/oozie/service/StatusTransitService.java
+++ b/core/src/main/java/org/apache/oozie/service/StatusTransitService.java
@@ -43,7 +43,7 @@ import org.apache.oozie.util.XLog;
 
 /**
  * StateTransitService is scheduled to run at the configured interval.
- * <p/>
+ * <p>
  * It is to update job's status according to its child actions' status. If all child actions' pending flag equals 0 (job
  * done), we reset the job's pending flag to 0. If all child actions are succeeded, we set the job's status to
  * SUCCEEDED.
@@ -61,7 +61,7 @@ public class StatusTransitService implements Service {
 
     /**
      * StateTransitRunnable is the runnable which is scheduled to run at the configured interval.
-     * <p/>
+     * <p>
      * It is to update job's status according to its child actions' status. If all child actions' pending flag equals 0
      * (job done), we reset the job's pending flag to 0. If all child actions are succeeded, we set the job's status to
      * SUCCEEDED.

http://git-wip-us.apache.org/repos/asf/oozie/blob/fcbab934/core/src/main/java/org/apache/oozie/service/UUIDService.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/oozie/service/UUIDService.java b/core/src/main/java/org/apache/oozie/service/UUIDService.java
index cd4ee2f..b0cf0ad 100644
--- a/core/src/main/java/org/apache/oozie/service/UUIDService.java
+++ b/core/src/main/java/org/apache/oozie/service/UUIDService.java
@@ -28,11 +28,11 @@ import org.apache.oozie.util.XLog;
 
 /**
  * The UUID service generates unique IDs.
- * <p/>
+ * <p>
  * The configuration property {@link #CONF_GENERATOR} specifies the ID generation type, 'random' or 'counter'.
- * <p/>
+ * <p>
  * For 'random' uses the JDK UUID.randomUUID() method.
- * <p/>
+ * <p>
  * For 'counter' uses a counter postfixed wit the system start up time.
  */
 public class UUIDService implements Service {
@@ -77,7 +77,6 @@ public class UUIDService implements Service {
 
     /**
      * reset start time
-     * @return
      */
     protected void resetStartTime() {
         startTime = new SimpleDateFormat("yyMMddHHmmssSSS").format(new Date());
@@ -151,7 +150,7 @@ public class UUIDService implements Service {
 
     /**
      * Create a child ID.
-     * <p/>
+     * <p>
      * If the same child name is given the returned child ID is the same.
      *
      * @param id unique ID.

http://git-wip-us.apache.org/repos/asf/oozie/blob/fcbab934/core/src/main/java/org/apache/oozie/service/WorkflowAppService.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/oozie/service/WorkflowAppService.java b/core/src/main/java/org/apache/oozie/service/WorkflowAppService.java
index 6b6e97c..6891bbe 100644
--- a/core/src/main/java/org/apache/oozie/service/WorkflowAppService.java
+++ b/core/src/main/java/org/apache/oozie/service/WorkflowAppService.java
@@ -153,7 +153,7 @@ public abstract class WorkflowAppService implements Service {
         }
     }
     /**
-     * Create proto configuration. <p/> The proto configuration includes the user,group and the paths which need to be
+     * Create proto configuration. <p> The proto configuration includes the user,group and the paths which need to be
      * added to distributed cache. These paths include .jar,.so and the resource file paths.
      *
      * @param jobConf job configuration.

http://git-wip-us.apache.org/repos/asf/oozie/blob/fcbab934/core/src/main/java/org/apache/oozie/service/WorkflowStoreService.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/oozie/service/WorkflowStoreService.java b/core/src/main/java/org/apache/oozie/service/WorkflowStoreService.java
index 8ce2b23..72e0fe4 100644
--- a/core/src/main/java/org/apache/oozie/service/WorkflowStoreService.java
+++ b/core/src/main/java/org/apache/oozie/service/WorkflowStoreService.java
@@ -58,7 +58,7 @@ public abstract class WorkflowStoreService implements Service {
     public abstract WorkflowLib getWorkflowLibWithNoDB();
 
     /**
-     * Return a workflow store instance with a fresh transaction. <p/> The workflow store has to be committed and then
+     * Return a workflow store instance with a fresh transaction. <p> The workflow store has to be committed and then
      * closed to commit changes, if only close it rolls back.
      *
      * @return a workflow store.
@@ -67,7 +67,7 @@ public abstract class WorkflowStoreService implements Service {
     public abstract WorkflowStore create() throws StoreException;
 
     /**
-     * Return a workflow store instance with an existing transaction. <p/> The workflow store has to be committed and
+     * Return a workflow store instance with an existing transaction. <p> The workflow store has to be committed and
      * then closed to commit changes, if only close it rolls back.
      *
      * @return a workflow store.

http://git-wip-us.apache.org/repos/asf/oozie/blob/fcbab934/core/src/main/java/org/apache/oozie/service/XLogService.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/oozie/service/XLogService.java b/core/src/main/java/org/apache/oozie/service/XLogService.java
index 3feab4c..04f04f4 100644
--- a/core/src/main/java/org/apache/oozie/service/XLogService.java
+++ b/core/src/main/java/org/apache/oozie/service/XLogService.java
@@ -39,20 +39,20 @@ import java.util.Map;
 
 /**
  * Built-in service that initializes and manages Logging via Log4j.
- * <p/>
+ * <p>
  * Oozie Lo4gj default configuration file is <code>oozie-log4j.properties</code>.
- * <p/>
+ * <p>
  * The file name can be changed by setting the Java System property <code>oozie.log4j.file</code>.
- * <p/>
+ * <p>
  * The Log4j configuration files must be a properties file.
- * <p/>
+ * <p>
  * The Log4j configuration file is first looked in the Oozie configuration directory see {@link ConfigurationService}.
  * If the file is not found there, it is looked in the classpath.
- * <p/>
+ * <p>
  * If the Log4j configuration file is loaded from Oozie configuration directory, automatic reloading is enabled.
- * <p/>
+ * <p>
  * If the Log4j configuration file is loaded from the classpath, automatic reloading is disabled.
- * <p/>
+ * <p>
  * the automatic reloading interval is defined by the Java System property <code>oozie.log4j.reload</code>. The default
  * value is 10 seconds.
  * <p>
@@ -266,7 +266,7 @@ public class XLogService implements Service, Instrumentable {
 
     /**
      * Instruments the log service.
-     * <p/>
+     * <p>
      * It sets instrumentation variables indicating the config file, reload interval and if loaded from the classpath.
      *
      * @param instr instrumentation to use.

http://git-wip-us.apache.org/repos/asf/oozie/blob/fcbab934/core/src/main/java/org/apache/oozie/service/ZKUUIDService.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/oozie/service/ZKUUIDService.java b/core/src/main/java/org/apache/oozie/service/ZKUUIDService.java
index 90227a2..61a6274 100644
--- a/core/src/main/java/org/apache/oozie/service/ZKUUIDService.java
+++ b/core/src/main/java/org/apache/oozie/service/ZKUUIDService.java
@@ -89,7 +89,6 @@ public class ZKUUIDService extends UUIDService {
      * Gets the unique id.
      *
      * @return the id
-     * @throws Exception the exception
      */
     @Override
     protected String createSequence() {

http://git-wip-us.apache.org/repos/asf/oozie/blob/fcbab934/core/src/main/java/org/apache/oozie/servlet/AuthFilter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/oozie/servlet/AuthFilter.java b/core/src/main/java/org/apache/oozie/servlet/AuthFilter.java
index b5b477d..38d575d 100644
--- a/core/src/main/java/org/apache/oozie/servlet/AuthFilter.java
+++ b/core/src/main/java/org/apache/oozie/servlet/AuthFilter.java
@@ -85,7 +85,7 @@ public class AuthFilter extends AuthenticationFilter {
 
     /**
      * Returns the configuration from Oozie configuration to be used by the authentication filter.
-     * <p/>
+     * <p>
      * All properties from Oozie configuration which name starts with {@link #OOZIE_PREFIX} will
      * be returned. The keys of the returned properties are trimmed from the {@link #OOZIE_PREFIX}
      * prefix, for example the Oozie configuration property name 'oozie.authentication.type' will
@@ -143,7 +143,7 @@ public class AuthFilter extends AuthenticationFilter {
 
     /**
      * Enforces authentication using Hadoop-auth AuthenticationFilter.
-     * <p/>
+     * <p>
      * This method is overriden to respond to HTTP OPTIONS requests for authenticated calls, regardless
      * of the target servlet supporting OPTIONS or not and to inject the authenticated user name as
      * request attribute for Oozie to retrieve the user id.

http://git-wip-us.apache.org/repos/asf/oozie/blob/fcbab934/core/src/main/java/org/apache/oozie/servlet/BaseJobServlet.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/oozie/servlet/BaseJobServlet.java b/core/src/main/java/org/apache/oozie/servlet/BaseJobServlet.java
index 9be4866..2110522 100644
--- a/core/src/main/java/org/apache/oozie/servlet/BaseJobServlet.java
+++ b/core/src/main/java/org/apache/oozie/servlet/BaseJobServlet.java
@@ -217,7 +217,7 @@ public abstract class BaseJobServlet extends JsonRestServlet {
             IOException;
 
     /**
-     * Validate the configuration user/group. <p/>
+     * Validate the configuration user/group. <p>
      *
      * @param conf configuration.
      * @throws XServletException thrown if the configuration does not have a property {@link
@@ -517,7 +517,7 @@ public abstract class BaseJobServlet extends JsonRestServlet {
      *
      * @param request the request
      * @param response the response
-     * @param Configuration conf
+     * @param conf the Configuration
      * @return the JSON object
      * @throws XServletException the x servlet exception
      * @throws IOException Signals that an I/O exception has occurred.

http://git-wip-us.apache.org/repos/asf/oozie/blob/fcbab934/core/src/main/java/org/apache/oozie/servlet/HostnameFilter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/oozie/servlet/HostnameFilter.java b/core/src/main/java/org/apache/oozie/servlet/HostnameFilter.java
index 9e524e2..3e17090 100644
--- a/core/src/main/java/org/apache/oozie/servlet/HostnameFilter.java
+++ b/core/src/main/java/org/apache/oozie/servlet/HostnameFilter.java
@@ -41,7 +41,7 @@ public class HostnameFilter implements Filter {
 
     /**
      * Initializes the filter.
-     * <p/>
+     * <p>
      * This implementation is a NOP.
      *
      * @param config filter configuration.
@@ -54,7 +54,7 @@ public class HostnameFilter implements Filter {
 
     /**
      * Resolves the requester hostname and delegates the request to the chain.
-     * <p/>
+     * <p>
      * The requester hostname is available via the {@link #get} method.
      *
      * @param request servlet request.
@@ -101,7 +101,7 @@ public class HostnameFilter implements Filter {
 
     /**
      * Destroys the filter.
-     * <p/>
+     * <p>
      * This implementation is a NOP.
      */
     @Override

http://git-wip-us.apache.org/repos/asf/oozie/blob/fcbab934/core/src/main/java/org/apache/oozie/servlet/JsonRestServlet.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/oozie/servlet/JsonRestServlet.java b/core/src/main/java/org/apache/oozie/servlet/JsonRestServlet.java
index db80c3d..059d3cf 100644
--- a/core/src/main/java/org/apache/oozie/servlet/JsonRestServlet.java
+++ b/core/src/main/java/org/apache/oozie/servlet/JsonRestServlet.java
@@ -46,7 +46,7 @@ import java.util.*;
 import java.util.concurrent.atomic.AtomicLong;
 
 /**
- * Base class for Oozie web service API Servlets. <p/> This class provides common instrumentation, error logging and
+ * Base class for Oozie web service API Servlets. <p> This class provides common instrumentation, error logging and
  * other common functionality.
  */
 public abstract class JsonRestServlet extends HttpServlet {
@@ -169,7 +169,7 @@ public abstract class JsonRestServlet extends HttpServlet {
     }
 
     /**
-     * Define an instrumentation sampler. <p/> Sampling period is 60 seconds, the sampling frequency is 1 second. <p/>
+     * Define an instrumentation sampler. <p> Sampling period is 60 seconds, the sampling frequency is 1 second. <p>
      * The instrumentation group used is {@link #INSTRUMENTATION_GROUP}.
      *
      * @param samplerName sampler name.
@@ -482,7 +482,7 @@ public abstract class JsonRestServlet extends HttpServlet {
     }
 
     /**
-     * Return the resource name of the request. <p/> The resource name is the whole extra path. If the extra path starts
+     * Return the resource name of the request. <p> The resource name is the whole extra path. If the extra path starts
      * with '/', the first '/' is trimmed.
      *
      * @param request request instance

http://git-wip-us.apache.org/repos/asf/oozie/blob/fcbab934/core/src/main/java/org/apache/oozie/servlet/V1AdminServlet.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/oozie/servlet/V1AdminServlet.java b/core/src/main/java/org/apache/oozie/servlet/V1AdminServlet.java
index 2383433..965a19a 100644
--- a/core/src/main/java/org/apache/oozie/servlet/V1AdminServlet.java
+++ b/core/src/main/java/org/apache/oozie/servlet/V1AdminServlet.java
@@ -128,7 +128,7 @@ public class V1AdminServlet extends BaseAdminServlet {
     /**
      * Get a json array of queue dump and a json array of unique map dump
      *
-     * @param JSONObject the result json object that contains a JSONArray for the callable dump
+     * @param json the result json object that contains a JSONArray for the callable dump
      *
      * @see
      * org.apache.oozie.servlet.BaseAdminServlet#getQueueDump(org.json.simple

http://git-wip-us.apache.org/repos/asf/oozie/blob/fcbab934/core/src/main/java/org/apache/oozie/servlet/XServletException.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/oozie/servlet/XServletException.java b/core/src/main/java/org/apache/oozie/servlet/XServletException.java
index 2b5e34d..59a0df9 100644
--- a/core/src/main/java/org/apache/oozie/servlet/XServletException.java
+++ b/core/src/main/java/org/apache/oozie/servlet/XServletException.java
@@ -25,7 +25,7 @@ import org.apache.oozie.util.XLog;
 import javax.servlet.ServletException;
 
 /**
- * Specialized Oozie servlet exception that uses Oozie error codes. <p/> It extends ServletException so it can be
+ * Specialized Oozie servlet exception that uses Oozie error codes. <p> It extends ServletException so it can be
  * handled in the <code>Servlet.service</code> method of the {@link JsonRestServlet}.
  */
 public class XServletException extends ServletException {

http://git-wip-us.apache.org/repos/asf/oozie/blob/fcbab934/core/src/main/java/org/apache/oozie/sla/SLACalcStatus.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/oozie/sla/SLACalcStatus.java b/core/src/main/java/org/apache/oozie/sla/SLACalcStatus.java
index 0d7123a..5c0cfd9 100644
--- a/core/src/main/java/org/apache/oozie/sla/SLACalcStatus.java
+++ b/core/src/main/java/org/apache/oozie/sla/SLACalcStatus.java
@@ -94,7 +94,6 @@ public class SLACalcStatus extends SLAEvent {
 
     /**
      * copy constructor
-     * @return SLACalcStatus
      */
     public SLACalcStatus(SLACalcStatus a) {
         this();
@@ -296,7 +295,7 @@ public class SLACalcStatus extends SLAEvent {
     }
     /**
      * Obtain an exclusive lock on the {link #getEntityKey}.
-     * <p/>
+     * <p>
      * A timeout of {link #getLockTimeOut} is used when trying to obtain the lock.
      *
      * @throws InterruptedException thrown if an interruption happened while trying to obtain the lock

http://git-wip-us.apache.org/repos/asf/oozie/blob/fcbab934/core/src/main/java/org/apache/oozie/sla/SLACalculator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/oozie/sla/SLACalculator.java b/core/src/main/java/org/apache/oozie/sla/SLACalculator.java
index f238321..8949515 100644
--- a/core/src/main/java/org/apache/oozie/sla/SLACalculator.java
+++ b/core/src/main/java/org/apache/oozie/sla/SLACalculator.java
@@ -66,7 +66,7 @@ public interface SLACalculator {
 
     /**
      * Enable sla alert for child jobs.
-     * @param jobId the parent job ids
+     * @param parentJobIds the parent job ids
      * @return
      * @throws JPAExecutorException
      * @throws ServiceException
@@ -86,7 +86,7 @@ public interface SLACalculator {
 
     /**
      * Disable Sla alert for child jobs.
-     * @param jobId the parent job ids
+     * @param parentJobIds the parent job ids
      * @return
      * @throws JPAExecutorException
      * @throws ServiceException

http://git-wip-us.apache.org/repos/asf/oozie/blob/fcbab934/core/src/main/java/org/apache/oozie/sla/listener/SLAEventListener.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/oozie/sla/listener/SLAEventListener.java b/core/src/main/java/org/apache/oozie/sla/listener/SLAEventListener.java
index 7bd560b..ab77104 100644
--- a/core/src/main/java/org/apache/oozie/sla/listener/SLAEventListener.java
+++ b/core/src/main/java/org/apache/oozie/sla/listener/SLAEventListener.java
@@ -40,37 +40,37 @@ public abstract class SLAEventListener {
 
     /**
      * on SLA job start-time limit met
-     * @param SLAEvent
+     * @param work
      */
     public abstract void onStartMet(SLAEvent work);
 
     /**
      * on SLA job start-time limit missed
-     * @param SLAEvent
+     * @param event
      */
     public abstract void onStartMiss(SLAEvent event);
 
     /**
      * on SLA job end-time limit met
-     * @param SLAEvent
+     * @param work
      */
     public abstract void onEndMet(SLAEvent work);
 
     /**
      * on SLA job end-time limit missed
-     * @param SLAEvent
+     * @param event
      */
     public abstract void onEndMiss(SLAEvent event);
 
     /**
      * on SLA job duration limit met
-     * @param SLAEvent
+     * @param work
      */
     public abstract void onDurationMet(SLAEvent work);
 
     /**
      * on SLA job duration limit missed
-     * @param SLAEvent
+     * @param event
      */
     public abstract void onDurationMiss(SLAEvent event);
 

http://git-wip-us.apache.org/repos/asf/oozie/blob/fcbab934/core/src/main/java/org/apache/oozie/sla/service/SLAService.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/oozie/sla/service/SLAService.java b/core/src/main/java/org/apache/oozie/sla/service/SLAService.java
index ef1d335..08cd07e 100644
--- a/core/src/main/java/org/apache/oozie/sla/service/SLAService.java
+++ b/core/src/main/java/org/apache/oozie/sla/service/SLAService.java
@@ -187,7 +187,6 @@ public class SLAService implements Service {
      * Enable jobs sla alert.
      *
      * @param jobIds the job ids
-     * @param isParentJob, if jobIds are parent job
      * @return true, if successful
      * @throws ServiceException the service exception
      */
@@ -204,8 +203,7 @@ public class SLAService implements Service {
     /**
      * Enable child jobs sla alert.
      *
-     * @param jobIds the parent job ids
-     * @param isParentJob, if jobIds are parent job
+     * @param parentJobIds the parent job ids
      * @return true, if successful
      * @throws ServiceException the service exception
      */
@@ -223,7 +221,6 @@ public class SLAService implements Service {
      * Disable jobs Sla alert.
      *
      * @param jobIds the job ids
-     * @param isParentJob, if jobIds are parent job
      * @return true, if successful
      * @throws ServiceException the service exception
      */
@@ -240,8 +237,7 @@ public class SLAService implements Service {
     /**
      * Disable child jobs Sla alert.
      *
-     * @param jobIds the parent job ids
-     * @param isParentJob, if jobIds are parent job
+     * @param parentJobIds the parent job ids
      * @return true, if successful
      * @throws ServiceException the service exception
      */
@@ -260,7 +256,7 @@ public class SLAService implements Service {
      * It takes list of pairs of jobid and key/value pairs of el evaluated sla definition.
      * Support definition are sla-should-start, sla-should-end, sla-nominal-time and sla-max-duration.
      *
-     * @param jobIdsSLAPair the job ids sla pair
+     * @param idSlaDefinitionList the job ids sla pair
      * @return true, if successful
      * @throws ServiceException the service exception
      */

http://git-wip-us.apache.org/repos/asf/oozie/blob/fcbab934/core/src/main/java/org/apache/oozie/store/SLAStore.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/oozie/store/SLAStore.java b/core/src/main/java/org/apache/oozie/store/SLAStore.java
index 9f818be..34f47fb 100644
--- a/core/src/main/java/org/apache/oozie/store/SLAStore.java
+++ b/core/src/main/java/org/apache/oozie/store/SLAStore.java
@@ -51,9 +51,9 @@ public class SLAStore extends Store {
     }
 
     /**
-     * Create a CoordJobBean. It also creates the process instance for the job.
+     * Create an SLAEventBeane. It also creates the process instance for the job.
      *
-     * @param workflow workflow bean
+     * @param slaEvent sla event bean
      * @throws StoreException
      */
 

http://git-wip-us.apache.org/repos/asf/oozie/blob/fcbab934/core/src/main/java/org/apache/oozie/store/Store.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/oozie/store/Store.java b/core/src/main/java/org/apache/oozie/store/Store.java
index aad2b63..b60f022 100644
--- a/core/src/main/java/org/apache/oozie/store/Store.java
+++ b/core/src/main/java/org/apache/oozie/store/Store.java
@@ -90,7 +90,7 @@ public abstract class Store {
     }
 
     /**
-     * Close current transaction <p/> Before close transaction, it needs to be committed.
+     * Close current transaction <p> Before close transaction, it needs to be committed.
      */
     public void closeTrx() {
         entityManager.close();

http://git-wip-us.apache.org/repos/asf/oozie/blob/fcbab934/core/src/main/java/org/apache/oozie/store/WorkflowStore.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/oozie/store/WorkflowStore.java b/core/src/main/java/org/apache/oozie/store/WorkflowStore.java
index d256dbe..c565e74 100644
--- a/core/src/main/java/org/apache/oozie/store/WorkflowStore.java
+++ b/core/src/main/java/org/apache/oozie/store/WorkflowStore.java
@@ -361,7 +361,6 @@ public class WorkflowStore extends Store {
      * @param wfId Workflow ID
      * @param start offset for select statement
      * @param len number of Workflow Actions to be returned
-     * @param locking true if Actions are to be locked
      * @return A List of WorkflowActionBean
      * @throws StoreException
      */

http://git-wip-us.apache.org/repos/asf/oozie/blob/fcbab934/core/src/main/java/org/apache/oozie/test/EmbeddedServletContainer.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/oozie/test/EmbeddedServletContainer.java b/core/src/main/java/org/apache/oozie/test/EmbeddedServletContainer.java
index f6207e8..30b856c 100644
--- a/core/src/main/java/org/apache/oozie/test/EmbeddedServletContainer.java
+++ b/core/src/main/java/org/apache/oozie/test/EmbeddedServletContainer.java
@@ -28,8 +28,8 @@ import java.net.ServerSocket;
 import java.util.Map;
 
 /**
- * An embedded servlet container for testing purposes. <p/> It provides reduced functionality, it supports only
- * Servlets. <p/> The servlet container is started in a free port.
+ * An embedded servlet container for testing purposes. <p> It provides reduced functionality, it supports only
+ * Servlets. <p> The servlet container is started in a free port.
  */
 public class EmbeddedServletContainer {
     private Server server;
@@ -91,7 +91,7 @@ public class EmbeddedServletContainer {
     }
 
     /**
-     * Start the servlet container. <p/> The container starts on a free port.
+     * Start the servlet container. <p> The container starts on a free port.
      *
      * @throws Exception thrown if the container could not start.
      */

http://git-wip-us.apache.org/repos/asf/oozie/blob/fcbab934/core/src/main/java/org/apache/oozie/util/ClassUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/oozie/util/ClassUtils.java b/core/src/main/java/org/apache/oozie/util/ClassUtils.java
index 26e4581..b47f4f0 100644
--- a/core/src/main/java/org/apache/oozie/util/ClassUtils.java
+++ b/core/src/main/java/org/apache/oozie/util/ClassUtils.java
@@ -29,7 +29,7 @@ import java.io.IOException;
 public class ClassUtils {
 
     /**
-     * Return the path to the JAR file in the classpath containing the specified class. <p/> This method has been
+     * Return the path to the JAR file in the classpath containing the specified class. <p> This method has been
      * canibalized from Hadoop's JobConf class.
      *
      * @param clazz class to find its JAR file.

http://git-wip-us.apache.org/repos/asf/oozie/blob/fcbab934/core/src/main/java/org/apache/oozie/util/DateUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/oozie/util/DateUtils.java b/core/src/main/java/org/apache/oozie/util/DateUtils.java
index 2b17a78..e20aca3 100644
--- a/core/src/main/java/org/apache/oozie/util/DateUtils.java
+++ b/core/src/main/java/org/apache/oozie/util/DateUtils.java
@@ -59,7 +59,7 @@ public class DateUtils {
 
     /**
      * Configures the Datetime parsing with Oozie processing timezone.
-     * <p/>
+     * <p>
      * The {@link #OOZIE_PROCESSING_TIMEZONE_KEY} property is read and set as the Oozie processing timezone.
      * Valid values for this property are <code>UTC</code> and <code>GMT(+/-)####</code>
      *
@@ -87,7 +87,7 @@ public class DateUtils {
 
     /**
      * Returns Oozie processing datetime mask.
-     * <p/>
+     * <p>
      * This mask is an ISO8601 datetime mask for the Oozie processing timezone.
      *
      * @return  Oozie processing datetime mask.
@@ -193,7 +193,7 @@ public class DateUtils {
 
     /**
      * Formats a {@link Date} as a string using the specified format mask.
-     * <p/>
+     * <p>
      * The format mask must be a {@link SimpleDateFormat} valid format mask.
      *
      * @param d {@link Date} to format.

http://git-wip-us.apache.org/repos/asf/oozie/blob/fcbab934/core/src/main/java/org/apache/oozie/util/ELConstantsFunctions.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/oozie/util/ELConstantsFunctions.java b/core/src/main/java/org/apache/oozie/util/ELConstantsFunctions.java
index 6be4265..4524623 100644
--- a/core/src/main/java/org/apache/oozie/util/ELConstantsFunctions.java
+++ b/core/src/main/java/org/apache/oozie/util/ELConstantsFunctions.java
@@ -77,7 +77,7 @@ public class ELConstantsFunctions {
     }
 
     /**
-     * Return the concatenation of 2 strings. <p/> A string with <code>null</code> value is considered as an empty
+     * Return the concatenation of 2 strings. <p> A string with <code>null</code> value is considered as an empty
      * string.
      *
      * @param s1 first string.

http://git-wip-us.apache.org/repos/asf/oozie/blob/fcbab934/core/src/main/java/org/apache/oozie/util/ELEvaluator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/oozie/util/ELEvaluator.java b/core/src/main/java/org/apache/oozie/util/ELEvaluator.java
index 689241f..84eaa3d 100644
--- a/core/src/main/java/org/apache/oozie/util/ELEvaluator.java
+++ b/core/src/main/java/org/apache/oozie/util/ELEvaluator.java
@@ -31,12 +31,12 @@ import java.util.HashMap;
 import java.util.Map;
 
 /**
- * JSP Expression Language Evaluator. <p/> It provides a more convenient way of using the JSP EL Evaluator.
+ * JSP Expression Language Evaluator. <p> It provides a more convenient way of using the JSP EL Evaluator.
  */
 public class ELEvaluator {
 
     /**
-     * Provides functions and variables for the EL evaluator. <p/> All functions and variables in the context of an EL
+     * Provides functions and variables for the EL evaluator. <p> All functions and variables in the context of an EL
      * evaluator are accessible from EL expressions.
      */
     public static class Context implements VariableResolver, FunctionMapper {
@@ -52,7 +52,7 @@ public class ELEvaluator {
         }
 
         /**
-         * Add variables to the context. <p/>
+         * Add variables to the context. <p>
          *
          * @param vars variables to add to the context.
          */
@@ -61,7 +61,7 @@ public class ELEvaluator {
         }
 
         /**
-         * Add a variable to the context. <p/>
+         * Add a variable to the context. <p>
          *
          * @param name variable name.
          * @param value variable value.
@@ -71,7 +71,7 @@ public class ELEvaluator {
         }
 
         /**
-         * Return a variable from the context. <p/>
+         * Return a variable from the context. <p>
          *
          * @param name variable name.
          * @return the variable value.
@@ -81,7 +81,7 @@ public class ELEvaluator {
         }
 
         /**
-         * Add a function to the context. <p/>
+         * Add a function to the context. <p>
          *
          * @param prefix function prefix.
          * @param functionName function name.
@@ -96,7 +96,7 @@ public class ELEvaluator {
         }
 
         /**
-         * Resolve a variable name. Used by the EL evaluator implemenation. <p/>
+         * Resolve a variable name. Used by the EL evaluator implemenation. <p>
          *
          * @param name variable name.
          * @return the variable value.
@@ -110,7 +110,7 @@ public class ELEvaluator {
         }
 
         /**
-         * Resolve a function prefix:name. Used by the EL evaluator implementation. <p/>
+         * Resolve a function prefix:name. Used by the EL evaluator implementation. <p>
          *
          * @param prefix function prefix.
          * @param name function name.
@@ -128,9 +128,9 @@ public class ELEvaluator {
 
     /**
      * If within the scope of a EL evaluation call, it gives access to the ELEvaluator instance performing the EL
-     * evaluation. <p/> This is useful for EL function methods to get access to the variables of the Evaluator. Because
+     * evaluation. <p> This is useful for EL function methods to get access to the variables of the Evaluator. Because
      * of this, ELEvaluator variables can be used to pass context to EL function methods (which must be static methods).
-     * <p/>
+     * <p>
      *
      * @return the ELEvaluator in scope, or <code>null</code> if none.
      */
@@ -150,7 +150,7 @@ public class ELEvaluator {
     }
 
     /**
-     * Creates an ELEvaluator with the functions and variables defined in the given {@link ELEvaluator.Context}. <p/>
+     * Creates an ELEvaluator with the functions and variables defined in the given {@link ELEvaluator.Context}. <p>
      *
      * @param context the ELSupport with functions and variables to be available for EL evalution.
      */
@@ -159,7 +159,7 @@ public class ELEvaluator {
     }
 
     /**
-     * Return the context with the functions and variables of the EL evaluator. <p/>
+     * Return the context with the functions and variables of the EL evaluator. <p>
      *
      * @return the context.
      */
@@ -168,7 +168,7 @@ public class ELEvaluator {
     }
 
     /**
-     * Convenience method that sets a variable in the EL evaluator context. <p/>
+     * Convenience method that sets a variable in the EL evaluator context. <p>
      *
      * @param name variable name.
      * @param value variable value.
@@ -178,7 +178,7 @@ public class ELEvaluator {
     }
 
     /**
-     * Convenience method that returns a variable from the EL evaluator context. <p/>
+     * Convenience method that returns a variable from the EL evaluator context. <p>
      *
      * @param name variable name.
      * @return the variable value, <code>null</code> if not defined.
@@ -188,7 +188,7 @@ public class ELEvaluator {
     }
 
     /**
-     * Evaluate an EL expression. <p/>
+     * Evaluate an EL expression. <p>
      *
      * @param expr EL expression to evaluate.
      * @param clazz return type of the EL expression.

http://git-wip-us.apache.org/repos/asf/oozie/blob/fcbab934/core/src/main/java/org/apache/oozie/util/IOUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/oozie/util/IOUtils.java b/core/src/main/java/org/apache/oozie/util/IOUtils.java
index 01ee79c..a6c2fda 100644
--- a/core/src/main/java/org/apache/oozie/util/IOUtils.java
+++ b/core/src/main/java/org/apache/oozie/util/IOUtils.java
@@ -65,7 +65,7 @@ public abstract class IOUtils {
     }
 
     /**
-     * Return a reader as string. <p/>
+     * Return a reader as string. <p>
      *
      * @param reader reader to read into a string.
      * @param maxLen max content length allowed, if -1 there is no limit.
@@ -91,7 +91,7 @@ public abstract class IOUtils {
 
 
     /**
-     * Return a classpath resource as a stream. <p/>
+     * Return a classpath resource as a stream. <p>
      *
      * @param path classpath for the resource.
      * @param maxLen max content length allowed.
@@ -108,7 +108,7 @@ public abstract class IOUtils {
     }
 
     /**
-     * Return a classpath resource as a reader. <p/> It is assumed that the resource is a text resource.
+     * Return a classpath resource as a reader. <p> It is assumed that the resource is a text resource.
      *
      * @param path classpath for the resource.
      * @param maxLen max content length allowed.
@@ -120,7 +120,7 @@ public abstract class IOUtils {
     }
 
     /**
-     * Return a classpath resource as string. <p/> It is assumed that the resource is a text resource.
+     * Return a classpath resource as string. <p> It is assumed that the resource is a text resource.
      *
      * @param path classpath for the resource.
      * @param maxLen max content length allowed.
@@ -261,7 +261,7 @@ public abstract class IOUtils {
     }
 
     /**
-     * Close a list of resources. </p> Any thrown exceptions are suppressed.
+     * Close a list of resources. <p> Any thrown exceptions are suppressed.
      * @param objects list of objects to close
      */
     public static void closeSafely(Closeable... objects) {

http://git-wip-us.apache.org/repos/asf/oozie/blob/fcbab934/core/src/main/java/org/apache/oozie/util/Instrumentation.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/oozie/util/Instrumentation.java b/core/src/main/java/org/apache/oozie/util/Instrumentation.java
index 3dfb67a..4eb6386 100644
--- a/core/src/main/java/org/apache/oozie/util/Instrumentation.java
+++ b/core/src/main/java/org/apache/oozie/util/Instrumentation.java
@@ -39,7 +39,7 @@ import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
 /**
- * Instrumentation framework that supports Timers, Counters, Variables and Sampler instrumentation elements. <p/> All
+ * Instrumentation framework that supports Timers, Counters, Variables and Sampler instrumentation elements. <p> All
  * instrumentation elements have a group and a name.
  */
 public class Instrumentation {
@@ -84,9 +84,9 @@ public class Instrumentation {
     }
 
     /**
-     * Cron is a stopwatch that can be started/stopped several times. <p/> This class is not thread safe, it does not
-     * need to be. <p/> It keeps track of the total time (first start to last stop) and the running time (total time
-     * minus the stopped intervals). <p/> Once a Cron is complete it must be added to the corresponding group/name in a
+     * Cron is a stopwatch that can be started/stopped several times. <p> This class is not thread safe, it does not
+     * need to be. <p> It keeps track of the total time (first start to last stop) and the running time (total time
+     * minus the stopped intervals). <p> Once a Cron is complete it must be added to the corresponding group/name in a
      * Instrumentation instance.
      */
     public static class Cron {
@@ -189,7 +189,7 @@ public class Instrumentation {
     }
 
     /**
-     * Gives access to a snapshot of an Instrumentation element (Counter, Timer). <p/> Instrumentation element snapshots
+     * Gives access to a snapshot of an Instrumentation element (Counter, Timer). <p> Instrumentation element snapshots
      * are returned by the {@link Instrumentation#getCounters()} and {@link Instrumentation#getTimers()} ()} methods.
      */
     public interface Element<T> {
@@ -243,7 +243,7 @@ public class Instrumentation {
         private long totalMaxTime;
 
         /**
-         * Timer constructor. <p/> It is project private for test purposes.
+         * Timer constructor. <p> It is project private for test purposes.
          */
         Timer() {
         }
@@ -283,7 +283,7 @@ public class Instrumentation {
         }
 
         /**
-         * Add a cron to a timer. <p/> It is project private for test purposes.
+         * Add a cron to a timer. <p> It is project private for test purposes.
          *
          * @param cron Cron to add.
          */
@@ -343,7 +343,7 @@ public class Instrumentation {
         }
 
         /**
-         * Return the sum of the square own times. <p/> It can be used to calculate the standard deviation.
+         * Return the sum of the square own times. <p> It can be used to calculate the standard deviation.
          *
          * @return the sum of the square own timer.
          */
@@ -352,7 +352,7 @@ public class Instrumentation {
         }
 
         /**
-         * Return the sum of the square total times. <p/> It can be used to calculate the standard deviation.
+         * Return the sum of the square total times. <p> It can be used to calculate the standard deviation.
          *
          * @return the sum of the square own timer.
          */
@@ -439,7 +439,7 @@ public class Instrumentation {
     }
 
     /**
-     * Add a cron to an instrumentation timer. The timer is created if it does not exists. <p/> This method is thread
+     * Add a cron to an instrumentation timer. The timer is created if it does not exists. <p> This method is thread
      * safe.
      *
      * @param group timer group.
@@ -479,7 +479,7 @@ public class Instrumentation {
     }
 
     /**
-     * Increment an instrumentation counter. The counter is created if it does not exists. <p/> This method is thread
+     * Increment an instrumentation counter. The counter is created if it does not exists. <p> This method is thread
      * safe.
      *
      * @param group counter group.
@@ -519,14 +519,14 @@ public class Instrumentation {
     }
 
     /**
-     * Interface for instrumentation variables. <p/> For example a the database service could expose the number of
+     * Interface for instrumentation variables. <p> For example a the database service could expose the number of
      * currently active connections.
      */
     public interface Variable<T> extends Element<T> {
     }
 
     /**
-     * Add an instrumentation variable. The variable must not exist. <p/> This method is thread safe.
+     * Add an instrumentation variable. The variable must not exist. <p> This method is thread safe.
      *
      * @param group counter group.
      * @param name counter name.
@@ -574,9 +574,9 @@ public class Instrumentation {
     }
 
     /**
-     * Return the current system configuration as a Map<String,String>.
+     * Return the current system configuration as a Map&lt;String,String&gt;.
      *
-     * @return the current system configuration as a Map<String,String>.
+     * @return the current system configuration as a Map&lt;String,String&gt;.
      */
     public Map<String, String> getConfiguration() {
         final Configuration maskedConf = Services.get().get(ConfigurationService.class).getMaskedConfiguration();
@@ -645,7 +645,7 @@ public class Instrumentation {
     }
 
     /**
-     * Return all the counters. <p/> This method is thread safe. <p/> The counters are live. The counter value is a
+     * Return all the counters. <p> This method is thread safe. <p> The counters are live. The counter value is a
      * snapshot at the time the {@link Instrumentation.Element#getValue()} is invoked.
      *
      * @return all counters.
@@ -655,7 +655,7 @@ public class Instrumentation {
     }
 
     /**
-     * Return all the timers. <p/> This method is thread safe. <p/> The timers are live. Once a timer is obtained, all
+     * Return all the timers. <p> This method is thread safe. <p> The timers are live. Once a timer is obtained, all
      * its values are consistent (they are snapshot at the time the {@link Instrumentation.Element#getValue()} is
      * invoked.
      *
@@ -666,7 +666,7 @@ public class Instrumentation {
     }
 
     /**
-     * Return all the variables. <p/> This method is thread safe. <p/> The variables are live. The variable value is a
+     * Return all the variables. <p> This method is thread safe. <p> The variables are live. The variable value is a
      * snapshot at the time the {@link Instrumentation.Element#getValue()} is invoked.
      *
      * @return all counters.
@@ -757,7 +757,7 @@ public class Instrumentation {
     }
 
     /**
-     * Add a sampling variable. <p/> This method is thread safe.
+     * Add a sampling variable. <p> This method is thread safe.
      *
      * @param group timer group.
      * @param name timer name.
@@ -792,7 +792,7 @@ public class Instrumentation {
     }
 
     /**
-     * Return all the samplers. <p/> This method is thread safe. <p/> The samplers are live. The sampler value is a
+     * Return all the samplers. <p> This method is thread safe. <p> The samplers are live. The sampler value is a
      * snapshot at the time the {@link Instrumentation.Element#getValue()} is invoked.
      *
      * @return all counters.

http://git-wip-us.apache.org/repos/asf/oozie/blob/fcbab934/core/src/main/java/org/apache/oozie/util/JobUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/oozie/util/JobUtils.java b/core/src/main/java/org/apache/oozie/util/JobUtils.java
index e0a9ce6..6bb1a00 100644
--- a/core/src/main/java/org/apache/oozie/util/JobUtils.java
+++ b/core/src/main/java/org/apache/oozie/util/JobUtils.java
@@ -42,7 +42,7 @@ public class JobUtils {
     /**
      * Normalize appPath in job conf with the provided user/group - If it's not jobs via proxy submission, after
      * normalization appPath always points to job's Xml definition file.
-     * <p/>
+     * <p>
      *
      * @param user user
      * @param group group
@@ -96,7 +96,7 @@ public class JobUtils {
      * key1=value1;key2=value2
      *
      * @param changeValue change value.
-     * @return This returns the hash with hash<[key1,value1],[key2,value2]>
+     * @return This returns the hash with hash&lt;[key1,value1],[key2,value2]&gt;
      * @throws CommandException thrown if changeValue cannot be parsed properly.
      */
     public static Map<String, String> parseChangeValue(String changeValue) throws CommandException {

http://git-wip-us.apache.org/repos/asf/oozie/blob/fcbab934/core/src/main/java/org/apache/oozie/util/MetricsInstrumentation.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/oozie/util/MetricsInstrumentation.java b/core/src/main/java/org/apache/oozie/util/MetricsInstrumentation.java
index e56bfda..185b67e 100644
--- a/core/src/main/java/org/apache/oozie/util/MetricsInstrumentation.java
+++ b/core/src/main/java/org/apache/oozie/util/MetricsInstrumentation.java
@@ -116,7 +116,7 @@ public class MetricsInstrumentation extends Instrumentation {
     }
 
     /**
-     * Add a cron to an instrumentation timer. The timer is created if it does not exists. <p/>
+     * Add a cron to an instrumentation timer. The timer is created if it does not exists. <p>
      * Internally, this is backed by a {@link com.codahale.metrics.Timer}.
      *
      * @param group timer group.
@@ -138,7 +138,7 @@ public class MetricsInstrumentation extends Instrumentation {
     }
 
     /**
-     * Add an instrumentation variable. <p/>
+     * Add an instrumentation variable. <p>
      * Internally, this is backed by a {@link Gauge}.
      *
      * @param group counter group.
@@ -171,7 +171,7 @@ public class MetricsInstrumentation extends Instrumentation {
     }
 
    /**
-     * Increment an instrumentation counter. The counter is created if it does not exists. <p/>
+     * Increment an instrumentation counter. The counter is created if it does not exists. <p>
      * Internally, this is backed by a {@link Counter}.
      *
      * @param group counter group.
@@ -192,7 +192,7 @@ public class MetricsInstrumentation extends Instrumentation {
     }
 
     /**
-     * Add a sampling variable. <p/>
+     * Add a sampling variable. <p>
      * Internally, this is backed by a biased (decaying) {@link Histogram}.
      *
      * @param group timer group.

http://git-wip-us.apache.org/repos/asf/oozie/blob/fcbab934/core/src/main/java/org/apache/oozie/util/ParamChecker.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/oozie/util/ParamChecker.java b/core/src/main/java/org/apache/oozie/util/ParamChecker.java
index 825c0b0..381e7e4 100644
--- a/core/src/main/java/org/apache/oozie/util/ParamChecker.java
+++ b/core/src/main/java/org/apache/oozie/util/ParamChecker.java
@@ -160,7 +160,7 @@ public class ParamChecker {
      *
      * @param value : value to test
      * @param name : Name of the parameter
-     * @return If the value is > 0, return the value. Otherwise throw IllegalArgumentException
+     * @return If the value is &gt; 0, return the value. Otherwise throw IllegalArgumentException
      */
     public static int checkGTZero(int value, String name) {
         if (value <= 0) {
@@ -175,7 +175,7 @@ public class ParamChecker {
      *
      * @param value : value to test
      * @param name : Name of the parameter
-     * @return If the value is >= 0, return the value. Otherwise throw IllegalArgumentException
+     * @return If the value is &gt;= 0, return the value. Otherwise throw IllegalArgumentException
      */
     public static int checkGEZero(int value, String name) {
         if (value < 0) {
@@ -190,7 +190,7 @@ public class ParamChecker {
      *
      * @param value : value to test
      * @param name : Name of the parameter
-     * @return If the value is <= 0, return the value. Otherwise throw IllegalArgumentException
+     * @return If the value is &lt;= 0, return the value. Otherwise throw IllegalArgumentException
      */
     public static int checkLEZero(int value, String name) {
         if (value > 0) {
@@ -203,7 +203,7 @@ public class ParamChecker {
     /**
      * Check whether the value is Integer.
      *
-     * @param value : value to test
+     * @param val : value to test
      * @param name : Name of the parameter
      * @return If the value is integer, return the value. Otherwise throw IllegalArgumentException
      */
@@ -222,7 +222,7 @@ public class ParamChecker {
     /**
      * Check whether a value is a valid coordinator frequency.
      *
-     * @param value : value to test
+     * @param val : value to test
      * @return If the value is a valid frequency, return the frequency, Otherwise throw IllegalArgumentException
      */
     public static String checkFrequency(String val) {
@@ -267,7 +267,7 @@ public class ParamChecker {
     /**
      * Check whether the value is Oozie processing timezone data format.
      *
-     * @param value : value to test
+     * @param date : date to test
      * @param name : Name of the parameter
      * @return If the value is in Oozie processing timezone date format, return the value.
      * Otherwise throw IllegalArgumentException
@@ -289,7 +289,7 @@ public class ParamChecker {
     /**
      * Check whether the value mention correct Timezone.
      *
-     * @param value : value to test
+     * @param tzStr : timezone to test
      * @param name : Name of the parameter
      * @return If the value is correct TZ return the value. Otherwise throw IllegalArgumentException
      */

http://git-wip-us.apache.org/repos/asf/oozie/blob/fcbab934/core/src/main/java/org/apache/oozie/util/ParameterVerifier.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/oozie/util/ParameterVerifier.java b/core/src/main/java/org/apache/oozie/util/ParameterVerifier.java
index 7d1f720..f3f4630 100644
--- a/core/src/main/java/org/apache/oozie/util/ParameterVerifier.java
+++ b/core/src/main/java/org/apache/oozie/util/ParameterVerifier.java
@@ -28,7 +28,7 @@ import org.jdom.Namespace;
 import org.apache.hadoop.conf.Configuration;
 
 /**
- * Utility class to parse and verify the <parameters> section in a workflow or coordinator job
+ * Utility class to parse and verify the &lt;parameters&gt; section in a workflow or coordinator job
  */
 public abstract class ParameterVerifier 
 {

http://git-wip-us.apache.org/repos/asf/oozie/blob/fcbab934/core/src/main/java/org/apache/oozie/util/ParameterVerifierException.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/oozie/util/ParameterVerifierException.java b/core/src/main/java/org/apache/oozie/util/ParameterVerifierException.java
index ab92518..ef9a591 100644
--- a/core/src/main/java/org/apache/oozie/util/ParameterVerifierException.java
+++ b/core/src/main/java/org/apache/oozie/util/ParameterVerifierException.java
@@ -23,7 +23,7 @@ import org.apache.oozie.XException;
 import org.apache.hadoop.conf.Configuration;
 
 /**
- * Exception thrown by {@link org.apache.oozie.util.ParameterHandler} .
+ * Exception thrown by {@link ParameterVerifier}.
  */
 public class ParameterVerifierException extends XException {
     

http://git-wip-us.apache.org/repos/asf/oozie/blob/fcbab934/core/src/main/java/org/apache/oozie/util/PollablePriorityDelayQueue.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/oozie/util/PollablePriorityDelayQueue.java b/core/src/main/java/org/apache/oozie/util/PollablePriorityDelayQueue.java
index 56bc57a..7228620 100644
--- a/core/src/main/java/org/apache/oozie/util/PollablePriorityDelayQueue.java
+++ b/core/src/main/java/org/apache/oozie/util/PollablePriorityDelayQueue.java
@@ -33,7 +33,7 @@ public class PollablePriorityDelayQueue<E> extends PriorityDelayQueue<E> {
      *
      * Return <tt>null</tt> if this queue has no elements eligible to run.
      *
-     * <p/>
+     * <p>
      * Invocations to this method run the anti-starvation (once every interval check).
      *
      * @return the element of this queue, for which eligibleToPoll is true.
@@ -84,7 +84,7 @@ public class PollablePriorityDelayQueue<E> extends PriorityDelayQueue<E> {
 
     /**
      * Method for checking the QueueElement eligible to poll before remove it from queue.
-     * <p/>
+     * <p>
      * This method should be overriden for checking purposes.
      *
      * @param element the element to check

http://git-wip-us.apache.org/repos/asf/oozie/blob/fcbab934/core/src/main/java/org/apache/oozie/util/PriorityDelayQueue.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/oozie/util/PriorityDelayQueue.java b/core/src/main/java/org/apache/oozie/util/PriorityDelayQueue.java
index cb20ef5..ae54506 100644
--- a/core/src/main/java/org/apache/oozie/util/PriorityDelayQueue.java
+++ b/core/src/main/java/org/apache/oozie/util/PriorityDelayQueue.java
@@ -34,20 +34,20 @@ import java.util.concurrent.locks.ReentrantLock;
 
 /**
  * A Queue implementation that support queuing elements into the future and priority queuing.
- * <p/>
+ * <p>
  * The {@link PriorityDelayQueue} avoids starvation by raising elements priority as they age.
- * <p/>
+ * <p>
  * To support queuing elements into the future, the JDK <code>DelayQueue</code> is used.
- * <p/>
+ * <p>
  * To support priority queuing, an array of <code>DelayQueue</code> sub-queues is used. Elements are consumed from the
  * higher priority sub-queues first. From a sub-queue, elements are available based on their age.
- * <p/>
+ * <p>
  * To avoid starvation, there is is maximum wait time for an an element in a sub-queue, after the maximum wait time has
  * elapsed, the element is promoted to the next higher priority sub-queue. Eventually it will reach the maximum priority
  * sub-queue and it will be consumed when it is the oldest element in the that sub-queue.
- * <p/>
+ * <p>
  * Every time an element is promoted to a higher priority sub-queue, a new maximum wait time applies.
- * <p/>
+ * <p>
  * This class does not use a separate thread for anti-starvation check, instead, the check is performed on polling and
  * seeking operations. This check is performed, the most every 1/2 second.
  */
@@ -56,7 +56,7 @@ public class PriorityDelayQueue<E> extends AbstractQueue<PriorityDelayQueue.Queu
 
     /**
      * Element wrapper required by the queue.
-     * <p/>
+     * <p>
      * This wrapper keeps track of the priority and the age of a queue element.
      */
     public static class QueueElement<E> implements Delayed {
@@ -364,7 +364,7 @@ public class PriorityDelayQueue<E> extends AbstractQueue<PriorityDelayQueue.Queu
 
     /**
      * Insert the specified element into the queue.
-     * <p/>
+     * <p>
      * The element is added with minimun priority and no delay.
      *
      * @param queueElement the element to add.
@@ -382,9 +382,9 @@ public class PriorityDelayQueue<E> extends AbstractQueue<PriorityDelayQueue.Queu
     /**
      * Retrieve and remove the head of this queue, or return <tt>null</tt> if this queue has no elements with an expired
      * delay.
-     * <p/>
+     * <p>
      * The retrieved element is the oldest one from the highest priority sub-queue.
-     * <p/>
+     * <p>
      * Invocations to this method run the anti-starvation (once every interval check).
      *
      * @return the head of this queue, or <tt>null</tt> if this queue has no elements with an expired delay.
@@ -480,7 +480,7 @@ public class PriorityDelayQueue<E> extends AbstractQueue<PriorityDelayQueue.Queu
 
     /**
      * Run the anti-starvation check every {@link #ANTI_STARVATION_INTERVAL} milliseconds.
-     * <p/>
+     * <p>
      * It promotes elements beyond max wait time to the next higher priority sub-queue.
      */
     protected void antiStarvation() {
@@ -527,9 +527,9 @@ public class PriorityDelayQueue<E> extends AbstractQueue<PriorityDelayQueue.Queu
 
     /**
      * Method for debugging purposes. This implementation is a <tt>NOP</tt>.
-     * <p/>
+     * <p>
      * This method should be overriden for logging purposes.
-     * <p/>
+     * <p>
      * Message templates used by this class are in JDK's <tt>MessageFormat</tt> syntax.
      *
      * @param msgTemplate message template.
@@ -541,8 +541,8 @@ public class PriorityDelayQueue<E> extends AbstractQueue<PriorityDelayQueue.Queu
     /**
      * Insert the specified element into this queue, waiting if necessary
      * for space to become available.
-     * <p/>
-     * NOTE: This method is to fulfill the <tt>BlockingQueue<tt/> interface. Not implemented in the most optimal way.
+     * <p>
+     * NOTE: This method is to fulfill the <tt>BlockingQueue</tt> interface. Not implemented in the most optimal way.
      *
      * @param e the element to add
      * @throws InterruptedException if interrupted while waiting
@@ -562,11 +562,11 @@ public class PriorityDelayQueue<E> extends AbstractQueue<PriorityDelayQueue.Queu
     /**
      * Insert the specified element into this queue, waiting up to the
      * specified wait time if necessary for space to become available.
-     * <p/>
+     * <p>
      * IMPORTANT: This implementation forces the addition of the element to the queue regardless
      * of the queue current size. The timeout value is ignored as the element is added immediately.
-     * <p/>
-     * NOTE: This method is to fulfill the <tt>BlockingQueue<tt/> interface. Not implemented in the most optimal way.
+     * <p>
+     * NOTE: This method is to fulfill the <tt>BlockingQueue</tt> interface. Not implemented in the most optimal way.
      *
      * @param e the element to add
      * @param timeout how long to wait before giving up, in units of
@@ -590,11 +590,11 @@ public class PriorityDelayQueue<E> extends AbstractQueue<PriorityDelayQueue.Queu
     /**
      * Retrieve and removes the head of this queue, waiting if necessary
      * until an element becomes available.
-     * <p/>
+     * <p>
      * IMPORTANT: This implementation has a delay of up to 10ms (when the queue is empty) to detect a new element
      * is available. It is doing a 10ms sleep.
-     * <p/>
-     * NOTE: This method is to fulfill the <tt>BlockingQueue<tt/> interface. Not implemented in the most optimal way.
+     * <p>
+     * NOTE: This method is to fulfill the <tt>BlockingQueue</tt> interface. Not implemented in the most optimal way.
      *
      * @return the head of this queue
      * @throws InterruptedException if interrupted while waiting
@@ -612,8 +612,8 @@ public class PriorityDelayQueue<E> extends AbstractQueue<PriorityDelayQueue.Queu
     /**
      * Retrieve and removes the head of this queue, waiting up to the
      * specified wait time if necessary for an element to become available.
-     * <p/>
-     * NOTE: This method is to fulfill the <tt>BlockingQueue<tt/> interface. Not implemented in the most optimal way.
+     * <p>
+     * NOTE: This method is to fulfill the <tt>BlockingQueue</tt> interface. Not implemented in the most optimal way.
      *
      * @param timeout how long to wait before giving up, in units of
      *        <tt>unit</tt>
@@ -644,8 +644,8 @@ public class PriorityDelayQueue<E> extends AbstractQueue<PriorityDelayQueue.Queu
      * an element will succeed by inspecting <tt>remainingCapacity</tt>
      * because it may be the case that another thread is about to
      * insert or remove an element.
-     * <p/>
-     * NOTE: This method is to fulfill the <tt>BlockingQueue<tt/> interface. Not implemented in the most optimal way.
+     * <p>
+     * NOTE: This method is to fulfill the <tt>BlockingQueue</tt> interface. Not implemented in the most optimal way.
      *
      * @return the remaining capacity
      */
@@ -665,8 +665,8 @@ public class PriorityDelayQueue<E> extends AbstractQueue<PriorityDelayQueue.Queu
      * <tt>IllegalArgumentException</tt>. Further, the behavior of
      * this operation is undefined if the specified collection is
      * modified while the operation is in progress.
-     * <p/>
-     * NOTE: This method is to fulfill the <tt>BlockingQueue<tt/> interface. Not implemented in the most optimal way.
+     * <p>
+     * NOTE: This method is to fulfill the <tt>BlockingQueue</tt> interface. Not implemented in the most optimal way.
      *
      * @param c the collection to transfer elements into
      * @return the number of elements transferred
@@ -698,8 +698,8 @@ public class PriorityDelayQueue<E> extends AbstractQueue<PriorityDelayQueue.Queu
      * <tt>IllegalArgumentException</tt>. Further, the behavior of
      * this operation is undefined if the specified collection is
      * modified while the operation is in progress.
-     * <p/>
-     * NOTE: This method is to fulfill the <tt>BlockingQueue<tt/> interface. Not implemented in the most optimal way.
+     * <p>
+     * NOTE: This method is to fulfill the <tt>BlockingQueue</tt> interface. Not implemented in the most optimal way.
      *
      * @param c the collection to transfer elements into
      * @param maxElements the maximum number of elements to transfer

http://git-wip-us.apache.org/repos/asf/oozie/blob/fcbab934/core/src/main/java/org/apache/oozie/util/WritableUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/oozie/util/WritableUtils.java b/core/src/main/java/org/apache/oozie/util/WritableUtils.java
index a2151fd..76a6895 100644
--- a/core/src/main/java/org/apache/oozie/util/WritableUtils.java
+++ b/core/src/main/java/org/apache/oozie/util/WritableUtils.java
@@ -75,7 +75,7 @@ public class WritableUtils {
     private static final String NULL = "||";
 
     /**
-     * Write a string to a data output supporting <code>null</code> values. <p/> It uses the '||' token to represent
+     * Write a string to a data output supporting <code>null</code> values. <p> It uses the '||' token to represent
      * <code>null</code>.
      *
      * @param dataOutput data output.
@@ -88,7 +88,7 @@ public class WritableUtils {
     }
 
     /**
-     * Read a string from a data input supporting <code>null</code> values. <p/> It uses the '||' token to represent
+     * Read a string from a data input supporting <code>null</code> values. <p> It uses the '||' token to represent
      * <code>null</code>.
      *
      * @param dataInput data input.

http://git-wip-us.apache.org/repos/asf/oozie/blob/fcbab934/core/src/main/java/org/apache/oozie/util/XCallable.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/oozie/util/XCallable.java b/core/src/main/java/org/apache/oozie/util/XCallable.java
index 4e22941..baf47cf 100644
--- a/core/src/main/java/org/apache/oozie/util/XCallable.java
+++ b/core/src/main/java/org/apache/oozie/util/XCallable.java
@@ -21,9 +21,9 @@ package org.apache.oozie.util;
 import java.util.concurrent.Callable;
 
 /**
- * Extends Callable adding the concept of priority. <p/> The priority is useful when queuing callables for later
- * execution via the {@link org.apache.oozie.service.CallableQueueService}. <p/> A higher number means a higher
- * priority. <p/>
+ * Extends Callable adding the concept of priority. <p> The priority is useful when queuing callables for later
+ * execution via the {@link org.apache.oozie.service.CallableQueueService}. <p> A higher number means a higher
+ * priority. <p>
  */
 public interface XCallable<T> extends Callable<T> {
 
@@ -42,7 +42,7 @@ public interface XCallable<T> extends Callable<T> {
     public int getPriority();
 
     /**
-     * Return the callable type. <p/> The callable type is used for concurrency throttling in the {@link
+     * Return the callable type. <p> The callable type is used for concurrency throttling in the {@link
      * org.apache.oozie.service.CallableQueueService}.
      *
      * @return the callable type.

http://git-wip-us.apache.org/repos/asf/oozie/blob/fcbab934/core/src/main/java/org/apache/oozie/util/XConfiguration.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/oozie/util/XConfiguration.java b/core/src/main/java/org/apache/oozie/util/XConfiguration.java
index d2fa5d0..6795ac2 100644
--- a/core/src/main/java/org/apache/oozie/util/XConfiguration.java
+++ b/core/src/main/java/org/apache/oozie/util/XConfiguration.java
@@ -43,7 +43,7 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 /**
- * Extends Hadoop Configuration providing a new constructor which reads an XML configuration from an InputStream. <p/>
+ * Extends Hadoop Configuration providing a new constructor which reads an XML configuration from an InputStream. <p>
  * OConfiguration(InputStream is).
  */
 public class XConfiguration extends Configuration {
@@ -51,7 +51,7 @@ public class XConfiguration extends Configuration {
     public static final String CONFIGURATION_SUBSTITUTE_DEPTH = "oozie.configuration.substitute.depth";
 
     /**
-     * Create an empty configuration. <p/> Default values are not loaded.
+     * Create an empty configuration. <p> Default values are not loaded.
      */
     public XConfiguration() {
         super(false);
@@ -59,7 +59,7 @@ public class XConfiguration extends Configuration {
     }
 
     /**
-     * Create a configuration from an InputStream. <p/> Code canibalized from <code>Configuration.loadResource()</code>.
+     * Create a configuration from an InputStream. <p> Code canibalized from <code>Configuration.loadResource()</code>.
      *
      * @param is inputstream to read the configuration from.
      * @throws IOException thrown if the configuration could not be read.
@@ -70,7 +70,7 @@ public class XConfiguration extends Configuration {
     }
 
     /**
-     * Create a configuration from an Reader. <p/> Code canibalized from <code>Configuration.loadResource()</code>.
+     * Create a configuration from an Reader. <p> Code canibalized from <code>Configuration.loadResource()</code>.
      *
      * @param reader reader to read the configuration from.
      * @throws IOException thrown if the configuration could not be read.
@@ -188,7 +188,7 @@ public class XConfiguration extends Configuration {
     }
 
     /**
-     * This is a stop gap fix for <link href="https://issues.apache.org/jira/browse/HADOOP-4416">HADOOP-4416</link>.
+     * This is a stop gap fix for HADOOP-4416.
      */
     public Class<?> getClassByName(String name) throws ClassNotFoundException {
         return super.getClassByName(name.trim());

http://git-wip-us.apache.org/repos/asf/oozie/blob/fcbab934/core/src/main/java/org/apache/oozie/util/XLog.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/oozie/util/XLog.java b/core/src/main/java/org/apache/oozie/util/XLog.java
index f1eaecd..cc9abd8 100644
--- a/core/src/main/java/org/apache/oozie/util/XLog.java
+++ b/core/src/main/java/org/apache/oozie/util/XLog.java
@@ -29,17 +29,17 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * The <code>XLog</code> class extends the functionality of the Apache common-logging <code>Log</code> interface. <p/>
+ * The <code>XLog</code> class extends the functionality of the Apache common-logging <code>Log</code> interface. <p>
  * It provides common prefix support, message templating with variable parameters and selective tee logging to multiple
- * logs. <p/> It provides also the LogFactory functionality.
+ * logs. <p> It provides also the LogFactory functionality.
  */
 public class XLog implements Log {
 
     public static final String INSTRUMENTATION_LOG_NAME = "oozieinstrumentation";
 
     /**
-     * <code>LogInfo</code> stores contextual information to create log prefixes. <p/> <code>LogInfo</code> uses a
-     * <code>ThreadLocal</code> to propagate the context. <p/> <code>LogInfo</code> context parameters are configurable
+     * <code>LogInfo</code> stores contextual information to create log prefixes. <p> <code>LogInfo</code> uses a
+     * <code>ThreadLocal</code> to propagate the context. <p> <code>LogInfo</code> context parameters are configurable
      * singletons.
      */
     public static class Info {
@@ -56,7 +56,7 @@ public class XLog implements Log {
         };
 
         /**
-         * Define a <code>LogInfo</code> context parameter. <p/> The parameter name and its contextual value will be
+         * Define a <code>LogInfo</code> context parameter. <p> The parameter name and its contextual value will be
          * used to create all prefixes.
          *
          * @param name name of the context parameter.
@@ -72,7 +72,7 @@ public class XLog implements Log {
         }
 
         /**
-         * Remove all defined context parameters. <p/>
+         * Remove all defined context parameters. <p>
          */
         public static void reset() {
             template = "";
@@ -662,8 +662,8 @@ public class XLog implements Log {
 
     /**
      * Utility method that does uses the <code>StringFormat</code> to format the message template using the provided
-     * parameters. <p/> In addition to the <code>StringFormat</code> syntax for message templates, it supports
-     * <code>{E}</code> for ENTER. <p/> The last parameter is ignored for the formatting if it is an Exception.
+     * parameters. <p> In addition to the <code>StringFormat</code> syntax for message templates, it supports
+     * <code>{E}</code> for ENTER. <p> The last parameter is ignored for the formatting if it is an Exception.
      *
      * @param msgTemplate message template.
      * @param params paramaters to use in the template. If the last parameter is an Exception, it is ignored.

http://git-wip-us.apache.org/repos/asf/oozie/blob/fcbab934/core/src/main/java/org/apache/oozie/util/XLogUserFilterParam.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/oozie/util/XLogUserFilterParam.java b/core/src/main/java/org/apache/oozie/util/XLogUserFilterParam.java
index bd7bbfd..1fe59e3 100644
--- a/core/src/main/java/org/apache/oozie/util/XLogUserFilterParam.java
+++ b/core/src/main/java/org/apache/oozie/util/XLogUserFilterParam.java
@@ -221,7 +221,7 @@ public class XLogUserFilterParam {
     /**
      * Gets the date. Date can in TZ or yyyy-MM-dd HH:mm:ss,SSS format
      *
-     * @param String date
+     * @param date date
      * @return the date
      */
     public Date getDate(String date) {

http://git-wip-us.apache.org/repos/asf/oozie/blob/fcbab934/core/src/main/java/org/apache/oozie/util/XmlUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/oozie/util/XmlUtils.java b/core/src/main/java/org/apache/oozie/util/XmlUtils.java
index 3672b96..91438b3 100644
--- a/core/src/main/java/org/apache/oozie/util/XmlUtils.java
+++ b/core/src/main/java/org/apache/oozie/util/XmlUtils.java
@@ -273,7 +273,7 @@ public class XmlUtils {
     }
 
     /**
-     * Schema validation for a given xml. <p/>
+     * Schema validation for a given xml. <p>
      *
      * @param schema for validation
      * @param xml to be validated
@@ -362,14 +362,14 @@ public class XmlUtils {
 
     /**
      * Escape characters for text appearing as XML data, between tags.
-     * <P/>
+     * <p>
      * The following characters are replaced with corresponding character entities :
-     * '<' to '&lt';
-     * '>' to '&gt';
-     * '&' to '&amp;'
+     * '&lt;' to '&lt;'
+     * '&gt;' to '&gt;'
+     * '&amp;' to '&amp;'
      * '"' to '&quot;'
      * "'" to "&#039;"
-     * <P/>
+     * <p>
      * Note that JSTL's {@code <c:out>} escapes the exact same set of characters as this method.
      */
     public static String escapeCharsForXML(String aText) {

http://git-wip-us.apache.org/repos/asf/oozie/blob/fcbab934/core/src/main/java/org/apache/oozie/util/ZKUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/oozie/util/ZKUtils.java b/core/src/main/java/org/apache/oozie/util/ZKUtils.java
index 0ce32b1..91f8f70 100644
--- a/core/src/main/java/org/apache/oozie/util/ZKUtils.java
+++ b/core/src/main/java/org/apache/oozie/util/ZKUtils.java
@@ -295,7 +295,7 @@ public class ZKUtils {
     /**
      * Returns the index of this Oozie Server in ZooKeeper's list of Oozie Servers (ordered by registration time)
      *
-     * @param oozies The collection of metadata provided by all of the Oozie Servers (from calling {@link ZKUtils#getAllMetaData())
+     * @param oozies The collection of metadata provided by all of the Oozie Servers (from calling {@link ZKUtils#getAllMetaData()}
      * @return the index of this Oozie Server in ZooKeeper's list of Oozie Servers (ordered by registration time)
      */
     public int getZKIdIndex(List<ServiceInstance<Map>> oozies) {

http://git-wip-us.apache.org/repos/asf/oozie/blob/fcbab934/core/src/main/java/org/apache/oozie/workflow/WorkflowInstance.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/oozie/workflow/WorkflowInstance.java b/core/src/main/java/org/apache/oozie/workflow/WorkflowInstance.java
index b580967..e91079c 100644
--- a/core/src/main/java/org/apache/oozie/workflow/WorkflowInstance.java
+++ b/core/src/main/java/org/apache/oozie/workflow/WorkflowInstance.java
@@ -29,7 +29,7 @@ import java.util.Map;
 public interface WorkflowInstance {
 
     /**
-     * Separator to qualify variables belonging to a node. <p/> Variables names should be compossed as <code>nodeName +
+     * Separator to qualify variables belonging to a node. <p> Variables names should be compossed as <code>nodeName +
      * {@link #NODE_VAR_SEPARATOR} + varName</code>.
      */
     public final static String NODE_VAR_SEPARATOR = "#";
@@ -100,7 +100,7 @@ public interface WorkflowInstance {
     public boolean signal(String path, String signaValue) throws WorkflowException;
 
     /**
-     * Fail the instance. <p/> All executing nodes will be be signaled for fail.
+     * Fail the instance. <p> All executing nodes will be be signaled for fail.
      *
      * @param nodeName the name of the node to be failed.
      * @throws WorkflowException thrown if the instance could not be failed.
@@ -108,7 +108,7 @@ public interface WorkflowInstance {
     public void fail(String nodeName) throws WorkflowException;
 
     /**
-     * Kill the instance. <p/> All executing nodes will be be signaled for kill.
+     * Kill the instance. <p> All executing nodes will be be signaled for kill.
      *
      * @throws WorkflowException thrown if the instance could not be killed.
      */
@@ -136,7 +136,7 @@ public interface WorkflowInstance {
     public Status getStatus();
 
     /**
-     * Set a variable in the context of the instance. <p/> Variables are persisted with the instance.
+     * Set a variable in the context of the instance. <p> Variables are persisted with the instance.
      *
      * @param name variable name.
      * @param value variable value, setting a <code>null</code> value removes the variable.
@@ -159,14 +159,14 @@ public interface WorkflowInstance {
     public Map<String, String> getAllVars();
 
     /**
-     * Add a set of variables in the context of the instance. <p/> Variables are persisted with the instance.
+     * Add a set of variables in the context of the instance. <p> Variables are persisted with the instance.
      *
      * @param varMap map with the variables to add.
      */
     public void setAllVars(Map<String, String> varMap);
 
     /**
-     * Set a transient variable in the context of the instance. <p/> Transient variables are not persisted with the
+     * Set a transient variable in the context of the instance. <p> Transient variables are not persisted with the
      * instance.
      *
      * @param name transient variable name.
@@ -183,7 +183,7 @@ public interface WorkflowInstance {
     public Object getTransientVar(String name);
 
     /**
-     * Return the transition a node did. <p/> This is meaninful only for action and decision nodes.
+     * Return the transition a node did. <p> This is meaninful only for action and decision nodes.
      *
      * @param node the node name.
      * @return the transition the node did, <code>null</code> if the node didn't execute yet.

http://git-wip-us.apache.org/repos/asf/oozie/blob/fcbab934/core/src/main/java/org/apache/oozie/workflow/WorkflowLib.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/oozie/workflow/WorkflowLib.java b/core/src/main/java/org/apache/oozie/workflow/WorkflowLib.java
index ccbca62..58ff823 100644
--- a/core/src/main/java/org/apache/oozie/workflow/WorkflowLib.java
+++ b/core/src/main/java/org/apache/oozie/workflow/WorkflowLib.java
@@ -24,7 +24,7 @@ import org.apache.hadoop.conf.Configuration;
 
 
 /**
- * The workflow library provides application parsing and storage capabilities for workflow instances. <p/> The
+ * The workflow library provides application parsing and storage capabilities for workflow instances. <p> The
  * implementation is responsible for doing the store operations in a transactional way, either in autocommit or within
  * the scope of a transaction.
  */

http://git-wip-us.apache.org/repos/asf/oozie/blob/fcbab934/core/src/main/java/org/apache/oozie/workflow/lite/DBLiteWorkflowLib.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/oozie/workflow/lite/DBLiteWorkflowLib.java b/core/src/main/java/org/apache/oozie/workflow/lite/DBLiteWorkflowLib.java
index c2e17df..3c41c83 100644
--- a/core/src/main/java/org/apache/oozie/workflow/lite/DBLiteWorkflowLib.java
+++ b/core/src/main/java/org/apache/oozie/workflow/lite/DBLiteWorkflowLib.java
@@ -48,7 +48,6 @@ public class DBLiteWorkflowLib extends LiteWorkflowLib {
      * Save the Workflow Instance for the given Workflow Application.
      *
      * @param instance
-     * @return
      * @throws WorkflowException
      */
     @Override

http://git-wip-us.apache.org/repos/asf/oozie/blob/fcbab934/core/src/main/java/org/apache/oozie/workflow/lite/StartNodeDef.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/oozie/workflow/lite/StartNodeDef.java b/core/src/main/java/org/apache/oozie/workflow/lite/StartNodeDef.java
index 981ec6b..c0ecb53 100644
--- a/core/src/main/java/org/apache/oozie/workflow/lite/StartNodeDef.java
+++ b/core/src/main/java/org/apache/oozie/workflow/lite/StartNodeDef.java
@@ -31,7 +31,7 @@ import java.util.Arrays;
 public class StartNodeDef extends ControlNodeDef {
 
     /**
-     * Reserved name fo the start node. <p/> It is an invalid token, it will never match an application node name.
+     * Reserved name fo the start node. <p> It is an invalid token, it will never match an application node name.
      */
     public static final String START = ":start:";
 
@@ -52,7 +52,7 @@ public class StartNodeDef extends ControlNodeDef {
     }
 
     /**
-     * Start node handler. <p/> It does an immediate transition to the transitionTo node.
+     * Start node handler. <p> It does an immediate transition to the transitionTo node.
      */
     public static class StartNodeHandler extends NodeHandler {
 

http://git-wip-us.apache.org/repos/asf/oozie/blob/fcbab934/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 4c74726..4dc79c3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1489,7 +1489,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>2.7</version>
+                    <version>2.10.3</version>
                     <configuration>
                             <additionalparam>${maven.javadoc.opts}</additionalparam>
                     </configuration>

http://git-wip-us.apache.org/repos/asf/oozie/blob/fcbab934/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index c84f117..79f19b8 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,5 +1,6 @@
 -- Oozie 4.3.0 release (trunk - unreleased)
 
+OOZIE-2178 fix javadoc to compile on JDK8 (rkanter)
 OOZIE-2268 Update ActiveMQ version for security and other fixes (rkanter)
 OOZIE-2215 Support glob in FS EL function (ryota)
 OOZIE-2270 Audit log doesn't get loaded when "audit log" tab is clicked for coord job (puru)