You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2008/06/18 16:27:40 UTC
svn commit: r669185 - in /lenya/trunk/src:
java/org/apache/lenya/cms/cocoon/components/modules/input/PageEnvelopeModule.java
java/org/apache/lenya/cms/publication/PageEnvelope.java
pubs/default/sitemap.xmap
Author: andreas
Date: Wed Jun 18 07:27:40 2008
New Revision: 669185
URL: http://svn.apache.org/viewvc?rev=669185&view=rev
Log:
Adding document-mime-type attribute to page envelope module, set Content-Type header when serving binary documents.
Modified:
lenya/trunk/src/java/org/apache/lenya/cms/cocoon/components/modules/input/PageEnvelopeModule.java
lenya/trunk/src/java/org/apache/lenya/cms/publication/PageEnvelope.java
lenya/trunk/src/pubs/default/sitemap.xmap
Modified: lenya/trunk/src/java/org/apache/lenya/cms/cocoon/components/modules/input/PageEnvelopeModule.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/java/org/apache/lenya/cms/cocoon/components/modules/input/PageEnvelopeModule.java?rev=669185&r1=669184&r2=669185&view=diff
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/cocoon/components/modules/input/PageEnvelopeModule.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/cocoon/components/modules/input/PageEnvelopeModule.java Wed Jun 18 07:27:40 2008
@@ -127,6 +127,8 @@
} else if (name.equals(PageEnvelope.DOCUMENT_LASTMODIFIED)) {
Date date = new Date(document.getLastModified());
value = new SimpleDateFormat(DATE_FORMAT).format(date);
+ } else if (name.equals(PageEnvelope.DOCUMENT_MIME_TYPE)) {
+ value = document.getMimeType();
} else if (name.equals(PageEnvelope.DOCUMENT_TYPE)) {
ResourceType resourceType = document.getResourceType();
if (resourceType == null) {
Modified: lenya/trunk/src/java/org/apache/lenya/cms/publication/PageEnvelope.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/java/org/apache/lenya/cms/publication/PageEnvelope.java?rev=669185&r1=669184&r2=669185&view=diff
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/publication/PageEnvelope.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/publication/PageEnvelope.java Wed Jun 18 07:27:40 2008
@@ -44,7 +44,8 @@
PageEnvelope.DOCUMENT_UUID, PageEnvelope.DOCUMENT_TYPE, PageEnvelope.DEFAULT_LANGUAGE,
PageEnvelope.DOCUMENT_LANGUAGE, PageEnvelope.DOCUMENT_LANGUAGES,
PageEnvelope.DOCUMENT_LANGUAGES_CSV, PageEnvelope.DOCUMENT_LASTMODIFIED,
- PageEnvelope.BREADCRUMB_PREFIX, PageEnvelope.SSL_PREFIX, PageEnvelope.LANGUAGE };
+ PageEnvelope.BREADCRUMB_PREFIX, PageEnvelope.SSL_PREFIX, PageEnvelope.LANGUAGE,
+ PageEnvelope.DOCUMENT_MIME_TYPE };
/**
* <code>PUBLICATION_ID</code> The publication id
*/
@@ -109,6 +110,7 @@
public static final String DOCUMENT_URL_WITHOUT_LANGUAGE = "document-url-without-language";
/**
* <code>DOCUMENT_FILE</code> The file of the current document
+ * @deprecated Reference a document via the lenya-document: URI instead.
*/
public static final String DOCUMENT_FILE = "document-file";
/**
@@ -124,6 +126,10 @@
*/
public static final String DOCUMENT_SOURCE_EXTENSION = "document-source-extension";
/**
+ * <code>DOCUMENT_MIME_TYPE</code> The MIME type of the current document
+ */
+ public static final String DOCUMENT_MIME_TYPE = "document-mime-type";
+ /**
* <code>DOCUMENT_UUID</code> The uuid of the current document
*/
public static final String DOCUMENT_UUID = "document-uuid";
Modified: lenya/trunk/src/pubs/default/sitemap.xmap
URL: http://svn.apache.org/viewvc/lenya/trunk/src/pubs/default/sitemap.xmap?rev=669185&r1=669184&r2=669185&view=diff
==============================================================================
--- lenya/trunk/src/pubs/default/sitemap.xmap (original)
+++ lenya/trunk/src/pubs/default/sitemap.xmap Wed Jun 18 07:27:40 2008
@@ -355,7 +355,8 @@
</map:read>
</map:match>
<!-- Documents other than *.html are served as-is and do not require processing: -->
- <map:read src="lenya-document:{page-envelope:document-uuid},lang={page-envelope:document-language}{link:rev}"/>
+ <map:read src="lenya-document:{page-envelope:document-uuid},lang={page-envelope:document-language}{link:rev}"
+ mime-type="{page-envelope:document-mime-type}"/>
</map:act>
<!--
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org