Return-Path: 
 <cocoon-cvs-return-11972-apmail-xml-cocoon-cvs-archive=xml.apache.org@xml.apache.org>
Delivered-To: apmail-xml-cocoon-cvs-archive@xml.apache.org
Received: (qmail 85131 invoked by uid 500); 6 May 2003 11:38:11 -0000
Mailing-List: contact cocoon-cvs-help@xml.apache.org; run by ezmlm
Precedence: bulk
Reply-To: cocoon-dev@xml.apache.org
list-help: <mailto:cocoon-cvs-help@xml.apache.org>
list-unsubscribe: <mailto:cocoon-cvs-unsubscribe@xml.apache.org>
list-post: <mailto:cocoon-cvs@xml.apache.org>
Delivered-To: mailing list cocoon-cvs@xml.apache.org
Received: (qmail 85120 invoked by uid 500); 6 May 2003 11:38:11 -0000
Delivered-To: apmail-cocoon-2.1-cvs@apache.org
Received: (qmail 85117 invoked from network); 6 May 2003 11:38:11 -0000
Received: from icarus.apache.org (208.185.179.13)
  by daedalus.apache.org with SMTP; 6 May 2003 11:38:11 -0000
Received: (qmail 24868 invoked by uid 1509); 6 May 2003 11:38:10 -0000
Date: 6 May 2003 11:38:10 -0000
Message-ID: <20030506113810.24867.qmail@icarus.apache.org>
From: stephan@apache.org
To: cocoon-2.1-cvs@apache.org
Subject: cvs commit: cocoon-2.1/src/blocks/slide/samples
 description2html4content.xsl description2html4locks.xsl
 description2html4permissions.xsl description2html4properties.xsl
 principal2html4users.xsl sitemap.xmap
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

