You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by ch...@apache.org on 2006/07/18 17:57:44 UTC
svn commit: r423122 - in /lenya/trunk/src:
impl/java/org/apache/lenya/cms/publication/
java/org/apache/lenya/cms/cocoon/components/modules/input/
java/org/apache/lenya/cms/publication/
Author: chestnut
Date: Tue Jul 18 08:57:43 2006
New Revision: 423122
URL: http://svn.apache.org/viewvc?rev=423122&view=rev
Log:
Document and ResourceType should return Date object instead of a formatted String
Modified:
lenya/trunk/src/impl/java/org/apache/lenya/cms/publication/DocumentImpl.java
lenya/trunk/src/impl/java/org/apache/lenya/cms/publication/ResourceTypeImpl.java
lenya/trunk/src/java/org/apache/lenya/cms/cocoon/components/modules/input/DocumentInfoModule.java
lenya/trunk/src/java/org/apache/lenya/cms/cocoon/components/modules/input/ResourceTypeModule.java
lenya/trunk/src/java/org/apache/lenya/cms/publication/Document.java
lenya/trunk/src/java/org/apache/lenya/cms/publication/ResourceType.java
Modified: lenya/trunk/src/impl/java/org/apache/lenya/cms/publication/DocumentImpl.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/impl/java/org/apache/lenya/cms/publication/DocumentImpl.java?rev=423122&r1=423121&r2=423122&view=diff
==============================================================================
--- lenya/trunk/src/impl/java/org/apache/lenya/cms/publication/DocumentImpl.java (original)
+++ lenya/trunk/src/impl/java/org/apache/lenya/cms/publication/DocumentImpl.java Tue Jul 18 08:57:43 2006
@@ -86,8 +86,8 @@
/**
* @see org.apache.lenya.cms.publication.Document#getExpires()
*/
- public String getExpires() throws DocumentException {
- String expires = null;
+ public Date getExpires() throws DocumentException {
+ Date expires = null;
long secs = 0;
MetaData metaData = null;
@@ -100,13 +100,14 @@
}
if (expiresMeta != null) {
secs = Long.parseLong(expiresMeta);
+ } else {
+ secs = -1;
}
- if (secs != 0) {
+ if (secs != -1) {
Date date = new Date();
date.setTime(date.getTime() + secs * 1000l);
- SimpleDateFormat sdf = new SimpleDateFormat("EEE, dd MMM yyyy kk:mm:ss zzz");
- expires = sdf.format(date);
+ expires = date;
} else {
expires = this.getResourceType().getExpires();
}
Modified: lenya/trunk/src/impl/java/org/apache/lenya/cms/publication/ResourceTypeImpl.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/impl/java/org/apache/lenya/cms/publication/ResourceTypeImpl.java?rev=423122&r1=423121&r2=423122&view=diff
==============================================================================
--- lenya/trunk/src/impl/java/org/apache/lenya/cms/publication/ResourceTypeImpl.java (original)
+++ lenya/trunk/src/impl/java/org/apache/lenya/cms/publication/ResourceTypeImpl.java Tue Jul 18 08:57:43 2006
@@ -113,11 +113,10 @@
}
- public String getExpires() {
+ public Date getExpires() {
Date date = new Date();
date.setTime(date.getTime() + this.expires * 1000l);
- SimpleDateFormat sdf = new SimpleDateFormat("EEE, dd MMM yyyy kk:mm:ss zzz");
- return sdf.format(date);
+ return date;
}
public Schema getSchema() {
Modified: lenya/trunk/src/java/org/apache/lenya/cms/cocoon/components/modules/input/DocumentInfoModule.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/java/org/apache/lenya/cms/cocoon/components/modules/input/DocumentInfoModule.java?rev=423122&r1=423121&r2=423122&view=diff
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/cocoon/components/modules/input/DocumentInfoModule.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/cocoon/components/modules/input/DocumentInfoModule.java Tue Jul 18 08:57:43 2006
@@ -137,7 +137,9 @@
+ name + "]");
} else if (attribute.equals(EXPIRES)) {
try {
- value = document.getExpires();
+ Date expires = document.getExpires();
+ SimpleDateFormat sdf = new SimpleDateFormat("EEE, dd MMM yyyy kk:mm:ss zzz");
+ value = sdf.format(expires);
} catch (DocumentException e) {
throw new ConfigurationException("Error getting expires date from document.", e);
}
Modified: lenya/trunk/src/java/org/apache/lenya/cms/cocoon/components/modules/input/ResourceTypeModule.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/java/org/apache/lenya/cms/cocoon/components/modules/input/ResourceTypeModule.java?rev=423122&r1=423121&r2=423122&view=diff
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/cocoon/components/modules/input/ResourceTypeModule.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/cocoon/components/modules/input/ResourceTypeModule.java Tue Jul 18 08:57:43 2006
@@ -99,7 +99,9 @@
String prefix = request.getContextPath();
value = transformFallbackUriToHttp(pub.getId(), prefix, uri);
} else if (attribute.equals(EXPIRES)) {
- value = resourceType.getExpires();
+ Date expires = resourceType.getExpires();
+ SimpleDateFormat sdf = new SimpleDateFormat("EEE, dd MMM yyyy kk:mm:ss zzz");
+ value = sdf.format(expires);
} else {
throw new ConfigurationException("Attribute [" + name + "] not supported!");
}
Modified: lenya/trunk/src/java/org/apache/lenya/cms/publication/Document.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/java/org/apache/lenya/cms/publication/Document.java?rev=423122&r1=423121&r2=423122&view=diff
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/publication/Document.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/publication/Document.java Tue Jul 18 08:57:43 2006
@@ -55,7 +55,7 @@
* Returns the date at which point the requested document is considered expired
* @return a string in RFC 1123 date format
*/
- String getExpires() throws DocumentException;
+ Date getExpires() throws DocumentException;
/**
* Returns the document ID of this document.
Modified: lenya/trunk/src/java/org/apache/lenya/cms/publication/ResourceType.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/java/org/apache/lenya/cms/publication/ResourceType.java?rev=423122&r1=423121&r2=423122&view=diff
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/publication/ResourceType.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/publication/ResourceType.java Tue Jul 18 08:57:43 2006
@@ -32,6 +32,7 @@
*/
package org.apache.lenya.cms.publication;
+import java.util.Date;
import org.apache.lenya.xml.Schema;
/**
@@ -48,7 +49,7 @@
* Returns the date at which point the requested resource is considered expired
* @return a string in RFC 1123 date format
*/
- String getExpires();
+ Date getExpires();
/**
* Returns the name of this document type.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org