vgritsenko 2003/06/10 16:58:43
Modified: src/blocks/batik/samples sitemap.xmap
src/blocks/fop/samples sitemap.xmap
Log:
fix batik and fop samples sitemaps: add views.
Revision Changes Path
1.4 +58 -61 cocoon-2.1/src/blocks/batik/samples/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/batik/samples/sitemap.xmap,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sitemap.xmap 7 May 2003 19:15:02 -0000 1.3
+++ sitemap.xmap 10 Jun 2003 23:58:42 -0000 1.4
@@ -10,72 +10,69 @@
<!-- =========================== Components ================================ -->
- <map:components>
- <map:generators default="file"/>
- <map:transformers default="xslt"/>
-
- <map:serializers default="html">
- <map:serializer logger="sitemap.serializer.svgxml" mime-type="image/svg+xml"
name="svgxml" src="org.apache.cocoon.serialization.XMLSerializer">
- <doctype-public>-//W3C//DTD SVG 1.0//EN</doctype-public>
-
<doctype-system>http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd</doctype-system>
- </map:serializer>
- <map:serializer logger="sitemap.serializer.svg2jpeg" name="svg2jpeg"
src="org.apache.cocoon.serialization.SVGSerializer" mime-type="image/jpeg">
- <parameter name="quality" type="float" value="0.9"/>
- </map:serializer>
- <map:serializer logger="sitemap.serializer.svg2png" name="svg2png"
src="org.apache.cocoon.serialization.SVGSerializer" mime-type="image/png"/>
- </map:serializers>
-
- <map:readers default="resource"/>
- <map:matchers default="wildcard"/>
- <map:pipes default="caching"/>
- </map:components>
+ <map:components>
+ <map:serializers default="html">
+ <map:serializer logger="sitemap.serializer.svgxml" mime-type="image/svg+xml"
name="svgxml" src="org.apache.cocoon.serialization.XMLSerializer">
+ <doctype-public>-//W3C//DTD SVG 1.0//EN</doctype-public>
+
<doctype-system>http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd</doctype-system>
+ </map:serializer>
+ <map:serializer logger="sitemap.serializer.svg2jpeg" name="svg2jpeg"
src="org.apache.cocoon.serialization.SVGSerializer" mime-type="image/jpeg">
+ <parameter name="quality" type="float" value="0.9"/>
+ </map:serializer>
+ <map:serializer logger="sitemap.serializer.svg2png" name="svg2png"
src="org.apache.cocoon.serialization.SVGSerializer" mime-type="image/png"/>
+ </map:serializers>
+ </map:components>
<!-- =========================== Views =================================== -->
- <map:views>
- <map:view from-label="content" name="content">
- <map:serialize type="xml"/>
- </map:view>
-
- <map:view from-position="last" name="links">
- <map:serialize type="links"/>
- </map:view>
- </map:views>
+ <map:views>
+ <map:view from-label="content" name="content">
+ <map:serialize type="xml"/>
+ </map:view>
+
+ <map:view name="pretty-content" from-label="data">
+ <map:transform src="context://stylesheets/system/xml2html.xslt"/>
+ <map:serialize type="html"/>
+ </map:view>
+
+ <map:view from-position="last" name="links">
+ <map:serialize type="links"/>
+ </map:view>
+ </map:views>
<!-- =========================== Pipelines ================================= -->
- <map:pipelines>
- <map:pipeline type="caching">
- <map:match pattern="">
- <map:redirect-to uri="welcome"/>
- </map:match>
+ <map:pipelines>
+ <map:pipeline type="caching">
+ <map:match pattern="">
+ <map:redirect-to uri="welcome"/>
+ </map:match>
- <map:match pattern="welcome">
- <map:generate src="samples.xml"/>
- <map:transform
src="context://samples/common/style/xsl/html/simple-samples2html.xsl">
- <map:parameter name="contextPath" value="{request:contextPath}"/>
- </map:transform>
- <map:serialize/>
- </map:match>
-
- <!-- ========================= batik ================================ -->
-
- <map:match pattern="*.svg">
- <map:generate src="{1}.svg"/>
- <map:serialize type="svgxml"/>
- </map:match>
-
- <map:match pattern="*.jpeg">
- <map:generate src="{1}.svg"/>
- <map:serialize type="svg2jpeg"/>
- </map:match>
-
- <map:match pattern="*.png">
- <map:generate src="{1}.svg"/>
- <map:serialize type="svg2png"/>
- </map:match>
-
- </map:pipeline>
- </map:pipelines>
+ <map:match pattern="welcome">
+ <map:generate src="samples.xml"/>
+ <map:transform
src="context://samples/common/style/xsl/html/simple-samples2html.xsl">
+ <map:parameter name="contextPath" value="{request:contextPath}"/>
+ </map:transform>
+ <map:serialize/>
+ </map:match>
+
+ <!-- ========================== batik ================================ -->
+
+ <map:match pattern="*.svg">
+ <map:generate src="{1}.svg"/>
+ <map:serialize type="svgxml"/>
+ </map:match>
+
+ <map:match pattern="*.jpeg">
+ <map:generate src="{1}.svg"/>
+ <map:serialize type="svg2jpeg"/>
+ </map:match>
+
+ <map:match pattern="*.png">
+ <map:generate src="{1}.svg"/>
+ <map:serialize type="svg2png"/>
+ </map:match>
+ </map:pipeline>
+ </map:pipelines>
</map:sitemap>
1.6 +23 -7 cocoon-2.1/src/blocks/fop/samples/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/fop/samples/sitemap.xmap,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sitemap.xmap 5 May 2003 09:30:12 -0000 1.5
+++ sitemap.xmap 10 Jun 2003 23:58:43 -0000 1.6
@@ -1,14 +1,32 @@
<?xml version="1.0"?>
-<!--
- FOP block samples sitemap
- $Id$
- -->
+<!--+
+ | FOP block samples sitemap
+ | CVS $Id$
+ +-->
<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0";>
- <map:pipelines>
+<!-- =========================== Views =================================== -->
+
+ <map:views>
+ <map:view from-label="content" name="content">
+ <map:serialize type="xml"/>
+ </map:view>
+
+ <map:view name="pretty-content" from-label="data">
+ <map:transform src="context://stylesheets/system/xml2html.xslt"/>
+ <map:serialize type="html"/>
+ </map:view>
+
+ <map:view from-position="last" name="links">
+ <map:serialize type="links"/>
+ </map:view>
+ </map:views>
+
+<!-- =========================== Pipelines ================================= -->
+ <map:pipelines>
<map:pipeline type="caching">
<map:match pattern="">
@@ -54,7 +72,5 @@
</map:match>
</map:pipeline>
-
</map:pipelines>
-
</map:sitemap>
