cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fel...@apache.org
Subject svn commit: r542312 [5/14] - in /cocoon/trunk/blocks: cocoon-ajax/cocoon-ajax-impl/src/main/resources/COB-INF/system/ cocoon-ajax/cocoon-ajax-impl/src/main/resources/META-INF/cocoon/spring/ cocoon-ajax/cocoon-ajax-sample/src/main/resources/COB-INF/ coc...
Date Mon, 28 May 2007 20:17:18 GMT
Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/flow/jxcalc/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/flow/jxcalc/sitemap.xmap?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/flow/jxcalc/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/flow/jxcalc/sitemap.xmap Mon May 28 13:17:10 2007
@@ -18,74 +18,74 @@
 
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
 
-    <!-- =========================== Flowscripts =================================== -->
+  <!-- =========================== Flowscripts =================================== -->
 
-    <map:flow language="javascript">
-        <map:script src="calc.js" />
-    </map:flow>
-
-    <!-- =========================== 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>
-            <!--+
-                | produces the screens called by the flowscript
-                +-->
-            <map:match pattern="page/*">
-                <map:generate type="jx" src="screens/{1}.xml" />
-                <!-- 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>
-        </map:pipeline>
-
-        <map:pipeline>
-            <!--+
-                | matches the page with the continuation ID and calls the flowscript
-                | associated to this sitemap with the given continuation ID. The flow
-                | engine will then look into the continuation store, retrieve
-                | the correct continuation and resume execution of the flowscript
-                | with that continuation. This guarantees transparent state 
-                | resumption between requests without the need for anything else
-                | (cookies or URL-encoded session IDs)
-                +-->
-            <map:match pattern="continue.*">
-                <map:call continuation="{1}" />
-            </map:match>
-
-            <!--+
-                | matches the call to the beginning of the flow and calls the flow
-                | from its entry point which, in this case is the 'calculator()'
-                | javascript function.
-                +-->
-            <map:match pattern="">
-                <map:call function="calculator" />
-            </map:match>
-
-            <!-- Make screens available to be used by other (sample-)blocks -->
-            <map:match pattern="screens/**">
-                <map:read src="screens/{1}" />
-            </map:match>
+  <map:flow language="javascript">
+    <map:script src="calc.js" />
+  </map:flow>
+
+  <!-- =========================== 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>
+      <!--+
+        | produces the screens called by the flowscript
+        +-->
+      <map:match pattern="page/*">
+        <map:generate type="jx" src="screens/{1}.xml" />
+        <!-- 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>
+    </map:pipeline>
+
+    <map:pipeline>
+      <!--+
+        | matches the page with the continuation ID and calls the flowscript
+        | associated to this sitemap with the given continuation ID. The flow
+        | engine will then look into the continuation store, retrieve
+        | the correct continuation and resume execution of the flowscript
+        | with that continuation. This guarantees transparent state 
+        | resumption between requests without the need for anything else
+        | (cookies or URL-encoded session IDs)
+        +-->
+      <map:match pattern="continue.*">
+        <map:call continuation="{1}" />
+      </map:match>
+
+      <!--+
+        | matches the call to the beginning of the flow and calls the flow
+        | from its entry point which, in this case is the 'calculator()'
+        | javascript function.
+        +-->
+      <map:match pattern="">
+        <map:call function="calculator" />
+      </map:match>
+
+      <!-- Make screens available to be used by other (sample-)blocks -->
+      <map:match pattern="screens/**">
+        <map:read src="screens/{1}" />
+      </map:match>
 
-        </map:pipeline>
-    </map:pipelines>
+    </map:pipeline>
+  </map:pipelines>
 </map:sitemap>

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/flow/prefs/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/flow/prefs/sitemap.xmap?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/flow/prefs/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/flow/prefs/sitemap.xmap Mon May 28 13:17:10 2007
@@ -22,77 +22,77 @@
 
   <map:views>
     <map:view name="content" from-label="content">
-      <map:serialize type="xml"/>
+      <map:serialize type="xml" />
     </map:view>
 
     <map:view from-label="content" name="pretty-content">
-      <map:transform src="servlet:style-default:/stylesheets/system/xml2html.xslt"/>
+      <map:transform src="servlet:style-default:/stylesheets/system/xml2html.xslt" />
       <map:transform type="servletLinkRewriter" />
-      <map:serialize type="html"/>
+      <map:serialize type="html" />
     </map:view>
 
     <map:view name="links" from-position="last">
-      <map:serialize type="links"/>
+      <map:serialize type="links" />
     </map:view>
   </map:views>
 
   <!-- indicates what flowscript to attach to this sitemap -->
   <map:flow language="javascript">
-    <map:script src="prefs.js"/>
+    <map:script src="prefs.js" />
   </map:flow>
 
   <map:pipelines>
     <map:pipeline>
       <!--+
-          | Produces the views called by the flowscript
-          +-->
+        | Produces the views called by the flowscript
+        +-->
       <map:match pattern="page/*">
-        <map:generate type="jx" src="screens/{1}.xml"/>
+        <map:generate type="jx" src="screens/{1}.xml" />
         <map:transform src="servlet:style-default:/common/style/xsl/html/simple-page2html.xsl">
-          <map:parameter name="servletPath" value="{request:servletPath}"/>
-          <map:parameter name="sitemapURI" value="{request:sitemapURI}"/>
-          <map:parameter name="contextPath" value="{request:contextPath}"/>
-          <map:parameter name="file" value="servlet:/flow/prefs/screens/{1}.xsp"/>
-          <map:parameter name="remove" value="{0}"/>
+          <map:parameter name="servletPath" value="{request:servletPath}" />
+          <map:parameter name="sitemapURI" value="{request:sitemapURI}" />
+          <map:parameter name="contextPath" value="{request:contextPath}" />
+          <map:parameter name="file" value="servlet:/flow/prefs/screens/{1}.xsp" />
+          <map:parameter name="remove" value="{0}" />
         </map:transform>
         <map:transform type="servletLinkRewriter" />
-        <map:serialize/>
+        <map:serialize />
       </map:match>
     </map:pipeline>
-  
+
     <map:pipeline>
       <!--+
-          | Unlike the calculator example, this flow has many different
-          | entry points, each indicated by its own matcher
-          +-->
+        | Unlike the calculator example, this flow has many different
+        | entry points, each indicated by its own matcher
+        +-->
       <map:match pattern="">
-        <map:call function="login"/>
+        <map:call function="login" />
       </map:match>
       <map:match pattern="register">
-        <map:call function="registerUser"/>
+        <map:call function="registerUser" />
       </map:match>
       <map:match pattern="edit">
-        <map:call function="edit"/>
+        <map:call function="edit" />
       </map:match>
       <map:match pattern="logout">
-        <map:call function="logout"/>
+        <map:call function="logout" />
       </map:match>
 
       <!--+
-          | Matches the page with the continuation ID and calls the flowscript
-          | associated to this sitemap with the given continuation ID. The flow
-          | engine will then look into the continuation store, retrieve
-          | the correct continuation and resume execution of the flowscript
-          | with that continuation. This guarantees transparent state 
-          | resumption between requests without the need for anything else
-          | (cookies or URL-encoded session IDs)
-          +-->
+        | Matches the page with the continuation ID and calls the flowscript
+        | associated to this sitemap with the given continuation ID. The flow
+        | engine will then look into the continuation store, retrieve
+        | the correct continuation and resume execution of the flowscript
+        | with that continuation. This guarantees transparent state 
+        | resumption between requests without the need for anything else
+        | (cookies or URL-encoded session IDs)
+        +-->
       <map:match pattern="continue.*">
