You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by fe...@apache.org on 2007/05/17 22:20:19 UTC

svn commit: r539101 - in /cocoon/trunk/blocks: cocoon-eventcache/cocoon-eventcache-sample/src/main/resources/COB-INF/ cocoon-faces/cocoon-faces-sample/src/main/resources/COB-INF/ cocoon-fop/cocoon-fop-ng-sample/src/main/resources/COB-INF/ cocoon-fop/co...

Author: felixk
Date: Thu May 17 13:20:18 2007
New Revision: 539101

URL: http://svn.apache.org/viewvc?view=rev&rev=539101
Log:
-use servlet services
-reformatted

Modified:
    cocoon/trunk/blocks/cocoon-eventcache/cocoon-eventcache-sample/src/main/resources/COB-INF/sitemap.xmap
    cocoon/trunk/blocks/cocoon-faces/cocoon-faces-sample/src/main/resources/COB-INF/sitemap.xmap
    cocoon/trunk/blocks/cocoon-fop/cocoon-fop-ng-sample/src/main/resources/COB-INF/sitemap.xmap
    cocoon/trunk/blocks/cocoon-fop/cocoon-fop-sample/src/main/resources/COB-INF/sitemap.xmap

Modified: cocoon/trunk/blocks/cocoon-eventcache/cocoon-eventcache-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-eventcache/cocoon-eventcache-sample/src/main/resources/COB-INF/sitemap.xmap?view=diff&rev=539101&r1=539100&r2=539101
==============================================================================
--- cocoon/trunk/blocks/cocoon-eventcache/cocoon-eventcache-sample/src/main/resources/COB-INF/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-eventcache/cocoon-eventcache-sample/src/main/resources/COB-INF/sitemap.xmap Thu May 17 13:20:18 2007
@@ -23,61 +23,82 @@
     +-->
 
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
-  <map:components>
-    <map:generators>
-    	<map:generator name="sample" src="org.apache.cocoon.samples.EventAwareGenerator"/>
-    </map:generators>
-    <map:actions>
-    	<map:action name="cacheevent" src="org.apache.cocoon.acting.CacheEventAction"/>
-    </map:actions>
-    
-    <map:pipes default="caching">
-	  <!-- A pipe must be defined configured to use the EventAware cache. -->
-      <map:pipe name="event-aware" src="org.apache.cocoon.components.pipeline.impl.CachingProcessingPipeline">
-        <parameter name="cache-role" value="org.apache.cocoon.caching.Cache/EventAware"/>
-      </map:pipe>
-    </map:pipes>
-  </map:components> 
-  
-  <map:flow language="javascript">
-     <map:script src="event.js"/>
-  </map:flow>
-  
-  <map:views>
-    <map:view from-label="content" name="content">
-      <map:serialize type="xml"/>
-    </map:view>
-  </map:views>
-
-  <map:pipelines>
-  	<!-- Our content must occur in a pipeline configured to use our Event Aware cache --> 
-    <map:pipeline type="event-aware">
-      
-      <map:match pattern="flow">
-        <map:call function="cacheEvent"/>
-      </map:match>
-      <map:match pattern="action">
-        <map:act type="cacheevent">
-          <map:parameter name="event" value="{request-param:event}"/>
-        </map:act>
-        <map:redirect-to uri="demo?pageKey={request-param:pageKey}&amp;rand={random:x}"/>
-      </map:match>
-      <map:match pattern="*">
-        <map:generate type="sample" src="eventcache.xml">
-          <map:parameter name="DELAY_SECS" value="2"/>
-          <map:parameter name="DATE" value="{date:date}"/>
-          <map:parameter name="KEY" value="{request-param:pageKey}"/>
-        </map:generate>
-        <map:transform src="servlet:style-default:/blocks/dynamic-page2html.xsl">
-          <map:parameter name="servletPath" value="{request:servletPath}"/>
-          <map:parameter name="sitemapURI" value="{request:sitemapURI}"/>
-          <map:parameter name="file" value="eventcache.xsp"/>
-          <map:parameter name="remove" value="{0}"/>
-	    </map:transform>
-        <map:transform type="servletLinkRewriter" />
-        <map:serialize/>
-      </map:match>
-    </map:pipeline>
-  </map:pipelines>
+
+    <!-- =========================== Components =================================== -->
+
+    <map:components>
+
+        <!-- =========================== Generators =================================== -->
+
+        <map:generators>
+            <map:generator name="sample" src="org.apache.cocoon.samples.EventAwareGenerator" />
+        </map:generators>
+        <map:actions>
+            <map:action name="cacheevent" src="org.apache.cocoon.acting.CacheEventAction" />
+        </map:actions>
+
+        <!-- =========================== Pipes =================================== -->
+
+        <map:pipes default="caching">
+            <!-- A pipe must be defined configured to use the EventAware cache. -->
+            <map:pipe name="event-aware" src="org.apache.cocoon.components.pipeline.impl.CachingProcessingPipeline">
+                <parameter name="cache-role" value="org.apache.cocoon.caching.Cache/EventAware" />
+            </map:pipe>
+        </map:pipes>
+    </map:components>
+
+    <!-- =========================== Flowscripts =================================== -->
+
+    <map:flow language="javascript">
+        <map:script src="event.js" />
+    </map:flow>
+
+    <!-- =========================== Views =================================== -->
+
+    <map:views>
+        <map:view from-label="content" name="content">
+            <map:serialize type="xml" />
+        </map:view>
+
+        <map:view from-label="content" name="pretty-content">
+            <!-- Make use of servlet services -->
+            <map:serialize type="servletService">
+                <map:parameter name="service" value="servlet:style-default:/service/system/xml2html" />
+            </map:serialize>
+        </map:view>
+
+        <map:view from-position="last" name="links">
+            <map:serialize type="links" />
+        </map:view>
+    </map:views>
+
+    <!-- =========================== Pipelines =================================== -->
+
+    <map:pipelines>
+        <!-- Our content must occur in a pipeline configured to use our Event Aware cache -->
+        <map:pipeline type="event-aware">
+
+            <map:match pattern="flow">
+                <map:call function="cacheEvent" />
+            </map:match>
+            <map:match pattern="action">
+                <map:act type="cacheevent">
+                    <map:parameter name="event" value="{request-param:event}" />
+                </map:act>
+                <map:redirect-to uri="demo?pageKey={request-param:pageKey}&amp;rand={random:x}" />
+            </map:match>
+            <map:match pattern="*">
+                <map:generate type="sample" src="eventcache.xml">
+                    <map:parameter name="DELAY_SECS" value="2" />
+                    <map:parameter name="DATE" value="{date:date}" />
+                    <map:parameter name="KEY" value="{request-param:pageKey}" />
+                </map:generate>
+                <!-- Make use of servlet services -->
+                <map:serialize type="servletService">
+                    <map:parameter name="service" value="servlet:style-default:/service/blocks/dynamic-page2html" />
+                </map:serialize>
+            </map:match>
+        </map:pipeline>
+    </map:pipelines>
 </map:sitemap>
 