stephan     2003/05/06 04:38:10

  Modified:    .        gump.xml status.xml
               src/blocks/slide README web.xml
               src/blocks/slide/samples description2html4content.xsl
                        description2html4locks.xsl
                        description2html4permissions.xsl
                        description2html4properties.xsl
                        principal2html4users.xsl sitemap.xmap
  Log:
  Update Slide examples, should work again.
  
  Revision  Changes    Path
  1.57      +2 -1      cocoon-2.1/gump.xml
  
  Index: gump.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/gump.xml,v
  retrieving revision 1.56
  retrieving revision 1.57
  diff -u -r1.56 -r1.57
  --- gump.xml	6 May 2003 08:49:59 -0000	1.56
  +++ gump.xml	6 May 2003 11:38:09 -0000	1.57
  @@ -592,6 +592,7 @@
       </ant>
   
       <depend project="cocoon" inherit="all"/>
  +    <depend project="cocoon-block-authentication-fw"/>
       <depend project="jta"/>
       <depend project="jakarta-slide"/>
   
  
  
  
  1.22      +0 -4      cocoon-2.1/status.xml
  
  Index: status.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/status.xml,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- status.xml	6 May 2003 09:09:26 -0000	1.21
  +++ status.xml	6 May 2003 11:38:09 -0000	1.22
  @@ -185,10 +185,6 @@
         You got a ArrayIndexOutOfBoundsException from the profiler example, if
         you try to get the SAX fragments.
       </action>
  -
  -    <action context="code" assigned-to="SMS">
  -      You can't upload a file within the Slide block.
  -    </action>
      </actions>
     </todo>
   
  
  
  
  1.2       +9 -9      cocoon-2.1/src/blocks/slide/README
  
  Index: README
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/slide/README,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- README	9 Mar 2003 00:06:13 -0000	1.1
  +++ README	6 May 2003 11:38:10 -0000	1.2
  @@ -6,24 +6,27 @@
   1. Copy the Java Transaction API (JTA) jar into
      lib/local.
   
  -2. Install the Web Application via in Tomcat
  +2. Enable the option 'enable-uploads' within 
  +   src/webapp/WEB-INF/web.xml 
  +
  +3. Install the Web Application via in Tomcat
   
    ./build.sh -Dinstall.war=$TOMCAT_HOME/webapps -Dinclude.scratchpad.libs=yes install
   
  -3. Start Tomcat
  +4. Start Tomcat
   
    $TOMCAT_HOME/bin/catalina.sh run
   
  -4. Access the slide repository via Cocoon
  +5. Access the slide repository via Cocoon
   
    http://localhost:8080/cocoon/samples/slide/
   
   [OPTIONAL]
   
  -5. If you want an access via WebDAV copy the web.xml into WEB-INF/
  +6. If you want an access via WebDAV copy the web.xml into WEB-INF/
      This file includes the WebDAV Servlet from Slide.
   
  -6. Add users to tomcat-users.xml for the MemoryRealm
  +7. Add users to tomcat-users.xml for the MemoryRealm
   
    <role rolename="user"/>
    <role rolename="root"/>
  @@ -32,7 +35,7 @@
   
      You can use the SlideRealm instead of the MemoryRealm.
   
  -7. Access WebDAV via MS WebFolders, Cadaver or whatever
  +8. Access WebDAV via MS WebFolders, Cadaver or whatever
   
    http://localhost:8080/cocoon/webdav/
   
  @@ -43,9 +46,6 @@
   
   
   Some things must be fixed:
  -
  -* The base directory for the content stores should be set. At the moment
  -  there isn't a way to respect the context path.
   
   * The links of directory browsing doesn't work properly, because of the
     servlet mapping.
  
  
  
  1.2       +42 -43    cocoon-2.1/src/blocks/slide/web.xml
  
  Index: web.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/slide/web.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- web.xml	9 Mar 2003 00:06:13 -0000	1.1
  +++ web.xml	6 May 2003 11:38:10 -0000	1.2
  @@ -1,40 +1,33 @@
   <?xml version="1.0" encoding="ISO-8859-1"?>
   
  -<!--
  -  This is the web-app configurations that allow Cocoon to work under
  -  Apache Tomcat. Please, follow the installation section of the
  -  documentation for more information about installing Cocoon on Tomcat
  --->
  +<!--+
  +    | This is the Cocoon web-app configurations file
  +    +-->
   
   <!DOCTYPE web-app
       PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN"
       "http://java.sun.com/j2ee/dtds/web-app_2_2.dtd">
   
   <web-app>
  -  <display-name>Cocoon2 Demo</display-name>
  -  <description>Demo application for Cocoon2</description>
  +
  +  <!-- Servlet Configuration ========================================== -->
  +
     <servlet>
  -    <servlet-name>Cocoon2</servlet-name>
  -    <display-name>Cocoon2</display-name>
  -    <description>The main Cocoon2 servlet</description>
  +    <servlet-name>Cocoon</servlet-name>
  +    <display-name>Cocoon</display-name>
  +    <description>Cocoon</description>
   
       <!--
  -      In cases you're facing class loader problems you can alternatively
  -      use the following servlet-class instead of the normal one
  -
  -      <servlet-class>org.apache.cocoon.servlet.ParanoidCocoonServlet</servlet-class>
  -    -->
  +      The regular servlet class (trusts the servlet container classloader)
  +      -->
       <servlet-class>org.apache.cocoon.servlet.CocoonServlet</servlet-class>
   
       <!--
  -      This parameter points to the main configuration file for Cocoon.
  -      Note that the path is specified in absolute notation but it will be
  -      resolved relative to the servlets webapp context path
  +      In cases you're facing class loading problems, you can alternatively
  +      use the following servlet-class instead of the above one
  +      
  +      <servlet-class>org.apache.cocoon.servlet.ParanoidCocoonServlet</servlet-class>
       -->
  -    <init-param>
  -      <param-name>configurations</param-name>
  -      <param-value>/WEB-INF/cocoon.xconf</param-value>
  -    </init-param>
   
       <!--
         This parameter tells cocoon to set the thread's context classloader to
  @@ -45,6 +38,16 @@
         <param-name>init-classloader</param-name>
         <param-value>false</param-value>
       </init-param>
  +    
  +    <!--
  +      This parameter points to the main configuration file for Cocoon.
  +      Note that the path is specified in absolute notation but it will be
  +      resolved relative to the servlets webapp context path
  +    -->
  +    <init-param>
  +      <param-name>configurations</param-name>
  +      <param-value>/WEB-INF/cocoon.xconf</param-value>
  +    </init-param>
   
       <!--
         This parameter indicates the configuration file of the LogKit management
  @@ -90,7 +93,7 @@
       -->
       <init-param>
         <param-name>log-level</param-name>
  -      <param-value>DEBUG</param-value>
  +      <param-value>WARN</param-value>
       </init-param>
   
       <!--
  @@ -100,7 +103,7 @@
       -->
       <init-param>
         <param-name>allow-reload</param-name>
  -      <param-value>yes</param-value>
  +      <param-value>no</param-value>
       </init-param>
   
       <!--
  @@ -133,6 +136,16 @@
       </init-param>
   
       <!--
  +      Causes all files in multipart requests to be processed.
  +      Default is false for security reasons.  
  +      Unsupported values will be interpreted as false.
  +    -->
  +    <init-param>
  +      <param-name>enable-uploads</param-name>
  +      <param-value>true</param-value>
  +    </init-param>
  +    
  +    <!--
         This parameter allows to specify where Cocoon should put uploaded files.
         The path specified can be either absolute or relative to the context 
         path of the servlet. On windows platform, absolute directory must start
  @@ -148,11 +161,12 @@
   
       <!--
         Causes all files in multipart requests to be saved to upload-dir.
  -      Default is true.  Unsupported values will be interpreted as false.
  +      Default is true for security reasons.  
  +      Unsupported values will be interpreted as false.
       -->
       <init-param>
         <param-name>autosave-uploads</param-name>
  -      <param-value>false</param-value>
  +      <param-value>true</param-value>
       </init-param>
   
       <!--
  @@ -237,22 +251,6 @@
       -->
   
       <!--
  -      This parameter allows you to select the request factory. Possible
  -      choices are as follows:
  -        - org.apache.cocoon.components.request.MultipartRequestFactoryImpl
  -          This is the default factory.
  -        - org.apache.cocoon.components.request.MaybeUploadRequestFactoryImpl
  -          You can opt in for this factory if maybeupload.jar is
  -          present.
  -        - org.apache.cocoon.components.request.SimpleRequestFactoryImpl
  -          This factory does not allow uploads.
  -    -->
  -    <init-param>
  -      <param-name>request-factory</param-name>
  -      <param-value>org.apache.cocoon.components.request.MultipartRequestFactoryImpl</param-value>
  -    </init-param>
  -
  -    <!--
         If you set this parameter to 'true' or 'yes', Cocoon will add processing
         time to the end of each response. Value 'hide' adds processing time as an HTML
         comment. By default, processing time is not added (corresponds to value 'no').
  @@ -303,7 +301,8 @@
       -->
   
       <!--
  -      Set form encoding. This will be the character set used to decode request parameters 
  +      Set form encoding. This will be the character set used to decode request parameters.
  +      If not set the ISO-8859-1 encoding will be assumed. 
       -->
       <!--
       <init-param>
  
  
  
  1.2       +2 -5      cocoon-2.1/src/blocks/slide/samples/description2html4content.xsl
  
  Index: description2html4content.xsl
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/slide/samples/description2html4content.xsl,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- description2html4content.xsl	9 Mar 2003 00:06:26 -0000	1.1
  +++ description2html4content.xsl	6 May 2003 11:38:10 -0000	1.2
  @@ -160,9 +160,8 @@
                       select="source:properties/dav:getlastmodified"/></td>
                     <td align="right">
                      <form action="" method="post">
  -                    <input type="hidden" name="method" value="doDeleteSource"/>
                       <input type="hidden" name="cocoon-source-uri" value="{@uri}"/>
  -                    <input type="submit" name="cocoon-action-deletesource" value="Delete"/>
  +                    <input type="submit" name="doDeleteSource" value="Delete"/>
                      </form>
                     </td>
                    </tr>
  @@ -170,7 +169,6 @@
       
                   <tr>
                    <form action="" method="post" enctype="multipart/form-data">
  -                  <input type="hidden" name="method" value="doUploadSource"/>
                     <input type="hidden" name="cocoon-source-uri" value="{@uri}"/>
                     <td align="left">
                      <input type="text" name="cocoon-source-name" size="15" maxlength="40"/>(optional)
  @@ -180,14 +178,13 @@
                      <input type="file" name="cocoon-upload-file" size="15" maxlength="40"/>
                     </td>
                     <td align="right">
  -                   <input type="submit" name="cocoon-action-upload" value="Upload File" />
  +                   <input type="submit" name="doUploadSource" value="Upload File" />
                     </td>
                    </form>
                   </tr>
   
                   <tr>
                    <form action="" method="post">
  -                  <input type="hidden" name="method" value="doCreateCollection"/>
                     <input type="hidden" name="cocoon-source-uri" value="{@uri}"/>
                     <td align="left" colspan="4">
                      <input type="text" name="cocoon-source-name" size="15" maxlength="40"/>
  
  
  
  1.2       +2 -4      cocoon-2.1/src/blocks/slide/samples/description2html4locks.xsl
  
  Index: description2html4locks.xsl
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/slide/samples/description2html4locks.xsl,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- description2html4locks.xsl	9 Mar 2003 00:06:26 -0000	1.1
  +++ description2html4locks.xsl	6 May 2003 11:38:10 -0000	1.2
  @@ -149,11 +149,10 @@
                   <td align="left"><xsl:value-of select="@exclusive"/></td>
                   <td align="right">
                    <form action="" method="post">
  -                  <input type="hidden" name="method" value="doDeleteLock"/>
                     <input type="hidden" name="cocoon-source-uri" value="{../../@uri}"/>
                     <input type="hidden" name="cocoon-lock-subject" value="{@subject}"/>
   
  -                  <input type="submit" name="cocoon-action-deletelock" value="Delete"/>
  +                  <input type="submit" name="doDeleteLock" value="Delete"/>
                    </form>
                   </td>
                  </tr>
  @@ -161,7 +160,6 @@
   
                 <tr>
                  <form action="" method="post">
  -                <input type="hidden" name="method" value="doAddLock"/>
                   <input type="hidden" name="cocoon-source-uri" value="{@uri}"/>
                   <td align="left">
                    <input name="cocoon-lock-subject" type="text" size="20" maxlength="40"/>
  @@ -185,7 +183,7 @@
                    </select>
                   </td>
                   <td align="right">
  -                 <input type="submit" name="cocoon-action-addlock" value="Add/Modify"/>
  +                 <input type="submit" name="doAddLock" value="Add/Modify"/>
                   </td>
                  </form>
                 </tr>
  
  
  
  1.2       +0 -4      cocoon-2.1/src/blocks/slide/samples/description2html4permissions.xsl
  
  Index: description2html4permissions.xsl
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/slide/samples/description2html4permissions.xsl,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- description2html4permissions.xsl	9 Mar 2003 00:06:26 -0000	1.1
  +++ description2html4permissions.xsl	6 May 2003 11:38:10 -0000	1.2
  @@ -148,7 +148,6 @@
                   <td align="left"><xsl:value-of select="@negative"/></td>
                   <td align="right">
                    <form action="" method="post">
  -                  <input type="hidden" name="method" value="doRemovePrincipalPermission"/>
                     <input type="hidden" name="cocoon-source-uri" value="{../../@uri}"/>
                     <input type="hidden" name="cocoon-source-permission-principal" value="{@principal}"/>
                     <input type="hidden" name="cocoon-source-permission-privilege" value="{@privilege}"/>
  @@ -163,7 +162,6 @@
   
                 <tr>
                  <form action="" method="post">
  -                <input type="hidden" name="method" value="doAddPrincipalPermission"/>
                   <input type="hidden" name="cocoon-source-uri" value="{@uri}"/>
                   <td align="left">
                    <select name="cocoon-source-permission-principal">
  @@ -258,7 +256,6 @@
                  <td align="left"><xsl:value-of select="@negative"/></td>
                  <td align="right">
                   <form action="" method="post">
  -                 <input type="hidden" name="method" value="doRemovePrincipalGroupPermission"/>
                    <input type="hidden" name="cocoon-source-uri" value="{../../@uri}"/>
                    <input type="hidden" name="cocoon-source-permission-principal-group" value="{@group}"/>
                    <input type="hidden" name="cocoon-source-permission-privilege" value="{@privilege}"/>
  @@ -273,7 +270,6 @@
   
                <tr>
                 <form action="" method="post">
  -               <input type="hidden" name="method" value="doAddPrincipalGroupPermission"/>
                  <input type="hidden" name="cocoon-source-uri" value="{@uri}"/>
                  <td align="left">
                   <select name="cocoon-source-permission-principal-group">
  
  
  
  1.2       +2 -4      cocoon-2.1/src/blocks/slide/samples/description2html4properties.xsl
  
  Index: description2html4properties.xsl
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/slide/samples/description2html4properties.xsl,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- description2html4properties.xsl	9 Mar 2003 00:06:26 -0000	1.1
  +++ description2html4properties.xsl	6 May 2003 11:38:10 -0000	1.2
  @@ -150,12 +150,11 @@
                  <td align="right">
                   <xsl:if test="namespace-uri()!='DAV:' and ../@type='live'">
                    <form action="" method="post">
  -                  <input type="hidden" name="method" value="doDeleteProperty"/>
                     <input type="hidden" name="cocoon-source-uri" value="{../../@uri}"/>
                     <input type="hidden" name="cocoon-source-property-namespace" value="{namespace-uri()}"/>
                     <input type="hidden" name="cocoon-source-property-name" value="{local-name()}"/>
     
  -                  <input type="submit" name="cocoon-action-deleteproperty" value="Delete"/>
  +                  <input type="submit" name="doDeleteProperty" value="Delete"/>
                    </form>
                   </xsl:if>
                  </td>
  @@ -164,7 +163,6 @@
   
                <tr>
                 <form action="" method="post">
  -               <input type="hidden" name="method" value="doAddProperty"/>
                  <input type="hidden" name="cocoon-source-uri" value="{@uri}"/>
                   <td align="left">
                    <input name="cocoon-source-property-namespace" type="text" size="15" maxlength="40"/>
  @@ -176,7 +174,7 @@
                    <input name="cocoon-source-property-value" type="text" size="15" maxlength="40"/>
                   </td>
                   <td align="right">
  -                 <input type="submit" name="cocoon-action-addproperty" value="Add/Modify"/>
  +                 <input type="submit" name="doAddProperty" value="Add/Modify"/>
                   </td>
                  </form>
                 </tr>
  
  
  
  1.2       +8 -14     cocoon-2.1/src/blocks/slide/samples/principal2html4users.xsl
  
  Index: principal2html4users.xsl
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/slide/samples/principal2html4users.xsl,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- principal2html4users.xsl	9 Mar 2003 00:06:26 -0000	1.1
  +++ principal2html4users.xsl	6 May 2003 11:38:10 -0000	1.2
  @@ -93,15 +93,14 @@
                  <tr>
     
                   <form action="" method="post">
  -                <input type="hidden" name="cocoon-principal-name" value="{@name}"/>
  -                <input type="hidden" name="method" value="doRemovePrincipal"/>
  +                 <input type="hidden" name="cocoon-principal-name" value="{@name}"/>
    
                    <td align="left">
                     <xsl:value-of select="@name"/>
                    </td>
    
                    <td align="left">
  -                  <input type="submit" name="cocoon-action-deleteprincipal" value="Delete user"/>
  +                  <input type="submit" name="doRemovePrincipal" value="Delete user"/>
                    </td>
    
                   </form>
  @@ -109,8 +108,7 @@
                   <td align="left"><xsl:value-of select="@role"/></td>
    
                   <form action="" method="post">
  -                <input type="hidden" name="cocoon-principal-name" value="{@name}"/>
  -                <input type="hidden" name="method" value="doRemovePrincipalGroupMember"/>
  +                 <input type="hidden" name="cocoon-principal-name" value="{@name}"/>
    
                    <td align="left">
                     <xsl:variable name="name" select="@name"/>
  @@ -123,7 +121,7 @@
                    </td>
    
                    <td align="left">
  -                  <input type="submit" name="cocoon-action-removemember" value="Remove group"/>
  +                  <input type="submit" name="doRemovePrincipalGroupMember" value="Remove group"/>
                    </td>
                   </form>
    
  @@ -136,7 +134,6 @@
    
                   <form action="" method="post">
                   <input type="hidden" name="cocoon-principal-name" value="{@name}"/>
  -                <input type="hidden" name="method" value="doAddPrincipalGroupMember"/>
    
                    <td align="left">
                     <xsl:variable name="name" select="@name"/>
  @@ -148,7 +145,7 @@
                    </td>
    
                    <td align="left">
  -                  <input type="submit" name="cocoon-action-addmember" value="Add group"/>
  +                  <input type="submit" name="doAddPrincipalGroupMember" value="Add group"/>
                    </td>
                   </form>
    
  @@ -157,7 +154,6 @@
    
                 <tr>
                  <form action="" method="post">
  -                <input type="hidden" name="method" value="doAddPrincipal"/>
                   <td align="left">
                    <input name="cocoon-principal-name" type="text" size="10" maxlength="40"/>
                   </td>
  @@ -170,7 +166,7 @@
                    <input name="cocoon-principal-password" type="text" size="10" maxlength="40"/>
                   </td>
                   <td align="right">
  -                 <input type="submit" name="cocoon-action-addprincipal" value="Add user"/>
  +                 <input type="submit" name="doAddPrincipal" value="Add user"/>
                   </td>
                  </form>
                 </tr>
  @@ -217,14 +213,13 @@
   
                   <form action="" method="post">
                    <input type="hidden" name="cocoon-principal-group-name" value="{@name}"/>
  -                 <input type="hidden" name="method" value="doRemovePrincipalGroup"/>
    
                    <td align="left">
                     <xsl:value-of select="@name"/>
                    </td>
   
                    <td align="right">
  -                  <input type="submit" name="cocoon-action-deletegroup" value="Delete group"/>
  +                  <input type="submit" name="doRemovePrincipalGroup" value="Delete group"/>
                    </td>
   
                   </form>
  @@ -233,12 +228,11 @@
   
                 <tr>
                  <form action="" method="post">
  -                <input type="hidden" name="method" value="doAddPrincipalGroup"/>
                   <td align="left">
                    <input name="cocoon-principal-group-name" type="text" size="15" maxlength="40"/>
                   </td>
                   <td align="right">
  -                 <input type="submit" name="cocoon-action-addgroup" value="Add group"/>
  +                 <input type="submit" name="doAddPrincipalGroup" value="Add group"/>
                   </td>
                  </form>
                 </tr>
  
  
  
  1.3       +18 -43    cocoon-2.1/src/blocks/slide/samples/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/slide/samples/sitemap.xmap,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- sitemap.xmap	25 Mar 2003 16:13:45 -0000	1.2
  +++ sitemap.xmap	6 May 2003 11:38:10 -0000	1.3
  @@ -15,29 +15,9 @@
                     label="content"/>
     </map:generators>
   
  -  <map:transformers default="xslt">
  -   <map:transformer name="session" logger="sitemap.transformer.session"
  -                    src="org.apache.cocoon.webapps.session.transformation.SessionTransformer"/>
  -   <map:transformer logger="sitemap.transformer.write-source" name="write-source"
  -                    src="org.apache.cocoon.transformation.SourceWritingTransformer"/>
  -   <map:transformer logger="sitemap.transformer.xinclude" name="xinclude" 
  -                    src="org.apache.cocoon.transformation.XIncludeTransformer"/>
  -   <map:transformer name="log" src="org.apache.cocoon.transformation.LogTransformer"/>
  -  </map:transformers>
  -
  +  <map:transformers default="xslt"/>
     <map:readers default="resource"/>
  -  <map:serializers default="html">
  -   <map:serializer logger="sitemap.serializer.xml" mime-type="text/xml" name="xml"
  -                   src="org.apache.cocoon.serialization.XMLSerializer"/>
  -
  -   <map:serializer logger="sitemap.serializer.html" mime-type="text/html" name="html" 
  -                   pool-grow="4" pool-max="32" pool-min="4" 
  -                   src="org.apache.cocoon.serialization.HTMLSerializer">
  -    <buffer-size>1024</buffer-size>
  -   </map:serializer>
  -  </map:serializers>
  -
  -
  +  <map:serializers default="html"/>
     <map:matchers default="wildcard"/>
     <map:selectors default="browser"/>
   
  @@ -64,18 +44,18 @@
   
    <map:views>
    
  -     <map:view name="content" from-label="content">
  -      <map:serialize type="xml"/>
  -     </map:view>
  -
  -     <map:view name="pretty-content" from-label="data">
  -       <map:transform src="context://stylesheets/system/xml2html.xsl"/>
  -       <map:serialize type="html"/>
  -     </map:view>
  -
  -     <map:view name="xml" from-label="content">
  -       <map:serialize type="xml"/>
  -     </map:view>
  +  <map:view name="content" from-label="content">
  +   <map:serialize type="xml"/>
  +  </map:view>
  +
  +  <map:view name="pretty-content" from-label="data">
  +   <map:transform src="context://stylesheets/system/xml2html.xsl"/>
  +   <map:serialize type="html"/>
  +  </map:view>
  +
  +  <map:view name="xml" from-label="content">
  +   <map:serialize type="xml"/>
  +  </map:view>
        
    </map:views>
   
  @@ -87,10 +67,10 @@
       <map:parameter name="repository" value="slide"/>
       <map:parameter name="namespace" value="myrepository"/>
       <map:parameter name="properties" value="true"/>
  -       <map:parameter name="permissions" value="true"/>
  -       <map:parameter name="locks" value="true"/>
  -       <map:parameter name="depth" value="1"/>
  -      </map:generate>
  +     <map:parameter name="permissions" value="true"/>
  +     <map:parameter name="locks" value="true"/>
  +     <map:parameter name="depth" value="1"/>
  +    </map:generate>
     </map:resource>
    </map:resources>
   
  @@ -190,7 +170,6 @@
        <!-- ============= Source content ================== -->
        <map:match pattern="content/**">
         <map:act type="source-actions">
  -       <map:parameter name="method" value="{request-param:method}"/>
          <map:parameter name="cocoon-source-principal" value="{../ID}"/>
         </map:act>
   
  @@ -205,7 +184,6 @@
        <!-- ============= Source properties =============== -->
        <map:match pattern="properties/**">
         <map:act type="source-actions">
  -       <map:parameter name="method" value="{request-param:method}"/>
          <map:parameter name="cocoon-source-principal" value="{../ID}"/>
         </map:act>
   
  @@ -217,7 +195,6 @@
        <!-- ============= Source permissions ============== -->
        <map:match pattern="permissions/**">
         <map:act type="source-actions">
  -       <map:parameter name="method" value="{request-param:method}"/>
          <map:parameter name="cocoon-source-principal" value="{../ID}"/>
         </map:act>
   
  @@ -233,7 +210,6 @@
        <!-- ============= Source locks ==================== -->
        <map:match pattern="locks/**">
         <map:act type="source-actions">
  -       <map:parameter name="method" value="{request-param:method}"/>
          <map:parameter name="cocoon-source-principal" value="{../ID}"/>
         </map:act>
   
  @@ -251,7 +227,6 @@
        <!-- ============= Repository users =============== -->
        <map:match pattern="users/**">
         <map:act type="principal-actions">
  -       <map:parameter name="method" value="{request-param:method}"/>
          <map:parameter name="cocoon-caller-principal-name" value="{../ID}"/>
         </map:act>