-        <map:call continuation="{1}"/>
+        <map:call continuation="{1}" />
       </map:match>
 
       <map:match pattern="prefs.js">
-        <map:read src="{0}" mime-type="text/plain"/>
+        <map:read src="{0}" mime-type="text/plain" />
       </map:match>
 
     </map:pipeline>

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/flow/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/flow/sitemap.xmap?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/flow/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/flow/sitemap.xmap Mon May 28 13:17:10 2007
@@ -20,47 +20,47 @@
 
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
 
-    <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>
-
-    <map:pipelines>
-        <map:pipeline>
-
-            <map:match pattern="j">
-                <map:generate src="samples.xml" type="jx" />
-                <map:serialize type="xml" />
-            </map:match>
-
-            <map:match pattern="">
-                <map:generate src="samples.xml" />
-                <!-- Make use of servlet services -->
-                <map:serialize type="servletService">
-                    <map:parameter name="service" value="servlet:style-default:/service/common/simple-samples2html" />
-                </map:serialize>
-            </map:match>
-
-            <map:match pattern="*">
-                <map:redirect-to uri="{1}/" />
-            </map:match>
-
-            <map:match pattern="*/**">
-                <map:mount uri-prefix="{1}" src="{1}/" />
-            </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>
+
+  <map:pipelines>
+    <map:pipeline>
+
+      <map:match pattern="j">
+        <map:generate src="samples.xml" type="jx" />
+        <map:serialize type="xml" />
+      </map:match>
+
+      <map:match pattern="">
+        <map:generate src="samples.xml" />
+        <!-- Make use of servlet services -->
+        <map:serialize type="servletService">
+          <map:parameter name="service" value="servlet:style-default:/service/common/simple-samples2html" />
+        </map:serialize>
+      </map:match>
+
+      <map:match pattern="*">
+        <map:redirect-to uri="{1}/" />
+      </map:match>
+
+      <map:match pattern="*/**">
+        <map:mount uri-prefix="{1}" src="{1}/" />
+      </map:match>
 
-        </map:pipeline>
-    </map:pipelines>
+    </map:pipeline>
+  </map:pipelines>
 </map:sitemap>

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/hello-world/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/hello-world/sitemap.xmap?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/hello-world/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/hello-world/sitemap.xmap Mon May 28 13:17:10 2007
@@ -20,154 +20,154 @@
 
 <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 id="service-resource">
-            <!-- 
-                All matcher in this pipeline are intended to be called
-                when making use of servlet services from other blocks 
-            -->
-        </map:pipeline>
-
-        <map:pipeline id="internal">
-            <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="hello.xml">
-                <map:generate src="content/hello.xml" />
-                <map:serialize type="xml" />
-            </map:match>
-
-            <map:match pattern="hello.html">
-                <map:generate src="content/hello.xml" />
-                <map:transform src="style/xsl/page2html.xsl" />
-                <map:serialize type="html" />
-            </map:match>
-
-            <map:match pattern="hello.xhtml">
-                <map:generate src="content/hello.xml" />
-                <map:transform src="style/xsl/page2html.xsl" />
-                <map:serialize type="xhtml" />
-            </map:match>
-
-            <map:match pattern="hello.txt">
-                <map:generate src="content/hello.xml" />
-                <map:serialize type="text" />
-            </map:match>
-
-            <map:match pattern="hello.wml">
-                <map:generate src="content/hello.xml" />
-                <map:transform src="style/xsl/page2wml.xsl" />
-                <map:serialize type="wml" />
-            </map:match>
-
-            <map:match pattern="hello.chtml">
-                <map:generate src="content/hello.xml" />
-                <map:transform src="style/xsl/page2chtml.xsl" />
-                <map:serialize type="chtml" />
-            </map:match>
-
-            <map:match pattern="hello.vml">
-                <map:generate src="content/hello.xml" />
-                <map:transform src="style/xsl/page2vml.xsl" />
-                <map:serialize type="xml" />
-            </map:match>
-
-            <map:match pattern="hello.svg">
-                <map:generate src="content/hello.xml" />
-                <map:transform src="style/xsl/page2svg.xsl" />
-                <map:serialize type="svgxml" />
-            </map:match>
-
-            <map:match pattern="hello.swf">
-                <map:read src="style/swf/hello.swf" />
-            </map:match>
-
-            <map:match pattern="hello.wrl">
-                <map:generate src="content/hello.xml" />
-                <map:transform src="style/xsl/page2vrml.xsl" />
-                <map:serialize type="vrml" />
-            </map:match>
-
-            <map:match pattern="hello.service">
-                <map:generate src="content/hello.xml" />
-                <map:transform src="style/xsl/page2html.xsl" />
-                <map:serialize type="xml" />
-            </map:match>
-
-            <map:match pattern="hello.service/WSDL">
-                <map:generate src="webservice/HelloWorld.wsdl" />
-                <map:serialize type="xml" />
-            </map:match>
-
-            <map:match pattern="hello.sxw">
-                <map:generate src="content/hello.xml" />
-                <map:transform src="style/xsl/page2sxw.xsl" />
-                <map:serialize type="sxw" />
-            </map:match>
-
-            <map:match pattern="hello.sxc">
-                <map:generate src="content/hello.xml" />
-                <map:transform src="style/xsl/page2sxc.xsl" />
-                <map:serialize type="sxc" />
-            </map:match>
-
-            <map:match pattern="hello.sxi">
-                <map:generate src="content/hello.xml" />
-                <!-- FIXME: XSLTC fails on this stylesheet -->
-                <map:transform type="xalan" src="style/xsl/page2sxi.xsl" />
-                <map:serialize type="sxi" />
-            </map:match>
-
-            <map:match pattern="hello.sxd">
-                <map:generate src="content/hello.xml" />
-                <map:transform src="style/xsl/page2sxd.xsl" />
-                <map:serialize type="sxd" />
-            </map:match>
-
-            <map:match pattern="hello-worldml.doc">
-                <map:generate src="content/hello.xml" />
-                <map:transform src="style/xsl/page2wordml.xsl" />
-                <map:serialize type="xml" />
-            </map:match>
-
-            <map:match pattern="hello.zip">
-                <map:generate src="content/hello_zip.xml" />
-                <map:serialize type="zip" />
-            </map:match>
-        </map:pipeline>
-
-        <map:pipeline id="external">
-            <!-- Make styles available to be used by other (sample-)blocks -->
-            <map:match pattern="style/**.xsl">
-                <map:read src="style/{1}.xsl" />
-            </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 id="service-resource">
+      <!-- 
+        All matcher in this pipeline are intended to be called
+        when making use of servlet services from other blocks 
+      -->
+    </map:pipeline>
+
+    <map:pipeline id="internal">
+      <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="hello.xml">
+        <map:generate src="content/hello.xml" />
+        <map:serialize type="xml" />
+      </map:match>
+
+      <map:match pattern="hello.html">
+        <map:generate src="content/hello.xml" />
+        <map:transform src="style/xsl/page2html.xsl" />
+        <map:serialize type="html" />
+      </map:match>
+
+      <map:match pattern="hello.xhtml">
+        <map:generate src="content/hello.xml" />
+        <map:transform src="style/xsl/page2html.xsl" />
+        <map:serialize type="xhtml" />
+      </map:match>
+
+      <map:match pattern="hello.txt">
+        <map:generate src="content/hello.xml" />
+        <map:serialize type="text" />
+      </map:match>
+
+      <map:match pattern="hello.wml">
+        <map:generate src="content/hello.xml" />
+        <map:transform src="style/xsl/page2wml.xsl" />
+        <map:serialize type="wml" />
+      </map:match>
+
+      <map:match pattern="hello.chtml">
+        <map:generate src="content/hello.xml" />
+        <map:transform src="style/xsl/page2chtml.xsl" />
+        <map:serialize type="chtml" />
+      </map:match>
+
+      <map:match pattern="hello.vml">
+        <map:generate src="content/hello.xml" />
+        <map:transform src="style/xsl/page2vml.xsl" />
+        <map:serialize type="xml" />
+      </map:match>
+
+      <map:match pattern="hello.svg">
+        <map:generate src="content/hello.xml" />
+        <map:transform src="style/xsl/page2svg.xsl" />
+        <map:serialize type="svgxml" />
+      </map:match>
+
+      <map:match pattern="hello.swf">
+        <map:read src="style/swf/hello.swf" />
+      </map:match>
+
+      <map:match pattern="hello.wrl">
+        <map:generate src="content/hello.xml" />
+        <map:transform src="style/xsl/page2vrml.xsl" />
+        <map:serialize type="vrml" />
+      </map:match>
+
+      <map:match pattern="hello.service">
+        <map:generate src="content/hello.xml" />
+        <map:transform src="style/xsl/page2html.xsl" />
+        <map:serialize type="xml" />
+      </map:match>
+
+      <map:match pattern="hello.service/WSDL">
+        <map:generate src="webservice/HelloWorld.wsdl" />
+        <map:serialize type="xml" />
+      </map:match>
+
+      <map:match pattern="hello.sxw">
+        <map:generate src="content/hello.xml" />
+        <map:transform src="style/xsl/page2sxw.xsl" />
+        <map:serialize type="sxw" />
+      </map:match>
+
+      <map:match pattern="hello.sxc">
+        <map:generate src="content/hello.xml" />
+        <map:transform src="style/xsl/page2sxc.xsl" />
+        <map:serialize type="sxc" />
+      </map:match>
+
+      <map:match pattern="hello.sxi">
+        <map:generate src="content/hello.xml" />
+        <!-- FIXME: XSLTC fails on this stylesheet -->
+        <map:transform type="xalan" src="style/xsl/page2sxi.xsl" />
+        <map:serialize type="sxi" />
+      </map:match>
+
+      <map:match pattern="hello.sxd">
+        <map:generate src="content/hello.xml" />
+        <map:transform src="style/xsl/page2sxd.xsl" />
+        <map:serialize type="sxd" />
+      </map:match>
+
+      <map:match pattern="hello-worldml.doc">
+        <map:generate src="content/hello.xml" />
+        <map:transform src="style/xsl/page2wordml.xsl" />
+        <map:serialize type="xml" />
+      </map:match>
+
+      <map:match pattern="hello.zip">
+        <map:generate src="content/hello_zip.xml" />
+        <map:serialize type="zip" />
+      </map:match>
+    </map:pipeline>
+
+    <map:pipeline id="external">
+      <!-- Make styles available to be used by other (sample-)blocks -->
+      <map:match pattern="style/**.xsl">
+        <map:read src="style/{1}.xsl" />
+      </map:match>
+    </map:pipeline>
+  </map:pipelines>
 </map:sitemap>

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/i18n/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/i18n/sitemap.xmap?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/i18n/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/i18n/sitemap.xmap Mon May 28 13:17:10 2007
@@ -24,184 +24,184 @@
 
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
 
