Index: lams_admin/web/WEB-INF/lams.tld
===================================================================
diff -u -r9393c098e5dfd603e2d37347cd1e531a25aa424a -r39ab7e944590b5773efab07a5c5344cd51916efd
--- lams_admin/web/WEB-INF/lams.tld	(.../lams.tld)	(revision 9393c098e5dfd603e2d37347cd1e531a25aa424a)
+++ lams_admin/web/WEB-INF/lams.tld	(.../lams.tld)	(revision 39ab7e944590b5773efab07a5c5344cd51916efd)
@@ -311,7 +311,7 @@
 		<path>/WEB-INF/tags/ExportPortOutput.tag</path>
    	</tag-file>  
 	<tag-file>
-	    <name>DefineLater</name>
-		<path>/WEB-INF/tags/DefineLater.tag</path>
+	    <name>Date</name>
+		<path>/WEB-INF/tags/Date.tag</path>
    	</tag-file>  
 </taglib>
Index: lams_admin/web/WEB-INF/tags/Date.tag
===================================================================
diff -u
--- lams_admin/web/WEB-INF/tags/Date.tag	(revision 0)
+++ lams_admin/web/WEB-INF/tags/Date.tag	(revision 39ab7e944590b5773efab07a5c5344cd51916efd)
@@ -0,0 +1,37 @@
+<% 
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+ 
+ /**
+  *	Author: Fiona Malikoff
+  *	Description: Format a date, using the locale, based on standard parameters.
+  * Need to use long for the date otherwise the AU locale comes out as 1/2/06 and
+  * full is needed to include the timezone.
+  */
+ 
+ %>
+<%@ tag body-content="empty" %>
+<%@ attribute name="value" required="true" rtexprvalue="true" type="java.util.Date" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<fmt:formatDate value="${value}" type="both" dateStyle="long" timeStyle="full" />
+
Index: lams_central/conf/xdoclet/taglib-tag.xml
===================================================================
diff -u -rc277bb1c30c1283b5f66c6f651855c51a5f87bc5 -r39ab7e944590b5773efab07a5c5344cd51916efd
--- lams_central/conf/xdoclet/taglib-tag.xml	(.../taglib-tag.xml)	(revision c277bb1c30c1283b5f66c6f651855c51a5f87bc5)
+++ lams_central/conf/xdoclet/taglib-tag.xml	(.../taglib-tag.xml)	(revision 39ab7e944590b5773efab07a5c5344cd51916efd)
@@ -214,4 +214,9 @@
 	    <name>ExportPortOutput</name>
 		<path>/WEB-INF/tags/ExportPortOutput.tag</path>
    	</tag-file>  
+   	<tag-file>
+	    <name>Date</name>
+		<path>/WEB-INF/tags/Date.tag</path>
+   	</tag-file>  
+   	
    	
\ No newline at end of file
Index: lams_central/web/WEB-INF/lams.tld
===================================================================
diff -u -r97049873e9f5a71cdb4e9286f82508040b597347 -r39ab7e944590b5773efab07a5c5344cd51916efd
--- lams_central/web/WEB-INF/lams.tld	(.../lams.tld)	(revision 97049873e9f5a71cdb4e9286f82508040b597347)
+++ lams_central/web/WEB-INF/lams.tld	(.../lams.tld)	(revision 39ab7e944590b5773efab07a5c5344cd51916efd)
@@ -310,5 +310,9 @@
 	    <name>ExportPortOutput</name>
 		<path>/WEB-INF/tags/ExportPortOutput.tag</path>
    	</tag-file>  
+   	<tag-file>
+	    <name>Date</name>
+		<path>/WEB-INF/tags/Date.tag</path>
+   	</tag-file>  
 
 </taglib>
