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 2005/02/14 11:20:45 UTC
svn commit: r153765 -
lenya/trunk/src/java/org/apache/lenya/cms/publication/PageEnvelope.java
Author: andreas
Date: Mon Feb 14 02:20:43 2005
New Revision: 153765
URL: http://svn.apache.org/viewcvs?view=rev&rev=153765
Log:
get area from URL instead of document, add DOCUMENT_TYPE to parameter list
Modified:
lenya/trunk/src/java/org/apache/lenya/cms/publication/PageEnvelope.java
Modified: lenya/trunk/src/java/org/apache/lenya/cms/publication/PageEnvelope.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/publication/PageEnvelope.java?view=diff&r1=153764&r2=153765
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/publication/PageEnvelope.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/publication/PageEnvelope.java Mon Feb 14 02:20:43 2005
@@ -40,10 +40,10 @@
PageEnvelope.DOCUMENT_ID, PageEnvelope.DOCUMENT_NAME, PageEnvelope.DOCUMENT_LABEL,
PageEnvelope.DOCUMENT_URL, PageEnvelope.DOCUMENT_URL_WITHOUT_LANGUAGE,
PageEnvelope.DOCUMENT_PATH, PageEnvelope.DOCUMENT_EXTENSION,
- PageEnvelope.DEFAULT_LANGUAGE, PageEnvelope.DOCUMENT_LANGUAGE,
- PageEnvelope.DOCUMENT_LANGUAGES, PageEnvelope.DOCUMENT_LANGUAGES_CSV,
- PageEnvelope.DOCUMENT_LASTMODIFIED, PageEnvelope.BREADCRUMB_PREFIX,
- PageEnvelope.SSL_PREFIX };
+ 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 };
/**
* <code>PUBLICATION_ID</code> The publication id
*/
@@ -148,6 +148,7 @@
public static final String DEFAULT_PREFIX = "lenya";
private String context;
+ private String area;
/**
* Constructor.
@@ -174,6 +175,10 @@
}
webappURI = ServletHelper.getWebappURI(request);
+
+ URLInformation info = new URLInformation(webappURI);
+ this.area = info.getArea();
+
if (map.getFactory().isDocument(webappURI)) {
Document _document = map.getFactory().getFromURL(webappURI);
setDocument(_document);
@@ -211,7 +216,14 @@
* @return a <code>Publication</code> value
*/
public Publication getPublication() {
- return getDocument().getPublication();
+ return getIdentityMap().getPublication();
+ }
+
+ /**
+ * @return The current area.
+ */
+ public String getArea() {
+ return this.area;
}
/**
@@ -251,7 +263,8 @@
private Document document;
/**
- * Returns the document or <code>null</code> if the current URL does not represent a document.
+ * Returns the document or <code>null</code> if the current URL does not
+ * represent a document.
* @return A document
*/
public Document getDocument() {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org