-    <!-- =========================== Components ================================ -->
+  <!-- =========================== Components ================================ -->
 
-    <map:components>
-        <map:generators default="file">
-            <!--+
-                | Redefine generators to remove their labels (otherwise aggregated parts also go through views)
-                +-->
-            <map:generator name="file" logger="sitemap.generator.file" src="org.apache.cocoon.generation.FileGenerator" />
-            <map:generator name="serverpages" logger="sitemap.generator.serverpages" src="org.apache.cocoon.generation.ServerPagesGenerator" />
-        </map:generators>
-
-        <map:transformers default="xslt">
-            <!--+
-                | Configure i18n transformer with message catalogues
-                +-->
-            <map:transformer name="i18n" logger="sitemap.transformer.i18n" src="org.apache.cocoon.transformation.I18nTransformer">
-                <catalogues default="messages">
-                    <catalogue id="messages" name="messages" location="translations" />
-                    <catalogue id="menu" name="menu" location="translations" />
-                    <catalogue id="tiered" name="messages">
-                        <location>translations/tiered</location>
-                        <location>translations</location>
-                    </catalogue>
-                </catalogues>
-            </map:transformer>
-        </map:transformers>
-
-        <map:actions>
-            <!--+
-                | Locale action is used to set/get current user locale.
-                | See Javadocs for details.
-                +-->
-            <map:action name="locale" logger="sitemap.action.locale" src="org.apache.cocoon.acting.LocaleAction">
-                <!-- Creates a new session if needed. Used with 'store-in-session' param -->
-                <create-session>true</create-session>
-                <!--+
-                    | Stores locale information in session. A session should be created before,
-                    | otherwise 'create-session' should be true.
-                    +-->
-                <store-in-session>true</store-in-session>
-                <!-- Stores locale information in request attributes -->
-                <store-in-request>true</store-in-request>
-                <!-- Stores locale information in a client cookie -->
-                <store-in-cookie>false</store-in-cookie>
-                <!--+
-                    | Uncomment to override default:
-                    <locale-attribute>locale</locale-attribute>
-                    <use-locale>true</use-locale>
-                    <default-locale language="en" country="US"/>
-                    +-->
-            </map:action>
-        </map:actions>
-    </map:components>
+  <map:components>
+    <map:generators default="file">
+      <!--+
+        | Redefine generators to remove their labels (otherwise aggregated parts also go through views)
+        +-->
+      <map:generator name="file" logger="sitemap.generator.file" src="org.apache.cocoon.generation.FileGenerator" />
+      <map:generator name="serverpages" logger="sitemap.generator.serverpages" src="org.apache.cocoon.generation.ServerPagesGenerator" />
+    </map:generators>
+
+    <map:transformers default="xslt">
+      <!--+
+        | Configure i18n transformer with message catalogues
+        +-->
+      <map:transformer name="i18n" logger="sitemap.transformer.i18n" src="org.apache.cocoon.transformation.I18nTransformer">
+        <catalogues default="messages">
+          <catalogue id="messages" name="messages" location="translations" />
+          <catalogue id="menu" name="menu" location="translations" />
+          <catalogue id="tiered" name="messages">
+            <location>translations/tiered</location>
+            <location>translations</location>
+          </catalogue>
+        </catalogues>
+      </map:transformer>
+    </map:transformers>
+
+    <map:actions>
+      <!--+
+        | Locale action is used to set/get current user locale.
+        | See Javadocs for details.
+        +-->
+      <map:action name="locale" logger="sitemap.action.locale" src="org.apache.cocoon.acting.LocaleAction">
+        <!-- Creates a new session if needed. Used with 'store-in-session' param -->
+        <create-session>true</create-session>
+        <!--+
+          | Stores locale information in session. A session should be created before,
+          | otherwise 'create-session' should be true.
+          +-->
+        <store-in-session>true</store-in-session>
+        <!-- Stores locale information in request attributes -->
+        <store-in-request>true</store-in-request>
+        <!-- Stores locale information in a client cookie -->
+        <store-in-cookie>false</store-in-cookie>
+        <!--+
+          | Uncomment to override default:
+          <locale-attribute>locale</locale-attribute>
+          <use-locale>true</use-locale>
+          <default-locale language="en" country="US"/>
+          +-->
+      </map:action>
+    </map:actions>
+  </map:components>
+
+  <!-- =========================== Resources =============================== -->
+  <map:resources>
+    <!--+
+      | This resource is used to create a composite page from menu and content
+      +-->
+    <map:resource name="composite">
+      <map:aggregate element="root">
+        <map:part src="cocoon:/menu/{../0}" />
+        <map:part src="cocoon:/content/{../0}" label="content" />
+      </map:aggregate>
+      <map:transform src="simple2page.xsl">
+        <map:parameter name="page" value="{../0}" />
+        <map:parameter name="locale" value="{../../locale}" />
+      </map:transform>
+      <map:transform src="servlet:style-default:/common/style/xsl/html/complex-page2html.xsl" />
+      <map:transform type="servletLinkRewriter" />
+      <map:serialize type="html" />
+    </map:resource>
+  </map:resources>
+
+  <!-- =========================== Views =================================== -->
+
+  <map:views>
+    <map:view name="content" from-label="content">
+      <map:serialize type="xml" />
+    </map:view>
+
+    <map:view from-label="content" name="pretty-content">
+      <!-- Make use of servlet services -->
+      <map:serialize type="servletService">
+        <map:parameter name="service" value="servlet:style-default:/service/system/xml2html" />
+      </map:serialize>
+    </map:view>
+
+    <map:view name="links" from-position="last">
+      <map:serialize type="links" />
+    </map:view>
+  </map:views>
+
+  <!-- =========================== Pipelines ================================= -->
+
+  <map:pipelines>
+    <map:pipeline>
+      <!-- Default pipeline -->
+      <map:match pattern="">
+        <map:redirect-to uri="simple.xml" />
+      </map:match>
 
