cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fel...@apache.org
Subject svn commit: r539084 [1/3] - in /cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources: COB-INF/ COB-INF/aggregation/ COB-INF/catalog/ COB-INF/errorhandling/ COB-INF/filter/ COB-INF/imagereader/ COB-INF/modules/ COB-INF...
Date Thu, 17 May 2007 19:17:02 GMT
Author: felixk
Date: Thu May 17 12:17:01 2007
New Revision: 539084

URL: http://svn.apache.org/viewvc?view=rev&rev=539084
Log:
-add views and other matchers
-use servlet services
-reformatted

Modified:
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/aggregation/sitemap.xmap
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/catalog/sitemap.xmap
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/core-samples-additional.xsamples
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/errorhandling/sitemap.xmap
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/filter/sitemap.xmap
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/imagereader/sitemap.xmap
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/modules/sitemap.xmap
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/paginator/sitemap.xmap
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/protected/sitemap.xmap
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/protected/stylesheets/simple-page2html.xsl
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/simpleform/four/sitemap.xmap
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/simpleform/one/sitemap.xmap
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/simpleform/sitemap.xmap
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/simpleform/three/sitemap.xmap
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/simpleform/two/sitemap.xmap
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/sitemap.xmap
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/sites/sitemap.xmap
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/sources/sitemap.xmap
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/sources/xsp.xmap
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/stream/sitemap.xmap
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/META-INF/cocoon/spring/cocoon-core-additional-sample.xml

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/aggregation/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/aggregation/sitemap.xmap?view=diff&rev=539084&r1=539083&r2=539084
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/aggregation/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/aggregation/sitemap.xmap Thu May 17 12:17:01 2007
@@ -20,191 +20,189 @@
 
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
 
-  <!-- =========================== Views =================================== -->
+    <!-- =========================== Views =================================== -->
 
-  <map:views>
-    <map:view name="content" from-label="content">
-      <map:serialize type="xml"/>
-    </map:view>
-
-    <map:view from-label="content" name="pretty-content">
-      <map:transform src="context://stylesheets/system/xml2html.xslt"/>
-      <map:serialize type="html"/>
-    </map:view>
-
-    <map:view name="links" from-position="last">
-      <map:serialize type="links"/>
-    </map:view>
-  </map:views>
-
-  <!-- =========================== Pipelines ================================= -->
-
-  <map:pipelines>
-    <map:pipeline>
-
-      <map:match pattern="">
-        <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>
-
-      <!--
-        - News sources, post processed using XSLT, for content aggregation
-        - samples.
-        -->
-
-      <map:match pattern="slashdot">
-        <map:generate src="http://slashdot.org/slashdot.xml"/>
-        <map:transform src="stylesheets/slashdot.xsl"/>
-        <map:serialize/>
-      </map:match>
-
-      <map:match pattern="**.gif">
-        <map:read mime-type="image/gif" src="http://images.slashdot.org/topics/{1}.gif"/>
-      </map:match>
-
-      <map:match pattern="**.jpg">
-        <map:read mime-type="image/jpg" src="http://images.slashdot.org/topics/{1}.jpg"/>
-      </map:match>
-
-      <map:match pattern="moreover">
-        <map:generate src="http://www.moreover.com/cgi-local/page?o=xml&amp;c=Developer%20news"/>
-        <map:transform src="stylesheets/moreover.xsl"/>
-        <map:serialize/>
-      </map:match>
-
-      <map:match pattern="xmlhack">
-        <map:generate src="http://www.xmlhack.com/cdf.cdf"/>
-        <map:transform src="stylesheets/xmlhack.xsl"/>
-        <map:serialize/>
-      </map:match>
-
-
-      <!--
-        - Content aggregation samples
-        -->
-
-      <!-- Aggregation using the sitemap aggregator -->
-      <map:match pattern="aggregate">
-        <map:aggregate element="page">
-          <!--+
-              | Aggregation is a very powerful concept that allows a document
-              | be generated from several other documents. Strictly speaking,
-              | all parts are just concatenated in this order to a new
-              | document.
-              |
-              | Several things to note here:
-              |
-              |   "cocoon:" is a pseudo protocol and refers to another
-              |   pipeline. "cocoon:/" refers to a pipeline from the current
-              |   sitemap while "cocoon://" refers to a pipeline from the root
-              |   sitemap.
-              |
-              | Other pseudo protocols exist:
-              |
-              |   "context:" is another pseudo protocol, "context://" is
-              |   refering to a resource using the servlet context.
-              |
-              |   "resource:" is yet another pseudo protocol, "resource://" is
-              |   refering to a resource from the context classloader.
-              |
-              | All these pseudo protocols are declared in the cocoon.xconf.
-              |
-              | Thus, the parts refer to the pipeline fragments above.
-              |
-              | The optional element attribute places the content in a new root
-              | element named as specified, using the namespace provided by an
-              | optional ns attribute.
-              |
-              | Please see docs for further explanations.
-              +-->
-         <map:part src="cocoon:/slashdot" element="slashdot"/>
-         <map:part src="cocoon:/moreover" element="moreover"/>
-         <map:part src="cocoon:/xmlhack" element="xmlhack"/>
-        </map:aggregate>
-        <map:transform src="stylesheets/news.xsl"/>
-        <map:serialize/>
-      </map:match>
-
-      <!-- Aggregation using the include transformer -->
-      <map:match pattern="aggregate2">
-        <map:generate src="aggregate.xml"/>
-        <map:transform type="include"/>
-        <map:transform type="xsltc" src="stylesheets/news.xsl"/>
-        <map:serialize/>
-      </map:match>
-
-      <!-- Aggregation using the include transformer, done in parallel threads -->
-      <map:match pattern="aggregate3">
-        <map:generate src="aggregate.xml"/>
-        <map:transform type="include">
-          <map:parameter name="parallel" value="true"/>
-        </map:transform>
-        <map:transform type="xsltc" src="stylesheets/news.xsl"/>
-        <map:serialize/>
-      </map:match>
-
-      <!-- Aggregation using the CInclude transformer -->
-      <map:match pattern="aggregate4">
-        <map:generate src="aggregate.xml"/>
-        <map:transform type="cinclude"/>
-        <map:transform type="xsltc" src="stylesheets/news.xsl"/>
-        <map:serialize/>
-      </map:match>
-  
-      <!-- Aggregation using the XInclude transformer -->
-      <map:match pattern="aggregate5">
-        <map:generate src="xaggregate.xml"/>
-        <map:transform type="xinclude"/>
-        <map:transform type="xsltc" src="stylesheets/news.xsl"/>
-        <map:serialize/>
-      </map:match>
-  
-
-      <!--
-        - Include Samples
-        -->
-      <map:match pattern="include-*-*-*">
-        <map:generate src="content/i{3}.xml"/>
-        <map:transform type="include">
-          <map:parameter name="parallel" value="{1}"/>
-          <map:parameter name="recursive" value="{2}"/>
-        </map:transform>
-        <map:transform src="context://samples/common/style/xsl/html/simple-page2html.xsl">
-          <map:parameter name="contextPath" value="{request:contextPath}"/>
-          <map:parameter name="servletPath" value="{request:servletPath}"/>
-          <map:parameter name="sitemapURI" value="{request:sitemapURI}"/>
-          <map:parameter name="file" value="content/test.xml"/>
-          <map:parameter name="remove" value="{0}"/>
-        </map:transform>
-        <map:serialize/>
-      </map:match>
-
-
-      <!--
-        - XInclude Samples
-        -->
-      <map:match pattern="*.html">
-        <map:generate src="content/{1}.xml"/>
-        <map:transform type="xinclude"/>
-        <map:transform src="context://samples/common/style/xsl/html/simple-page2html.xsl">
-          <map:parameter name="contextPath" value="{request:contextPath}"/>
-          <map:parameter name="servletPath" value="{request:servletPath}"/>
-          <map:parameter name="sitemapURI" value="{request:sitemapURI}"/>
-          <map:parameter name="file" value="content/test.xml"/>
-          <map:parameter name="remove" value="{0}"/>
-        </map:transform>
-        <map:serialize/>
-      </map:match>
-
-      <!-- Source Files -->
-      <map:match pattern="*.xml">
-        <map:generate src="content/{1}.xml"/>
-        <map:serialize/>
-      </map:match>
+    <map:views>
+        <map:view name="content" from-label="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 name="links" from-position="last">
+            <map:serialize type="links" />
+        </map:view>
+    </map:views>
+
+    <!-- =========================== Pipelines ================================= -->
+
+    <map:pipelines>
+        <map:pipeline>
+
+            <map:match pattern="">
+                <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>
+
+            <map:match pattern="sitemap.xmap">
+                <map:read src="sitemap.xmap" mime-type="text/xml" />
+            </map:match>
+
+            <!--
+                - News sources, post processed using XSLT, for content aggregation
+                - samples.
+            -->
+
+            <map:match pattern="slashdot">
+                <map:generate src="http://slashdot.org/slashdot.xml" />
+                <map:transform src="stylesheets/slashdot.xsl" />
+                <map:serialize />
+            </map:match>
+
+            <map:match pattern="**.gif">
+                <map:read mime-type="image/gif" src="http://images.slashdot.org/topics/{1}.gif" />
+            </map:match>
+
+            <map:match pattern="**.jpg">
+                <map:read mime-type="image/jpg" src="http://images.slashdot.org/topics/{1}.jpg" />
+            </map:match>
+
+            <map:match pattern="moreover">
+                <map:generate src="http://www.moreover.com/cgi-local/page?o=xml&amp;c=Developer%20news" />
+                <map:transform src="stylesheets/moreover.xsl" />
+                <map:serialize />
+            </map:match>
+
+            <map:match pattern="xmlhack">
+                <map:generate src="http://www.xmlhack.com/cdf.cdf" />
+                <map:transform src="stylesheets/xmlhack.xsl" />
+                <map:serialize />
+            </map:match>
+
+
+            <!--
+                - Content aggregation samples
+            -->
+
+            <!-- Aggregation using the sitemap aggregator -->
+            <map:match pattern="aggregate">
+                <map:aggregate element="page">
+                    <!--+
+                        | Aggregation is a very powerful concept that allows a document
+                        | be generated from several other documents. Strictly speaking,
+                        | all parts are just concatenated in this order to a new
+                        | document.
+                        |
+                        | Several things to note here:
+                        |
+                        |   "cocoon:" is a pseudo protocol and refers to another
+                        |   pipeline. "cocoon:/" refers to a pipeline from the current
+                        |   sitemap while "cocoon://" refers to a pipeline from the root
+                        |   sitemap.
+                        |
+                        | Other pseudo protocols exist:
+                        |
+                        |   "context:" is another pseudo protocol, "context://" is
+                        |   refering to a resource using the servlet context.
+                        |
+                        |   "resource:" is yet another pseudo protocol, "resource://" is
+                        |   refering to a resource from the context classloader.
+                        |
+                        | All these pseudo protocols are declared in the cocoon.xconf.
+                        |
+                        | Thus, the parts refer to the pipeline fragments above.
+                        |
+                        | The optional element attribute places the content in a new root
+                        | element named as specified, using the namespace provided by an
+                        | optional ns attribute.
+                        |
+                        | Please see docs for further explanations.
+                        +-->
+                    <map:part src="cocoon:/slashdot" element="slashdot" />
+                    <map:part src="cocoon:/moreover" element="moreover" />
+                    <map:part src="cocoon:/xmlhack" element="xmlhack" />
+                </map:aggregate>
+                <map:transform src="stylesheets/news.xsl" />
+                <map:serialize />
+            </map:match>
+
+            <!-- Aggregation using the include transformer -->
+            <map:match pattern="aggregate2">
+                <map:generate src="aggregate.xml" />
+                <map:transform type="include" />
+                <map:transform type="xsltc" src="stylesheets/news.xsl" />
+                <map:serialize />
+            </map:match>
+
+            <!-- Aggregation using the include transformer, done in parallel threads -->
+            <map:match pattern="aggregate3">
+                <map:generate src="aggregate.xml" />
+                <map:transform type="include">
+                    <map:parameter name="parallel" value="true" />
+                </map:transform>
+                <map:transform type="xsltc" src="stylesheets/news.xsl" />
+                <map:serialize />
+            </map:match>
+
+            <!-- Aggregation using the CInclude transformer -->
+            <map:match pattern="aggregate4">
+                <map:generate src="aggregate.xml" />
+                <map:transform type="cinclude" />
+                <map:transform type="xsltc" src="stylesheets/news.xsl" />
+                <map:serialize />
+            </map:match>
+
+            <!-- Aggregation using the XInclude transformer -->
+            <map:match pattern="aggregate5">
+                <map:generate src="xaggregate.xml" />
+                <map:transform type="xinclude" />
+                <map:transform type="xsltc" src="stylesheets/news.xsl" />
+                <map:serialize />
+            </map:match>
+
+
+            <!--
+                - Include Samples
+            -->
+            <map:match pattern="include-*-*-*">
+                <map:generate src="content/i{3}.xml" />
+                <map:transform type="include">
+                    <map:parameter name="parallel" value="{1}" />
+                    <map:parameter name="recursive" value="{2}" />
+                </map:transform>
+                <!-- 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>
+
+
+            <!--
+                - XInclude Samples
+            -->
+            <map:match pattern="*.html">
+                <map:generate src="content/{1}.xml" />
+                <map:transform type="xinclude" />
+                <!-- 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>
+
+            <!-- Source Files -->
+            <map:match pattern="*.xml">
+                <map:generate src="content/{1}.xml" />
+                <map:serialize />
+            </map:match>
 
