Return-Path: 
 <cvs-return-30897-apmail-cocoon-cvs-archive=cocoon.apache.org@cocoon.apache.org>
Delivered-To: apmail-cocoon-cvs-archive@www.apache.org
Received: (qmail 34164 invoked from network); 28 May 2007 20:17:59 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 28 May 2007 20:17:59 -0000
Received: (qmail 75560 invoked by uid 500); 28 May 2007 20:18:03 -0000
Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org
Received: (qmail 75309 invoked by uid 500); 28 May 2007 20:18:02 -0000
Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cocoon.apache.org
list-help: <mailto:cvs-help@cocoon.apache.org>
list-unsubscribe: <mailto:cvs-unsubscribe@cocoon.apache.org>
List-Post: <mailto:cvs@cocoon.apache.org>
List-Id: <cvs.cocoon.apache.org>
Delivered-To: mailing list cvs@cocoon.apache.org
Received: (qmail 75247 invoked by uid 99); 28 May 2007 20:18:00 -0000
Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 28 May 2007 13:18:00 -0700
X-ASF-Spam-Status: No, hits=-99.5 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 28 May 2007 13:17:48 -0700
Received: by eris.apache.org (Postfix, from userid 65534)
	id EA01E1A9820; Mon, 28 May 2007 13:17:27 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: svn commit: r542312 [3/14] - in /cocoon/trunk/blocks:
 cocoon-ajax/cocoon-ajax-impl/src/main/resources/COB-INF/system/
 cocoon-ajax/cocoon-ajax-impl/src/main/resources/META-INF/cocoon/spring/
 cocoon-ajax/cocoon-ajax-sample/src/main/resources/COB-INF/ coc...
Date: Mon, 28 May 2007 20:17:18 -0000
To: cvs@cocoon.apache.org
From: felixk@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20070528201727.EA01E1A9820@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

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=542312&r1=542311&r2=542312
==============================================================================
--- 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 Mon May 28 13:17:10 2007
@@ -24,91 +24,91 @@
 
 <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">
-            <!-- 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: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: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=542312&r1=542311&r2=542312
==============================================================================
--- 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 Mon May 28 13:17:10 2007
@@ -23,254 +23,253 @@
     +-->
 <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>
