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 [6/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-databases/cocoon-databases-sample/src/main/resources/COB-INF/org-db/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-databases/cocoon-databases-sample/src/main/resources/COB-INF/org-db/sitemap.xmap?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-databases/cocoon-databases-sample/src/main/resources/COB-INF/org-db/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-databases/cocoon-databases-sample/src/main/resources/COB-INF/org-db/sitemap.xmap Mon May 28 13:17:10 2007
@@ -18,100 +18,100 @@
 
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
 
-    <!-- ========================= Components ================================ -->
+  <!-- ========================= Components ================================ -->
 
-    <map:components>
+  <map:components>
 
-        <!-- ========================= Actions ================================ -->
+    <!-- ========================= Actions ================================ -->
 
-        <map:actions>
-            <!--
-                - Original database actions
-            -->
-            <map:action logger="sitemap.action.add-employee" name="add-employee" src="org.apache.cocoon.acting.DatabaseAddAction" />
-            <map:action logger="sitemap.action.del-employee" name="del-employee" src="org.apache.cocoon.acting.DatabaseDeleteAction" />
-            <map:action logger="sitemap.action.upd-employee" name="upd-employee" src="org.apache.cocoon.acting.DatabaseUpdateAction" />
-        </map:actions>
-
-    </map:components>
-
-    <!-- ========================== Action sets ================================ -->
-
-    <!--
-        - Action sets group actions together. If some actions are often used
-        - together in pipeline fragments, it's easier to group them and refer
-        - to the group. For more info, please see the docs.
-    -->
-    <map:action-sets>
-        <map:action-set name="employee">
-            <map:act action="Add" type="add-employee" />
-            <map:act action="Delete" type="del-employee" />
-            <map:act action="Update" type="upd-employee" />
-        </map:action-set>
-    </map:action-sets>
-
-    <!-- =========================== 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="employee.xml">
-                <map:generate src="{0}" />
-                <map:serialize type="xml" />
-            </map:match>
-
-            <map:match pattern="employee">
-                <map:act set="employee">
-                    <map:parameter name="descriptor" value="employee.xml" />
-                    <!--
-                        - Here an action is used. To be precise: all actions that were
-                        - grouped together to a set named "employee". See user docs on
-                        - actions for more on this.
-                        -
-                        - This fragment until the closing tag of map:act is only
-                        - included if at least one action of this set completes
-                        - successfully.
-                    -->
-                    <map:generate src="employee.xsp" type="serverpages" />
-                    <!-- Make use of servlet services -->
-                    <map:serialize type="servletService">
-                        <map:parameter name="service" value="servlet:style-default:/service/blocks/dynamic-page2html" />
-                    </map:serialize>
-                </map:act>
-            </map:match>
-
-            <map:match pattern="*">
-                <map:generate src="{1}.xsp" type="serverpages" />
-                <!-- Make use of servlet services -->
-                <map:serialize type="servletService">
-                    <map:parameter name="service" value="servlet:style-default:/service/blocks/dynamic-page2html" />
-                </map:serialize>
-            </map:match>
-
-            <map:match pattern="">
-                <map:redirect-to uri="../" />
-            </map:match>
+    <map:actions>
+      <!--
+        - Original database actions
+      -->
+      <map:action logger="sitemap.action.add-employee" name="add-employee" src="org.apache.cocoon.acting.DatabaseAddAction" />
+      <map:action logger="sitemap.action.del-employee" name="del-employee" src="org.apache.cocoon.acting.DatabaseDeleteAction" />
+      <map:action logger="sitemap.action.upd-employee" name="upd-employee" src="org.apache.cocoon.acting.DatabaseUpdateAction" />
+    </map:actions>
+
+  </map:components>
+
+  <!-- ========================== Action sets ================================ -->
+
+  <!--
+    - Action sets group actions together. If some actions are often used
+    - together in pipeline fragments, it's easier to group them and refer
+    - to the group. For more info, please see the docs.
+  -->
+  <map:action-sets>
+    <map:action-set name="employee">
+      <map:act action="Add" type="add-employee" />
+      <map:act action="Delete" type="del-employee" />
+      <map:act action="Update" type="upd-employee" />
+    </map:action-set>
+  </map:action-sets>
+
+  <!-- =========================== 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="employee.xml">
+        <map:generate src="{0}" />
+        <map:serialize type="xml" />
+      </map:match>
+
+      <map:match pattern="employee">
+        <map:act set="employee">
+          <map:parameter name="descriptor" value="employee.xml" />
+          <!--
+            - Here an action is used. To be precise: all actions that were
+            - grouped together to a set named "employee". See user docs on
+            - actions for more on this.
+            -
+            - This fragment until the closing tag of map:act is only
+            - included if at least one action of this set completes
+            - successfully.
+          -->
+          <map:generate src="employee.xsp" type="serverpages" />
+          <!-- Make use of servlet services -->
+          <map:serialize type="servletService">
+            <map:parameter name="service" value="servlet:style-default:/service/blocks/dynamic-page2html" />
+          </map:serialize>
+        </map:act>
+      </map:match>
+
+      <map:match pattern="*">
+        <map:generate src="{1}.xsp" type="serverpages" />
+        <!-- Make use of servlet services -->
+        <map:serialize type="servletService">
+          <map:parameter name="service" value="servlet:style-default:/service/blocks/dynamic-page2html" />
+        </map:serialize>
+      </map:match>
+
+      <map:match pattern="">
+        <map:redirect-to uri="../" />
+      </map:match>
 
-        </map:pipeline>
-    </map:pipelines>
+    </map:pipeline>
+  </map:pipelines>
 
 </map:sitemap>

Modified: cocoon/trunk/blocks/cocoon-databases/cocoon-databases-sample/src/main/resources/COB-INF/transform/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-databases/cocoon-databases-sample/src/main/resources/COB-INF/transform/sitemap.xmap?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-databases/cocoon-databases-sample/src/main/resources/COB-INF/transform/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-databases/cocoon-databases-sample/src/main/resources/COB-INF/transform/sitemap.xmap Mon May 28 13:17:10 2007
@@ -17,51 +17,51 @@
 -->
 <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="{1}.xml" />
-                <!--
-                    - Let's have a look at the user docs:
-                    -
-                    - "[...] The purpose of the SQLTransformer is to query a
-                    - database and translate the result to XML. [...]"
-                -->
-                <map:transform type="sql">
-                    <map:parameter name="use-connection" value="personnel" />
-                </map:transform>
-                <map:transform src="../stylesheets/sql2html.xsl" />
-                <map:transform type="servletLinkRewriter" />
-                <map:serialize type="html" />
-            </map:match>
-
-            <map:match pattern="">
-                <map:redirect-to uri="../" />
-            </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="{1}.xml" />
+        <!--
+          - Let's have a look at the user docs:
+          -
+          - "[...] The purpose of the SQLTransformer is to query a
+          - database and translate the result to XML. [...]"
+        -->
+        <map:transform type="sql">
+          <map:parameter name="use-connection" value="personnel" />
+        </map:transform>
+        <map:transform src="../stylesheets/sql2html.xsl" />
+        <map:transform type="servletLinkRewriter" />
+        <map:serialize type="html" />
+      </map:match>
+
+      <map:match pattern="">
+        <map:redirect-to uri="../" />
+      </map:match>
 
-        </map:pipeline>
-    </map:pipelines>
+    </map:pipeline>
+  </map:pipelines>
 
 </map:sitemap>

Modified: cocoon/trunk/blocks/cocoon-databases/cocoon-databases-sample/src/main/resources/COB-INF/tutorial/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-databases/cocoon-databases-sample/src/main/resources/COB-INF/tutorial/sitemap.xmap?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-databases/cocoon-databases-sample/src/main/resources/COB-INF/tutorial/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-databases/cocoon-databases-sample/src/main/resources/COB-INF/tutorial/sitemap.xmap Mon May 28 13:17:10 2007
@@ -18,95 +18,95 @@
 
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
 
-    <!-- =========================== Components ================================ -->
+  <!-- =========================== Components ================================ -->
 
-    <map:components>
+  <map:components>
 
-        <!-- =========================== Actions ================================ -->
+    <!-- =========================== Actions ================================ -->
 
-        <map:actions>
-            <map:action name="dbAdd" logger="sitemap.tutorial.action.dbAdd" src="org.apache.cocoon.acting.DatabaseAddAction" />
+    <map:actions>
+      <map:action name="dbAdd" logger="sitemap.tutorial.action.dbAdd" src="org.apache.cocoon.acting.DatabaseAddAction" />
 
-            <map:action name="dbDel" logger="sitemap.tutorial.action.dbDel" src="org.apache.cocoon.acting.DatabaseDeleteAction" />
-
-            <map:action name="dbUpd" logger="sitemap.tutorial.action.dbUpd" src="org.apache.cocoon.acting.DatabaseUpdateAction" />
-        </map:actions>
-
-    </map:components>
-
-    <!-- ========================== Action sets ================================ -->
-
-    <map:action-sets>
-        <map:action-set name="process">
-            <map:act type="form-validator" action="Create Department">
-                <map:parameter name="constraint-set" value="add" />
-                <map:act type="dbAdd" />
-            </map:act>
-            <map:act type="form-validator" action="Update Department">
-                <map:parameter name="constraint-set" value="update" />
-                <map:act type="dbUpd" />
-            </map:act>
-            <map:act type="dbDel" action="Delete Department" />
-            <map:act type="form-validator" action="Create Employee">
-                <map:parameter name="constraint-set" value="add" />
-                <map:act type="dbAdd" />
-            </map:act>
-            <map:act type="form-validator" action="Update Employee">
-                <map:parameter name="constraint-set" value="update" />
-                <map:act type="dbUpd" />
-            </map:act>
-            <map:act type="dbDel" action="Delete Employee" />
-        </map:action-set>
-    </map:action-sets>
-
-    <!-- =========================== Pipelines ================================= -->
-
-    <map:pipelines>
-        <map:pipeline>
-
-            <map:match pattern="">
-                <map:redirect-to uri="home.html" />
-            </map:match>
-
-            <map:match pattern="*-dept.html">
-                <map:act set="process">
-                    <map:parameter name="descriptor" value="{servlet:/}/tutorial/docs/department-form.xml" />
-                    <map:generate type="serverpages" src="docs/confirm-dept.xsp" />
-                    <map:transform src="apache.xsl" />
-                    <map:serialize />
-                </map:act>
-                <map:generate type="serverpages" src="docs/{1}-dept.xsp" />
-                <map:transform src="apache.xsl" />
-                <!--map:transform src="context://samples/common/style/xsl/html/simple-page2html.xsl"/-->
-                <map:serialize />
-            </map:match>
-
-            <map:match pattern="*-empl.html">
-                <map:act set="process">
-                    <map:parameter name="descriptor" value="{servlet:/}/tutorial/docs/employee-form.xml" />
-                    <map:generate type="serverpages" src="docs/confirm-empl.xsp" />
-                    <map:transform src="apache.xsl" />
-                    <map:serialize />
-                </map:act>
-                <map:generate type="serverpages" src="docs/{1}-empl.xsp" />
-                <map:transform src="apache.xsl" />
-                <!--map:transform src="context://samples/common/style/xsl/html/simple-page2html.xsl"/-->
-                <map:serialize />
-            </map:match>
-
-            <map:match pattern="**.html">
-                <map:generate src="docs/{1}.xml" />
-                <map:transform src="apache.xsl" />
-                <!--map:transform src="context://samples/common/style/xsl/html/simple-page2html.xsl"/-->
-                <map:serialize />
-            </map:match>
-
-            <map:match pattern="images/**">
-                <map:read src="context://docs/{0}" />
-            </map:match>
+      <map:action name="dbDel" logger="sitemap.tutorial.action.dbDel" src="org.apache.cocoon.acting.DatabaseDeleteAction" />
+
+      <map:action name="dbUpd" logger="sitemap.tutorial.action.dbUpd" src="org.apache.cocoon.acting.DatabaseUpdateAction" />
+    </map:actions>
+
+  </map:components>
+
+  <!-- ========================== Action sets ================================ -->
+
+  <map:action-sets>
+    <map:action-set name="process">
+      <map:act type="form-validator" action="Create Department">
+        <map:parameter name="constraint-set" value="add" />
+        <map:act type="dbAdd" />
+      </map:act>
+      <map:act type="form-validator" action="Update Department">
+        <map:parameter name="constraint-set" value="update" />
+        <map:act type="dbUpd" />
+      </map:act>
+      <map:act type="dbDel" action="Delete Department" />
+      <map:act type="form-validator" action="Create Employee">
+        <map:parameter name="constraint-set" value="add" />
+        <map:act type="dbAdd" />
+      </map:act>
+      <map:act type="form-validator" action="Update Employee">
+        <map:parameter name="constraint-set" value="update" />
+        <map:act type="dbUpd" />
+      </map:act>
+      <map:act type="dbDel" action="Delete Employee" />
+    </map:action-set>
+  </map:action-sets>
+
+  <!-- =========================== Pipelines ================================= -->
+
+  <map:pipelines>
+    <map:pipeline>
+
+      <map:match pattern="">
+        <map:redirect-to uri="home.html" />
+      </map:match>
+
+      <map:match pattern="*-dept.html">
+        <map:act set="process">
+          <map:parameter name="descriptor" value="{servlet:/}/tutorial/docs/department-form.xml" />
+          <map:generate type="serverpages" src="docs/confirm-dept.xsp" />
+          <map:transform src="apache.xsl" />
+          <map:serialize />
+        </map:act>
+        <map:generate type="serverpages" src="docs/{1}-dept.xsp" />
+        <map:transform src="apache.xsl" />
+        <!--map:transform src="context://samples/common/style/xsl/html/simple-page2html.xsl"/-->
+        <map:serialize />
+      </map:match>
+
+      <map:match pattern="*-empl.html">
+        <map:act set="process">
+          <map:parameter name="descriptor" value="{servlet:/}/tutorial/docs/employee-form.xml" />
+          <map:generate type="serverpages" src="docs/confirm-empl.xsp" />
+          <map:transform src="apache.xsl" />
+          <map:serialize />
+        </map:act>
+        <map:generate type="serverpages" src="docs/{1}-empl.xsp" />
+        <map:transform src="apache.xsl" />
+        <!--map:transform src="context://samples/common/style/xsl/html/simple-page2html.xsl"/-->
+        <map:serialize />
+      </map:match>
+
+      <map:match pattern="**.html">
+        <map:generate src="docs/{1}.xml" />
+        <map:transform src="apache.xsl" />
+        <!--map:transform src="context://samples/common/style/xsl/html/simple-page2html.xsl"/-->
+        <map:serialize />
+      </map:match>
+
+      <map:match pattern="images/**">
+        <map:read src="context://docs/{0}" />
+      </map:match>
 
-        </map:pipeline>
+    </map:pipeline>
 
-    </map:pipelines>
+  </map:pipelines>
 
 </map:sitemap>

Modified: cocoon/trunk/blocks/cocoon-databases/cocoon-databases-sample/src/main/resources/META-INF/cocoon/spring/cocoon-databases-sample-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-databases/cocoon-databases-sample/src/main/resources/META-INF/cocoon/spring/cocoon-databases-sample-blockServlet.xml?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-databases/cocoon-databases-sample/src/main/resources/META-INF/cocoon/spring/cocoon-databases-sample-blockServlet.xml (original)
+++ cocoon/trunk/blocks/cocoon-databases/cocoon-databases-sample/src/main/resources/META-INF/cocoon/spring/cocoon-databases-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.databases.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
-        <servlet:context mount-path="/cocoon-databases-sample" context-path="blockcontext:/cocoon-databases-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.databases.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
+    <servlet:context mount-path="/cocoon-databases-sample" context-path="blockcontext:/cocoon-databases-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-deli/cocoon-deli-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-deli/cocoon-deli-sample/src/main/resources/COB-INF/sitemap.xmap?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-deli/cocoon-deli-sample/src/main/resources/COB-INF/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-deli/cocoon-deli-sample/src/main/resources/COB-INF/sitemap.xmap Mon May 28 13:17:10 2007
@@ -17,59 +17,59 @@
 -->
 <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>
-
-    <!-- =========================== Resources =================================== -->
-
-    <map:pipelines>
-        <map:pipeline>
-
-            <map:match pattern="">
-                <map:redirect-to uri="samples" />
-            </map:match>
-
-            <map:match pattern="samples">
-                <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="deli.html">
-                <map:generate src="samples.xml" />
-                <map:transform src="deli_test.xsl" type="deli">
-                    <map:parameter name="ua" value="{request-header:user-agent}" />
-                </map:transform>
-                <map:serialize type="html" />
-            </map:match>
-
-            <map:match pattern="deli.wml">
-                <map:generate src="samples.xml" />
-                <map:transform src="deli_test.xsl" type="deli">
-                    <map:parameter name="ua" value="{request-header:user-agent}" />
-                </map:transform>
-                <map:serialize type="wml" />
-            </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>
+
+  <!-- =========================== Resources =================================== -->
+
+  <map:pipelines>
+    <map:pipeline>
+
+      <map:match pattern="">
+        <map:redirect-to uri="samples" />
+      </map:match>
+
+      <map:match pattern="samples">
+        <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="deli.html">
+        <map:generate src="samples.xml" />
+        <map:transform src="deli_test.xsl" type="deli">
+          <map:parameter name="ua" value="{request-header:user-agent}" />
+        </map:transform>
+        <map:serialize type="html" />
+      </map:match>
+
+      <map:match pattern="deli.wml">
+        <map:generate src="samples.xml" />
+        <map:transform src="deli_test.xsl" type="deli">
+          <map:parameter name="ua" value="{request-header:user-agent}" />
+        </map:transform>
+        <map:serialize type="wml" />
+      </map:match>
 
-        </map:pipeline>
-    </map:pipelines>
+    </map:pipeline>
+  </map:pipelines>
 
 </map:sitemap>

Modified: cocoon/trunk/blocks/cocoon-deli/cocoon-deli-sample/src/main/resources/META-INF/cocoon/spring/cocoon-deli-sample-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-deli/cocoon-deli-sample/src/main/resources/META-INF/cocoon/spring/cocoon-deli-sample-blockServlet.xml?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-deli/cocoon-deli-sample/src/main/resources/META-INF/cocoon/spring/cocoon-deli-sample-blockServlet.xml (original)
+++ cocoon/trunk/blocks/cocoon-deli/cocoon-deli-sample/src/main/resources/META-INF/cocoon/spring/cocoon-deli-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.deli.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
-        <servlet:context mount-path="/cocoon-deli-sample" context-path="blockcontext:/cocoon-deli-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.deli.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
+    <servlet:context mount-path="/cocoon-deli-sample" context-path="blockcontext:/cocoon-deli-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-eventcache/cocoon-eventcache-impl/src/main/resources/META-INF/cocoon/avalon/cocoon-eventcache.xconf
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-eventcache/cocoon-eventcache-impl/src/main/resources/META-INF/cocoon/avalon/cocoon-eventcache.xconf?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-eventcache/cocoon-eventcache-impl/src/main/resources/META-INF/cocoon/avalon/cocoon-eventcache.xconf (original)
+++ cocoon/trunk/blocks/cocoon-eventcache/cocoon-eventcache-impl/src/main/resources/META-INF/cocoon/avalon/cocoon-eventcache.xconf Mon May 28 13:17:10 2007
@@ -21,18 +21,19 @@
     | SVN $Id$
     +-->
 <components>
-	<component class="org.apache.cocoon.caching.impl.JMSEventMessageListener"
-               role="org.apache.cocoon.caching.impl.JMSEventMessageListener" logger="core.jms">
-       <parameter name="connection" value="local-topics"/>
-       <parameter name="topic" value="topic1"/>
-       <!--
-       <parameter name="eventcache-role" value="org.apache.cocoon.caching.Cache/EventAware"/>
-       -->
-    </component>
-    
-    <!-- The event registry which maps Cache events to Pipeline keys -->
-    <!--component role="org.apache.cocoon.caching.EventRegistry"
-                  class="org.apache.cocoon.caching.impl.DefaultEventRegistryImpl"/-->
-    <component role="org.apache.cocoon.caching.EventRegistry"
-               class="org.apache.cocoon.caching.impl.StoreEventRegistryImpl"/>
+  <component class="org.apache.cocoon.caching.impl.JMSEventMessageListener"
+             role="org.apache.cocoon.caching.impl.JMSEventMessageListener"
+             logger="core.jms">
+    <parameter name="connection" value="local-topics" />
+    <parameter name="topic" value="topic1" />
+    <!--
+      <parameter name="eventcache-role" value="org.apache.cocoon.caching.Cache/EventAware"/>
+    -->
+  </component>
+
+  <!-- The event registry which maps Cache events to Pipeline keys -->
+  <!--component role="org.apache.cocoon.caching.EventRegistry"
+    class="org.apache.cocoon.caching.impl.DefaultEventRegistryImpl"/-->
+  <component role="org.apache.cocoon.caching.EventRegistry"
+             class="org.apache.cocoon.caching.impl.StoreEventRegistryImpl" />
 </components>

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

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

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

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

Modified: cocoon/trunk/blocks/cocoon-fop/cocoon-fop-sample/src/main/resources/META-INF/cocoon/spring/cocoon-fop-sample-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-fop/cocoon-fop-sample/src/main/resources/META-INF/cocoon/spring/cocoon-fop-sample-blockServlet.xml?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-fop/cocoon-fop-sample/src/main/resources/META-INF/cocoon/spring/cocoon-fop-sample-blockServlet.xml (original)
+++ cocoon/trunk/blocks/cocoon-fop/cocoon-fop-sample/src/main/resources/META-INF/cocoon/spring/cocoon-fop-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.fop.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
-        <servlet:context mount-path="/cocoon-fop-sample" context-path="blockcontext:/cocoon-fop-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.fop.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
+    <servlet:context mount-path="/cocoon-fop-sample" context-path="blockcontext:/cocoon-fop-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-forms/cocoon-forms-impl/src/main/resources/META-INF/cocoon/spring/cocoon-forms-impl-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/META-INF/cocoon/spring/cocoon-forms-impl-blockServlet.xml?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/META-INF/cocoon/spring/cocoon-forms-impl-blockServlet.xml (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/META-INF/cocoon/spring/cocoon-forms-impl-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.forms.impl.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
-        <servlet:context mount-path="/cocoon-forms-impl" context-path="blockcontext:/cocoon-forms-impl/">
-   			<servlet:connections>
-				<entry key="ajax" value-ref="org.apache.cocoon.ajax.impl.servlet"/>
-			</servlet:connections>
-        </servlet:context>
-    </bean>
+  <bean id="org.apache.cocoon.forms.impl.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
+    <servlet:context mount-path="/cocoon-forms-impl" context-path="blockcontext:/cocoon-forms-impl/">
+      <servlet:connections>
+        <entry key="ajax" value-ref="org.apache.cocoon.ajax.impl.servlet" />
+      </servlet:connections>
+    </servlet:context>
+  </bean>
 </beans>

Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/aggregate/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/aggregate/sitemap.xmap?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/aggregate/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/aggregate/sitemap.xmap Mon May 28 13:17:10 2007
@@ -24,54 +24,54 @@
 
 <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>
-
-    <!-- =========================== Flowscripts =================================== -->
-
-    <map:flow language="javascript">
-        <map:script src="example.js" />
-    </map:flow>
-
-    <!-- =========================== Pipelines =================================== -->
-
-    <map:pipelines>
-        <map:pipeline>
-            <map:match pattern="example">
-                <map:call function="example" />
-            </map:match>
-            <map:match pattern="*.continue">
-                <map:call continuation="{1}" />
-            </map:match>
-
-            <map:match pattern="*-display-pipeline">
-                <!-- pipeline to show the form -->
-                <map:generate type="jx" src="template-{1}.xml" />
-                <map:transform type="forms" />
-                <map:transform src="servlet:style-default:/common/style/xsl/html/simple-page2html.xsl" />
-                <map:transform src="../resources/forms-samples-styling.xsl">
-                    <map:parameter name="dojo-resources" value="{servlet:ajax:/resource/external/dojo}" />
-                    <map:parameter name="forms-resources" value="{servlet:forms:/resource/external/forms}" />
-                </map:transform>
-                <map:transform type="servletLinkRewriter" />
-                <map:serialize />
-            </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>
+
+  <!-- =========================== Flowscripts =================================== -->
+
+  <map:flow language="javascript">
+    <map:script src="example.js" />
+  </map:flow>
+
+  <!-- =========================== Pipelines =================================== -->
+
+  <map:pipelines>
+    <map:pipeline>
+      <map:match pattern="example">
+        <map:call function="example" />
+      </map:match>
+      <map:match pattern="*.continue">
+        <map:call continuation="{1}" />
+      </map:match>
+
+      <map:match pattern="*-display-pipeline">
+        <!-- pipeline to show the form -->
+        <map:generate type="jx" src="template-{1}.xml" />
+        <map:transform type="forms" />
+        <map:transform src="servlet:style-default:/common/style/xsl/html/simple-page2html.xsl" />
+        <map:transform src="../resources/forms-samples-styling.xsl">
+          <map:parameter name="dojo-resources" value="{servlet:ajax:/resource/external/dojo}" />
+          <map:parameter name="forms-resources" value="{servlet:forms:/resource/external/forms}" />
+        </map:transform>
+        <map:transform type="servletLinkRewriter" />
+        <map:serialize />
+      </map:match>
+    </map:pipeline>
+  </map:pipelines>
 </map:sitemap>

Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/captcha/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/captcha/sitemap.xmap?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/captcha/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/captcha/sitemap.xmap Mon May 28 13:17:10 2007
@@ -18,94 +18,94 @@
 
 <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 name="content1" from-label="content1">
-            <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>
-
-    <!-- =========================== Flowscripts =================================== -->
-
-    <map:flow language="javascript">
-        <map:script src="flow/captcha.js" />
-    </map:flow>
-
-    <!-- =========================== Pipelines =================================== -->
-
-    <map:pipelines>
-        <map:pipeline>
-
-            <map:match pattern="">
-                <map:call function="captcha" />
-            </map:match>
-
-            <map:match pattern="*.cont">
-                <map:call continuation="{1}" />
-            </map:match>
-
-            <map:match pattern="success">
-                <map:generate type="jx" src="success.xml" />
-                <!-- Make use of servlet services -->
-                <map:serialize type="servletService">
-                    <map:parameter name="service" value="servlet:style-default:/common/simple-page2html" />
-                </map:serialize>
-            </map:match>
-
-            <!--
-                | Show a form, using the forms transformer
-            -->
-            <map:match pattern="*-display-pipeline">
-                <map:generate type="file" src="forms/{1}.tpl.xml" />
-                <map:transform type="forms" label="content1" />
-                <map:transform type="i18n">
-                    <!--map:parameter name="locale" value="en-US"/-->
-                </map:transform>
-                <map:transform src="servlet:style-default:/common/style/xsl/html/simple-page2html.xsl" />
-                <map:transform src="../resources/forms-samples-styling.xsl">
-                    <map:parameter name="dojo-resources" value="{servlet:ajax:/resource/external/dojo}" />
-                    <map:parameter name="forms-resources" value="{servlet:forms:/resource/external/forms}" />
-                </map:transform>
-                <map:transform type="i18n"></map:transform>
-                <map:transform type="servletLinkRewriter" />
-                <map:serialize />
-            </map:match>
-
-            <!--
-                | Generate the CAPTCHA image. Any type of generator can be used here,
-                | as long as it reads the string to display from the session
-                | attribute named "captcha-{1}".
-                | Using an SVG file as input requires that the Batik block be
-                | included in the build.
-            -->
-            <map:match pattern="captcha-*.jpg">
-                <map:generate type="jx" src="captcha-image.xml">
-                    <map:parameter name="value" value="{session-attr:captcha-{1}}" />
-                </map:generate>
-                <map:serialize type="svg2jpeg" />
-            </map:match>
-
-            <map:match pattern="*">
-                <map:redirect-to uri="{1}/" />
-            </map:match>
+  <map:views>
+    <map:view name="content" from-label="content">
+      <map:serialize type="xml" />
+    </map:view>
+
+    <map:view name="content1" from-label="content1">
+      <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>
+
+  <!-- =========================== Flowscripts =================================== -->
+
+  <map:flow language="javascript">
+    <map:script src="flow/captcha.js" />
+  </map:flow>
+
+  <!-- =========================== Pipelines =================================== -->
+
+  <map:pipelines>
+    <map:pipeline>
+
+      <map:match pattern="">
+        <map:call function="captcha" />
+      </map:match>
+
+      <map:match pattern="*.cont">
+        <map:call continuation="{1}" />
+      </map:match>
+
+      <map:match pattern="success">
+        <map:generate type="jx" src="success.xml" />
+        <!-- Make use of servlet services -->
+        <map:serialize type="servletService">
+          <map:parameter name="service" value="servlet:style-default:/common/simple-page2html" />
+        </map:serialize>
+      </map:match>
+
+      <!--
+        | Show a form, using the forms transformer
+      -->
+      <map:match pattern="*-display-pipeline">
+        <map:generate type="file" src="forms/{1}.tpl.xml" />
+        <map:transform type="forms" label="content1" />
+        <map:transform type="i18n">
+          <!--map:parameter name="locale" value="en-US"/-->
+        </map:transform>
+        <map:transform src="servlet:style-default:/common/style/xsl/html/simple-page2html.xsl" />
+        <map:transform src="../resources/forms-samples-styling.xsl">
+          <map:parameter name="dojo-resources" value="{servlet:ajax:/resource/external/dojo}" />
+          <map:parameter name="forms-resources" value="{servlet:forms:/resource/external/forms}" />
+        </map:transform>
+        <map:transform type="i18n"></map:transform>
+        <map:transform type="servletLinkRewriter" />
+        <map:serialize />
+      </map:match>
+
+      <!--
+        | Generate the CAPTCHA image. Any type of generator can be used here,
+        | as long as it reads the string to display from the session
+        | attribute named "captcha-{1}".
+        | Using an SVG file as input requires that the Batik block be
+        | included in the build.
+      -->
+      <map:match pattern="captcha-*.jpg">
+        <map:generate type="jx" src="captcha-image.xml">
+          <map:parameter name="value" value="{session-attr:captcha-{1}}" />
+        </map:generate>
+        <map:serialize type="svg2jpeg" />
+      </map:match>
+
+      <map:match pattern="*">
+        <map:redirect-to uri="{1}/" />
+      </map:match>
 
-        </map:pipeline>
-    </map:pipelines>
+    </map:pipeline>
+  </map:pipelines>
 
 </map:sitemap>