-    </map:pipeline>
-  </map:pipelines>
+        </map:pipeline>
+    </map:pipelines>
 </map:sitemap>

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/catalog/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/catalog/sitemap.xmap?view=diff&rev=539084&r1=539083&r2=539084
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/catalog/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/catalog/sitemap.xmap Thu May 17 12:17:01 2007
@@ -20,52 +20,56 @@
 
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
 
- <map:pipelines>
-  <map:pipeline>
- 
-   <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>
-
-   <!-- Catalog entity resolver =========================== -->
-
-   <map:match pattern="catalog-demo">
-    <map:generate src="catalog-demo.xml"/>
-    <map:transform src="style.xsl"/>
-    <map:serialize type="html"/>
-   </map:match>
-
-   <map:match pattern="entity-test.html">
-    <map:generate src="catalog-test.xml"/>
-    <map:transform src="style.xsl"/>
-    <map:serialize type="html"/>
-   </map:match>
-
-   <map:match pattern="sdocbook-demo">
-    <map:generate src="article.xml"/>
-    <map:transform src="sdocbook2body.xsl"/>
-    <map:serialize type="html"/>
-   </map:match>
-
-   <!-- ========================= Resources ================================ -->
-
-   <map:match pattern="images/**.gif">
-    <map:read src="context://resources/images/{1}.gif" mime-type="image/gif"/>
-   </map:match>
+    <map:pipelines>
+        <map:pipeline>
 
-   <!-- delegate to parent sitemap 
-   <map:handle-errors/> -->
+            <map:match pattern="">
+                <map:redirect-to uri="welcome" />
+            </map:match>
+
+            <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>
+
+            <map:match pattern="sitemap.xmap">
+                <map:read src="sitemap.xmap" mime-type="text/xml" />
+            </map:match>
+
+            <!-- Catalog entity resolver =========================== -->
+
+            <map:match pattern="catalog-demo">
+                <map:generate src="catalog-demo.xml" />
+                <map:transform src="style.xsl" />
+                <map:serialize type="html" />
+            </map:match>
+
+            <map:match pattern="entity-test.html">
+                <map:generate src="catalog-test.xml" />
+                <map:transform src="style.xsl" />
+                <map:serialize type="html" />
+            </map:match>
+
+            <map:match pattern="sdocbook-demo">
+                <map:generate src="article.xml" />
+                <map:transform src="sdocbook2body.xsl" />
+                <map:serialize type="html" />
+            </map:match>
+
+            <!-- ========================= Resources ================================ -->
+
+            <map:match pattern="images/**.gif">
+                <map:read src="context://resources/images/{1}.gif" mime-type="image/gif" />
+            </map:match>
 