-    <!-- =========================== Resources =============================== -->
-    <map:resources>
+      <map:act type="locale">
         <!--+
-            | This resource is used to create a composite page from menu and content
-            +-->
-        <map:resource name="composite">
-            <map:aggregate element="root">
-                <map:part src="cocoon:/menu/{../0}" />
-                <map:part src="cocoon:/content/{../0}" label="content" />
-            </map:aggregate>
-            <map:transform src="simple2page.xsl">
-                <map:parameter name="page" value="{../0}" />
-                <map:parameter name="locale" value="{../../locale}" />
-            </map:transform>
-            <map:transform src="servlet:style-default:/common/style/xsl/html/complex-page2html.xsl" />
-            <map:transform type="servletLinkRewriter" />
-            <map:serialize type="html" />
-        </map:resource>
-    </map:resources>
-
-    <!-- =========================== Views =================================== -->
-
-    <map:views>
-        <map:view name="content" from-label="content">
-            <map:serialize type="xml" />
-        </map:view>
-
-        <map:view from-label="content" name="pretty-content">
-            <!-- Make use of servlet services -->
-            <map:serialize type="servletService">
-                <map:parameter name="service" value="servlet:style-default:/service/system/xml2html" />
-            </map:serialize>
-        </map:view>
-
-        <map:view name="links" from-position="last">
-            <map:serialize type="links" />
-        </map:view>
-    </map:views>
-
-    <!-- =========================== Pipelines ================================= -->
-
-    <map:pipelines>
-        <map:pipeline>
-            <!-- Default pipeline -->
-            <map:match pattern="">
-                <map:redirect-to uri="simple.xml" />
-            </map:match>
-
-            <map:act type="locale">
-                <!--+
-                    | Locale aware content generation pipeline
-                    +-->
-
-                <!-- Generate static output (simple.xml) -->
-                <map:match pattern="*.xml">
-                    <map:call resource="composite" />
-                </map:match>
-
-                <!-- Generate dynamic output (simple.xsp) -->
-                <map:match pattern="*.xsp">
-                    <map:call resource="composite" />
-                </map:match>
-
-                <!-- A helper matcher for static content translation and generation -->
-                <map:match pattern="content/tiered.xml">
-                    <map:generate src="tiered.xml" />
-                    <map:transform type="i18n">
-                        <map:parameter name="default-catalogue-id" value="tiered" />
-                        <map:parameter name="locale" value="{../locale}" />
-                    </map:transform>
-                    <map:serialize />
-                </map:match>
-
-                <!-- A helper matcher for static content translation and generation -->
-                <map:match pattern="content/*.xml">
-                    <map:generate src="{1}.xml" />
-                    <map:transform type="i18n">
-                        <map:parameter name="locale" value="{../locale}" />
-                    </map:transform>
-                    <map:serialize />
-                </map:match>
-
-                <!-- A helper matcher for dynamic content translation and generation -->
-                <map:match pattern="content/*.xsp">
-                    <map:generate type="serverpages" src="{1}.xsp" />
-                    <map:transform type="i18n">
-                        <map:parameter name="locale" value="{../locale}" />
-                    </map:transform>
-                    <map:serialize />
-                </map:match>
-
-                <!-- Menu generation -->
-                <map:match pattern="menu/*">
-                    <map:generate src="menu.xml" />
-                    <map:transform type="i18n">
-                        <!-- Override default catalogue for this pipeline -->
-                        <map:parameter name="default-catalogue-id" value="menu" />
-                        <map:parameter name="locale" value="{../locale}" />
-                    </map:transform>
-                    <map:serialize />
-                </map:match>
-            </map:act>
-
-            <!--+
-                | Locale agnostic pipeline part below
-                +-->
-
-            <!-- Display this sitemap source -->
-            <map:match pattern="sitemap.xmap">
-                <map:generate src="sitemap.xmap" />
-                <!-- Make use of servlet services -->
-                <map:serialize type="servletService">
-                    <map:parameter name="service" value="servlet:style-default:/service/system/xml2html" />
-                </map:serialize>
-            </map:match>
-
-            <map:match pattern="*.css">
-                <map:read src="{1}.css" mime-type="text/css" />
-            </map:match>
-
-            <map:match pattern="images/*.gif">
-                <map:read src="images/{1}.gif" mime-type="image/gif" />
-            </map:match>
+          | Locale aware content generation pipeline
+          +-->
+
+        <!-- Generate static output (simple.xml) -->
+        <map:match pattern="*.xml">
+          <map:call resource="composite" />
+        </map:match>
+
+        <!-- Generate dynamic output (simple.xsp) -->
+        <map:match pattern="*.xsp">
+          <map:call resource="composite" />
+        </map:match>
+
+        <!-- A helper matcher for static content translation and generation -->
+        <map:match pattern="content/tiered.xml">
+          <map:generate src="tiered.xml" />
+          <map:transform type="i18n">
+            <map:parameter name="default-catalogue-id" value="tiered" />
+            <map:parameter name="locale" value="{../locale}" />
+          </map:transform>
+          <map:serialize />
+        </map:match>
+
+        <!-- A helper matcher for static content translation and generation -->
+        <map:match pattern="content/*.xml">
+          <map:generate src="{1}.xml" />
+          <map:transform type="i18n">
+            <map:parameter name="locale" value="{../locale}" />
+          </map:transform>
+          <map:serialize />
+        </map:match>
+
+        <!-- A helper matcher for dynamic content translation and generation -->
+        <map:match pattern="content/*.xsp">
+          <map:generate type="serverpages" src="{1}.xsp" />
+          <map:transform type="i18n">
+            <map:parameter name="locale" value="{../locale}" />
+          </map:transform>
+          <map:serialize />
+        </map:match>
+
+        <!-- Menu generation -->
+        <map:match pattern="menu/*">
+          <map:generate src="menu.xml" />
+          <map:transform type="i18n">
+            <!-- Override default catalogue for this pipeline -->
+            <map:parameter name="default-catalogue-id" value="menu" />
+            <map:parameter name="locale" value="{../locale}" />
+          </map:transform>
+          <map:serialize />
+        </map:match>
+      </map:act>
+
+      <!--+
+        | Locale agnostic pipeline part below
+        +-->
+
+      <!-- Display this sitemap source -->
+      <map:match pattern="sitemap.xmap">
+        <map:generate src="sitemap.xmap" />
+        <!-- Make use of servlet services -->
+        <map:serialize type="servletService">
+          <map:parameter name="service" value="servlet:style-default:/service/system/xml2html" />
+        </map:serialize>
+      </map:match>
+
+      <map:match pattern="*.css">
+        <map:read src="{1}.css" mime-type="text/css" />
+      </map:match>
+
+      <map:match pattern="images/*.gif">
+        <map:read src="images/{1}.gif" mime-type="image/gif" />
+      </map:match>
 
