Author: fmeschbe
Date: Thu Nov 26 15:40:49 2009
New Revision: 884596
URL: http://svn.apache.org/viewvc?rev=884596&view=rev
Log:
SLING-1206 use ISO8601 pattern as second in the list of default patterns
SLING-1207 modify registration of SlingPostServlet
Modified:
sling/trunk/bundles/servlets/post/src/main/java/org/apache/sling/servlets/post/impl/SlingPostServlet.java
sling/trunk/bundles/servlets/post/src/main/resources/OSGI-INF/metatype/metatype.properties
Modified:
sling/trunk/bundles/servlets/post/src/main/java/org/apache/sling/servlets/post/impl/SlingPostServlet.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/servlets/post/src/main/java/org/apache/sling/servlets/post/impl/SlingPostServlet.java?rev=884596&r1=884595&r2=884596&view=diff
==============================================================================
---
sling/trunk/bundles/servlets/post/src/main/java/org/apache/sling/servlets/post/impl/SlingPostServlet.java
(original)
+++
sling/trunk/bundles/servlets/post/src/main/java/org/apache/sling/servlets/post/impl/SlingPostServlet.java
Thu Nov 26 15:40:49 2009
@@ -59,11 +59,13 @@
* @scr.property name="service.vendor" value="The Apache Software Foundation"
*
* Use this as the default servlet for POST requests for Sling
- * @scr.property name="sling.servlet.resourceTypes"
- * value="sling/servlet/default" private="true"
- * @scr.property name="sling.servlet.methods" value="POST" private="true"
* @scr.property name="sling.servlet.prefix" value="-1" type="Integer"
private="true"
*
+ *
+ * @scr.property name="sling.servlet.paths"
+ * values.0="sling/servlet/default/POST"
+ * private="true"
+ *
* Get all SlingPostProcessors
* @scr.reference name="postProcessor"
* interface="org.apache.sling.servlets.post.SlingPostProcessor"
@@ -84,9 +86,10 @@
/**
* @scr.property values.0="EEE MMM dd yyyy HH:mm:ss 'GMT'Z"
- * values.1="yyyy-MM-dd'T'HH:mm:ss.SSSZ"
- * values.2="yyyy-MM-dd'T'HH:mm:ss" values.3="yyyy-MM-dd"
- * values.4="dd.MM.yyyy HH:mm:ss" values.5="dd.MM.yyyy"
+ * values.1="ISO8601"
+ * values.2="yyyy-MM-dd'T'HH:mm:ss.SSSZ"
+ * values.3="yyyy-MM-dd'T'HH:mm:ss" values.4="yyyy-MM-dd"
+ * values.5="dd.MM.yyyy HH:mm:ss" values.6="dd.MM.yyyy"
*/
private static final String PROP_DATE_FORMAT = "servlet.post.dateFormats";
@@ -308,7 +311,13 @@
dateParser = new DateParser();
String[] dateFormats =
OsgiUtil.toStringArray(props.get(PROP_DATE_FORMAT));
for (String dateFormat : dateFormats) {
- dateParser.register(dateFormat);
+ try {
+ dateParser.register(dateFormat);
+ } catch (Throwable t) {
+ log.warn(
+ "activate: Ignoring format {} because it is invalid: {}",
+ dateFormat, t);
+ }
}
}
Modified:
sling/trunk/bundles/servlets/post/src/main/resources/OSGI-INF/metatype/metatype.properties
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/servlets/post/src/main/resources/OSGI-INF/metatype/metatype.properties?rev=884596&r1=884595&r2=884596&view=diff
==============================================================================
---
sling/trunk/bundles/servlets/post/src/main/resources/OSGI-INF/metatype/metatype.properties
(original)
+++
sling/trunk/bundles/servlets/post/src/main/resources/OSGI-INF/metatype/metatype.properties
Thu Nov 26 15:40:49 2009
@@ -28,8 +28,12 @@
servlet to handle POST requests in Sling.
servlet.post.dateFormats.name = Date Format
servlet.post.dateFormats.description = List SimpleDateFormat strings for date \
- formats supported for parsing from request input to data fields. The default \
- value is [ "EEE MMM dd yyyy HH:mm:ss 'GMT'Z", "yyyy-MM-dd'T'HH:mm:ss.SSSZ", \
+ formats supported for parsing from request input to data fields. The special \
+ format "ISO8601" (without the quotes) can be used to designate strict
ISO-8601 \
+ parser which is able to parse strings generated by the Property.getString() \
+ method for Date properties. The default \
+ value is [ "EEE MMM dd yyyy HH:mm:ss 'GMT'Z", "ISO8601", \
+ "yyyy-MM-dd'T'HH:mm:ss.SSSZ", \
"yyyy-MM-dd'T'HH:mm:ss", "yyyy-MM-dd", "dd.MM.yyyy HH:mm:ss", "dd.MM.yyyy" ].
servlet.post.nodeNameHints.name = Node Name Hint Properties
servlet.post.nodeNameHints.description = The list of properties whose values \