-  </map:pipeline>
- </map:pipelines>
+            <!-- delegate to parent sitemap 
+                <map:handle-errors/> -->
+
+        </map:pipeline>
+    </map:pipelines>
 
 </map:sitemap>
 

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/core-samples-additional.xsamples
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/core-samples-additional.xsamples?view=diff&rev=539084&r1=539083&r2=539084
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/core-samples-additional.xsamples (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/core-samples-additional.xsamples Thu May 17 12:17:01 2007
@@ -19,7 +19,7 @@
 <xsamples xpath="/samples" unless="group[@name='Additional core samples']">
 
   <group name="Additional core samples">
-    <sample name="Additional Core Samples" href="core-samples-additional/">
+    <sample name="Additional Core Samples" href="/cocoon-core-additional-sample/">
       Additional samples of core components 
       (the main samples are in the core-samples-main block).
     </sample>

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/errorhandling/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/errorhandling/sitemap.xmap?view=diff&rev=539084&r1=539083&r2=539084
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/errorhandling/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/errorhandling/sitemap.xmap Thu May 17 12:17:01 2007
@@ -21,74 +21,72 @@
     +-->
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
 
-  <map:components>
-    <map:generators default="file">
-      <map:generator name="exception" src="org.apache.cocoon.samples.errorhandling.ExceptionGenerator"/>
-    </map:generators>
-    <map:selectors default="browser">
-      <map:selector name="exception" src="org.apache.cocoon.selection.XPathExceptionSelector">
-        <exception name="application" class="org.apache.cocoon.samples.errorhandling.ApplicationException">
-          <xpath name="application1" test="errorCode=1"/>
-          <xpath name="application2" test="errorCode=2"/>
-        </exception>
-        <exception name="validation" class="org.apache.cocoon.samples.errorhandling.ValidationException"/>
-        <exception name="not-found" class="org.apache.cocoon.ResourceNotFoundException"/>
-        <exception class="java.lang.Throwable" unroll="true"/>
-      </map:selector>
-    </map:selectors>
-    <map:actions>
-      <map:action name="exception" src="org.apache.cocoon.samples.errorhandling.ExceptionAction"/>
-    </map:actions>
-  </map:components>
-
-  <map:pipelines>
-    <map:pipeline>
-      <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>
-
-      <map:match pattern="not-exists">
-        <map:generate src="{0}.xml"/>
-        <map:serialize/>
-      </map:match>
-
-      <map:match pattern="*">
-        <map:generate type="exception" src="{1}"/>
-        <map:serialize/>
-      </map:match>
-
-      <map:match pattern="internal/**">
-        <map:mount uri-prefix="internal" src="internal/"/>
-      </map:match>
-    </map:pipeline>
-
-    <map:pipeline>
-      <map:mount uri-prefix="exception" src="exception/"/>
-
-      <map:handle-errors>
-        <map:select type="exception">
-          <map:when test="not-found">
-            <map:generate src="notFound.html"/>
-            <map:serialize/>
-          </map:when>
-        </map:select>
-      </map:handle-errors>
-    </map:pipeline>
-
-    <map:handle-errors>
-      <map:generate type="notifying"/>
-      <map:transform src="context://stylesheets/system/error2html.xslt">
-        <map:parameter name="contextPath" value="{request:contextPath}"/>
-      </map:transform>
-    </map:handle-errors>
-  </map:pipelines>
+    <map:components>
+        <map:generators default="file">
+            <map:generator name="exception" src="org.apache.cocoon.samples.errorhandling.ExceptionGenerator" />
+        </map:generators>
+        <map:selectors default="browser">
+            <map:selector name="exception" src="org.apache.cocoon.selection.XPathExceptionSelector">
+                <exception name="application" class="org.apache.cocoon.samples.errorhandling.ApplicationException">
+                    <xpath name="application1" test="errorCode=1" />
+                    <xpath name="application2" test="errorCode=2" />
+                </exception>
+                <exception name="validation" class="org.apache.cocoon.samples.errorhandling.ValidationException" />
+                <exception name="not-found" class="org.apache.cocoon.ResourceNotFoundException" />
+                <exception class="java.lang.Throwable" unroll="true" />
+            </map:selector>
+        </map:selectors>
+        <map:actions>
+            <map:action name="exception" src="org.apache.cocoon.samples.errorhandling.ExceptionAction" />
+        </map:actions>
+    </map:components>
+
+    <map:pipelines>
+        <map:pipeline>
+            <map:match pattern="">
+                <map:redirect-to uri="welcome" />
+            </map:match>
+
+            <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>
+
+            <map:match pattern="not-exists">
+                <map:generate src="{0}.xml" />
+                <map:serialize />
+            </map:match>
+
+            <map:match pattern="*">
+                <map:generate type="exception" src="{1}" />
+                <map:serialize />
+            </map:match>
+
+            <map:match pattern="internal/**">
+                <map:mount uri-prefix="internal" src="internal/" />
+            </map:match>
+        </map:pipeline>
+
+        <map:pipeline>
+            <map:mount uri-prefix="exception" src="exception/" />
+
+            <map:handle-errors>
+                <map:select type="exception">
+                    <map:when test="not-found">
+                        <map:generate src="notFound.html" />
+                        <map:serialize />
+                    </map:when>
+                </map:select>
+            </map:handle-errors>
+        </map:pipeline>
+
+        <map:handle-errors>
+            <map:generate type="notifying" />
+            <map:transform src="servlet:style-default:/stylesheets/system/error2html.xslt" />
+        </map:handle-errors>
+    </map:pipelines>
 
 </map:sitemap>

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/filter/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/filter/sitemap.xmap?view=diff&rev=539084&r1=539083&r2=539084
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/filter/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/filter/sitemap.xmap Thu May 17 12:17:01 2007
@@ -18,50 +18,51 @@
 <!-- CVS $ID$ -->
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
 
-<!-- =========================== Views =================================== -->
+    <!-- =========================== Views =================================== -->
 
- <map:views>
-  <map:view name="content" from-label="content">
-   <map:serialize type="xml"/>
-  </map:view>
-
-  <map:view from-label="content" name="pretty-content">
-   <map:transform src="context://stylesheets/system/xml2html.xslt"/>
-   <map:serialize type="html"/>
-  </map:view>
-
-  <map:view name="links" from-position="last">
-   <map:serialize type="links"/>
-  </map:view>
- </map:views>
-
-<!-- =========================== Pipelines ================================= -->
-
- <map:pipelines>
-  <map:pipeline>
-
-   <map:match pattern="">
-    <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>
-
-   <map:match pattern="original">
-    <map:generate src="tobefiltered.xml"/>
-    <map:serialize type="xml"/>
-   </map:match>
-
-   <map:match pattern="filter-*-*-*">
-    <map:generate src="tobefiltered.xml"/>
-    <map:transform type="filter">
-     <map:parameter name="element-name" value="{1}"/>
-     <map:parameter name="count" value="{2}"/>
-     <map:parameter name="blocknr" value="{3}"/> 
-    </map:transform>
-    <map:serialize type="xml"/>
-   </map:match>
-  </map:pipeline>
- </map:pipelines>
+    <map:views>
+        <map:view name="content" from-label="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 name="links" from-position="last">
+            <map:serialize type="links" />
+        </map:view>
+    </map:views>
+
+    <!-- =========================== Pipelines ================================= -->
+
+    <map:pipelines>
+        <map:pipeline>
+            <map:match pattern="">
+                <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>
+
+            <map:match pattern="original">
+                <map:generate src="tobefiltered.xml" />
+                <map:serialize type="xml" />
+            </map:match>
+
+            <map:match pattern="filter-*-*-*">
+                <map:generate src="tobefiltered.xml" />
+                <map:transform type="filter">
+                    <map:parameter name="element-name" value="{1}" />
+                    <map:parameter name="count" value="{2}" />
+                    <map:parameter name="blocknr" value="{3}" />
+                </map:transform>
+                <map:serialize type="xml" />
+            </map:match>
+        </map:pipeline>
+    </map:pipelines>
 </map:sitemap>

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/imagereader/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/imagereader/sitemap.xmap?view=diff&rev=539084&r1=539083&r2=539084
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/imagereader/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/imagereader/sitemap.xmap Thu May 17 12:17:01 2007
@@ -24,70 +24,91 @@
 
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
 
-  <map:pipelines>
-    <map:pipeline>
-      <map:match pattern="">
-        <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>
- 
-      <map:match pattern="image">
-        <map:read src="logo.jpg"/>
-      </map:match>
-
-      <map:match pattern="image-size-*">
-        <map:read type="image" src="logo.jpg">
-          <map:parameter name="width" value="{1}"/>
-          <map:parameter name="height" value="{1}"/>
-        </map:read>
-      </map:match>
-
-      <map:match pattern="image-grayscale">
-        <map:read type="image" src="logo.jpg">
-          <map:parameter name="grayscale" value="true"/>
-        </map:read>
-      </map:match>
-
-      <map:match pattern="image-color-scale-*-*-*">
-        <map:read type="image" src="logo.jpg">
-          <map:parameter name="scaleRed" value="{1}"/>
-          <map:parameter name="scaleGreen" value="{2}"/>
-          <map:parameter name="scaleBlue" value="{3}"/>
-        </map:read>
-      </map:match>
-
-      <map:match pattern="image-color-offset-*-*-*">
-        <map:read type="image" src="logo.jpg">
-          <map:parameter name="offsetRed" value="{1}"/>
-          <map:parameter name="offsetGreen" value="{2}"/>
-          <map:parameter name="offsetBlue" value="{3}"/>
-        </map:read>
-      </map:match>
-
-      <map:match pattern="list">
-       <map:generate type="imagedirectory" src=".">
-         <map:parameter name="dateFormat" value="yyyy-MM-dd hh:mm" />
-         <map:parameter name="depth" value="1" />
-         <map:parameter name="include" value=".*\.jpg" />
-       </map:generate>
-       <map:transform src="dir2page.xsl" />
-       <map:serialize type="html"/>
-      </map:match>
- 
-      <map:match pattern="full-*">
-        <map:read src="{1}.jpg" mime-type="image/jpeg"/>
-      </map:match>
-
-      <map:match pattern="scale-*-*-*">
-        <map:read type="image" src="{3}.jpg" mime-type="image/jpeg">
-          <map:parameter name="width" value="{1}"/>
-          <map:parameter name="height" value="{2}"/>
-        </map:read>
-      </map:match>
+    <!-- =========================== Views =================================== -->
 
-    </map:pipeline>
-  </map:pipelines>
+    <map:views>
+        <map:view name="content" from-label="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 name="links" from-position="last">
+            <map:serialize type="links" />
+        </map:view>
+    </map:views>
+
+    <!-- =========================== Pipelines ================================= -->
+
+    <map:pipelines>
+        <map:pipeline>
+            <map:match pattern="">
+                <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>
+
+            <map:match pattern="image">
+                <map:read src="logo.jpg" />
+            </map:match>
+
+            <map:match pattern="image-size-*">
+                <map:read type="image" src="logo.jpg">
+                    <map:parameter name="width" value="{1}" />
+                    <map:parameter name="height" value="{1}" />
+                </map:read>
+            </map:match>
+
+            <map:match pattern="image-grayscale">
+                <map:read type="image" src="logo.jpg">
+                    <map:parameter name="grayscale" value="true" />
+                </map:read>
+            </map:match>
+
+            <map:match pattern="image-color-scale-*-*-*">
+                <map:read type="image" src="logo.jpg">
+                    <map:parameter name="scaleRed" value="{1}" />
+                    <map:parameter name="scaleGreen" value="{2}" />
+                    <map:parameter name="scaleBlue" value="{3}" />
+                </map:read>
+            </map:match>
+
+            <map:match pattern="image-color-offset-*-*-*">
+                <map:read type="image" src="logo.jpg">
+                    <map:parameter name="offsetRed" value="{1}" />
+                    <map:parameter name="offsetGreen" value="{2}" />
+                    <map:parameter name="offsetBlue" value="{3}" />
+                </map:read>
+            </map:match>
+
+            <map:match pattern="list">
+                <map:generate type="imagedirectory" src=".">
+                    <map:parameter name="dateFormat" value="yyyy-MM-dd hh:mm" />
+                    <map:parameter name="depth" value="1" />
+                    <map:parameter name="include" value=".*\.jpg" />
+                </map:generate>
+                <map:transform src="dir2page.xsl" />
+                <map:serialize type="html" />
+            </map:match>
+
+            <map:match pattern="full-*">
+                <map:read src="{1}.jpg" mime-type="image/jpeg" />
+            </map:match>
+
+            <map:match pattern="scale-*-*-*">
+                <map:read type="image" src="{3}.jpg" mime-type="image/jpeg">
+                    <map:parameter name="width" value="{1}" />
+                    <map:parameter name="height" value="{2}" />
+                </map:read>
+            </map:match>
+
+        </map:pipeline>
+    </map:pipelines>
 </map:sitemap>

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/modules/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/modules/sitemap.xmap?view=diff&rev=539084&r1=539083&r2=539084
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/modules/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/modules/sitemap.xmap Thu May 17 12:17:01 2007
@@ -23,403 +23,426 @@
     +-->
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
 
-  <!-- =========================== Components ============================== -->
-  <map:components>
-    <map:include-properties dir="properties"/>
-    <map:actions>
-      <!-- Action to store locale name as cookie. -->
-      <map:action name="cookie-locale" src="org.apache.cocoon.acting.LocaleAction">
-        <store-in-cookie>true</store-in-cookie>
-      </map:action>
-    </map:actions>
-  </map:components>
-
-  <!-- =========================== Resources =============================== -->
-  <map:resources>
-    <!-- This resource is used to create a composite page from menu and content -->
-    <map:resource name="composite">
-      <map:aggregate element="site">
-        <map:part src="cocoon:/menu/{../1}.html"/>
-        <map:part src="cocoon:/content/{../1}.xml" label="content"/>
-      </map:aggregate>
-      <map:transform src="site2html.xsl">
-        <map:parameter name="page" value="{../0}"/>
-      </map:transform>
-      <map:serialize/>
-    </map:resource>
-  </map:resources>
-
-  <!-- =========================== Pipelines ================================= -->
-  <map:pipelines>
-    <map:pipeline>
-
-      <!-- Default URL matcher. Matches '/' URLs-->
-      <map:match pattern="">
-        <map:redirect-to uri="index.html"/>
-      </map:match>
-
-      <map:match pattern="*.html">
-        <map:call resource="composite"/>
-      </map:match>
-
-      <!-- Index page content -->
-      <map:match pattern="content/index.xml">
-        <map:generate src="menu.xml"/>
-        <map:transform src="menu2content.xsl"/>
-        <map:serialize/>
-      </map:match>
-
-      <!-- Menu -->
-      <map:match pattern="menu/*">
-        <map:generate src="menu.xml"/>
-        <map:transform src="menu2navigation.xsl">
-          <map:parameter name="page" value="{1}"/>
-        </map:transform>
-        <map:serialize/>
-      </map:match>
-
-
-      <map:match pattern="content/request.xml">
-        <map:generate type="jx" src="properties.xml">
-          <map:parameter name="attributeNames" value="{request:attributeNames}"/>
-          <map:parameter name="authType" value="{request:authType}"/>
-          <map:parameter name="characterEncoding" value="{request:characterEncoding}"/>
-          <map:parameter name="cookieMap" value="{request:cookieMap}"/>
-          <map:parameter name="cookies" value="{request:cookies}"/>
-          <map:parameter name="contentLength" value="{request:contentLength}"/>
-          <map:parameter name="contentType" value="{request:contentType}"/>
-          <map:parameter name="contextPath" value="{request:contextPath}"/>
-          <map:parameter name="headers" value="{request:headers}"/>
-          <map:parameter name="headerNames" value="{request:headerNames}"/>
-          <map:parameter name="locale" value="{request:locale}"/>
-          <map:parameter name="locales" value="{request:locales}"/>
-          <map:parameter name="method" value="{request:method}"/>
-          <!--map:parameter name="parameter-map" value="{request:parameterMap}"/-->
-          <map:parameter name="parameterNames" value="{request:parameterNames}"/>
-          <map:parameter name="pathInfo" value="{request:pathInfo}"/>
-          <map:parameter name="pathTranslated" value="{request:pathTranslated}"/>
-          <map:parameter name="protocol" value="{request:protocol}"/>
-          <map:parameter name="queryString" value="{request:queryString}"/>
-          <map:parameter name="remoteAddr" value="{request:remoteAddr}"/>
-          <map:parameter name="remoteHost" value="{request:remoteHost}"/>
-          <map:parameter name="remoteUser" value="{request:remoteUser}"/>
-          <map:parameter name="requestURI" value="{request:requestURI}"/>
-          <map:parameter name="requestedSessionId" value="{request:requestedSessionId}"/>
-          <map:parameter name="requestedSessionIdFromCookie" value="{request:requestedSessionIdFromCookie}"/>
-          <map:parameter name="requestedSessionIdFromURL" value="{request:requestedSessionIdFromURL}"/>
-          <map:parameter name="requestedSessionIdValid" value="{request:requestedSessionIdValid}"/>
-          <map:parameter name="scheme" value="{request:scheme}"/>
-          <map:parameter name="secure" value="{request:secure}"/>
-          <map:parameter name="serverName" value="{request:serverName}"/>
-          <map:parameter name="serverPort" value="{request:serverPort}"/>
-          <map:parameter name="servletPath" value="{request:servletPath}"/>
-          <map:parameter name="session [truncated]" value="{request:concat('org. ... .', substring(session, 36))}"/>
-          <map:parameter name="sitemapURI" value="{request:sitemapURI}"/>
-          <map:parameter name="userPrincipal" value="{request:userPrincipal}"/>
-        </map:generate>
-        <map:transform src="properties2html.xsl">
-          <map:parameter name="title" value="Request Input Module (RequestModule)"/>
-        </map:transform>
-        <map:serialize/>
-      </map:match>
-
-      <map:match pattern="content/baselink.xml">
-        <map:generate type="jx" src="properties.xml">
-          <map:parameter name="sitemapAsBase" value="{baselink:SitemapBaseLink}"/>
-          <map:parameter name="requestAsBase" value="{baselink:RequestBaseLink}"/>
-        </map:generate>
-
-        <map:transform src="properties2html.xsl">
-          <map:parameter name="title" value="BaseLink Input Module (BaseLinkModule)"/>
-          <map:parameter name="description" value="Returns a relative path (../,
+    <!-- =========================== Components ============================== -->
+    <map:components>
+        <map:include-properties dir="properties" />
+        <map:actions>
+            <!-- Action to store locale name as cookie. -->
+            <map:action name="cookie-locale" src="org.apache.cocoon.acting.LocaleAction">
+                <store-in-cookie>true</store-in-cookie>
+            </map:action>
+        </map:actions>
+    </map:components>
+
+    <!-- =========================== Resources =============================== -->
+    <map:resources>
+        <!-- This resource is used to create a composite page from menu and content -->
+        <map:resource name="composite">
+            <map:aggregate element="site">
+                <map:part src="cocoon:/menu/{../1}.html" />
+                <map:part src="cocoon:/content/{../1}.xml" label="content" />
+            </map:aggregate>
+            <map:transform src="site2html.xsl">
+                <map:parameter name="page" value="{../0}" />
+            </map:transform>
+            <map:serialize />
+        </map:resource>
+    </map:resources>
+
+    <!-- =========================== Views =================================== -->
+
+    <map:views>
+        <map:view name="content" from-label="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 name="links" from-position="last">
+            <map:serialize type="links" />
+        </map:view>
+    </map:views>
+
+    <!-- =========================== Pipelines ================================= -->
+
+    <map:pipelines>
+        <map:pipeline>
+
+            <!-- Default URL matcher. Matches '/' URLs-->
+            <map:match pattern="">
+                <map:redirect-to uri="index.html" />
+            </map:match>
+
+            <map:match pattern="*.html">
+                <map:call resource="composite" />
+            </map:match>
+
+            <!-- Index page content -->
+            <map:match pattern="content/index.xml">
+                <map:generate src="menu.xml" />
+                <map:transform src="menu2content.xsl" />
+                <map:serialize />
+            </map:match>
+
+            <!-- Menu -->
+            <map:match pattern="menu/*">
+                <map:generate src="menu.xml" />
+                <map:transform src="menu2navigation.xsl">
+                    <map:parameter name="page" value="{1}" />
+                </map:transform>
+                <map:serialize />
+            </map:match>
+
+
+            <map:match pattern="content/request.xml">
+                <map:generate type="jx" src="properties.xml">
+                    <map:parameter name="attributeNames" value="{request:attributeNames}" />
+                    <map:parameter name="authType" value="{request:authType}" />
+                    <map:parameter name="characterEncoding" value="{request:characterEncoding}" />
+                    <map:parameter name="cookieMap" value="{request:cookieMap}" />
+                    <map:parameter name="cookies" value="{request:cookies}" />
+                    <map:parameter name="contentLength" value="{request:contentLength}" />
+                    <map:parameter name="contentType" value="{request:contentType}" />
+                    <map:parameter name="contextPath" value="{request:contextPath}" />
+                    <map:parameter name="headers" value="{request:headers}" />
+                    <map:parameter name="headerNames" value="{request:headerNames}" />
+                    <map:parameter name="locale" value="{request:locale}" />
+                    <map:parameter name="locales" value="{request:locales}" />
+                    <map:parameter name="method" value="{request:method}" />
+                    <!--map:parameter name="parameter-map" value="{request:parameterMap}"/-->
+                    <map:parameter name="parameterNames" value="{request:parameterNames}" />
+                    <map:parameter name="pathInfo" value="{request:pathInfo}" />
+                    <map:parameter name="pathTranslated" value="{request:pathTranslated}" />
+                    <map:parameter name="protocol" value="{request:protocol}" />
+                    <map:parameter name="queryString" value="{request:queryString}" />
+                    <map:parameter name="remoteAddr" value="{request:remoteAddr}" />
+                    <map:parameter name="remoteHost" value="{request:remoteHost}" />
+                    <map:parameter name="remoteUser" value="{request:remoteUser}" />
+                    <map:parameter name="requestURI" value="{request:requestURI}" />
+                    <map:parameter name="requestedSessionId" value="{request:requestedSessionId}" />
+                    <map:parameter name="requestedSessionIdFromCookie" value="{request:requestedSessionIdFromCookie}" />
+                    <map:parameter name="requestedSessionIdFromURL" value="{request:requestedSessionIdFromURL}" />
+                    <map:parameter name="requestedSessionIdValid" value="{request:requestedSessionIdValid}" />
+                    <map:parameter name="scheme" value="{request:scheme}" />
+                    <map:parameter name="secure" value="{request:secure}" />
+                    <map:parameter name="serverName" value="{request:serverName}" />
+                    <map:parameter name="serverPort" value="{request:serverPort}" />
+                    <map:parameter name="servletPath" value="{request:servletPath}" />
+                    <map:parameter name="session [truncated]" value="{request:concat('org. ... .', substring(session, 36))}" />
+                    <map:parameter name="sitemapURI" value="{request:sitemapURI}" />
+                    <map:parameter name="userPrincipal" value="{request:userPrincipal}" />
+                </map:generate>
+                <map:transform src="properties2html.xsl">
+                    <map:parameter name="title" value="Request Input Module (RequestModule)" />
+                </map:transform>
+                <map:serialize />
+            </map:match>
+
+            <map:match pattern="content/baselink.xml">
+                <map:generate type="jx" src="properties.xml">
+                    <map:parameter name="sitemapAsBase" value="{baselink:SitemapBaseLink}" />
+                    <map:parameter name="requestAsBase" value="{baselink:RequestBaseLink}" />
+                </map:generate>
+
+                <map:transform src="properties2html.xsl">
+                    <map:parameter name="title" value="BaseLink Input Module (BaseLinkModule)" />
+                    <map:parameter name="description" value="Returns a relative path (../,
             ../../, etc) linking to either the base of the current request URI or the base
             of the sitemap.
             In this demonstration, the request URI is {0} (an internal request not
-            equivalent to what the user sees)"/>
-        </map:transform>
-        <map:serialize/>
-      </map:match>
-
-      <map:match pattern="requestparam">
-        <map:redirect-to uri="content/requestparam.xml?foo=foo+param&amp;bar=bar+param"/>
-      </map:match>
-      <map:match pattern="content/requestparam.xml">
-        <map:generate type="jx" src="properties.xml">
-          <map:parameter name="foo" value="{request-param:foo}"/>
-          <map:parameter name="bar" value="{request-param:bar}"/>
-        </map:generate>
-        <map:transform src="properties2html.xsl">
-          <map:parameter name="title" value="Request Parameter Input Module (RequestParameterModule)"/>
-          <map:parameter name="description" value="Provides access to request
+            equivalent to what the user sees)" />
+                </map:transform>
+                <map:serialize />
+            </map:match>
+
+            <map:match pattern="requestparam">
+                <map:redirect-to uri="content/requestparam.xml?foo=foo+param&amp;bar=bar+param" />
+            </map:match>
+            <map:match pattern="content/requestparam.xml">
+                <map:generate type="jx" src="properties.xml">
+                    <map:parameter name="foo" value="{request-param:foo}" />
+                    <map:parameter name="bar" value="{request-param:bar}" />
+                </map:generate>
+                <map:transform src="properties2html.xsl">
+                    <map:parameter name="title" value="Request Parameter Input Module (RequestParameterModule)" />
+                    <map:parameter name="description" value="Provides access to request
             parameters. Edit the URL of this page to see the request parameter