Modified: cocoon/trunk/blocks/cocoon-faces/cocoon-faces-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-faces/cocoon-faces-sample/src/main/resources/COB-INF/sitemap.xmap?view=diff&rev=539101&r1=539100&r2=539101
==============================================================================
--- cocoon/trunk/blocks/cocoon-faces/cocoon-faces-sample/src/main/resources/COB-INF/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-faces/cocoon-faces-sample/src/main/resources/COB-INF/sitemap.xmap Thu May 17 13:20:18 2007
@@ -19,94 +19,98 @@
 
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
 
-<!-- =========================== Components ================================ -->
+    <!-- =========================== Components ================================ -->
 
-  <map:components>
-    <map:transformers default="xslt">
-      <map:transformer name="taglib"
-                       logger="sitemap.transformer.taglib"
-                       src="org.apache.cocoon.transformation.TagTransformer"/>
-    </map:transformers>
-
-    <map:actions>
-      <map:action name="faces"
-                  logger="sitemap.action.faces"
-                  src="org.apache.cocoon.faces.FacesAction">
-        <!--
-          - Specify how to transform view ID to sitemap URI (optional).
-        <cut-prefix>/samples/blocks/faces</cut-prefix>
-        <add-prefix>/path/to/view/pipeline</add-prefix>
-        <cut-suffix>.faces</cut-suffix>
-          -->
-        <add-suffix>.view</add-suffix>
-      </map:action>
-    </map:actions>
-  </map:components>
-
-<!-- =========================== Views =================================== -->
-
-  <map:views>
-    <map:view from-label="content" name="content">
-      <map:serialize type="xml"/>
-    </map:view>
-
-    <map:view from-label="content" name="pretty-content">
-      <map:transform src="servlet:style-default:/stylesheets/system/xml2html.xslt"/>
-      <map:transform type="servletLinkRewriter" />
-      <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>
-      <map:match pattern="">
-        <map:redirect-to uri="welcome"/>
-      </map:match>
-
-      <!--
-        - Welcome page
-        -->
-      <map:match pattern="welcome">
-        <map:generate src="samples.xml"/>
-        <map:transform src="servlet:style-default:/common/style/xsl/html/simple-samples2html.xsl" />
-        <map:transform type="servletLinkRewriter" />
-        <map:serialize/>
-      </map:match>
-
-      <!--
-        - Pipeline generating JavaServer Faces view.
-        - JSF 1.1 Specification 2.2.6 Render Response.
-        -->
-      <map:match pattern="*.view">
-        <map:generate src="{1}.xml"/>
-        <map:transform type="taglib"/>
-        <map:transform src="servlet:style-default:/common/style/xsl/html/simple-page2html.xsl" />
-        <map:transform type="servletLinkRewriter" />
-        <map:serialize/>
-      </map:match>
-
-      <!--
-        - Action invoking JavaServer Faces lifecycle.
-        - Render phase of the lifecycle dispatches view render request
-        - back to the sitemap.
-        -->
-      <map:match pattern="*">
-        <map:act type="faces"/>
-      </map:match>
-
-      <!--
-        - Auto mount for demos in sub directories
-        -->
-      <map:match pattern="*/**">
-        <map:mount src="{1}/" uri-prefix="{1}"/>
-      </map:match>
+    <map:components>
 
