You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by eg...@apache.org on 2003/08/12 15:32:25 UTC
cvs commit: cocoon-lenya/src/java/org/apache/lenya/cms/cocoon/components/modules/input PageEnvelopeModule.java
egli 2003/08/12 06:32:25
Modified: src/java/org/apache/lenya/cms/publication PageEnvelope.java
src/java/org/apache/lenya/cms/cocoon/components/modules/input
PageEnvelopeModule.java
Log:
Make sure the documents comleteURLWithoutLanguage is exported
via the page envelope module.
Revision Changes Path
1.39 +4 -1 cocoon-lenya/src/java/org/apache/lenya/cms/publication/PageEnvelope.java
Index: PageEnvelope.java
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/cms/publication/PageEnvelope.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- PageEnvelope.java 11 Aug 2003 14:46:28 -0000 1.38
+++ PageEnvelope.java 12 Aug 2003 13:32:25 -0000 1.39
@@ -79,6 +79,7 @@
public static final String DEFAULT_LANGUAGE = "default-language";
public static final String DOCUMENT_ID = "document-id";
public static final String DOCUMENT_URL = "document-url";
+ public static final String DOCUMENT_URL_WITHOUT_LANGUAGE = "document-url-without-language";
public static final String DOCUMENT_FILE = "document-file";
public static final String DOCUMENT_PATH = "document-path";
public static final String DOCUMENT_LANGUAGE = "document-language";
@@ -90,6 +91,7 @@
public static final String DOCUMENT_DC_RIGHTS = "document-dc-rights";
public static final String DOCUMENT_LASTMODIFIED = "document-lastmodified";
public static final String BREADCRUMB_PREFIX = "breadcrumb-prefix";
+
private String context;
/**
@@ -261,6 +263,7 @@
PageEnvelope.PUBLICATION,
PageEnvelope.DOCUMENT_ID,
PageEnvelope.DOCUMENT_URL,
+ PageEnvelope.DOCUMENT_URL_WITHOUT_LANGUAGE,
PageEnvelope.DOCUMENT_PATH,
PageEnvelope.DEFAULT_LANGUAGE,
PageEnvelope.DOCUMENT_LANGUAGE,
1.20 +3 -1 cocoon-lenya/src/java/org/apache/lenya/cms/cocoon/components/modules/input/PageEnvelopeModule.java
Index: PageEnvelopeModule.java
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/cms/cocoon/components/modules/input/PageEnvelopeModule.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- PageEnvelopeModule.java 11 Aug 2003 14:46:27 -0000 1.19
+++ PageEnvelopeModule.java 12 Aug 2003 13:32:25 -0000 1.20
@@ -124,6 +124,8 @@
value = envelope.getDocument().getId();
} else if (name.equals(PageEnvelope.DOCUMENT_URL)) {
value = envelope.getDocument().getDocumentURL();
+ } else if (name.equals(PageEnvelope.DOCUMENT_URL_WITHOUT_LANGUAGE)) {
+ value = envelope.getDocument().getCompleteURLWithoutLanguage();
} else if (name.equals(PageEnvelope.DOCUMENT_PATH)) {
value = envelope.getDocumentPath();
} else if (name.equals(PageEnvelope.DOCUMENT_FILE)) {
---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org