-            values change (parts after the '?' are request parameters) ."/>
-        </map:transform>
-        <map:serialize/>
-      </map:match>
-
-      <map:match pattern="content/session.xml">
-        <map:generate type="jx" src="properties.xml">
-          <map:parameter name="attributeNames" value="{session:attributeNames}"/>
-          <map:parameter name="creationTime" value="{session:creationTime}"/>
-          <map:parameter name="lastAccessedTime" value="{session:lastAccessedTime}"/>
-          <map:parameter name="maxInactiveInterval" value="{session:maxInactiveInterval}"/>
-          <map:parameter name="id" value="{session:id}"/>
-          <map:parameter name="new" value="{session:new}"/>
-        </map:generate>
-        <map:transform src="properties2html.xsl">
-          <map:parameter name="title" value="Session Input Module (SessionModule)"/>
-          <map:parameter name="description" value="SessionModule provides access
-            to Session object properties."/>
-        </map:transform>
-        <map:serialize/>
-      </map:match>
-
-      <map:match pattern="content/system-property.xml">
-        <map:generate type="jx" src="properties.xml">
-          <map:parameter name="java.version" value="{system-property:java.version}"/>
-          <map:parameter name="java.vendor" value="{system-property:java.vendor}"/>
-          <map:parameter name="java.vendor.url" value="{system-property:java.vendor.url}"/>
-          <map:parameter name="java.home" value="{system-property:java.home}"/>
-          <map:parameter name="java.vm.specification.version" value="{system-property:java.vm.specification.version}"/>
-          <map:parameter name="java.vm.specification.vendor" value="{system-property:java.vm.specification.vendor}"/>
-          <map:parameter name="java.vm.specification.name" value="{system-property:java.vm.specification.name}"/>
-          <map:parameter name="java.vm.version" value="{system-property:java.vm.version}"/>
-          <map:parameter name="java.vm.vendor" value="{system-property:java.vm.vendor}"/>
-          <map:parameter name="java.vm.name" value="{system-property:java.vm.name}"/>
-          <map:parameter name="java.specification.version" value="{system-property:java.specification.version}"/>
-          <map:parameter name="java.specification.vendor" value="{system-property:java.specification.vendor}"/>
-          <map:parameter name="java.specification.name" value="{system-property:java.specification.name}"/>
-          <map:parameter name="java.specification.name" value="{system-property:java.specification.name}"/>
-          <map:parameter name="java.class.path" value="{system-property:java.class.path}"/>
-          <map:parameter name="java.ext.dirs" value="{system-property:java.ext.dirs}"/>
-          <map:parameter name="os.name" value="{system-property:os.name}"/>
-          <map:parameter name="os.arch" value="{system-property:os.arch}"/>
-          <map:parameter name="os.version" value="{system-property:os.version}"/>
-          <map:parameter name="file.separator" value="{system-property:file.separator}"/>
-          <map:parameter name="path.separator" value="{system-property:path.separator}"/>
-          <map:parameter name="line.separator" value="{system-property:line.separator}"/>
-          <map:parameter name="user.name" value="{system-property:user.name}"/>
-          <map:parameter name="user.home" value="{system-property:user.home}"/>
-          <map:parameter name="user.dir" value="{system-property:user.dir}"/>
-          <!-- Function call -->
-          <map:parameter name="users-home-base" value="{system-property:substring-before(user.home, user.name)}"/>
-        </map:generate>
-        <map:transform src="properties2html.xsl">
-          <map:parameter name="title" value="System Properties Input Module (SystemPropertiesModule)"/>
-        </map:transform>
-        <map:serialize/>
-      </map:match>
-
-      <map:match pattern="content/xml.xml">
-        <map:generate type="jx" src="properties.xml">
-          <map:parameter name="/forrestconf/@version" value="{myxml:/forrestconf/@version}"/>
-          <map:parameter name="/forrestconf/skin" value="{myxml:/forrestconf/skin}"/>
-          <map:parameter name="/*/base-url" value="{myxml:/*/base-url}"/>
-          <!--
-          <map:parameter name="slashdot-headline" value="{slashdot:/*:RDF/item[1]/title}"/>
-          -->
-        </map:generate>
-        <map:transform src="properties2html.xsl">
-          <map:parameter name="title" value="XML File Input Module (XMLFileModule)"/>
-          <map:parameter name="description" value="XMLFileModule uses an XML
+            values change (parts after the '?' are request parameters) ." />
+                </map:transform>
+                <map:serialize />
+            </map:match>
+
+            <map:match pattern="content/session.xml">
+                <map:generate type="jx" src="properties.xml">
+                    <map:parameter name="attributeNames" value="{session:attributeNames}" />
+                    <map:parameter name="creationTime" value="{session:creationTime}" />
+                    <map:parameter name="lastAccessedTime" value="{session:lastAccessedTime}" />
+                    <map:parameter name="maxInactiveInterval" value="{session:maxInactiveInterval}" />
+                    <map:parameter name="id" value="{session:id}" />
+                    <map:parameter name="new" value="{session:new}" />
+                </map:generate>
+                <map:transform src="properties2html.xsl">
+                    <map:parameter name="title" value="Session Input Module (SessionModule)" />
+                    <map:parameter name="description" value="SessionModule provides access
+            to Session object properties." />
+                </map:transform>
+                <map:serialize />
+            </map:match>
+
+            <map:match pattern="content/system-property.xml">
+                <map:generate type="jx" src="properties.xml">
+                    <map:parameter name="java.version" value="{system-property:java.version}" />
+                    <map:parameter name="java.vendor" value="{system-property:java.vendor}" />
+                    <map:parameter name="java.vendor.url" value="{system-property:java.vendor.url}" />
+                    <map:parameter name="java.home" value="{system-property:java.home}" />
+                    <map:parameter name="java.vm.specification.version" value="{system-property:java.vm.specification.version}" />
+                    <map:parameter name="java.vm.specification.vendor" value="{system-property:java.vm.specification.vendor}" />
+                    <map:parameter name="java.vm.specification.name" value="{system-property:java.vm.specification.name}" />
+                    <map:parameter name="java.vm.version" value="{system-property:java.vm.version}" />
+                    <map:parameter name="java.vm.vendor" value="{system-property:java.vm.vendor}" />
+                    <map:parameter name="java.vm.name" value="{system-property:java.vm.name}" />
+                    <map:parameter name="java.specification.version" value="{system-property:java.specification.version}" />
+                    <map:parameter name="java.specification.vendor" value="{system-property:java.specification.vendor}" />
+                    <map:parameter name="java.specification.name" value="{system-property:java.specification.name}" />
+                    <map:parameter name="java.specification.name" value="{system-property:java.specification.name}" />
+                    <map:parameter name="java.class.path" value="{system-property:java.class.path}" />
+                    <map:parameter name="java.ext.dirs" value="{system-property:java.ext.dirs}" />
+                    <map:parameter name="os.name" value="{system-property:os.name}" />
+                    <map:parameter name="os.arch" value="{system-property:os.arch}" />
+                    <map:parameter name="os.version" value="{system-property:os.version}" />
+                    <map:parameter name="file.separator" value="{system-property:file.separator}" />
+                    <map:parameter name="path.separator" value="{system-property:path.separator}" />
+                    <map:parameter name="line.separator" value="{system-property:line.separator}" />
+                    <map:parameter name="user.name" value="{system-property:user.name}" />
+                    <map:parameter name="user.home" value="{system-property:user.home}" />
+                    <map:parameter name="user.dir" value="{system-property:user.dir}" />
+                    <!-- Function call -->
+                    <map:parameter name="users-home-base" value="{system-property:substring-before(user.home, user.name)}" />
+                </map:generate>
+                <map:transform src="properties2html.xsl">
+                    <map:parameter name="title" value="System Properties Input Module (SystemPropertiesModule)" />
+                </map:transform>
+                <map:serialize />
+            </map:match>
+
+            <map:match pattern="content/xml.xml">
+                <map:generate type="jx" src="properties.xml">
+                    <map:parameter name="/forrestconf/@version" value="{myxml:/forrestconf/@version}" />
+                    <map:parameter name="/forrestconf/skin" value="{myxml:/forrestconf/skin}" />
+                    <map:parameter name="/*/base-url" value="{myxml:/*/base-url}" />
+                    <!--
+                        <map:parameter name="slashdot-headline" value="{slashdot:/*:RDF/item[1]/title}"/>
+                    -->
+                </map:generate>
+                <map:transform src="properties2html.xsl">
+                    <map:parameter name="title" value="XML File Input Module (XMLFileModule)" />
+                    <map:parameter name="description" value="XMLFileModule uses an XML
             file as a data source, with XPath expressions as the key values. In
             this example, the keys identify nodes in