-    </map:pipeline>
-  </map:pipelines>
+        <!-- =========================== Transformers ================================ -->
+
+        <map:transformers default="xslt">
+            <map:transformer name="taglib" logger="sitemap.transformer.taglib" src="org.apache.cocoon.transformation.TagTransformer" />
+        </map:transformers>
+
+        <!-- =========================== Actions ================================ -->
+
+        <map:actions>
+            <map:action name="faces" logger="sitemap.action.faces" src="org.apache.cocoon.faces.FacesAction">
+                <!--
+                    - Specify how to transform view ID to sitemap URI (optional).
+                    <cut-prefix>/samples/blocks/faces</cut-prefix>
+                    <add-prefix>/path/to/view/pipeline</add-prefix>
+                    <cut-suffix>.faces</cut-suffix>
+                -->
+                <add-suffix>.view</add-suffix>
+            </map:action>
+        </map:actions>
+    </map:components>
+
+    <!-- =========================== Views =================================== -->
+
+    <map:views>
+        <map:view from-label="content" name="content">
+            <map:serialize type="xml" />
+        </map:view>
+
+        <map:view from-label="content" name="pretty-content">
+            <!-- Make use of servlet services -->
+            <map:serialize type="servletService">
+                <map:parameter name="service" value="servlet:style-default:/service/system/xml2html" />
+            </map:serialize>
+        </map:view>
+
+        <map:view from-position="last" name="links">
+            <map:serialize type="links" />
+        </map:view>
+    </map:views>
+
+    <!-- =========================== Pipelines =================================== -->
+
+    <map:pipelines>
+        <map:pipeline>
+            <map:match pattern="">
+                <map:redirect-to uri="welcome" />
+            </map:match>
+
+            <!--
+                - Welcome page
+            -->
+            <map:match pattern="welcome">
+                <map:generate src="samples.xml" />
+                <!-- Make use of servlet services -->
+                <map:serialize type="servletService">
+                    <map:parameter name="service" value="servlet:style-default:/service/common/simple-samples2html" />
+                </map:serialize>
+            </map:match>
+
+            <!--
+                - Pipeline generating JavaServer Faces view.
+                - JSF 1.1 Specification 2.2.6 Render Response.
+            -->
+            <map:match pattern="*.view">
+                <map:generate src="{1}.xml" />
+                <map:transform type="taglib" />
+                <!-- Make use of servlet services -->
+                <map:serialize type="servletService">
+                    <map:parameter name="service" value="servlet:style-default:/service/common/simple-page2html" />
+                </map:serialize>
+            </map:match>
+
+            <!--
+                - Action invoking JavaServer Faces lifecycle.
+                - Render phase of the lifecycle dispatches view render request
+                - back to the sitemap.
+            -->
+            <map:match pattern="*">
+                <map:act type="faces" />
+            </map:match>
+
+            <!--
+                - Auto mount for demos in sub directories
+            -->
+            <map:match pattern="*/**">
+                <map:mount src="{1}/" uri-prefix="{1}" />
+            </map:match>
+
+        </map:pipeline>
+    </map:pipelines>
 </map:sitemap>

