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

svn commit: r542312 [2/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...

Modified: cocoon/trunk/blocks/cocoon-batik/cocoon-batik-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-batik/cocoon-batik-sample/src/main/resources/COB-INF/sitemap.xmap?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-batik/cocoon-batik-sample/src/main/resources/COB-INF/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-batik/cocoon-batik-sample/src/main/resources/COB-INF/sitemap.xmap Mon May 28 13:17:10 2007
@@ -24,92 +24,92 @@
 
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
 
-    <!-- =========================== Components ================================ -->
+  <!-- =========================== Components ================================ -->
 
-    <map:components>
-        <map:serializers default="html">
-            <map:serializer logger="sitemap.serializer.svgxml" mime-type="image/svg+xml" name="svgxml" src="org.apache.cocoon.serialization.XMLSerializer">
-                <doctype-public>-//W3C//DTD SVG 1.0//EN</doctype-public>
-                <doctype-system>http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd</doctype-system>
-            </map:serializer>
-            <map:serializer logger="sitemap.serializer.svg2jpeg" name="svg2jpeg" src="org.apache.cocoon.serialization.SVGSerializer" mime-type="image/jpeg">
-                <parameter name="quality" type="float" value="0.9" />
-            </map:serializer>
-            <map:serializer logger="sitemap.serializer.svg2png" name="svg2png" src="org.apache.cocoon.serialization.SVGSerializer" mime-type="image/png" />
-        </map:serializers>
-    </map:components>
-
-    <!-- =========================== Views =================================== -->
-
-    <map:views>
-        <map:view from-label="content" name="content">
-            <map:serialize type="xml" />
-        </map:view>
-
-        <map:view from-label="content" name="pretty-content">
-            <!-- Make use of servlet services -->
-            <map:serialize type="servletService">
-                <map:parameter name="service" value="servlet:style-default:/service/system/xml2html" />
-            </map:serialize>
-        </map:view>
-
-        <map:view from-position="last" name="links">
-            <map:serialize type="links" />
-        </map:view>
-    </map:views>
-
-    <!-- =========================== Pipelines ================================= -->
-
-    <map:pipelines>
-        <map:pipeline type="caching">
-            <map:match pattern="">
-                <map:redirect-to uri="welcome" />
-            </map:match>
-
-            <map:match pattern="welcome">
-                <map:generate src="samples.xml" />
-                <!-- Make use of servlet services -->
-                <map:serialize type="servletService">
-                    <map:parameter name="service" value="servlet:style-default:/service/common/simple-samples2html" />
-                </map:serialize>
-            </map:match>
-
-            <map:match pattern="sitemap.xmap">
-                <map:read src="sitemap.xmap" mime-type="text/xml" />
-            </map:match>
-
-            <!-- ========================== batik ================================ -->
-
-            <map:match pattern="hello.jpeg">
-                <map:generate src="servlet:main-sample:/hello-world/hello.svg" />
-                <map:serialize type="svg2jpeg" />
-            </map:match>
-
-            <map:match pattern="hello.png">
-                <map:generate src="servlet:main-sample:/hello-world/hello.svg" />
-                <map:serialize type="svg2png" />
-            </map:match>
-
-            <map:match pattern="hello.svg">
-                <map:generate src="servlet:main-sample:/hello-world/hello.svg" />
-                <map:serialize type="svgxml" />
-            </map:match>
-
-            <map:match pattern="*.svg">
-                <map:generate src="{1}.svg" />
-                <map:serialize type="svgxml" />
-            </map:match>
-
-            <map:match pattern="*.jpeg">
-                <map:generate src="{1}.svg" />
-                <map:serialize type="svg2jpeg" />
-            </map:match>
-
-            <map:match pattern="*.png">
-                <map:generate src="{1}.svg" />
-                <map:serialize type="svg2png" />
-            </map:match>
+  <map:components>
+    <map:serializers default="html">
+      <map:serializer logger="sitemap.serializer.svgxml" mime-type="image/svg+xml" name="svgxml" src="org.apache.cocoon.serialization.XMLSerializer">
+        <doctype-public>-//W3C//DTD SVG 1.0//EN</doctype-public>
+        <doctype-system>http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd</doctype-system>
+      </map:serializer>
+      <map:serializer logger="sitemap.serializer.svg2jpeg" name="svg2jpeg" src="org.apache.cocoon.serialization.SVGSerializer" mime-type="image/jpeg">
+        <parameter name="quality" type="float" value="0.9" />
+      </map:serializer>
+      <map:serializer logger="sitemap.serializer.svg2png" name="svg2png" src="org.apache.cocoon.serialization.SVGSerializer" mime-type="image/png" />
+    </map:serializers>
+  </map:components>
+
+  <!-- =========================== Views =================================== -->
+
+  <map:views>
+    <map:view from-label="content" name="content">
+      <map:serialize type="xml" />
+    </map:view>
+
+    <map:view from-label="content" name="pretty-content">
+      <!-- Make use of servlet services -->
+      <map:serialize type="servletService">
+        <map:parameter name="service" value="servlet:style-default:/service/system/xml2html" />
+      </map:serialize>
+    </map:view>
+
+    <map:view from-position="last" name="links">
+      <map:serialize type="links" />
+    </map:view>
+  </map:views>
+
+  <!-- =========================== Pipelines ================================= -->
+
+  <map:pipelines>
+    <map:pipeline type="caching">
+      <map:match pattern="">
+        <map:redirect-to uri="welcome" />
+      </map:match>
+
+      <map:match pattern="welcome">
+        <map:generate src="samples.xml" />
+        <!-- Make use of servlet services -->
+        <map:serialize type="servletService">
+          <map:parameter name="service" value="servlet:style-default:/service/common/simple-samples2html" />
+        </map:serialize>
+      </map:match>
+
+      <map:match pattern="sitemap.xmap">
+        <map:read src="sitemap.xmap" mime-type="text/xml" />
+      </map:match>
+
+      <!-- ========================== batik ================================ -->
+
+      <map:match pattern="hello.jpeg">
+        <map:generate src="servlet:main-sample:/hello-world/hello.svg" />
+        <map:serialize type="svg2jpeg" />
+      </map:match>
+
+      <map:match pattern="hello.png">
+        <map:generate src="servlet:main-sample:/hello-world/hello.svg" />
+        <map:serialize type="svg2png" />
+      </map:match>
+
+      <map:match pattern="hello.svg">
+        <map:generate src="servlet:main-sample:/hello-world/hello.svg" />
+        <map:serialize type="svgxml" />
+      </map:match>
+
+      <map:match pattern="*.svg">
+        <map:generate src="{1}.svg" />
+        <map:serialize type="svgxml" />
+      </map:match>
+
+      <map:match pattern="*.jpeg">
+        <map:generate src="{1}.svg" />
+        <map:serialize type="svg2jpeg" />
+      </map:match>
+
+      <map:match pattern="*.png">
+        <map:generate src="{1}.svg" />
+        <map:serialize type="svg2png" />
+      </map:match>
 
-        </map:pipeline>
-    </map:pipelines>
+    </map:pipeline>
+  </map:pipelines>
 </map:sitemap>

Modified: cocoon/trunk/blocks/cocoon-batik/cocoon-batik-sample/src/main/resources/META-INF/cocoon/spring/cocoon-batik-sample-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-batik/cocoon-batik-sample/src/main/resources/META-INF/cocoon/spring/cocoon-batik-sample-blockServlet.xml?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-batik/cocoon-batik-sample/src/main/resources/META-INF/cocoon/spring/cocoon-batik-sample-blockServlet.xml (original)
+++ cocoon/trunk/blocks/cocoon-batik/cocoon-batik-sample/src/main/resources/META-INF/cocoon/spring/cocoon-batik-sample-blockServlet.xml Mon May 28 13:17:10 2007
@@ -23,12 +23,12 @@
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
                            http://cocoon.apache.org/schema/servlet http://cocoon.apache.org/schema/servlet/cocoon-servlet-1.0.xsd">
 
-    <bean id="org.apache.cocoon.batik.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
-        <servlet:context mount-path="/cocoon-batik-sample" context-path="blockcontext:/cocoon-batik-sample/">
-            <servlet:connections>
-                <entry key="main-sample" value-ref="org.apache.cocoon.core.main.sample.servlet" />
-                <entry key="style-default" value-ref="org.apache.cocoon.samples.style.default.servlet" />
-            </servlet:connections>
-        </servlet:context>
-    </bean>
+  <bean id="org.apache.cocoon.batik.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
+    <servlet:context mount-path="/cocoon-batik-sample" context-path="blockcontext:/cocoon-batik-sample/">
+      <servlet:connections>
+        <entry key="main-sample" value-ref="org.apache.cocoon.core.main.sample.servlet" />
+        <entry key="style-default" value-ref="org.apache.cocoon.samples.style.default.servlet" />
+      </servlet:connections>
+    </servlet:context>
+  </bean>
 </beans>

Modified: cocoon/trunk/blocks/cocoon-bsf/cocoon-bsf-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-bsf/cocoon-bsf-sample/src/main/resources/COB-INF/sitemap.xmap?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-bsf/cocoon-bsf-sample/src/main/resources/COB-INF/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-bsf/cocoon-bsf-sample/src/main/resources/COB-INF/sitemap.xmap Mon May 28 13:17:10 2007
@@ -24,53 +24,53 @@
 
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
 
-    <!-- =========================== Views =================================== -->
+  <!-- =========================== Views =================================== -->
 
-    <map:views>
-        <map:view from-label="content" name="content">
-            <map:serialize type="xml" />
-        </map:view>
-
-        <map:view from-label="content" name="pretty-content">
-            <!-- Make use of servlet services -->
-            <map:serialize type="servletService">
-                <map:parameter name="service" value="servlet:style-default:/service/system/xml2html" />
-            </map:serialize>
-        </map:view>
-
-        <map:view from-position="last" name="links">
-            <map:serialize type="links" />
-        </map:view>
-    </map:views>
-
-    <!-- =========================== Pipelines ================================= -->
-
-    <map:pipelines>
-        <map:pipeline type="caching">
-            <map:match pattern="">
-                <map:redirect-to uri="welcome" />
-            </map:match>
-
-            <map:match pattern="welcome">
-                <map:generate src="samples.xml" />
-                <!-- Make use of servlet services -->
-                <map:serialize type="servletService">
-                    <map:parameter name="service" value="servlet:style-default:/service/common/simple-samples2html" />
-                </map:serialize>
-            </map:match>
-
-            <map:match pattern="sitemap.xmap">
-                <map:read src="sitemap.xmap" mime-type="text/xml" />
-            </map:match>
-
-            <!-- ========================== BSF Groovy ========================== -->
-
-            <map:match pattern="generator/*.gy">
-                <map:generate type="script" src="generator/{1}.gy" />
-                <map:transform src="servlet:main-sample:/hello-world/style/xsl/page2html.xsl" />
-                <map:transform type="servletLinkRewriter" />
-                <map:serialize type="xml" />
-            </map:match>
-        </map:pipeline>
-    </map:pipelines>
+  <map:views>
+    <map:view from-label="content" name="content">
+      <map:serialize type="xml" />
+    </map:view>
+
+    <map:view from-label="content" name="pretty-content">
+      <!-- Make use of servlet services -->
+      <map:serialize type="servletService">
+        <map:parameter name="service" value="servlet:style-default:/service/system/xml2html" />
+      </map:serialize>
+    </map:view>
+
+    <map:view from-position="last" name="links">
+      <map:serialize type="links" />
+    </map:view>
+  </map:views>
+
+  <!-- =========================== Pipelines ================================= -->
+
+  <map:pipelines>
+    <map:pipeline type="caching">
+      <map:match pattern="">
+        <map:redirect-to uri="welcome" />
+      </map:match>
+
+      <map:match pattern="welcome">
+        <map:generate src="samples.xml" />
+        <!-- Make use of servlet services -->
+        <map:serialize type="servletService">
+          <map:parameter name="service" value="servlet:style-default:/service/common/simple-samples2html" />
+        </map:serialize>
+      </map:match>
+
+      <map:match pattern="sitemap.xmap">
+        <map:read src="sitemap.xmap" mime-type="text/xml" />
+      </map:match>
+
+      <!-- ========================== BSF Groovy ========================== -->
+
+      <map:match pattern="generator/*.gy">
+        <map:generate type="script" src="generator/{1}.gy" />
+        <map:transform src="servlet:main-sample:/hello-world/style/xsl/page2html.xsl" />
+        <map:transform type="servletLinkRewriter" />
+        <map:serialize type="xml" />
+      </map:match>
+    </map:pipeline>
+  </map:pipelines>
 </map:sitemap>

Modified: cocoon/trunk/blocks/cocoon-bsf/cocoon-bsf-sample/src/main/resources/META-INF/cocoon/spring/cocoon-bsf-sample-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-bsf/cocoon-bsf-sample/src/main/resources/META-INF/cocoon/spring/cocoon-bsf-sample-blockServlet.xml?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-bsf/cocoon-bsf-sample/src/main/resources/META-INF/cocoon/spring/cocoon-bsf-sample-blockServlet.xml (original)
+++ cocoon/trunk/blocks/cocoon-bsf/cocoon-bsf-sample/src/main/resources/META-INF/cocoon/spring/cocoon-bsf-sample-blockServlet.xml Mon May 28 13:17:10 2007
@@ -23,12 +23,12 @@
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
                            http://cocoon.apache.org/schema/servlet http://cocoon.apache.org/schema/servlet/cocoon-servlet-1.0.xsd">
 
-    <bean id="org.apache.cocoon.bsf.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
-        <servlet:context mount-path="/cocoon-bsf-sample" context-path="blockcontext:/cocoon-bsf-sample/">
-            <servlet:connections>
-                <entry key="main-sample" value-ref="org.apache.cocoon.core.main.sample.servlet" />
-                <entry key="style-default" value-ref="org.apache.cocoon.samples.style.default.servlet" />
-            </servlet:connections>
-        </servlet:context>
-    </bean>
+  <bean id="org.apache.cocoon.bsf.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
+    <servlet:context mount-path="/cocoon-bsf-sample" context-path="blockcontext:/cocoon-bsf-sample/">
+      <servlet:connections>
+        <entry key="main-sample" value-ref="org.apache.cocoon.core.main.sample.servlet" />
+        <entry key="style-default" value-ref="org.apache.cocoon.samples.style.default.servlet" />
+      </servlet:connections>
+    </servlet:context>
+  </bean>
 </beans>

Modified: cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-sample/src/main/resources/COB-INF/sitemap.xmap?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-sample/src/main/resources/COB-INF/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-sample/src/main/resources/COB-INF/sitemap.xmap Mon May 28 13:17:10 2007
@@ -23,90 +23,90 @@
 
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
 
-    <!-- =========================== Flows =================================== -->
+  <!-- =========================== Flows =================================== -->
 
-    <map:flow language="javascript" />
+  <map:flow language="javascript" />
 
-    <!-- =========================== Views =================================== -->
+  <!-- =========================== Views =================================== -->
 
-    <map:views>
-        <map:view from-label="content" name="content">
-            <map:serialize type="xml" />
-        </map:view>
-
-        <map:view from-label="content" name="pretty-content">
-            <!-- Make use of servlet services -->
-            <map:serialize type="servletService">
-                <map:parameter name="service" value="servlet:style-default:/service/system/xml2html" />
-            </map:serialize>
-        </map:view>
-
-        <map:view from-position="last" name="links">
-            <map:serialize type="links" />
-        </map:view>
-    </map:views>
-
-    <!-- =========================== Pipelines ================================= -->
-
-    <map:pipelines>
-        <map:pipeline type="caching">
-
-            <map:match pattern="">
-                <map:redirect-to uri="welcome" />
-            </map:match>
-
-            <!-- list of samples -->
-            <map:match pattern="welcome">
-                <map:generate src="welcome.xml" />
-                <!-- Make use of servlet services -->
-                <map:serialize type="servletService">
-                    <map:parameter name="service" value="servlet:style-default:/service/common/simple-samples2html" />
-                </map:serialize>
-            </map:match>
-
-            <map:match pattern="sitemap.xmap">
-                <map:read src="sitemap.xmap" mime-type="text/xml" />
-            </map:match>
-
-            <!-- =========================== Captcha ================================= -->
-
-            <map:match pattern="custom">
-                <map:generate src="custom.xhtml" label="content" />
-                <map:serialize type="html" />
-            </map:match>
-
-            <map:match pattern="simple">
-                <map:call function="simple" />
-            </map:match>
-
-            <map:match pattern="continue">
-                <map:call continuation="{request-param:continuation}" />
-            </map:match>
-
-            <map:match pattern="custom.jpeg">
-                <map:read type="captcha" src="{request-param:text}">
-                    <map:parameter name="width" value="{request-param:width}" />
-                    <map:parameter name="height" value="{request-param:height}" />
-                    <map:parameter name="background" value="{request-param:background}" />
-                    <map:parameter name="foreground" value="{request-param:foreground}" />
-                    <map:parameter name="font" value="{request-param:font}" />
-                    <map:parameter name="scale" value="{request-param:scale}" />
-                    <map:parameter name="amount" value="{request-param:amount}" />
-                    <map:parameter name="quality" value="{request-param:quality}" />
-                </map:read>
-            </map:match>
-
-            <map:match pattern="simple.jpeg">
-                <map:read type="captcha" src="{session-attr:captcha}" />
-            </map:match>
-
-            <map:match pattern="**.jx">
-                <map:generate src="{1}.jx" />
-                <map:transform type="jx" label="content" />
-                <map:serialize type="html" />
-            </map:match>
+  <map:views>
+    <map:view from-label="content" name="content">
+      <map:serialize type="xml" />
+    </map:view>
+
+    <map:view from-label="content" name="pretty-content">
+      <!-- Make use of servlet services -->
+      <map:serialize type="servletService">
+        <map:parameter name="service" value="servlet:style-default:/service/system/xml2html" />
+      </map:serialize>
+    </map:view>
+
+    <map:view from-position="last" name="links">
+      <map:serialize type="links" />
+    </map:view>
+  </map:views>
+
+  <!-- =========================== Pipelines ================================= -->
+
+  <map:pipelines>
+    <map:pipeline type="caching">
+
+      <map:match pattern="">
+        <map:redirect-to uri="welcome" />
+      </map:match>
+
+      <!-- list of samples -->
+      <map:match pattern="welcome">
+        <map:generate src="welcome.xml" />
+        <!-- Make use of servlet services -->
+        <map:serialize type="servletService">
+          <map:parameter name="service" value="servlet:style-default:/service/common/simple-samples2html" />
+        </map:serialize>
+      </map:match>
+
+      <map:match pattern="sitemap.xmap">
+        <map:read src="sitemap.xmap" mime-type="text/xml" />
+      </map:match>
+
+      <!-- =========================== Captcha ================================= -->
+
+      <map:match pattern="custom">
+        <map:generate src="custom.xhtml" label="content" />
+        <map:serialize type="html" />
+      </map:match>
+
+      <map:match pattern="simple">
+        <map:call function="simple" />
+      </map:match>
+
+      <map:match pattern="continue">
+        <map:call continuation="{request-param:continuation}" />
+      </map:match>
+
+      <map:match pattern="custom.jpeg">
+        <map:read type="captcha" src="{request-param:text}">
+          <map:parameter name="width" value="{request-param:width}" />
+          <map:parameter name="height" value="{request-param:height}" />
+          <map:parameter name="background" value="{request-param:background}" />
+          <map:parameter name="foreground" value="{request-param:foreground}" />
+          <map:parameter name="font" value="{request-param:font}" />
+          <map:parameter name="scale" value="{request-param:scale}" />
+          <map:parameter name="amount" value="{request-param:amount}" />
+          <map:parameter name="quality" value="{request-param:quality}" />
+        </map:read>
+      </map:match>
+
+      <map:match pattern="simple.jpeg">
+        <map:read type="captcha" src="{session-attr:captcha}" />
+      </map:match>
+
+      <map:match pattern="**.jx">
+        <map:generate src="{1}.jx" />
+        <map:transform type="jx" label="content" />
+        <map:serialize type="html" />
+      </map:match>
 
 
-        </map:pipeline>
-    </map:pipelines>
+    </map:pipeline>
+  </map:pipelines>
 </map:sitemap>

Modified: cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-sample/src/main/resources/META-INF/cocoon/spring/cocoon-captcha-sample-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-sample/src/main/resources/META-INF/cocoon/spring/cocoon-captcha-sample-blockServlet.xml?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-sample/src/main/resources/META-INF/cocoon/spring/cocoon-captcha-sample-blockServlet.xml (original)
+++ cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-sample/src/main/resources/META-INF/cocoon/spring/cocoon-captcha-sample-blockServlet.xml Mon May 28 13:17:10 2007
@@ -23,11 +23,11 @@
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
                            http://cocoon.apache.org/schema/servlet http://cocoon.apache.org/schema/servlet/cocoon-servlet-1.0.xsd">
 
-    <bean id="org.apache.cocoon.captcha.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
-        <servlet:context mount-path="/cocoon-captcha-sample" context-path="blockcontext:/cocoon-captcha-sample/">
-            <servlet:connections>
-                <entry key="style-default" value-ref="org.apache.cocoon.samples.style.default.servlet" />
-            </servlet:connections>
-        </servlet:context>
-    </bean>
+  <bean id="org.apache.cocoon.captcha.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
+    <servlet:context mount-path="/cocoon-captcha-sample" context-path="blockcontext:/cocoon-captcha-sample/">
+      <servlet:connections>
+        <entry key="style-default" value-ref="org.apache.cocoon.samples.style.default.servlet" />
+      </servlet:connections>
+    </servlet:context>
+  </bean>
 </beans>

Modified: cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/sitemap.xmap?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/sitemap.xmap Mon May 28 13:17:10 2007
@@ -18,273 +18,273 @@
 <!-- @version $Id$ -->
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
 
-    <!-- =========================== Components ================================ -->
+  <!-- =========================== Components ================================ -->
 
-    <map:components>
+  <map:components>
 
-        <!-- =========================== Generators ================================= -->
+    <!-- =========================== Generators ================================= -->
 
-        <map:generators default="file">
-            <map:generator name="text" logger="sitemap.generator.textgenerator" src="org.apache.cocoon.generation.TextGenerator">
-                <parameter name="localizable" value="true" />
-            </map:generator>
-
-            <map:generator name="exception" src="org.apache.cocoon.generation.ParseExceptionGenerator" />
-        </map:generators>
-
-        <!-- =========================== Transformers ================================= -->
-
-        <map:transformers default="xsltc">
-            <map:transformer name="pattern" src="org.apache.cocoon.transformation.PatternTransformer" logger="sitemap.transformer.pattern">
-                <parameter name="groups" value="true" />
-            </map:transformer>
-
-            <map:transformer name="lexer" src="org.apache.cocoon.transformation.LexicalTransformer" logger="sitemap.transformer.lexer">
-                <parameter name="localizable" value="true" />
-            </map:transformer>
-
-            <map:transformer name="parser" src="org.apache.cocoon.transformation.ParserTransformer" logger="sitemap.transformer.parser">
-                <parameter name="flatten" value="true" />
-                <parameter name="recovery" value="true" />
-                <parameter name="localizable" value="true" />
-            </map:transformer>
-
-            <map:transformer name="extparser" src="org.apache.cocoon.transformation.ExtendedParserTransformer" logger="sitemap.transformer.extendedparser"></map:transformer>
-        </map:transformers>
-
-        <!-- =========================== Selectors ================================ -->
-
-        <map:selectors default="browser">
-            <map:selector logger="sitemap.selector.exception" name="exception" src="org.apache.cocoon.selection.ExceptionSelector">
-                <exception name="syntax" class="net.sourceforge.chaperon.process.ParseException" />
-                <exception class="java.lang.Throwable" unroll="true" />
-            </map:selector>
-        </map:selectors>
-
-    </map:components>
-
-    <!-- =========================== Views =================================== -->
-
-    <map:views>
-        <map:view from-label="content" name="content">
-            <map:serialize type="xml" />
-        </map:view>
-
-        <map:view from-label="content" name="pretty-content">
-            <!-- Make use of servlet services -->
-            <map:serialize type="servletService">
-                <map:parameter name="service" value="servlet:style-default:/service/system/xml2html" />
-            </map:serialize>
-        </map:view>
-
-        <map:view from-position="last" name="links">
-            <map:serialize type="links" />
-        </map:view>
-
-        <map:view from-label="ast" name="ast">
-            <map:serialize type="xml" />
-        </map:view>
-
-        <map:view from-label="xdoc" name="xdoc">
-            <map:serialize type="xml" />
-        </map:view>
-
-        <map:view from-position="last" name="links">
-            <map:serialize type="links" />
-        </map:view>
-
-    </map:views>
-
-    <!-- =========================== Flow =================================== -->
-
-    <map:flow language="javascript">
-        <map:script src="misc/wiki.js" />
-    </map:flow>
-
-    <!-- =========================== Pipelines ================================= -->
-
-    <map:pipelines>
-
-        <map:pipeline type="caching" internal-only="true">
-            <!-- Hint: During development you could expose this pipeline, to help
-                with writing your grammars. Use a text grammar myapp.grm and request
-                the myapp.xlex and myapp.xgrm URLs and then view source.
-            -->
-            <map:match pattern="*.xlex">
-                <map:generate type="text" src="grammars/{1}.grm" />
-                <map:transform type="lexer" src="grammars/grm.xlex" />
-                <map:transform type="parser" src="grammars/grm.xgrm" />
-                <map:transform src="stylesheets/text4regex.xsl" />
-                <map:transform type="lexer" src="grammars/regex.xlex" />
-                <map:transform type="parser" src="grammars/regex.xgrm" />
-                <map:transform src="stylesheets/grm2xlex.xsl" />
-                <map:serialize type="xml" />
-            </map:match>
-
-            <map:match pattern="*.xgrm">
-                <map:generate type="text" src="grammars/{1}.grm" />
-                <map:transform type="lexer" src="grammars/grm.xlex" />
-                <map:transform type="parser" src="grammars/grm.xgrm" />
-                <map:transform src="stylesheets/text4regex.xsl" />
-                <map:transform type="lexer" src="grammars/regex.xlex" />
-                <map:transform type="parser" src="grammars/regex.xgrm" />
-                <map:transform src="stylesheets/grm2xgrm.xsl" />
-                <map:serialize type="xml" />
-            </map:match>
-
-            <map:match pattern="*.xegrm">
-                <map:generate type="text" src="grammars/{1}.egrm" />
-                <map:transform type="extparser" src="grammars/egrm.xegrm" />
-                <map:transform src="stylesheets/egrm2xegrm.xsl" />
-                <map:serialize type="xml" />
-            </map:match>
-
-            <map:match pattern="wiki/*.html">
-                <map:generate type="jx" src="misc/{1}.xml" />
-                <map:transform type="lexer" src="cocoon:/wiki.xlex" />
-                <map:transform type="parser" src="cocoon:/wiki.xgrm" label="ast">
-                    <map:parameter name="failsafe" value="true" />
-                </map:transform>
-                <map:transform src="stylesheets/error4wiki.xsl" />
-                <map:transform type="lexer" src="grammars/error.xlex" />
-                <map:transform src="stylesheets/error2page.xsl" />
-                <map:transform src="stylesheets/wiki2xdoc.xsl" label="xdoc" />
-                <!-- Make use of servlet services -->
-                <map:serialize type="servletService">
-                    <map:parameter name="service" value="servlet:style-default:/service/common/style/complex-page2html" />
-                </map:serialize>
-            </map:match>
-
-            <map:match pattern="wiki/source.xml">
-                <map:generate type="jx" src="misc/source.xml" />
-                <map:transform type="lexer" src="cocoon:/wiki.xlex" />
-                <map:transform type="parser" src="cocoon:/wiki.xgrm" label="ast" />
-                <map:transform src="stylesheets/wiki2xdoc.xsl" label="xdoc" />
-                <map:serialize type="xml" />
-            </map:match>
-
-        </map:pipeline>
-
-        <map:pipeline type="caching">
-
-            <map:match pattern="">
-                <map:redirect-to uri="welcome" />
-            </map:match>
-
-            <map:match pattern="welcome">
-                <map:generate src="misc/samples.xml" />
-                <!-- Make use of servlet services -->
-                <map:serialize type="servletService">
-                    <map:parameter name="service" value="servlet:style-default:/service/common/simple-samples2html" />
-                </map:serialize>
-            </map:match>
-
-            <map:match pattern="sitemap.xmap">
-                <map:read src="sitemap.xmap" mime-type="text/xml" />
-            </map:match>
-
-            <map:match pattern="*.kont">
-                <map:call continuation="{1}" />
-            </map:match>
-
-            <map:match pattern="*.do">
-                <map:call function="{1}" />
-            </map:match>
-
-            <map:match pattern="*.css">
-                <map:read src="misc/{1}.css" />
-            </map:match>
-
-            <map:match pattern="**/*.css">
-                <map:read src="misc/{2}.css" />
-            </map:match>
-
-            <!-- ========================= Chaperon ================================ -->
-            <map:match pattern="mathexp.html">
-                <map:call function="mathexp" />
-            </map:match>
-            <map:match pattern="mathexp-view.html">
-                <map:generate type="jx" src="misc/mathexp.jx" />
-                <map:transform type="lexer" src="grammars/mathexp.xlex" />
-                <map:transform type="parser" src="grammars/mathexp.xgrm" />
-                <map:transform src="stylesheets/mathexp2html.xsl" />
-                <!-- Make use of servlet services -->
-                <map:serialize type="servletService">
-                    <map:parameter name="service" value="servlet:style-default:/service/common/complex-page2html" />
-                </map:serialize>
-            </map:match>
-
-            <map:match pattern="quote*.html">
-                <map:generate type="text" src="misc/quote{1}.txt" />
-                <map:transform type="lexer" src="cocoon:/quote.xlex" />
-                <map:transform type="parser" src="cocoon:/quote.xgrm" label="ast" />
-                <map:transform src="stylesheets/quote2page.xsl" />
-                <!-- Make use of servlet services -->
-                <map:serialize type="servletService">
-                    <map:parameter name="service" value="servlet:style-default:/service/common/complex-page2html" />
-                </map:serialize>
-            </map:match>
-
-            <map:match pattern="pattern.html">
-                <map:generate src="misc/patterntext.xml" />
-                <map:transform type="pattern" src="grammars/link.xlex" />
-                <map:transform src="stylesheets/pattern2link.xsl" />
-                <!-- Make use of servlet services -->
-                <map:serialize type="servletService">
-                    <map:parameter name="service" value="servlet:style-default:/service/common/complex-page2html" />
-                </map:serialize>
-            </map:match>
-
-            <map:match pattern="**/*.java.html">
-                <map:generate type="text" src="http://cvs.apache.org/viewcvs.cgi/*checkout*/cocoon-2.1/src/java/{1}/{2}.java" />
-                <map:transform type="lexer" src="grammars/java.xlex" />
-                <map:transform src="stylesheets/text4javadoc.xsl" />
-                <map:transform type="lexer" src="grammars/javadoc.xlex" label="ast" />
-                <map:transform src="stylesheets/java2html.xsl">
-                    <map:parameter name="package" value="{1}" />
-                    <map:parameter name="class" value="{2}" />
-                </map:transform>
-                <!-- Make use of servlet services -->
-                <map:serialize type="servletService">
-                    <map:parameter name="service" value="servlet:style-default:/service/common/complex-page2html" />
-                </map:serialize>
-            </map:match>
-
-            <map:match pattern="**/*.class.html">
-                <map:generate type="text" src="http://cvs.apache.org/viewcvs.cgi/*checkout*/cocoon-2.1/src/java/{1}/{2}.java" />
-                <map:transform type="lexer" src="grammars/java.xlex" />
-                <map:transform src="stylesheets/remove4class.xsl" />
-                <map:transform type="parser" src="cocoon:/java.xgrm" />
-                <map:transform src="stylesheets/text4javadoc2.xsl" />
-                <map:transform type="lexer" src="cocoon:/javadoc.xlex" />
-                <map:transform type="parser" src="cocoon:/javadoc.xgrm" label="ast" />
-                <map:transform src="stylesheets/class2html.xsl">
-                    <map:parameter name="package" value="{1}" />
-                    <map:parameter name="class" value="{2}" />
-                </map:transform>
-                <!-- Make use of servlet services -->
-                <map:serialize type="servletService">
-                    <map:parameter name="service" value="servlet:style-default:/service/common/complex-page2html" />
-                </map:serialize>
-            </map:match>
-
-            <map:handle-errors>
-                <map:select type="exception">
-                    <map:when test="syntax">
-                        <map:generate type="exception" />
-                        <map:transform src="stylesheets/text4error.xsl" />
-                        <map:transform type="xinclude" />
-                        <map:transform type="lexer" src="grammars/error.xlex" />
-                        <map:transform src="stylesheets/error2html.xsl">
-                            <map:parameter name="contextPath" value="{request:contextPath}" />
-                        </map:transform>
-                        <map:serialize type="html" />
-                    </map:when>
-                </map:select>
-            </map:handle-errors>
+    <map:generators default="file">
+      <map:generator name="text" logger="sitemap.generator.textgenerator" src="org.apache.cocoon.generation.TextGenerator">
+        <parameter name="localizable" value="true" />
+      </map:generator>
+
+      <map:generator name="exception" src="org.apache.cocoon.generation.ParseExceptionGenerator" />
+    </map:generators>
+
+    <!-- =========================== Transformers ================================= -->
+
+    <map:transformers default="xsltc">
+      <map:transformer name="pattern" src="org.apache.cocoon.transformation.PatternTransformer" logger="sitemap.transformer.pattern">
+        <parameter name="groups" value="true" />
+      </map:transformer>
+
+      <map:transformer name="lexer" src="org.apache.cocoon.transformation.LexicalTransformer" logger="sitemap.transformer.lexer">
+        <parameter name="localizable" value="true" />
+      </map:transformer>
+
+      <map:transformer name="parser" src="org.apache.cocoon.transformation.ParserTransformer" logger="sitemap.transformer.parser">
+        <parameter name="flatten" value="true" />
+        <parameter name="recovery" value="true" />
+        <parameter name="localizable" value="true" />
+      </map:transformer>
+
+      <map:transformer name="extparser" src="org.apache.cocoon.transformation.ExtendedParserTransformer" logger="sitemap.transformer.extendedparser"></map:transformer>
+    </map:transformers>
+
+    <!-- =========================== Selectors ================================ -->
+
+    <map:selectors default="browser">
+      <map:selector logger="sitemap.selector.exception" name="exception" src="org.apache.cocoon.selection.ExceptionSelector">
+        <exception name="syntax" class="net.sourceforge.chaperon.process.ParseException" />
+        <exception class="java.lang.Throwable" unroll="true" />
+      </map:selector>
+    </map:selectors>
+
+  </map:components>
+
+  <!-- =========================== Views =================================== -->
+
+  <map:views>
+    <map:view from-label="content" name="content">
+      <map:serialize type="xml" />
+    </map:view>
+
+    <map:view from-label="content" name="pretty-content">
+      <!-- Make use of servlet services -->
+      <map:serialize type="servletService">
+        <map:parameter name="service" value="servlet:style-default:/service/system/xml2html" />
+      </map:serialize>
+    </map:view>
+
+    <map:view from-position="last" name="links">
+      <map:serialize type="links" />
+    </map:view>
+
+    <map:view from-label="ast" name="ast">
+      <map:serialize type="xml" />
+    </map:view>
+
+    <map:view from-label="xdoc" name="xdoc">
+      <map:serialize type="xml" />
+    </map:view>
+
+    <map:view from-position="last" name="links">
+      <map:serialize type="links" />
+    </map:view>
+
+  </map:views>
+
+  <!-- =========================== Flow =================================== -->
+
+  <map:flow language="javascript">
+    <map:script src="misc/wiki.js" />
+  </map:flow>
+
+  <!-- =========================== Pipelines ================================= -->
+
+  <map:pipelines>
+
+    <map:pipeline type="caching" internal-only="true">
+      <!-- Hint: During development you could expose this pipeline, to help
+        with writing your grammars. Use a text grammar myapp.grm and request
+        the myapp.xlex and myapp.xgrm URLs and then view source.
+      -->
+      <map:match pattern="*.xlex">
+        <map:generate type="text" src="grammars/{1}.grm" />
+        <map:transform type="lexer" src="grammars/grm.xlex" />
+        <map:transform type="parser" src="grammars/grm.xgrm" />
+        <map:transform src="stylesheets/text4regex.xsl" />
+        <map:transform type="lexer" src="grammars/regex.xlex" />
+        <map:transform type="parser" src="grammars/regex.xgrm" />
+        <map:transform src="stylesheets/grm2xlex.xsl" />
+        <map:serialize type="xml" />
+      </map:match>
+
+      <map:match pattern="*.xgrm">
+        <map:generate type="text" src="grammars/{1}.grm" />
+        <map:transform type="lexer" src="grammars/grm.xlex" />
+        <map:transform type="parser" src="grammars/grm.xgrm" />
+        <map:transform src="stylesheets/text4regex.xsl" />
+        <map:transform type="lexer" src="grammars/regex.xlex" />
+        <map:transform type="parser" src="grammars/regex.xgrm" />
+        <map:transform src="stylesheets/grm2xgrm.xsl" />
+        <map:serialize type="xml" />
+      </map:match>
+
+      <map:match pattern="*.xegrm">
+        <map:generate type="text" src="grammars/{1}.egrm" />
+        <map:transform type="extparser" src="grammars/egrm.xegrm" />
+        <map:transform src="stylesheets/egrm2xegrm.xsl" />
+        <map:serialize type="xml" />
+      </map:match>
+
+      <map:match pattern="wiki/*.html">
+        <map:generate type="jx" src="misc/{1}.xml" />
+        <map:transform type="lexer" src="cocoon:/wiki.xlex" />
+        <map:transform type="parser" src="cocoon:/wiki.xgrm" label="ast">
+          <map:parameter name="failsafe" value="true" />
+        </map:transform>
+        <map:transform src="stylesheets/error4wiki.xsl" />
+        <map:transform type="lexer" src="grammars/error.xlex" />
+        <map:transform src="stylesheets/error2page.xsl" />
+        <map:transform src="stylesheets/wiki2xdoc.xsl" label="xdoc" />
+        <!-- Make use of servlet services -->
+        <map:serialize type="servletService">
+          <map:parameter name="service" value="servlet:style-default:/service/common/style/complex-page2html" />
+        </map:serialize>
+      </map:match>
+
+      <map:match pattern="wiki/source.xml">
+        <map:generate type="jx" src="misc/source.xml" />
+        <map:transform type="lexer" src="cocoon:/wiki.xlex" />
+        <map:transform type="parser" src="cocoon:/wiki.xgrm" label="ast" />
+        <map:transform src="stylesheets/wiki2xdoc.xsl" label="xdoc" />
+        <map:serialize type="xml" />
+      </map:match>
+
+    </map:pipeline>
+
+    <map:pipeline type="caching">
+
+      <map:match pattern="">
+        <map:redirect-to uri="welcome" />
+      </map:match>
+
+      <map:match pattern="welcome">
+        <map:generate src="misc/samples.xml" />
+        <!-- Make use of servlet services -->
+        <map:serialize type="servletService">
+          <map:parameter name="service" value="servlet:style-default:/service/common/simple-samples2html" />
+        </map:serialize>
+      </map:match>
+
+      <map:match pattern="sitemap.xmap">
+        <map:read src="sitemap.xmap" mime-type="text/xml" />
+      </map:match>
+
+      <map:match pattern="*.kont">
+        <map:call continuation="{1}" />
+      </map:match>
+
+      <map:match pattern="*.do">
+        <map:call function="{1}" />
+      </map:match>
+
+      <map:match pattern="*.css">
+        <map:read src="misc/{1}.css" />
+      </map:match>
+
+      <map:match pattern="**/*.css">
+        <map:read src="misc/{2}.css" />
+      </map:match>
+
+      <!-- ========================= Chaperon ================================ -->
+      <map:match pattern="mathexp.html">
+        <map:call function="mathexp" />
+      </map:match>
+      <map:match pattern="mathexp-view.html">
+        <map:generate type="jx" src="misc/mathexp.jx" />
+        <map:transform type="lexer" src="grammars/mathexp.xlex" />
+        <map:transform type="parser" src="grammars/mathexp.xgrm" />
+        <map:transform src="stylesheets/mathexp2html.xsl" />
+        <!-- Make use of servlet services -->
+        <map:serialize type="servletService">
+          <map:parameter name="service" value="servlet:style-default:/service/common/complex-page2html" />
+        </map:serialize>
+      </map:match>
+
+      <map:match pattern="quote*.html">
+        <map:generate type="text" src="misc/quote{1}.txt" />
+        <map:transform type="lexer" src="cocoon:/quote.xlex" />
+        <map:transform type="parser" src="cocoon:/quote.xgrm" label="ast" />
+        <map:transform src="stylesheets/quote2page.xsl" />
+        <!-- Make use of servlet services -->
+        <map:serialize type="servletService">
+          <map:parameter name="service" value="servlet:style-default:/service/common/complex-page2html" />
+        </map:serialize>
+      </map:match>
+
+      <map:match pattern="pattern.html">
+        <map:generate src="misc/patterntext.xml" />
+        <map:transform type="pattern" src="grammars/link.xlex" />
+        <map:transform src="stylesheets/pattern2link.xsl" />
+        <!-- Make use of servlet services -->
+        <map:serialize type="servletService">
+          <map:parameter name="service" value="servlet:style-default:/service/common/complex-page2html" />
+        </map:serialize>
+      </map:match>
+
+      <map:match pattern="**/*.java.html">
+        <map:generate type="text" src="http://cvs.apache.org/viewcvs.cgi/*checkout*/cocoon-2.1/src/java/{1}/{2}.java" />
+        <map:transform type="lexer" src="grammars/java.xlex" />
+        <map:transform src="stylesheets/text4javadoc.xsl" />
+        <map:transform type="lexer" src="grammars/javadoc.xlex" label="ast" />
+        <map:transform src="stylesheets/java2html.xsl">
+          <map:parameter name="package" value="{1}" />
+          <map:parameter name="class" value="{2}" />
+        </map:transform>
+        <!-- Make use of servlet services -->
+        <map:serialize type="servletService">
+          <map:parameter name="service" value="servlet:style-default:/service/common/complex-page2html" />
+        </map:serialize>
+      </map:match>
+
+      <map:match pattern="**/*.class.html">
+        <map:generate type="text" src="http://cvs.apache.org/viewcvs.cgi/*checkout*/cocoon-2.1/src/java/{1}/{2}.java" />
+        <map:transform type="lexer" src="grammars/java.xlex" />
+        <map:transform src="stylesheets/remove4class.xsl" />
+        <map:transform type="parser" src="cocoon:/java.xgrm" />
+        <map:transform src="stylesheets/text4javadoc2.xsl" />
+        <map:transform type="lexer" src="cocoon:/javadoc.xlex" />
+        <map:transform type="parser" src="cocoon:/javadoc.xgrm" label="ast" />
+        <map:transform src="stylesheets/class2html.xsl">
+          <map:parameter name="package" value="{1}" />
+          <map:parameter name="class" value="{2}" />
+        </map:transform>
+        <!-- Make use of servlet services -->
+        <map:serialize type="servletService">
+          <map:parameter name="service" value="servlet:style-default:/service/common/complex-page2html" />
+        </map:serialize>
+      </map:match>
+
+      <map:handle-errors>
+        <map:select type="exception">
+          <map:when test="syntax">
+            <map:generate type="exception" />
+            <map:transform src="stylesheets/text4error.xsl" />
+            <map:transform type="xinclude" />
+            <map:transform type="lexer" src="grammars/error.xlex" />
+            <map:transform src="stylesheets/error2html.xsl">
+              <map:parameter name="contextPath" value="{request:contextPath}" />
+            </map:transform>
+            <map:serialize type="html" />
+          </map:when>
+        </map:select>
+      </map:handle-errors>
 
-        </map:pipeline>
+    </map:pipeline>
 
-    </map:pipelines>
+  </map:pipelines>
 
 </map:sitemap>

Modified: cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/META-INF/cocoon/spring/cocoon-chaperon-sample-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/META-INF/cocoon/spring/cocoon-chaperon-sample-blockServlet.xml?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/META-INF/cocoon/spring/cocoon-chaperon-sample-blockServlet.xml (original)
+++ cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/META-INF/cocoon/spring/cocoon-chaperon-sample-blockServlet.xml Mon May 28 13:17:10 2007
@@ -23,11 +23,11 @@
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
                            http://cocoon.apache.org/schema/servlet http://cocoon.apache.org/schema/servlet/cocoon-servlet-1.0.xsd">
 
-    <bean id="org.apache.cocoon.chaperon.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
-        <servlet:context mount-path="/cocoon-chaperon-sample" context-path="blockcontext:/cocoon-chaperon-sample/">
-            <servlet:connections>
-                <entry key="style-default" value-ref="org.apache.cocoon.samples.style.default.servlet" />
-            </servlet:connections>
-        </servlet:context>
-    </bean>
+  <bean id="org.apache.cocoon.chaperon.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
+    <servlet:context mount-path="/cocoon-chaperon-sample" context-path="blockcontext:/cocoon-chaperon-sample/">
+      <servlet:connections>
+        <entry key="style-default" value-ref="org.apache.cocoon.samples.style.default.servlet" />
+      </servlet:connections>
+    </servlet:context>
+  </bean>
 </beans>

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

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/catalog/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/catalog/sitemap.xmap?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/catalog/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/catalog/sitemap.xmap Mon May 28 13:17:10 2007
@@ -20,56 +20,56 @@
 
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
 
-    <map:pipelines>
-        <map:pipeline>
+  <map:pipelines>
+    <map:pipeline>
 
-            <map:match pattern="">
-                <map:redirect-to uri="welcome" />
-            </map:match>
-
-            <map:match pattern="welcome">
-                <map:generate src="samples.xml" />
-                <!-- Make use of servlet services -->
-                <map:serialize type="servletService">
-                    <map:parameter name="service" value="servlet:style-default:/service/common/simple-samples2html" />
-                </map:serialize>
-            </map:match>
-
-            <map:match pattern="sitemap.xmap">
-                <map:read src="sitemap.xmap" mime-type="text/xml" />
-            </map:match>
-
-            <!-- Catalog entity resolver =========================== -->
-
-            <map:match pattern="catalog-demo">
-                <map:generate src="catalog-demo.xml" />
-                <map:transform src="style.xsl" />
-                <map:serialize type="html" />
-            </map:match>
-
-            <map:match pattern="entity-test.html">
-                <map:generate src="catalog-test.xml" />
-                <map:transform src="style.xsl" />
-                <map:serialize type="html" />
-            </map:match>
-
-            <map:match pattern="sdocbook-demo">
-                <map:generate src="article.xml" />
-                <map:transform src="sdocbook2body.xsl" />
-                <map:serialize type="html" />
-            </map:match>
-
-            <!-- ========================= Resources ================================ -->
-
-            <map:match pattern="images/**.gif">
-                <map:read src="context://resources/images/{1}.gif" mime-type="image/gif" />
-            </map:match>
+      <map:match pattern="">
+        <map:redirect-to uri="welcome" />
+      </map:match>
+
+      <map:match pattern="welcome">
+        <map:generate src="samples.xml" />
+        <!-- Make use of servlet services -->
+        <map:serialize type="servletService">
+          <map:parameter name="service" value="servlet:style-default:/service/common/simple-samples2html" />
+        </map:serialize>
+      </map:match>
+
+      <map:match pattern="sitemap.xmap">
+        <map:read src="sitemap.xmap" mime-type="text/xml" />
+      </map:match>
+
+      <!-- Catalog entity resolver =========================== -->
+
+      <map:match pattern="catalog-demo">
+        <map:generate src="catalog-demo.xml" />
+        <map:transform src="style.xsl" />
+        <map:serialize type="html" />
+      </map:match>
+
+      <map:match pattern="entity-test.html">
+        <map:generate src="catalog-test.xml" />
+        <map:transform src="style.xsl" />
+        <map:serialize type="html" />
+      </map:match>
+
+      <map:match pattern="sdocbook-demo">
+        <map:generate src="article.xml" />
+        <map:transform src="sdocbook2body.xsl" />
+        <map:serialize type="html" />
+      </map:match>
+
+      <!-- ========================= Resources ================================ -->
+
+      <map:match pattern="images/**.gif">
+        <map:read src="context://resources/images/{1}.gif" mime-type="image/gif" />
+      </map:match>
 
-            <!-- delegate to parent sitemap 
-                <map:handle-errors/> -->
+      <!-- delegate to parent sitemap 
+        <map:handle-errors/> -->
 
-        </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/errorhandling/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/errorhandling/sitemap.xmap?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/errorhandling/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/errorhandling/sitemap.xmap Mon May 28 13:17:10 2007
@@ -21,72 +21,72 @@
     +-->
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
 
-    <map:components>
-        <map:generators default="file">
-            <map:generator name="exception" src="org.apache.cocoon.samples.errorhandling.ExceptionGenerator" />
-        </map:generators>
-        <map:selectors default="browser">
-            <map:selector name="exception" src="org.apache.cocoon.selection.XPathExceptionSelector">
-                <exception name="application" class="org.apache.cocoon.samples.errorhandling.ApplicationException">
-                    <xpath name="application1" test="errorCode=1" />
-                    <xpath name="application2" test="errorCode=2" />
-                </exception>
-                <exception name="validation" class="org.apache.cocoon.samples.errorhandling.ValidationException" />
-                <exception name="not-found" class="org.apache.cocoon.ResourceNotFoundException" />
-                <exception class="java.lang.Throwable" unroll="true" />
-            </map:selector>
-        </map:selectors>
-        <map:actions>
-            <map:action name="exception" src="org.apache.cocoon.samples.errorhandling.ExceptionAction" />
-        </map:actions>
-    </map:components>
-
-    <map:pipelines>
-        <map:pipeline>
-            <map:match pattern="">
-                <map:redirect-to uri="welcome" />
-            </map:match>
-
-            <map:match pattern="welcome">
-                <map:generate src="samples.xml" />
-                <!-- Make use of servlet services -->
-                <map:serialize type="servletService">
-                    <map:parameter name="service" value="servlet:style-default:/service/common/simple-samples2html" />
-                </map:serialize>
-            </map:match>
-
-            <map:match pattern="not-exists">
-                <map:generate src="{0}.xml" />
-                <map:serialize />
-            </map:match>
-
-            <map:match pattern="*">
-                <map:generate type="exception" src="{1}" />
-                <map:serialize />
-            </map:match>
-
-            <map:match pattern="internal/**">
-                <map:mount uri-prefix="internal" src="internal/" />
-            </map:match>
-        </map:pipeline>
-
-        <map:pipeline>
-            <map:mount uri-prefix="exception" src="exception/" />
-
-            <map:handle-errors>
-                <map:select type="exception">
-                    <map:when test="not-found">
-                        <map:generate src="notFound.html" />
-                        <map:serialize />
-                    </map:when>
-                </map:select>
-            </map:handle-errors>
-        </map:pipeline>
-
-        <map:handle-errors>
-            <map:generate type="notifying" />
-            <map:transform src="servlet:style-default:/stylesheets/system/error2html.xslt" />
-        </map:handle-errors>
-    </map:pipelines>
+  <map:components>
+    <map:generators default="file">
+      <map:generator name="exception" src="org.apache.cocoon.samples.errorhandling.ExceptionGenerator" />
+    </map:generators>
+    <map:selectors default="browser">
+      <map:selector name="exception" src="org.apache.cocoon.selection.XPathExceptionSelector">
+        <exception name="application" class="org.apache.cocoon.samples.errorhandling.ApplicationException">
+          <xpath name="application1" test="errorCode=1" />
+          <xpath name="application2" test="errorCode=2" />
+        </exception>
+        <exception name="validation" class="org.apache.cocoon.samples.errorhandling.ValidationException" />
+        <exception name="not-found" class="org.apache.cocoon.ResourceNotFoundException" />
+        <exception class="java.lang.Throwable" unroll="true" />
+      </map:selector>
+    </map:selectors>
+    <map:actions>
+      <map:action name="exception" src="org.apache.cocoon.samples.errorhandling.ExceptionAction" />
+    </map:actions>
+  </map:components>
+
+  <map:pipelines>
+    <map:pipeline>
+      <map:match pattern="">
+        <map:redirect-to uri="welcome" />
+      </map:match>
+
+      <map:match pattern="welcome">
+        <map:generate src="samples.xml" />
+        <!-- Make use of servlet services -->
+        <map:serialize type="servletService">
+          <map:parameter name="service" value="servlet:style-default:/service/common/simple-samples2html" />
+        </map:serialize>
+      </map:match>
+
+      <map:match pattern="not-exists">
+        <map:generate src="{0}.xml" />
+        <map:serialize />
+      </map:match>
+
+      <map:match pattern="*">
+        <map:generate type="exception" src="{1}" />
+        <map:serialize />
+      </map:match>
+
+      <map:match pattern="internal/**">
+        <map:mount uri-prefix="internal" src="internal/" />
+      </map:match>
+    </map:pipeline>
+
+    <map:pipeline>
+      <map:mount uri-prefix="exception" src="exception/" />
+
+      <map:handle-errors>
+        <map:select type="exception">
+          <map:when test="not-found">
+            <map:generate src="notFound.html" />
+            <map:serialize />
+          </map:when>
+        </map:select>
+      </map:handle-errors>
+    </map:pipeline>
+
+    <map:handle-errors>
+      <map:generate type="notifying" />
+      <map:transform src="servlet:style-default:/stylesheets/system/error2html.xslt" />
+    </map:handle-errors>
+  </map:pipelines>
 
 </map:sitemap>

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/filter/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/filter/sitemap.xmap?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/filter/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/filter/sitemap.xmap Mon May 28 13:17:10 2007
@@ -18,51 +18,51 @@
 <!-- CVS $ID$ -->
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
 
-    <!-- =========================== Views =================================== -->
+  <!-- =========================== Views =================================== -->
 
-    <map:views>
-        <map:view name="content" from-label="content">
-            <map:serialize type="xml" />
-        </map:view>
-
-        <map:view from-label="content" name="pretty-content">
-            <!-- Make use of servlet services -->
-            <map:serialize type="servletService">
-                <map:parameter name="service" value="servlet:style-default:/service/system/xml2html" />
-            </map:serialize>
-        </map:view>
-
-        <map:view name="links" from-position="last">
-            <map:serialize type="links" />
-        </map:view>
-    </map:views>
-
-    <!-- =========================== Pipelines ================================= -->
-
-    <map:pipelines>
-        <map:pipeline>
-            <map:match pattern="">
-                <map:generate src="samples.xml" />
-                <!-- Make use of servlet services -->
-                <map:serialize type="servletService">
-                    <map:parameter name="service" value="servlet:style-default:/service/common/simple-samples2html" />
-                </map:serialize>
-            </map:match>
-
-            <map:match pattern="original">
-                <map:generate src="tobefiltered.xml" />
-                <map:serialize type="xml" />
-            </map:match>
-
-            <map:match pattern="filter-*-*-*">
-                <map:generate src="tobefiltered.xml" />
-                <map:transform type="filter">
-                    <map:parameter name="element-name" value="{1}" />
-                    <map:parameter name="count" value="{2}" />
-                    <map:parameter name="blocknr" value="{3}" />
-                </map:transform>
-                <map:serialize type="xml" />
-            </map:match>
-        </map:pipeline>
-    </map:pipelines>
+  <map:views>
+    <map:view name="content" from-label="content">
+      <map:serialize type="xml" />
+    </map:view>
+
+    <map:view from-label="content" name="pretty-content">
+      <!-- Make use of servlet services -->
+      <map:serialize type="servletService">
+        <map:parameter name="service" value="servlet:style-default:/service/system/xml2html" />
+      </map:serialize>
+    </map:view>
+
+    <map:view name="links" from-position="last">
+      <map:serialize type="links" />
+    </map:view>
+  </map:views>
+
+  <!-- =========================== Pipelines ================================= -->
+
+  <map:pipelines>
+    <map:pipeline>
+      <map:match pattern="">
+        <map:generate src="samples.xml" />
+        <!-- Make use of servlet services -->
+        <map:serialize type="servletService">
+          <map:parameter name="service" value="servlet:style-default:/service/common/simple-samples2html" />
+        </map:serialize>
+      </map:match>
+
+      <map:match pattern="original">
+        <map:generate src="tobefiltered.xml" />
+        <map:serialize type="xml" />
+      </map:match>
+
+      <map:match pattern="filter-*-*-*">
+        <map:generate src="tobefiltered.xml" />
+        <map:transform type="filter">
+          <map:parameter name="element-name" value="{1}" />
+          <map:parameter name="count" value="{2}" />
+          <map:parameter name="blocknr" value="{3}" />
+        </map:transform>
+        <map:serialize type="xml" />
+      </map:match>
+    </map:pipeline>
+  </map:pipelines>
 </map:sitemap>