-            context://samples/modules/forrestconf.xml"/>
-        </map:transform>
-        <map:serialize/>
-      </map:match>
-
-      <map:match pattern="content/defaults.xml">
-        <map:generate type="jx" src="properties.xml">
-          <map:parameter name="skin" value="{defaults:skin}"/>
-          <map:parameter name="base-url" value="{defaults:base-url}"/>
-        </map:generate>
-        <map:transform src="properties2html.xsl">
-          <map:parameter name="title" value="Defaults Input Module (DefaultsModule)"/>
-          <map:parameter name="description" value="DefaultsModule
+            context://samples/modules/forrestconf.xml" />
+                </map:transform>
+                <map:serialize />
+            </map:match>
+
+            <map:match pattern="content/defaults.xml">
+                <map:generate type="jx" src="properties.xml">
+                    <map:parameter name="skin" value="{defaults:skin}" />
+                    <map:parameter name="base-url" value="{defaults:base-url}" />
+                </map:generate>
+                <map:transform src="properties2html.xsl">
+                    <map:parameter name="title" value="Defaults Input Module (DefaultsModule)" />
+                    <map:parameter name="description" value="DefaultsModule
             contains 'default' values, hardcoded into cocoon.xconf.
-            It is simply a lookup table containing static values."/>
-        </map:transform>
-        <map:serialize/>
-      </map:match>
-
-      <map:match pattern="content/chain.xml">
-        <map:generate type="jx" src="properties.xml">
-          <map:parameter name="skin" value="{chain:skin}"/>
-        </map:generate>
-        <map:transform src="properties2html.xsl">
-          <map:parameter name="title" value="Chaining Input module (ChainMetaModule)"/>
-          <map:parameter name="description" value="ChainMetaModule
+            It is simply a lookup table containing static values." />
+                </map:transform>
+                <map:serialize />
+            </map:match>
+
+            <map:match pattern="content/chain.xml">
+                <map:generate type="jx" src="properties.xml">
+                    <map:parameter name="skin" value="{chain:skin}" />
+                </map:generate>
+                <map:transform src="properties2html.xsl">
+                    <map:parameter name="title" value="Chaining Input module (ChainMetaModule)" />
+                    <map:parameter name="description"
+                        value="ChainMetaModule
             iterates through a set of modules until one returns a
             non-null value for the specified key.  In this example, we
             chain together request-param, request-attr, session-attr
             and defaults modules.  The 'skin' value is taken from the
             first that returns a non-null value, usually 'defaults'.
             Try adding '?skin=myskin' to the URL, and it should
