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/01/11 11:33:25 UTC
cvs commit: xml-forrest/src/core/context resources.xmap sitemap.xmap
nicolaken 2004/01/11 02:33:25
Modified: src/core/context resources.xmap sitemap.xmap
Log:
Make Forrest able to serve any Icon, and also user-defined ones, not
only in skins.
Revision Changes Path
1.7 +14 -7 xml-forrest/src/core/context/resources.xmap
Index: resources.xmap
===================================================================
RCS file: /home/cvs/xml-forrest/src/core/context/resources.xmap,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- resources.xmap 8 Jan 2004 16:16:58 -0000 1.6
+++ resources.xmap 11 Jan 2004 10:33:25 -0000 1.7
@@ -321,13 +321,20 @@
</map:select>
</map:match>
- <map:match pattern="**/*.ico">
- <map:call resource="skin-read">
- <map:parameter name="path" value="images/{1}" />
- <map:parameter name="name" value="{2}" />
- <map:parameter name="ext" value="ico" />
- <map:parameter name="mime-type" value="image/x-icon" />
- </map:call>
+ <map:match pattern="**.ico">
+ <map:select type="exists">
+ <map:when test="{project:content.xdocs}/{1}.ico">
+ <map:read src="{project:content.xdocs}/{1}.ico" mime-type="image/x-icon" />
+ </map:when>
+ <map:otherwise>
+ <map:call resource="skin-read">
+ <map:parameter name="path" value="images" />
+ <map:parameter name="name" value="{1}" />
+ <map:parameter name="ext" value="ico" />
+ <map:parameter name="mime-type" value="image/x-icon" />
+ </map:call>
+ </map:otherwise>
+ </map:select>
</map:match>
</map:pipeline>
</map:pipelines>
1.5 +4 -10 xml-forrest/src/core/context/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/xml-forrest/src/core/context/sitemap.xmap,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sitemap.xmap 28 Nov 2003 17:12:43 -0000 1.4
+++ sitemap.xmap 11 Jan 2004 10:33:25 -0000 1.5
@@ -365,21 +365,15 @@
<map:match pattern="profiler">
<map:mount uri-prefix="" src="profiler.xmap" check-reload="yes" />
</map:match>
- <map:match pattern="**.js">
- <map:mount uri-prefix="" src="resources.xmap" check-reload="yes" />
- </map:match>
- <map:match pattern="**.css">
- <map:mount uri-prefix="" src="resources.xmap" check-reload="yes" />
- </map:match>
<map:match pattern="**images**">
<map:mount uri-prefix="" src="resources.xmap" check-reload="yes" />
</map:match>
- <map:match pattern="**.png">
+ <map:match pattern="**.*">
<map:mount uri-prefix="" src="resources.xmap" check-reload="yes" />
</map:match>
- <map:match pattern="**favicon.ico">
+ <map:match pattern="**">
<map:mount uri-prefix="" src="resources.xmap" check-reload="yes" />
- </map:match>
+ </map:match>
</map:pipeline>