-
-    <!-- =========================== 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 (../,
+  <!-- =========================== 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
+        </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
+        </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
+        </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
+        </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
+        </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
@@ -278,171 +277,171 @@
             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
+        </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
+        </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
+        </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
+          <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
+        </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
+        </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
+        </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
+          <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
+        </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
+        </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
+        </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
+        </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" />
-                <!-- 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: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=542312&r1=542311&r2=542312
==============================================================================
--- 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 Mon May 28 13:17:10 2007
@@ -20,52 +20,52 @@
 
 <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">
-            <!-- 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: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>

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/protected/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/protected/sitemap.xmap?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/protected/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/protected/sitemap.xmap Mon May 28 13:17:10 2007
@@ -20,118 +20,118 @@
 
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
 
-    <!-- ========================= Components ============================== -->
-    <map:components>
-        <map:actions>
-            <map:action name="db-authenticator" src="org.apache.cocoon.acting.DatabaseAuthenticatorAction" />
-        </map:actions>
-    </map:components>
-
-    <!-- =========================== 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="descriptors/*.xml">
-                <map:generate src="{0}" />
-                <map:serialize type="xml" />
-            </map:match>
-
-            <map:match pattern="">
-                <map:redirect-to uri="page" />
-            </map:match>
-
-            <!-- ================= -->
-            <!-- Simple login page -->
-            <!-- ================= -->
-            <map:match pattern="login">
-                <map:generate src="docs/login.xml" />
-                <map:transform src="stylesheets/simple-page2html.xsl">
-                    <map:parameter name="servletPath" value="{request:servletPath}" />
-                    <map:parameter name="sitemapURI" value="{request:sitemapURI}" />
-                    <map:parameter name="contextPath" value="{request:contextPath}" />
-                    <map:parameter name="file" value="docs/login.xml" />
-                    <map:parameter name="remove" value="{0}" />
-                </map:transform>
-                <map:serialize />
-            </map:match>
-
-            <!-- ========================================= -->
-            <!-- Form target which performs auth service   -->
-            <!-- ========================================= -->
-            <map:match pattern="do-login">
-                <!-- first validate whether submitted values are ok -->
-                <map:act type="form-validator">
-                    <map:parameter name="descriptor" value="descriptors/params.xml" />
-                    <map:parameter name="validate" value="username" />
-                    <!-- now try to log in -->
-                    <map:act type="db-authenticator">
-                        <map:parameter name="descriptor" value="descriptors/auth.xml" />
-                        <!-- now go to protected area -->
-                        <map:redirect-to uri="page" />
-                    </map:act>
-                </map:act>
-                <!-- something was wrong, try it again -->
-                <map:redirect-to uri="login" />
-            </map:match>
-
-            <!-- ================ -->
-            <!-- Protected area   -->
-            <!-- ================ -->
-            <map:match pattern="page">
-                <!-- first validate whether user has logged in -->
-                <map:act type="session-validator">
-                    <map:parameter name="descriptor" value="descriptors/params.xml" />
-                    <map:parameter name="validate" value="username,department_id,theme" />
-                    <!-- generate protected content -->
-                    <map:generate type="jx" src="docs/protected.xml">
-                        <map:parameter name="username" value="{session-attr:username}" />
-                        <map:parameter name="department_id" value="{session-attr:department_id}" />
-                        <map:parameter name="theme" value="{session-attr:theme}" />
-                    </map:generate>
-                    <map:transform src="stylesheets/{theme}-page2html.xsl">
-                        <map:parameter name="servletPath" value="{request:servletPath}" />
-                        <map:parameter name="sitemapURI" value="{request:sitemapURI}" />
-                        <map:parameter name="contextPath" value="{request:contextPath}" />
-                        <map:parameter name="file" value="docs/protected.xsp" />
-                        <map:parameter name="remove" value="{../0}" />
-                    </map:transform>
-                    <map:serialize />
-                </map:act>
-                <!-- something was wrong, redirect to login page -->
-                <map:redirect-to uri="login" />
-            </map:match>
-
-            <!-- ========================================= -->
-            <!-- Logout link which invalidates the session -->
-            <!-- ========================================= -->
-            <map:match pattern="do-logout">
-                <map:act type="session-invalidator">
-                    <map:redirect-to uri="login" />
-                </map:act>
-            </map:match>
+  <!-- ========================= Components ============================== -->
+  <map:components>
+    <map:actions>
+      <map:action name="db-authenticator" src="org.apache.cocoon.acting.DatabaseAuthenticatorAction" />
+    </map:actions>
+  </map:components>
+
+  <!-- =========================== 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="descriptors/*.xml">
+        <map:generate src="{0}" />
+        <map:serialize type="xml" />
+      </map:match>
+
+      <map:match pattern="">
+        <map:redirect-to uri="page" />
+      </map:match>
+
+      <!-- ================= -->
+      <!-- Simple login page -->
+      <!-- ================= -->
+      <map:match pattern="login">
+        <map:generate src="docs/login.xml" />
+        <map:transform src="stylesheets/simple-page2html.xsl">
+          <map:parameter name="servletPath" value="{request:servletPath}" />
+          <map:parameter name="sitemapURI" value="{request:sitemapURI}" />
+          <map:parameter name="contextPath" value="{request:contextPath}" />
+          <map:parameter name="file" value="docs/login.xml" />
+          <map:parameter name="remove" value="{0}" />
+        </map:transform>
+        <map:serialize />
+      </map:match>
+
+      <!-- ========================================= -->
+      <!-- Form target which performs auth service   -->
+      <!-- ========================================= -->
+      <map:match pattern="do-login">
+        <!-- first validate whether submitted values are ok -->
+        <map:act type="form-validator">
+          <map:parameter name="descriptor" value="descriptors/params.xml" />
+          <map:parameter name="validate" value="username" />
+          <!-- now try to log in -->
+          <map:act type="db-authenticator">
+            <map:parameter name="descriptor" value="descriptors/auth.xml" />
+            <!-- now go to protected area -->
+            <map:redirect-to uri="page" />
+          </map:act>
+        </map:act>
+        <!-- something was wrong, try it again -->
+        <map:redirect-to uri="login" />
+      </map:match>
+
+      <!-- ================ -->
+      <!-- Protected area   -->
+      <!-- ================ -->
+      <map:match pattern="page">
+        <!-- first validate whether user has logged in -->
+        <map:act type="session-validator">
+          <map:parameter name="descriptor" value="descriptors/params.xml" />
+          <map:parameter name="validate" value="username,department_id,theme" />
+          <!-- generate protected content -->
+          <map:generate type="jx" src="docs/protected.xml">
+            <map:parameter name="username" value="{session-attr:username}" />
+            <map:parameter name="department_id" value="{session-attr:department_id}" />
+            <map:parameter name="theme" value="{session-attr:theme}" />
+          </map:generate>
+          <map:transform src="stylesheets/{theme}-page2html.xsl">
+            <map:parameter name="servletPath" value="{request:servletPath}" />
+            <map:parameter name="sitemapURI" value="{request:sitemapURI}" />
+            <map:parameter name="contextPath" value="{request:contextPath}" />
+            <map:parameter name="file" value="docs/protected.xsp" />
+            <map:parameter name="remove" value="{../0}" />
+          </map:transform>
+          <map:serialize />
+        </map:act>
+        <!-- something was wrong, redirect to login page -->
+        <map:redirect-to uri="login" />
+      </map:match>
+
+      <!-- ========================================= -->
+      <!-- Logout link which invalidates the session -->
+      <!-- ========================================= -->
+      <map:match pattern="do-logout">
+        <map:act type="session-invalidator">
+          <map:redirect-to uri="login" />
+        </map:act>
+      </map:match>
 
-        </map:pipeline>
-    </map:pipelines>
+    </map:pipeline>
+  </map:pipelines>
 </map:sitemap>
 
 <!-- end of file -->

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/simpleform/four/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/simpleform/four/sitemap.xmap?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/simpleform/four/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/simpleform/four/sitemap.xmap Mon May 28 13:17:10 2007
@@ -17,179 +17,179 @@
 -->
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
 
-    <!-- =========================== Components =================================== -->
+  <!-- =========================== Components =================================== -->
 
-    <map:components>
+  <map:components>
 
-        <!-- =========================== Transformers =================================== -->
+    <!-- =========================== Transformers =================================== -->
 
-        <map:transformers default="xslt">
+    <map:transformers default="xslt">
 
-            <!--+ 
-                | the SimpleFormTransformer acts upon HTML4 form element tags and 
-                | replaces their value attribute or their content in case of the 
-                | textarea element with data obtained from an input module attribute 
-                | with the same name. In addition, it checks the result of the 
-                | FormValidatorAction when it encounters <error/> tags and includes
-                | / excludes them depending on the result. 
+      <!--+ 
+        | the SimpleFormTransformer acts upon HTML4 form element tags and 
+        | replaces their value attribute or their content in case of the 
+        | textarea element with data obtained from an input module attribute 
+        | with the same name. In addition, it checks the result of the 
+        | FormValidatorAction when it encounters <error/> tags and includes
+        | / excludes them depending on the result. 
+        |
+        +-->
+      <map:transformer name="simpleform" logger="sitemap.transformer.simpleform" src="org.apache.cocoon.transformation.SimpleFormTransformer">
+        <input-module name="request-param" />
+      </map:transformer>
+
+      <!--+ 
+        | This transformer is used to extract the form instance data from the
+        | xml document. See the javadocs of this class for more information on
+        | the default configuration and  configuration options.
+        |
+        | Here, the instance data is nested inside the form element. The
+        | transformer can be configured to look for it at other places.
+        |
+        | The instance data is stored as an attribute with the same name as the 
+        | form using an output module. Here we decide to use the RequestAttributeMap
+        |  module. This would allows
+        | a) to store instances for several forms and 
+        | b) to access a particular instance and value using JXPath syntax.
+        |
+        | Per default, the map key is the name of the form as is the root node 
+        | of the new Document.
+        |
+        +-->
+      <map:transformer name="simpleform-instance-extraction" logger="sitemap.transformer.simpleform-request" src="org.apache.cocoon.transformation.SimpleFormInstanceExtractionTransformer">
+        <output name="request-attr-map" />
+      </map:transformer>
+
+      <!--+ 
+        | This is the other transformer to read and insert the instance data. 
+        | It will be applied first in the pipeline so that the user submitted 
+        | data can override the default data. 
+        |
+        | Only one of the two transformers needs to check for validation errors, 
+        | this instance has been instructed to ignore validation results because 
+        | looking up the instance data requires to augment the element name with
+        | the form name and thus differ from the validation result names.
+        |
+        | The instance extractor places the form instances into a map with the 
+        | form name as key. Furthermore, it has been instructed to create a root
+        |  element wrapping the instance data with the same name as the form. 
+        | Hence we need to included the form's name twice in the element name 
+        | used for the lookup.
+        |
+        | In addition, we may want to be able to select from a XSP if the form 
+        | data should be replaced with values from the instance or from the 
+        | request. Therefore, a different attribute is used to protect element 
+        | values.
+        |
+        +-->
+      <map:transformer name="simpleform-instance" logger="sitemap.transformer.simpleform-instance" src="org.apache.cocoon.transformation.SimpleFormTransformer">
+        <fixed-attribute>this-is-never-used</fixed-attribute>
+        <use-form-name-twice>true</use-form-name-twice>
+        <ignore-validation>true</ignore-validation>
+        <input-module name="jxpath">
+          <!--+
+            | "jxpath" does not pass the attribute name to the module it
+            | obtains the value to act from. Thus an additional attribute
+            | name needs to be injected. 
+            +-->
+          <from-parameter>org.apache.cocoon.components.modules.output.OutputModule</from-parameter>
+          <input-module name="request-attr" />
+        </input-module>
+      </map:transformer>
+
+    </map:transformers>
+
+  </map:components>
+
+  <!-- =========================== Resources =================================== -->
+
+  <map:resources>
+    <map:resource name="static-page">
+      <!-- Make use of servlet services -->
+      <map:serialize type="servletService">
+        <map:parameter name="service" value="servlet:style-default:/service/common/simple-page2html" />
+      </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>
+
+      <!-- some redirections -->
+      <map:match pattern="">
+        <map:redirect-to uri="index" />
+      </map:match>
+
+      <map:match pattern="index">
+        <!--+
+          | Only validate when data was submitted
+          +-->
+        <map:select type="simple">
+          <map:parameter name="value" value="{request:method}" />
+          <map:when test="POST">
+            <!--+
+              | Check the request parameters using the FormValidatorAction 
+              +-->
+            <map:act type="form-validator">
+              <map:parameter name="descriptor" value="descriptor.xml" />
+              <map:parameter name="constraint-set" value="car-reservation" />
+              <!--+
+                | this is the success case
                 |
                 +-->
