You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by ro...@apache.org on 2004/03/24 10:15:24 UTC
cvs commit: cocoon-lenya/src/webapp/lenya i18n.xmap
roku 2004/03/24 01:15:24
Modified: src/webapp sitemap.xmap
Added: src/webapp/lenya i18n.xmap
Log:
Moved i18n handling to a separate sitemap in order to:
- avoid potential endless loops caused by sub sitemap mounts
- avoid unessacarry ResourceBundle loggings in core.log if a dict file is not found
Revision Changes Path
1.126 +7 -22 cocoon-lenya/src/webapp/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/sitemap.xmap,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- sitemap.xmap 21 Mar 2004 23:55:15 -0000 1.125
+++ sitemap.xmap 24 Mar 2004 09:15:23 -0000 1.126
@@ -36,7 +36,7 @@
<map:transformer name="xinclude" logger="sitemap.transformer.xinclude" pool-grow="2" pool-max="16" pool-min="2" src="org.apache.cocoon.transformation.XIncludeTransformer"/>
<map:transformer name="i18n" logger="sitemap.transformer.i18n" src="org.apache.cocoon.transformation.I18nTransformer">
<catalogues default="cmsui">
- <catalogue id="cmsui" name="cmsui" location="cocoon://i18n-catalogue/"/>
+ <catalogue id="cmsui" name="cmsui" location="cocoon://i18n-catalogue/"/>
</catalogues>
<untranslated-text>untranslated</untranslated-text>
<cache-at-startup>true</cache-at-startup>
@@ -234,30 +234,15 @@
<!-- =========================== Pipelines ================================= -->
<map:pipelines>
-
- <map:pipeline type="noncaching">
+
+ <!-- I18N -->
+ <map:pipeline>
<map:match pattern="i18n-catalogue/**">
- <map:generate type="serverpages" src="lenya/resources/i18n/catalogue.xsp">
- <map:parameter name="pub-catalogue-location" value="context:/lenya/pubs/{page-envelope:publication-id}/lenya/resources/i18n/"/>
- <map:parameter name="catalogue-file" value="{1}"/>
- </map:generate>
- <map:transform type="xinclude"/>
- <map:serialize/>
+ <map:mount uri-prefix="" src="lenya/i18n.xmap" check-reload="true" reload-method="synchron"/>
</map:match>
-
- <map:handle-errors>
- <map:generate type="notifying"/>
- <map:transform src="stylesheets/system/error2html.xslt">
- <map:parameter name="contextPath" value="{request:contextPath}"/>
- </map:transform>
- <map:serialize type="html"/>
- </map:handle-errors>
-
</map:pipeline>
-
- <map:pipeline>
-
+ <map:pipeline>
<map:match type="usecase" pattern="login">
<map:match type="step" pattern="showscreen">
1.1 cocoon-lenya/src/webapp/lenya/i18n.xmap
Index: i18n.xmap
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 1999-2004 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<!-- $Id: navigation.xmap,v 1.21 2004/03/13 14:28:33 gregor Exp $ -->
<!--
This sitemaps provides fallback messages catalogues and catalogue merging.
The reason for the existence of this sitemap is mainly to avoid endless loops when
the pipelines located here are in sitemap.map or global-sitemap.xmap.
-->
<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
<!-- =========================== Components ================================ -->
<map:components>
<map:generators default="file"/>
<map:transformers default="xslt"/>
<map:readers default="resource"/>
<map:serializers default="html"/>
<map:matchers default="wildcard"/>
<map:actions/>
<map:selectors/>
</map:components>
<!-- =========================== Pipelines ================================ -->
<map:resources/>
<map:pipelines>
<map:pipeline type="noncaching">
<map:match pattern="i18n-catalogue/**">
<map:select type="resource-exists">
<map:when test="pubs/{page-envelope:publication-id}/lenya/resources/i18n/{1}">
<map:generate type="serverpages" src="resources/i18n/catalogue.xsp">
<map:parameter name="pub-catalogue-location" value="context:/lenya/pubs/{page-envelope:publication-id}/lenya/resources/i18n/"/>
<map:parameter name="catalogue-file" value="{1}"/>
</map:generate>
<map:transform type="xinclude"/>
<map:serialize/>
</map:when>
<map:when test="resources/i18n/{1}">
<map:generate src="resources/i18n/{1}"/>
<map:serialize/>
</map:when>
</map:select>
</map:match>
</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