-            change."/>
-        </map:transform>
-        <map:serialize/>
-      </map:match>
-
-      <map:match pattern="content/cookie.xml">
-        <map:act type="cookie-locale"/>
-        <map:generate type="jx" src="properties.xml">
-          <map:parameter name="locale" value="{cookie:locale}"/>
-        </map:generate>
-        <map:transform src="properties2html.xsl">
-          <map:parameter name="title" value="Cookie module (CookieModule)"/>
-          <map:parameter name="description" value="Returns the value
+            change." />
+                </map:transform>
+                <map:serialize />
+            </map:match>
+
+            <map:match pattern="content/cookie.xml">
+                <map:act type="cookie-locale" />
+                <map:generate type="jx" src="properties.xml">
+                    <map:parameter name="locale" value="{cookie:locale}" />
+                </map:generate>
+                <map:transform src="properties2html.xsl">
+                    <map:parameter name="title" value="Cookie module (CookieModule)" />
+                    <map:parameter name="description" value="Returns the value
             of the named HTTP cookie.
             The example used LocaleAction to store the current locale name as cookie.
             If the value is empty, use the browser's reload button.
             (Cookies just created cannot be read out. Only when the browser presents it
-            on the next request, it will be available.)"/>
-        </map:transform>
-        <map:serialize/>
-      </map:match>
-
-      <map:match pattern="content/date.xml">
-        <map:generate type="jx" src="properties.xml">
-          <map:parameter name="format-in-cocoon.xconf" value="{date:date}"/>
-          <map:parameter name="format-inline" value="{date:MMM d, yyyy}"/>
-        </map:generate>
-        <map:transform src="properties2html.xsl">
-          <map:parameter name="title" value="Date Input module (DateMetaModule)"/>
-          <map:parameter name="description" value="Returns the current
+            on the next request, it will be available.)" />
+                </map:transform>
+                <map:serialize />
+            </map:match>
+
+            <map:match pattern="content/date.xml">
+                <map:generate type="jx" src="properties.xml">
+                    <map:parameter name="format-in-cocoon.xconf" value="{date:date}" />
+                    <map:parameter name="format-inline" value="{date:MMM d, yyyy}" />
+                </map:generate>
+                <map:transform src="properties2html.xsl">
+                    <map:parameter name="title" value="Date Input module (DateMetaModule)" />
+                    <map:parameter name="description" value="Returns the current
             date and time.  The format is specified in cocoon.xconf or as the
