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/13 09:22:33 UTC
cvs commit: cocoon-lenya/src/webapp global-sitemap.xmap sitemap.xmap
roku 2004/03/13 00:22:33
Modified: src/webapp global-sitemap.xmap sitemap.xmap
Log:
- Moved XInclude transformer to sitemap.xmap, because I need to use it there for i18n catalogue merging
- Added support for the i18-catalogue pipeline to merge local with global i18n catalogue
Revision Changes Path
1.52 +0 -1 cocoon-lenya/src/webapp/global-sitemap.xmap
Index: global-sitemap.xmap
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/global-sitemap.xmap,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- global-sitemap.xmap 12 Mar 2004 18:42:39 -0000 1.51
+++ global-sitemap.xmap 13 Mar 2004 08:22:33 -0000 1.52
@@ -98,7 +98,6 @@
<transformer-factory>org.apache.xalan.processor.TransformerFactoryImpl</transformer-factory>
</map:transformer>
- <map:transformer logger="sitemap.transformer.xinclude" name="xinclude" pool-grow="2" pool-max="16" pool-min="2" src="org.apache.cocoon.transformation.XIncludeTransformer"/>
<map:transformer logger="sitemap.transformer.cinclude" name="cinclude" pool-grow="2" pool-max="16" pool-min="2" src="org.apache.cocoon.transformation.CIncludeTransformer"/>
<map:transformer logger="sitemap.transformer.encodeURL" name="encodeURL" src="org.apache.cocoon.transformation.EncodeURLTransformer"/>
<map:transformer logger="sitemap.transformer.write-source" name="write-source" src="org.apache.cocoon.transformation.SourceWritingTransformer"/>
1.120 +17 -13 cocoon-lenya/src/webapp/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/sitemap.xmap,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- sitemap.xmap 12 Mar 2004 18:46:48 -0000 1.119
+++ sitemap.xmap 13 Mar 2004 08:22:33 -0000 1.120
@@ -17,10 +17,10 @@
</map:generators>
<map:transformers default="xslt">
-
- <map:transformer name="i18n" src="org.apache.cocoon.transformation.I18nTransformer">
+ <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-dictionaries"/>
+ <catalogue id="cmsui" name="cmsui" location="cocoon://i18n-catalogue"/>
</catalogues>
<untranslated-text>untranslated</untranslated-text>
<cache-at-startup>true</cache-at-startup>
@@ -111,7 +111,7 @@
<map:actions>
<map:action logger="sitemap.action.request" name="request" src="org.apache.cocoon.acting.RequestParamAction"/>
-
+ <map:action logger="sitemap.action.resource-exists" name="resource-exists" src="org.apache.cocoon.acting.ResourceExistsAction"/>
<!-- =========================== Lenya CMS ================================= -->
<map:action name="parent-child" logger="sitemap.action.parent-child" src="org.apache.lenya.cms.cocoon.acting.ParentChildCreatorAction">
@@ -216,20 +216,24 @@
</map:transform>
<map:serialize/>
</map:resource>
-
+
</map:resources>
<!-- =========================== Pipelines ================================= -->
<map:pipelines>
- <!-- i18n dictionaries (pub local and global) are merged/aggregated here -->
- <map:pipeline type="noncaching">
- <!-- FIXME: Why cant I use pattern="i18n-dictionaries/**"? Results into an endless loop with StackOverflowError-->
- <map:match pattern="i18n-dictionaries**">
- <map:generate src="lenya/resources/i18n{1}"/>
- <map:serialize/>
- </map:match>
- </map:pipeline>
+
+ <map:pipeline type="noncaching">
+ <!-- FIXME: Why cant I use pattern="i18n-catalogues/**"? Results into an endless loop with StackOverflowError-->
+ <map:match pattern="i18n-catalogue**">
+ <map:generate type="serverpages" src="lenya/resources/i18n/catalogue.xsp">
+ <map:parameter name="pub-catalogue-location" value="../../pubs/{page-envelope:publication-id}/lenya/resources/i18n"/>
+ <map:parameter name="catalogue-file" value="{1}"/>
+ </map:generate>
+ <map:transform type="xinclude"/>
+ <map:serialize/>
+ </map:match>
+ </map:pipeline>
<map:pipeline>
---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org