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/11/03 17:46:33 UTC
cvs commit: cocoon-lenya/src/webapp/lenya/content/info delete.xsp archive.xsp
egli 2003/11/03 08:46:33
Modified: src/webapp/lenya/content/info delete.xsp archive.xsp
Log:
Adapted to new DocumentReferencesHelper interface.
Revision Changes Path
1.9 +4 -3 cocoon-lenya/src/webapp/lenya/content/info/delete.xsp
Index: delete.xsp
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/content/info/delete.xsp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- delete.xsp 29 Oct 2003 15:33:47 -0000 1.8
+++ delete.xsp 3 Nov 2003 16:46:32 -0000 1.9
@@ -10,6 +10,7 @@
<xsp:structure>
<xsp:include>org.apache.lenya.cms.publication.Publication</xsp:include>
<xsp:include>org.apache.lenya.cms.publication.DocumentHelper</xsp:include>
+ <xsp:include>org.apache.lenya.cms.publication.Document</xsp:include>
<xsp:include>org.apache.lenya.cms.publication.xsp.DocumentReferencesHelper</xsp:include>
</xsp:structure>
@@ -27,14 +28,14 @@
DocumentReferencesHelper helper = new DocumentReferencesHelper(objectModel);
- String[] references = helper.getReferences(Publication.LIVE_AREA);
+ Document[] references = helper.getReferences(Publication.LIVE_AREA);
if (references.length > 0) {
</xsp:logic><inconsistent-documents><xsp:logic>
for (int i = 0; i < references.length; i++) {
<inconsistent-document>
- <xsp:attribute name="href"><xsp:expr>helper.getURL(Publication.LIVE_AREA, references[i])</xsp:expr></xsp:attribute>
- <xsp:expr>references[i]</xsp:expr>
+ <xsp:attribute name="href"><xsp-request:get-context-path/><xsp:expr>references[i].getCompleteURL()</xsp:expr></xsp:attribute>
+ <xsp:expr>references[i].getId()</xsp:expr> [<xsp:expr>references[i].getLanguage()</xsp:expr>]
</inconsistent-document>
}
1.11 +4 -3 cocoon-lenya/src/webapp/lenya/content/info/archive.xsp
Index: archive.xsp
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/content/info/archive.xsp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- archive.xsp 29 Oct 2003 15:33:47 -0000 1.10
+++ archive.xsp 3 Nov 2003 16:46:32 -0000 1.11
@@ -9,6 +9,7 @@
<xsp:structure>
<xsp:include>org.apache.lenya.cms.publication.Publication</xsp:include>
+ <xsp:include>org.apache.lenya.cms.publication.Document</xsp:include>
<xsp:include>org.apache.lenya.cms.publication.DocumentHelper</xsp:include>
<xsp:include>org.apache.lenya.cms.publication.xsp.DocumentReferencesHelper</xsp:include>
</xsp:structure>
@@ -26,14 +27,14 @@
<parent-url><xsp:expr>parentUrl</xsp:expr></parent-url>
DocumentReferencesHelper helper = new DocumentReferencesHelper(objectModel);
- String[] references = helper.getReferences(Publication.LIVE_AREA);
+ Document[] references = helper.getReferences(Publication.LIVE_AREA);
if (references.length > 0) {
</xsp:logic><inconsistent-documents><xsp:logic>
for (int i = 0; i < references.length; i++) {
<inconsistent-document>
- <xsp:attribute name="href"><xsp:expr>helper.getURL(Publication.LIVE_AREA, references[i])</xsp:expr></xsp:attribute>
- <xsp:expr>references[i]</xsp:expr>
+ <xsp:attribute name="href"><xsp-request:get-context-path/><xsp:expr>references[i].getCompleteURL()</xsp:expr></xsp:attribute>
+ <xsp:expr>references[i].getId()</xsp:expr> [<xsp:expr>references[i].getLanguage()</xsp:expr>]
</inconsistent-document>
}
</xsp:logic></inconsistent-documents><xsp:logic>
---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org