Author: rgoers Date: Thu Nov 25 23:49:19 2004 New Revision: 106642 URL: http://svn.apache.org/viewcvs?view=rev&rev=106642 Log: Implement enhancement for bug 28360.
Modified: cocoon/trunk/src/java/org/apache/cocoon/components/modules/input/DateInputModule.java cocoon/trunk/src/webapp/samples/modules/sitemap.xmap cocoon/trunk/status.xml Modified: cocoon/trunk/src/java/org/apache/cocoon/components/modules/input/DateInputModule.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/components/modules/input/DateInputModule.java?view=diff&rev=106642&p1=cocoon/trunk/src/java/org/apache/cocoon/components/modules/input/DateInputModule.java&r1=106641&p2=cocoon/trunk/src/java/org/apache/cocoon/components/modules/input/DateInputModule.java&r2=106642 ============================================================================== --- cocoon/trunk/src/java/org/apache/cocoon/components/modules/input/DateInputModule.java (original) +++ cocoon/trunk/src/java/org/apache/cocoon/components/modules/input/DateInputModule.java Thu Nov 25 23:49:19 2004 @@ -34,7 +34,7 @@ * root node or nested <format/> tag on module declaration. * * @author <a href="mailto:[EMAIL PROTECTED]">Christian Haul</a> - * @version CVS $Id: DateInputModule.java,v 1.3 2004/03/05 13:02:48 bdelacretaz Exp $ + * @version CVS $Id$ * @see java.text.SimpleDateFormat */ public class DateInputModule extends AbstractInputModule implements ThreadSafe { @@ -48,7 +48,7 @@ public Object getAttribute( String name, Configuration modeConf, Map objectModel ) throws ConfigurationException { - String format = (String) this.settings.get("format",null); + String format = (String) this.settings.get("format",name); if (modeConf != null) { format = modeConf.getAttribute("format", format); // this is preferred: @@ -58,7 +58,11 @@ if (format==null) { return new Date(); } else { - return new SimpleDateFormat(format).format(new Date()); + try { + return new SimpleDateFormat(format).format(new Date()); + } catch (Exception e) { + return new Date(); + } } } Modified: cocoon/trunk/src/webapp/samples/modules/sitemap.xmap Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/webapp/samples/modules/sitemap.xmap?view=diff&rev=106642&p1=cocoon/trunk/src/webapp/samples/modules/sitemap.xmap&r1=106641&p2=cocoon/trunk/src/webapp/samples/modules/sitemap.xmap&r2=106642 ============================================================================== --- cocoon/trunk/src/webapp/samples/modules/sitemap.xmap (original) +++ cocoon/trunk/src/webapp/samples/modules/sitemap.xmap Thu Nov 25 23:49:19 2004 @@ -19,7 +19,7 @@ | Input Modules sample sitemap. | Author: Konstantin Piroumian "[EMAIL PROTECTED]" | - | $Id: sitemap.xmap,v 1.13 2004/07/07 02:37:01 vgritsenko Exp $ + | $Id$ +--> <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0";> @@ -262,12 +262,14 @@ <map:match pattern="content/date.xml"> <map:generate type="jx" src="properties.xml"> - <map:parameter name="date" value="{date:date}"/> + <map:parameter name="format-in-cocoon.xconf" value="{date:date}"/> + <map:parameter name="format-inline" value="{date:MMM d, yyyy}"/> </map:generate> <map:transform src="properties2html.xsl"> <map:parameter name="title" value="Date Input module (DateMetaModule)"/> <map:parameter name="description" value="Returns the current - date and time. The format is specified in cocoon.xconf"/> + date and time. The format is specified in cocoon.xconf or as the + data specified in the input module reference"/> </map:transform> <map:serialize/> </map:match> Modified: cocoon/trunk/status.xml Url: http://svn.apache.org/viewcvs/cocoon/trunk/status.xml?view=diff&rev=106642&p1=cocoon/trunk/status.xml&r1=106641&p2=cocoon/trunk/status.xml&r2=106642 ============================================================================== --- cocoon/trunk/status.xml (original) +++ cocoon/trunk/status.xml Thu Nov 25 23:49:19 2004 @@ -389,6 +389,9 @@ </action> </release> <release version="2.1.7" date="TBD"> + <action dev="RG" type="update" fixes-bug="28360" due-to="Nico Verwer" due-to-email="[EMAIL PROTECTED]"> + DateInputModule now accepts date format string when specified in a sitemap. + </action> <action dev="RG" type="add"> Portal: Added support for storing JSR-168 Portlet preferences. </action>
