azkaban-uncached

diff --git a/src/java/azkaban/webapp/AzkabanWebServer.java b/src/java/azkaban/webapp/AzkabanWebServer.java
index e92eb47..2ae3ee3 100644
--- a/src/java/azkaban/webapp/AzkabanWebServer.java
+++ b/src/java/azkaban/webapp/AzkabanWebServer.java
@@ -42,6 +42,7 @@ import org.apache.velocity.app.VelocityEngine;
 import org.apache.velocity.runtime.log.Log4JLogChute;
 import org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader;
 import org.apache.velocity.runtime.resource.loader.JarResourceLoader;
+import org.joda.time.DateTime;
 import org.joda.time.DateTimeZone;
 import org.mortbay.jetty.Server;
 import org.mortbay.jetty.bio.SocketConnector;

diff --git a/src/java/azkaban/webapp/servlet/AbstractAzkabanServlet.java b/src/java/azkaban/webapp/servlet/AbstractAzkabanServlet.java
index 0a8415a..6532f9e 100644
--- a/src/java/azkaban/webapp/servlet/AbstractAzkabanServlet.java
+++ b/src/java/azkaban/webapp/servlet/AbstractAzkabanServlet.java
@@ -306,7 +306,7 @@ public abstract class AbstractAzkabanServlet extends HttpServlet {
 		}
 		
 		if(triggerPlugins != null && !triggerPlugins.isEmpty()) {
-			page.add("triggers", triggerPlugins);
+			page.add("triggerPlugins", triggerPlugins);
 		}
 		
 		return page;

diff --git a/src/java/azkaban/webapp/servlet/velocity/flowexecutionpanel.vm b/src/java/azkaban/webapp/servlet/velocity/flowexecutionpanel.vm
index 14f2b42..f0cf6ac 100644
--- a/src/java/azkaban/webapp/servlet/velocity/flowexecutionpanel.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/flowexecutionpanel.vm
@@ -136,9 +136,9 @@
 		<a class="btn2" id="schedule-btn">Schedule</a>
 		#end
 		
-		#if( $triggers.size() > 0 ) 
-			#foreach( $trigger in $triggers )
-			<a class="btn2" id=set-$trigger.pluginName>$trigger.pluginName</a>
+		#if( $triggerPlugins.size() > 0 ) 
+			#foreach( $triggerPlugin in $triggerPlugins )
+			<a class="btn2" id=set-$triggerPlugin.pluginName>$triggerPlugin.pluginName</a>
 			#end
 		#end
 
@@ -152,11 +152,11 @@
 #parse( "azkaban/webapp/servlet/velocity/schedulepanel.vm" )
 #end
 
-#if( $triggers.size() > 0 ) 
-	#foreach( $trigger in $triggers )
-		#set ($prefix = $trigger.pluginName )
-		#set ($webpath = $trigger.pluginPath )
-		#parse( $trigger.inputPanelVM )
+#if( $triggerPlugins.size() > 0 ) 
+	#foreach( $triggerPlugin in $triggerPlugins )
+		#set ($prefix = $triggerPlugin.pluginName )
+		#set ($webpath = $triggerPlugin.pluginPath )
+		#parse( $triggerPlugin.inputPanelVM )
 	#end
 #end
 

diff --git a/src/java/azkaban/webapp/servlet/velocity/nav.vm b/src/java/azkaban/webapp/servlet/velocity/nav.vm
index 2789f31..9326d81 100644
--- a/src/java/azkaban/webapp/servlet/velocity/nav.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/nav.vm
@@ -37,10 +37,10 @@
 					#end
 				#end
 				
-				#foreach($trigger in $triggers)
-					#if(!$trigger.hidden)
-					<li #if($current_page == $trigger.pluginName) class="selected"#end onClick="navMenuClick('$!context/$trigger.pluginPath')">
-						<a href="$!context/$trigger.pluginPath">$trigger.pluginName</a>
+				#foreach($triggerPlugin in $triggerPlugins)
+					#if(!$triggerPlugin.hidden)
+					<li #if($current_page == $triggerPlugin.pluginName) class="selected"#end onClick="navMenuClick('$!context/$triggerPlugin.pluginPath')">
+						<a href="$!context/$triggerPlugin.pluginPath">$triggerPlugin.pluginName</a>
 					</li>
 					#end
 				#end