azkaban-aplcache

diff --git a/azkaban-common/src/main/java/azkaban/database/DataSourceUtils.java b/azkaban-common/src/main/java/azkaban/database/DataSourceUtils.java
index 9983c25..c9af320 100644
--- a/azkaban-common/src/main/java/azkaban/database/DataSourceUtils.java
+++ b/azkaban-common/src/main/java/azkaban/database/DataSourceUtils.java
@@ -17,12 +17,16 @@
 package azkaban.database;
 
 import java.sql.SQLException;
+
 import javax.sql.DataSource;
+
 import org.apache.commons.dbutils.DbUtils;
 import org.apache.commons.dbutils.QueryRunner;
 import org.apache.log4j.Logger;
+
 import java.sql.PreparedStatement;
 import java.sql.Connection;
+
 import azkaban.utils.Props;
 
 public class DataSourceUtils {

diff --git a/azkaban-common/src/main/java/azkaban/executor/ExecutableFlowBase.java b/azkaban-common/src/main/java/azkaban/executor/ExecutableFlowBase.java
index 72aaa6a..d4b4b59 100644
--- a/azkaban-common/src/main/java/azkaban/executor/ExecutableFlowBase.java
+++ b/azkaban-common/src/main/java/azkaban/executor/ExecutableFlowBase.java
@@ -368,7 +368,7 @@ public class ExecutableFlowBase extends ExecutableNode {
 
   /**
    * Only returns true if the status of all finished nodes is true.
-   * 
+   *
    * @return
    */
   public boolean isFlowFinished() {
@@ -385,10 +385,10 @@ public class ExecutableFlowBase extends ExecutableNode {
   /**
    * Finds all jobs which are ready to run. This occurs when all of its
    * dependency nodes are finished running.
-   * 
+   *
    * It will also return any subflow that has been completed such that the
    * FlowRunner can properly handle them.
-   * 
+   *
    * @param flow
    * @return
    */

diff --git a/azkaban-common/src/main/java/azkaban/executor/ExecutableNode.java b/azkaban-common/src/main/java/azkaban/executor/ExecutableNode.java
index 6b5ab86..b4cab0f 100644
--- a/azkaban-common/src/main/java/azkaban/executor/ExecutableNode.java
+++ b/azkaban-common/src/main/java/azkaban/executor/ExecutableNode.java
@@ -24,6 +24,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+
 import azkaban.flow.Node;
 import azkaban.utils.Props;
 import azkaban.utils.PropsUtils;

diff --git a/azkaban-common/src/main/java/azkaban/executor/ExecutionAttempt.java b/azkaban-common/src/main/java/azkaban/executor/ExecutionAttempt.java
index d54a9f3..1ca05d2 100644
--- a/azkaban-common/src/main/java/azkaban/executor/ExecutionAttempt.java
+++ b/azkaban-common/src/main/java/azkaban/executor/ExecutionAttempt.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2014 LinkedIn Corp.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
 package azkaban.executor;
 
 import java.util.HashMap;

diff --git a/azkaban-common/src/main/java/azkaban/executor/ExecutorManager.java b/azkaban-common/src/main/java/azkaban/executor/ExecutorManager.java
index ad441bc..e3521db 100644
--- a/azkaban-common/src/main/java/azkaban/executor/ExecutorManager.java
+++ b/azkaban-common/src/main/java/azkaban/executor/ExecutorManager.java
@@ -38,6 +38,7 @@ import org.apache.http.client.utils.URIBuilder;
 import org.apache.http.impl.client.BasicResponseHandler;
 import org.apache.http.impl.client.DefaultHttpClient;
 import org.apache.log4j.Logger;
+
 import org.joda.time.DateTime;
 
 import azkaban.alert.Alerter;
@@ -54,7 +55,7 @@ import azkaban.utils.Props;
 
 /**
  * Executor manager used to manage the client side job.
- * 
+ *
  */
 public class ExecutorManager extends EventHandler implements
     ExecutorManagerAdapter {

diff --git a/azkaban-common/src/main/java/azkaban/executor/ExecutorManagerServlet.java b/azkaban-common/src/main/java/azkaban/executor/ExecutorManagerServlet.java
index 6dcfcc6..83629ae 100644
--- a/azkaban-common/src/main/java/azkaban/executor/ExecutorManagerServlet.java
+++ b/azkaban-common/src/main/java/azkaban/executor/ExecutorManagerServlet.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2014 LinkedIn Corp.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
 package azkaban.executor;
 
 import java.io.IOException;

diff --git a/azkaban-common/src/main/java/azkaban/executor/JdbcExecutorLoader.java b/azkaban-common/src/main/java/azkaban/executor/JdbcExecutorLoader.java
index 02c01c9..0d98a70 100644
--- a/azkaban-common/src/main/java/azkaban/executor/JdbcExecutorLoader.java
+++ b/azkaban-common/src/main/java/azkaban/executor/JdbcExecutorLoader.java
@@ -37,6 +37,7 @@ import org.apache.commons.dbutils.ResultSetHandler;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.io.FileUtils;
 import org.apache.log4j.Logger;
+
 import org.joda.time.DateTime;
 
 import azkaban.database.AbstractJdbcLoader;

diff --git a/azkaban-common/src/main/java/azkaban/flow/Node.java b/azkaban-common/src/main/java/azkaban/flow/Node.java
index 515420b..3728666 100644
--- a/azkaban-common/src/main/java/azkaban/flow/Node.java
+++ b/azkaban-common/src/main/java/azkaban/flow/Node.java
@@ -40,7 +40,7 @@ public class Node {
 
   /**
    * Clones nodes
-   * 
+   *
    * @param node
    */
   public Node(Node clone) {

diff --git a/azkaban-common/src/main/java/azkaban/jmx/JmxTriggerManager.java b/azkaban-common/src/main/java/azkaban/jmx/JmxTriggerManager.java
index 713211c..9e46645 100644
--- a/azkaban-common/src/main/java/azkaban/jmx/JmxTriggerManager.java
+++ b/azkaban-common/src/main/java/azkaban/jmx/JmxTriggerManager.java
@@ -68,7 +68,6 @@ public class JmxTriggerManager implements JmxTriggerManagerMBean {
 
   @Override
   public String getScannerThreadStage() {
-    // TODO Auto-generated method stub
     return jmxStats.getScannerThreadStage();
   }
 }

diff --git a/azkaban-common/src/main/java/azkaban/jobExecutor/AbstractProcessJob.java b/azkaban-common/src/main/java/azkaban/jobExecutor/AbstractProcessJob.java
index 400a25c..73592f0 100644
--- a/azkaban-common/src/main/java/azkaban/jobExecutor/AbstractProcessJob.java
+++ b/azkaban-common/src/main/java/azkaban/jobExecutor/AbstractProcessJob.java
@@ -32,9 +32,8 @@ import azkaban.utils.JSONUtils;
 import azkaban.utils.Props;
 import azkaban.utils.PropsUtils;
 
-/*
+/**
  * A revised process-based job
- *
  */
 public abstract class AbstractProcessJob extends AbstractJob {
   private final Logger log;
@@ -89,7 +88,7 @@ public abstract class AbstractProcessJob extends AbstractJob {
 
   /**
    * initialize temporary and final property file
-   * 
+   *
    * @return {tmpPropFile, outputPropFile}
    */
   public File[] initPropsFiles() {

diff --git a/azkaban-common/src/main/java/azkaban/jobExecutor/Job.java b/azkaban-common/src/main/java/azkaban/jobExecutor/Job.java
index 1bb4c80..cf82636 100644
--- a/azkaban-common/src/main/java/azkaban/jobExecutor/Job.java
+++ b/azkaban-common/src/main/java/azkaban/jobExecutor/Job.java
@@ -25,7 +25,7 @@ import azkaban.utils.Props;
  * <li>Job ID/Name : {String}</li>
  * <li>Arguments: Key/Value Map for Strings</li>
  * </ul>
- * 
+ *
  * A job is required to have a constructor Job(String jobId, Props props)
  */
 
@@ -33,7 +33,7 @@ public interface Job {
 
   /**
    * Returns a unique(should be checked in xml) string name/id for the Job.
-   * 
+   *
    * @return
    */
   public String getId();
@@ -46,7 +46,7 @@ public interface Job {
 
   /**
    * Best effort attempt to cancel the job.
-   * 
+   *
    * @throws Exception If cancel fails
    */
   public void cancel() throws Exception;
@@ -54,21 +54,21 @@ public interface Job {
   /**
    * Returns a progress report between [0 - 1.0] to indicate the percentage
    * complete
-   * 
+   *
    * @throws Exception If getting progress fails
    */
   public double getProgress() throws Exception;
 
   /**
    * Get the generated properties from this job.
-   * 
+   *
    * @return
    */
   public Props getJobGeneratedProperties();
 
   /**
    * Determine if the job was cancelled.
-   * 
+   *
    * @return
    */
   public boolean isCanceled();

diff --git a/azkaban-common/src/main/java/azkaban/jobExecutor/NoopJob.java b/azkaban-common/src/main/java/azkaban/jobExecutor/NoopJob.java
index f20c554..0f6c376 100644
--- a/azkaban-common/src/main/java/azkaban/jobExecutor/NoopJob.java
+++ b/azkaban-common/src/main/java/azkaban/jobExecutor/NoopJob.java
@@ -21,7 +21,7 @@ import org.apache.log4j.Logger;
 import azkaban.utils.Props;
 
 /**
- *
+ * A no-op job.
  */
 public class NoopJob implements Job {
   private String jobId;

diff --git a/azkaban-common/src/main/java/azkaban/jobExecutor/ProcessJob.java b/azkaban-common/src/main/java/azkaban/jobExecutor/ProcessJob.java
index f386c40..bf856fb 100644
--- a/azkaban-common/src/main/java/azkaban/jobExecutor/ProcessJob.java
+++ b/azkaban-common/src/main/java/azkaban/jobExecutor/ProcessJob.java
@@ -28,9 +28,8 @@ import azkaban.jobExecutor.utils.process.AzkabanProcess;
 import azkaban.jobExecutor.utils.process.AzkabanProcessBuilder;
 import azkaban.utils.Props;
 
-/*
+/**
  * A job that runs a simple unix command
- *
  */
 public class ProcessJob extends AbstractProcessJob {
 
@@ -148,7 +147,7 @@ public class ProcessJob extends AbstractProcessJob {
   /**
    * Splits the command into a unix like command line structure. Quotes and
    * single quotes are treated as nested strings.
-   * 
+   *
    * @param command
    * @return
    */

diff --git a/azkaban-common/src/main/java/azkaban/jobExecutor/PythonJob.java b/azkaban-common/src/main/java/azkaban/jobExecutor/PythonJob.java
index acacc42..135790e 100644
--- a/azkaban-common/src/main/java/azkaban/jobExecutor/PythonJob.java
+++ b/azkaban-common/src/main/java/azkaban/jobExecutor/PythonJob.java
@@ -28,7 +28,7 @@ public class PythonJob extends LongArgJob {
   private static final String SCRIPT_KEY = "script";
 
   public PythonJob(String jobid, Props sysProps, Props jobProps, Logger log) {
-    super(jobid, 
+    super(jobid,
         new String[] {
           jobProps.getString(PYTHON_BINARY_KEY, "python"),
           jobProps.getString(SCRIPT_KEY)

diff --git a/azkaban-common/src/main/java/azkaban/jobExecutor/RubyJob.java b/azkaban-common/src/main/java/azkaban/jobExecutor/RubyJob.java
index 8fe14fa..a5f88f7 100644
--- a/azkaban-common/src/main/java/azkaban/jobExecutor/RubyJob.java
+++ b/azkaban-common/src/main/java/azkaban/jobExecutor/RubyJob.java
@@ -28,7 +28,7 @@ public class RubyJob extends LongArgJob {
   private static final String SCRIPT_KEY = "script";
 
   public RubyJob(String jobid, Props sysProps, Props jobProps, Logger log) {
-    super(jobid, 
+    super(jobid,
         new String[] {
           jobProps.getString(RUBY_BINARY_KEY, "ruby"),
           jobProps.getString(SCRIPT_KEY)

diff --git a/azkaban-common/src/main/java/azkaban/jobExecutor/utils/InitErrorJob.java b/azkaban-common/src/main/java/azkaban/jobExecutor/utils/InitErrorJob.java
index b860f80..2a982ef 100644
--- a/azkaban-common/src/main/java/azkaban/jobExecutor/utils/InitErrorJob.java
+++ b/azkaban-common/src/main/java/azkaban/jobExecutor/utils/InitErrorJob.java
@@ -22,9 +22,8 @@ import azkaban.jobExecutor.AbstractJob;
 
 /**
  * this job is used to throw out exception caught in initialization stage
- * 
+ *
  * @author lguo
- * 
  */
 public class InitErrorJob extends AbstractJob {
 

diff --git a/azkaban-common/src/main/java/azkaban/jobExecutor/utils/process/AzkabanProcess.java b/azkaban-common/src/main/java/azkaban/jobExecutor/utils/process/AzkabanProcess.java
index 78666f7..dd7dd57 100644
--- a/azkaban-common/src/main/java/azkaban/jobExecutor/utils/process/AzkabanProcess.java
+++ b/azkaban-common/src/main/java/azkaban/jobExecutor/utils/process/AzkabanProcess.java
@@ -35,10 +35,9 @@ import com.google.common.base.Joiner;
 
 /**
  * A less shitty version of java.lang.Process.
- * 
+ *
  * Output is read by separate threads to avoid deadlock and logged to log4j
  * loggers.
- * 
  */
 public class AzkabanProcess {
   private final String workingDir;
@@ -117,7 +116,7 @@ public class AzkabanProcess {
 
   /**
    * Await the completion of this process
-   * 
+   *
    * @throws InterruptedException if the thread is interrupted while waiting.
    */
   public void awaitCompletion() throws InterruptedException {
@@ -126,7 +125,7 @@ public class AzkabanProcess {
 
   /**
    * Await the start of this process
-   * 
+   *
    * @throws InterruptedException if the thread is interrupted while waiting.
    */
   public void awaitStartup() throws InterruptedException {
@@ -135,7 +134,7 @@ public class AzkabanProcess {
 
   /**
    * Get the process id for this process, if it has started.
-   * 
+   *
    * @return The process id or -1 if it cannot be fetched
    */
   public int getProcessId() {
@@ -145,7 +144,7 @@ public class AzkabanProcess {
 
   /**
    * Attempt to kill the process, waiting up to the given time for it to die
-   * 
+   *
    * @param time The amount of time to wait
    * @param unit The time unit
    * @return true iff this soft kill kills the process in the given wait time.
@@ -184,7 +183,7 @@ public class AzkabanProcess {
 
   /**
    * Attempt to get the process id for this process
-   * 
+   *
    * @param process The process to get the id from
    * @return The id of the process
    */

diff --git a/azkaban-common/src/main/java/azkaban/jobtype/JobTypeManager.java b/azkaban-common/src/main/java/azkaban/jobtype/JobTypeManager.java
index e5b5bdb..e5d0dae 100644
--- a/azkaban-common/src/main/java/azkaban/jobtype/JobTypeManager.java
+++ b/azkaban-common/src/main/java/azkaban/jobtype/JobTypeManager.java
@@ -16,6 +16,16 @@
 
 package azkaban.jobtype;
 
+import java.io.File;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.log4j.Logger;
+
 import azkaban.jobExecutor.JavaProcessJob;
 import azkaban.jobExecutor.Job;
 import azkaban.jobExecutor.NoopJob;
@@ -23,19 +33,10 @@ import azkaban.jobExecutor.ProcessJob;
 import azkaban.jobExecutor.PythonJob;
 import azkaban.jobExecutor.RubyJob;
 import azkaban.jobExecutor.ScriptJob;
+import azkaban.jobExecutor.utils.JobExecutionException;
 import azkaban.utils.Props;
 import azkaban.utils.PropsUtils;
 import azkaban.utils.Utils;
-import azkaban.jobExecutor.utils.JobExecutionException;
-import java.io.File;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.log4j.Logger;
 
 public class JobTypeManager {
   private final String jobTypePluginDir; // the dir for jobtype plugins
@@ -244,7 +245,7 @@ public class JobTypeManager {
 
   /**
    * Creates and loads all plugin resources (jars) into a ClassLoader
-   * 
+   *
    * @param pluginDir
    * @param jobTypeName
    * @param plugins

diff --git a/azkaban-common/src/main/java/azkaban/jobtype/JobTypePluginSet.java b/azkaban-common/src/main/java/azkaban/jobtype/JobTypePluginSet.java
index f2e9133..cb687dd 100644
--- a/azkaban-common/src/main/java/azkaban/jobtype/JobTypePluginSet.java
+++ b/azkaban-common/src/main/java/azkaban/jobtype/JobTypePluginSet.java
@@ -23,10 +23,10 @@ import azkaban.utils.Props;
 
 /**
  * Container for job type plugins
- * 
+ *
  * This contains the jobClass objects, the properties for loading plugins, and
  * the properties given by default to the plugin.
- * 
+ *
  * This class is not thread safe, so adding to this class should only be
  * populated and controlled by the JobTypeManager
  */
@@ -49,7 +49,7 @@ public class JobTypePluginSet {
 
   /**
    * Copy constructor
-   * 
+   *
    * @param clone
    */
   public JobTypePluginSet(JobTypePluginSet clone) {
@@ -62,7 +62,7 @@ public class JobTypePluginSet {
 
   /**
    * Sets the common properties shared in every jobtype
-   * 
+   *
    * @param commonJobProps
    */
   public void setCommonPluginJobProps(Props commonJobProps) {
@@ -71,7 +71,7 @@ public class JobTypePluginSet {
 
   /**
    * Sets the common properties used to load every plugin
-   * 
+   *
    * @param commonLoadProps
    */
   public void setCommonPluginLoadProps(Props commonLoadProps) {
@@ -80,7 +80,7 @@ public class JobTypePluginSet {
 
   /**
    * Gets common properties for every jobtype
-   * 
+   *
    * @return
    */
   public Props getCommonPluginJobProps() {
@@ -89,7 +89,7 @@ public class JobTypePluginSet {
 
   /**
    * Gets the common properties used to load a plugin
-   * 
+   *
    * @return
    */
   public Props getCommonPluginLoadProps() {
@@ -98,7 +98,7 @@ public class JobTypePluginSet {
 
   /**
    * Get the properties for a jobtype used to setup and load a plugin
-   * 
+   *
    * @param jobTypeName
    * @return
    */
@@ -109,7 +109,7 @@ public class JobTypePluginSet {
   /**
    * Get the properties that will be given to the plugin as default job
    * properties.
-   * 
+   *
    * @param jobTypeName
    * @return
    */
@@ -119,7 +119,7 @@ public class JobTypePluginSet {
 
   /**
    * Gets the plugin job runner class
-   * 
+   *
    * @param jobTypeName
    * @return
    */

diff --git a/azkaban-common/src/main/java/azkaban/project/JdbcProjectLoader.java b/azkaban-common/src/main/java/azkaban/project/JdbcProjectLoader.java
index e7146af..b4b1fd6 100644
--- a/azkaban-common/src/main/java/azkaban/project/JdbcProjectLoader.java
+++ b/azkaban-common/src/main/java/azkaban/project/JdbcProjectLoader.java
@@ -39,11 +39,11 @@ import org.apache.commons.dbutils.ResultSetHandler;
 import org.apache.commons.io.IOUtils;
 import org.apache.log4j.Logger;
 
+import azkaban.database.AbstractJdbcLoader;
 import azkaban.flow.Flow;
 import azkaban.project.ProjectLogEvent.EventType;
 import azkaban.user.Permission;
 import azkaban.user.User;
-import azkaban.database.AbstractJdbcLoader;
 import azkaban.utils.GZIPUtils;
 import azkaban.utils.JSONUtils;
 import azkaban.utils.Md5Hasher;
@@ -191,7 +191,7 @@ public class JdbcProjectLoader extends AbstractJdbcLoader implements
 
   /**
    * Creates a Project in the db.
-   * 
+   *
    * It will throw an exception if it finds an active project of the same name,
    * or the SQL fails
    */
@@ -674,7 +674,7 @@ public class JdbcProjectLoader extends AbstractJdbcLoader implements
 
   /**
    * Get all the logs for a given project
-   * 
+   *
    * @param project
    * @return
    * @throws ProjectManagerException

diff --git a/azkaban-common/src/main/java/azkaban/project/ProjectLoader.java b/azkaban-common/src/main/java/azkaban/project/ProjectLoader.java
index 1251903..371599f 100644
--- a/azkaban-common/src/main/java/azkaban/project/ProjectLoader.java
+++ b/azkaban-common/src/main/java/azkaban/project/ProjectLoader.java
@@ -32,7 +32,7 @@ public interface ProjectLoader {
 
   /**
    * Returns all projects which are active
-   * 
+   *
    * @return
    * @throws ProjectManagerException
    */
@@ -40,7 +40,7 @@ public interface ProjectLoader {
 
   /**
    * Loads whole project, including permissions, by the project id.
-   * 
+   *
    * @param id
    * @return
    * @throws ProjectManagerException
@@ -51,11 +51,11 @@ public interface ProjectLoader {
    * Should create an empty project with the given name and user and adds it to
    * the data store. It will auto assign a unique id for this project if
    * successful.
-   * 
+   *
    * If an active project of the same name exists, it will throw an exception.
    * If the name and description of the project exceeds the store's constraints,
    * it will throw an exception.
-   * 
+   *
    * @param name
    * @return
    * @throws ProjectManagerException if an active project of the same name
@@ -66,7 +66,7 @@ public interface ProjectLoader {
 
   /**
    * Removes the project by marking it inactive.
-   * 
+   *
    * @param project
    * @throws ProjectManagerException
    */
@@ -77,7 +77,7 @@ public interface ProjectLoader {
    * Adds and updates the user permissions. Does not check if the user is valid.
    * If the permission doesn't exist, it adds. If the permission exists, it
    * updates.
-   * 
+   *
    * @param project
    * @param name
    * @param perm
@@ -92,7 +92,7 @@ public interface ProjectLoader {
 
   /**
    * Modifies and commits the project description.
-   * 
+   *
    * @param project
    * @param description
    * @throws ProjectManagerException
@@ -103,7 +103,7 @@ public interface ProjectLoader {
   /**
    * Stores logs for a particular project. Will soft fail rather than throw
    * exception.
-   * 
+   *
    * @param project
    * @param type
    * @param message return true if the posting was success.
@@ -113,7 +113,7 @@ public interface ProjectLoader {
 
   /**
    * Returns all the events for a project sorted
-   * 
+   *
    * @param project
    * @return
    */
@@ -129,7 +129,7 @@ public interface ProjectLoader {
 
   /**
    * Get file that's uploaded.
-   * 
+   *
    * @return
    */
   public ProjectFileHandler getUploadedFile(Project project, int version)
@@ -137,7 +137,7 @@ public interface ProjectLoader {
 
   /**
    * Get file that's uploaded.
-   * 
+   *
    * @return
    */
   public ProjectFileHandler getUploadedFile(int projectId, int version)
@@ -145,7 +145,7 @@ public interface ProjectLoader {
 
   /**
    * Changes and commits different project version.
-   * 
+   *
    * @param project
    * @param version
    * @throws ProjectManagerException
@@ -158,7 +158,7 @@ public interface ProjectLoader {
 
   /**
    * Uploads all computed flows
-   * 
+   *
    * @param project
    * @param version
    * @param flows
@@ -169,7 +169,7 @@ public interface ProjectLoader {
 
   /**
    * Upload just one flow.
-   * 
+   *
    * @param project
    * @param version
    * @param flow
@@ -180,7 +180,7 @@ public interface ProjectLoader {
 
   /**
    * Fetches one particular flow.
-   * 
+   *
    * @param project
    * @param version
    * @param flowId
@@ -191,7 +191,7 @@ public interface ProjectLoader {
 
   /**
    * Fetches all flows.
-   * 
+   *
    * @param project
    * @param version
    * @param flowId
@@ -208,7 +208,7 @@ public interface ProjectLoader {
 
   /**
    * Upload Project properties
-   * 
+   *
    * @param project
    * @param path
    * @param properties
@@ -219,7 +219,7 @@ public interface ProjectLoader {
 
   /**
    * Upload Project properties. Map contains key value of path and properties
-   * 
+   *
    * @param project
    * @param path
    * @param properties
@@ -230,7 +230,7 @@ public interface ProjectLoader {
 
   /**
    * Fetch project properties
-   * 
+   *
    * @param project
    * @param propsName
    * @return
@@ -241,7 +241,7 @@ public interface ProjectLoader {
 
   /**
    * Fetch all project properties
-   * 
+   *
    * @param project
    * @return
    * @throws ProjectManagerException
@@ -251,7 +251,7 @@ public interface ProjectLoader {
 
   /**
    * Cleans all project versions less tha
-   * 
+   *
    * @param projectId
    * @param version
    * @throws ProjectManagerException

diff --git a/azkaban-common/src/main/java/azkaban/scheduler/ScheduleManager.java b/azkaban-common/src/main/java/azkaban/scheduler/ScheduleManager.java
index 5b98d3c..7a4c402 100644
--- a/azkaban-common/src/main/java/azkaban/scheduler/ScheduleManager.java
+++ b/azkaban-common/src/main/java/azkaban/scheduler/ScheduleManager.java
@@ -22,6 +22,7 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.log4j.Logger;
+
 import org.joda.time.DateTimeZone;
 import org.joda.time.ReadablePeriod;
 import org.joda.time.format.DateTimeFormat;
@@ -56,7 +57,7 @@ public class ScheduleManager implements TriggerAgent {
   /**
    * Give the schedule manager a loader class that will properly load the
    * schedule.
-   * 
+   *
    * @param loader
    */
   public ScheduleManager(ScheduleLoader loader) {
@@ -110,7 +111,7 @@ public class ScheduleManager implements TriggerAgent {
 
   /**
    * Retrieves a copy of the list of schedules.
-   * 
+   *
    * @return
    * @throws ScheduleManagerException
    */
@@ -123,7 +124,7 @@ public class ScheduleManager implements TriggerAgent {
 
   /**
    * Returns the scheduled flow for the flow name
-   * 
+   *
    * @param id
    * @return
    * @throws ScheduleManagerException
@@ -138,7 +139,7 @@ public class ScheduleManager implements TriggerAgent {
 
   /**
    * Returns the scheduled flow for the scheduleId
-   * 
+   *
    * @param id
    * @return
    * @throws ScheduleManagerException
@@ -150,7 +151,7 @@ public class ScheduleManager implements TriggerAgent {
 
   /**
    * Removes the flow from the schedule if it exists.
-   * 
+   *
    * @param id
    * @throws ScheduleManagerException
    */
@@ -165,7 +166,7 @@ public class ScheduleManager implements TriggerAgent {
 
   /**
    * Removes the flow from the schedule if it exists.
-   * 
+   *
    * @param id
    */
   public synchronized void removeSchedule(Schedule sched) {
@@ -217,7 +218,7 @@ public class ScheduleManager implements TriggerAgent {
 
   /**
    * Schedules the flow, but doesn't save the schedule afterwards.
-   * 
+   *
    * @param flow
    */
   private synchronized void internalSchedule(Schedule s) {
@@ -227,7 +228,7 @@ public class ScheduleManager implements TriggerAgent {
 
   /**
    * Adds a flow to the schedule.
-   * 
+   *
    * @param flow
    */
   public synchronized void insertSchedule(Schedule s) {

diff --git a/azkaban-common/src/main/java/azkaban/scheduler/TriggerBasedScheduleLoader.java b/azkaban-common/src/main/java/azkaban/scheduler/TriggerBasedScheduleLoader.java
index 796b7af..83e1c9d 100644
--- a/azkaban-common/src/main/java/azkaban/scheduler/TriggerBasedScheduleLoader.java
+++ b/azkaban-common/src/main/java/azkaban/scheduler/TriggerBasedScheduleLoader.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2014 LinkedIn Corp.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
 package azkaban.scheduler;
 
 import java.util.ArrayList;

diff --git a/azkaban-common/src/main/java/azkaban/server/AbstractServiceServlet.java b/azkaban-common/src/main/java/azkaban/server/AbstractServiceServlet.java
index a515d10..c993db9 100644
--- a/azkaban-common/src/main/java/azkaban/server/AbstractServiceServlet.java
+++ b/azkaban-common/src/main/java/azkaban/server/AbstractServiceServlet.java
@@ -1,12 +1,30 @@
+/*
+ * Copyright 2014 LinkedIn Corp.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
 package azkaban.server;
 
 import java.io.IOException;
 import java.io.OutputStream;
+
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
 import org.codehaus.jackson.map.ObjectMapper;
 
 public class AbstractServiceServlet extends HttpServlet {

diff --git a/azkaban-common/src/main/java/azkaban/server/AzkabanServer.java b/azkaban-common/src/main/java/azkaban/server/AzkabanServer.java
index 2169b8b..45f49f2 100644
--- a/azkaban-common/src/main/java/azkaban/server/AzkabanServer.java
+++ b/azkaban-common/src/main/java/azkaban/server/AzkabanServer.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2012 LinkedIn Corp.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -105,7 +105,7 @@ public abstract class AzkabanServer {
 
   /**
    * Loads the Azkaban property file from the AZKABAN_HOME conf directory
-   * 
+   *
    * @return
    */
   private static Props loadConfigurationFromAzkabanHome() {

diff --git a/azkaban-common/src/main/java/azkaban/server/HttpRequestUtils.java b/azkaban-common/src/main/java/azkaban/server/HttpRequestUtils.java
index 1e5a529..80eff74 100644
--- a/azkaban-common/src/main/java/azkaban/server/HttpRequestUtils.java
+++ b/azkaban-common/src/main/java/azkaban/server/HttpRequestUtils.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2012 LinkedIn Corp.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -114,7 +114,7 @@ public class HttpRequestUtils {
 
   /**
    * Checks for the existance of the parameter in the request
-   * 
+   *
    * @param request
    * @param param
    * @return
@@ -126,7 +126,7 @@ public class HttpRequestUtils {
   /**
    * Retrieves the param from the http servlet request. Will throw an exception
    * if not found
-   * 
+   *
    * @param request
    * @param name
    * @return
@@ -144,11 +144,11 @@ public class HttpRequestUtils {
 
   /**
    * Retrieves the param from the http servlet request.
-   * 
+   *
    * @param request
    * @param name
    * @param default
-   * 
+   *
    * @return
    */
   public static String getParam(HttpServletRequest request, String name,
@@ -163,7 +163,7 @@ public class HttpRequestUtils {
   /**
    * Returns the param and parses it into an int. Will throw an exception if not
    * found, or a parse error if the type is incorrect.
-   * 
+   *
    * @param request
    * @param name
    * @return

diff --git a/azkaban-common/src/main/java/azkaban/server/session/Session.java b/azkaban-common/src/main/java/azkaban/server/session/Session.java
index 5345d5c..dd8ce9d 100644
--- a/azkaban-common/src/main/java/azkaban/server/session/Session.java
+++ b/azkaban-common/src/main/java/azkaban/server/session/Session.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2012 LinkedIn Corp.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -31,7 +31,7 @@ public class Session {
 
   /**
    * Constructor for the session
-   * 
+   *
    * @param sessionId
    * @param user
    */
@@ -43,7 +43,7 @@ public class Session {
 
   /**
    * Returns the User object
-   * 
+   *
    * @return
    */
   public User getUser() {
@@ -52,7 +52,7 @@ public class Session {
 
   /**
    * Returns the sessionId
-   * 
+   *
    * @return
    */
   public String getSessionId() {

diff --git a/azkaban-common/src/main/java/azkaban/server/session/SessionCache.java b/azkaban-common/src/main/java/azkaban/server/session/SessionCache.java
index e792adf..fc4d64f 100644
--- a/azkaban-common/src/main/java/azkaban/server/session/SessionCache.java
+++ b/azkaban-common/src/main/java/azkaban/server/session/SessionCache.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2012 LinkedIn Corp.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -23,7 +23,7 @@ import azkaban.utils.cache.Cache.EjectionPolicy;
 
 /**
  * Cache for web session.
- * 
+ *
  * The following global azkaban properties can be used: max.num.sessions - used
  * to determine the number of live sessions that azkaban will handle. Default is
  * 10000 session.time.to.live -Number of seconds before session expires. Default
@@ -38,7 +38,7 @@ public class SessionCache {
 
   /**
    * Constructor taking global props.
-   * 
+   *
    * @param props
    */
   public SessionCache(Props props) {
@@ -53,7 +53,7 @@ public class SessionCache {
 
   /**
    * Returns the cached session using the session id.
-   * 
+   *
    * @param sessionId
    * @return
    */
@@ -65,7 +65,7 @@ public class SessionCache {
 
   /**
    * Adds a session to the cache. Accessible through the session ID.
-   * 
+   *
    * @param id
    * @param session
    */
@@ -75,7 +75,7 @@ public class SessionCache {
 
   /**
    * Removes the session from the cache.
-   * 
+   *
    * @param id
    * @return
    */

diff --git a/azkaban-common/src/main/java/azkaban/sla/SlaOption.java b/azkaban-common/src/main/java/azkaban/sla/SlaOption.java
index 82b9bdc..d5eff76 100644
--- a/azkaban-common/src/main/java/azkaban/sla/SlaOption.java
+++ b/azkaban-common/src/main/java/azkaban/sla/SlaOption.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2014 LinkedIn Corp.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
 package azkaban.sla;
 
 import java.util.ArrayList;

diff --git a/azkaban-common/src/main/java/azkaban/trigger/ActionTypeLoader.java b/azkaban-common/src/main/java/azkaban/trigger/ActionTypeLoader.java
index 16292da..8c6ad63 100644
--- a/azkaban-common/src/main/java/azkaban/trigger/ActionTypeLoader.java
+++ b/azkaban-common/src/main/java/azkaban/trigger/ActionTypeLoader.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2012 LinkedIn Corp.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the

diff --git a/azkaban-common/src/main/java/azkaban/trigger/builtin/BasicTimeChecker.java b/azkaban-common/src/main/java/azkaban/trigger/builtin/BasicTimeChecker.java
index e63adcd..4731dde 100644
--- a/azkaban-common/src/main/java/azkaban/trigger/builtin/BasicTimeChecker.java
+++ b/azkaban-common/src/main/java/azkaban/trigger/builtin/BasicTimeChecker.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2012 LinkedIn Corp.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the

diff --git a/azkaban-common/src/main/java/azkaban/trigger/builtin/CreateTriggerAction.java b/azkaban-common/src/main/java/azkaban/trigger/builtin/CreateTriggerAction.java
index 7f4a3c1..2fe5061 100644
--- a/azkaban-common/src/main/java/azkaban/trigger/builtin/CreateTriggerAction.java
+++ b/azkaban-common/src/main/java/azkaban/trigger/builtin/CreateTriggerAction.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2012 LinkedIn Corp.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the

diff --git a/azkaban-common/src/main/java/azkaban/trigger/builtin/ExecuteFlowAction.java b/azkaban-common/src/main/java/azkaban/trigger/builtin/ExecuteFlowAction.java
index f7a1cfa..7927491 100644
--- a/azkaban-common/src/main/java/azkaban/trigger/builtin/ExecuteFlowAction.java
+++ b/azkaban-common/src/main/java/azkaban/trigger/builtin/ExecuteFlowAction.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2012 LinkedIn Corp.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the

diff --git a/azkaban-common/src/main/java/azkaban/trigger/builtin/ExecutionChecker.java b/azkaban-common/src/main/java/azkaban/trigger/builtin/ExecutionChecker.java
index f351103..b3e249d 100644
--- a/azkaban-common/src/main/java/azkaban/trigger/builtin/ExecutionChecker.java
+++ b/azkaban-common/src/main/java/azkaban/trigger/builtin/ExecutionChecker.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2012 LinkedIn Corp.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the

diff --git a/azkaban-common/src/main/java/azkaban/trigger/builtin/KillExecutionAction.java b/azkaban-common/src/main/java/azkaban/trigger/builtin/KillExecutionAction.java
index ac32252..ea26983 100644
--- a/azkaban-common/src/main/java/azkaban/trigger/builtin/KillExecutionAction.java
+++ b/azkaban-common/src/main/java/azkaban/trigger/builtin/KillExecutionAction.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2012 LinkedIn Corp.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the

diff --git a/azkaban-common/src/main/java/azkaban/trigger/builtin/SendEmailAction.java b/azkaban-common/src/main/java/azkaban/trigger/builtin/SendEmailAction.java
index fb7739b..e2b63fa 100644
--- a/azkaban-common/src/main/java/azkaban/trigger/builtin/SendEmailAction.java
+++ b/azkaban-common/src/main/java/azkaban/trigger/builtin/SendEmailAction.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2012 LinkedIn Corp.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the

diff --git a/azkaban-common/src/main/java/azkaban/trigger/builtin/SlaAlertAction.java b/azkaban-common/src/main/java/azkaban/trigger/builtin/SlaAlertAction.java
index e7b34de..64e3d7e 100644
--- a/azkaban-common/src/main/java/azkaban/trigger/builtin/SlaAlertAction.java
+++ b/azkaban-common/src/main/java/azkaban/trigger/builtin/SlaAlertAction.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2012 LinkedIn Corp.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the

diff --git a/azkaban-common/src/main/java/azkaban/trigger/builtin/SlaChecker.java b/azkaban-common/src/main/java/azkaban/trigger/builtin/SlaChecker.java
index 0db4250..1141176 100644
--- a/azkaban-common/src/main/java/azkaban/trigger/builtin/SlaChecker.java
+++ b/azkaban-common/src/main/java/azkaban/trigger/builtin/SlaChecker.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2012 LinkedIn Corp.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -20,6 +20,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.log4j.Logger;
+
 import org.joda.time.DateTime;
 import org.joda.time.ReadablePeriod;
 

diff --git a/azkaban-common/src/main/java/azkaban/trigger/CheckerTypeLoader.java b/azkaban-common/src/main/java/azkaban/trigger/CheckerTypeLoader.java
index 85a024a..829b343 100644
--- a/azkaban-common/src/main/java/azkaban/trigger/CheckerTypeLoader.java
+++ b/azkaban-common/src/main/java/azkaban/trigger/CheckerTypeLoader.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2012 LinkedIn Corp.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the

diff --git a/azkaban-common/src/main/java/azkaban/trigger/Condition.java b/azkaban-common/src/main/java/azkaban/trigger/Condition.java
index c6698b2..07c0a65 100644
--- a/azkaban-common/src/main/java/azkaban/trigger/Condition.java
+++ b/azkaban-common/src/main/java/azkaban/trigger/Condition.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2012 LinkedIn Corp.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -25,6 +25,7 @@ import org.apache.commons.jexl2.Expression;
 import org.apache.commons.jexl2.JexlEngine;
 import org.apache.commons.jexl2.MapContext;
 import org.apache.log4j.Logger;
+
 import org.joda.time.DateTime;
 
 public class Condition {

diff --git a/azkaban-common/src/main/java/azkaban/trigger/ConditionChecker.java b/azkaban-common/src/main/java/azkaban/trigger/ConditionChecker.java
index af215ea..e8d356f 100644
--- a/azkaban-common/src/main/java/azkaban/trigger/ConditionChecker.java
+++ b/azkaban-common/src/main/java/azkaban/trigger/ConditionChecker.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2012 LinkedIn Corp.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the

diff --git a/azkaban-common/src/main/java/azkaban/trigger/JdbcTriggerLoader.java b/azkaban-common/src/main/java/azkaban/trigger/JdbcTriggerLoader.java
index 099db6c..61333ac 100644
--- a/azkaban-common/src/main/java/azkaban/trigger/JdbcTriggerLoader.java
+++ b/azkaban-common/src/main/java/azkaban/trigger/JdbcTriggerLoader.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2012 LinkedIn Corp.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -28,6 +28,7 @@ import org.apache.commons.dbutils.DbUtils;
 import org.apache.commons.dbutils.QueryRunner;
 import org.apache.commons.dbutils.ResultSetHandler;
 import org.apache.log4j.Logger;
+
 import org.joda.time.DateTime;
 
 import azkaban.database.AbstractJdbcLoader;

diff --git a/azkaban-common/src/main/java/azkaban/trigger/Trigger.java b/azkaban-common/src/main/java/azkaban/trigger/Trigger.java
index 968e9d8..edde6d3 100644
--- a/azkaban-common/src/main/java/azkaban/trigger/Trigger.java
+++ b/azkaban-common/src/main/java/azkaban/trigger/Trigger.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2012 LinkedIn Corp.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -22,6 +22,7 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.log4j.Logger;
+
 import org.joda.time.DateTime;
 
 import azkaban.utils.JSONUtils;

diff --git a/azkaban-common/src/main/java/azkaban/trigger/TriggerAction.java b/azkaban-common/src/main/java/azkaban/trigger/TriggerAction.java
index 367b84c..17a1179 100644
--- a/azkaban-common/src/main/java/azkaban/trigger/TriggerAction.java
+++ b/azkaban-common/src/main/java/azkaban/trigger/TriggerAction.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2012 LinkedIn Corp.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the

diff --git a/azkaban-common/src/main/java/azkaban/trigger/TriggerAgent.java b/azkaban-common/src/main/java/azkaban/trigger/TriggerAgent.java
index b467a1c..b779e60 100644
--- a/azkaban-common/src/main/java/azkaban/trigger/TriggerAgent.java
+++ b/azkaban-common/src/main/java/azkaban/trigger/TriggerAgent.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2012 LinkedIn Corp.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the

diff --git a/azkaban-common/src/main/java/azkaban/trigger/TriggerException.java b/azkaban-common/src/main/java/azkaban/trigger/TriggerException.java
index a4539bb..8b01478 100644
--- a/azkaban-common/src/main/java/azkaban/trigger/TriggerException.java
+++ b/azkaban-common/src/main/java/azkaban/trigger/TriggerException.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2012 LinkedIn Corp.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the

diff --git a/azkaban-common/src/main/java/azkaban/trigger/TriggerLoader.java b/azkaban-common/src/main/java/azkaban/trigger/TriggerLoader.java
index 662bbfd..6ffdbf4 100644
--- a/azkaban-common/src/main/java/azkaban/trigger/TriggerLoader.java
+++ b/azkaban-common/src/main/java/azkaban/trigger/TriggerLoader.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2012 LinkedIn Corp.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the

diff --git a/azkaban-common/src/main/java/azkaban/trigger/TriggerLoaderException.java b/azkaban-common/src/main/java/azkaban/trigger/TriggerLoaderException.java
index b45d916..aa40fb9 100644
--- a/azkaban-common/src/main/java/azkaban/trigger/TriggerLoaderException.java
+++ b/azkaban-common/src/main/java/azkaban/trigger/TriggerLoaderException.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2012 LinkedIn Corp.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the

diff --git a/azkaban-common/src/main/java/azkaban/trigger/TriggerManager.java b/azkaban-common/src/main/java/azkaban/trigger/TriggerManager.java
index 256b6fb..24bb8e3 100644
--- a/azkaban-common/src/main/java/azkaban/trigger/TriggerManager.java
+++ b/azkaban-common/src/main/java/azkaban/trigger/TriggerManager.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2012 LinkedIn Corp.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -26,6 +26,7 @@ import java.util.Set;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.PriorityBlockingQueue;
+
 import org.apache.log4j.Logger;
 
 import azkaban.event.Event;

diff --git a/azkaban-common/src/main/java/azkaban/trigger/TriggerManagerAdapter.java b/azkaban-common/src/main/java/azkaban/trigger/TriggerManagerAdapter.java
index a747a34..64207fd 100644
--- a/azkaban-common/src/main/java/azkaban/trigger/TriggerManagerAdapter.java
+++ b/azkaban-common/src/main/java/azkaban/trigger/TriggerManagerAdapter.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2012 LinkedIn Corp.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the

diff --git a/azkaban-common/src/main/java/azkaban/trigger/TriggerManagerException.java b/azkaban-common/src/main/java/azkaban/trigger/TriggerManagerException.java
index e8cc823..741a2c4 100644
--- a/azkaban-common/src/main/java/azkaban/trigger/TriggerManagerException.java
+++ b/azkaban-common/src/main/java/azkaban/trigger/TriggerManagerException.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2012 LinkedIn Corp.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the

diff --git a/azkaban-common/src/main/java/azkaban/trigger/TriggerStatus.java b/azkaban-common/src/main/java/azkaban/trigger/TriggerStatus.java
index 3281941..1a55249 100644
--- a/azkaban-common/src/main/java/azkaban/trigger/TriggerStatus.java
+++ b/azkaban-common/src/main/java/azkaban/trigger/TriggerStatus.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2012 LinkedIn Corp.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the

diff --git a/azkaban-common/src/main/java/azkaban/user/Permission.java b/azkaban-common/src/main/java/azkaban/user/Permission.java
index d0d123a..88718bb 100644
--- a/azkaban-common/src/main/java/azkaban/user/Permission.java
+++ b/azkaban-common/src/main/java/azkaban/user/Permission.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2012 LinkedIn Corp.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the

diff --git a/azkaban-common/src/main/java/azkaban/user/Role.java b/azkaban-common/src/main/java/azkaban/user/Role.java
index 1954959..7b51e6d 100644
--- a/azkaban-common/src/main/java/azkaban/user/Role.java
+++ b/azkaban-common/src/main/java/azkaban/user/Role.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2012 LinkedIn Corp.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the

diff --git a/azkaban-common/src/main/java/azkaban/user/User.java b/azkaban-common/src/main/java/azkaban/user/User.java
index a78a22f..3c4187a 100644
--- a/azkaban-common/src/main/java/azkaban/user/User.java
+++ b/azkaban-common/src/main/java/azkaban/user/User.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2012 LinkedIn Corp.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the

diff --git a/azkaban-common/src/main/java/azkaban/user/UserManager.java b/azkaban-common/src/main/java/azkaban/user/UserManager.java
index 1d5e6f1..254cfe5 100644
--- a/azkaban-common/src/main/java/azkaban/user/UserManager.java
+++ b/azkaban-common/src/main/java/azkaban/user/UserManager.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2012 LinkedIn Corp.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -19,7 +19,7 @@ package azkaban.user;
 /**
  * Interface for the UserManager. Implementors will have to handle the retrieval
  * of the User object given the username and password.
- * 
+ *
  * The constructor will be called with a azkaban.utils.Props object passed as
  * the only parameter. If such a constructor doesn't exist, than the UserManager
  * instantiation may fail.
@@ -27,7 +27,7 @@ package azkaban.user;
 public interface UserManager {
   /**
    * Retrieves the user given the username and password to authenticate against.
-   * 
+   *
    * @param username
    * @param password
    * @return
@@ -40,7 +40,7 @@ public interface UserManager {
   /**
    * Returns true if the user is valid. This is used when adding permissions for
    * users
-   * 
+   *
    * @param username
    * @return
    */
@@ -49,7 +49,7 @@ public interface UserManager {
   /**
    * Returns true if the group is valid. This is used when adding permissions
    * for groups.
-   * 
+   *
    * @param group
    * @return
    */
@@ -57,7 +57,7 @@ public interface UserManager {
 
   /**
    * Returns the user role. This may return null.
-   * 
+   *
    * @param roleName
    * @return
    */

diff --git a/azkaban-common/src/main/java/azkaban/user/UserManagerException.java b/azkaban-common/src/main/java/azkaban/user/UserManagerException.java
index e73ac25..a27d07b 100644
--- a/azkaban-common/src/main/java/azkaban/user/UserManagerException.java
+++ b/azkaban-common/src/main/java/azkaban/user/UserManagerException.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2012 LinkedIn Corp.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -18,7 +18,7 @@ package azkaban.user;
 
 /**
  * Exception for the UserManager to capture login errors.
- * 
+ *
  */
 public class UserManagerException extends Exception {
   private static final long serialVersionUID = 1L;

diff --git a/azkaban-common/src/main/java/azkaban/user/XmlUserManager.java b/azkaban-common/src/main/java/azkaban/user/XmlUserManager.java
index 46b9ff7..b3c00e2 100644
--- a/azkaban-common/src/main/java/azkaban/user/XmlUserManager.java
+++ b/azkaban-common/src/main/java/azkaban/user/XmlUserManager.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2012 LinkedIn Corp.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -27,10 +27,12 @@ import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 
 import org.apache.log4j.Logger;
+
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
+
 import org.xml.sax.SAXException;
 
 import azkaban.user.User.UserPermissions;
@@ -39,7 +41,7 @@ import azkaban.utils.Props;
 /**
  * Xml implementation of the UserManager. Looks for the property
  * user.manager.xml.file in the azkaban properties.
- * 
+ *
  * The xml to be in the following form: <azkaban-users> <user
  * username="username" password="azkaban" roles="admin" groups="azkaban"/>
  * </azkaban-users>
@@ -73,7 +75,7 @@ public class XmlUserManager implements UserManager {
 
   /**
    * The constructor.
-   * 
+   *
    * @param props
    */
   public XmlUserManager(Props props) {

diff --git a/azkaban-common/src/main/java/azkaban/utils/AbstractMailer.java b/azkaban-common/src/main/java/azkaban/utils/AbstractMailer.java
index 01136cd..a9074a7 100644
--- a/azkaban-common/src/main/java/azkaban/utils/AbstractMailer.java
+++ b/azkaban-common/src/main/java/azkaban/utils/AbstractMailer.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2012 LinkedIn Corp.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the

diff --git a/azkaban-common/src/main/java/azkaban/utils/cache/Cache.java b/azkaban-common/src/main/java/azkaban/utils/cache/Cache.java
index d08bf38..a2ddc60 100644
--- a/azkaban-common/src/main/java/azkaban/utils/cache/Cache.java
+++ b/azkaban-common/src/main/java/azkaban/utils/cache/Cache.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2012 LinkedIn Corp.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the

diff --git a/azkaban-common/src/main/java/azkaban/utils/cache/CacheManager.java b/azkaban-common/src/main/java/azkaban/utils/cache/CacheManager.java
index 724eaee..3257401 100644
--- a/azkaban-common/src/main/java/azkaban/utils/cache/CacheManager.java
+++ b/azkaban-common/src/main/java/azkaban/utils/cache/CacheManager.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2012 LinkedIn Corp.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the

diff --git a/azkaban-common/src/main/java/azkaban/utils/cache/Element.java b/azkaban-common/src/main/java/azkaban/utils/cache/Element.java
index e1eb69d..81aab7f 100644
--- a/azkaban-common/src/main/java/azkaban/utils/cache/Element.java
+++ b/azkaban-common/src/main/java/azkaban/utils/cache/Element.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2012 LinkedIn Corp.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the

diff --git a/azkaban-common/src/main/java/azkaban/utils/CircularBuffer.java b/azkaban-common/src/main/java/azkaban/utils/CircularBuffer.java
index 39e30c9..adbc024 100644
--- a/azkaban-common/src/main/java/azkaban/utils/CircularBuffer.java
+++ b/azkaban-common/src/main/java/azkaban/utils/CircularBuffer.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2010 LinkedIn Corp.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -26,7 +26,7 @@ import com.google.common.collect.Iterators;
 /**
  * A circular buffer of items of a given length. It will grow up to the give
  * size as items are appended, then it will begin to overwrite older items.
- * 
+ *
  * @param <T> The type of the item contained.
  */
 public class CircularBuffer<T> implements Iterable<T> {

diff --git a/azkaban-common/src/main/java/azkaban/utils/DirectoryFlowLoader.java b/azkaban-common/src/main/java/azkaban/utils/DirectoryFlowLoader.java
index 86bfd07..0353d5f 100644
--- a/azkaban-common/src/main/java/azkaban/utils/DirectoryFlowLoader.java
+++ b/azkaban-common/src/main/java/azkaban/utils/DirectoryFlowLoader.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2012 LinkedIn Corp.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the

diff --git a/azkaban-common/src/main/java/azkaban/utils/Emailer.java b/azkaban-common/src/main/java/azkaban/utils/Emailer.java
index cdf44e4..4fae334 100644
--- a/azkaban-common/src/main/java/azkaban/utils/Emailer.java
+++ b/azkaban-common/src/main/java/azkaban/utils/Emailer.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2012 LinkedIn Corp.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -28,10 +28,10 @@ import azkaban.executor.ExecutableFlow;
 import azkaban.executor.ExecutableNode;
 import azkaban.executor.ExecutionOptions;
 import azkaban.executor.Status;
-import azkaban.sla.SlaOption;
-import azkaban.utils.AbstractMailer;
 import azkaban.executor.mail.DefaultMailCreator;
 import azkaban.executor.mail.MailCreator;
+import azkaban.sla.SlaOption;
+import azkaban.utils.AbstractMailer;
 import azkaban.utils.EmailMessage;
 import azkaban.utils.Props;
 

diff --git a/azkaban-common/src/main/java/azkaban/utils/EmailMessage.java b/azkaban-common/src/main/java/azkaban/utils/EmailMessage.java
index 604590b..34a6d63 100644
--- a/azkaban-common/src/main/java/azkaban/utils/EmailMessage.java
+++ b/azkaban-common/src/main/java/azkaban/utils/EmailMessage.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2012 LinkedIn Corp.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the

diff --git a/azkaban-common/src/main/java/azkaban/utils/FileIOUtils.java b/azkaban-common/src/main/java/azkaban/utils/FileIOUtils.java
index 048d2e0..202cc2b 100644
--- a/azkaban-common/src/main/java/azkaban/utils/FileIOUtils.java
+++ b/azkaban-common/src/main/java/azkaban/utils/FileIOUtils.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2012 LinkedIn Corp.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the

diff --git a/azkaban-common/src/main/java/azkaban/utils/GZIPUtils.java b/azkaban-common/src/main/java/azkaban/utils/GZIPUtils.java
index b1d6abb..4315a06 100644
--- a/azkaban-common/src/main/java/azkaban/utils/GZIPUtils.java
+++ b/azkaban-common/src/main/java/azkaban/utils/GZIPUtils.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2012 LinkedIn Corp.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the

diff --git a/azkaban-common/src/main/java/azkaban/utils/JSONUtils.java b/azkaban-common/src/main/java/azkaban/utils/JSONUtils.java
index cafb9d9..d6a0cf5 100644
--- a/azkaban-common/src/main/java/azkaban/utils/JSONUtils.java
+++ b/azkaban-common/src/main/java/azkaban/utils/JSONUtils.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2012 LinkedIn Corp.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -180,11 +180,11 @@ public class JSONUtils {
 
   /*
    * Writes json to a stream without using any external dependencies.
-   * 
+   *
    * This is useful for plugins or extensions that want to write properties to a
    * writer without having to import the jackson, or json libraries. The
    * properties are expected to be a map of String keys and String values.
-   * 
+   *
    * The other json writing methods are more robust and will handle more cases.
    */
   public static void writePropsNoJarDependency(Map<String, String> properties,

diff --git a/azkaban-common/src/main/java/azkaban/utils/LogGobbler.java b/azkaban-common/src/main/java/azkaban/utils/LogGobbler.java
index 6176744..7dcd5c0 100644
--- a/azkaban-common/src/main/java/azkaban/utils/LogGobbler.java
+++ b/azkaban-common/src/main/java/azkaban/utils/LogGobbler.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2012 LinkedIn Corp.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the

diff --git a/azkaban-common/src/main/java/azkaban/utils/Pair.java b/azkaban-common/src/main/java/azkaban/utils/Pair.java
index 5c28784..fddf7fa 100644
--- a/azkaban-common/src/main/java/azkaban/utils/Pair.java
+++ b/azkaban-common/src/main/java/azkaban/utils/Pair.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2012 LinkedIn Corp.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -18,7 +18,7 @@ package azkaban.utils;
 
 /**
  * Pair of values.
- * 
+ *
  * @param <F>
  * @param <S>
  */

diff --git a/azkaban-common/src/main/java/azkaban/utils/Props.java b/azkaban-common/src/main/java/azkaban/utils/Props.java
index beee964..db2b8fe 100644
--- a/azkaban-common/src/main/java/azkaban/utils/Props.java
+++ b/azkaban-common/src/main/java/azkaban/utils/Props.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2012 LinkedIn Corp.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -55,7 +55,7 @@ public class Props {
 
   /**
    * Constructor for empty Props with parent override.
-   * 
+   *
    * @param parent
    */
   public Props(Props parent) {
@@ -65,7 +65,7 @@ public class Props {
 
   /**
    * Load props from a file.
-   * 
+   *
    * @param parent
    * @param file
    * @throws IOException
@@ -76,7 +76,7 @@ public class Props {
 
   /**
    * Load props from a file.
-   * 
+   *
    * @param parent
    * @param file
    * @throws IOException
@@ -97,7 +97,7 @@ public class Props {
 
   /**
    * Create props from property input streams
-   * 
+   *
    * @param parent
    * @param inputStreams
    * @throws IOException
@@ -108,7 +108,7 @@ public class Props {
   }
 
   /**
-   * 
+   *
    * @param inputStream
    * @throws IOException
    */
@@ -120,7 +120,7 @@ public class Props {
 
   /**
    * Create properties from maps of properties
-   * 
+   *
    * @param parent
    * @param props
    */
@@ -133,7 +133,7 @@ public class Props {
 
   /**
    * Create properties from Properties objects
-   * 
+   *
    * @param parent
    * @param properties
    */
@@ -146,7 +146,7 @@ public class Props {
 
   /**
    * Create a Props object with the contents set to that of props.
-   * 
+   *
    * @param parent
    * @param props
    */
@@ -173,7 +173,7 @@ public class Props {
   /**
    * Create a Props with a null parent from a list of key value pairing. i.e.
    * [key1, value1, key2, value2 ...]
-   * 
+   *
    * @param args
    * @return
    */
@@ -184,7 +184,7 @@ public class Props {
   /**
    * Create a Props from a list of key value pairing. i.e. [key1, value1, key2,
    * value2 ...]
-   * 
+   *
    * @param args
    * @return
    */
@@ -212,7 +212,7 @@ public class Props {
 
   /**
    * Check key in current Props then search in parent
-   * 
+   *
    * @param k
    * @return
    */
@@ -223,7 +223,7 @@ public class Props {
 
   /**
    * Check value in current Props then search in parent
-   * 
+   *
    * @param value
    * @return
    */
@@ -234,7 +234,7 @@ public class Props {
 
   /**
    * Return value if available in current Props otherwise return from parent
-   * 
+   *
    * @param key
    * @return
    */
@@ -250,7 +250,7 @@ public class Props {
 
   /**
    * Get the key set from the current Props
-   * 
+   *
    * @return
    */
   public Set<String> localKeySet() {
@@ -259,7 +259,7 @@ public class Props {
 
   /**
    * Get parent Props
-   * 
+   *
    * @return
    */
   public Props getParent() {
@@ -270,10 +270,10 @@ public class Props {
    * Put the given string value for the string key. This method performs any
    * variable substitution in the value replacing any occurance of ${name} with
    * the value of get("name").
-   * 
+   *
    * @param key The key to put the value to
    * @param value The value to do substitution on and store
-   * 
+   *
    * @throws IllegalArgumentException If the variable given for substitution is
    *           not a valid key in this Props.
    */
@@ -286,9 +286,9 @@ public class Props {
    * substitution in the value replacing any occurrence of ${name} with the
    * value of get("name"). get() is called first on the Props and next on the
    * Properties object.
-   * 
+   *
    * @param properties The properties to put
-   * 
+   *
    * @throws IllegalArgumentException If the variable given for substitution is
    *           not a valid key in this Props.
    */
@@ -300,7 +300,7 @@ public class Props {
 
   /**
    * Put integer
-   * 
+   *
    * @param key
    * @param value
    * @return
@@ -311,7 +311,7 @@ public class Props {
 
   /**
    * Put Long. Stores as String.
-   * 
+   *
    * @param key
    * @param value
    * @return
@@ -322,7 +322,7 @@ public class Props {
 
   /**
    * Put Double. Stores as String.
-   * 
+   *
    * @param key
    * @param value
    * @return
@@ -333,7 +333,7 @@ public class Props {
 
   /**
    * Put everything in the map into the props.
-   * 
+   *
    * @param m
    */
   public void putAll(Map<? extends String, ? extends String> m) {
@@ -348,7 +348,7 @@ public class Props {
 
   /**
    * Put all properties in the props into the current props. Will handle null p.
-   * 
+   *
    * @param p
    */
   public void putAll(Props p) {
@@ -363,7 +363,7 @@ public class Props {
 
   /**
    * Puts only the local props from p into the current properties
-   * 
+   *
    * @param p
    */
   public void putLocal(Props p) {
@@ -374,7 +374,7 @@ public class Props {
 
   /**
    * Remove only the local value of key s, and not the parents.
-   * 
+   *
    * @param s
    * @return
    */
@@ -400,7 +400,7 @@ public class Props {
   /**
    * Attempts to return the Class that corresponds to the Props value. If the
    * class doesn't exit, an IllegalArgumentException will be thrown.
-   * 
+   *
    * @param key
    * @return
    */
@@ -433,7 +433,7 @@ public class Props {
   /**
    * Gets the class from the Props. If it doesn't exist, it will return the
    * defaultClass
-   * 
+   *
    * @param key
    * @param c
    * @return
@@ -449,7 +449,7 @@ public class Props {
   /**
    * Gets the string from the Props. If it doesn't exist, it will return the
    * defaultValue
-   * 
+   *
    * @param key
    * @param defaultValue
    * @return
@@ -465,7 +465,7 @@ public class Props {
   /**
    * Gets the string from the Props. If it doesn't exist, throw and
    * UndefinedPropertiesException
-   * 
+   *
    * @param key
    * @param defaultValue
    * @return
@@ -481,7 +481,7 @@ public class Props {
 
   /**
    * Returns a list of strings with the comma as the separator of the value
-   * 
+   *
    * @param key
    * @return
    */
@@ -491,7 +491,7 @@ public class Props {
 
   /**
    * Returns a list of strings with the sep as the separator of the value
-   * 
+   *
    * @param key
    * @param sep
    * @return
@@ -513,7 +513,7 @@ public class Props {
   /**
    * Returns a list of strings with the comma as the separator of the value. If
    * the value is null, it'll return the defaultValue.
-   * 
+   *
    * @param key
    * @return
    */
@@ -528,7 +528,7 @@ public class Props {
   /**
    * Returns a list of strings with the sep as the separator of the value. If
    * the value is null, it'll return the defaultValue.
-   * 
+   *
    * @param key
    * @return
    */
@@ -544,7 +544,7 @@ public class Props {
   /**
    * Returns true if the value equals "true". If the value is null, then the
    * default value is returned.
-   * 
+   *
    * @param key
    * @param defaultValue
    * @return
@@ -560,7 +560,7 @@ public class Props {
   /**
    * Returns true if the value equals "true". If the value is null, then an
    * UndefinedPropertyException is thrown.
-   * 
+   *
    * @param key
    * @return
    */
@@ -576,7 +576,7 @@ public class Props {
    * Returns the long representation of the value. If the value is null, then
    * the default value is returned. If the value isn't a long, then a parse
    * exception will be thrown.
-   * 
+   *
    * @param key
    * @param defaultValue
    * @return
@@ -593,7 +593,7 @@ public class Props {
    * Returns the long representation of the value. If the value is null, then a
    * UndefinedPropertyException will be thrown. If the value isn't a long, then
    * a parse exception will be thrown.
-   * 
+   *
    * @param key
    * @return
    */
@@ -610,7 +610,7 @@ public class Props {
    * Returns the int representation of the value. If the value is null, then the
    * default value is returned. If the value isn't a int, then a parse exception
    * will be thrown.
-   * 
+   *
    * @param key
    * @param defaultValue
    * @return
@@ -627,7 +627,7 @@ public class Props {
    * Returns the int representation of the value. If the value is null, then a
    * UndefinedPropertyException will be thrown. If the value isn't a int, then a
    * parse exception will be thrown.
-   * 
+   *
    * @param key
    * @return
    */
@@ -644,7 +644,7 @@ public class Props {
    * Returns the double representation of the value. If the value is null, then
    * the default value is returned. If the value isn't a double, then a parse
    * exception will be thrown.
-   * 
+   *
    * @param key
    * @param defaultValue
    * @return
@@ -661,7 +661,7 @@ public class Props {
    * Returns the double representation of the value. If the value is null, then
    * a UndefinedPropertyException will be thrown. If the value isn't a double,
    * then a parse exception will be thrown.
-   * 
+   *
    * @param key
    * @return
    */
@@ -678,7 +678,7 @@ public class Props {
    * Returns the uri representation of the value. If the value is null, then the
    * default value is returned. If the value isn't a uri, then a
    * IllegalArgumentException will be thrown.
-   * 
+   *
    * @param key
    * @param defaultValue
    * @return
@@ -700,7 +700,7 @@ public class Props {
    * Returns the double representation of the value. If the value is null, then
    * the default value is returned. If the value isn't a uri, then a
    * IllegalArgumentException will be thrown.
-   * 
+   *
    * @param key
    * @param defaultValue
    * @return
@@ -723,7 +723,7 @@ public class Props {
 
   /**
    * Store only those properties defined at this local level
-   * 
+   *
    * @param file The file to write to
    * @throws IOException If the file can't be found or there is an io error
    */
@@ -739,7 +739,7 @@ public class Props {
 
   /**
    * Returns a copy of only the local values of this props
-   * 
+   *
    * @return
    */
   @SuppressWarnings("unchecked")
@@ -749,7 +749,7 @@ public class Props {
 
   /**
    * Store only those properties defined at this local level
-   * 
+   *
    * @param out The output stream to write to
    * @throws IOException If the file can't be found or there is an io error
    */
@@ -763,7 +763,7 @@ public class Props {
 
   /**
    * Returns a java.util.Properties file populated with the stuff in here.
-   * 
+   *
    * @return
    */
   public Properties toProperties() {
@@ -777,7 +777,7 @@ public class Props {
 
   /**
    * Store all properties, those local and also those in parent props
-   * 
+   *
    * @param file The file to store to
    * @throws IOException If there is an error writing
    */
@@ -793,7 +793,7 @@ public class Props {
 
   /**
    * Store all properties, those local and also those in parent props
-   * 
+   *
    * @param out The stream to write to
    * @throws IOException If there is an error writing
    */
@@ -812,7 +812,7 @@ public class Props {
 
   /**
    * Get a map of all properties by string prefix
-   * 
+   *
    * @param prefix The string prefix
    */
   public Map<String, String> getMapByPrefix(String prefix) {
@@ -835,7 +835,7 @@ public class Props {
 
   /**
    * Returns a set of all keys, including the parents
-   * 
+   *
    * @return
    */
   public Set<String> getKeySet() {
@@ -852,7 +852,7 @@ public class Props {
 
   /**
    * Logs the property in the given logger
-   * 
+   *
    * @param logger
    * @param comment
    */
@@ -866,7 +866,7 @@ public class Props {
 
   /**
    * Clones the Props p object and all of its parents.
-   * 
+   *
    * @param p
    * @return
    */
@@ -875,7 +875,7 @@ public class Props {
   }
 
   /**
-   * 
+   *
    * @param source
    * @return
    */
@@ -910,7 +910,7 @@ public class Props {
 
   /**
    * Returns true if the properties are equivalent, regardless of the hierarchy.
-   * 
+   *
    * @param p
    * @return
    */
@@ -930,7 +930,7 @@ public class Props {
   }
 
   /**
-     * 
+     *
      */
   @Override
   public int hashCode() {
@@ -941,7 +941,7 @@ public class Props {
   }
 
   /**
-     * 
+     *
      */
   @Override
   public String toString() {

diff --git a/azkaban-common/src/main/java/azkaban/utils/PropsUtils.java b/azkaban-common/src/main/java/azkaban/utils/PropsUtils.java
index 22b47cc..064562f 100644
--- a/azkaban-common/src/main/java/azkaban/utils/PropsUtils.java
+++ b/azkaban-common/src/main/java/azkaban/utils/PropsUtils.java
@@ -28,22 +28,23 @@ import java.util.UUID;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import azkaban.executor.ExecutableFlowBase;
-import azkaban.flow.CommonJobProperties;
-
 import org.apache.commons.jexl2.Expression;
 import org.apache.commons.jexl2.JexlEngine;
 import org.apache.commons.jexl2.JexlException;
 import org.apache.commons.jexl2.MapContext;
 import org.apache.commons.lang.StringUtils;
+
 import org.joda.time.DateTime;
 
+import azkaban.executor.ExecutableFlowBase;
+import azkaban.flow.CommonJobProperties;
+
 public class PropsUtils {
 
   /**
    * Load job schedules from the given directories ] * @param dir The directory
    * to look in
-   * 
+   *
    * @param suffixes File suffixes to load
    * @return The loaded set of schedules
    */
@@ -53,7 +54,7 @@ public class PropsUtils {
 
   /**
    * Load job schedules from the given directories
-   * 
+   *
    * @param parent The parent properties for these properties
    * @param dir The directory to look in
    * @param suffixes File suffixes to load
@@ -94,7 +95,7 @@ public class PropsUtils {
 
   /**
    * Load job schedules from the given directories
-   * 
+   *
    * @param dirs The directories to check for properties
    * @param suffixes The suffixes to load
    * @return The properties
@@ -109,7 +110,7 @@ public class PropsUtils {
 
   /**
    * Load properties from the given path
-   * 
+   *
    * @param jobPath The path to load from
    * @param props The parent properties for loaded properties
    * @param suffixes The suffixes of files to load
@@ -220,7 +221,7 @@ public class PropsUtils {
   /**
    * Function that looks for expressions to parse. It parses backwards to
    * capture embedded expressions
-   * 
+   *
    * @param value
    * @param last
    * @param jexl

diff --git a/azkaban-common/src/main/java/azkaban/utils/SplitterOutputStream.java b/azkaban-common/src/main/java/azkaban/utils/SplitterOutputStream.java
index caf8a18..9c228ae 100644
--- a/azkaban-common/src/main/java/azkaban/utils/SplitterOutputStream.java
+++ b/azkaban-common/src/main/java/azkaban/utils/SplitterOutputStream.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2012 LinkedIn Corp.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the

diff --git a/azkaban-common/src/main/java/azkaban/utils/StringUtils.java b/azkaban-common/src/main/java/azkaban/utils/StringUtils.java
index de3502a..1a314b3 100644
--- a/azkaban-common/src/main/java/azkaban/utils/StringUtils.java
+++ b/azkaban-common/src/main/java/azkaban/utils/StringUtils.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2012 LinkedIn Corp.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -52,7 +52,7 @@ public class StringUtils {
 
   /**
    * Use this when you don't want to include Apache Common's string for plugins.
-   * 
+   *
    * @param list
    * @param delimiter
    * @return

diff --git a/azkaban-common/src/main/java/azkaban/utils/SwapQueue.java b/azkaban-common/src/main/java/azkaban/utils/SwapQueue.java
index bb547da..0caae71 100644
--- a/azkaban-common/src/main/java/azkaban/utils/SwapQueue.java
+++ b/azkaban-common/src/main/java/azkaban/utils/SwapQueue.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2012 LinkedIn Corp.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -44,7 +44,7 @@ public class SwapQueue<T> implements Iterable<T> {
 
   /**
    * Returns a count of the secondary queue.
-   * 
+   *
    * @return
    */
   public synchronized int getSwapQueueSize() {
@@ -61,7 +61,7 @@ public class SwapQueue<T> implements Iterable<T> {
 
   /**
    * Returns both the secondary and primary size
-   * 
+   *
    * @return
    */
   public synchronized int getSize() {

diff --git a/azkaban-common/src/main/java/azkaban/utils/Triple.java b/azkaban-common/src/main/java/azkaban/utils/Triple.java
index 88dc443..e713f47 100644
--- a/azkaban-common/src/main/java/azkaban/utils/Triple.java
+++ b/azkaban-common/src/main/java/azkaban/utils/Triple.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2012 LinkedIn Corp.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the

diff --git a/azkaban-common/src/main/java/azkaban/utils/TypedMapWrapper.java b/azkaban-common/src/main/java/azkaban/utils/TypedMapWrapper.java
index 282dfdf..7118e8c 100644
--- a/azkaban-common/src/main/java/azkaban/utils/TypedMapWrapper.java
+++ b/azkaban-common/src/main/java/azkaban/utils/TypedMapWrapper.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2014 LinkedIn Corp.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
 package azkaban.utils;
 
 import java.util.Collection;

diff --git a/azkaban-common/src/main/java/azkaban/utils/UndefinedPropertyException.java b/azkaban-common/src/main/java/azkaban/utils/UndefinedPropertyException.java
index 4298621..239dc99 100644
--- a/azkaban-common/src/main/java/azkaban/utils/UndefinedPropertyException.java
+++ b/azkaban-common/src/main/java/azkaban/utils/UndefinedPropertyException.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2012 LinkedIn Corp.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the

diff --git a/azkaban-common/src/main/java/azkaban/utils/Utils.java b/azkaban-common/src/main/java/azkaban/utils/Utils.java
index 57e6e05..7c417ca 100644
--- a/azkaban-common/src/main/java/azkaban/utils/Utils.java
+++ b/azkaban-common/src/main/java/azkaban/utils/Utils.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2012 LinkedIn Corp.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -35,6 +35,7 @@ import java.util.zip.ZipFile;
 import java.util.zip.ZipOutputStream;
 
 import org.apache.commons.io.IOUtils;
+
 import org.joda.time.Days;
 import org.joda.time.DurationFieldType;
 import org.joda.time.Hours;
@@ -60,7 +61,7 @@ public class Utils {
   /**
    * Equivalent to Object.equals except that it handles nulls. If a and b are
    * both null, true is returned.
-   * 
+   *
    * @param a
    * @param b
    * @return
@@ -75,7 +76,7 @@ public class Utils {
 
   /**
    * Return the object if it is non-null, otherwise throw an exception
-   * 
+   *
    * @param <T> The type of the object
    * @param t The object
    * @return The object if it is not null
@@ -102,7 +103,7 @@ public class Utils {
 
   /**
    * Print the message and then exit with the given exit code
-   * 
+   *
    * @param message The message to print
    * @param exitCode The exit code
    */
@@ -226,7 +227,7 @@ public class Utils {
 
   /**
    * Get the root cause of the Exception
-   * 
+   *
    * @param e The Exception
    * @return The root cause of the Exception
    */
@@ -240,7 +241,7 @@ public class Utils {
 
   /**
    * Get the Class of all the objects
-   * 
+   *
    * @param args The objects to get the Classes from
    * @return The classes as an array
    */
@@ -257,7 +258,7 @@ public class Utils {
 
   /**
    * Call the class constructor with the given arguments
-   * 
+   *
    * @param c The class
    * @param args The arguments
    * @return The constructed object

diff --git a/azkaban-common/src/main/java/azkaban/utils/WebUtils.java b/azkaban-common/src/main/java/azkaban/utils/WebUtils.java
index 021f650..55891b2 100644
--- a/azkaban-common/src/main/java/azkaban/utils/WebUtils.java
+++ b/azkaban-common/src/main/java/azkaban/utils/WebUtils.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2012 LinkedIn Corp.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the

diff --git a/azkaban-common/src/test/java/azkaban/database/AzkabanDatabaseSetupTest.java b/azkaban-common/src/test/java/azkaban/database/AzkabanDatabaseSetupTest.java
index 3825757..a3b18cc 100644
--- a/azkaban-common/src/test/java/azkaban/database/AzkabanDatabaseSetupTest.java
+++ b/azkaban-common/src/test/java/azkaban/database/AzkabanDatabaseSetupTest.java
@@ -24,11 +24,12 @@ import javax.sql.DataSource;
 
 import org.apache.commons.dbutils.QueryRunner;
 import org.apache.commons.io.FileUtils;
+
 import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.BeforeClass;
-import org.junit.Test;
 import org.junit.Ignore;
+import org.junit.Test;
 
 import azkaban.utils.Props;
 

diff --git a/azkaban-common/src/test/java/azkaban/executor/ExecutableFlowTest.java b/azkaban-common/src/test/java/azkaban/executor/ExecutableFlowTest.java
index 6dcef9a..8997fee 100644
--- a/azkaban-common/src/test/java/azkaban/executor/ExecutableFlowTest.java
+++ b/azkaban-common/src/test/java/azkaban/executor/ExecutableFlowTest.java
@@ -25,10 +25,11 @@ import java.util.Map;
 import java.util.Set;
 
 import org.apache.log4j.Logger;
-import org.junit.Assert;
+
 import org.junit.After;
-import org.junit.Ignore;
+import org.junit.Assert;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import azkaban.executor.ExecutionOptions.FailureAction;

diff --git a/azkaban-common/src/test/java/azkaban/executor/JavaJobRunnerMain.java b/azkaban-common/src/test/java/azkaban/executor/JavaJobRunnerMain.java
index f207b6d..67d0284 100644
--- a/azkaban-common/src/test/java/azkaban/executor/JavaJobRunnerMain.java
+++ b/azkaban-common/src/test/java/azkaban/executor/JavaJobRunnerMain.java
@@ -16,14 +16,6 @@
 
 package azkaban.executor;
 
-import azkaban.jobExecutor.ProcessJob;
-import azkaban.utils.Props;
-
-import org.apache.log4j.ConsoleAppender;
-import org.apache.log4j.Layout;
-import org.apache.log4j.Logger;
-import org.apache.log4j.PatternLayout;
-
 import java.io.BufferedOutputStream;
 import java.io.BufferedReader;
 import java.io.FileOutputStream;
@@ -38,6 +30,14 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Properties;
 
+import org.apache.log4j.ConsoleAppender;
+import org.apache.log4j.Layout;
+import org.apache.log4j.Logger;
+import org.apache.log4j.PatternLayout;
+
+import azkaban.jobExecutor.ProcessJob;
+import azkaban.utils.Props;
+
 public class JavaJobRunnerMain {
 
   public static final String JOB_CLASS = "job.class";

diff --git a/azkaban-common/src/test/java/azkaban/jobExecutor/JavaProcessJobTest.java b/azkaban-common/src/test/java/azkaban/jobExecutor/JavaProcessJobTest.java
index a47cd76..11c799c 100644
--- a/azkaban-common/src/test/java/azkaban/jobExecutor/JavaProcessJobTest.java
+++ b/azkaban-common/src/test/java/azkaban/jobExecutor/JavaProcessJobTest.java
@@ -21,6 +21,7 @@ import java.util.Date;
 import java.util.Properties;
 
 import org.apache.log4j.Logger;
+
 import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.Before;

diff --git a/azkaban-common/src/test/java/azkaban/jobExecutor/ProcessJobTest.java b/azkaban-common/src/test/java/azkaban/jobExecutor/ProcessJobTest.java
index 111af14..26b86d5 100644
--- a/azkaban-common/src/test/java/azkaban/jobExecutor/ProcessJobTest.java
+++ b/azkaban-common/src/test/java/azkaban/jobExecutor/ProcessJobTest.java
@@ -16,10 +16,11 @@
 
 package azkaban.jobExecutor;
 
+import org.apache.log4j.Logger;
+
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
-import org.apache.log4j.Logger;
 
 import azkaban.utils.Props;
 

diff --git a/azkaban-common/src/test/java/azkaban/jobExecutor/PythonJobTest.java b/azkaban-common/src/test/java/azkaban/jobExecutor/PythonJobTest.java
index 5a44131..ee767de 100644
--- a/azkaban-common/src/test/java/azkaban/jobExecutor/PythonJobTest.java
+++ b/azkaban-common/src/test/java/azkaban/jobExecutor/PythonJobTest.java
@@ -20,6 +20,7 @@ import java.io.IOException;
 import java.util.Date;
 
 import org.apache.log4j.Logger;
+
 import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.BeforeClass;
@@ -33,7 +34,7 @@ public class PythonJobTest {
   private Props props = null;
   private Logger log = Logger.getLogger(PythonJob.class);
 
-  private static final String scriptContent = 
+  private static final String scriptContent =
       "#!/usr/bin/python  \n" +
           "import re, string, sys  \n" +
           "# if no arguments were given, print a helpful message \n" +

diff --git a/azkaban-common/src/test/java/azkaban/jobExecutor/Utils.java b/azkaban-common/src/test/java/azkaban/jobExecutor/Utils.java
index 0a3ab04..ad5f353 100644
--- a/azkaban-common/src/test/java/azkaban/jobExecutor/Utils.java
+++ b/azkaban-common/src/test/java/azkaban/jobExecutor/Utils.java
@@ -22,6 +22,8 @@ import java.io.IOException;
 import java.io.PrintWriter;
 
 public class Utils {
+  private Utils() {
+  }
 
   public static void dumpFile(String filename, String filecontent)
       throws IOException {
@@ -34,5 +36,4 @@ public class Utils {
     File file = new File(filename);
     file.delete();
   }
-
 }

diff --git a/azkaban-common/src/test/java/azkaban/jobtype/FakeJavaJob.java b/azkaban-common/src/test/java/azkaban/jobtype/FakeJavaJob.java
index 5e55761..cc41f53 100644
--- a/azkaban-common/src/test/java/azkaban/jobtype/FakeJavaJob.java
+++ b/azkaban-common/src/test/java/azkaban/jobtype/FakeJavaJob.java
@@ -17,6 +17,7 @@
 package azkaban.jobtype;
 
 import org.apache.log4j.Logger;
+
 import azkaban.jobExecutor.JavaProcessJob;
 import azkaban.utils.Props;
 

diff --git a/azkaban-common/src/test/java/azkaban/jobtype/FakeJavaJob2.java b/azkaban-common/src/test/java/azkaban/jobtype/FakeJavaJob2.java
index 5a56b46..ccbd2ed 100644
--- a/azkaban-common/src/test/java/azkaban/jobtype/FakeJavaJob2.java
+++ b/azkaban-common/src/test/java/azkaban/jobtype/FakeJavaJob2.java
@@ -17,6 +17,7 @@
 package azkaban.jobtype;
 
 import org.apache.log4j.Logger;
+
 import azkaban.jobExecutor.JavaProcessJob;
 import azkaban.utils.Props;
 

diff --git a/azkaban-common/src/test/java/azkaban/jobtype/JobTypeManagerTest.java b/azkaban-common/src/test/java/azkaban/jobtype/JobTypeManagerTest.java
index 32f26d6..7a42262 100644
--- a/azkaban-common/src/test/java/azkaban/jobtype/JobTypeManagerTest.java
+++ b/azkaban-common/src/test/java/azkaban/jobtype/JobTypeManagerTest.java
@@ -16,18 +16,19 @@
 
 package azkaban.jobtype;
 
-import static org.junit.Assert.*;
-
 import java.io.File;
 import java.io.IOException;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.log4j.Logger;
+
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
 
+import static org.junit.Assert.*;
+
 import azkaban.jobExecutor.Job;
 import azkaban.utils.Props;
 

diff --git a/azkaban-common/src/test/java/azkaban/project/JdbcProjectLoaderTest.java b/azkaban-common/src/test/java/azkaban/project/JdbcProjectLoaderTest.java
index 0bc8a10..a7ef5f3 100644
--- a/azkaban-common/src/test/java/azkaban/project/JdbcProjectLoaderTest.java
+++ b/azkaban-common/src/test/java/azkaban/project/JdbcProjectLoaderTest.java
@@ -28,18 +28,19 @@ import javax.sql.DataSource;
 import org.apache.commons.dbutils.DbUtils;
 import org.apache.commons.dbutils.QueryRunner;
 import org.apache.commons.dbutils.ResultSetHandler;
+
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Ignore;
 import org.junit.Test;
 
+import azkaban.database.DataSourceUtils;
 import azkaban.flow.Edge;
 import azkaban.flow.Flow;
 import azkaban.flow.Node;
 import azkaban.project.ProjectLogEvent.EventType;
 import azkaban.user.Permission;
 import azkaban.user.User;
-import azkaban.database.DataSourceUtils;
 import azkaban.utils.Pair;
 import azkaban.utils.Props;
 import azkaban.utils.PropsUtils;

diff --git a/azkaban-common/src/test/java/azkaban/project/ProjectTest.java b/azkaban-common/src/test/java/azkaban/project/ProjectTest.java
index 1e26ddd..da36d46 100644
--- a/azkaban-common/src/test/java/azkaban/project/ProjectTest.java
+++ b/azkaban-common/src/test/java/azkaban/project/ProjectTest.java
@@ -16,10 +16,10 @@
 
 package azkaban.project;
 
-import static org.junit.Assert.*;
-
 import org.junit.Test;
 
+import static org.junit.Assert.*;
+
 import azkaban.user.Permission;
 import azkaban.user.Permission.Type;
 import azkaban.utils.JSONUtils;

diff --git a/azkaban-common/src/test/java/azkaban/trigger/ConditionTest.java b/azkaban-common/src/test/java/azkaban/trigger/ConditionTest.java
index 2907e8c..cfff784 100644
--- a/azkaban-common/src/test/java/azkaban/trigger/ConditionTest.java
+++ b/azkaban-common/src/test/java/azkaban/trigger/ConditionTest.java
@@ -25,14 +25,14 @@ import org.joda.time.DateTime;
 import org.junit.Test;
 import org.junit.Ignore;
 
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
+
 import azkaban.trigger.builtin.BasicTimeChecker;
 import azkaban.utils.JSONUtils;
 import azkaban.utils.Props;
 import azkaban.utils.Utils;
 
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.assertFalse;
-
 public class ConditionTest {
 
   @Test

diff --git a/azkaban-common/src/test/java/azkaban/trigger/DummyTriggerAction.java b/azkaban-common/src/test/java/azkaban/trigger/DummyTriggerAction.java
index 9522afe..c5a26c4 100644
--- a/azkaban-common/src/test/java/azkaban/trigger/DummyTriggerAction.java
+++ b/azkaban-common/src/test/java/azkaban/trigger/DummyTriggerAction.java
@@ -37,13 +37,11 @@ public class DummyTriggerAction implements TriggerAction {
 
   @Override
   public TriggerAction fromJson(Object obj) {
-    // TODO Auto-generated method stub
     return null;
   }
 
   @Override
   public Object toJson() {
-    // TODO Auto-generated method stub
     return null;
   }
 
@@ -65,7 +63,5 @@ public class DummyTriggerAction implements TriggerAction {
 
   @Override
   public void setContext(Map<String, Object> context) {
-    // TODO Auto-generated method stub
-
   }
 }

diff --git a/azkaban-common/src/test/java/azkaban/trigger/ExecuteFlowActionTest.java b/azkaban-common/src/test/java/azkaban/trigger/ExecuteFlowActionTest.java
index 4eba98e..0e8b2f9 100644
--- a/azkaban-common/src/test/java/azkaban/trigger/ExecuteFlowActionTest.java
+++ b/azkaban-common/src/test/java/azkaban/trigger/ExecuteFlowActionTest.java
@@ -22,12 +22,12 @@ import java.util.List;
 import org.junit.Ignore;
 import org.junit.Test;
 
+import static org.junit.Assert.*;
+
 import azkaban.executor.ExecutionOptions;
 import azkaban.trigger.builtin.ExecuteFlowAction;
 import azkaban.utils.Props;
 
-import static org.junit.Assert.*;
-
 public class ExecuteFlowActionTest {
 
   @Ignore @Test

diff --git a/azkaban-common/src/test/java/azkaban/trigger/JdbcTriggerLoaderTest.java b/azkaban-common/src/test/java/azkaban/trigger/JdbcTriggerLoaderTest.java
index 61cae41..ecbe990 100644
--- a/azkaban-common/src/test/java/azkaban/trigger/JdbcTriggerLoaderTest.java
+++ b/azkaban-common/src/test/java/azkaban/trigger/JdbcTriggerLoaderTest.java
@@ -16,8 +16,6 @@
 
 package azkaban.trigger;
 
-import static org.junit.Assert.*;
-
 import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -39,6 +37,8 @@ import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
 
+import static org.junit.Assert.*;
+
 import azkaban.database.DataSourceUtils;
 import azkaban.executor.ExecutionOptions;
 import azkaban.trigger.builtin.BasicTimeChecker;

diff --git a/azkaban-common/src/test/java/azkaban/trigger/TriggerManagerTest.java b/azkaban-common/src/test/java/azkaban/trigger/TriggerManagerTest.java
index 8e2d4a1..4021cc7 100644
--- a/azkaban-common/src/test/java/azkaban/trigger/TriggerManagerTest.java
+++ b/azkaban-common/src/test/java/azkaban/trigger/TriggerManagerTest.java
@@ -16,8 +16,6 @@
 
 package azkaban.trigger;
 
-import static org.junit.Assert.*;
-
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -30,6 +28,8 @@ import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
 
+import static org.junit.Assert.*;
+
 import azkaban.utils.Props;
 
 public class TriggerManagerTest {

diff --git a/azkaban-common/src/test/java/azkaban/trigger/TriggerTest.java b/azkaban-common/src/test/java/azkaban/trigger/TriggerTest.java
index f310c30..a0e1f51 100644
--- a/azkaban-common/src/test/java/azkaban/trigger/TriggerTest.java
+++ b/azkaban-common/src/test/java/azkaban/trigger/TriggerTest.java
@@ -28,6 +28,8 @@ import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
 
+import static org.junit.Assert.*;
+
 import azkaban.executor.ExecutionOptions;
 import azkaban.trigger.builtin.BasicTimeChecker;
 import azkaban.trigger.builtin.ExecuteFlowAction;
@@ -35,8 +37,6 @@ import azkaban.utils.JSONUtils;
 import azkaban.utils.Props;
 import azkaban.utils.Utils;
 
-import static org.junit.Assert.*;
-
 public class TriggerTest {
 
   private CheckerTypeLoader checkerLoader;

diff --git a/azkaban-common/src/test/java/azkaban/user/PermissionTest.java b/azkaban-common/src/test/java/azkaban/user/PermissionTest.java
index ae9eedd..e34a5b4 100644
--- a/azkaban-common/src/test/java/azkaban/user/PermissionTest.java
+++ b/azkaban-common/src/test/java/azkaban/user/PermissionTest.java
@@ -20,10 +20,10 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
-import azkaban.user.Permission.Type;
-
 import static org.junit.Assert.assertTrue;
 
+import azkaban.user.Permission.Type;
+
 public class PermissionTest {
   @Before
   public void setUp() throws Exception {
@@ -113,7 +113,7 @@ public class PermissionTest {
 
   /**
    * Why? because it's quicker.
-   * 
+   *
    * @param message
    */
   public void info(String message) {

diff --git a/azkaban-common/src/test/java/azkaban/user/XmlUserManagerTest.java b/azkaban-common/src/test/java/azkaban/user/XmlUserManagerTest.java
index 6dc9717..d5d93c2 100644
--- a/azkaban-common/src/test/java/azkaban/user/XmlUserManagerTest.java
+++ b/azkaban-common/src/test/java/azkaban/user/XmlUserManagerTest.java
@@ -23,11 +23,11 @@ import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
 
+import static org.junit.Assert.fail;
+
 import azkaban.utils.Props;
 import azkaban.utils.UndefinedPropertyException;
 
-import static org.junit.Assert.fail;
-
 public class XmlUserManagerTest {
   private Props baseProps = new Props();
 

diff --git a/azkaban-execserver/src/main/java/azkaban/execapp/AzkabanExecutorServer.java b/azkaban-execserver/src/main/java/azkaban/execapp/AzkabanExecutorServer.java
index 1e30125..2878f2f 100644
--- a/azkaban-execserver/src/main/java/azkaban/execapp/AzkabanExecutorServer.java
+++ b/azkaban-execserver/src/main/java/azkaban/execapp/AzkabanExecutorServer.java
@@ -29,7 +29,9 @@ import javax.management.MBeanServer;
 import javax.management.ObjectName;
 
 import org.apache.log4j.Logger;
+
 import org.joda.time.DateTimeZone;
+
 import org.mortbay.jetty.Connector;
 import org.mortbay.jetty.Server;
 import org.mortbay.jetty.servlet.Context;
@@ -42,8 +44,8 @@ import azkaban.execapp.jmx.JmxFlowRunnerManager;
 import azkaban.jmx.JmxJettyServer;
 import azkaban.project.JdbcProjectLoader;
 import azkaban.project.ProjectLoader;
-import azkaban.server.ServerConstants;
 import azkaban.server.AzkabanServer;
+import azkaban.server.ServerConstants;
 import azkaban.utils.Props;
 import azkaban.utils.Utils;
 

diff --git a/azkaban-execserver/src/main/java/azkaban/execapp/event/FlowWatcher.java b/azkaban-execserver/src/main/java/azkaban/execapp/event/FlowWatcher.java
index 74e33ed..139cf61 100644
--- a/azkaban-execserver/src/main/java/azkaban/execapp/event/FlowWatcher.java
+++ b/azkaban-execserver/src/main/java/azkaban/execapp/event/FlowWatcher.java
@@ -52,7 +52,7 @@ public abstract class FlowWatcher {
 
   /**
    * Called to fire events to the JobRunner listeners
-   * 
+   *
    * @param jobId
    */
   protected synchronized void handleJobStatusChange(String jobId, Status status) {

diff --git a/azkaban-execserver/src/main/java/azkaban/execapp/event/LocalFlowWatcher.java b/azkaban-execserver/src/main/java/azkaban/execapp/event/LocalFlowWatcher.java
index 5faa86f..afa3650 100644
--- a/azkaban-execserver/src/main/java/azkaban/execapp/event/LocalFlowWatcher.java
+++ b/azkaban-execserver/src/main/java/azkaban/execapp/event/LocalFlowWatcher.java
@@ -16,11 +16,11 @@
 
 package azkaban.execapp.event;
 
-import azkaban.execapp.FlowRunner;
-import azkaban.execapp.JobRunner;
 import azkaban.event.Event;
 import azkaban.event.Event.Type;
 import azkaban.event.EventListener;
+import azkaban.execapp.FlowRunner;
+import azkaban.execapp.JobRunner;
 import azkaban.executor.ExecutableNode;
 
 public class LocalFlowWatcher extends FlowWatcher {

diff --git a/azkaban-execserver/src/main/java/azkaban/execapp/ExecutorServlet.java b/azkaban-execserver/src/main/java/azkaban/execapp/ExecutorServlet.java
index 2a8232b..804ae8d 100644
--- a/azkaban-execserver/src/main/java/azkaban/execapp/ExecutorServlet.java
+++ b/azkaban-execserver/src/main/java/azkaban/execapp/ExecutorServlet.java
@@ -30,6 +30,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.log4j.Logger;
+
 import org.codehaus.jackson.map.ObjectMapper;
 
 import azkaban.executor.ConnectorParams;

diff --git a/azkaban-execserver/src/main/java/azkaban/execapp/FlowRunner.java b/azkaban-execserver/src/main/java/azkaban/execapp/FlowRunner.java
index cdce906..123f9e4 100644
--- a/azkaban-execserver/src/main/java/azkaban/execapp/FlowRunner.java
+++ b/azkaban-execserver/src/main/java/azkaban/execapp/FlowRunner.java
@@ -60,7 +60,7 @@ import azkaban.utils.SwapQueue;
 
 /**
  * Class that handles the running of a ExecutableFlow DAG
- * 
+ *
  */
 public class FlowRunner extends EventHandler implements Runnable {
   private static final Layout DEFAULT_LAYOUT = new PatternLayout(
@@ -122,7 +122,7 @@ public class FlowRunner extends EventHandler implements Runnable {
 
   /**
    * Constructor. This will create its own ExecutorService for thread pools
-   * 
+   *
    * @param flow
    * @param executorLoader
    * @param projectLoader
@@ -138,7 +138,7 @@ public class FlowRunner extends EventHandler implements Runnable {
   /**
    * Constructor. If executorService is null, then it will create it's own for
    * thread pools.
-   * 
+   *
    * @param flow
    * @param executorLoader
    * @param projectLoader
@@ -356,7 +356,7 @@ public class FlowRunner extends EventHandler implements Runnable {
 
   /**
    * Main method that executes the jobs.
-   * 
+   *
    * @throws Exception
    */
   private void runFlow() throws Exception {
@@ -725,7 +725,7 @@ public class FlowRunner extends EventHandler implements Runnable {
   /**
    * Determines what the state of the next node should be. Returns null if the
    * node should not be run.
-   * 
+   *
    * @param node
    * @return
    */

diff --git a/azkaban-execserver/src/main/java/azkaban/execapp/FlowRunnerManager.java b/azkaban-execserver/src/main/java/azkaban/execapp/FlowRunnerManager.java
index 928cc42..a044f70 100644
--- a/azkaban-execserver/src/main/java/azkaban/execapp/FlowRunnerManager.java
+++ b/azkaban-execserver/src/main/java/azkaban/execapp/FlowRunnerManager.java
@@ -48,7 +48,6 @@ import azkaban.executor.ExecutorLoader;
 import azkaban.executor.ExecutorManagerException;
 import azkaban.jobtype.JobTypeManager;
 import azkaban.jobtype.JobTypeManagerException;
-
 import azkaban.utils.FileIOUtils;
 import azkaban.utils.FileIOUtils.JobMetaData;
 import azkaban.utils.FileIOUtils.LogData;
@@ -58,7 +57,7 @@ import azkaban.utils.Props;
 
 /**
  * Execution manager for the server side execution.
- * 
+ *
  */
 public class FlowRunnerManager implements EventListener {
   private static Logger logger = Logger.getLogger(FlowRunnerManager.class);

diff --git a/azkaban-execserver/src/main/java/azkaban/execapp/JMXHttpServlet.java b/azkaban-execserver/src/main/java/azkaban/execapp/JMXHttpServlet.java
index a54b6e7..8461548 100644
--- a/azkaban-execserver/src/main/java/azkaban/execapp/JMXHttpServlet.java
+++ b/azkaban-execserver/src/main/java/azkaban/execapp/JMXHttpServlet.java
@@ -31,9 +31,9 @@ import javax.servlet.http.HttpServletResponse;
 import org.apache.log4j.Logger;
 
 import azkaban.executor.ConnectorParams;
-import azkaban.utils.JSONUtils;
 import azkaban.server.ServerConstants;
 import azkaban.server.HttpRequestUtils;
+import azkaban.utils.JSONUtils;
 
 public class JMXHttpServlet extends HttpServlet implements ConnectorParams {
   private static final long serialVersionUID = -3085603824826446270L;

diff --git a/azkaban-execserver/src/main/java/azkaban/execapp/JobRunner.java b/azkaban-execserver/src/main/java/azkaban/execapp/JobRunner.java
index 840ff88..5d7a996 100644
--- a/azkaban-execserver/src/main/java/azkaban/execapp/JobRunner.java
+++ b/azkaban-execserver/src/main/java/azkaban/execapp/JobRunner.java
@@ -20,10 +20,8 @@ import java.io.File;
 import java.io.FilenameFilter;
 import java.io.IOException;
 import java.util.ArrayList;
-
 import java.util.HashSet;
 import java.util.Set;
-
 import java.util.Arrays;
 import java.util.Collections;
 
@@ -33,10 +31,10 @@ import org.apache.log4j.Layout;
 import org.apache.log4j.Logger;
 import org.apache.log4j.RollingFileAppender;
 
-import azkaban.execapp.event.BlockingStatus;
 import azkaban.event.Event;
 import azkaban.event.Event.Type;
 import azkaban.event.EventHandler;
+import azkaban.execapp.event.BlockingStatus;
 import azkaban.execapp.event.FlowWatcher;
 import azkaban.executor.ExecutableFlowBase;
 import azkaban.executor.ExecutableNode;
@@ -48,7 +46,6 @@ import azkaban.jobExecutor.AbstractProcessJob;
 import azkaban.jobExecutor.Job;
 import azkaban.jobtype.JobTypeManager;
 import azkaban.jobtype.JobTypeManagerException;
-
 import azkaban.utils.Props;
 
 public class JobRunner extends EventHandler implements Runnable {
@@ -177,7 +174,7 @@ public class JobRunner extends EventHandler implements Runnable {
   /**
    * Returns a list of jobs that this JobRunner will wait upon to finish before
    * starting. It is only relevant if pipeline is turned on.
-   * 
+   *
    * @return
    */
   public Set<String> getPipelineWatchedJobs() {
@@ -256,7 +253,7 @@ public class JobRunner extends EventHandler implements Runnable {
   /**
    * Used to handle non-ready and special status's (i.e. KILLED). Returns true
    * if they handled anything.
-   * 
+   *
    * @return
    */
   private boolean handleNonReadyStatus() {
@@ -404,7 +401,7 @@ public class JobRunner extends EventHandler implements Runnable {
 
   /**
    * The main run thread.
-   * 
+   *
    */
   @Override
   public void run() {

diff --git a/azkaban-execserver/src/test/java/azkaban/execapp/event/LocalFlowWatcherTest.java b/azkaban-execserver/src/test/java/azkaban/execapp/event/LocalFlowWatcherTest.java
index cef7245..a75f9b6 100644
--- a/azkaban-execserver/src/test/java/azkaban/execapp/event/LocalFlowWatcherTest.java
+++ b/azkaban-execserver/src/test/java/azkaban/execapp/event/LocalFlowWatcherTest.java
@@ -28,20 +28,20 @@ import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
 
+import azkaban.execapp.EventCollectorListener;
 import azkaban.execapp.FlowRunner;
 import azkaban.executor.ExecutableFlow;
 import azkaban.executor.ExecutableNode;
 import azkaban.executor.ExecutionOptions;
 import azkaban.executor.ExecutorLoader;
+import azkaban.executor.JavaJob;
+import azkaban.executor.MockExecutorLoader;
 import azkaban.executor.Status;
 import azkaban.flow.Flow;
 import azkaban.jobtype.JobTypeManager;
 import azkaban.project.Project;
 import azkaban.project.ProjectLoader;
-import azkaban.execapp.EventCollectorListener;
-import azkaban.executor.MockExecutorLoader;
 import azkaban.project.MockProjectLoader;
-import azkaban.executor.JavaJob;
 import azkaban.utils.JSONUtils;
 
 public class LocalFlowWatcherTest {

diff --git a/azkaban-execserver/src/test/java/azkaban/execapp/event/RemoteFlowWatcherTest.java b/azkaban-execserver/src/test/java/azkaban/execapp/event/RemoteFlowWatcherTest.java
index 43265e4..4cbc794 100644
--- a/azkaban-execserver/src/test/java/azkaban/execapp/event/RemoteFlowWatcherTest.java
+++ b/azkaban-execserver/src/test/java/azkaban/execapp/event/RemoteFlowWatcherTest.java
@@ -28,21 +28,21 @@ import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
 
+import azkaban.execapp.EventCollectorListener;
 import azkaban.execapp.FlowRunner;
 import azkaban.executor.ExecutableFlow;
 import azkaban.executor.ExecutableFlowBase;
 import azkaban.executor.ExecutableNode;
 import azkaban.executor.ExecutionOptions;
 import azkaban.executor.ExecutorLoader;
+import azkaban.executor.JavaJob;
+import azkaban.executor.MockExecutorLoader;
 import azkaban.executor.Status;
 import azkaban.flow.Flow;
 import azkaban.jobtype.JobTypeManager;
 import azkaban.project.Project;
 import azkaban.project.ProjectLoader;
-import azkaban.execapp.EventCollectorListener;
-import azkaban.executor.MockExecutorLoader;
 import azkaban.project.MockProjectLoader;
-import azkaban.executor.JavaJob;
 import azkaban.utils.JSONUtils;
 
 public class RemoteFlowWatcherTest {

diff --git a/azkaban-execserver/src/test/java/azkaban/execapp/FlowRunnerPipelineTest.java b/azkaban-execserver/src/test/java/azkaban/execapp/FlowRunnerPipelineTest.java
index deece7b..8d258ee 100644
--- a/azkaban-execserver/src/test/java/azkaban/execapp/FlowRunnerPipelineTest.java
+++ b/azkaban-execserver/src/test/java/azkaban/execapp/FlowRunnerPipelineTest.java
@@ -30,11 +30,16 @@ import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
 
+import azkaban.execapp.event.FlowWatcher;
+import azkaban.execapp.event.LocalFlowWatcher;
 import azkaban.executor.ExecutableFlow;
 import azkaban.executor.ExecutableFlowBase;
 import azkaban.executor.ExecutableNode;
 import azkaban.executor.ExecutionOptions;
 import azkaban.executor.ExecutorLoader;
+import azkaban.executor.InteractiveTestJob;
+import azkaban.executor.JavaJob;
+import azkaban.executor.MockExecutorLoader;
 import azkaban.executor.Status;
 import azkaban.flow.Flow;
 import azkaban.jobtype.JobTypeManager;
@@ -43,11 +48,6 @@ import azkaban.project.Project;
 import azkaban.project.ProjectLoader;
 import azkaban.project.ProjectManagerException;
 import azkaban.project.MockProjectLoader;
-import azkaban.executor.MockExecutorLoader;
-import azkaban.executor.InteractiveTestJob;
-import azkaban.executor.JavaJob;
-import azkaban.execapp.event.FlowWatcher;
-import azkaban.execapp.event.LocalFlowWatcher;
 import azkaban.utils.DirectoryFlowLoader;
 
 /**

diff --git a/azkaban-execserver/src/test/java/azkaban/execapp/FlowRunnerPropertyResolutionTest.java b/azkaban-execserver/src/test/java/azkaban/execapp/FlowRunnerPropertyResolutionTest.java
index 2ba66d2..4642833 100644
--- a/azkaban-execserver/src/test/java/azkaban/execapp/FlowRunnerPropertyResolutionTest.java
+++ b/azkaban-execserver/src/test/java/azkaban/execapp/FlowRunnerPropertyResolutionTest.java
@@ -34,15 +34,15 @@ import azkaban.executor.ExecutableFlow;
 import azkaban.executor.ExecutableFlowBase;
 import azkaban.executor.ExecutableNode;
 import azkaban.executor.ExecutorLoader;
+import azkaban.executor.InteractiveTestJob;
+import azkaban.executor.JavaJob;
+import azkaban.executor.MockExecutorLoader;
 import azkaban.flow.Flow;
 import azkaban.jobtype.JobTypeManager;
 import azkaban.project.Project;
 import azkaban.project.ProjectLoader;
 import azkaban.project.ProjectManagerException;
 import azkaban.project.MockProjectLoader;
-import azkaban.executor.MockExecutorLoader;
-import azkaban.executor.InteractiveTestJob;
-import azkaban.executor.JavaJob;
 import azkaban.utils.DirectoryFlowLoader;
 import azkaban.utils.Props;
 

diff --git a/azkaban-execserver/src/test/java/azkaban/execapp/FlowRunnerTest.java b/azkaban-execserver/src/test/java/azkaban/execapp/FlowRunnerTest.java
index 1da5c9f..8b2c6d4 100644
--- a/azkaban-execserver/src/test/java/azkaban/execapp/FlowRunnerTest.java
+++ b/azkaban-execserver/src/test/java/azkaban/execapp/FlowRunnerTest.java
@@ -28,22 +28,22 @@ import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
 
+import azkaban.event.Event;
+import azkaban.event.Event.Type;
 import azkaban.executor.ExecutableFlow;
 import azkaban.executor.ExecutableNode;
 import azkaban.executor.ExecutionOptions.FailureAction;
 import azkaban.executor.ExecutorLoader;
+import azkaban.executor.InteractiveTestJob;
+import azkaban.executor.JavaJob;
+import azkaban.executor.MockExecutorLoader;
 import azkaban.executor.Status;
-import azkaban.event.Event;
-import azkaban.event.Event.Type;
 import azkaban.flow.Flow;
 import azkaban.jobtype.JobTypeManager;
 import azkaban.jobtype.JobTypePluginSet;
 import azkaban.project.Project;
 import azkaban.project.ProjectLoader;
 import azkaban.project.MockProjectLoader;
-import azkaban.executor.MockExecutorLoader;
-import azkaban.executor.InteractiveTestJob;
-import azkaban.executor.JavaJob;
 import azkaban.utils.JSONUtils;
 
 public class FlowRunnerTest {

diff --git a/azkaban-execserver/src/test/java/azkaban/execapp/FlowRunnerTest2.java b/azkaban-execserver/src/test/java/azkaban/execapp/FlowRunnerTest2.java
index 1a9e6a2..fad4450 100644
--- a/azkaban-execserver/src/test/java/azkaban/execapp/FlowRunnerTest2.java
+++ b/azkaban-execserver/src/test/java/azkaban/execapp/FlowRunnerTest2.java
@@ -35,6 +35,9 @@ import azkaban.executor.ExecutableFlowBase;
 import azkaban.executor.ExecutableNode;
 import azkaban.executor.ExecutionOptions.FailureAction;
 import azkaban.executor.ExecutorLoader;
+import azkaban.executor.InteractiveTestJob;
+import azkaban.executor.JavaJob;
+import azkaban.executor.MockExecutorLoader;
 import azkaban.executor.Status;
 import azkaban.flow.Flow;
 import azkaban.jobtype.JobTypeManager;
@@ -43,9 +46,6 @@ import azkaban.project.Project;
 import azkaban.project.ProjectLoader;
 import azkaban.project.ProjectManagerException;
 import azkaban.project.MockProjectLoader;
-import azkaban.executor.MockExecutorLoader;
-import azkaban.executor.InteractiveTestJob;
-import azkaban.executor.JavaJob;
 import azkaban.utils.DirectoryFlowLoader;
 import azkaban.utils.Props;
 

diff --git a/azkaban-execserver/src/test/java/azkaban/execapp/JobRunnerTest.java b/azkaban-execserver/src/test/java/azkaban/execapp/JobRunnerTest.java
index 8827ede..8f439f3 100644
--- a/azkaban-execserver/src/test/java/azkaban/execapp/JobRunnerTest.java
+++ b/azkaban-execserver/src/test/java/azkaban/execapp/JobRunnerTest.java
@@ -29,18 +29,18 @@ import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
 
+import azkaban.event.Event;
+import azkaban.event.Event.Type;
 import azkaban.executor.ExecutableFlow;
 import azkaban.executor.ExecutableNode;
 import azkaban.executor.ExecutorLoader;
+import azkaban.executor.JavaJob;
+import azkaban.executor.MockExecutorLoader;
+import azkaban.executor.SleepJavaJob;
 import azkaban.executor.Status;
-import azkaban.event.Event;
-import azkaban.event.Event.Type;
 import azkaban.jobExecutor.ProcessJob;
 import azkaban.jobtype.JobTypeManager;
 import azkaban.project.MockProjectLoader;
-import azkaban.executor.MockExecutorLoader;
-import azkaban.executor.JavaJob;
-import azkaban.executor.SleepJavaJob;
 import azkaban.utils.Props;
 
 public class JobRunnerTest {

diff --git a/azkaban-execserver/src/test/java/azkaban/execapp/ProjectVersionsTest.java b/azkaban-execserver/src/test/java/azkaban/execapp/ProjectVersionsTest.java
index f383bf3..221ba31 100644
--- a/azkaban-execserver/src/test/java/azkaban/execapp/ProjectVersionsTest.java
+++ b/azkaban-execserver/src/test/java/azkaban/execapp/ProjectVersionsTest.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2014 LinkedIn Corp.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
 package azkaban.execapp;
 
 import java.util.ArrayList;

diff --git a/azkaban-migration/src/main/java/azkaban/migration/schedule2trigger/Schedule2Trigger.java b/azkaban-migration/src/main/java/azkaban/migration/schedule2trigger/Schedule2Trigger.java
index d193d42..b2a7e1e 100644
--- a/azkaban-migration/src/main/java/azkaban/migration/schedule2trigger/Schedule2Trigger.java
+++ b/azkaban-migration/src/main/java/azkaban/migration/schedule2trigger/Schedule2Trigger.java
@@ -17,7 +17,6 @@
 package azkaban.migration.schedule2trigger;
 
 import java.io.File;
-
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -26,13 +25,12 @@ import java.util.Map;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.log4j.Logger;
-import azkaban.executor.ExecutionOptions;
-import static azkaban.migration.schedule2trigger.CommonParams.*;
-import azkaban.utils.JSONUtils;
-import azkaban.utils.Props;
+
 import org.joda.time.DateTime;
 import org.joda.time.DateTimeZone;
 import org.joda.time.ReadablePeriod;
+
+import azkaban.executor.ExecutionOptions;
 import azkaban.trigger.Condition;
 import azkaban.trigger.ConditionChecker;
 import azkaban.trigger.JdbcTriggerLoader;
@@ -41,8 +39,12 @@ import azkaban.trigger.TriggerAction;
 import azkaban.trigger.TriggerLoader;
 import azkaban.trigger.builtin.BasicTimeChecker;
 import azkaban.trigger.builtin.ExecuteFlowAction;
+import azkaban.utils.JSONUtils;
+import azkaban.utils.Props;
 import azkaban.utils.Utils;
 
+import static azkaban.migration.schedule2trigger.CommonParams.*;
+
 @SuppressWarnings("deprecation")
 public class Schedule2Trigger {
 

diff --git a/azkaban-migration/src/main/java/azkaban/migration/scheduler/JdbcScheduleLoader.java b/azkaban-migration/src/main/java/azkaban/migration/scheduler/JdbcScheduleLoader.java
index 70449cd..38a9761 100644
--- a/azkaban-migration/src/main/java/azkaban/migration/scheduler/JdbcScheduleLoader.java
+++ b/azkaban-migration/src/main/java/azkaban/migration/scheduler/JdbcScheduleLoader.java
@@ -16,10 +16,6 @@
 
 package azkaban.migration.scheduler;
 
-import azkaban.database.DataSourceUtils;
-import azkaban.utils.GZIPUtils;
-import azkaban.utils.JSONUtils;
-import azkaban.utils.Props;
 import java.io.IOException;
 import java.sql.Connection;
 import java.sql.ResultSet;
@@ -28,14 +24,22 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
+
 import javax.sql.DataSource;
+
 import org.apache.commons.dbutils.DbUtils;
 import org.apache.commons.dbutils.QueryRunner;
 import org.apache.commons.dbutils.ResultSetHandler;
 import org.apache.log4j.Logger;
+
 import org.joda.time.DateTimeZone;
 import org.joda.time.ReadablePeriod;
 
+import azkaban.database.DataSourceUtils;
+import azkaban.utils.GZIPUtils;
+import azkaban.utils.JSONUtils;
+import azkaban.utils.Props;
+
 @Deprecated
 public class JdbcScheduleLoader implements ScheduleLoader {
 

diff --git a/azkaban-soloserver/src/main/java/azkaban/soloserver/AzkabanSingleServer.java b/azkaban-soloserver/src/main/java/azkaban/soloserver/AzkabanSingleServer.java
index ac4ae69..37fc8d7 100644
--- a/azkaban-soloserver/src/main/java/azkaban/soloserver/AzkabanSingleServer.java
+++ b/azkaban-soloserver/src/main/java/azkaban/soloserver/AzkabanSingleServer.java
@@ -20,8 +20,8 @@ import org.apache.log4j.Logger;
 
 import azkaban.database.AzkabanDatabaseSetup;
 import azkaban.database.AzkabanDatabaseUpdater;
-import azkaban.server.AzkabanServer;
 import azkaban.execapp.AzkabanExecutorServer;
+import azkaban.server.AzkabanServer;
 import azkaban.webapp.AzkabanWebServer;
 import azkaban.utils.Props;
 

diff --git a/azkaban-webserver/src/main/java/azkaban/webapp/AzkabanWebServer.java b/azkaban-webserver/src/main/java/azkaban/webapp/AzkabanWebServer.java
index c134b38..f6cc83e 100644
--- a/azkaban-webserver/src/main/java/azkaban/webapp/AzkabanWebServer.java
+++ b/azkaban-webserver/src/main/java/azkaban/webapp/AzkabanWebServer.java
@@ -69,6 +69,7 @@ import azkaban.scheduler.ScheduleManager;
 import azkaban.scheduler.TriggerBasedScheduleLoader;
 import azkaban.server.AzkabanServer;
 import azkaban.server.ServerConstants;
+import azkaban.server.session.SessionCache;
 import azkaban.trigger.JdbcTriggerLoader;
 import azkaban.trigger.TriggerLoader;
 import azkaban.trigger.TriggerManager;
@@ -100,7 +101,6 @@ import azkaban.webapp.servlet.TriggerManagerServlet;
 import azkaban.webapp.plugin.TriggerPlugin;
 import azkaban.webapp.plugin.ViewerPlugin;
 import azkaban.webapp.plugin.PluginRegistry;
-import azkaban.server.session.SessionCache;
 
 /**
  * The Azkaban Jetty server class

diff --git a/azkaban-webserver/src/main/java/azkaban/webapp/plugin/PluginRegistry.java b/azkaban-webserver/src/main/java/azkaban/webapp/plugin/PluginRegistry.java
index 6d19ceb..bcb0758 100644
--- a/azkaban-webserver/src/main/java/azkaban/webapp/plugin/PluginRegistry.java
+++ b/azkaban-webserver/src/main/java/azkaban/webapp/plugin/PluginRegistry.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2014 LinkedIn Corp.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -16,9 +16,9 @@
 
 package azkaban.webapp.plugin;
 
-import java.util.List;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.TreeSet;
 

diff --git a/azkaban-webserver/src/main/java/azkaban/webapp/plugin/TriggerPlugin.java b/azkaban-webserver/src/main/java/azkaban/webapp/plugin/TriggerPlugin.java
index d98c4d2..1a1b26b 100644
--- a/azkaban-webserver/src/main/java/azkaban/webapp/plugin/TriggerPlugin.java
+++ b/azkaban-webserver/src/main/java/azkaban/webapp/plugin/TriggerPlugin.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2014 LinkedIn Corp.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -17,7 +17,6 @@
 package azkaban.webapp.plugin;
 
 import azkaban.trigger.TriggerAgent;
-
 import azkaban.webapp.servlet.AbstractAzkabanServlet;
 
 public interface TriggerPlugin {

diff --git a/azkaban-webserver/src/main/java/azkaban/webapp/plugin/ViewerPlugin.java b/azkaban-webserver/src/main/java/azkaban/webapp/plugin/ViewerPlugin.java
index 101bc02..6d84c43 100644
--- a/azkaban-webserver/src/main/java/azkaban/webapp/plugin/ViewerPlugin.java
+++ b/azkaban-webserver/src/main/java/azkaban/webapp/plugin/ViewerPlugin.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2012 LinkedIn Corp.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -17,8 +17,8 @@
 package azkaban.webapp.plugin;
 
 import java.util.ArrayList;
-import java.util.List;
 import java.util.Comparator;
+import java.util.List;
 
 public class ViewerPlugin {
   private final String pluginName;

diff --git a/azkaban-webserver/src/main/java/azkaban/webapp/servlet/AbstractAzkabanServlet.java b/azkaban-webserver/src/main/java/azkaban/webapp/servlet/AbstractAzkabanServlet.java
index b89d709..c282391 100644
--- a/azkaban-webserver/src/main/java/azkaban/webapp/servlet/AbstractAzkabanServlet.java
+++ b/azkaban-webserver/src/main/java/azkaban/webapp/servlet/AbstractAzkabanServlet.java
@@ -33,17 +33,17 @@ import org.joda.time.DateTime;
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
 
-import azkaban.server.ServerConstants;
-import azkaban.utils.WebUtils;
-import azkaban.utils.JSONUtils;
-import azkaban.utils.Props;
 import azkaban.server.AzkabanServer;
 import azkaban.server.HttpRequestUtils;
+import azkaban.server.ServerConstants;
 import azkaban.server.session.Session;
+import azkaban.utils.Props;
+import azkaban.utils.JSONUtils;
+import azkaban.utils.WebUtils;
 import azkaban.webapp.AzkabanWebServer;
+import azkaban.webapp.plugin.PluginRegistry;
 import azkaban.webapp.plugin.ViewerPlugin;
 import azkaban.webapp.plugin.TriggerPlugin;
-import azkaban.webapp.plugin.PluginRegistry;
 
 /**
  * Base Servlet for pages

diff --git a/azkaban-webserver/src/main/java/azkaban/webapp/servlet/ExecutorServlet.java b/azkaban-webserver/src/main/java/azkaban/webapp/servlet/ExecutorServlet.java
index 8c1c7fc..66d8934 100644
--- a/azkaban-webserver/src/main/java/azkaban/webapp/servlet/ExecutorServlet.java
+++ b/azkaban-webserver/src/main/java/azkaban/webapp/servlet/ExecutorServlet.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2012 LinkedIn Corp.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -41,13 +41,13 @@ import azkaban.project.ProjectManager;
 import azkaban.scheduler.Schedule;
 import azkaban.scheduler.ScheduleManager;
 import azkaban.scheduler.ScheduleManagerException;
+import azkaban.server.HttpRequestUtils;
+import azkaban.server.session.Session;
 import azkaban.user.Permission;
 import azkaban.user.User;
 import azkaban.user.Permission.Type;
 import azkaban.utils.FileIOUtils.LogData;
 import azkaban.webapp.AzkabanWebServer;
-import azkaban.server.session.Session;
-import azkaban.server.HttpRequestUtils;
 import azkaban.webapp.plugin.PluginRegistry;
 import azkaban.webapp.plugin.ViewerPlugin;
 
@@ -405,7 +405,7 @@ public class ExecutorServlet extends LoginAbstractAzkabanServlet {
 
   /**
    * Gets the logs through plain text stream to reduce memory overhead.
-   * 
+   *
    * @param req
    * @param resp
    * @param user
@@ -445,7 +445,7 @@ public class ExecutorServlet extends LoginAbstractAzkabanServlet {
 
   /**
    * Gets the logs through ajax plain text stream to reduce memory overhead.
-   * 
+   *
    * @param req
    * @param resp
    * @param user

diff --git a/azkaban-webserver/src/main/java/azkaban/webapp/servlet/HistoryServlet.java b/azkaban-webserver/src/main/java/azkaban/webapp/servlet/HistoryServlet.java
index df8206c..1ff0d8f 100644
--- a/azkaban-webserver/src/main/java/azkaban/webapp/servlet/HistoryServlet.java
+++ b/azkaban-webserver/src/main/java/azkaban/webapp/servlet/HistoryServlet.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2012 LinkedIn Corp.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -33,8 +33,8 @@ import azkaban.executor.ExecutorManagerAdapter;
 import azkaban.executor.ExecutorManagerException;
 import azkaban.project.Project;
 import azkaban.project.ProjectManager;
-import azkaban.webapp.AzkabanWebServer;
 import azkaban.server.session.Session;
+import azkaban.webapp.AzkabanWebServer;
 
 public class HistoryServlet extends LoginAbstractAzkabanServlet {
 

diff --git a/azkaban-webserver/src/main/java/azkaban/webapp/servlet/IndexRedirectServlet.java b/azkaban-webserver/src/main/java/azkaban/webapp/servlet/IndexRedirectServlet.java
index 2e1aaed..31153e5 100644
--- a/azkaban-webserver/src/main/java/azkaban/webapp/servlet/IndexRedirectServlet.java
+++ b/azkaban-webserver/src/main/java/azkaban/webapp/servlet/IndexRedirectServlet.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2012 LinkedIn Corp.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the

diff --git a/azkaban-webserver/src/main/java/azkaban/webapp/servlet/JMXHttpServlet.java b/azkaban-webserver/src/main/java/azkaban/webapp/servlet/JMXHttpServlet.java
index 883d48a..74b419e 100644
--- a/azkaban-webserver/src/main/java/azkaban/webapp/servlet/JMXHttpServlet.java
+++ b/azkaban-webserver/src/main/java/azkaban/webapp/servlet/JMXHttpServlet.java
@@ -32,13 +32,13 @@ import org.apache.log4j.Logger;
 
 import azkaban.executor.ConnectorParams;
 import azkaban.executor.ExecutorManagerAdapter;
+import azkaban.server.session.Session;
 import azkaban.trigger.TriggerManager;
 import azkaban.user.Permission;
 import azkaban.user.Role;
 import azkaban.user.User;
 import azkaban.user.UserManager;
 import azkaban.webapp.AzkabanWebServer;
-import azkaban.server.session.Session;
 
 /**
  * Limited set of jmx calls for when you cannot attach to the jvm

diff --git a/azkaban-webserver/src/main/java/azkaban/webapp/servlet/LoginAbstractAzkabanServlet.java b/azkaban-webserver/src/main/java/azkaban/webapp/servlet/LoginAbstractAzkabanServlet.java
index 6491d7c..e0b9e38 100644
--- a/azkaban-webserver/src/main/java/azkaban/webapp/servlet/LoginAbstractAzkabanServlet.java
+++ b/azkaban-webserver/src/main/java/azkaban/webapp/servlet/LoginAbstractAzkabanServlet.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2012 LinkedIn Corp.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -37,12 +37,12 @@ import org.apache.commons.io.IOUtils;
 import org.apache.log4j.Logger;
 
 import azkaban.project.Project;
+import azkaban.server.session.Session;
 import azkaban.user.Permission;
 import azkaban.user.Role;
 import azkaban.user.User;
 import azkaban.user.UserManager;
 import azkaban.user.UserManagerException;
-import azkaban.server.session.Session;
 
 /**
  * Abstract Servlet that handles auto login when the session hasn't been
@@ -359,7 +359,7 @@ public abstract class LoginAbstractAzkabanServlet extends
   /**
    * The get request is handed off to the implementor after the user is logged
    * in.
-   * 
+   *
    * @param req
    * @param resp
    * @param session
@@ -373,7 +373,7 @@ public abstract class LoginAbstractAzkabanServlet extends
   /**
    * The post request is handed off to the implementor after the user is logged
    * in.
-   * 
+   *
    * @param req
    * @param resp
    * @param session
@@ -387,7 +387,7 @@ public abstract class LoginAbstractAzkabanServlet extends
   /**
    * The post request is handed off to the implementor after the user is logged
    * in.
-   * 
+   *
    * @param req
    * @param resp
    * @param session

diff --git a/azkaban-webserver/src/main/java/azkaban/webapp/servlet/MultipartParser.java b/azkaban-webserver/src/main/java/azkaban/webapp/servlet/MultipartParser.java
index 3897b77..353b21e 100644
--- a/azkaban-webserver/src/main/java/azkaban/webapp/servlet/MultipartParser.java
+++ b/azkaban-webserver/src/main/java/azkaban/webapp/servlet/MultipartParser.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2012 LinkedIn Corp.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the

diff --git a/azkaban-webserver/src/main/java/azkaban/webapp/servlet/Page.java b/azkaban-webserver/src/main/java/azkaban/webapp/servlet/Page.java
index df2ba7a..b03673f 100644
--- a/azkaban-webserver/src/main/java/azkaban/webapp/servlet/Page.java
+++ b/azkaban-webserver/src/main/java/azkaban/webapp/servlet/Page.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2012 LinkedIn Corp.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -39,7 +39,7 @@ public class Page {
 
   /**
    * Creates a page and sets up the velocity engine to render
-   * 
+   *
    * @param request
    * @param response
    * @param engine

diff --git a/azkaban-webserver/src/main/java/azkaban/webapp/servlet/PageRenderException.java b/azkaban-webserver/src/main/java/azkaban/webapp/servlet/PageRenderException.java
index 2672988..5b0c774 100644
--- a/azkaban-webserver/src/main/java/azkaban/webapp/servlet/PageRenderException.java
+++ b/azkaban-webserver/src/main/java/azkaban/webapp/servlet/PageRenderException.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2012 LinkedIn Corp.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the

diff --git a/azkaban-webserver/src/main/java/azkaban/webapp/servlet/ProjectManagerServlet.java b/azkaban-webserver/src/main/java/azkaban/webapp/servlet/ProjectManagerServlet.java
index a031685..95644e2 100644
--- a/azkaban-webserver/src/main/java/azkaban/webapp/servlet/ProjectManagerServlet.java
+++ b/azkaban-webserver/src/main/java/azkaban/webapp/servlet/ProjectManagerServlet.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2012 LinkedIn Corp.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -59,6 +59,7 @@ import azkaban.project.ProjectManagerException;
 import azkaban.scheduler.Schedule;
 import azkaban.scheduler.ScheduleManager;
 import azkaban.scheduler.ScheduleManagerException;
+import azkaban.server.session.Session;
 import azkaban.user.Permission;
 import azkaban.user.Role;
 import azkaban.user.UserManager;
@@ -70,7 +71,6 @@ import azkaban.utils.Props;
 import azkaban.utils.PropsUtils;
 import azkaban.utils.Utils;
 import azkaban.webapp.AzkabanWebServer;
-import azkaban.server.session.Session;
 
 public class ProjectManagerServlet extends LoginAbstractAzkabanServlet {
   private static final long serialVersionUID = 1;

diff --git a/azkaban-webserver/src/main/java/azkaban/webapp/servlet/ProjectServlet.java b/azkaban-webserver/src/main/java/azkaban/webapp/servlet/ProjectServlet.java
index be902f1..da82e13 100644
--- a/azkaban-webserver/src/main/java/azkaban/webapp/servlet/ProjectServlet.java
+++ b/azkaban-webserver/src/main/java/azkaban/webapp/servlet/ProjectServlet.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2012 LinkedIn Corp.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -28,12 +28,12 @@ import org.apache.log4j.Logger;
 
 import azkaban.project.Project;
 import azkaban.project.ProjectManager;
+import azkaban.server.session.Session;
 import azkaban.user.Permission;
 import azkaban.user.Role;
 import azkaban.user.User;
 import azkaban.user.UserManager;
 import azkaban.webapp.AzkabanWebServer;
-import azkaban.server.session.Session;
 
 /**
  * The main page

diff --git a/azkaban-webserver/src/main/java/azkaban/webapp/servlet/ScheduleServlet.java b/azkaban-webserver/src/main/java/azkaban/webapp/servlet/ScheduleServlet.java
index 1b4cf4c..2baef36 100644
--- a/azkaban-webserver/src/main/java/azkaban/webapp/servlet/ScheduleServlet.java
+++ b/azkaban-webserver/src/main/java/azkaban/webapp/servlet/ScheduleServlet.java
@@ -56,6 +56,8 @@ import azkaban.project.ProjectManager;
 import azkaban.scheduler.Schedule;
 import azkaban.scheduler.ScheduleManager;
 import azkaban.scheduler.ScheduleManagerException;
+import azkaban.server.session.Session;
+import azkaban.server.HttpRequestUtils;
 import azkaban.sla.SlaOption;
 import azkaban.user.Permission;
 import azkaban.user.Permission.Type;
@@ -65,8 +67,6 @@ import azkaban.utils.SplitterOutputStream;
 import azkaban.utils.Utils;
 import azkaban.webapp.AzkabanWebServer;
 import azkaban.webapp.SchedulerStatistics;
-import azkaban.server.session.Session;
-import azkaban.server.HttpRequestUtils;
 
 public class ScheduleServlet extends LoginAbstractAzkabanServlet {
   private static final long serialVersionUID = 1L;

diff --git a/azkaban-webserver/src/main/java/azkaban/webapp/servlet/TriggerManagerServlet.java b/azkaban-webserver/src/main/java/azkaban/webapp/servlet/TriggerManagerServlet.java
index a0f4007..81eff00 100644
--- a/azkaban-webserver/src/main/java/azkaban/webapp/servlet/TriggerManagerServlet.java
+++ b/azkaban-webserver/src/main/java/azkaban/webapp/servlet/TriggerManagerServlet.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2012 LinkedIn, Inc
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -27,12 +27,13 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.log4j.Logger;
+
+import azkaban.server.session.Session;
 import azkaban.trigger.Trigger;
 import azkaban.trigger.TriggerManager;
 import azkaban.trigger.TriggerManagerException;
 import azkaban.user.User;
 import azkaban.webapp.AzkabanWebServer;
-import azkaban.server.session.Session;
 
 public class TriggerManagerServlet extends LoginAbstractAzkabanServlet {
   private static final long serialVersionUID = 1L;

diff --git a/azkaban-webserver/src/main/java/azkaban/webapp/servlet/VelocityUtils.java b/azkaban-webserver/src/main/java/azkaban/webapp/servlet/VelocityUtils.java
index 2ae7031..89aada8 100644
--- a/azkaban-webserver/src/main/java/azkaban/webapp/servlet/VelocityUtils.java
+++ b/azkaban-webserver/src/main/java/azkaban/webapp/servlet/VelocityUtils.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2012 LinkedIn Corp.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the