azkaban-uncached

diff --git a/src/java/azkaban/project/ProjectManager.java b/src/java/azkaban/project/ProjectManager.java
index 8db4fe3..a5be083 100644
--- a/src/java/azkaban/project/ProjectManager.java
+++ b/src/java/azkaban/project/ProjectManager.java
@@ -50,8 +50,6 @@ public class ProjectManager {
 	private final int projectVersionRetention;
 	private final boolean creatorDefaultPermissions;
 	
-	private boolean loadTriggerFromFile = false;
-	
 	public ProjectManager(ProjectLoader loader, Props props) {
 		this.projectLoader = loader;
 		this.props = props;
@@ -61,8 +59,6 @@ public class ProjectManager {
 		
 		this.creatorDefaultPermissions = props.getBoolean("creator.default.proxy", true);
 		
-		this.loadTriggerFromFile = props.getBoolean("enable.load.trigger.from.file", false);
-		
 		if (!tempDir.exists()) {
 			tempDir.mkdirs();
 		}
@@ -70,10 +66,6 @@ public class ProjectManager {
 		loadAllProjects();
 	}
 
-	public void setLoadTriggerFromFile(boolean enable) {
-		this.loadTriggerFromFile = enable;
-	}
-
 	private void loadAllProjects() {
 		List<Project> projects;
 		try {

diff --git a/src/java/azkaban/trigger/ActionTypeLoader.java b/src/java/azkaban/trigger/ActionTypeLoader.java
index 720a2b2..2efdf99 100644
--- a/src/java/azkaban/trigger/ActionTypeLoader.java
+++ b/src/java/azkaban/trigger/ActionTypeLoader.java
@@ -30,8 +30,6 @@ public class ActionTypeLoader {
 	private static Logger logger = Logger.getLogger(ActionTypeLoader.class);
 	
 	public static final String DEFAULT_TRIGGER_ACTION_PLUGIN_DIR = "plugins/triggeractions";
-	private static final String ACTIONTYPECONFFILE = "plugin.properties"; // need jars.to.include property, will be loaded with user property
-	private static final String COMMONCONFFILE = "common.properties";	// common properties for multiple plugins
 
 	protected static Map<String, Class<? extends TriggerAction>> actionToClass = new HashMap<String, Class<? extends TriggerAction>>();
 	

diff --git a/src/java/azkaban/trigger/builtin/CreateTriggerAction.java b/src/java/azkaban/trigger/builtin/CreateTriggerAction.java
index 8ddb32f..ad86c3f 100644
--- a/src/java/azkaban/trigger/builtin/CreateTriggerAction.java
+++ b/src/java/azkaban/trigger/builtin/CreateTriggerAction.java
@@ -28,6 +28,7 @@ public class CreateTriggerAction implements TriggerAction {
 	public static final String type = "CreateTriggerAction";
 	private static TriggerManager triggerManager;
 	private Trigger trigger;
+	@SuppressWarnings("unused")
 	private Map<String, Object> context;
 	private String actionId;
 	

diff --git a/src/java/azkaban/trigger/builtin/ExecuteFlowAction.java b/src/java/azkaban/trigger/builtin/ExecuteFlowAction.java
index 2f3a5f4..ab1586a 100644
--- a/src/java/azkaban/trigger/builtin/ExecuteFlowAction.java
+++ b/src/java/azkaban/trigger/builtin/ExecuteFlowAction.java
@@ -27,7 +27,6 @@ import azkaban.executor.ExecutableFlow;
 import azkaban.executor.ExecutionOptions;
 import azkaban.executor.ExecutorManagerAdapter;
 import azkaban.executor.ExecutorManagerException;
-import azkaban.executor.Status;
 import azkaban.flow.Flow;
 import azkaban.project.Project;
 import azkaban.project.ProjectManager;

diff --git a/src/java/azkaban/trigger/CheckerTypeLoader.java b/src/java/azkaban/trigger/CheckerTypeLoader.java
index b20d778..7c02bed 100644
--- a/src/java/azkaban/trigger/CheckerTypeLoader.java
+++ b/src/java/azkaban/trigger/CheckerTypeLoader.java
@@ -16,19 +16,11 @@
 
 package azkaban.trigger;
 
-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.HashMap;
-import java.util.List;
 import java.util.Map;
 
 import org.apache.log4j.Logger;
 
-import azkaban.trigger.builtin.BasicTimeChecker;
 import azkaban.utils.Props;
 import azkaban.utils.Utils;
 
@@ -38,8 +30,6 @@ public class CheckerTypeLoader {
 	private static Logger logger = Logger.getLogger(CheckerTypeLoader.class);
 	
 	public static final String DEFAULT_CONDITION_CHECKER_PLUGIN_DIR = "plugins/conditioncheckers";
-	private static final String CHECKERTYPECONFFILE = "plugin.properties"; // need jars.to.include property, will be loaded with user property
-	private static final String COMMONCONFFILE = "common.properties";	// common properties for multiple plugins
 	
 	protected static Map<String, Class<? extends ConditionChecker>> checkerToClass = new HashMap<String, Class<? extends ConditionChecker>>();
 	

diff --git a/src/java/azkaban/trigger/TriggerManager.java b/src/java/azkaban/trigger/TriggerManager.java
index 496a9b3..6f403e7 100644
--- a/src/java/azkaban/trigger/TriggerManager.java
+++ b/src/java/azkaban/trigger/TriggerManager.java
@@ -28,17 +28,12 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.PriorityBlockingQueue;
 import org.apache.log4j.Logger;
 
-import azkaban.execapp.JobRunner;
 import azkaban.execapp.event.Event;
 import azkaban.execapp.event.EventHandler;
 import azkaban.execapp.event.EventListener;
 import azkaban.execapp.event.Event.Type;
 import azkaban.executor.ExecutableFlow;
-import azkaban.executor.ExecutableNode;
-import azkaban.executor.ExecutionOptions;
 import azkaban.executor.ExecutorManager;
-import azkaban.executor.Status;
-import azkaban.executor.ExecutionOptions.FailureAction;
 import azkaban.utils.Props;
 
 public class TriggerManager extends EventHandler implements TriggerManagerAdapter{

diff --git a/src/java/azkaban/utils/Emailer.java b/src/java/azkaban/utils/Emailer.java
index ec75d6a..dcc749c 100644
--- a/src/java/azkaban/utils/Emailer.java
+++ b/src/java/azkaban/utils/Emailer.java
@@ -36,7 +36,6 @@ import azkaban.executor.mail.DefaultMailCreator;
 import azkaban.executor.mail.MailCreator;
 import azkaban.utils.EmailMessage;
 import azkaban.utils.Props;
-import azkaban.utils.Utils;
 
 public class Emailer extends AbstractMailer implements Alerter {
 	private static Logger logger = Logger.getLogger(Emailer.class);

diff --git a/src/java/azkaban/utils/Utils.java b/src/java/azkaban/utils/Utils.java
index 17a3edf..257508a 100644
--- a/src/java/azkaban/utils/Utils.java
+++ b/src/java/azkaban/utils/Utils.java
@@ -43,6 +43,7 @@ import org.joda.time.Months;
 import org.joda.time.ReadablePeriod;
 import org.joda.time.Seconds;
 import org.joda.time.Weeks;
+import org.joda.time.Years;
 
 /**
  * A util helper class full of static methods that are commonly used.
@@ -328,6 +329,9 @@ public class Utils {
 		int periodInt = Integer.parseInt(periodStr.substring(0,
 				periodStr.length() - 1));
 		switch (periodUnit) {
+		case 'y':
+			period = Years.years(periodInt);
+			break;
 		case 'M':
 			period = Months.months(periodInt);
 			break;
@@ -355,13 +359,16 @@ public class Utils {
 	}
 
 	public static String createPeriodString(ReadablePeriod period) {
-		String periodStr = "n";
+		String periodStr = "null";
 
 		if (period == null) {
-			return "n";
+			return "null";
 		}
 
-		if (period.get(DurationFieldType.months()) > 0) {
+		if (period.get(DurationFieldType.years()) > 0) {
+			int years = period.get(DurationFieldType.years());
+			periodStr = years + "y";
+		} else if (period.get(DurationFieldType.months()) > 0) {
 			int months = period.get(DurationFieldType.months());
 			periodStr = months + "M";
 		} else if (period.get(DurationFieldType.weeks()) > 0) {

diff --git a/src/java/azkaban/utils/WebUtils.java b/src/java/azkaban/utils/WebUtils.java
index 95fc6aa..31322e6 100644
--- a/src/java/azkaban/utils/WebUtils.java
+++ b/src/java/azkaban/utils/WebUtils.java
@@ -115,13 +115,17 @@ public class WebUtils {
 	
 	public String formatPeriod(ReadablePeriod period)
 	{
-        String periodStr = "n";
+        String periodStr = "null";
 
         if (period == null) {
             return periodStr;
         }
 
-        if (period.get(DurationFieldType.months()) > 0) {
+        if (period.get(DurationFieldType.years()) > 0) {
+        	int years = period.get(DurationFieldType.years());
+        	periodStr = years + " year(s)";
+        }
+        else if (period.get(DurationFieldType.months()) > 0) {
             int months = period.get(DurationFieldType.months());
             periodStr = months + " month(s)";
         }

diff --git a/src/java/azkaban/webapp/servlet/ExecutorServlet.java b/src/java/azkaban/webapp/servlet/ExecutorServlet.java
index 919045e..95847a1 100644
--- a/src/java/azkaban/webapp/servlet/ExecutorServlet.java
+++ b/src/java/azkaban/webapp/servlet/ExecutorServlet.java
@@ -43,7 +43,6 @@ import azkaban.scheduler.ScheduleManagerException;
 import azkaban.user.Permission;
 import azkaban.user.User;
 import azkaban.user.Permission.Type;
-import azkaban.utils.FileIOUtils.JobMetaData;
 import azkaban.utils.FileIOUtils.LogData;
 import azkaban.webapp.AzkabanWebServer;
 import azkaban.webapp.session.Session;
@@ -444,51 +443,6 @@ public class ExecutorServlet extends LoginAbstractAzkabanServlet {
 		}
 	}
 
-	/**
-	 * Gets the job metadata through ajax plain text stream to reduce memory overhead.
-	 * 
-	 * @param req
-	 * @param resp
-	 * @param user
-	 * @param exFlow
-	 * @throws ServletException
-	 */
-	private void ajaxFetchJobMetaData(HttpServletRequest req, HttpServletResponse resp, HashMap<String, Object> ret, User user, ExecutableFlow exFlow) throws ServletException {
-		Project project = getProjectAjaxByPermission(ret, exFlow.getProjectId(), user, Type.READ);
-		if (project == null) {
-			return;
-		}
-		
-		int offset = this.getIntParam(req, "offset");
-		int length = this.getIntParam(req, "length");
-		
-		String jobId = this.getParam(req, "jobId");
-		resp.setCharacterEncoding("utf-8");
-
-		try {
-			ExecutableNode node = exFlow.getExecutableNode(jobId);
-			if (node == null) {
-				ret.put("error", "Job " + jobId + " doesn't exist in " + exFlow.getExecutionId());
-				return;
-			}
-			
-			int attempt = this.getIntParam(req, "attempt", node.getAttempt());
-			JobMetaData data = executorManager.getExecutionJobMetaData(exFlow, jobId, offset, length, attempt);
-			if (data == null) {
-				ret.put("length", 0);
-				ret.put("offset", offset);
-				ret.put("data", "");
-			}
-			else {
-				ret.put("length", data.getLength());
-				ret.put("offset", data.getOffset());
-				ret.put("data", data.getData());
-			}
-		} catch (ExecutorManagerException e) {
-			throw new ServletException(e);
-		}
-	}
-	
 	private void ajaxFetchFlowInfo(HttpServletRequest req, HttpServletResponse resp, HashMap<String, Object> ret, User user, String projectName, String flowId) throws ServletException {
 		Project project = getProjectAjaxByPermission(ret, projectName, user, Type.READ);
 		if (project == null) {

diff --git a/src/java/azkaban/webapp/servlet/HistoryServlet.java b/src/java/azkaban/webapp/servlet/HistoryServlet.java
index 95874fa..a46d645 100644
--- a/src/java/azkaban/webapp/servlet/HistoryServlet.java
+++ b/src/java/azkaban/webapp/servlet/HistoryServlet.java
@@ -31,7 +31,6 @@ import org.joda.time.format.DateTimeFormat;
 
 
 import azkaban.executor.ExecutableFlow;
-import azkaban.executor.ExecutorManager;
 import azkaban.executor.ExecutorManagerAdapter;
 import azkaban.executor.ExecutorManagerException;
 import azkaban.project.Project;

diff --git a/src/java/azkaban/webapp/servlet/JMXHttpServlet.java b/src/java/azkaban/webapp/servlet/JMXHttpServlet.java
index 1a5d1d7..616cc76 100644
--- a/src/java/azkaban/webapp/servlet/JMXHttpServlet.java
+++ b/src/java/azkaban/webapp/servlet/JMXHttpServlet.java
@@ -19,7 +19,6 @@ package azkaban.webapp.servlet;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Set;
 
 import javax.management.MBeanAttributeInfo;
 import javax.management.MBeanInfo;
@@ -32,7 +31,6 @@ import javax.servlet.http.HttpServletResponse;
 import org.apache.log4j.Logger;
 
 import azkaban.executor.ConnectorParams;
-import azkaban.executor.ExecutorManager;
 import azkaban.executor.ExecutorManagerAdapter;
 import azkaban.trigger.TriggerManager;
 import azkaban.user.Permission;

diff --git a/src/java/azkaban/webapp/servlet/ProjectManagerServlet.java b/src/java/azkaban/webapp/servlet/ProjectManagerServlet.java
index 6affa18..d25ea39 100644
--- a/src/java/azkaban/webapp/servlet/ProjectManagerServlet.java
+++ b/src/java/azkaban/webapp/servlet/ProjectManagerServlet.java
@@ -44,7 +44,6 @@ import org.apache.log4j.Logger;
 
 import azkaban.executor.ExecutableFlow;
 import azkaban.executor.ExecutableJobInfo;
-import azkaban.executor.ExecutorManager;
 import azkaban.executor.ExecutorManagerAdapter;
 import azkaban.executor.ExecutorManagerException;
 import azkaban.flow.Edge;

diff --git a/src/package/execserver/bin/azkaban-executor-start.sh b/src/package/execserver/bin/azkaban-executor-start.sh
index f6313f7..5245714 100755
--- a/src/package/execserver/bin/azkaban-executor-start.sh
+++ b/src/package/execserver/bin/azkaban-executor-start.sh
@@ -1,3 +1,5 @@
+#!/bin/bash
+
 azkaban_dir=$(dirname $0)/..
 
 if [[ -z "$tmpdir" ]]; then

diff --git a/src/package/execserver/bin/start-exec.sh b/src/package/execserver/bin/start-exec.sh
index f44b2ec..fbb7124 100644
--- a/src/package/execserver/bin/start-exec.sh
+++ b/src/package/execserver/bin/start-exec.sh
@@ -1,3 +1,5 @@
+#!/bin/bash
+
 base_dir=$(dirname $0)/..
 
 bin/azkaban-executor-start.sh $base_dir 2>&1>logs/executorServerLog__`date +%F+%T`.out &

diff --git a/src/package/soloserver/bin/azkaban-solo-start.sh b/src/package/soloserver/bin/azkaban-solo-start.sh
index 32e3054..54ac8d9 100755
--- a/src/package/soloserver/bin/azkaban-solo-start.sh
+++ b/src/package/soloserver/bin/azkaban-solo-start.sh
@@ -1,3 +1,5 @@
+#!/bin/bash
+
 azkaban_dir=$(dirname $0)/..
 
 if [[ -z "$tmpdir" ]]; then

diff --git a/src/package/triggerserver/bin/azkaban-trigger-start.sh b/src/package/triggerserver/bin/azkaban-trigger-start.sh
index 00e1077..64daa9b 100755
--- a/src/package/triggerserver/bin/azkaban-trigger-start.sh
+++ b/src/package/triggerserver/bin/azkaban-trigger-start.sh
@@ -1,3 +1,5 @@
+#!/bin/bash
+
 azkaban_dir=$(dirname $0)/..
 
 if [[ -z "$tmpdir" ]]; then

diff --git a/src/package/webserver/bin/azkaban-web-start.sh b/src/package/webserver/bin/azkaban-web-start.sh
index fd16e47..b0604fd 100755
--- a/src/package/webserver/bin/azkaban-web-start.sh
+++ b/src/package/webserver/bin/azkaban-web-start.sh
@@ -1,3 +1,5 @@
+#!/bin/bash
+
 azkaban_dir=$(dirname $0)/..
 
 if [[ -z "$tmpdir" ]]; then

diff --git a/src/package/webserver/bin/start-web.sh b/src/package/webserver/bin/start-web.sh
index 30d43fa..b063aaa 100644
--- a/src/package/webserver/bin/start-web.sh
+++ b/src/package/webserver/bin/start-web.sh
@@ -1,3 +1,5 @@
+#!/bin/bash
+
 base_dir=$(dirname $0)/..
 
 bin/azkaban-web-start.sh $base_dir 2>&1>logs/webServerLog_`date +%F+%T`.out &

diff --git a/src/sql/create.project_properties.sql b/src/sql/create.project_properties.sql
index 9ed6267..7adf25e 100644
--- a/src/sql/create.project_properties.sql
+++ b/src/sql/create.project_properties.sql
@@ -1,7 +1,7 @@
 CREATE TABLE project_properties (
 	project_id INT NOT NULL,
 	version INT NOT NULL,
-	name VARCHAR(128),
+	name VARCHAR(255),
 	modified_time BIGINT NOT NULL,
 	encoding_type TINYINT,
 	property BLOB,

diff --git a/src/web/js/azkaban.message.dialog.view.js b/src/web/js/azkaban.message.dialog.view.js
index 767047f..cea0852 100644
--- a/src/web/js/azkaban.message.dialog.view.js
+++ b/src/web/js/azkaban.message.dialog.view.js
@@ -37,7 +37,6 @@ azkaban.MessageDialogView = Backbone.View.extend({
 	}
 });
 
-
 $(function() {
 	messageDialogView = new azkaban.MessageDialogView({
 		el: $('#azkaban-message-dialog')

diff --git a/src/web/js/azkaban.schedule.panel.view.js b/src/web/js/azkaban.schedule.panel.view.js
index 2e26845..b869552 100644
--- a/src/web/js/azkaban.schedule.panel.view.js
+++ b/src/web/js/azkaban.schedule.panel.view.js
@@ -72,11 +72,9 @@ azkaban.SchedulePanelView = Backbone.View.extend({
 			
 		var successHandler = function(data) {
 			if (data.error) {
-				schedulePanelView.hideSchedulePanel();
 				messageDialogView.show("Error Scheduling Flow", data.message);
 			}
 			else {
-				schedulePanelView.hideSchedulePanel();
 				messageDialogView.show("Flow Scheduled", data.message,
 					function() {
 						window.location.href = scheduleURL;

diff --git a/unit/java/azkaban/test/database/AzkabanDatabaseSetupTest.java b/unit/java/azkaban/test/database/AzkabanDatabaseSetupTest.java
index 23d548c..0b2bd48 100644
--- a/unit/java/azkaban/test/database/AzkabanDatabaseSetupTest.java
+++ b/unit/java/azkaban/test/database/AzkabanDatabaseSetupTest.java
@@ -6,11 +6,10 @@ import java.sql.SQLException;
 
 import javax.sql.DataSource;
 
-import junit.framework.Assert;
-
 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;
 

diff --git a/unit/java/azkaban/test/execapp/event/BlockingStatusTest.java b/unit/java/azkaban/test/execapp/event/BlockingStatusTest.java
index 3acd91b..124f9a0 100644
--- a/unit/java/azkaban/test/execapp/event/BlockingStatusTest.java
+++ b/unit/java/azkaban/test/execapp/event/BlockingStatusTest.java
@@ -1,8 +1,8 @@
 package azkaban.test.execapp.event;
 
+import org.junit.Assert;
 import org.junit.Test;
 
-import junit.framework.Assert;
 import azkaban.execapp.event.BlockingStatus;
 import azkaban.executor.Status;
 

diff --git a/unit/java/azkaban/test/execapp/FlowRunnerTest.java b/unit/java/azkaban/test/execapp/FlowRunnerTest.java
index da1ed27..7628c13 100644
--- a/unit/java/azkaban/test/execapp/FlowRunnerTest.java
+++ b/unit/java/azkaban/test/execapp/FlowRunnerTest.java
@@ -4,10 +4,9 @@ import java.io.File;
 import java.io.IOException;
 import java.util.HashMap;
 
-import junit.framework.Assert;
-
 import org.apache.commons.io.FileUtils;
 import org.junit.After;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 

diff --git a/unit/java/azkaban/test/execapp/JobRunnerTest.java b/unit/java/azkaban/test/execapp/JobRunnerTest.java
index 1f8edc2..02f35ae 100644
--- a/unit/java/azkaban/test/execapp/JobRunnerTest.java
+++ b/unit/java/azkaban/test/execapp/JobRunnerTest.java
@@ -4,11 +4,10 @@ import java.io.File;
 import java.io.IOException;
 import java.util.HashSet;
 
-import junit.framework.Assert;
-
 import org.apache.commons.io.FileUtils;
 import org.apache.log4j.Logger;
 import org.junit.After;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 

diff --git a/unit/java/azkaban/test/execapp/ProjectVersionsTest.java b/unit/java/azkaban/test/execapp/ProjectVersionsTest.java
index 5a0a31b..9120729 100644
--- a/unit/java/azkaban/test/execapp/ProjectVersionsTest.java
+++ b/unit/java/azkaban/test/execapp/ProjectVersionsTest.java
@@ -3,8 +3,7 @@ package azkaban.test.execapp;
 import java.util.ArrayList;
 import java.util.Collections;
 
-import junit.framework.Assert;
-
+import org.junit.Assert;
 import org.junit.Test;
 
 import azkaban.execapp.ProjectVersion;

diff --git a/unit/java/azkaban/test/executor/JdbcExecutorLoaderTest.java b/unit/java/azkaban/test/executor/JdbcExecutorLoaderTest.java
index ba89a20..302eaac 100644
--- a/unit/java/azkaban/test/executor/JdbcExecutorLoaderTest.java
+++ b/unit/java/azkaban/test/executor/JdbcExecutorLoaderTest.java
@@ -6,17 +6,16 @@ import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.HashMap;
-import java.util.HashSet;
+import java.util.HashSet;	
 import java.util.Map;
 
 import javax.sql.DataSource;
 
-import junit.framework.Assert;
-
 import org.apache.commons.dbutils.DbUtils;
 import org.apache.commons.dbutils.QueryRunner;
 import org.apache.commons.dbutils.ResultSetHandler;
 import org.joda.time.DateTime;
+import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
 

diff --git a/unit/java/azkaban/test/project/JdbcProjectLoaderTest.java b/unit/java/azkaban/test/project/JdbcProjectLoaderTest.java
index 85f874c..0de4121 100644
--- a/unit/java/azkaban/test/project/JdbcProjectLoaderTest.java
+++ b/unit/java/azkaban/test/project/JdbcProjectLoaderTest.java
@@ -9,15 +9,13 @@ import java.util.List;
 
 import javax.sql.DataSource;
 
-import junit.framework.Assert;
-
 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.Test;
 
-
 import azkaban.flow.Edge;
 import azkaban.flow.Flow;
 import azkaban.flow.Node;

diff --git a/unit/java/azkaban/test/trigger/ConditionTest.java b/unit/java/azkaban/test/trigger/ConditionTest.java
index c56edab..76ced5e 100644
--- a/unit/java/azkaban/test/trigger/ConditionTest.java
+++ b/unit/java/azkaban/test/trigger/ConditionTest.java
@@ -1,7 +1,6 @@
 package azkaban.test.trigger;
 
 import java.io.File;
-import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -14,7 +13,6 @@ import org.junit.Test;
 import azkaban.trigger.CheckerTypeLoader;
 import azkaban.trigger.Condition;
 import azkaban.trigger.ConditionChecker;
-import azkaban.trigger.TriggerException;
 import azkaban.trigger.builtin.BasicTimeChecker;
 import azkaban.utils.JSONUtils;
 import azkaban.utils.Props;
@@ -75,7 +73,6 @@ public class ConditionTest {
 		
 		Condition cond2 = Condition.fromJson(JSONUtils.parseJSONFromFile(temp));
 		
-		Map<String, ConditionChecker> checkers1 = cond.getCheckers();
 		Map<String, ConditionChecker> checkers2 = cond2.getCheckers();
 		
 		assertTrue(cond.getExpression().equals(cond2.getExpression()));

diff --git a/unit/java/azkaban/test/trigger/ExecuteFlowActionTest.java b/unit/java/azkaban/test/trigger/ExecuteFlowActionTest.java
index 4f1bb09..905ca3d 100644
--- a/unit/java/azkaban/test/trigger/ExecuteFlowActionTest.java
+++ b/unit/java/azkaban/test/trigger/ExecuteFlowActionTest.java
@@ -2,7 +2,6 @@ package azkaban.test.trigger;
 
 import static org.junit.Assert.*;
 
-import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -10,8 +9,6 @@ import org.junit.Test;
 
 import azkaban.executor.ExecutionOptions;
 import azkaban.trigger.ActionTypeLoader;
-import azkaban.trigger.TriggerAction;
-import azkaban.trigger.TriggerException;
 import azkaban.trigger.builtin.ExecuteFlowAction;
 import azkaban.utils.Props;
 

diff --git a/unit/java/azkaban/test/trigger/JdbcTriggerLoaderTest.java b/unit/java/azkaban/test/trigger/JdbcTriggerLoaderTest.java
index 82a9796..61f2ae7 100644
--- a/unit/java/azkaban/test/trigger/JdbcTriggerLoaderTest.java
+++ b/unit/java/azkaban/test/trigger/JdbcTriggerLoaderTest.java
@@ -21,7 +21,6 @@ import org.junit.Before;
 import org.junit.Test;
 
 import azkaban.database.DataSourceUtils;
-import azkaban.executor.ExecutableFlow;
 import azkaban.executor.ExecutionOptions;
 import azkaban.trigger.ActionTypeLoader;
 import azkaban.trigger.CheckerTypeLoader;
@@ -33,7 +32,6 @@ import azkaban.trigger.TriggerAction;
 import azkaban.trigger.TriggerException;
 import azkaban.trigger.TriggerLoader;
 import azkaban.trigger.TriggerLoaderException;
-import azkaban.trigger.TriggerManagerException;
 import azkaban.trigger.builtin.BasicTimeChecker;
 import azkaban.trigger.builtin.ExecuteFlowAction;
 import azkaban.utils.Props;
@@ -201,16 +199,6 @@ public class JdbcTriggerLoaderTest {
 		return t;
 	}
 	
-	private boolean isTestSetup() {
-		if (!testDBExists) {
-			System.err.println("Skipping DB test because Db not setup.");
-			return false;
-		}
-		
-		System.out.println("Running DB test because Db setup.");
-		return true;
-	}
-	
 	public static class CountHandler implements ResultSetHandler<Integer> {
 		@Override
 		public Integer handle(ResultSet rs) throws SQLException {

diff --git a/unit/java/azkaban/test/trigger/ThresholdChecker.java b/unit/java/azkaban/test/trigger/ThresholdChecker.java
index 4e6e85c..3368eae 100644
--- a/unit/java/azkaban/test/trigger/ThresholdChecker.java
+++ b/unit/java/azkaban/test/trigger/ThresholdChecker.java
@@ -2,9 +2,6 @@ package azkaban.test.trigger;
 
 import java.util.Map;
 
-import org.joda.time.DateTime;
-import org.joda.time.DateTimeZone;
-
 import azkaban.trigger.ConditionChecker;
 
 

diff --git a/unit/java/azkaban/test/trigger/TriggerManagerTest.java b/unit/java/azkaban/test/trigger/TriggerManagerTest.java
index ebf1f38..dfd2da5 100644
--- a/unit/java/azkaban/test/trigger/TriggerManagerTest.java
+++ b/unit/java/azkaban/test/trigger/TriggerManagerTest.java
@@ -12,13 +12,10 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
-import azkaban.executor.ExecutorManager;
 import azkaban.trigger.Condition;
 import azkaban.trigger.ConditionChecker;
-import azkaban.trigger.CheckerTypeLoader;
 import azkaban.trigger.Trigger;
 import azkaban.trigger.TriggerAction;
-import azkaban.trigger.ActionTypeLoader;
 import azkaban.trigger.TriggerException;
 import azkaban.trigger.TriggerLoader;
 import azkaban.trigger.TriggerLoaderException;

diff --git a/unit/java/azkaban/test/trigger/TriggerTest.java b/unit/java/azkaban/test/trigger/TriggerTest.java
index 22f6532..2b79266 100644
--- a/unit/java/azkaban/test/trigger/TriggerTest.java
+++ b/unit/java/azkaban/test/trigger/TriggerTest.java
@@ -1,7 +1,6 @@
 package azkaban.test.trigger;
 
 import java.io.File;
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;

diff --git a/unit/java/azkaban/test/utils/cache/CacheTest.java b/unit/java/azkaban/test/utils/cache/CacheTest.java
index bc5e2b9..3fcc0f9 100644
--- a/unit/java/azkaban/test/utils/cache/CacheTest.java
+++ b/unit/java/azkaban/test/utils/cache/CacheTest.java
@@ -1,7 +1,6 @@
 package azkaban.test.utils.cache;
 
-import junit.framework.Assert;
-
+import org.junit.Assert;
 import org.junit.Test;
 
 import azkaban.utils.cache.Cache;

diff --git a/unit/java/azkaban/test/utils/FileIOUtilsTest.java b/unit/java/azkaban/test/utils/FileIOUtilsTest.java
index 241162e..3157663 100644
--- a/unit/java/azkaban/test/utils/FileIOUtilsTest.java
+++ b/unit/java/azkaban/test/utils/FileIOUtilsTest.java
@@ -4,10 +4,9 @@ import java.io.File;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 
-import junit.framework.Assert;
-
 import org.apache.commons.io.FileUtils;
 import org.junit.After;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 

diff --git a/unit/java/azkaban/test/utils/JsonUtilsTest.java b/unit/java/azkaban/test/utils/JsonUtilsTest.java
index 87c81e9..c12f17c 100644
--- a/unit/java/azkaban/test/utils/JsonUtilsTest.java
+++ b/unit/java/azkaban/test/utils/JsonUtilsTest.java
@@ -5,8 +5,7 @@ import java.io.StringWriter;
 import java.util.HashMap;
 import java.util.Map;
 
-import junit.framework.Assert;
-
+import org.junit.Assert;
 import org.junit.Test;
 
 import azkaban.utils.JSONUtils;

diff --git a/unit/java/azkaban/test/utils/PropsUtilsTest.java b/unit/java/azkaban/test/utils/PropsUtilsTest.java
index e2c914f..1623005 100644
--- a/unit/java/azkaban/test/utils/PropsUtilsTest.java
+++ b/unit/java/azkaban/test/utils/PropsUtilsTest.java
@@ -2,8 +2,7 @@ package azkaban.test.utils;
 
 import java.io.IOException;
 
-import junit.framework.Assert;
-
+import org.junit.Assert;
 import org.junit.Test;
 
 import azkaban.utils.Props;
@@ -88,7 +87,6 @@ public class PropsUtilsTest {
 	
 	private void failIfNotException(Props props) {
 		try {
-			Props resolved = PropsUtils.resolveProps(props);
 			Assert.fail();
 		}
 		catch (UndefinedPropertyException e) {