-            <map:transformer name="simpleform" logger="sitemap.transformer.simpleform" src="org.apache.cocoon.transformation.SimpleFormTransformer">
-                <input-module name="request-param" />
-            </map:transformer>
-
-            <!--+ 
-                | This transformer is used to extract the form instance data from the
-                | xml document. See the javadocs of this class for more information on
-                | the default configuration and  configuration options.
-                |
-                | Here, the instance data is nested inside the form element. The
-                | transformer can be configured to look for it at other places.
-                |
-                | The instance data is stored as an attribute with the same name as the 
-                | form using an output module. Here we decide to use the RequestAttributeMap
-                |  module. This would allows
-                | a) to store instances for several forms and 
-                | b) to access a particular instance and value using JXPath syntax.
-                |
-                | Per default, the map key is the name of the form as is the root node 
-                | of the new Document.
-                |
-                +-->
-            <map:transformer name="simpleform-instance-extraction" logger="sitemap.transformer.simpleform-request" src="org.apache.cocoon.transformation.SimpleFormInstanceExtractionTransformer">
-                <output name="request-attr-map" />
-            </map:transformer>
-
-            <!--+ 
-                | This is the other transformer to read and insert the instance data. 
-                | It will be applied first in the pipeline so that the user submitted 
-                | data can override the default data. 
-                |
-                | Only one of the two transformers needs to check for validation errors, 
-                | this instance has been instructed to ignore validation results because 
-                | looking up the instance data requires to augment the element name with
-                | the form name and thus differ from the validation result names.
-                |
-                | The instance extractor places the form instances into a map with the 
-                | form name as key. Furthermore, it has been instructed to create a root
-                |  element wrapping the instance data with the same name as the form. 
-                | Hence we need to included the form's name twice in the element name 
-                | used for the lookup.
-                |
-                | In addition, we may want to be able to select from a XSP if the form 
-                | data should be replaced with values from the instance or from the 
-                | request. Therefore, a different attribute is used to protect element 
-                | values.
-                |
-                +-->
-            <map:transformer name="simpleform-instance" logger="sitemap.transformer.simpleform-instance" src="org.apache.cocoon.transformation.SimpleFormTransformer">
-                <fixed-attribute>this-is-never-used</fixed-attribute>
-                <use-form-name-twice>true</use-form-name-twice>
-                <ignore-validation>true</ignore-validation>
-                <input-module name="jxpath">
-                    <!--+
-                        | "jxpath" does not pass the attribute name to the module it
-                        | obtains the value to act from. Thus an additional attribute
-                        | name needs to be injected. 
-                        +-->
-                    <from-parameter>org.apache.cocoon.components.modules.output.OutputModule</from-parameter>
-                    <input-module name="request-attr" />
-                </input-module>
-            </map:transformer>
-
-        </map:transformers>
-
-    </map:components>
-
-    <!-- =========================== Resources =================================== -->
-
-    <map:resources>
-        <map:resource name="static-page">
-            <!-- Make use of servlet services -->
-            <map:serialize type="servletService">
-                <map:parameter name="service" value="servlet:style-default:/service/common/simple-page2html" />
-            </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>
-
-            <!-- some redirections -->
-            <map:match pattern="">
-                <map:redirect-to uri="index" />
-            </map:match>
-
-            <map:match pattern="index">
-                <!--+
-                    | Only validate when data was submitted
-                    +-->
-                <map:select type="simple">
-                    <map:parameter name="value" value="{request:method}" />
-                    <map:when test="POST">
-                        <!--+
-                            | Check the request parameters using the FormValidatorAction 
-                            +-->
-                        <map:act type="form-validator">
-                            <map:parameter name="descriptor" value="descriptor.xml" />
-                            <map:parameter name="constraint-set" value="car-reservation" />
-                            <!--+
-                                | this is the success case
-                                |
-                                +-->
-                            <map:generate src="success.xml" />
-                            <map:transform type="simpleform" />
-                            <map:call resource="static-page">
-                                <map:parameter name="file" value="success" />
-                            </map:call>
-                            <!-- because of the resource above the "success" pipeline ends here. -->
-                        </map:act>
-                    </map:when>
-                </map:select>
-                <!--+
-                    | this branch contains the failed validation.
-                    | Since the "success" pipeline ends with a resource, the following is only 
-                    | applied if validation has not been successful.
-                    +-->
-                <map:generate type="file" src="form.xml" />
-                <!-- extract the instance data -->
-                <map:transform type="simpleform-instance-extraction" />
-                <!-- fill in the instance data -->
-                <map:transform type="simpleform-instance" />
-                <!-- fill in the request parameters, and error tags -->
-                <map:transform type="simpleform" />
-                <map:call resource="static-page">
-                    <map:parameter name="file" value="form" />
-                </map:call>
-            </map:match>
-
-            <!-- some redirections -->
-            <map:match pattern="*">
-                <map:redirect-to uri="index" />
-            </map:match>
+              <map:generate src="success.xml" />
+              <map:transform type="simpleform" />
+              <map:call resource="static-page">
+                <map:parameter name="file" value="success" />
+              </map:call>
+              <!-- because of the resource above the "success" pipeline ends here. -->
+            </map:act>
+          </map:when>
+        </map:select>
+        <!--+
+          | this branch contains the failed validation.
+          | Since the "success" pipeline ends with a resource, the following is only 
+          | applied if validation has not been successful.
+          +-->
+        <map:generate type="file" src="form.xml" />
+        <!-- extract the instance data -->
+        <map:transform type="simpleform-instance-extraction" />
+        <!-- fill in the instance data -->
+        <map:transform type="simpleform-instance" />
+        <!-- fill in the request parameters, and error tags -->
+        <map:transform type="simpleform" />
+        <map:call resource="static-page">
+          <map:parameter name="file" value="form" />
+        </map:call>
+      </map:match>
+
+      <!-- some redirections -->
+      <map:match pattern="*">
+        <map:redirect-to uri="index" />
+      </map:match>
 
-        </map:pipeline>
-    </map:pipelines>
+    </map:pipeline>
+  </map:pipelines>
 
 </map:sitemap>