-        </map:pipeline>
-    </map:pipelines>
+    </map:pipeline>
+  </map:pipelines>
 </map:sitemap>

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/sitemap.xmap?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/sitemap.xmap Mon May 28 13:17:10 2007
@@ -27,42 +27,42 @@
 
 <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>
-
-            <!-- ========================= Mount sub-sitemaps ============================= -->
-            <map:match pattern="*/**">
-                <map:mount uri-prefix="{1}" src="{1}/" />
-            </map:match>
-        </map:pipeline>
+  <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>
+
+      <!-- ========================= Mount sub-sitemaps ============================= -->
+      <map:match pattern="*/**">
+        <map:mount uri-prefix="{1}" src="{1}/" />
+      </map:match>
+    </map:pipeline>
 
-    </map:pipelines>
+  </map:pipelines>
 </map:sitemap>

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/spring/config/spring/applicationContext.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/spring/config/spring/applicationContext.xml?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/spring/config/spring/applicationContext.xml (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/spring/config/spring/applicationContext.xml Mon May 28 13:17:10 2007
@@ -20,13 +20,9 @@
 
 <beans>
 
-	<bean id="spring-test"
-	      class="org.apache.cocoon.core.container.spring.test.TestBean"
-	      abstract="false"
-	      singleton="true"
-	      lazy-init="default">
-      <property name="settings" ref="org.apache.cocoon.configuration.Settings"/>
-	  <property name="javaVersion" value="${java.specification.version}"/>
-	</bean>
+  <bean id="spring-test" class="org.apache.cocoon.core.container.spring.test.TestBean" abstract="false" singleton="true" lazy-init="default">
+    <property name="settings" ref="org.apache.cocoon.configuration.Settings" />
+    <property name="javaVersion" value="${java.specification.version}" />
+  </bean>
 
 </beans>

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/system/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/system/sitemap.xmap?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/system/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/system/sitemap.xmap Mon May 28 13:17:10 2007
@@ -24,92 +24,92 @@
 
 <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" />
-                <map:transform src="servlet:style-default:/common/style/xsl/html/simple-samples2html.xsl" />
-                <map:transform type="servletLinkRewriter" />
-                <map:serialize />
-            </map:match>
-
-            <map:match pattern="status.html">
-                <map:generate type="status" />
-                <!-- Make use of servlet services -->
-                <map:serialize type="servletService">
-                    <map:parameter name="service" value="servlet:style-default:/service/system/status2html" />
-                </map:serialize>
-            </map:match>
-
-            <map:match pattern="status-with-continuations.xml">
-                <map:generate type="status">
-                    <map:parameter name="show-cont" value="true" />
-                </map:generate>
-                <map:serialize type="xml" />
-            </map:match>
-
-            <map:match pattern="status-with-continuations.html">
-                <map:generate src="cocoon:/status-with-continuations.xml" />
-                <!-- Make use of servlet services -->
-                <map:serialize type="servletService">
-                    <map:parameter name="service" value="servlet:style-default:/service/system/status2html" />
-                </map:serialize>
-            </map:match>
-
-            <map:match pattern="clearcache.html">
-                <map:act type="clear-cache">
-                    <map:generate src="status" type="status" />
-                    <!-- Make use of servlet services -->
-                    <map:serialize type="servletService">
-                        <map:parameter name="service" value="servlet:style-default:/service/system/status2html" />
-                    </map:serialize>
-                </map:act>
-            </map:match>
-
-            <map:match pattern="clearpersistentstore.html">
-                <map:act type="clear-persistent-store">
-                    <map:generate src="status" type="status" />
-                    <!-- Make use of servlet services -->
-                    <map:serialize type="servletService">
-                        <map:parameter name="service" value="servlet:style-default:/service/system/status2html" />
-                    </map:serialize>
-                </map:act>
-                <map:generate src="no-persistent-store.xml" />
-                <!-- Make use of servlet services -->
-                <map:serialize type="servletService">
-                    <map:parameter name="service" value="servlet:style-default:/service/system/xml2html" />
-                </map:serialize>
-            </map:match>
-
-            <map:match pattern="request.html">
-                <map:generate type="request" />
-                <!-- Make use of servlet services -->
-                <map:serialize type="servletService">
-                    <map:parameter name="service" value="servlet:style-default:/service/system/xml2html" />
-                </map:serialize>
-            </map:match>
+  <map: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" />
+        <map:transform src="servlet:style-default:/common/style/xsl/html/simple-samples2html.xsl" />
+        <map:transform type="servletLinkRewriter" />
+        <map:serialize />
+      </map:match>
+
+      <map:match pattern="status.html">
+        <map:generate type="status" />
+        <!-- Make use of servlet services -->
+        <map:serialize type="servletService">
+          <map:parameter name="service" value="servlet:style-default:/service/system/status2html" />
+        </map:serialize>
+      </map:match>
+
+      <map:match pattern="status-with-continuations.xml">
+        <map:generate type="status">
+          <map:parameter name="show-cont" value="true" />
+        </map:generate>
+        <map:serialize type="xml" />
+      </map:match>
+
+      <map:match pattern="status-with-continuations.html">
+        <map:generate src="cocoon:/status-with-continuations.xml" />
+        <!-- Make use of servlet services -->
+        <map:serialize type="servletService">
+          <map:parameter name="service" value="servlet:style-default:/service/system/status2html" />
+        </map:serialize>
+      </map:match>
+
+      <map:match pattern="clearcache.html">
+        <map:act type="clear-cache">
+          <map:generate src="status" type="status" />
+          <!-- Make use of servlet services -->
+          <map:serialize type="servletService">
+            <map:parameter name="service" value="servlet:style-default:/service/system/status2html" />
+          </map:serialize>
+        </map:act>
+      </map:match>
+
+      <map:match pattern="clearpersistentstore.html">
+        <map:act type="clear-persistent-store">
+          <map:generate src="status" type="status" />
+          <!-- Make use of servlet services -->
+          <map:serialize type="servletService">
+            <map:parameter name="service" value="servlet:style-default:/service/system/status2html" />
+          </map:serialize>
+        </map:act>
+        <map:generate src="no-persistent-store.xml" />
+        <!-- Make use of servlet services -->
+        <map:serialize type="servletService">
+          <map:parameter name="service" value="servlet:style-default:/service/system/xml2html" />
+        </map:serialize>
+      </map:match>
+
+      <map:match pattern="request.html">
+        <map:generate type="request" />
+        <!-- Make use of servlet services -->
+        <map:serialize type="servletService">
+          <map:parameter name="service" value="servlet:style-default:/service/system/xml2html" />
+        </map:serialize>
+      </map:match>
 
-        </map:pipeline>
-    </map:pipelines>
+    </map:pipeline>
+  </map:pipelines>
 </map:sitemap>

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/META-INF/cocoon/spring/cocoon-core-main-sample-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/META-INF/cocoon/spring/cocoon-core-main-sample-blockServlet.xml?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/META-INF/cocoon/spring/cocoon-core-main-sample-blockServlet.xml (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/META-INF/cocoon/spring/cocoon-core-main-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.core.main.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
-        <servlet:context mount-path="/cocoon-core-main-sample" context-path="blockcontext:/cocoon-core-main-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.core.main.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
+    <servlet:context mount-path="/cocoon-core-main-sample" context-path="blockcontext:/cocoon-core-main-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-cron/cocoon-cron-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-cron/cocoon-cron-sample/src/main/resources/COB-INF/sitemap.xmap?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-cron/cocoon-cron-sample/src/main/resources/COB-INF/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-cron/cocoon-cron-sample/src/main/resources/COB-INF/sitemap.xmap Mon May 28 13:17:10 2007
@@ -18,79 +18,79 @@
 <!-- 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>
-
-    <!-- ============================ Flows ================================== -->
-
-    <map:flow language="javascript">
-        <map:script src="cron.js" />
-    </map:flow>
-
-    <!-- =========================== Pipelines ================================= -->
-
-    <map:pipelines>
-
-        <map:pipeline internal-only="false">
-            <map:match pattern="*.view">
-                <map:generate type="jx" src="{1}.xml" />
-                <!-- 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:pipeline>
-
-        <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="docs.html">
-                <map:generate src="docs.xml" />
-                <!-- 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="cron.html">
-                <map:call function="cron">
-                    <map:parameter name="realPath" value="{realpath:/}" />
-                </map:call>
-            </map:match>
-
-            <map:match pattern="continue.*">
-                <map:call continuation="{1}" />
-            </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>
+
+  <!-- ============================ Flows ================================== -->
+
+  <map:flow language="javascript">
+    <map:script src="cron.js" />
+  </map:flow>
+
+  <!-- =========================== Pipelines ================================= -->
+
+  <map:pipelines>
+
+    <map:pipeline internal-only="false">
+      <map:match pattern="*.view">
+        <map:generate type="jx" src="{1}.xml" />
+        <!-- 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:pipeline>
+
+    <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="docs.html">
+        <map:generate src="docs.xml" />
+        <!-- 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="cron.html">
+        <map:call function="cron">
+          <map:parameter name="realPath" value="{realpath:/}" />
+        </map:call>
+      </map:match>
+
+      <map:match pattern="continue.*">
+        <map:call continuation="{1}" />
+      </map:match>
 
-        </map:pipeline>
-    </map:pipelines>
+    </map:pipeline>
+  </map:pipelines>
 
 </map:sitemap>

Modified: cocoon/trunk/blocks/cocoon-cron/cocoon-cron-sample/src/main/resources/META-INF/cocoon/spring/cocoon-cron-sample-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-cron/cocoon-cron-sample/src/main/resources/META-INF/cocoon/spring/cocoon-cron-sample-blockServlet.xml?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-cron/cocoon-cron-sample/src/main/resources/META-INF/cocoon/spring/cocoon-cron-sample-blockServlet.xml (original)
+++ cocoon/trunk/blocks/cocoon-cron/cocoon-cron-sample/src/main/resources/META-INF/cocoon/spring/cocoon-cron-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.cron.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
-        <servlet:context mount-path="/cocoon-cron-sample" context-path="blockcontext:/cocoon-cron-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.cron.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
+    <servlet:context mount-path="/cocoon-cron-sample" context-path="blockcontext:/cocoon-cron-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-databases/cocoon-databases-impl/src/main/resources/META-INF/cocoon/avalon/cocoon-databases-sitemap.xconf
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-databases/cocoon-databases-impl/src/main/resources/META-INF/cocoon/avalon/cocoon-databases-sitemap.xconf?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-databases/cocoon-databases-impl/src/main/resources/META-INF/cocoon/avalon/cocoon-databases-sitemap.xconf (original)
+++ cocoon/trunk/blocks/cocoon-databases/cocoon-databases-impl/src/main/resources/META-INF/cocoon/avalon/cocoon-databases-sitemap.xconf Mon May 28 13:17:10 2007
@@ -21,6 +21,6 @@
     +-->
 <map:components xmlns:map="http://apache.org/cocoon/sitemap/1.0">
   <map:transformers>
-   <map:transformer logger="sitemap.transformer.sql" name="sql" src="org.apache.cocoon.transformation.SQLTransformer"/>
+    <map:transformer logger="sitemap.transformer.sql" name="sql" src="org.apache.cocoon.transformation.SQLTransformer" />
   </map:transformers>
 </map:components>

Modified: cocoon/trunk/blocks/cocoon-databases/cocoon-databases-impl/src/main/resources/META-INF/cocoon/avalon/cocoon-databases.xconf
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-databases/cocoon-databases-impl/src/main/resources/META-INF/cocoon/avalon/cocoon-databases.xconf?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-databases/cocoon-databases-impl/src/main/resources/META-INF/cocoon/avalon/cocoon-databases.xconf (original)
+++ cocoon/trunk/blocks/cocoon-databases/cocoon-databases-impl/src/main/resources/META-INF/cocoon/avalon/cocoon-databases.xconf Mon May 28 13:17:10 2007
@@ -32,22 +32,22 @@
   <input-modules>
     <component-instance logger="core.modules.input" name="collection" 	class="org.apache.cocoon.components.modules.input.CollectionMetaModule"/>
   </input-modules>
-  
-   <autoincrement-modules>
-      <component-instance logger="core.modules.auto" name="auto" class="org.apache.cocoon.components.modules.database.HsqlIdentityAutoIncrementModule"/>
-<!--
+
+  <autoincrement-modules>
+    <component-instance logger="core.modules.auto" name="auto" class="org.apache.cocoon.components.modules.database.HsqlIdentityAutoIncrementModule" />
+    <!--
       Choose the one suitable for your DBMS. You *can* have more than
       one at a time, but they need to have different names. You then
       need to specify explicitly, which one to use in your descriptor
       file.
-
+      
       <component-instance logger="core.modules.auto" name="auto" class="org.apache.cocoon.components.modules.database.ManualAutoIncrementModule"/>
       <component-instance logger="core.modules.auto" name="auto" class="org.apache.cocoon.components.modules.database.IfxSerialAutoIncrementModule"/>
       <component-instance logger="core.modules.auto" name="auto" class="org.apache.cocoon.components.modules.database.McKoiSequenceModule"/>
       <component-instance logger="core.modules.auto" name="auto" class="org.apache.cocoon.components.modules.database.MysqlAutoIncrementModule"/>
       <component-instance logger="core.modules.auto" name="auto" class="org.apache.cocoon.components.modules.database.PgsqlAutoIncrementModule"/>
       <component-instance logger="core.modules.auto" name="auto" class="org.apache.cocoon.components.modules.database.SQLServerIdentityAutoIncrementModule"/>
--->
-   </autoincrement-modules>
+    -->
+  </autoincrement-modules>
 
 </components>

Modified: cocoon/trunk/blocks/cocoon-databases/cocoon-databases-sample/src/main/resources/COB-INF/mod-db/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-databases/cocoon-databases-sample/src/main/resources/COB-INF/mod-db/sitemap.xmap?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-databases/cocoon-databases-sample/src/main/resources/COB-INF/mod-db/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-databases/cocoon-databases-sample/src/main/resources/COB-INF/mod-db/sitemap.xmap Mon May 28 13:17:10 2007
@@ -18,217 +18,217 @@
 
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
 
-    <!-- ========================= Components ============================== -->
+  <!-- ========================= Components ============================== -->
 
-    <map:components>
-        <!-- most components are inherited from parent sitemap -->
-        <!-- just make sure that defaults suit our needs -->
-
-        <map:actions>
-            <!-- these action are in addition to the ones inherited -->
-
-            <!-- declare actions for database operations -->
-            <map:action name="mod-db-add" src="org.apache.cocoon.acting.modular.DatabaseAddAction">
-                <descriptor>database.xml</descriptor>
-                <!-- shall we throw an exception in addition to rolling back
-                    the transaction when encountering an error during
-                    database ops? 
-                -->
-                <throw-exception>false</throw-exception>
-                <!-- if results should be directed to another destination than the
-                    default request attributes, use e.g.
-                    
-                    <output>session</output>
-                    
-                    this can also be specified on the fly through a map:parameter
-                    named "output"
-                    remember, that input-/output-modules need to be declared in your
-                    cocoon.xconf in order to be used here.
-                -->
-            </map:action>
-
-            <map:action name="mod-db-del" src="org.apache.cocoon.acting.modular.DatabaseDeleteAction">
-                <descriptor>database.xml</descriptor>
-                <throw-exception>false</throw-exception>
-            </map:action>
-
-            <map:action name="mod-db-upd" src="org.apache.cocoon.acting.modular.DatabaseUpdateAction">
-                <descriptor>database.xml</descriptor>
-                <throw-exception>false</throw-exception>
-            </map:action>
-
-        </map:actions>
-
-    </map:components>
-
-
-    <!-- =========================== Views =================================== -->
-
-    <map:views>
-        <map:view name="content" from-label="content">
-            <map:serialize type="xml" />
-        </map:view>
-
-        <map:view from-label="content" name="pretty-content">
-            <!-- Make use of servlet services -->
-            <map:serialize type="servletService">
-                <map:parameter name="service" value="servlet:style-default:/service/system/xml2html" />
-            </map:serialize>
-        </map:view>
-
-        <map:view name="links" from-position="last">
-            <map:serialize type="links" />
-        </map:view>
-    </map:views>
-
-    <!-- =========================== Pipelines ================================= -->
-
-    <map:pipelines>
-        <map:pipeline>
-
-            <map:match pattern="database.xml">
-                <map:generate src="{0}" />
-                <map:serialize type="xml" />
-            </map:match>
-            <map:match pattern="schema.sql">
-                <map:read src="{0}" mime-type="text/plain" />
-            </map:match>
-            <!-- ========================== Modular DB ================================= -->
-
-            <map:match pattern="">
-                <map:redirect-to uri="user-list" />
-            </map:match>
-
-            <map:match pattern="file-upload-test">
-                <map:generate type="serverpages" src="file-upload-blob.xsp" />
-                <map:serialize type="xml" />
-            </map:match>
-
-            <!--  Deliver images from database -->
-            <map:match pattern="image/*">
-                <map:read type="databasereader" src="{1}" mime-type="image/jpg">
-                    <!-- option sitemap parameters -->
-                    <map:parameter name="table" value="media" />
-                    <map:parameter name="image" value="image" />
-                    <map:parameter name="key" value="id" />
-                    <map:parameter name="type-column" value="mimetype" />
-                </map:read>
-            </map:match>
-
-
-            <map:match pattern="*">
-
-                <!--
-                    First, the logic to do all the database operations. Note,
-                    that we do no parameter validation here, just see if some
-                    parameters are present. For a real application, you'd
-                    want to check their values as well. Note too, that in a
-                    more complex setup you'd want to use an action set for
-                    this rather than spell it out everywhere.
-                    Or even better, call these actions from the flow layer!
-                    That way it is easier to react to error conditions.
-                -->
-
-                <!-- ______________________________ inserts ______________________________ -->
-
-                <!-- add new groups to a user's groups -->
-                <map:act type="req-params">
-                    <map:parameter name="parameters" value="add-groups user_groups.uid user_groups.gid" />
-                    <map:act type="mod-db-add">
-                        <map:parameter name="table-set" value="user_groups" />
-                    </map:act>
-                </map:act>
-
-                <!-- add one new group -->
-                <map:act type="req-params">
-                    <map:parameter name="parameters" value="add-group groups.gname" />
-                    <map:act type="mod-db-add">
-                        <map:parameter name="table-set" value="groups" />
-                    </map:act>
-                </map:act>
-
-                <!-- add one new user -->
-                <!-- Actually, this one is not used anymore. The one below
-                    works well when no groups are supplied.
-                -->
-                <map:act type="req-params">
-                    <map:parameter name="parameters" value="add-user user.name user.firstname user.uname" />
-                    <map:act type="mod-db-add">
-                        <map:parameter name="table-set" value="user" />
-                    </map:act>
-                </map:act>
-
-                <!-- add one new user plus groups -->
-                <map:act type="req-params">
-                    <map:parameter name="parameters" value="add-user-groups user.name user.firstname user.uname" />
-                    <map:act type="mod-db-add">
-                        <map:parameter name="table-set" value="user+groups" />
-                    </map:act>
-                </map:act>
-
-                <!-- upload binary data -->
-                <map:act type="req-params">
-                    <map:parameter name="parameters" value="add-image" /><!-- media.image media.id -->
-                    <map:act type="mod-db-add">
-                        <map:parameter name="table-set" value="media" />
-                    </map:act>
-                </map:act>
-
-                <!-- ______________________________ updates ______________________________ -->
-
-                <!-- update one user -->
-                <map:act type="req-params">
-                    <map:parameter name="parameters" value="upd-user user.uid user.name user.firstname user.uname" />
-                    <map:act type="mod-db-upd">
-                        <map:parameter name="table-set" value="user" />
-                    </map:act>
-                </map:act>
-
-
-                <!-- update one group -->
-                <map:act type="req-params">
-                    <map:parameter name="parameters" value="upd-group groups.gid groups.gname" />
-                    <map:act type="mod-db-upd">
-                        <map:parameter name="table-set" value="groups" />
-                    </map:act>
-                </map:act>
-
-                <!-- ______________________________ deletes ______________________________ -->
-
-                <!-- delete one user -->
-                <map:act type="req-params">
-                    <map:parameter name="parameters" value="del-user user.uid" />
-                    <map:act type="mod-db-del">
-                        <map:parameter name="table-set" value="user" />
-                    </map:act>
-                </map:act>
-
-                <!-- delete one group -->
-                <map:act type="req-params">
-                    <map:parameter name="parameters" value="del-group groups.gid" />
-                    <map:act type="mod-db-del">
-                        <map:parameter name="table-set" value="groups" />
-                    </map:act>
-                </map:act>
-
-                <!-- delete groups from a user's groups -->
-                <map:act type="req-params">
-                    <map:parameter name="parameters" value="remove-groups user_groups.uid user_groups.gid" />
-                    <map:act type="mod-db-del">
-                        <map:parameter name="table-set" value="user_groups" />
-                    </map:act>
-                </map:act>
-
-                <!-- ______________________________ content  ______________________________ -->
-
-                <map:generate type="serverpages" src="{1}.xsp" />
-                <map:transform src="servlet:style-default:/blocks/dynamic-page2html.xsl" />
-                <map:transform src="stupid.xsl" />
-                <map:serialize />
+  <map:components>
+    <!-- most components are inherited from parent sitemap -->
+    <!-- just make sure that defaults suit our needs -->
+
+    <map:actions>
+      <!-- these action are in addition to the ones inherited -->
+
+      <!-- declare actions for database operations -->
+      <map:action name="mod-db-add" src="org.apache.cocoon.acting.modular.DatabaseAddAction">
+        <descriptor>database.xml</descriptor>
+        <!-- shall we throw an exception in addition to rolling back
+          the transaction when encountering an error during
+          database ops? 
+        -->
+        <throw-exception>false</throw-exception>
+        <!-- if results should be directed to another destination than the
+          default request attributes, use e.g.
+          
+          <output>session</output>
+          
+          this can also be specified on the fly through a map:parameter
+          named "output"
+          remember, that input-/output-modules need to be declared in your
+          cocoon.xconf in order to be used here.
+        -->
+      </map:action>
+
+      <map:action name="mod-db-del" src="org.apache.cocoon.acting.modular.DatabaseDeleteAction">
+        <descriptor>database.xml</descriptor>
+        <throw-exception>false</throw-exception>
+      </map:action>
+
+      <map:action name="mod-db-upd" src="org.apache.cocoon.acting.modular.DatabaseUpdateAction">
+        <descriptor>database.xml</descriptor>
+        <throw-exception>false</throw-exception>
+      </map:action>
+
+    </map:actions>
+
+  </map:components>
+
+
+  <!-- =========================== Views =================================== -->
+
+  <map:views>
+    <map:view name="content" from-label="content">
+      <map:serialize type="xml" />
+    </map:view>
+
+    <map:view from-label="content" name="pretty-content">
+      <!-- Make use of servlet services -->
+      <map:serialize type="servletService">
+        <map:parameter name="service" value="servlet:style-default:/service/system/xml2html" />
+      </map:serialize>
+    </map:view>
+
+    <map:view name="links" from-position="last">
+      <map:serialize type="links" />
+    </map:view>
+  </map:views>
+
+  <!-- =========================== Pipelines ================================= -->
+
+  <map:pipelines>
+    <map:pipeline>
+
+      <map:match pattern="database.xml">
+        <map:generate src="{0}" />
+        <map:serialize type="xml" />
+      </map:match>
+      <map:match pattern="schema.sql">
+        <map:read src="{0}" mime-type="text/plain" />
+      </map:match>
+      <!-- ========================== Modular DB ================================= -->
+
+      <map:match pattern="">
+        <map:redirect-to uri="user-list" />
+      </map:match>
+
+      <map:match pattern="file-upload-test">
+        <map:generate type="serverpages" src="file-upload-blob.xsp" />
+        <map:serialize type="xml" />
+      </map:match>
+
+      <!--  Deliver images from database -->
+      <map:match pattern="image/*">
+        <map:read type="databasereader" src="{1}" mime-type="image/jpg">
+          <!-- option sitemap parameters -->
+          <map:parameter name="table" value="media" />
+          <map:parameter name="image" value="image" />
+          <map:parameter name="key" value="id" />
+          <map:parameter name="type-column" value="mimetype" />
+        </map:read>
+      </map:match>
+
+
+      <map:match pattern="*">
+
+        <!--
+          First, the logic to do all the database operations. Note,
+          that we do no parameter validation here, just see if some
+          parameters are present. For a real application, you'd
+          want to check their values as well. Note too, that in a
+          more complex setup you'd want to use an action set for
+          this rather than spell it out everywhere.
+          Or even better, call these actions from the flow layer!
+          That way it is easier to react to error conditions.
+        -->
+
+        <!-- ______________________________ inserts ______________________________ -->
+
+        <!-- add new groups to a user's groups -->
+        <map:act type="req-params">
+          <map:parameter name="parameters" value="add-groups user_groups.uid user_groups.gid" />
+          <map:act type="mod-db-add">
+            <map:parameter name="table-set" value="user_groups" />
+          </map:act>
+        </map:act>
+
+        <!-- add one new group -->
+        <map:act type="req-params">
+          <map:parameter name="parameters" value="add-group groups.gname" />
+          <map:act type="mod-db-add">
+            <map:parameter name="table-set" value="groups" />
+          </map:act>
+        </map:act>
+
+        <!-- add one new user -->
+        <!-- Actually, this one is not used anymore. The one below
+          works well when no groups are supplied.
+        -->
+        <map:act type="req-params">
+          <map:parameter name="parameters" value="add-user user.name user.firstname user.uname" />
+          <map:act type="mod-db-add">
+            <map:parameter name="table-set" value="user" />
+          </map:act>
+        </map:act>
+
+        <!-- add one new user plus groups -->
+        <map:act type="req-params">
+          <map:parameter name="parameters" value="add-user-groups user.name user.firstname user.uname" />
+          <map:act type="mod-db-add">
+            <map:parameter name="table-set" value="user+groups" />
+          </map:act>
+        </map:act>
+
+        <!-- upload binary data -->
+        <map:act type="req-params">
+          <map:parameter name="parameters" value="add-image" /><!-- media.image media.id -->
+          <map:act type="mod-db-add">
+            <map:parameter name="table-set" value="media" />
+          </map:act>
+        </map:act>
+
+        <!-- ______________________________ updates ______________________________ -->
+
+        <!-- update one user -->
+        <map:act type="req-params">
+          <map:parameter name="parameters" value="upd-user user.uid user.name user.firstname user.uname" />
+          <map:act type="mod-db-upd">
+            <map:parameter name="table-set" value="user" />
+          </map:act>
+        </map:act>
+
+
+        <!-- update one group -->
+        <map:act type="req-params">
+          <map:parameter name="parameters" value="upd-group groups.gid groups.gname" />
+          <map:act type="mod-db-upd">
+            <map:parameter name="table-set" value="groups" />
+          </map:act>
+        </map:act>
+
+        <!-- ______________________________ deletes ______________________________ -->
+
+        <!-- delete one user -->
+        <map:act type="req-params">
+          <map:parameter name="parameters" value="del-user user.uid" />
+          <map:act type="mod-db-del">
+            <map:parameter name="table-set" value="user" />
+          </map:act>
+        </map:act>
+
+        <!-- delete one group -->
+        <map:act type="req-params">
+          <map:parameter name="parameters" value="del-group groups.gid" />
+          <map:act type="mod-db-del">
+            <map:parameter name="table-set" value="groups" />
+          </map:act>
+        </map:act>
+
+        <!-- delete groups from a user's groups -->
+        <map:act type="req-params">
+          <map:parameter name="parameters" value="remove-groups user_groups.uid user_groups.gid" />
+          <map:act type="mod-db-del">
+            <map:parameter name="table-set" value="user_groups" />
+          </map:act>
+        </map:act>
+
+        <!-- ______________________________ content  ______________________________ -->
+
+        <map:generate type="serverpages" src="{1}.xsp" />
+        <map:transform src="servlet:style-default:/blocks/dynamic-page2html.xsl" />
+        <map:transform src="stupid.xsl" />
+        <map:serialize />
 
-            </map:match>
+      </map:match>
 
-        </map:pipeline>
-    </map:pipelines>
+    </map:pipeline>
+  </map:pipelines>
 
 </map:sitemap>



Mime
View raw message