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/26 17:10:36 UTC
cvs commit: cocoon-lenya/src/webapp/lenya/pubs/default publication-sitemap.xmap
egli 2003/11/26 08:10:36
Modified: src/webapp/lenya/pubs/default publication-sitemap.xmap
Log:
The exception handling is now merged from the unicom publication,
i.e. you'll get a nice error page if a document has not been published
yet and you'll get the normal exception stack trace in all other cases
(where we are looking at real bugs).
Fixes #24224.
Revision Changes Path
1.62 +47 -9 cocoon-lenya/src/webapp/lenya/pubs/default/publication-sitemap.xmap
Index: publication-sitemap.xmap
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/default/publication-sitemap.xmap,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- publication-sitemap.xmap 4 Nov 2003 10:23:12 -0000 1.61
+++ publication-sitemap.xmap 26 Nov 2003 16:10:36 -0000 1.62
@@ -5,7 +5,11 @@
<map:components>
<map:generators default="file"/>
<map:matchers default="wildcard"/>
- <map:actions/>
+ <map:actions>
+ <map:action logger="sitemap.action.language-exists"
+ name="language-exists"
+ src="org.apache.lenya.cms.cocoon.acting.LanguageExistsAction"/>
+ </map:actions>
<map:selectors>
<map:selector name="request-method" logger="sitemap.selector.request-method" src="org.apache.cocoon.selection.RequestMethodSelector"/>
</map:selectors>
@@ -17,8 +21,23 @@
</map:view>
</map:views>
- <map:resources/>
-
+ <map:resources>
+ <map:resource name="style-cms-page">
+ <map:transform src="../../xslt/util/page2xhtml.xsl">
+ <map:parameter name="contextprefix" value="{request:contextPath}"/>
+ </map:transform>
+ <map:select type="parameter">
+ <map:parameter name="statusCode" value="{statusCode}"/>
+ <map:when test="">
+ <map:serialize/>
+ </map:when>
+ <map:otherwise>
+ <map:serialize status-code="{statusCode}"/>
+ </map:otherwise>
+ </map:select>
+ </map:resource>
+ </map:resources>
+
<map:pipelines>
<map:pipeline>
<map:match pattern="**/">
@@ -83,16 +102,35 @@
</map:match>
<map:match pattern="**.html">
- <map:generate src="cocoon:/lenyabody-view/{page-envelope:publication-id}/{page-envelope:area}/{page-envelope:document-type}{page-envelope:document-url}"/>
- <map:transform src="cocoon://lenya-page/{page-envelope:publication-id}/{1}.xml"/>
- <map:serialize type="html"/>
+ <map:act type="language-exists">
+ <map:generate src="cocoon:/lenyabody-view/{page-envelope:publication-id}/{page-envelope:area}/{page-envelope:document-type}{page-envelope:document-url}"/>
+ <map:transform src="cocoon://lenya-page/{page-envelope:publication-id}/{../1}.xml"/>
+ <map:serialize type="html"/>
+ </map:act>
+
+ <!-- There is no version of the requested document-id for the
+ requested language. -->
+ <map:generate type="serverpages" src="../../content/exception/missing-language.xsp"/>
+ <map:transform src="../../xslt/exception/missing-language.xsl"/>
+ <map:call resource="style-cms-page"/>
+
</map:match>
<map:handle-errors type="500">
- <!-- FIXME: other exceptions are also caught here! -->
- <map:transform src="../../xslt/exception/not-published-yet.xsl"/>
+ <map:select type="exception">
+ <map:when test="document-does-not-exist">
+ <map:transform src="../../xslt/exception/document-does-not-exist.xsl">
+ <map:parameter name="documentid" value="{page-envelope:document-id}"/>
+ <map:parameter name="documenturl" value="{page-envelope:document-url}"/>
+ </map:transform>
+ <map:call resource="style-cms-page">
+ <map:parameter name="statusCode" value="404"/>
+ </map:call>
+ </map:when>
+ </map:select>
<map:serialize type="html"/>
</map:handle-errors>
+
</map:pipeline>
</map:pipelines>
</map:sitemap>
---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org