You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@forrest.apache.org by je...@apache.org on 2003/09/20 10:23:50 UTC
cvs commit: xml-forrest/src/resources/conf forrest.xmap menu.xmap sitemap.xmap
jefft 2003/09/20 01:23:50
Modified: src/resources/conf forrest.xmap menu.xmap sitemap.xmap
Log:
Move component definitions into the sitemaps where they are used. Otherwise we
break any project that has an overridden sitemap.xmap
Revision Changes Path
1.35 +2 -3 xml-forrest/src/resources/conf/forrest.xmap
Index: forrest.xmap
===================================================================
RCS file: /home/cvs/xml-forrest/src/resources/conf/forrest.xmap,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- forrest.xmap 19 Sep 2003 10:48:32 -0000 1.34
+++ forrest.xmap 20 Sep 2003 08:23:50 -0000 1.35
@@ -21,8 +21,7 @@
<map:components>
<!-- FIXME (JJP): This should not be here. Should be define on sitemap -->
<map:generators default="file">
-
-
+ <map:generator name="serverpages" src="org.apache.cocoon.generation.ServerPagesGenerator"/>
<map:generator name="html" src="org.apache.cocoon.generation.HTMLGenerator">
<jtidy-config>jtidy.properties</jtidy-config>
</map:generator>
1.11 +14 -3 xml-forrest/src/resources/conf/menu.xmap
Index: menu.xmap
===================================================================
RCS file: /home/cvs/xml-forrest/src/resources/conf/menu.xmap,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- menu.xmap 16 Sep 2003 16:35:08 -0000 1.10
+++ menu.xmap 20 Sep 2003 08:23:50 -0000 1.11
@@ -18,12 +18,23 @@
<map:components>
<map:generators default="file"/>
<map:serializers default="html"/>
- <map:transformers default="xslt"/>
+ <map:transformers default="xslt">
+ <map:transformer name="i18n" src="org.apache.cocoon.transformation.I18nTransformer">
+ <catalogues default="menu">
+ <catalogue id="menu" name="menu" location="translations"/>
+ </catalogues>
+ <!-- Commented out to verify your translations
+ <untranslated-text>untranslated</untranslated-text> -->
+ <cache-at-startup>true</cache-at-startup>
+ </map:transformer>
+ </map:transformers>
<map:matchers default="wildcard"/>
<map:selectors default="browser">
<map:selector logger="sitemap.selector.config" name="config" src="org.apache.cocoon.selection.SimpleSelector" />
</map:selectors>
-
+ <map:actions>
+ <map:action name="locale" src="org.apache.cocoon.acting.LocaleAction" />
+ </map:actions>
</map:components>
<map:pipelines>
1.120 +1 -14 xml-forrest/src/resources/conf/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/xml-forrest/src/resources/conf/sitemap.xmap,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- sitemap.xmap 16 Sep 2003 16:35:08 -0000 1.119
+++ sitemap.xmap 20 Sep 2003 08:23:50 -0000 1.120
@@ -12,7 +12,6 @@
<map:components>
<map:generators default="file">
<map:generator name="file" src="org.apache.cocoon.generation.FileGenerator" />
- <map:generator name="serverpages" src="org.apache.cocoon.generation.ServerPagesGenerator"/>
<!--
<map:generator name="html" src="org.apache.cocoon.generation.HTMLGenerator">
<jtidy-config>jtidy.properties</jtidy-config>
@@ -62,15 +61,6 @@
<map:transformer name="xinclude" src="org.apache.cocoon.transformation.XIncludeTransformer" logger="sitemap.transformer.xinclude" pool-grow="2" pool-max="16" pool-min="2" />
- <map:transformer name="i18n" src="org.apache.cocoon.transformation.I18nTransformer">
- <catalogues default="menu">
- <catalogue id="menu" name="menu" location="translations"/>
- </catalogues>
- <!-- Commented out to verify your translations
- <untranslated-text>untranslated</untranslated-text> -->
- <cache-at-startup>true</cache-at-startup>
- </map:transformer>
-
</map:transformers>
<map:readers default="resource">
@@ -110,9 +100,6 @@
<map:selectors>
<map:selector logger="sitemap.selector.exists" name="exists" src="org.apache.cocoon.selection.ResourceExistsSelector" />
</map:selectors>
- <map:actions>
- <map:action name="locale" src="org.apache.cocoon.acting.LocaleAction" />
- </map:actions>
<map:pipes default="caching">