You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@forrest.apache.org by ni...@apache.org on 2004/04/23 22:27:28 UTC
svn commit: rev 10199 - xml/forrest/branches/copyless/src/core/context
Author: nicolaken
Date: Fri Apr 23 13:27:27 2004
New Revision: 10199
Modified:
xml/forrest/branches/copyless/src/core/context/resources.xmap
xml/forrest/branches/copyless/src/core/context/sitemap.xmap
Log:
Move skinconf pipeline to the main sitemap.
Modified: xml/forrest/branches/copyless/src/core/context/resources.xmap
==============================================================================
--- xml/forrest/branches/copyless/src/core/context/resources.xmap (original)
+++ xml/forrest/branches/copyless/src/core/context/resources.xmap Fri Apr 23 13:27:27 2004
@@ -38,9 +38,7 @@
<map:serializer mime-type="image/png" name="svg2png" src="org.apache.cocoon.serialization.SVGSerializer" />
<map:serializer name="text" mime-type="text/plain" src="org.apache.cocoon.serialization.TextSerializer"/>
</map:serializers>
- <map:transformers default="xslt">
- <map:transformer name="skinconf" src="org.apache.forrest.skinconf.SkinconfTransformer"/>
- </map:transformers>
+ <map:transformers default="xslt"/>
<map:readers default="resource" />
<map:matchers default="wildcard" />
<map:selectors default="browser" />
@@ -157,7 +155,7 @@
</map:resource>
<map:resource name="pipe-svg2png-corner-resource">
- <map:generate src="cocoon:/skin/skinconf.xml" />
+ <map:generate src="cocoon://skinconf.xml" />
<map:transform src="{path}">
<map:parameter name="orientation-tb"
value="{orientation-tb}"/>
@@ -177,7 +175,7 @@
</map:resource>
<map:resource name="generate-resource">
- <map:generate src="cocoon:/skin/skinconf.xml" />
+ <map:generate src="cocoon://skinconf.xml" />
<map:transform src="{path}"/>
</map:resource>
@@ -191,25 +189,6 @@
<map:pipelines>
- <map:pipeline internal-only="false">
- <map:match pattern="**skin/skinconf.xml">
- <map:generate src="{project:skinconf}" />
- <map:select type="exists">
- <map:when test="{project:skins-dir}{forrest:skin}/skinconf.xsl">
- <map:transform src="{project:skins-dir}{forrest:skin}/skinconf.xsl"/>
- </map:when>
- </map:select>
- <map:select type="exists">
- <map:when test="{forrest:home}context/skins/{forrest:skin}/skinconf.xsl">
- <map:transform src="{forrest:home}context/skins/{forrest:skin}/skinconf.xsl"/>
- </map:when>
- </map:select>
- <map:transform src="{forrest:home}context/skins/common/skinconf.xsl"/>
- <map:transform type="skinconf"/>
- <map:serialize type="xml" />
- </map:match>
- </map:pipeline>
-
<map:pipeline>
<map:match pattern="**skin/**.js">
<map:call resource="skin-read">
Modified: xml/forrest/branches/copyless/src/core/context/sitemap.xmap
==============================================================================
--- xml/forrest/branches/copyless/src/core/context/sitemap.xmap (original)
+++ xml/forrest/branches/copyless/src/core/context/sitemap.xmap Fri Apr 23 13:27:27 2004
@@ -40,6 +40,9 @@
</map:generators>
<map:transformers default="xslt">
+ <!-- Add values to skinconf that need extra processing like the color shades -->
+ <map:transformer name="skinconf" src="org.apache.forrest.skinconf.SkinconfTransformer"/>
+
<!-- Generates @id attributes from <title> strings -->
<map:transformer name="idgen" src="org.apache.cocoon.transformation.IdGeneratorTransformer">
<element>//*[local-name() = 'section']</element>
@@ -211,19 +214,26 @@
<!-- =========================== Pipelines ================================= -->
<map:pipelines>
- <map:pipeline internal-only="false">
- <map:match pattern="skinconf.xml">
- <map:generate src="{project:skinconf}" />
- <map:serialize type="xml" />
- </map:match>
- </map:pipeline>
+ <map:pipeline internal-only="false">
+ <map:match pattern="skinconf.xml">
+ <map:generate src="{project:skinconf}" />
+ <map:select type="exists">
+ <map:when test="{project:skins-dir}{forrest:skin}/skinconf.xsl">
+ <map:transform src="{project:skins-dir}{forrest:skin}/skinconf.xsl"/>
+ </map:when>
+ </map:select>
+ <map:select type="exists">
+ <map:when test="{forrest:home}context/skins/{forrest:skin}/skinconf.xsl">
+ <map:transform src="{forrest:home}context/skins/{forrest:skin}/skinconf.xsl"/>
+ </map:when>
+ </map:select>
+ <map:transform src="{forrest:home}context/skins/common/skinconf.xsl"/>
+ <map:transform type="skinconf"/>
+ <map:serialize type="xml" />
+ </map:match>
+ </map:pipeline>
<map:pipeline internal-only="false">
-
- <map:match pattern="**skinconf.xml">
- <map:mount uri-prefix="" src="resources.xmap" check-reload="yes" />
- </map:match>
-
<!-- ============================================================ -->
<!-- SOURCE FORMATS -->
<!-- Raw XML sources, typically doc-v12 format -->