import java.io.Reader;
import java.net.URISyntaxException;
import java.net.URL;
+import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.LinkedList;
import java.util.Map;
}
if (s instanceof Outputable) {
((Outputable) s).output(out, l, vars);
- } else if (s instanceof Date) {
+ } else if (s instanceof java.sql.Date) {
out.print(DateSelector.getDateFormat().format(s));
+ } else if (s instanceof Date) {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ out.print(sdf.format(s));
+ out.print(" UTC");
} else {
out.print(s == null ? "null" : (unescaped ? s.toString() : HTMLEncoder.encodeHTML(s.toString())));
}