You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by vg...@apache.org on 2007/12/08 04:50:47 UTC

svn commit: r602312 - in /cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF: i18n/ modules/ modules/images/

Author: vgritsenko
Date: Fri Dec  7 19:50:46 2007
New Revision: 602312

URL: http://svn.apache.org/viewvc?rev=602312&view=rev
Log:
updating modules sample l&f

Removed:
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/modules/images/
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/modules/menu2navigation.xsl
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/modules/page.css
Modified:
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/i18n/menu.xml
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/i18n/simple2page.xsl
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/modules/menu.xml
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/modules/menu2content.xsl
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/modules/properties2html.xsl
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/modules/site2html.xsl
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/modules/sitemap.xmap

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/i18n/menu.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/i18n/menu.xml?rev=602312&r1=602311&r2=602312&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/i18n/menu.xml (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/i18n/menu.xml Fri Dec  7 19:50:46 2007
@@ -26,7 +26,6 @@
   <menu label="Samples" i18n:attr="label">
     <menu-item label="Static (XML)" href="simple.xml" i18n:attr="label"/>
     <menu-item label="Dynamic (XSP)" href="simple.xsp" i18n:attr="label"/>
-    <menu-item label="Sitemap source" href="sitemap.xmap" i18n:attr="label"/>    
     <menu-item label="Multi catalogues" href="multi.xml" i18n:attr="label"/>
     <menu-item label="Tiered catalogues" href="tiered.xml" i18n:attr="label"/>
     <menu-item label="Back" href=".." i18n:attr="label"/>

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/i18n/simple2page.xsl
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/i18n/simple2page.xsl?rev=602312&r1=602311&r2=602312&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/i18n/simple2page.xsl (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/i18n/simple2page.xsl Fri Dec  7 19:50:46 2007
@@ -62,7 +62,6 @@
     </p>
   </xsl:template>
 
-  <!-- Current (open) menu -->
   <xsl:template match="menu">
     <xsl:if test="@icon">
       <img src="{@icon}" align="middle"/>
@@ -74,7 +73,7 @@
 
   <!-- Display a link to a page -->
   <xsl:template match="menu-item[substring-after(@href, 'locale=') = $locale or @href=$page or (@href='' and $locale='')]">
-    <li class="current" title="{@href}">
+    <li title="{@href}">
       <xsl:if test="@icon">
         <img src="{@icon}" align="middle"/>
         <xsl:text> </xsl:text>
@@ -89,7 +88,7 @@
         <img src="{@icon}" align="middle"/>
         <xsl:text> </xsl:text>
       </xsl:if>
-      <a href="{@href}" class="page"><xsl:value-of select="@label"/></a>
+      <a href="{@href}"><xsl:value-of select="@label"/></a>
     </li>
   </xsl:template>
 

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/modules/menu.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/modules/menu.xml?rev=602312&r1=602311&r2=602312&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/modules/menu.xml (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/modules/menu.xml Fri Dec  7 19:50:46 2007
@@ -15,44 +15,43 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!--+
-    | Menu definition.
-    |
-    | @version $Id$
-    +-->
+
+<!--
+  - Menu definition.
+  -
+  - $Id$
+  -->
 <book software="Apache Cocoon"
       title="Apache Cocoon Input Modules Samples"
       copyright="@year@ The Apache Software Foundation">
 
   <menu label="Overview">
-    <menu-item label="Index" href="index.html"/>
-    <menu-item label="Sitemap" href="sitemap.xmap"/>
+    <menu-item label="Index" href="welcome"/>
   </menu>
 
   <menu label="Modules">
-    <menu-item label="BaseLinkModule" href="baselink.html" desc="BaseLink properties"/>
-    <menu-item label="ChainMetaModule" href="chain.html" desc="Chained values"/>
-    <menu-item label="CookieModule" href="cookie.html" desc="Cookie values"/>
-    <menu-item label="DateInputModule" href="date.html" desc="Date"/>
-    <menu-item label="DefaultsModule" href="defaults.html" desc="Default (static) values"/>
-    <menu-item label="GlobalInputModule" href="global.html" desc="Access to the global variables defined in the sitemap."/>
-    <menu-item label="NamingInputModule" href="naming.html" desc="JNDI Resources. This sample does not work with built-in Jetty as it does not provide JNDI."/>
-    <menu-item label="PropertiesFileModule" href="properties.html" desc="Properties file values"/>
-    <menu-item label="RandomNumberModule" href="randomnumber.html" desc="Random number"/>
-    <menu-item label="RealPathModule" href="realpath.html" desc="Real filesystem paths of context paths"/>
-    <menu-item label="RequestModule" href="request.html" desc="Request object properties"/>
-    <menu-item label="RequestParameterModule" href="requestparam.html" desc="Request parameters"/>
-    <menu-item label="SessionModule" href="session.html" desc="Session object properties"/>
-    <menu-item label="SessionAttributeModule" href="session-attr.html" desc="Session attributes"/>
-    <menu-item label="SystemPropertyModule" href="system-property.html" desc="System properties (environment variables)"/>
-    <menu-item label="URLEncodeModule" href="url-encode.html" desc="URLEncode passed parameter"/>
-    <menu-item label="URLDecodeModule" href="url-decode.html" desc="URLDecode passed parameter"/>
+    <menu-item label="BaseLinkModule" href="baselink" desc="BaseLink properties"/>
+    <menu-item label="ChainMetaModule" href="chain" desc="Chained values"/>
+    <menu-item label="CookieModule" href="cookie" desc="Cookie values"/>
+    <menu-item label="DateInputModule" href="date" desc="Date"/>
+    <menu-item label="DefaultsModule" href="defaults" desc="Default (static) values"/>
+    <menu-item label="GlobalInputModule" href="global" desc="Access to the global variables defined in the sitemap."/>
+    <menu-item label="NamingInputModule" href="naming" desc="JNDI Resources. This sample does not work with built-in Jetty as it does not provide JNDI."/>
+    <menu-item label="PropertiesFileModule" href="properties" desc="Properties file values"/>
+    <menu-item label="RandomNumberModule" href="randomnumber" desc="Random number"/>
+    <menu-item label="RealPathModule" href="realpath" desc="Real filesystem paths of context paths"/>
+    <menu-item label="RequestModule" href="request" desc="Request object properties"/>
+    <menu-item label="RequestParameterModule" href="requestparam" desc="Request parameters"/>
+    <menu-item label="SessionModule" href="session" desc="Session object properties"/>
+    <menu-item label="SessionAttributeModule" href="session-attr" desc="Session attributes"/>
+    <menu-item label="SystemPropertyModule" href="system-property" desc="System properties (environment variables)"/>
+    <menu-item label="URLEncodeModule" href="url-encode" desc="URLEncode passed parameter"/>
+    <menu-item label="URLDecodeModule" href="url-decode" desc="URLDecode passed parameter"/>
     <menu-item label="XMLFileModule" href="xml.html" desc="XML node values"/>
   </menu>
 
   <menu label="Documentation">
-    <external label="Input Modules Docs" href="../../docs/userdocs/concepts/modules.html"/>
-    <external label="API Docs" href="../../api/java/org/apache/cocoon/components/modules/input/package-summary.html"/>
+    <menu-item label="Input Modules Docs" href="../../docs/userdocs/concepts/modules.html"/>
+    <menu-item label="API Docs" href="../../api/java/org/apache/cocoon/components/modules/input/package-summary.html"/>
   </menu>
-
 </book>

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/modules/menu2content.xsl
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/modules/menu2content.xsl?rev=602312&r1=602311&r2=602312&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/modules/menu2content.xsl (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/modules/menu2content.xsl Fri Dec  7 19:50:46 2007
@@ -16,41 +16,34 @@
   limitations under the License.
 -->
 
-<!--+
-    | Transforms menu.xml to the index page
-    |
-    | @version $Id$
-    +-->
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<!--
+  - Transforms menu.xml to the index page
+  -
+  - $Id$
+  -->
+<xsl:stylesheet version="1.0"
+                xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
   <xsl:template match="book">
     <page>
       <title>Input Modules</title>
-      <table>
-        <tr>
-          <td>
-            <h3>Input Modules</h3>
-            <p>Modules are used to access input and output data in
-               modular way. Below there are samples for some of the
-               available input modules.
-            </p>
-            <table class="table">
-              <xsl:apply-templates select="menu/menu-item[@desc]"/>
-            </table>
-          </td>
-        </tr>
-      </table>
+      <content>
+        <h3>Input Modules</h3>
+        <p>Modules are used to access input and output data in a
+           pluggable way. Below there are samples for some of the
+           available input modules.
+        </p>
+        <table class="table">
+          <xsl:apply-templates select="menu/menu-item[@desc]"/>
+        </table>
+      </content>
     </page>
   </xsl:template>
 
   <xsl:template match="menu-item[@desc]">
     <tr>
-      <td>
-        <a href="{@href}"><xsl:value-of select="@label" /></a>
-      </td>
-      <td>
-        <xsl:value-of select="@desc" />
-      </td>
+      <td><a href="{@href}"><xsl:value-of select="@label"/></a></td>
+      <td><xsl:value-of select="@desc" /></td>
     </tr>
   </xsl:template>
 </xsl:stylesheet>

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/modules/properties2html.xsl
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/modules/properties2html.xsl?rev=602312&r1=602311&r2=602312&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/modules/properties2html.xsl (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/modules/properties2html.xsl Fri Dec  7 19:50:46 2007
@@ -15,52 +15,44 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!--+
-    | Transforms properties.xml to result page.
-    |
-    | @version $Id$
-    +-->
+
+<!--
+  - Transforms properties.xml to result page.
+  -
+  - $Id$
+  -->
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
-<xsl:param name="title">Input Module</xsl:param>
-<xsl:param name="description"></xsl:param>
+  <xsl:param name="title">Input Module</xsl:param>
+  <xsl:param name="description"/>
 
-<xsl:template match="/">
-<page>
-    <title><xsl:value-of select="$title"/></title>
-    <table class="content">
-        <tr>
-            <td>
-                <h3><xsl:value-of select="$title"/></h3>
-                <p><xsl:value-of select="$description"/></p>
-                <xsl:apply-templates />
-            </td>
-        </tr>
-    </table>
-</page>
-</xsl:template>
+  <xsl:template match="/">
+    <page>
+      <title><xsl:value-of select="$title"/></title>
+      <content>
+        <p><xsl:value-of select="$description"/></p>
+        <xsl:apply-templates/>
+      </content>
+    </page>
+  </xsl:template>
 
-<xsl:template match="properties">
+  <xsl:template match="properties">
     <table class="table">
-        <tr>
-            <th>Accessor</th>
-            <th>Value</th>
-        </tr>
-        <xsl:apply-templates>
-            <xsl:sort select="name" />
-        </xsl:apply-templates>
+      <tr>
+        <th>Accessor</th>
+        <th>Value</th>
+      </tr>
+      <xsl:apply-templates>
+        <xsl:sort select="name"/>
+      </xsl:apply-templates>
     </table>
-</xsl:template>
+  </xsl:template>
 
-<xsl:template match="property">
+  <xsl:template match="property">
     <tr>
-        <td><xsl:value-of select="name"/></td>
-        <td>
-            <xsl:value-of select="value"/>&#160;
-        </td>
+      <td><xsl:value-of select="name"/></td>
+      <td><xsl:value-of select="value"/>&#160;</td>
     </tr>
-</xsl:template>
-
-<xsl:template match="title"></xsl:template>
+  </xsl:template>
 
 </xsl:stylesheet>

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/modules/site2html.xsl
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/modules/site2html.xsl?rev=602312&r1=602311&r2=602312&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/modules/site2html.xsl (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/modules/site2html.xsl Fri Dec  7 19:50:46 2007
@@ -15,73 +15,62 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!--+
-    | Transforms to HTML page.
-    |
-    | @version $Id$
-    +-->
-<!DOCTYPE html [
-<!ENTITY nbsp "&#160;">
-<!ENTITY copy "&#0169;">
-<!ENTITY laquo "&#0171;">
-<!ENTITY raquo "&#0187;">
-]>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
-  <xsl:param name="page" />
-
-  <xsl:template match="site">
-    <html>
-      <head>
-        <title>
-          <xsl:value-of select="page/title" />
-        </title>
-        <link rel="stylesheet" href="page.css" type="text/css"/>
-      </head>
-      <body>
-        <table class="path">
-          <tr>
-            <td>
-              <a href="../../">Apache Cocoon Main</a>&#160;&gt;&#160;<a href="../">Samples</a>&#160;&gt;&#160;<a href="./">Modules</a>&#160;&gt;&#160;<span class="current"><xsl:value-of select="page/title"/></span>
-            </td>
-          </tr>
-        </table>
-        <table class="topline"><tr><td>&#160;</td></tr></table>
-        <table cellspacing="0" cellpadding="0" summary="content pane">
-          <tr>
-            <td width="5" class="navbar">&#160;</td>
-            <td rowspan="2" valign="top" nowrap="nowrap" width="200">
-              <xsl:apply-templates select="table[@class='menu']"/>
-            </td>
-            <td valign="top" class="navbar" align="left">
-              &#160;
-            </td>
-            <td width="*" valign="top" class="navbar" align="right">
-              Page: <xsl:value-of select="$page" />
-            </td>
-          </tr>
-          <tr>
-            <td>&#160;</td>
-            <td class="content" valign="top" colspan="2">
-              <xsl:apply-templates select="page"/>
-            </td>
-          </tr>
-        </table>
-        <table>
-          <tr>
-            <td class="copyright">
-              Copyright (c) 1999-2006 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All Rights Reserved.
-            </td>
-          </tr>
-        </table>
-      </body>
-    </html>
+
+<!--
+  - Transforms 'composite' aggregated element to sample page.
+  -
+  - $Id$
+  -->
+<xsl:stylesheet version="1.0"
+                xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+
+  <xsl:param name="page"/>
+
+  <xsl:template match="composite">
+    <page>
+      <title>Sitemap Expressions &amp; Input Modules</title>
+      <content>
+        <row>
+          <column title="Menu">
+            <xsl:apply-templates select="book"/>
+          </column>
+          <column title="{page/title}">
+            <xsl:apply-templates select="page"/>
+          </column>
+        </row>
+      </content>
+    </page>
+  </xsl:template>
+
+  <xsl:template match="page">
+    <xsl:apply-templates select="content"/>
+  </xsl:template>
+
+  <xsl:template match="book">
+    <xsl:apply-templates select="menu"/>
+  </xsl:template>
+
+  <xsl:template match="menu">
+    <h3><xsl:value-of select="@label"/></h3>
+    <ul><xsl:apply-templates/></ul>
+  </xsl:template>
+
+  <!-- Display a link to a page -->
+  <xsl:template match="menu-item[@href=$page]">
+    <li title="{@href}">
+      <xsl:value-of select="@label"/>
+    </li>
+  </xsl:template>
+
+  <xsl:template match="menu-item">
+    <li class="page">
+      <a href="{@href}"><xsl:value-of select="@label"/></a>
+    </li>
   </xsl:template>
 
-  <xsl:template match="node()|@*" priority="-1">
+  <xsl:template match="@*|node()" priority="-1">
     <xsl:copy>
-      <xsl:apply-templates select="@*"/>
-      <xsl:apply-templates/>
+      <xsl:apply-templates select="@*|node()"/>
     </xsl:copy>
   </xsl:template>
 

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/modules/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/modules/sitemap.xmap?rev=602312&r1=602311&r2=602312&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/modules/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/modules/sitemap.xmap Fri Dec  7 19:50:46 2007
@@ -40,16 +40,20 @@
   <!-- =========================== Resources =============================== -->
 
   <map:resources>
-    <!-- This resource is used to create a composite page from menu and content -->
+    <!--
+      - 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 element="composite">
+        <map:part src="menu.xml"/>
+        <map:part src="cocoon:/content/{../1}.xml" label="content"/>
       </map:aggregate>
       <map:transform src="site2html.xsl">
-        <map:parameter name="page" value="{../0}" />
+        <map:parameter name="page" value="{../0}"/>
       </map:transform>
-      <map:serialize />
+      <map:transform src="servlet:style:/common/style/xsl/html/simple-page2html.xsl"/>
+      <map:transform type="servletLinkRewriter"/>
+      <map:serialize type="html"/>
     </map:resource>
   </map:resources>
 
@@ -76,31 +80,32 @@
   <map:pipelines>
     <map:pipeline>
 
-      <!-- Default URL matcher. Matches '/' URLs-->
+      <!-- Default URL matcher. Matches '/' URLs -->
       <map:match pattern="">
-        <map:redirect-to uri="index.html" />
+        <map:redirect-to uri="welcome"/>
       </map:match>
 
-      <map:match pattern="*.html">
-        <map:call resource="composite" />
+      <map:match pattern="requestparam">
+        <map:redirect-to uri="content/requestparam.xml?foo=foo+param&amp;bar=bar+param"/>
       </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 pattern="*">
+        <map:call resource="composite"/>
       </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 />
+
+      <!--
+        - Index page content
+        -->
+
+      <map:match pattern="content/welcome.xml">
+        <map:generate src="menu.xml"/>
+        <map:transform src="menu2content.xsl"/>
+        <map:serialize type="xml"/>
       </map:match>
 
+      <!--
+        - Input module specific content
+        -->
 
       <map:match pattern="content/request.xml">
         <map:generate type="jx" src="properties.xml">
@@ -143,7 +148,7 @@
         <map:transform src="properties2html.xsl">
           <map:parameter name="title" value="Request Input Module (RequestModule)" />
         </map:transform>
-        <map:serialize />
+        <map:serialize type="xml"/>
       </map:match>
 
       <map:match pattern="content/baselink.xml">
@@ -151,7 +156,6 @@
           <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 (../,
@@ -160,12 +164,9 @@
             In this demonstration, the request URI is {0} (an internal request not
             equivalent to what the user sees)" />
         </map:transform>
-        <map:serialize />
+        <map:serialize type="xml"/>
       </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}" />
@@ -177,7 +178,7 @@
             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:serialize type="xml"/>
       </map:match>
 
       <map:match pattern="content/session.xml">
@@ -194,7 +195,7 @@
           <map:parameter name="description" value="SessionModule provides access
             to Session object properties." />
         </map:transform>
-        <map:serialize />
+        <map:serialize type="xml"/>
       </map:match>
 
       <map:match pattern="content/system-property.xml">
@@ -230,7 +231,7 @@
         <map:transform src="properties2html.xsl">
           <map:parameter name="title" value="System Properties Input Module (SystemPropertiesModule)" />
         </map:transform>
-        <map:serialize />
+        <map:serialize type="xml"/>
       </map:match>
 
       <map:match pattern="content/xml.xml">
@@ -249,7 +250,7 @@
             this example, the keys identify nodes in
             context://samples/modules/forrestconf.xml" />
         </map:transform>
-        <map:serialize />
+        <map:serialize type="xml"/>
       </map:match>
 
       <map:match pattern="content/defaults.xml">
@@ -263,7 +264,7 @@
             contains 'default' values, hardcoded into cocoon.xconf.
             It is simply a lookup table containing static values." />
         </map:transform>
-        <map:serialize />
+        <map:serialize type="xml"/>
       </map:match>
 
       <map:match pattern="content/chain.xml">
@@ -281,7 +282,7 @@
             Try adding '?skin=myskin' to the URL, and it should
             change." />
         </map:transform>
-        <map:serialize />
+        <map:serialize type="xml"/>
       </map:match>
 
       <map:match pattern="content/cookie.xml">
@@ -298,7 +299,7 @@
             (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:serialize type="xml"/>
       </map:match>
 
       <map:match pattern="content/date.xml">
@@ -312,7 +313,7 @@
             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:serialize type="xml"/>
       </map:match>
 
       <map:match pattern="content/session-attr.xml">
@@ -325,7 +326,7 @@
           <map:parameter name="description" value="SessionAttributeModule provides access
             to Session attributes." />
         </map:transform>
-        <map:serialize />
+        <map:serialize type="xml"/>
       </map:match>
 
       <map:match pattern="content/randomnumber.xml">
@@ -339,7 +340,7 @@
           <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:serialize type="xml"/>
       </map:match>
 
       <map:match pattern="content/realpath.xml">
@@ -353,7 +354,7 @@
           <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:serialize type="xml"/>
       </map:match>
 
       <map:match pattern="content/properties.xml">
@@ -372,7 +373,7 @@
             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:serialize type="xml"/>
       </map:match>
 
       <map:match pattern="content/url-encode.xml">
@@ -385,7 +386,7 @@
           <map:parameter name="description" value="URLEncodeModule performs
             URL encoding of the passed parameter" />
         </map:transform>
-        <map:serialize />
+        <map:serialize type="xml"/>
       </map:match>
 
       <map:match pattern="content/url-decode.xml">
@@ -398,7 +399,7 @@
           <map:parameter name="description" value="URLDecodeModule performs
             URL decoding of the passed parameter" />
         </map:transform>
-        <map:serialize />
+        <map:serialize type="xml"/>
       </map:match>
 
       <map:match pattern="content/naming.xml">
@@ -410,7 +411,7 @@
           <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:serialize type="xml"/>
       </map:match>
 
       <map:match pattern="content/global.xml">
@@ -425,24 +426,16 @@
             contains 'global' values defined in the sitemap. Children sitemaps
             can override values defined in the parent sitemap." />
         </map:transform>
-        <map:serialize />
+        <map:serialize type="xml"/>
       </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:/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>