Modified: cocoon/trunk/blocks/cocoon-fop/cocoon-fop-ng-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-fop/cocoon-fop-ng-sample/src/main/resources/COB-INF/sitemap.xmap?view=diff&rev=539101&r1=539100&r2=539101
==============================================================================
--- cocoon/trunk/blocks/cocoon-fop/cocoon-fop-ng-sample/src/main/resources/COB-INF/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-fop/cocoon-fop-ng-sample/src/main/resources/COB-INF/sitemap.xmap Thu May 17 13:20:18 2007
@@ -23,110 +23,115 @@
 
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
 
-<!-- =========================== Views =================================== -->
+    <!-- =========================== Views =================================== -->
 
-  <map:views>
-    <map:view from-label="content" name="content">
-      <map:serialize type="xml"/>
-    </map:view>
-
-    <map:view from-label="content" name="pretty-content">
-      <map:transform src="servlet:style-default:/stylesheets/system/xml2html.xslt"/>
-      <map:transform type="servletLinkRewriter" />
-      <map:serialize type="html"/>
-    </map:view>
-
-    <map:view from-label="xsl-fo" name="xsl-fo">
-      <map:serialize type="xml"/>
-    </map:view>
-
-    <map:view from-position="last" name="links">
-      <map:serialize type="links"/>
-    </map:view>
-  </map:views>
-
-  <map:resources>
-    <map:resource name="hello">
-      <map:generate src="servlet:main-sample:/hello-world/hello.xml"/>
-      <map:transform label="xsl-fo" src="servlet:main-sample:/hello-world/style/xsl/page2fo.xsl"/>
-    </map:resource>
-  </map:resources>
-
-<!-- =========================== Pipelines ================================= -->
-
-  <map:pipelines>
-    <map:pipeline type="caching">
-      <map:match pattern="">
-        <map:redirect-to uri="welcome"/>
-      </map:match>
-
-      <!-- list of samples -->
-      <map:match pattern="welcome">
-        <map:generate src="misc/samples.xml"/>
-        <map:transform src="servlet:style-default:/common/style/xsl/html/simple-samples2html.xsl" />
-        <map:transform type="servletLinkRewriter" />
-        <map:serialize/>
-      </map:match>
-
-      <!-- hello world -->
-      <map:match pattern="hello.pdf">
-        <map:call resource="hello"/>
-        <map:serialize type="fo2pdf"/>
-      </map:match>
-
-      <!--
-        This one does not work, gives a java.util.EmptyStackException
-
-        map:match pattern="hello.rtf">
-        <map:call resource="hello"/>
-        <map:serialize type="fo2rtf"/>
-      </map:match-->
-
-      <map:match pattern="hello.ps">
-        <map:call resource="hello"/>
-        <map:serialize type="fo2ps"/>
-      </map:match>
-
-      <map:match pattern="hello.png">
-        <map:call resource="hello"/>
-        <map:serialize type="fo2png"/>
-      </map:match>
-
-      <!-- xsl-fo document access -->
-      <map:match pattern="**/*.fo.xml">
-        <map:generate src="{1}/{2}.fo.xml"/>
-        <!-- This stylesheet makes image URLs absolute, so that FOP can
-        display images. {realpath:/} returns the absolute path of the
-        context root. -->
-        <map:transform src="misc/fix-imagelinks.xsl" label="content">
-          <map:parameter name="ctxroot" value="{realpath:/}"/>
-          <map:parameter name="dir" value="samples/fop/{1}/"/>
-        </map:transform>
-        <map:serialize type="xml"/>
-      </map:match>
-
-      <!-- PDF conversion -->
-      <map:match pattern="**/*.pdf">
-        <map:generate src="cocoon:/{1}/{2}.fo.xml"/>
-        <map:serialize type="fo2pdf"/>
-      </map:match>
-
-      <map:match pattern="**/*.png">
-        <map:generate src="cocoon:/{1}/{2}.fo.xml"/>
-        <map:serialize type="fo2png"/>
-      </map:match>
-
-      <!-- reuse the XSP caching example for our caching test
-           Disabled for now as we don't want a dependency to XSP!
-      <map:match pattern="cache-test-*.pdf">-->
-        <!-- note that caching didn't work when accessing the XSP using the cocoon:/ protocol -->
-        <!--map:generate src="../xsp/java/cacheable.xsp" type="serverpages"/>
-        <map:transform src="cache-test/xsp-sample-to-fo.xsl">
-           <map:parameter name="pages" value="{1}"/>
-        </map:transform>
-        <map:serialize type="fo2pdf"/>
-      </map:match>
-      -->
-    </map:pipeline>
-  </map:pipelines>
+    <map:views>
+        <map:view from-label="content" name="content">
+            <map:serialize type="xml" />
+        </map:view>
+
+        <map:view from-label="content" name="pretty-content">
+            <!-- Make use of servlet services -->
+            <map:serialize type="servletService">
+                <map:parameter name="service" value="servlet:style-default:/service/system/xml2html" />
+            </map:serialize>
+        </map:view>
+
+        <map:view from-label="xsl-fo" name="xsl-fo">
+            <map:serialize type="xml" />
+        </map:view>
+
+        <map:view from-position="last" name="links">
+            <map:serialize type="links" />
+        </map:view>
+    </map:views>
+
+    <!-- =========================== Resources =================================== -->
+
+    <map:resources>
+        <map:resource name="hello">
+            <!-- TODO: Can servlet-services can be use here also? -->
+            <map:generate src="servlet:main-sample:/hello-world/hello.xml" />
+            <map:transform label="xsl-fo" src="servlet:main-sample:/hello-world/style/xsl/page2fo.xsl" />
+        </map:resource>
+    </map:resources>
+
+    <!-- =========================== Pipelines ================================= -->
+
+    <map:pipelines>
+        <map:pipeline type="caching">
+            <map:match pattern="">
+                <map:redirect-to uri="welcome" />
+            </map:match>
+
+            <!-- list of samples -->
+            <map:match pattern="welcome">
+                <map:generate src="misc/samples.xml" />
+                <!-- Make use of servlet services -->
+                <map:serialize type="servletService">
+                    <map:parameter name="service" value="servlet:style-default:/service/common/simple-samples2html" />
+                </map:serialize>
+            </map:match>
+
+            <!-- hello world -->
+            <map:match pattern="hello.pdf">
+                <map:call resource="hello" />
+                <map:serialize type="fo2pdf" />
+            </map:match>
+
+            <!--
+                This one does not work, gives a java.util.EmptyStackException
+                
+                map:match pattern="hello.rtf">
+                <map:call resource="hello"/>
+                <map:serialize type="fo2rtf"/>
+                </map:match-->
+
+            <map:match pattern="hello.ps">
+                <map:call resource="hello" />
+                <map:serialize type="fo2ps" />
+            </map:match>
+
+            <map:match pattern="hello.png">
+                <map:call resource="hello" />
+                <map:serialize type="fo2png" />
+            </map:match>
+
+            <!-- xsl-fo document access -->
+            <map:match pattern="**/*.fo.xml">
+                <map:generate src="{1}/{2}.fo.xml" />
+                <!-- This stylesheet makes image URLs absolute, so that FOP can
+                    display images. {realpath:/} returns the absolute path of the
+                    context root. -->
+                <map:transform src="misc/fix-imagelinks.xsl" label="content">
+                    <map:parameter name="ctxroot" value="{realpath:/}" />
+                    <map:parameter name="dir" value="samples/fop/{1}/" />
+                </map:transform>
+                <map:serialize type="xml" />
+            </map:match>
+
+            <!-- PDF conversion -->
+            <map:match pattern="**/*.pdf">
+                <map:generate src="cocoon:/{1}/{2}.fo.xml" />
+                <map:serialize type="fo2pdf" />
+            </map:match>
+
+            <map:match pattern="**/*.png">
+                <map:generate src="cocoon:/{1}/{2}.fo.xml" />
+                <map:serialize type="fo2png" />
+            </map:match>
+
+            <!-- reuse the XSP caching example for our caching test
+                Disabled for now as we don't want a dependency to XSP!
+                <map:match pattern="cache-test-*.pdf">-->
+            <!-- note that caching didn't work when accessing the XSP using the cocoon:/ protocol -->
+            <!--map:generate src="../xsp/java/cacheable.xsp" type="serverpages"/>
+                <map:transform src="cache-test/xsp-sample-to-fo.xsl">
+                <map:parameter name="pages" value="{1}"/>
+                </map:transform>
+                <map:serialize type="fo2pdf"/>
+                </map:match>
+            -->
+        </map:pipeline>
+    </map:pipelines>
 </map:sitemap>