Index: lams_central/web/WEB-INF/tags/Date.tag
===================================================================
diff -u
--- lams_central/web/WEB-INF/tags/Date.tag	(revision 0)
+++ lams_central/web/WEB-INF/tags/Date.tag	(revision 39ab7e944590b5773efab07a5c5344cd51916efd)
@@ -0,0 +1,37 @@
+<% 
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+ 
+ /**
+  *	Author: Fiona Malikoff
+  *	Description: Format a date, using the locale, based on standard parameters.
+  * Need to use long for the date otherwise the AU locale comes out as 1/2/06 and
+  * full is needed to include the timezone.
+  */
+ 
+ %>
+<%@ tag body-content="empty" %>
+<%@ attribute name="value" required="true" rtexprvalue="true" type="java.util.Date" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<fmt:formatDate value="${value}" type="both" dateStyle="long" timeStyle="full" />
+
Index: lams_central/web/development/datetest.jsp
===================================================================
diff -u
--- lams_central/web/development/datetest.jsp	(revision 0)
+++ lams_central/web/development/datetest.jsp	(revision 39ab7e944590b5773efab07a5c5344cd51916efd)
@@ -0,0 +1,70 @@
+<%@ page language="java" errorPage="/error.jsp" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+	<head>
+	</head>
+	<body>
+
+		<fmt:parseDate var="date" type="both" pattern="yyyyMMddHHmmss">20060201150405</fmt:parseDate>
+
+		<H1>Date Format Test: for 1 Feb 2006 3:04:05PM</H1>
+		
+		<P>Using: dateStyle="medium" timeStyle="long" (same as leaving dateStyle as default)<BR>
+
+		<fmt:setLocale value="en_AU"/>
+		en_AU: <fmt:formatDate value="${date}" type="both" dateStyle="medium" timeStyle="long" /><BR>
+
+		<fmt:setLocale value="en_UK"/>
+		en_UK: <fmt:formatDate value="${date}" type="both" dateStyle="medium" timeStyle="long" /><BR>
+
+		<fmt:setLocale value="cy_UK"/>
+		cy_UK: <fmt:formatDate value="${date}" type="both" dateStyle="medium" timeStyle="long" /><BR>
+
+		<fmt:setLocale value="en_GB"/>
+		en_GB: <fmt:formatDate value="${date}" type="both" dateStyle="medium" timeStyle="long" /><BR>
+
+		<fmt:setLocale value="cy_GB"/>
+		cy_GB: <fmt:formatDate value="${date}" type="both" dateStyle="medium" timeStyle="long" /><BR>
+
+		<fmt:setLocale value="en_US"/>
+		en_US: <fmt:formatDate value="${date}" type="both" dateStyle="medium" timeStyle="long" /><BR>
+
+		<fmt:setLocale value="es_ES"/>
+		es_ES: <fmt:formatDate value="${date}" type="both" dateStyle="medium" timeStyle="long" /><BR>
+
+		<fmt:setLocale value="zh_CN"/>
+		zh_CN: <fmt:formatDate value="${date}" type="both" dateStyle="medium" timeStyle="long" />
+
+		</p>
+					
+		<P>Using: dateStyle="long" timeStyle="full"<BR>
+
+		<fmt:setLocale value="en_AU"/>
+		en_AU: <fmt:formatDate value="${date}" type="both" dateStyle="long" timeStyle="full" /><BR>
+
+		<fmt:setLocale value="en_UK"/>
+		en_UK: <fmt:formatDate value="${date}" type="both" dateStyle="long" timeStyle="full" /><BR>
+
+		<fmt:setLocale value="cy_UK"/>
+		cy_UK: <fmt:formatDate value="${date}" type="both" dateStyle="long" timeStyle="full" /><BR>
+
+		<fmt:setLocale value="en_GB"/>
+		en_GB: <fmt:formatDate value="${date}" type="both" dateStyle="long" timeStyle="full" /><BR>
+
+		<fmt:setLocale value="cy_GB"/>
+		cy_GB: <fmt:formatDate value="${date}" type="both" dateStyle="long" timeStyle="full" /><BR>
+
+		<fmt:setLocale value="en_US"/>
+		en_US: <fmt:formatDate value="${date}" type="both" dateStyle="long" timeStyle="full" /><BR>
+
+		<fmt:setLocale value="zh_CN"/>
+		zh_CN: <fmt:formatDate value="${date}" type="both" dateStyle="long" timeStyle="full" />
+
+		</p>
+	</body>
+</html>
+
Index: lams_tool_forum/web/WEB-INF/lams.tld
===================================================================
diff -u -r9393c098e5dfd603e2d37347cd1e531a25aa424a -r39ab7e944590b5773efab07a5c5344cd51916efd
--- lams_tool_forum/web/WEB-INF/lams.tld	(.../lams.tld)	(revision 9393c098e5dfd603e2d37347cd1e531a25aa424a)
+++ lams_tool_forum/web/WEB-INF/lams.tld	(.../lams.tld)	(revision 39ab7e944590b5773efab07a5c5344cd51916efd)
@@ -311,7 +311,7 @@
 		<path>/WEB-INF/tags/ExportPortOutput.tag</path>
    	</tag-file>  
 	<tag-file>
-	    <name>DefineLater</name>
-		<path>/WEB-INF/tags/DefineLater.tag</path>
+	    <name>Date</name>
+		<path>/WEB-INF/tags/Date.tag</path>
    	</tag-file>  
 </taglib>
Index: lams_tool_forum/web/WEB-INF/tags/Date.tag
===================================================================
diff -u
--- lams_tool_forum/web/WEB-INF/tags/Date.tag	(revision 0)
+++ lams_tool_forum/web/WEB-INF/tags/Date.tag	(revision 39ab7e944590b5773efab07a5c5344cd51916efd)
@@ -0,0 +1,37 @@
+<% 
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+ 
+ /**
+  *	Author: Fiona Malikoff
+  *	Description: Format a date, using the locale, based on standard parameters.
+  * Need to use long for the date otherwise the AU locale comes out as 1/2/06 and
+  * full is needed to include the timezone.
+  */
+ 
+ %>
+<%@ tag body-content="empty" %>
+<%@ attribute name="value" required="true" rtexprvalue="true" type="java.util.Date" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<fmt:formatDate value="${value}" type="both" dateStyle="long" timeStyle="full" />
+