Index: outage/list.jsp
===================================================================
--- outage/list.jsp	(revision 6436)
+++ outage/list.jsp	(working copy)
@@ -47,10 +47,14 @@
 		org.opennms.web.acegisecurity.Authentication,
 		org.opennms.web.outage.filter.*,
 		org.opennms.web.element.ElementUtil,
+		java.util.Date,
 		java.text.DateFormat
 	"
 %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
 
+
 <%--
   This page is written to be the display (view) portion of the OutageQueryServlet
   at the /outage/list URL.  It will not work by itself, as it requires two request
@@ -120,6 +124,9 @@
         <th><%=this.makeSortLink(request, parms, OutageFactory.SortStyle.IFREGAINEDSERVICE, OutageFactory.SortStyle.REVERSE_IFREGAINEDSERVICE, "time service was regained", "Up")%></th>
       </tr>      
       
+      <jsp:useBean id="svcLostTime" class="java.util.Date"/>
+      <jsp:useBean id="svcRegainedTime" class="java.util.Date"/>
+
       <% for( int i=0; i < outages.length; i++ ) { %>        
         <tr class="<%=OutageUtil.getStatusColor(outages[i])%>">
         
@@ -178,7 +185,9 @@
             
           <!-- lost service time -->
           <td class="noWrap">
-						<%=DATE_FORMAT.format(outages[i].getLostServiceTime())%>
+	    <c:set target="${svcLostTime}" property="time" value="<%=outages[i].getLostServiceTime().getTime()%>"/>
+	    <fmt:formatDate value="${svcLostTime}" type="date" dateStyle="short"/>&nbsp;<fmt:formatDate value="${svcLostTime}" type="time" pattern="HH:mm:ss"/>
+						<!-- <%=DATE_FORMAT.format(outages[i].getLostServiceTime())%> -->
               <a href="<%=OutageUtil.makeLink( request, parms, new LostServiceDateAfterFilter(outages[i].getLostServiceTime()), true)%>" title="Only show outages beginning after this one"><%=AFTER_ICON%></a>            
               <a href="<%=OutageUtil.makeLink( request, parms, new LostServiceDateBeforeFilter(outages[i].getLostServiceTime()), true)%>" title="Only show outages beginning before this one"><%=BEFORE_ICON%></a>            
           </td>
@@ -187,7 +196,9 @@
           <% Date regainedTime = outages[i].getRegainedServiceTime(); %>
           <% if(regainedTime != null ) { %>
             <td class="noWrap">
-              <%=DATE_FORMAT.format(outages[i].getRegainedServiceTime())%>
+	      <c:set target="${svcRegainedTime}" property="time" value="<%=outages[i].getRegainedServiceTime().getTime()%>"/>
+	    <fmt:formatDate value="${svcRegainedTime}" type="date" dateStyle="short"/>&nbsp;<fmt:formatDate value="${svcRegainedTime}" type="time" pattern="HH:mm:ss"/>
+              <!-- <%=DATE_FORMAT.format(outages[i].getRegainedServiceTime())%> -->
                 <a href="<%=OutageUtil.makeLink( request, parms, new RegainedServiceDateAfterFilter(outages[i].getRegainedServiceTime()), true)%>" title="Only show outages resolving after this one"><%=AFTER_ICON%></a>            
                 <a href="<%=OutageUtil.makeLink( request, parms, new RegainedServiceDateBeforeFilter(outages[i].getRegainedServiceTime()), true)%>" title="Only show outages resolving before this one"><%=BEFORE_ICON%></a>            
             </td>
Index: outage/current.jsp
===================================================================
--- outage/current.jsp	(revision 6436)
+++ outage/current.jsp	(working copy)
@@ -46,6 +46,8 @@
 		java.util.*
 	"
 %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
 
 <%!  
     protected OutageModel model = new OutageModel();
@@ -130,6 +132,7 @@
 			<th>Outage&nbsp;ID</th>
 		</tr>
 
+	  <jsp:useBean id="svcLostTime" class="java.util.Date"/>
           <% for( int nodeIndex=0; nodeIndex < nodeList.size(); nodeIndex++ ) { %>
             <%
                 int serviceCnt = ((Integer)servicesPerNodeList.get( nodeIndex )).intValue();
@@ -157,7 +160,10 @@
                   <% } %>
                     
                   <td><a href="element/service.jsp?node=<%=nodeId%>&intf=<%=ipAddr%>&service=<%=outage.getServiceId()%>"><%=outage.getServiceName()%></a></td>
-                  <td><%=org.opennms.netmgt.EventConstants.formatToUIString(outage.getTimeDown())%></td>
+	          <c:set target="${svcLostTime}" property="time" value="<%=outage.getTimeDown().getTime()%>"/>
+		  <td>
+	          <fmt:formatDate value="${svcLostTime}" type="date" dateStyle="short"/>&nbsp;<fmt:formatDate value="${svcLostTime}" type="time" pattern="HH:mm:ss"/>
+		  </td>
                   <td><a href="outage/detail.jsp?id=<%=outageId%>"><%=outageId%></a></td>
                 </tr>
               <% } /* endfor service */ %>
Index: alarm/list-long.jsp
===================================================================
--- alarm/list-long.jsp	(revision 6436)
+++ alarm/list-long.jsp	(working copy)
@@ -53,6 +53,8 @@
 		org.opennms.web.alarm.filter.*
 		"
 %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
 
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
 
@@ -274,6 +276,8 @@
 						<th width="17%"><%=this.makeSortLink( parms, AlarmFactory.SortStyle.FIRSTEVENTTIME,  AlarmFactory.SortStyle.REVERSE_FIRSTEVENTTIME,  "firsteventtime",  "First Event Time"  )%></th>
 					</tr>
 				</thead>
+      <jsp:useBean id="lastEventTime" class="java.util.Date"/>
+      <jsp:useBean id="firstEventTime" class="java.util.Date"/>
       <% for( int i=0; i < alarms.length; i++ ) { 
       	Alarm alarm = alarms[i];
       	pageContext.setAttribute("alarm", alarm);
@@ -365,14 +369,16 @@
             <% } %>
           </td>
           <td class="divider">
-            <nobr><span title="Event <%= alarms[i].getLastEventID() %>"><a href="event/detail.jsp?id=<%= alarms[i].getLastEventID() %>"><%=org.opennms.netmgt.EventConstants.formatToUIString(alarms[i].getLastEventTime())%></a></span></nobr>
+	    <c:set target="${lastEventTime}" property="time" value="<%=alarms[i].getLastEventTime().getTime()%>"/>
+            <nobr><span title="Event <%= alarms[i].getLastEventID() %>"><a href="event/detail.jsp?id=<%= alarms[i].getLastEventID() %>"><fmt:formatDate value="${lastEventTime}" type="date" dateStyle="short"/>&nbsp;<fmt:formatDate value="${lastEventTime}" type="time" pattern="HH:mm:ss"/></a></span></nobr>
             <nobr>
               <a href="<%=this.makeLink( parms, new AfterLastEventTimeFilter(alarms[i].getLastEventTime()), true)%>"  class="filterLink" title="Only show alarms occurring after this one">${addAfterFilter}</a>            
               <a href="<%=this.makeLink( parms, new BeforeLastEventTimeFilter(alarms[i].getLastEventTime()), true)%>" class="filterLink" title="Only show alarms occurring before this one">${addBeforeFilter}</a>
             </nobr>
           </td>
           <td class="divider">
-            <nobr><%=org.opennms.netmgt.EventConstants.formatToUIString(alarms[i].getFirstEventTime())%></nobr>
+	    <c:set target="${firstEventTime}" property="time" value="<%=alarms[i].getFirstEventTime().getTime()%>"/>
+            <nobr><fmt:formatDate value="${lastEventTime}" type="date" dateStyle="short"/>&nbsp;<fmt:formatDate value="${lastEventTime}" type="time" pattern="HH:mm:ss"/></nobr>
             <nobr>
               <a href="<%=this.makeLink( parms, new AfterFirstEventTimeFilter(alarms[i].getFirstEventTime()), true)%>"  class="filterLink" title="Only show alarms occurring after this one">${addAfterFilter}</a>            
               <a href="<%=this.makeLink( parms, new BeforeFirstEventTimeFilter(alarms[i].getFirstEventTime()), true)%>" class="filterLink" title="Only show alarms occurring before this one">${addBeforeFilter}</a>
Index: alarm/list.jsp
===================================================================
--- alarm/list.jsp	(revision 6436)
+++ alarm/list.jsp	(working copy)
@@ -53,6 +53,8 @@
 		org.opennms.web.alarm.filter.*
 		"
 %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
 
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
 
@@ -276,6 +278,8 @@
 		</tr>
 	</thead>
 
+      <jsp:useBean id="lastEventTime" class="java.util.Date"/>
+      <jsp:useBean id="firstEventTime" class="java.util.Date"/>
       <% for( int i=0; i < alarms.length; i++ ) { 
       	Alarm alarm = alarms[i];
       	pageContext.setAttribute("alarm", alarm);
@@ -377,13 +381,15 @@
             <% } %>
           </td>
           <td class="divider">
-            <nobr><span title="Event <%= alarms[i].getLastEventID() %>"><a href="event/detail.jsp?id=<%= alarms[i].getLastEventID() %>"><%=org.opennms.netmgt.EventConstants.formatToUIString(alarms[i].getLastEventTime())%></a></span></nobr>
+	    <c:set target="${lastEventTime}" property="time" value="<%=alarms[i].getLastEventTime().getTime()%>"/>
+            <nobr><span title="Event <%= alarms[i].getLastEventID() %>"><a href="event/detail.jsp?id=<%= alarms[i].getLastEventID() %>"><fmt:formatDate value="${lastEventTime}" type="date" dateStyle="short"/>&nbsp;<fmt:formatDate value="${lastEventTime}" type="time" pattern="HH:mm:ss"/></a></span></nobr>
             <nobr>
               <a href="<%=this.makeLink( parms, new AfterLastEventTimeFilter(alarms[i].getLastEventTime()), true)%>"  class="filterLink" title="Only show alarms occurring after this one">${addAfterFilter}</a>            
               <a href="<%=this.makeLink( parms, new BeforeLastEventTimeFilter(alarms[i].getLastEventTime()), true)%>" class="filterLink" title="Only show alarms occurring before this one">${addBeforeFilter}</a>
             </nobr>
           <br />
-            <nobr><%=org.opennms.netmgt.EventConstants.formatToUIString(alarms[i].getFirstEventTime())%></nobr>
+	    <c:set target="${firstEventTime}" property="time" value="<%=alarms[i].getFirstEventTime().getTime()%>"/>
+            <nobr><fmt:formatDate value="${lastEventTime}" type="date" dateStyle="short"/>&nbsp;<fmt:formatDate value="${lastEventTime}" type="time" pattern="HH:mm:ss"/></nobr>
             <nobr>
               <a href="<%=this.makeLink( parms, new AfterFirstEventTimeFilter(alarms[i].getFirstEventTime()), true)%>"  class="filterLink" title="Only show alarms occurring after this one">${addAfterFilter}</a>            
               <a href="<%=this.makeLink( parms, new BeforeFirstEventTimeFilter(alarms[i].getFirstEventTime()), true)%>" class="filterLink" title="Only show alarms occurring before this one">${addBeforeFilter}</a>
Index: includes/eventlist.jsp
===================================================================
--- includes/eventlist.jsp	(revision 6436)
+++ includes/eventlist.jsp	(working copy)
@@ -54,9 +54,12 @@
 	session="true"
 	import="org.opennms.web.event.*,
 		org.opennms.web.acegisecurity.Authentication,
-		org.opennms.web.MissingParameterException
+		org.opennms.web.MissingParameterException,
+		java.util.Date
 	"
 %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
 
 <%
     //required parameter: node
@@ -171,6 +174,7 @@
 
 <h3><%=header%></h3>
 <table class="standard">
+<jsp:useBean id="eventTime" class="java.util.Date"/>
 
 <%
    for( int i=0; i < events.length; i++ ) {
@@ -185,7 +189,8 @@
              </nobr>
            </td>
        <% } %>
-       <td class="divider"><%=org.opennms.netmgt.EventConstants.formatToUIString(events[i].getTime())%></td>
+       <c:set target="${eventTime}" property="time" value="<%=events[i].getTime().getTime()%>"/>
+       <td class="divider"><fmt:formatDate value="${eventTime}" type="date" dateStyle="short"/>&nbsp;<fmt:formatDate value="${eventTime}" type="time" pattern="HH:mm:ss"/></td>
        <td class="divider bright"><%=EventUtil.getSeverityLabel(severity)%></td>
        <td class="divider"><%=events[i].getLogMessage()%></td>
      </tr>
Index: includes/interfaceOutages-box.jsp
===================================================================
--- includes/interfaceOutages-box.jsp	(revision 6436)
+++ includes/interfaceOutages-box.jsp	(working copy)
@@ -53,6 +53,8 @@
 		java.util.*
 	"
 %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
 
 <%! 
     OutageModel model = new OutageModel();
@@ -76,6 +78,8 @@
 <h3>Recent Outages</h3>
 
 <table>
+<jsp:useBean id="svcLostTime" class="java.util.Date"/>
+<jsp:useBean id="svcRegainedTime" class="java.util.Date"/>
 
 <% if(outages.length == 0) { %>
   <tr>
@@ -95,11 +99,13 @@
        <tr class="Cleared">
      <% } %>
       <td class="divider"><a href="element/service.jsp?node=<%=nodeId%>&intf=<%=outages[i].getIpAddress()%>&service=<%=outages[i].getServiceId()%>"><%=outages[i].getServiceName()%></a></td>
-      <td class="divider"><%=EventConstants.formatToUIString(outages[i].getLostServiceTime())%></td>
+      <c:set target="${svcLostTime}" property="time" value="<%=outages[i].getLostServiceTime().getTime()%>"/>
+      <td class="divider"><fmt:formatDate value="${svcLostTime}" type="date" dateStyle="short"/>&nbsp;<fmt:formatDate value="${svcLostTime}" type="time" pattern="HH:mm:ss"/></td>
       <% if( outages[i].getRegainedServiceTime() == null ) { %>
         <td class="divider"><b>DOWN</b></td>
       <% } else { %>        
-        <td class="divider"><%=EventConstants.formatToUIString(outages[i].getRegainedServiceTime())%></td>
+        <c:set target="${svcRegainedTime}" property="time" value="<%=outages[i].getRegainedServiceTime().getTime()%>"/>
+        <td class="divider"><fmt:formatDate value="${svcLostTime}" type="date" dateStyle="short"/>&nbsp;<fmt:formatDate value="${svcLostTime}" type="time" pattern="HH:mm:ss"/></td>
       <% } %>
       <td class="divider"><a href="outage/detail.jsp?id=<%=outages[i].getId()%>"><%=outages[i].getId()%></a></td>  
      </tr>
Index: includes/serviceOutages-box.jsp
===================================================================
--- includes/serviceOutages-box.jsp	(revision 6436)
+++ includes/serviceOutages-box.jsp	(working copy)
@@ -52,6 +52,8 @@
 		java.util.*
 	"
 %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
 
 <%! 
     OutageModel m_model = new OutageModel();
@@ -76,6 +78,8 @@
 <h3>Recent Outages</h3>
 
 <table>
+<jsp:useBean id="svcLostTime" class="java.util.Date"/>
+<jsp:useBean id="svcRegainedTime" class="java.util.Date"/>
 
 <% if (outages.length == 0) { %>
   <td colspan="3">There have been no outages on this service in the last 24 hours.</td>
@@ -87,8 +91,14 @@
   </tr>
   <%  for(int i=0; i < outages.length; i++) { %>
      <tr class="<%=(outages[i].getRegainedServiceTime() == null) ? "Critical" : "Normal"%>">
-      <td class="divider"><%=EventConstants.formatToUIString(outages[i].getLostServiceTime())%></td>
-      <td  class="divider bright"><%=(outages[i].getRegainedServiceTime() == null) ? "DOWN" : EventConstants.formatToUIString(outages[i].getRegainedServiceTime())%></td>
+       <c:set target="${svcLostTime}" property="time" value="<%=outages[i].getLostServiceTime().getTime()%>"/>
+      <td class="divider"><fmt:formatDate value="${svcLostTime}" type="date" dateStyle="short"/>&nbsp;<fmt:formatDate value="${svcLostTime}" type="time" pattern="HH:mm:ss"/></td>
+      <% if( outages[i].getRegainedServiceTime() == null ) { %>
+        <td class="divider bright"><b>DOWN</b></td>
+      <% } else { %>
+        <c:set target="${svcRegainedTime}" property="time" value="<%=outages[i].getRegainedServiceTime().getTime()%>"/>
+        <td class="divider bright"><fmt:formatDate value="${svcLostTime}" type="date" dateStyle="short"/>&nbsp;<fmt:formatDate value="${svcLostTime}" type="time" pattern="HH:mm:ss"/></td>      
+      <% } %>
       <td class="divider"><a href="outage/detail.jsp?id=<%=outages[i].getId()%>"><%=outages[i].getId()%></a></td>
     </tr>
   <% } %>
Index: includes/nodeOutages-box.jsp
===================================================================
--- includes/nodeOutages-box.jsp	(revision 6436)
+++ includes/nodeOutages-box.jsp	(working copy)
@@ -48,6 +48,8 @@
 --%>
 
 <%@page language="java" contentType="text/html" session="true" import="org.opennms.web.outage.*,java.util.*" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
 
 <%! 
     OutageModel model = new OutageModel();
@@ -75,6 +77,8 @@
 
 <h3>Recent Outages</h3>
 <table>
+<jsp:useBean id="svcLostTime" class="java.util.Date"/>
+<jsp:useBean id="svcRegainedTime" class="java.util.Date"/>
 <% if(outages.length == 0) { %>
   <tr>
     <td>There have been no outages on this node in the last 24 hours.</td>
@@ -96,12 +100,14 @@
     <% } %>
       <td class="divider"><a href="element/interface.jsp?node=<%=nodeId%>&intf=<%=outages[i].getIpAddress()%>"><%=outages[i].getIpAddress()%></a></td>
       <td class="divider"><a href="element/service.jsp?node=<%=nodeId%>&intf=<%=outages[i].getIpAddress()%>&service=<%=outages[i].getServiceId()%>"><%=outages[i].getServiceName()%></a></td>
-      <td class="divider"><%=org.opennms.netmgt.EventConstants.formatToUIString(outages[i].getLostServiceTime())%></td>
+       <c:set target="${svcLostTime}" property="time" value="<%=outages[i].getLostServiceTime().getTime()%>"/>
+      <td class="divider"><fmt:formatDate value="${svcLostTime}" type="date" dateStyle="short"/>&nbsp;<fmt:formatDate value="${svcLostTime}" type="time" pattern="HH:mm:ss"/></td>
       
       <% if( outages[i].getRegainedServiceTime() == null ) { %>
         <td class="divider bright"><b>DOWN</b></td>
       <% } else { %>
-        <td class="divider bright"><%=org.opennms.netmgt.EventConstants.formatToUIString(outages[i].getRegainedServiceTime())%></td>      
+        <c:set target="${svcRegainedTime}" property="time" value="<%=outages[i].getRegainedServiceTime().getTime()%>"/>
+        <td class="divider bright"><fmt:formatDate value="${svcLostTime}" type="date" dateStyle="short"/>&nbsp;<fmt:formatDate value="${svcLostTime}" type="time" pattern="HH:mm:ss"/></td>      
       <% } %>
       <td class="divider"><a href="outage/detail.jsp?id=<%=outages[i].getId()%>"><%=outages[i].getId()%></a></td>       
     </tr>
Index: event/list.jsp
===================================================================
--- event/list.jsp	(revision 6436)
+++ event/list.jsp	(working copy)
@@ -54,6 +54,8 @@
 		org.opennms.web.admin.notification.noticeWizard.*
 	"
 %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
 
 <%--
   This page is written to be the display (view) portion of the EventQueryServlet
@@ -262,6 +264,7 @@
           <th width="10%">Ackd</th>
         </tr>
         </thead>     
+      <jsp:useBean id="eventTime" class="java.util.Date"/>
       <% for( int i=0; i < events.length; i++ ) { %>        
         <tr valign="top" class="<%=EventUtil.getSeverityLabel(events[i].getSeverity())%>">
           <% if( !(request.isUserInRole( Authentication.READONLY_ROLE ))) { %>
@@ -284,8 +287,9 @@
               </nobr>
             <% } %>
           </td>
+	  <c:set target="${eventTime}" property="time" value="<%=events[i].getTime().getTime()%>"/>
           <td class="divider">
-            <nobr><%=org.opennms.netmgt.EventConstants.formatToUIString(events[i].getTime())%></nobr>
+            <nobr><fmt:formatDate value="${eventTime}" type="date" dateStyle="short"/>&nbsp;<fmt:formatDate value="${eventTime}" type="time" pattern="HH:mm:ss"/></nobr>
             <nobr>
               <a href="<%=this.makeLink( parms, new AfterDateFilter(events[i].getTime()), true)%>"  class="filterLink" title="Only show events occurring after this one"><%=addAfterDateFilterString%></a>            
               <a href="<%=this.makeLink( parms, new BeforeDateFilter(events[i].getTime()), true)%>" class="filterLink" title="Only show events occurring before this one"><%=addBeforeDateFilterString%></a>