Modified: cocoon/trunk/blocks/cocoon-fop/cocoon-fop-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-fop/cocoon-fop-sample/src/main/resources/COB-INF/sitemap.xmap?view=diff&rev=539101&r1=539100&r2=539101
==============================================================================
--- cocoon/trunk/blocks/cocoon-fop/cocoon-fop-sample/src/main/resources/COB-INF/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-fop/cocoon-fop-sample/src/main/resources/COB-INF/sitemap.xmap Thu May 17 13:20:18 2007
@@ -23,83 +23,85 @@
 
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
 
-<!-- =========================== Views =================================== -->
+    <!-- =========================== Views =================================== -->
 
-  <map:views>
-    <map:view from-label="content" name="content">
-      <map:serialize type="xml"/>
-    </map:view>
-
-    <map:view from-label="content" name="pretty-content">
-      <map:transform src="servlet:style-default:/stylesheets/system/xml2html.xslt"/>
-      <map:transform type="servletLinkRewriter" />
-      <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>
-
-      <!-- list of samples -->
-      <map:match pattern="welcome">
-        <map:generate src="misc/samples.xml"/>
-        <map:transform src="servlet:style-default:/common/style/xsl/html/simple-samples2html.xsl" />
-        <map:transform type="servletLinkRewriter" />
-        <map:serialize/>
-      </map:match>
-
-      <!-- hello world -->
-      <map:match pattern="hello.pdf">
-        <map:generate src="servlet:main-sample:/hello-world/hello.xml"/>
-        <map:transform src="servlet:main-sample:/hello-world/style/xsl/page2fo.xsl"/>
-        <map:serialize type="fo2pdf"/>
-      </map:match>
-
-      <map:match pattern="hello.ps">
-        <map:generate src="servlet:main-sample:/hello-world/hello.xml"/>
-        <map:transform src="servlet:main-sample:/hello-world/style/xsl/page2fo.xsl"/>
-        <map:serialize type="fo2ps"/>
-      </map:match>
-
-      <!-- xsl-fo document access -->
-      <map:match pattern="**/*.fo.xml">
-        <map:generate src="{1}/{2}.fo.xml"/>
-        <!-- This stylesheet makes image URLs absolute, so that FOP can
-        display images. {realpath:/} returns the absolute path of the
-        context root. -->
-        <map:transform src="misc/fix-imagelinks.xsl" label="content">
-          <map:parameter name="ctxroot" value="{realpath:/}"/>
-          <map:parameter name="dir" value="samples/fop/{1}/"/>
-        </map:transform>
-        <map:serialize type="xml"/>
-      </map:match>
-
-      <!-- PDF conversion -->
-      <map:match pattern="**/*.pdf">
-        <map:generate src="cocoon:/{1}/{2}.fo.xml"/>
-        <map:serialize type="fo2pdf"/>
-      </map:match>
-
-      <!-- reuse the XSP caching example for our caching test
-           Disabled for now as we don't want a dependency to XSP!
-      <map:match pattern="cache-test-*.pdf">-->
-        <!-- note that caching didn't work when accessing the XSP using the cocoon:/ protocol -->
-        <!--map:generate src="../xsp/java/cacheable.xsp" type="serverpages"/>
-        <map:transform src="cache-test/xsp-sample-to-fo.xsl">
-           <map:parameter name="pages" value="{1}"/>
-        </map:transform>
-        <map:serialize type="fo2pdf"/>
-      </map:match>
-      -->
-    </map:pipeline>
-  </map:pipelines>
+    <map:views>
+        <map:view from-label="content" name="content">
+            <map:serialize type="xml" />
+        </map:view>
+
+        <map:view from-label="content" name="pretty-content">
+            <!-- Make use of servlet services -->
+            <map:serialize type="servletService">
+                <map:parameter name="service" value="servlet:style-default:/service/system/xml2html" />
+            </map:serialize>
+        </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>
+
+            <!-- list of samples -->
+            <map:match pattern="welcome">
+                <map:generate src="misc/samples.xml" />
+                <!-- Make use of servlet services -->
+                <map:serialize type="servletService">
+                    <map:parameter name="service" value="servlet:style-default:/service/common/simple-samples2html" />
+                </map:serialize>
+            </map:match>
+
+            <!-- hello world -->
+            <map:match pattern="hello.pdf">
+                <map:generate src="servlet:main-sample:/hello-world/hello.xml" />
+                <map:transform src="servlet:main-sample:/hello-world/style/xsl/page2fo.xsl" />
+                <map:serialize type="fo2pdf" />
+            </map:match>
+
+            <map:match pattern="hello.ps">
+                <map:generate src="servlet:main-sample:/hello-world/hello.xml" />
+                <map:transform src="servlet:main-sample:/hello-world/style/xsl/page2fo.xsl" />
+                <map:serialize type="fo2ps" />
+            </map:match>
+
+            <!-- xsl-fo document access -->
+            <map:match pattern="**/*.fo.xml">
+                <map:generate src="{1}/{2}.fo.xml" />
+                <!-- This stylesheet makes image URLs absolute, so that FOP can
+                    display images. {realpath:/} returns the absolute path of the
+                    context root. -->
+                <map:transform src="misc/fix-imagelinks.xsl" label="content">
+                    <map:parameter name="ctxroot" value="{realpath:/}" />
+                    <map:parameter name="dir" value="samples/fop/{1}/" />
+                </map:transform>
+                <map:serialize type="xml" />
+            </map:match>
+
+            <!-- PDF conversion -->
+            <map:match pattern="**/*.pdf">
+                <map:generate src="cocoon:/{1}/{2}.fo.xml" />
+                <map:serialize type="fo2pdf" />
+            </map:match>
+
+            <!-- reuse the XSP caching example for our caching test
+                Disabled for now as we don't want a dependency to XSP!
+                <map:match pattern="cache-test-*.pdf">-->
+            <!-- note that caching didn't work when accessing the XSP using the cocoon:/ protocol -->
+            <!--map:generate src="../xsp/java/cacheable.xsp" type="serverpages"/>
+                <map:transform src="cache-test/xsp-sample-to-fo.xsl">
+                <map:parameter name="pages" value="{1}"/>
+                </map:transform>
+                <map:serialize type="fo2pdf"/>
+                </map:match>
+            -->
+        </map:pipeline>
+    </map:pipelines>
 </map:sitemap>