-            data specified in the input module reference"/>
-        </map:transform>
-        <map:serialize/>
-      </map:match>
-
-      <map:match pattern="content/session-attr.xml">
-        <map:generate type="jx" src="properties.xml">
-          <map:parameter name="fruit" value="{session-attr:fruit}"/>
-        </map:generate>
-        <map:transform src="properties2html.xsl">
-          <map:parameter name="title" value="Session Attribute Input Module
-            (SessionAttributeModule)"/>
-          <map:parameter name="description" value="SessionAttributeModule provides access
-            to Session attributes."/>
-        </map:transform>
-        <map:serialize/>
-      </map:match>
-
-      <map:match pattern="content/randomnumber.xml">
-        <map:generate type="jx" src="properties.xml">
-          <map:parameter name="default" value="{random:x}"/>
-          <map:parameter name="from 100 to 500" value="{random-100-to-500:y}"/>
-          <map:parameter name="from 5000 to 10000" value="{random-5000-to-10000:z}"/>
-        </map:generate>
-        <map:transform src="properties2html.xsl">
-          <map:parameter name="title" value="Random number module (RandomNumberModule)"/>
-          <map:parameter name="description" value="Returns a random number in a
-            user-configurable range (by default 0 to (2^63)-1 (cca. 9.22337204 × 10^18)"/>
-        </map:transform>
-        <map:serialize/>
-      </map:match>
-
-      <map:match pattern="content/realpath.xml">
-        <map:generate type="jx" src="properties.xml">
-          <map:parameter name="/" value="{realpath:/}"/>
-          <map:parameter name="/images" value="{realpath:/images}"/>
-          <map:parameter name="/WEB-INF" value="{realpath:/WEB-INF}"/>
-        </map:generate>
-        <map:transform src="properties2html.xsl">
-          <map:parameter name="title" value="RealPath Module (RealPathModule)"/>
-          <map:parameter name="description" value="Returns the real path of a
-            context-relative virtual path (if not deployed from a .war)."/>
-        </map:transform>
-        <map:serialize/>
-      </map:match>
-
-      <map:match pattern="content/properties.xml">
-        <map:generate type="jx" src="properties.xml">
-          <map:parameter name="name" value="{cocoon-properties:name}"/>
-          <map:parameter name="Name" value="{cocoon-properties:Name}"/>
-          <map:parameter name="fullname" value="{cocoon-properties:fullname}"/>
-          <map:parameter name="version" value="{cocoon-properties:version}"/>
-          <map:parameter name="released.version" value="{cocoon-properties:released.version}"/>
-          <map:parameter name="year" value="{cocoon-properties:year}"/>
-        </map:generate>
-        <map:transform src="properties2html.xsl">
-          <map:parameter name="title" value="Properties File Module
-            (PropertiesFileModule)"/>
-          <map:parameter name="description" value="PropertiesFileModule provides access
+            data specified in the input module reference" />
+                </map:transform>
+                <map:serialize />
+            </map:match>
+
+            <map:match pattern="content/session-attr.xml">
+                <map:generate type="jx" src="properties.xml">
+                    <map:parameter name="fruit" value="{session-attr:fruit}" />
+                </map:generate>
+                <map:transform src="properties2html.xsl">
+                    <map:parameter name="title" value="Session Attribute Input Module
+            (SessionAttributeModule)" />
+                    <map:parameter name="description" value="SessionAttributeModule provides access
+            to Session attributes." />
+                </map:transform>
+                <map:serialize />
+            </map:match>
+
+            <map:match pattern="content/randomnumber.xml">
+                <map:generate type="jx" src="properties.xml">
+                    <map:parameter name="default" value="{random:x}" />
+                    <map:parameter name="from 100 to 500" value="{random-100-to-500:y}" />
+                    <map:parameter name="from 5000 to 10000" value="{random-5000-to-10000:z}" />
+                </map:generate>
+                <map:transform src="properties2html.xsl">
+                    <map:parameter name="title" value="Random number module (RandomNumberModule)" />
+                    <map:parameter name="description" value="Returns a random number in a
+            user-configurable range (by default 0 to (2^63)-1 (cca. 9.22337204 × 10^18)" />
+                </map:transform>
+                <map:serialize />
+            </map:match>
+
+            <map:match pattern="content/realpath.xml">
+                <map:generate type="jx" src="properties.xml">
+                    <map:parameter name="/" value="{realpath:/}" />
+                    <map:parameter name="/images" value="{realpath:/images}" />
+                    <map:parameter name="/WEB-INF" value="{realpath:/WEB-INF}" />
+                </map:generate>
+                <map:transform src="properties2html.xsl">
+                    <map:parameter name="title" value="RealPath Module (RealPathModule)" />
+                    <map:parameter name="description" value="Returns the real path of a
+            context-relative virtual path (if not deployed from a .war)." />
+                </map:transform>
+                <map:serialize />
+            </map:match>
+
+            <map:match pattern="content/properties.xml">
+                <map:generate type="jx" src="properties.xml">
+                    <map:parameter name="name" value="{cocoon-properties:name}" />
+                    <map:parameter name="Name" value="{cocoon-properties:Name}" />
+                    <map:parameter name="fullname" value="{cocoon-properties:fullname}" />
+                    <map:parameter name="version" value="{cocoon-properties:version}" />
+                    <map:parameter name="released.version" value="{cocoon-properties:released.version}" />
+                    <map:parameter name="year" value="{cocoon-properties:year}" />
+                </map:generate>
+                <map:transform src="properties2html.xsl">
+                    <map:parameter name="title" value="Properties File Module
+            (PropertiesFileModule)" />
+                    <map:parameter name="description" value="PropertiesFileModule provides access
             to properties from a properties file. In this example the keys identify properties in
-            resource://org/apache/cocoon/cocoon.properties"/>
-        </map:transform>
-        <map:serialize/>
-      </map:match>
-
-      <map:match pattern="content/url-encode.xml">
-        <map:generate type="jx" src="properties.xml">
-          <map:parameter name="foo bar" value="{url-encode:foo bar}"/>
-          <map:parameter name="foo/bar" value="{url-encode:foo/bar}"/>
-        </map:generate>
-        <map:transform src="properties2html.xsl">
-          <map:parameter name="title" value="URL Encoding Module (URLEncodeModule)"/>
-          <map:parameter name="description" value="URLEncodeModule performs
-            URL encoding of the passed parameter"/>
-        </map:transform>
-        <map:serialize/>
-      </map:match>
-
-      <map:match pattern="content/url-decode.xml">
-        <map:generate type="jx" src="properties.xml">
-          <map:parameter name="foo%20bar" value="{url-decode:foo%20bar}"/>
-          <map:parameter name="foo%2Fbar" value="{url-decode:foo%2Fbar}"/>
-        </map:generate>
-        <map:transform src="properties2html.xsl">
-          <map:parameter name="title" value="URL Decoding Module (URLDecodeModule)"/>
-          <map:parameter name="description" value="URLDecodeModule performs
-            URL decoding of the passed parameter"/>
-        </map:transform>
-        <map:serialize/>
-      </map:match>
-
-      <map:match pattern="content/naming.xml">
-        <map:generate type="jx" src="properties.xml">
-          <map:parameter name="java:comp/env/greeting" value="{naming:java:comp/env/greeting}"/>
-        </map:generate>
-        <map:transform src="properties2html.xsl">
-          <map:parameter name="title" value="Naming Module (NamingInputModule)"/>
-          <map:parameter name="description" value="NamingInputModule provides access
-            to JNDI resources. This sample does not work with built-in Jetty as it does not provide JNDI."/>
-        </map:transform>
-        <map:serialize/>
-      </map:match>
-
-      <map:match pattern="content/global.xml">
-        <map:generate type="jx" src="properties.xml">
-          <map:parameter name="global-sitemap" value="{global:global-sitemap}"/>
-          <map:parameter name="global-sub-sitemap" value="{global:global-sub-sitemap}"/>
-          <map:parameter name="global-sitemap-override" value="{global:global-sitemap-override}"/>
-        </map:generate>
-        <map:transform src="properties2html.xsl">
-          <map:parameter name="title" value="Global Input Module (GlobalInputModule)"/>
-          <map:parameter name="description" value="GlobalInputModule
+            resource://org/apache/cocoon/cocoon.properties" />
+                </map:transform>
+                <map:serialize />
+            </map:match>
+
+            <map:match pattern="content/url-encode.xml">
+                <map:generate type="jx" src="properties.xml">
+                    <map:parameter name="foo bar" value="{url-encode:foo bar}" />
+                    <map:parameter name="foo/bar" value="{url-encode:foo/bar}" />
+                </map:generate>
+                <map:transform src="properties2html.xsl">
+                    <map:parameter name="title" value="URL Encoding Module (URLEncodeModule)" />
+                    <map:parameter name="description" value="URLEncodeModule performs
+            URL encoding of the passed parameter" />
+                </map:transform>
+                <map:serialize />
+            </map:match>
+
+            <map:match pattern="content/url-decode.xml">
+                <map:generate type="jx" src="properties.xml">
+                    <map:parameter name="foo%20bar" value="{url-decode:foo%20bar}" />
+                    <map:parameter name="foo%2Fbar" value="{url-decode:foo%2Fbar}" />
+                </map:generate>
+                <map:transform src="properties2html.xsl">
+                    <map:parameter name="title" value="URL Decoding Module (URLDecodeModule)" />
+                    <map:parameter name="description" value="URLDecodeModule performs
+            URL decoding of the passed parameter" />
+                </map:transform>
+                <map:serialize />
+            </map:match>
+
+            <map:match pattern="content/naming.xml">
+                <map:generate type="jx" src="properties.xml">
+                    <map:parameter name="java:comp/env/greeting" value="{naming:java:comp/env/greeting}" />
+                </map:generate>
+                <map:transform src="properties2html.xsl">
+                    <map:parameter name="title" value="Naming Module (NamingInputModule)" />
+                    <map:parameter name="description" value="NamingInputModule provides access
+            to JNDI resources. This sample does not work with built-in Jetty as it does not provide JNDI." />
+                </map:transform>
+                <map:serialize />
+            </map:match>
+
+            <map:match pattern="content/global.xml">
+                <map:generate type="jx" src="properties.xml">
+                    <map:parameter name="global-sitemap" value="{global:global-sitemap}" />
+                    <map:parameter name="global-sub-sitemap" value="{global:global-sub-sitemap}" />
+                    <map:parameter name="global-sitemap-override" value="{global:global-sitemap-override}" />
+                </map:generate>
+                <map:transform src="properties2html.xsl">
+                    <map:parameter name="title" value="Global Input Module (GlobalInputModule)" />
+                    <map:parameter name="description" value="GlobalInputModule
             contains 'global' values defined in the sitemap. Children sitemaps
-            can override values defined in the parent sitemap."/>
-        </map:transform>
-        <map:serialize/>
-      </map:match>
-
-      <!-- Display this sitemap source-->
-      <map:match pattern="sitemap.xmap">
-        <map:generate src="sitemap.xmap"/>
-        <map:transform src="context://stylesheets/system/xml2html.xslt"/>
-        <map:serialize/>
-      </map:match>
-
-      <map:match pattern="*.css">
-        <map:read src="{1}.css" mime-type="text/css"/>
-      </map:match>
-
-      <map:match pattern="images/*.gif">
-        <map:read src="images/{1}.gif" mime-type="image/gif"/>
-      </map:match>
+            can override values defined in the parent sitemap." />
+                </map:transform>
+                <map:serialize />
+            </map:match>
+
+            <!-- Display this sitemap source-->
+            <map:match pattern="sitemap.xmap">
+                <map:generate src="sitemap.xmap" />
+                <!-- Make use of servlet services -->
+                <map:serialize type="servletService">
+                    <map:parameter name="service" value="servlet:style-default:/service/system/xml2html" />
+                </map:serialize>
+            </map:match>
+
+            <map:match pattern="*.css">
+                <map:read src="{1}.css" mime-type="text/css" />
+            </map:match>
+
+            <map:match pattern="images/*.gif">
+                <map:read src="images/{1}.gif" mime-type="image/gif" />
+            </map:match>
 
-    </map:pipeline>
-  </map:pipelines>
+        </map:pipeline>
+    </map:pipelines>
 </map:sitemap>

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/paginator/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/paginator/sitemap.xmap?view=diff&rev=539084&r1=539083&r2=539084
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/paginator/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/paginator/sitemap.xmap Thu May 17 12:17:01 2007
@@ -20,31 +20,52 @@
 
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
 
-  <map:pipelines>
-    <map:pipeline>
-    
-      <map:match pattern="">
-        <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>
- 
-      <map:match pattern="*(*)">
-        <map:generate src="content/{1}.xml"/>
-        <map:transform type="paginate" src="pagesheets/{1}.pagesheet" label="content">
-          <map:parameter name="page" value="{2}"/>
-        </map:transform>    
-        <map:transform src="stylesheets/pagedlist2html.xsl"/>
-        <map:serialize type="html"/>
-      </map:match>
- 
-      <map:match pattern="*">
-        <map:generate src="content/{1}.xml"/>
-        <map:transform src="stylesheets/list2html.xsl"/>
-        <map:serialize type="html"/>
-      </map:match>
-   </map:pipeline>
-  </map:pipelines>
+    <!-- =========================== Views =================================== -->
+
+    <map:views>
+        <map:view name="content" from-label="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 name="links" from-position="last">
+            <map:serialize type="links" />
+        </map:view>
+    </map:views>
+
+    <!-- ========================== Pipelines ================================ -->
+
+    <map:pipelines>
+        <map:pipeline>
+
+            <map:match pattern="">
+                <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>
+
+            <map:match pattern="*(*)">
+                <map:generate src="content/{1}.xml" />
+                <map:transform type="paginate" src="pagesheets/{1}.pagesheet" label="content">
+                    <map:parameter name="page" value="{2}" />
+                </map:transform>
+                <map:transform src="stylesheets/pagedlist2html.xsl" />
+                <map:serialize type="html" />
+            </map:match>
+
+            <map:match pattern="*">
+                <map:generate src="content/{1}.xml" />
+                <map:transform src="stylesheets/list2html.xsl" />
+                <map:serialize type="html" />
+            </map:match>
+        </map:pipeline>
+    </map:pipelines>
 </map:sitemap>



Mime
View raw message