You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2003/07/17 18:26:51 UTC

cvs commit: cocoon-lenya/src/webapp/lenya/pubs/default/config/ac/passwd visitor.rml

andreas     2003/07/17 09:26:51

  Modified:    src/webapp/lenya/pubs/oscom/config/ac/policies
                        matrix-project.xsp weekly-column.acml root.acml
                        navigation.acml matrix.acml public.acml
                        editor-matrix.acml
               src/webapp/lenya/pubs/oscom/config/ac/passwd tom.iml
                        paul.iml lenya.iml cocoon.iml
               src/webapp/lenya/pubs/default/config/ac ac.xconf
               src/webapp sitemap.xmap
               src/webapp/lenya/pubs/default sitemap.xmap
               src/webapp/lenya/pubs/oscom sitemap.xmap
                        policies-sitemap.xmap
               src/webapp/lenya/pubs/oscom/config/menus overview.xsp
  Added:       src/webapp/lenya/pubs/oscom/config/ac/passwd root.gml
                        editor.rml useradministrator.gml editor.gml
                        matrix.gml editormatrix.gml administrator.gml
                        visitor.rml
               src/webapp/lenya/pubs/default/config/ac/policies/authoring
                        subtree-policy.acml
               src/webapp global-sitemap.xmap
               src/webapp/lenya/pubs/oscom/config/ac ac.xconf
               src/webapp/lenya/pubs/default/config/ac/policies
                        subtree-policy.acml
               src/webapp/lenya/pubs/default/config/ac/passwd visitor.rml
  Removed:     src/webapp/lenya/pubs/default/config/ac/policies/authoring/index.html
                        url-policy.acml
  Log:
  - introducing global access control sitemap
  - reflecting access control changes in default and oscom publications
  
  Revision  Changes    Path
  1.2       +21 -29    cocoon-lenya/src/webapp/lenya/pubs/oscom/config/ac/policies/matrix-project.xsp
  
  Index: matrix-project.xsp
  ===================================================================
  RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/oscom/config/ac/policies/matrix-project.xsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- matrix-project.xsp	8 Dec 2002 22:31:54 -0000	1.1
  +++ matrix-project.xsp	17 Jul 2003 16:26:49 -0000	1.2
  @@ -5,36 +5,28 @@
     xmlns:xsp="http://apache.org/xsp"  
     >
   
  -<ac>
  -<request>
  -  <action name="read"/>
  -</request>
  -<policy>
  - <object match="/">
  -  <subjects>
  -<!--
  -    <machine ip="127.0.0.1">
  -      <actions>
  -        <read/>
  -      </actions>
  -    </machine>
  --->
  +<policy xmlns="http://apache.org/cocoon/lenya/ac/1.0">
   
  -    <user><xsp:attribute name="id"><xsp:expr>parameters.getParameter("name","")</xsp:expr></xsp:attribute>
  -      <actions>
  -        <read/>
  -      </actions>
  -    </user>
  +  <!--  
  +  <machine id="127.0.0.1">
  +    <role id="visitor"/>
  +  </machine>
  +  -->
  +  
  +  <xsp:logic>
  +    String username = parameters.getParameter("name", null);
  +    if (username != null) {
  +      <user><xsp:attribute name="id"><xsp:expr>username</xsp:expr></xsp:attribute>
  +        <role id="visitor"/>
  +      </user>
  +    }
  +  </xsp:logic>
   
  -    <group id="matrix">
  -      <actions>
  -        <read/>
  -        <write/>
  -      </actions>
  -    </group>
  -  </subjects>
  - </object>
  -</policy>
  -</ac>
  +  <group id="matrix">
  +    <role id="visitor"/>
  +    <role id="editor"/>
  +  </group>
  +    
  +</policy> 
   
   </xsp:page>
  
  
  
  1.2       +11 -21    cocoon-lenya/src/webapp/lenya/pubs/oscom/config/ac/policies/weekly-column.acml
  
  Index: weekly-column.acml
  ===================================================================
  RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/oscom/config/ac/policies/weekly-column.acml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- weekly-column.acml	2 Oct 2002 22:53:50 -0000	1.1
  +++ weekly-column.acml	17 Jul 2003 16:26:49 -0000	1.2
  @@ -1,23 +1,13 @@
   <?xml version="1.0"?>
   
  -<ac>
  -<request>
  -  <action name="read"/>
  -</request>
  -<policy>
  - <object match="/">
  -  <subjects>
  -    <user id="tom">
  -      <actions>
  -        <read/>
  -      </actions>
  -    </user>
  -    <group id="root">
  -      <actions>
  -        <read/>
  -      </actions>
  -    </group>
  -  </subjects>
  - </object>
  -</policy>
  -</ac>
  +<policy xmlns="http://apache.org/cocoon/lenya/ac/1.0">
  +
  +  <user id="tom">
  +    <role id="visitor"/>
  +  </group>
  +  
  +  <group id="root">
  +    <role id="visitor"/>
  +  </group>
  +
  +</policy> 
  
  
  
  1.2       +6 -16     cocoon-lenya/src/webapp/lenya/pubs/oscom/config/ac/policies/root.acml
  
  Index: root.acml
  ===================================================================
  RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/oscom/config/ac/policies/root.acml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- root.acml	12 May 2002 00:48:05 -0000	1.1
  +++ root.acml	17 Jul 2003 16:26:49 -0000	1.2
  @@ -1,18 +1,8 @@
   <?xml version="1.0"?>
  +<policy xmlns="http://apache.org/cocoon/lenya/ac/1.0">
   
  -<ac>
  -<request>
  -  <action name="read"/>
  -</request>
  -<policy>
  - <object match="/">
  -  <subjects>
  -    <group id="root">
  -      <actions>
  -        <read/>
  -      </actions>
  -    </group>
  -  </subjects>
  - </object>
  -</policy>
  -</ac>
  +  <group id="root">
  +    <role id="visitor"/>
  +  </group>
  +
  +</policy> 
  
  
  
  1.2       +7 -16     cocoon-lenya/src/webapp/lenya/pubs/oscom/config/ac/policies/navigation.acml
  
  Index: navigation.acml
  ===================================================================
  RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/oscom/config/ac/policies/navigation.acml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- navigation.acml	2 Oct 2002 22:53:50 -0000	1.1
  +++ navigation.acml	17 Jul 2003 16:26:49 -0000	1.2
  @@ -1,18 +1,9 @@
   <?xml version="1.0"?>
   
  -<ac>
  -<request>
  -  <action name="read"/>
  -</request>
  -<policy>
  - <object match="/">
  -  <subjects>
  -    <world>
  -      <actions>
  -        <read/>
  -      </actions>
  -    </world>
  -  </subjects>
  - </object>
  -</policy>
  -</ac>
  +<policy xmlns="http://apache.org/cocoon/lenya/ac/1.0">
  +
  +  <world>
  +    <role id="visitor"/>
  +  </group>
  +
  +</policy> 
  
  
  
  1.2       +11 -21    cocoon-lenya/src/webapp/lenya/pubs/oscom/config/ac/policies/matrix.acml
  
  Index: matrix.acml
  ===================================================================
  RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/oscom/config/ac/policies/matrix.acml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- matrix.acml	26 Apr 2003 22:52:12 -0000	1.1
  +++ matrix.acml	17 Jul 2003 16:26:49 -0000	1.2
  @@ -1,23 +1,13 @@
   <?xml version="1.0"?>
   
  -<ac>
  -<request>
  -  <action name="read"/>
  -</request>
  -<policy>
  - <object match="/">
  -  <subjects>
  -    <group id="matrix">
  -      <actions>
  -        <read/>
  -      </actions>
  -    </group>
  -    <group id="root">
  -      <actions>
  -        <read/>
  -      </actions>
  -    </group>
  -  </subjects>
  - </object>
  -</policy>
  -</ac>
  +<policy xmlns="http://apache.org/cocoon/lenya/ac/1.0">
  +
  +  <group id="matrix">
  +    <role id="visitor"/>
  +  </group>
  +  
  +  <group id="root">
  +    <role id="visitor"/>
  +  </group>
  +
  +</policy> 
  
  
  
  1.2       +7 -16     cocoon-lenya/src/webapp/lenya/pubs/oscom/config/ac/policies/public.acml
  
  Index: public.acml
  ===================================================================
  RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/oscom/config/ac/policies/public.acml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- public.acml	12 May 2002 00:48:05 -0000	1.1
  +++ public.acml	17 Jul 2003 16:26:49 -0000	1.2
  @@ -1,18 +1,9 @@
   <?xml version="1.0"?>
   
  -<ac>
  -<request>
  -  <action name="read"/>
  -</request>
  -<policy>
  - <object match="/">
  -  <subjects>
  -    <world>
  -      <actions>
  -        <read/>
  -      </actions>
  -    </world>
  -  </subjects>
  - </object>
  -</policy>
  -</ac>
  +<policy xmlns="http://apache.org/cocoon/lenya/ac/1.0">
  +
  +  <world>
  +    <role id="visitor"/>
  +  </world>
  +
  +</policy> 
  
  
  
  1.2       +10 -21    cocoon-lenya/src/webapp/lenya/pubs/oscom/config/ac/policies/editor-matrix.acml
  
  Index: editor-matrix.acml
  ===================================================================
  RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/oscom/config/ac/policies/editor-matrix.acml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- editor-matrix.acml	20 Dec 2002 00:08:11 -0000	1.1
  +++ editor-matrix.acml	17 Jul 2003 16:26:49 -0000	1.2
  @@ -1,23 +1,12 @@
   <?xml version="1.0"?>
  +<policy xmlns="http://apache.org/cocoon/lenya/ac/1.0">
   
  -<ac>
  -<request>
  -  <action name="read"/>
  -</request>
  -<policy>
  - <object match="/">
  -  <subjects>
  -    <group id="editor-matrix">
  -      <actions>
  -        <read/>
  -      </actions>
  -    </group>
  -    <group id="root">
  -      <actions>
  -        <read/>
  -      </actions>
  -    </group>
  -  </subjects>
  - </object>
  -</policy>
  -</ac>
  +  <group id="editormatrix">
  +    <role id="visitor"/>
  +  </group>
  +  
  +  <group id="root">
  +    <role id="visitor"/>
  +  </group>
  +
  +</policy> 
  
  
  
  1.2       +2 -1      cocoon-lenya/src/webapp/lenya/pubs/oscom/config/ac/passwd/tom.iml
  
  Index: tom.iml
  ===================================================================
  RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/oscom/config/ac/passwd/tom.iml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- tom.iml	2 Oct 2002 22:53:50 -0000	1.1
  +++ tom.iml	17 Jul 2003 16:26:49 -0000	1.2
  @@ -1,6 +1,7 @@
   <?xml version="1.0"?>
   
  -<identity id="tom">
  +<identity id="tom" class="org.apache.lenya.cms.ac.FileUser">
  +<email>info@lenya.org</email>
   <password type="md5">8e07dafd13495561db9063ebe4db4b27</password>
   <comment>Tom Weiss</comment>
   <!--
  
  
  
  1.4       +3 -2      cocoon-lenya/src/webapp/lenya/pubs/oscom/config/ac/passwd/paul.iml
  
  Index: paul.iml
  ===================================================================
  RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/oscom/config/ac/passwd/paul.iml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- paul.iml	20 Apr 2003 21:12:59 -0000	1.3
  +++ paul.iml	17 Jul 2003 16:26:49 -0000	1.4
  @@ -1,9 +1,10 @@
   <?xml version="1.0"?>
   
  -<identity id="paul">
  +<identity id="paul" class="org.apache.lenya.cms.ac.FileUser">
  +<email>info@lenya.org</email>
   <password type="md5">8e07dafd13495561db9063ebe4db4b27</password>
   <comment>Paul Browning</comment>
   <groups>
  -  <group>editor-matrix</group>
  +  <group>editormatrix</group>
   </groups>
   </identity>
  
  
  
  1.5       +2 -1      cocoon-lenya/src/webapp/lenya/pubs/oscom/config/ac/passwd/lenya.iml
  
  Index: lenya.iml
  ===================================================================
  RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/oscom/config/ac/passwd/lenya.iml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- lenya.iml	6 Mar 2003 20:46:54 -0000	1.4
  +++ lenya.iml	17 Jul 2003 16:26:49 -0000	1.5
  @@ -1,6 +1,7 @@
   <?xml version="1.0"?>
   
  -<identity id="lenya">
  +<identity id="lenya" class="org.apache.lenya.cms.ac.FileUser">
  +<email>info@lenya.org</email>
   <password type="md5">8e07dafd13495561db9063ebe4db4b27</password>
   <comment>Lenya</comment>
   <!--<expire year="2002" month="12" day="31"/>-->
  
  
  
  1.2       +2 -1      cocoon-lenya/src/webapp/lenya/pubs/oscom/config/ac/passwd/cocoon.iml
  
  Index: cocoon.iml
  ===================================================================
  RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/oscom/config/ac/passwd/cocoon.iml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- cocoon.iml	8 Dec 2002 22:31:54 -0000	1.1
  +++ cocoon.iml	17 Jul 2003 16:26:49 -0000	1.2
  @@ -1,6 +1,7 @@
   <?xml version="1.0"?>
   
  -<identity id="cocoon">
  +<identity id="cocoon" class="org.apache.lenya.cms.ac.FileUser">
  +<email>info@lenya.org</email>
   <password type="md5">8e07dafd13495561db9063ebe4db4b27</password>
   <comment>Cocoon</comment>
   </identity>
  
  
  
  1.1                  cocoon-lenya/src/webapp/lenya/pubs/oscom/config/ac/passwd/root.gml
  
  Index: root.gml
  ===================================================================
  <?xml version="1.0" encoding="UTF-8"?>
  <group class="org.apache.lenya.cms.ac.FileGroup" id="root"/>
  
  
  1.1                  cocoon-lenya/src/webapp/lenya/pubs/oscom/config/ac/passwd/editor.rml
  
  Index: editor.rml
  ===================================================================
  <?xml version="1.0" encoding="UTF-8"?>
  <role class="org.apache.lenya.cms.ac.FileRole" id="editor"/>
  
  
  1.1                  cocoon-lenya/src/webapp/lenya/pubs/oscom/config/ac/passwd/useradministrator.gml
  
  Index: useradministrator.gml
  ===================================================================
  <?xml version="1.0" encoding="UTF-8"?>
  <group class="org.apache.lenya.cms.ac.FileGroup" id="useradministrator"/>
  
  
  1.1                  cocoon-lenya/src/webapp/lenya/pubs/oscom/config/ac/passwd/editor.gml
  
  Index: editor.gml
  ===================================================================
  <?xml version="1.0" encoding="UTF-8"?>
  <group class="org.apache.lenya.cms.ac.FileGroup" id="editor"/>
  
  
  1.1                  cocoon-lenya/src/webapp/lenya/pubs/oscom/config/ac/passwd/matrix.gml
  
  Index: matrix.gml
  ===================================================================
  <?xml version="1.0" encoding="UTF-8"?>
  <group class="org.apache.lenya.cms.ac.FileGroup" id="matrix"/>
  
  
  1.1                  cocoon-lenya/src/webapp/lenya/pubs/oscom/config/ac/passwd/editormatrix.gml
  
  Index: editormatrix.gml
  ===================================================================
  <?xml version="1.0" encoding="UTF-8"?>
  <group class="org.apache.lenya.cms.ac.FileGroup" id="editormatrix"/>
  
  
  1.1                  cocoon-lenya/src/webapp/lenya/pubs/oscom/config/ac/passwd/administrator.gml
  
  Index: administrator.gml
  ===================================================================
  <?xml version="1.0" encoding="UTF-8"?>
  <group class="org.apache.lenya.cms.ac.FileGroup" id="administrator"/>
  
  
  1.1                  cocoon-lenya/src/webapp/lenya/pubs/oscom/config/ac/passwd/visitor.rml
  
  Index: visitor.rml
  ===================================================================
  <?xml version="1.0" encoding="UTF-8"?>
  <role class="org.apache.lenya.cms.ac.FileRole" id="visitor"/>
  
  
  1.2       +1 -1      cocoon-lenya/src/webapp/lenya/pubs/default/config/ac/ac.xconf
  
  Index: ac.xconf
  ===================================================================
  RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/default/config/ac/ac.xconf,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ac.xconf	14 Jul 2003 18:10:10 -0000	1.1
  +++ ac.xconf	17 Jul 2003 16:26:50 -0000	1.2
  @@ -2,6 +2,6 @@
   
   <access-controller type="publication-file">
     <accreditable-manager>
  -    <parameter name="directory" value="context:///lenya/pubs/unizh/config/ac/passwd"/>
  +    <parameter name="directory" value="context:///lenya/pubs/default/config/ac/passwd"/>
     </accreditable-manager>
   </access-controller>
  
  
  
  1.1                  cocoon-lenya/src/webapp/lenya/pubs/default/config/ac/policies/authoring/subtree-policy.acml
  
  Index: subtree-policy.acml
  ===================================================================
  <?xml version="1.0"?>
  <policy xmlns="http://apache.org/cocoon/lenya/ac/1.0">
  
    <group id="editor">
      <role id="editor"/>
    </group>
  
    <group id="reviewer">
      <role id="reviewer"/>
    </group>
  
  </policy> 
  
  
  
  1.102     +46 -623   cocoon-lenya/src/webapp/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: /home/cvs/cocoon-lenya/src/webapp/sitemap.xmap,v
  retrieving revision 1.101
  retrieving revision 1.102
  diff -u -r1.101 -r1.102
  --- sitemap.xmap	26 Jun 2003 10:35:31 -0000	1.101
  +++ sitemap.xmap	17 Jul 2003 16:26:50 -0000	1.102
  @@ -1,120 +1,18 @@
   <?xml version="1.0" encoding="UTF-8"?>
   <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
   
  -<!--+
  -    | This is the 'heart' of Cocoon. The sitemap maps URI space to 
  -    | resources. It consists basicaly of two parts: components and
  -    | pipelines. Pipelines are made out of components. There is such a
  -    | vast number of components available that it would be impossible to
  -    | describe them here, please refer to the accompanying
  -    | documentation. For specific components, have a look also at the
  -    | javadocs for them. Most pipelines are present to demonstrate some
  -    | feature or technique, often they are explained in more detail in 
  -    | the accompanying documentation.
  -    +-->
  -
   <!-- =========================== Components ================================ -->
   
    <map:components>
  -
  -  <!--+
  -      | All pipelines consist at least of two components: a generator, that
  -      | produces the content, and a serialiser, that delivers the content to
  -      | the client.
  -      | 
  -      | More precisely: a generator generates SAX events and a serializer
  -      | consumes these events and produces a byte stream.
  -      | 
  -      | Some things to note here: each generator has a unique name, this
  -      | name is mapped to a java class, one name is declared as default
  -      | generator. In addition each generator may have additional
  -      | configurations as child elements.
  -      | 
  -      | Additional attributes are targeted at the component manager. The optional
  -      | "label" attribute is relevant for the view concept below. The optional
  -      | "logger" attribute defines the logging category where messages produced
  -      | by a component should go. If there's no "logger" attribute, the category
  -      | used is the one defined for the "sitemap" component in cocoon.xconf.
  -      | 
  -      | We have chosen in this sitemap to use a different logging category
  -      | for each component, which allows fine-grained classification of log
  -      | messages. But you are free to use any category you want.
  -      | 
  -      | It is possible to have the same java class declared as different
  -      | generators by using different names. No configuration options are
  -      | shared between these instances, however.
  -      | 
  -      | All components follow this schema.
  -      +-->
  +   
     <map:generators default="file">
       <map:generator label="content,data" logger="sitemap.generator.file" name="file" pool-grow="4" pool-max="32" pool-min="8" src="org.apache.cocoon.generation.FileGenerator"/>
       <map:generator label="content,data" logger="sitemap.generator.file-nolabel" name="file-nolabel" pool-grow="4" pool-max="32" pool-min="8" src="org.apache.cocoon.generation.FileGenerator"/>
       <map:generator label="content,data" logger="sitemap.generator.serverpages" name="serverpages" pool-grow="2" pool-max="32" pool-min="4" src="org.apache.cocoon.generation.ServerPagesGenerator"/>
  -    <map:generator label="content,data" logger="sitemap.generator.directory" name="directory" pool-grow="2" pool-max="16" pool-min="2" src="org.apache.cocoon.generation.DirectoryGenerator"/>
  -    <map:generator label="content,data" logger="sitemap.generator.imagedirectory" name="imagedirectory" src="org.apache.cocoon.generation.ImageDirectoryGenerator"/>
  -    <map:generator label="data" logger="sitemap.generator.request" name="request" pool-grow="2" pool-max="16" pool-min="2" src="org.apache.cocoon.generation.RequestGenerator"/>
  -    <map:generator label="content,data" logger="sitemap.generator.stream" name="stream" pool-grow="2" pool-max="16" pool-min="1" src="org.apache.cocoon.generation.StreamGenerator"/>
  -    <map:generator label="data" logger="sitemap.generator.status" name="status" pool-grow="2" pool-max="16" pool-min="2" src="org.apache.cocoon.generation.StatusGenerator"/>
  -  
  -
  -   <map:generator label="data" logger="sitemap.generator.extractor" name="extractor" src="org.apache.cocoon.generation.FragmentExtractorGenerator"/>
  -
  -
  -    <map:generator label="content,data" name="auth-conf" src="org.apache.cocoon.webapps.authentication.generation.ConfigurationGenerator"/>
  -
  -
  -    <map:generator label="content,data" name="portal" src="org.apache.cocoon.webapps.portal.generation.PortalGenerator"/>
  -    <map:generator label="content,data" name="portal-conf" src="org.apache.cocoon.webapps.portal.generation.ConfigurationGenerator"/>
  -
  -    <map:generator label="content,data" name="jsp" src="org.apache.cocoon.generation.JspGenerator"/>
  -
  -    <map:generator label="content,data" name="php" src="org.apache.cocoon.generation.PhpGenerator"/>
  -
  -    <map:generator name="search" src="org.apache.cocoon.generation.SearchGenerator"/>
  -
  -    <map:generator label="content,data" name="html" src="org.apache.cocoon.generation.HTMLGenerator"/>
  -
  -    <map:generator label="content,data" name="script" src="org.apache.cocoon.generation.ScriptGenerator"/>
  -
  -    <map:generator label="content,data" logger="sitemap.generator.profiler" name="profiler" src="org.apache.cocoon.generation.ProfilerGenerator"/>
  -
  -    <map:generator label="content,data" logger="sitemap.generator.velocity" name="velocity" src="org.apache.cocoon.generation.VelocityGenerator"/>
  -
  -
  -    <map:generator label="content,data" logger="sitemap.generator.sourcedescription" name="sourcedescription" src="org.apache.cocoon.generation.SourceDescriptionGenerator"/>
  -
  -    <map:generator label="content,data" logger="sitemap.generator.principallist" name="principallist" src="org.apache.cocoon.generation.PrincipalListGenerator"/>
  -
  -    <map:generator label="content,data" logger="sitemap.generator.proxy" name="proxy" src="org.apache.cocoon.generation.HttpProxyGenerator"/>
  -
  -    <map:generator name="notifying" src="org.apache.cocoon.sitemap.NotifyingGenerator"/>
  -
  -    <!-- =================== XML:DB Generators ========================= -->
  -    <!-- BEWARE: these are unmaintained XML:DB generators, going to be   -->
  -    <!-- removed soon.                                                   -->
  -    <!-- You might want  to use the XML:DB pseudo protocol instead.      -->
  -    <map:generator label="content,data" name="xmldb" src="org.apache.cocoon.generation.XMLDBGenerator">
  -      <driver>org.apache.xindice.client.xmldb.DatabaseImpl</driver>
  -      <base>xmldb:xindice:///db/</base>
  -    </map:generator>
  -    <map:generator label="content,data" name="xmldbcollection" src="org.apache.cocoon.generation.XMLDBCollectionGenerator">
  -      <driver>org.apache.xindice.client.xmldb.DatabaseImpl</driver>
  -      <base>xmldb:xindice:///db/</base>
  -    </map:generator>
  -    
   <!-- =========================== Lenya CMS ================================= -->
  -    
       <map:generator name="servletproxy" src="org.apache.lenya.cms.cocoon.generation.ProxyGenerator"/>
  -</map:generators>
  +  </map:generators>
   
  -  <!--+
  -      | Transformers can be placed inside the pipeline between the generator
  -      | and the serializer. You may have as many transformers as you
  -      | like. Transformers consume SAX events and emmit SAX events.
  -      |
  -      | The "xslt" transformer is an example of a component with additional
  -      | configuration.
  -      +-->
     <map:transformers default="xslt">
   
       <map:transformer name="xlink" src="org.apache.lenya.cms.cocoon.transformation.IncludeTransformer">
  @@ -137,251 +35,51 @@
         <transformer-factory>org.apache.xalan.processor.TransformerFactoryImpl</transformer-factory>
       </map:transformer>
   
  -    <map:transformer logger="sitemap.transformer.xinclude" name="xinclude" pool-grow="2" pool-max="16" pool-min="2" src="org.apache.cocoon.transformation.XIncludeTransformer"/>
  -    <map:transformer logger="sitemap.transformer.cinclude" name="cinclude" pool-grow="2" pool-max="16" pool-min="2" src="org.apache.cocoon.transformation.CIncludeTransformer"/>
  -    <map:transformer logger="sitemap.transformer.encodeURL" name="encodeURL" src="org.apache.cocoon.transformation.EncodeURLTransformer"/>
  -    <map:transformer logger="sitemap.transformer.write-source" name="write-source" src="org.apache.cocoon.transformation.SourceWritingTransformer"/>
  -    <map:transformer logger="sitemap.transformer.jpath" name="jpath" src="org.apache.cocoon.transformation.JPathTransformer"/>
  -    <map:transformer logger="sitemap.transformer.filter" name="filter" src="org.apache.cocoon.transformation.FilterTransformer"/>
  -    <map:transformer logger="sitemap.transformer.writeDOMsession" name="writeDOMsession" src="org.apache.cocoon.transformation.WriteDOMSessionTransformer"/>
  -    <map:transformer logger="sitemap.transformer.readDOMsession" name="readDOMsession" src="org.apache.cocoon.transformation.ReadDOMSessionTransformer"/>
  -    <map:transformer logger="sitemap.transformer.log" name="log" pool-grow="2" pool-max="16" pool-min="2" src="org.apache.cocoon.transformation.LogTransformer"/>
  -  
  -
  -    <map:transformer logger="sitemap.transformer.extractor" name="extractor" src="org.apache.cocoon.transformation.FragmentExtractorTransformer"/>
  -
  -    <map:transformer logger="sitemap.transformer.lexer" name="lexer" src="org.apache.cocoon.transformation.LexicalTransformer"/>
  -    <map:transformer logger="sitemap.transformer.lexer" name="parser" src="org.apache.cocoon.transformation.ParserTransformer"/>
  -    <map:transformer logger="sitemap.transformer.lexer" name="pattern" src="org.apache.cocoon.transformation.PatternTransformer"/>
  -
  -
  -    <map:transformer name="session" pool-grow="4" pool-max="32" pool-min="8" src="org.apache.cocoon.webapps.session.transformation.SessionTransformer"/>
  -    <map:transformer name="session-pre" pool-grow="4" pool-max="32" pool-min="8" src="org.apache.cocoon.webapps.session.transformation.SessionPreTransformer"/>
  -    <map:transformer name="session-post" pool-grow="4" pool-max="32" pool-min="8" src="org.apache.cocoon.webapps.session.transformation.SessionPostTransformer"/>
  -    
  -    <map:transformer logger="sitemap.transformer.menufilter" name="menufilter" src="org.apache.lenya.cms.cocoon.transformation.WorkflowMenuTransformer"/>
  -
  -
  -   <map:transformer logger="sitemap.transformer.sql" name="sql" src="org.apache.cocoon.transformation.SQLTransformer"/>
  -
  -
  -    <map:transformer name="ldap" src="org.apache.cocoon.transformation.LDAPTransformer"/>
  +  </map:transformers>
   
  -
  -    <map:transformer logger="sitemap.transformer.deli" name="xslt" pool-grow="2" pool-max="32" pool-min="8" src="org.apache.cocoon.transformation.DeliTransformer">
  -      <use-request-parameters>false</use-request-parameters>
  -      <use-session-parameters>false</use-session-parameters>
  -      <use-cookie-parameters>false</use-cookie-parameters>
  -      <transformer-factory>org.apache.xalan.xsltc.trax.TransformerFactoryImpl</transformer-factory>
  -    </map:transformer>
  -
  -</map:transformers>
  -
  -  <!--+
  -      | Serializers consume SAX events and produce a character stream. Every
  -      | pipeline needs to be terminated by a serializer.
  -      +-->
     <map:serializers default="html">
       <map:serializer logger="sitemap.serializer.links" name="links" src="org.apache.cocoon.serialization.LinkSerializer"/>
       <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:serializer logger="sitemap.serializer.wml" mime-type="text/vnd.wap.wml" name="wml" src="org.apache.cocoon.serialization.XMLSerializer">
  -     <doctype-public>-//WAPFORUM//DTD WML 1.1//EN</doctype-public>
  -     <doctype-system>http://www.wapforum.org/DTD/wml_1.1.xml</doctype-system>
  -     <encoding>ASCII</encoding>
  -     <omit-xml-declaration>yes</omit-xml-declaration>
  -    </map:serializer>
  -    <map:serializer logger="sitemap.serializer.svgxml" mime-type="image/svg-xml" name="svgxml" src="org.apache.cocoon.serialization.XMLSerializer">
  -     <doctype-public>-//W3C//DTD SVG 20000303 Stylable//EN</doctype-public>
  -     <doctype-system>http://www.w3.org/TR/2000/03/WD-SVG-20000303/</doctype-system>
  -    </map:serializer>
       <map:serializer logger="sitemap.serializer.xhtml" mime-type="text/html" name="xhtml" pool-grow="2" pool-max="64" pool-min="2" src="org.apache.cocoon.serialization.XMLSerializer">
         <doctype-public>-//W3C//DTD XHTML 1.0 Strict//EN</doctype-public>
         <doctype-system>http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd</doctype-system>
         <encoding>UTF-8</encoding>
       </map:serializer>
       <map:serializer logger="sitemap.serializer.text" mime-type="text/plain" name="text" src="org.apache.cocoon.serialization.TextSerializer"/>
  -    <map:serializer logger="sitemap.serializer.vrml" mime-type="model/vrml" name="vrml" src="org.apache.cocoon.serialization.TextSerializer"/>
  -  
  -
  -    <map:serializer logger="sitemap.serializer.fo2pdf" mime-type="application/pdf" name="fo2pdf" src="org.apache.cocoon.serialization.FOPSerializer">
  -      <!-- This element specifies URL to FOP user configuration file.
  -           It can be absolute file URL or relative to the servlet context.
  -           Examples:
  -
  -      <user-config>file:/C:/cocoon/fop-config.xml</user-config>
  -      <user-config>WEB-INF/fop-config.xml</user-config>
  -      -->
  -
  -      <!-- Should serializer set content length header or not?
  -           Default is true.
  -      <set-content-length>true</set-content-length>
  -      -->
  -    </map:serializer>
  -
  -    <map:serializer logger="sitemap.serializer.fo2ps" mime-type="application/postscript" name="fo2ps" src="org.apache.cocoon.serialization.FOPSerializer"/>
  -
  -    <map:serializer logger="sitemap.serializer.fo2pcl" mime-type="vnd.hp-PCL" name="fo2pcl" src="org.apache.cocoon.serialization.FOPSerializer"/>
  -
  -   <map:serializer logger="sitemap.serializer.svgxml" mime-type="image/svg-xml" name="svgxml" src="org.apache.cocoon.serialization.XMLSerializer">
  -    <doctype-public>-//W3C//DTD SVG 20000303 Stylable//EN</doctype-public>
  -    <doctype-system>http://www.w3.org/TR/2000/03/WD-SVG-20000303/</doctype-system>
  -   </map:serializer>
  -
  -    <map:serializer logger="sitemap.serializer.svg2png" mime-type="image/jpeg" name="svg2jpeg" src="org.apache.cocoon.serialization.SVGSerializer">
  -      <parameter name="quality" type="float" value="0.9"/>
  -    </map:serializer>
  -
  -    <map:serializer logger="sitemap.serializer.svg2png" mime-type="image/png" name="svg2png" src="org.apache.cocoon.serialization.SVGSerializer"/>
  -
  -    <map:serializer mime-type="application/x-shockwave-flash" name="swf" src="org.apache.cocoon.serialization.SWFSerializer"/>
  +  </map:serializers>
   
  -    <map:serializer mime-type="application/msword" name="fo2rtf" src="org.apache.cocoon.serialization.RTFSerializer"/>
  -
  -    <map:serializer mime-type="application/pdf" name="itext2pdf" src="org.apache.cocoon.serialization.iTextSerializer"/>
  -
  - <map:serializer mime-type="application/vnd.ms-excel" name="xls" src="org.apache.cocoon.serialization.HSSFSerializer"/>
  -</map:serializers>
  -
  -  <!--+
  -      | Readers circumvent the XML oriented SAX pipeline model, think of a reader
  -      | being a generator and a serializer at once thus a pipeline may not
  -      | contain any generator, transformer or serializer in addition to a
  -      | reader. They are useful for delivering binary content like images.
  -      +-->
     <map:readers default="resource">
       <map:reader logger="sitemap.reader.resource" name="resource" pool-max="32" src="org.apache.cocoon.reading.ResourceReader"/>
  -  
  -    <map:reader name="jsp" src="org.apache.cocoon.reading.JSPReader"/>
  -</map:readers>
  +  </map:readers>
   
  -  <!--+
  -      | Matchers are executed during pipeline setup. They decide if a
  -      | pipeline fragment is used within a pipeline. Usually, the decision
  -      | is based on a match on the requested URI but matchers exist, that
  -      | match different things as well. Most often the fragment contained in
  -      | a matcher has a generator as well as a serializer. This is not a
  -      | necessity, matchers can be nested while chaining does not work.
  -      +-->
     <map:matchers default="wildcard">
       <map:matcher logger="sitemap.matcher.wildcard" name="wildcard" src="org.apache.cocoon.matching.WildcardURIMatcher"/>
       <map:matcher logger="sitemap.matcher.regexp" name="regexp" src="org.apache.cocoon.matching.RegexpURIMatcher"/>
       <map:matcher logger="sitemap.matcher.request-parameter" name="request-parameter" src="org.apache.cocoon.matching.RequestParameterMatcher"/>
  -    <map:matcher logger="sitemap.matcher.cookie" name="cookie" src="org.apache.cocoon.matching.CookieMatcher"/>
  -    <map:matcher logger="sitemap.matcher.header" name="header" src="org.apache.cocoon.matching.HeaderMatcher"/>
  -    <map:matcher logger="sitemap.matcher.parameter" name="parameter" src="org.apache.cocoon.matching.ParameterMatcher"/>
  -    <map:matcher logger="sitemap.matcher.sessionstate" name="sessionstate" src="org.apache.cocoon.matching.WildcardSessionAttributeMatcher">
  -      <attribute-name>org.apache.cocoon.SessionState</attribute-name>
  +    <map:matcher name="usecase" logger="sitemap.matcher.usecase" src="org.apache.cocoon.matching.WildcardRequestParameterMatcher">
  +      <parameter-name>lenya.usecase</parameter-name>
       </map:matcher>
  -    <map:matcher logger="sitemap.matcher.referer-match" name="referer-match" src="org.apache.cocoon.matching.WildcardHeaderMatcher">
  -      <header-name>referer</header-name>
  +    <map:matcher name="step" logger="sitemap.matcher.step" src="org.apache.cocoon.matching.WildcardRequestParameterMatcher">
  +      <parameter-name>lenya.step</parameter-name>
       </map:matcher>
  -      <map:matcher name="usecase" logger="sitemap.matcher.usecase" src="org.apache.cocoon.matching.WildcardRequestParameterMatcher">
  -        <parameter-name>lenya.usecase</parameter-name>
  -      </map:matcher>
  -      <map:matcher name="step" logger="sitemap.matcher.step" src="org.apache.cocoon.matching.WildcardRequestParameterMatcher">
  -        <parameter-name>lenya.step</parameter-name>
  -      </map:matcher>
     </map:matchers>
   
  -  <!--+
  -      | Selectors are executed during pipeline setup. They can be used to
  -      | determine which pipeline fragments should be combined. They are best
  -      | compared with a java switch statement.
  -      +-->
     <map:selectors default="browser">
  -   <map:selector logger="sitemap.selector.browser" name="browser" src="org.apache.cocoon.selection.BrowserSelector">
  -    <!--+
  -        | NOTE: The appearance indicates the search order. This is very important since
  -        |       some words may be found in more than one browser description. (MSIE is
  -        |       presented as "Mozilla/4.0 (Compatible; MSIE 4.01; ...")
  -        +-->
  -    <browser name="explorer" useragent="MSIE"/>
  -    <browser name="pocketexplorer" useragent="MSPIE"/>
  -    <browser name="handweb" useragent="HandHTTP"/>
  -    <browser name="avantgo" useragent="AvantGo"/>
  -    <browser name="imode" useragent="DoCoMo"/>
  -    <browser name="opera" useragent="Opera"/>
  -    <browser name="lynx" useragent="Lynx"/>
  -    <browser name="java" useragent="Java"/>
  -    <browser name="wap" useragent="Nokia"/>
  -    <browser name="wap" useragent="UP"/>
  -    <browser name="wap" useragent="Wapalizer"/>
  -    <browser name="mozilla5" useragent="Mozilla/5"/>
  -    <browser name="mozilla5" useragent="Netscape6/"/>
  -    <browser name="netscape" useragent="Mozilla"/>
  -   </map:selector>
      <map:selector logger="sitemap.selector.request-parameter" name="request-parameter" src="org.apache.cocoon.selection.RequestParameterSelector">
       <!-- Define now which request parameter to use; or do it later,
            when using this selector, via "parameter-name" parameter.
       <parameter-name>myparam</parameter-name> 
       -->
      </map:selector>
  -   <map:selector logger="sitemap.selector.request-attribute" name="request-attribute" src="org.apache.cocoon.selection.RequestAttributeSelector">
  -    <!-- <attribute-name>myparam</attribute-name> -->
  -   </map:selector>
  -   <map:selector logger="sitemap.selector.session-attribute" name="session-attribute" src="org.apache.cocoon.selection.SessionAttributeSelector">
  -    <!-- <attribute-name>myparam</attribute-name> -->
  -   </map:selector>
  -   <map:selector logger="sitemap.selector.parameter" name="parameter" src="org.apache.cocoon.selection.ParameterSelector"/>
  -   <map:selector logger="sitemap.selector.header" name="header" src="org.apache.cocoon.selection.HeaderSelector">
  -    <!-- <header-name>myparam</header-name> -->
  -   </map:selector>
  -   <map:selector logger="sitemap.selector.host" name="host" src="org.apache.cocoon.selection.HostSelector"/>
  +   
      <map:selector logger="sitemap.selector.resource-exists" name="resource-exists" src="org.apache.cocoon.selection.ResourceExistsSelector"/>
  -  
  -
  -<!-- FIXME: Cocoon M1 -->
  -<!--
  -    <map:selector name="auth-media" src="org.apache.cocoon.webapps.authentication.selection.MediaSelector"/>
  --->
  -<!-- FIXME: Latest Cocoon CVS -->
  -<!--
  -    <map:selector name="auth-media" src="org.apache.cocoon.webapps.session.selection.MediaSelector"/>
  --->
   </map:selectors>
   
  -  <!--+
  -      | Actions are executed during pipeline setup. Their purpose is to
  -      | execute some code that doesn't involve touching the stream of
  -      | pipeline events. Example usage is to update databases, check external 
  -      | resources, etc.. The execution may fail or complete successfully. Only 
  -      | if the execution of the action was successful, the pipeline fragment 
  -      | nested inside the action element is executed, otherwise, it's skipped
  -      | entirely and execution proceeds from the element right below the action.
  -      +-->
     <map:actions>
      <map:action logger="sitemap.action.request" name="request" src="org.apache.cocoon.acting.RequestParamAction"/>
  -   <map:action logger="sitemap.action.form-validator" name="form-validator" src="org.apache.cocoon.acting.FormValidatorAction"/>
  -   <map:action logger="sitemap.action.session-state" name="session-state" src="org.apache.cocoon.acting.SessionStateAction"/>
  -   <map:action logger="sitemap.action.session-propagator" name="session-propagator" src="org.apache.cocoon.acting.SessionPropagatorAction"/>
  -   <map:action logger="sitemap.action.session-isvalid" name="session-isvalid" src="org.apache.cocoon.acting.SessionIsValidAction"/>
  -   <map:action logger="sitemap.action.resource-exists" name="resource-exists" src="org.apache.cocoon.acting.ResourceExistsAction"/>
  -   <map:action logger="sitemap.action.set-header" name="set-header" src="org.apache.cocoon.acting.HttpHeaderAction"/>
  -   <map:action logger="sitemap.action.clear-cache" name="clear-cache" src="org.apache.cocoon.acting.ClearCacheAction"/>
  -   <map:action logger="sitemap.action.clear-persistent-store" name="clear-persistent-store" src="org.apache.cocoon.acting.ClearPersistentStoreAction"/>
  -  
  -
  -    <map:action name="session" src="org.apache.cocoon.webapps.session.acting.SessionAction"/>
  -
  -    <map:action name="session-form" src="org.apache.cocoon.webapps.session.acting.SessionFormAction"/>
  -
  -
  -    <map:action name="auth-protect" src="org.apache.cocoon.webapps.authentication.acting.AuthAction"/>
  -    <map:action name="auth-login" src="org.apache.cocoon.webapps.authentication.acting.LoginAction"/>
  -    <map:action name="auth-logout" src="org.apache.cocoon.webapps.authentication.acting.LogoutAction"/>
  -    <map:action name="auth-loggedIn" src="org.apache.cocoon.webapps.authentication.acting.LoggedInAction"/>
  -
  -
  -    <map:action name="portal-auth" src="org.apache.cocoon.webapps.portal.acting.AuthAction"/>
  -
  -
  -   <map:action logger="sitemap.action.source" name="source" src="org.apache.cocoon.acting.SourceMultiAction"/>
  -
  -   <map:action logger="sitemap.action.principal" name="principal" src="org.apache.cocoon.acting.PrincipalMultiAction"/>
  -
   
   <!-- =========================== Lenya CMS ================================= -->
   
  @@ -423,45 +121,12 @@
         <map:action logger="sitemap.action.multipart" name="multipart" src="org.apache.lenya.cms.cocoon.acting.MultipartHttpServletRequestAction"/>
   
         <map:action logger="sitemap.action.resource-exists-enhanced" name="resource-exists-enhanced" src="org.apache.lenya.cms.cocoon.acting.ResourceExistsAction"/>
  +      
  +      <map:action name="authorizer" src="org.apache.lenya.cms.cocoon.acting.DelegatingAuthorizerAction" logger="lenya.sitemap.action.authorizer"/>
  +      <map:action name="authenticator" src="org.apache.lenya.cms.cocoon.acting.DelegatingAuthenticatorAction" logger="lenya.sitemap.action.authenticator"/>
  +      
      </map:actions>
   
  -  <!--+
  -      | The different pipe implementations
  -      | 
  -      | NON-CACHING:
  -      |   The non caching implementation of cocoon pipelines.
  -      | 
  -      | CACHING:
  -      |   Traditional longest cachable key caching.
  -      | 
  -      | CACHING-POINT:
  -      |   The caching-point pipeline implements an extended             
  -      |   caching algorithm which is of particular benefit for use with 
  -      |   those pipelines that utilise cocoon-views and/or provide      
  -      |   drill-down functionality.                                     
  -      | 
  -      | The autoCachingPoint algorithim (if enabled) will automatically
  -      | cache common elements of the pipeline currently being processed - as well
  -      | as the entire cachable pipeline according to the "longest cachable key"
  -      | algorithm.
  -      | 
  -      | Consider the following simple pipeline, where generator G is labelled with
  -      | a cocoon-view enabling the pipeline to serialize data to either html or pdf 
  -      | depending on the value of cocoon-view (as provided by the request):
  -      | G - T -  S(html)
  -      | |__ T -  S(pdf)
  -      | 
  -      | If cocoon-view=html, then the caching-point algorithm will not only cache 
  -      | the longest cachable path, which would be GTS(html) but also the
  -      | *common element* which in this case would be the results from G. If the
  -      | next request to this pipeline was cocoon-view=pdf, then there would be no
  -      | need to invoke the generator a second time, as it's value has already been
  -      | cached (provided G generates the same cache key)
  -      | 
  -      | Also note: One can switch "Off" autoCachingPoint and use "pipeline-hints" to
  -      | manually indicate that certain pipeline-components should be considered as
  -      | cache points.
  -      +-->
      <map:pipes default="caching">
        <map:pipe name="caching" src="org.apache.cocoon.components.pipeline.impl.CachingProcessingPipeline"/>
        <map:pipe name="caching-point" src="org.apache.cocoon.components.pipeline.impl.CachingPointProcessingPipeline">
  @@ -512,21 +177,8 @@
   
   <!-- =========================== Resources ================================= -->
   
  -  <!--+
  -      | Resources are pipeline fragments that may be used from different
  -      | pipeline fragments. For our needs, they behave exactly like
  -      | pipelines, only that they are not accessible from outside.
  -      | Hence I will explain what's inside below for pipelines.
  -      +-->
     <map:resources>
   
  -    <map:resource name="navigation">
  -      <map:generate src="lenya/pubs/{pub_id}/content/live/sitetree.xml" />
  -      <map:transform src="lenya/xslt/util/sitetree2navigation.xsl">
  -        <map:parameter name="nav_id" value="{nav_id}"/>
  -      </map:transform>
  -    </map:resource>
  -   
       <map:resource name="style-cms-page">
         <map:transform src="lenya/xslt/util/page2xhtml.xsl">
           <map:parameter name="contextprefix" value="{request:contextPath}"/>
  @@ -536,285 +188,56 @@
      
    </map:resources>
   
  -<!-- ========================== Action sets ================================ -->
  -
  - <!--+
  -     | Action sets group actions together. If some actions are often used
  -     | together in pipeline fragments, it's easier to group them and refer
  -     | to the group. For more info, please see the docs.
  -     +-->
  -  <map:action-sets>
  -  </map:action-sets>
  -
   <!-- =========================== Pipelines ================================= -->
   
  - <!--+
  -     | Pipelines. The beef. Pipelines specify how the processing of your
  -     | content is done. Usually, a pipeline consists of several fragments
  -     | that specify the generation, transformation, and serialization of
  -     | SAX events.
  -     |
  -     | Processing is done in two steps:
  -     |
  -     | 1) The top level elements are executed in order of appearance until
  -     |    one signals success. These top level elements are usually
  -     |    matchers.
  -     |
  -     |    Other components are called depth-first to determine what
  -     |    fragments make up the processing pipeline. When a component
  -     |    fails, no nested components are called but the next component on
  -     |    the same level.
  -     |
  -     | 2) Once it is determined which generator, which transformers and
  -     |    wich serializer is used, these components are executed. During
  -     |    this, the pipeline may not be changed.
  -     |
  -     | You may have as many pipelines in your sitemap as you like.
  -     +-->
  - <map:pipelines>
  -
  -  <map:component-configurations>
  -    <global-variables>
  -       <!--+
  -           | Define global parameters here:
  -           |   <skin>my_skin</skin>
  -           |   ...
  -           | You can access them by {global:*name*}, e.g. {global:skin}.
  -           | These values are inherited into sub-sitemaps and can
  -           | be extended there.
  -           +-->
  -    </global-variables>
  -  </map:component-configurations>
  -
  -
  -
  -<!-- =========================== Lenya CMS ================================= -->
  -
  -
  -<!-- =========================== Actions ================================= -->
  -
  -<!-- FIXME: move generic actions out of publication sitemaps, and offer overriding
  -     capabilities. -->
  -
  -<!-- =========================== Pipelines ================================= -->
  -
  -    <map:pipeline>
  -      <map:match pattern="publications.xml">
  -        <map:generate type="directory" src="lenya/pubs"/>
  -        <map:transform src="lenya/xslt/util/xinclude.xsl"/>
  -        <map:transform type="xlink">
  -          <map:parameter name="href" value="lenya/pubs/dummy.xml"/>
  -        </map:transform>
  -        <map:serialize type="xml"/>
  -      </map:match>
  -    </map:pipeline>
  -
  -    <map:pipeline>
  -      <map:match pattern="">
  -        <map:redirect-to uri="index.html"/>
  -      </map:match>
  -      <map:match pattern="index.html">
  -        <map:aggregate element="lenya" ns="http://lenya.org/2003/publication" prefix="lenya" label="aggregate">
  -          <map:part src="cocoon:/publications.xml"/>
  -          <map:part src="lenya/content/introduction.xml"/>
  -        </map:aggregate>
  -        <map:transform src="lenya/xslt/util/welcome.xsl"/>
  -        <map:call resource="style-cms-page"/>
  -      </map:match>
  -    </map:pipeline>
  -
  -    <!-- Search with Lucene -->
  -    <map:pipeline>
  -      <map:match pattern="lucene/**">
  -        <map:mount uri-prefix="lucene" src="lenya/lucene.xmap" check-reload="true" reload-method="synchron"/>
  -      </map:match>
  -      <map:match pattern="*/search/lucene">
  -        <map:generate type="serverpages" src="lenya/content/search/search-and-results.xsp">
  -          <map:parameter name="max-hits-per-page" value="3"/>
  -          <map:parameter name="max-pages" value="7"/>
  -          <map:parameter name="number-of-pubs" value="1"/>
  -          <map:parameter name="pub0-id" value="{1}"/>
  -          <map:parameter name="pub0-name" value="{1}"/>
  -          <map:parameter name="pub0-index-dir" value="lenya/pubs/{1}/work/search/lucene/index/index"/>
  -          <map:parameter name="pub0-excerpt-dir" value="lenya/pubs/{1}/work/search/lucene/htdocs_dump"/>
  -          <map:parameter name="pub0-prefix" value=""/>
  -        </map:generate>
  -        <map:transform src="lenya/xslt/search/sort.xsl"/>
  -        
  -        <map:act type="resource-exists" src="lenya/pubs/{1}/lenya/xslt/search/search-and-results.xsl">
  -          <map:transform src="lenya/pubs/{../1}/lenya/xslt/search/search-and-results.xsl"/>
  -          <map:serialize type="html"/>
  -        </map:act>
  -        <map:transform src="lenya/xslt/search/search-and-results.xsl"/>
  -        <map:serialize type="html"/>
  -      </map:match>
  -      <map:handle-errors type="500">
  -        <map:serialize type="xml"/>
  -      </map:handle-errors>
  -    </map:pipeline>
  -    <!-- /Search with Lucene -->
  -
  -
  -
  -    <map:pipeline>
  -      <!-- Editor Xopus -->
  -      <map:match pattern="xopus/**">
  -        <map:mount uri-prefix="xopus" src="lenya/xopus.xmap" check-reload="true" reload-method="synchron"/>
  -      </map:match>
  -
  -
  -      <!-- Editor Bitflux -->
  -      <map:match pattern="bitflux/**">
  -        <map:mount uri-prefix="bitflux" src="lenya/bitflux.xmap" check-reload="true" reload-method="synchron"/>
  -      </map:match>
  -    </map:pipeline>
  +  <map:pipelines>
   
       <map:pipeline>
  -    
  -      <!-- Lenya GUI -->
  -      <map:match pattern="lenya/**">
  -        <map:mount uri-prefix="lenya" src="lenya/lenya.xmap" check-reload="true" reload-method="synchron"/>
  -      </map:match>
         
  -      <!-- navigation -->
  -      <map:match pattern="navigation/**">
  -        <map:mount uri-prefix="navigation" src="lenya/navigation.xmap" check-reload="true" reload-method="synchron"/>
  -      </map:match>
  -
  -      <!-- uri-parameter/{publication-id}/{parameter}/{area}/{uri} -->
  -      <map:match pattern="uri-parameter/*/*/*/**">
  -        <map:mount uri-prefix="uri-parameter/{1}/{2}/" src="lenya/pubs/{1}/parameter-{2}.xmap" check-reload="true" reload-method="synchron"/>
  -      </map:match>
  -
  -
  -      <!-- Edit XHTML with Midas -->
  -      <map:pipeline>
  -        <map:match pattern="default/authoring/sugus">
  -          <map:act type="multipart">
  -            <map:read src="lenya/resources/misc/midas/midas.html" mime-type="text/html"/>
  -          </map:act>
  -          <map:read src="lenya/resources/misc/midas/midas_files/content.html" mime-type="text/html"/>
  -        </map:match>
  -
  -        <map:match type="usecase" pattern="midas">
  -          <map:match type="step" pattern="open">
  -            <map:generate src="lenya/pubs/default/content/authoring/tutorial/index.xml"/>
  -            <map:transform src="lenya/resources/misc/midas/midas.xsl"/>
  -            <map:serialize type="html"/>
  -          </map:match>
  -<!--
  -          <map:match type="step" pattern="save">
  -            <map:act type="multipart">
  -              <map:read src="lenya/resources/misc/midas/midas.html" mime-type="text/html"/>
  -            </map:act>
  -            <map:read src="lenya/resources/misc/midas/midas_files/content.html" mime-type="text/html"/>
  -          </map:match>
  --->
  -        </map:match>
  -        <map:match pattern="**/midas_content/**">
  -          <map:generate src="lenya/pubs/default/content/authoring/tutorial/index.xml"/>
  -          <map:transform src="lenya/resources/misc/midas/remove_dtd.xsl"/>
  -          <map:serialize type="html"/>
  -        </map:match>
  -        <map:match pattern="**/midas_files/**">
  -          <map:read src="lenya/resources/misc/midas/midas_files/{2}"/>
  +      <map:match  type="usecase" pattern="login">
  +        
  +        <map:match type="step" pattern="showscreen">
  +          <map:generate type="serverpages" src="lenya/content/ac/login.xsp"/>
  +          <map:transform src="lenya/xslt/ac/login.xsl">
  +            <map:parameter name="publication_name" value="Unknown Publication"/>
  +          </map:transform>
  +          <map:call resource="style-cms-page"/>
           </map:match>
  -
  -        <map:handle-errors type="500">
  -          <map:serialize type="xml"/>
  -        </map:handle-errors>
  -      </map:pipeline>
  -      <!-- /Edit XHTML with Midas -->
  -
  -
  -      <!-- Usecases -->
  -      <map:pipeline>
  -        <map:match type="usecase" pattern="*">
  -          <map:mount uri-prefix="" src="lenya/usecase.xmap" check-reload="true" reload-method="synchron"/>
  +        
  +        <map:match type="step" pattern="login">
  +          <map:act type="authenticator">
  +            <map:redirect-to uri="{request:requestURI}" session="true"/>
  +          </map:act>
  +          <map:redirect-to uri="{request:requestURI}?lenya.usecase=login&amp;lenya.step=showscreen&amp;status=failed" session="true"/>
           </map:match>
  -      </map:pipeline>
  -
  -
  -      <!-- Publications -->
  -<!-- FIXME: Some publications still use "" and "index.html" as live entry point -->
  -<!--
  -      <map:match pattern="*/">
  -        <map:redirect-to uri="introduction.html"/>
  -      </map:match>
  -      <map:match pattern="*/index.html">
  -        <map:redirect-to uri="introduction.html"/>
  -      </map:match>
  --->
  -      <!-- About Publication -->
  -      <map:match pattern="*/introduction.html">
  -        <map:generate src="lenya/pubs/{1}/publication.xml" />
  -        <map:transform src="lenya/xslt/util/publication.xsl"/>
  -        <map:call resource="style-cms-page"/>
  -      </map:match>
  -
  -      <!-- Navigation -->
  -      <map:match pattern="*/navigation_id*.xml">
  -        <map:call resource="navigation">
  -          <map:parameter name="pub_id" value="{1}"/>
  -          <map:parameter name="nav_id" value="{2}"/>
  -        </map:call>
  -        <map:serialize type="xml" />
  -      </map:match>
  -      <map:match pattern="*/navigation_id*.html">
  -        <map:call resource="navigation">
  -          <map:parameter name="pub_id" value="{1}"/>
  -          <map:parameter name="nav_id" value="{2}"/>
  -        </map:call>
  -        <map:transform src="lenya/xslt/util/navigation2html.xsl"/>
  -        <map:serialize type="html" />
  -      </map:match>
  -      
  -      <!-- Enter the actual publication (url = "") -->
  -      <map:match pattern="*/">
  -        <map:mount uri-prefix="{1}" src="lenya/pubs/{1}/sitemap.xmap" check-reload="true" reload-method="synchron"/>
  -      </map:match>
  -      
  -      <!-- Resources -->
  -      
  -      <!-- {publication-id}/{area}/{file} -->
  -      <map:match pattern="*/*/**">
  -        <map:act type="resource-exists-enhanced">
  -          <map:parameter name="url" value="lenya/pubs/{1}/resources/{3}"/>
  -          <map:parameter name="type" value="file"/>
  -          <map:mount uri-prefix="" src="lenya/resources.xmap" check-reload="true" reload-method="synchron"/>
  -        </map:act>
  +        
         </map:match>
         
  -      <!-- lenya/{file} -->
  -      <map:match pattern="lenya/**">
  -        <map:act type="resource-exists">
  -          <map:parameter name="url" value="lenya/resources/{1}"/>
  -          <map:mount uri-prefix="" src="lenya/resources.xmap" check-reload="true" reload-method="synchron"/>
  -        </map:act>
  +      <map:match type="usecase" pattern="logout">
  +        <map:generate type="serverpages" src="lenya/content/ac/logout.xsp"/>
  +        <map:transform src="lenya/xslt/ac/logout.xsl">
  +          <map:parameter name="publication_name" value="Unknown Publication"/>
  +        </map:transform>
  +        <map:serialize/>
         </map:match>
   
  -    <!-- Admin Area -->
  -    <map:pipeline>
  -      <map:match pattern="*/admin/**">
  -        <map:mount uri-prefix="{1}/admin" src="lenya/admin.xmap" check-reload="true" reload-method="synchron"/>
  -      </map:match>
       </map:pipeline>
   
  -    <!-- Info Area -->
  -    <map:pipeline>
  -      <map:match pattern="*/info/**">
  -        <map:mount uri-prefix="{1}/info" src="lenya/info.xmap" check-reload="true" reload-method="synchron"/>
  +    <map:pipeline internal-only="true">
  +      <map:match pattern="**">
  +        <map:mount uri-prefix="" src="global-sitemap.xmap" check-reload="true" reload-method="synchron"/>
         </map:match>
       </map:pipeline>
         
  -      <!-- Enter the actual publication -->
  -      <map:match pattern="*/**">
  -        <map:mount uri-prefix="{1}" src="lenya/pubs/{1}/sitemap.xmap" check-reload="true" reload-method="synchron"/>
  +    <map:pipeline>
  +      <map:match pattern="**">
  +        <map:act type="authorizer">
  +          <map:mount uri-prefix="" src="global-sitemap.xmap" check-reload="true" reload-method="synchron"/>
  +        </map:act>
  +        <map:redirect-to uri="{request:requestURI}?lenya.usecase=login&amp;lenya.step=showscreen" session="true"/>
         </map:match>
       </map:pipeline>
   
  -
  -
  - </map:pipelines>
  +  </map:pipelines>
   
   </map:sitemap>
  
  
  
  1.1                  cocoon-lenya/src/webapp/global-sitemap.xmap
  
  Index: global-sitemap.xmap
  ===================================================================
  <?xml version="1.0" encoding="UTF-8"?>
  <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
  
  <!--+
      | This is the 'heart' of Cocoon. The sitemap maps URI space to 
      | resources. It consists basicaly of two parts: components and
      | pipelines. Pipelines are made out of components. There is such a
      | vast number of components available that it would be impossible to
      | describe them here, please refer to the accompanying
      | documentation. For specific components, have a look also at the
      | javadocs for them. Most pipelines are present to demonstrate some
      | feature or technique, often they are explained in more detail in 
      | the accompanying documentation.
      +-->
  
  <!-- =========================== Components ================================ -->
  
   <map:components>
  
    <!--+
        | All pipelines consist at least of two components: a generator, that
        | produces the content, and a serialiser, that delivers the content to
        | the client.
        | 
        | More precisely: a generator generates SAX events and a serializer
        | consumes these events and produces a byte stream.
        | 
        | Some things to note here: each generator has a unique name, this
        | name is mapped to a java class, one name is declared as default
        | generator. In addition each generator may have additional
        | configurations as child elements.
        | 
        | Additional attributes are targeted at the component manager. The optional
        | "label" attribute is relevant for the view concept below. The optional
        | "logger" attribute defines the logging category where messages produced
        | by a component should go. If there's no "logger" attribute, the category
        | used is the one defined for the "sitemap" component in cocoon.xconf.
        | 
        | We have chosen in this sitemap to use a different logging category
        | for each component, which allows fine-grained classification of log
        | messages. But you are free to use any category you want.
        | 
        | It is possible to have the same java class declared as different
        | generators by using different names. No configuration options are
        | shared between these instances, however.
        | 
        | All components follow this schema.
        +-->
    <map:generators default="file">
      <map:generator label="content,data" logger="sitemap.generator.file" name="file" pool-grow="4" pool-max="32" pool-min="8" src="org.apache.cocoon.generation.FileGenerator"/>
      <map:generator label="content,data" logger="sitemap.generator.file-nolabel" name="file-nolabel" pool-grow="4" pool-max="32" pool-min="8" src="org.apache.cocoon.generation.FileGenerator"/>
      <map:generator label="content,data" logger="sitemap.generator.serverpages" name="serverpages" pool-grow="2" pool-max="32" pool-min="4" src="org.apache.cocoon.generation.ServerPagesGenerator"/>
      <map:generator label="content,data" logger="sitemap.generator.directory" name="directory" pool-grow="2" pool-max="16" pool-min="2" src="org.apache.cocoon.generation.DirectoryGenerator"/>
      <map:generator label="content,data" logger="sitemap.generator.imagedirectory" name="imagedirectory" src="org.apache.cocoon.generation.ImageDirectoryGenerator"/>
      <map:generator label="data" logger="sitemap.generator.request" name="request" pool-grow="2" pool-max="16" pool-min="2" src="org.apache.cocoon.generation.RequestGenerator"/>
      <map:generator label="content,data" logger="sitemap.generator.stream" name="stream" pool-grow="2" pool-max="16" pool-min="1" src="org.apache.cocoon.generation.StreamGenerator"/>
      <map:generator label="data" logger="sitemap.generator.status" name="status" pool-grow="2" pool-max="16" pool-min="2" src="org.apache.cocoon.generation.StatusGenerator"/>
    
  
     <map:generator label="data" logger="sitemap.generator.extractor" name="extractor" src="org.apache.cocoon.generation.FragmentExtractorGenerator"/>
  
  
      <map:generator label="content,data" name="auth-conf" src="org.apache.cocoon.webapps.authentication.generation.ConfigurationGenerator"/>
  
  
      <map:generator label="content,data" name="portal" src="org.apache.cocoon.webapps.portal.generation.PortalGenerator"/>
      <map:generator label="content,data" name="portal-conf" src="org.apache.cocoon.webapps.portal.generation.ConfigurationGenerator"/>
  
      <map:generator label="content,data" name="jsp" src="org.apache.cocoon.generation.JspGenerator"/>
  
      <map:generator label="content,data" name="php" src="org.apache.cocoon.generation.PhpGenerator"/>
  
      <map:generator name="search" src="org.apache.cocoon.generation.SearchGenerator"/>
  
      <map:generator label="content,data" name="html" src="org.apache.cocoon.generation.HTMLGenerator"/>
  
      <map:generator label="content,data" name="script" src="org.apache.cocoon.generation.ScriptGenerator"/>
  
      <map:generator label="content,data" logger="sitemap.generator.profiler" name="profiler" src="org.apache.cocoon.generation.ProfilerGenerator"/>
  
      <map:generator label="content,data" logger="sitemap.generator.velocity" name="velocity" src="org.apache.cocoon.generation.VelocityGenerator"/>
  
  
      <map:generator label="content,data" logger="sitemap.generator.sourcedescription" name="sourcedescription" src="org.apache.cocoon.generation.SourceDescriptionGenerator"/>
  
      <map:generator label="content,data" logger="sitemap.generator.principallist" name="principallist" src="org.apache.cocoon.generation.PrincipalListGenerator"/>
  
      <map:generator label="content,data" logger="sitemap.generator.proxy" name="proxy" src="org.apache.cocoon.generation.HttpProxyGenerator"/>
  
      <map:generator name="notifying" src="org.apache.cocoon.sitemap.NotifyingGenerator"/>
  
      <!-- =================== XML:DB Generators ========================= -->
      <!-- BEWARE: these are unmaintained XML:DB generators, going to be   -->
      <!-- removed soon.                                                   -->
      <!-- You might want  to use the XML:DB pseudo protocol instead.      -->
      <map:generator label="content,data" name="xmldb" src="org.apache.cocoon.generation.XMLDBGenerator">
        <driver>org.apache.xindice.client.xmldb.DatabaseImpl</driver>
        <base>xmldb:xindice:///db/</base>
      </map:generator>
      <map:generator label="content,data" name="xmldbcollection" src="org.apache.cocoon.generation.XMLDBCollectionGenerator">
        <driver>org.apache.xindice.client.xmldb.DatabaseImpl</driver>
        <base>xmldb:xindice:///db/</base>
      </map:generator>
      
  <!-- =========================== Lenya CMS ================================= -->
      
      <map:generator name="servletproxy" src="org.apache.lenya.cms.cocoon.generation.ProxyGenerator"/>
  </map:generators>
  
    <!--+
        | Transformers can be placed inside the pipeline between the generator
        | and the serializer. You may have as many transformers as you
        | like. Transformers consume SAX events and emmit SAX events.
        |
        | The "xslt" transformer is an example of a component with additional
        | configuration.
        +-->
    <map:transformers default="xslt">
  
      <map:transformer name="xlink" src="org.apache.lenya.cms.cocoon.transformation.IncludeTransformer">
        <publication type=""/>
      </map:transformer>
  
      <!-- NOTE: XSLTC is now the default processor. If you use Xalan extensions, use the "xalan" transformer. -->
      <map:transformer logger="sitemap.transformer.xslt" name="xslt" pool-grow="2" pool-max="32" pool-min="8" src="org.apache.cocoon.transformation.TraxTransformer">
        <use-request-parameters>false</use-request-parameters>
        <use-session-parameters>false</use-session-parameters>
        <use-cookie-parameters>false</use-cookie-parameters>
        <transformer-factory>org.apache.xalan.xsltc.trax.TransformerFactoryImpl</transformer-factory>
      </map:transformer>
  
      <!-- NOTE: This used to be the default XSLT processor. The default now is XSLTC -->
      <map:transformer logger="sitemap.transformer.xalan" name="xalan" pool-grow="2" pool-max="32" pool-min="8" src="org.apache.cocoon.transformation.TraxTransformer">
        <use-request-parameters>false</use-request-parameters>
        <use-session-parameters>false</use-session-parameters>
        <use-cookie-parameters>false</use-cookie-parameters>
        <transformer-factory>org.apache.xalan.processor.TransformerFactoryImpl</transformer-factory>
      </map:transformer>
  
      <map:transformer logger="sitemap.transformer.xinclude" name="xinclude" pool-grow="2" pool-max="16" pool-min="2" src="org.apache.cocoon.transformation.XIncludeTransformer"/>
      <map:transformer logger="sitemap.transformer.cinclude" name="cinclude" pool-grow="2" pool-max="16" pool-min="2" src="org.apache.cocoon.transformation.CIncludeTransformer"/>
      <map:transformer logger="sitemap.transformer.encodeURL" name="encodeURL" src="org.apache.cocoon.transformation.EncodeURLTransformer"/>
      <map:transformer logger="sitemap.transformer.write-source" name="write-source" src="org.apache.cocoon.transformation.SourceWritingTransformer"/>
      <map:transformer logger="sitemap.transformer.jpath" name="jpath" src="org.apache.cocoon.transformation.JPathTransformer"/>
      <map:transformer logger="sitemap.transformer.filter" name="filter" src="org.apache.cocoon.transformation.FilterTransformer"/>
      <map:transformer logger="sitemap.transformer.writeDOMsession" name="writeDOMsession" src="org.apache.cocoon.transformation.WriteDOMSessionTransformer"/>
      <map:transformer logger="sitemap.transformer.readDOMsession" name="readDOMsession" src="org.apache.cocoon.transformation.ReadDOMSessionTransformer"/>
      <map:transformer logger="sitemap.transformer.log" name="log" pool-grow="2" pool-max="16" pool-min="2" src="org.apache.cocoon.transformation.LogTransformer"/>
    
  
      <map:transformer logger="sitemap.transformer.extractor" name="extractor" src="org.apache.cocoon.transformation.FragmentExtractorTransformer"/>
  
      <map:transformer logger="sitemap.transformer.lexer" name="lexer" src="org.apache.cocoon.transformation.LexicalTransformer"/>
      <map:transformer logger="sitemap.transformer.lexer" name="parser" src="org.apache.cocoon.transformation.ParserTransformer"/>
      <map:transformer logger="sitemap.transformer.lexer" name="pattern" src="org.apache.cocoon.transformation.PatternTransformer"/>
  
  
      <map:transformer name="session" pool-grow="4" pool-max="32" pool-min="8" src="org.apache.cocoon.webapps.session.transformation.SessionTransformer"/>
      <map:transformer name="session-pre" pool-grow="4" pool-max="32" pool-min="8" src="org.apache.cocoon.webapps.session.transformation.SessionPreTransformer"/>
      <map:transformer name="session-post" pool-grow="4" pool-max="32" pool-min="8" src="org.apache.cocoon.webapps.session.transformation.SessionPostTransformer"/>
      
      <map:transformer logger="sitemap.transformer.menufilter" name="menufilter" src="org.apache.lenya.cms.cocoon.transformation.WorkflowMenuTransformer"/>
  
  
     <map:transformer logger="sitemap.transformer.sql" name="sql" src="org.apache.cocoon.transformation.SQLTransformer"/>
  
  
      <map:transformer name="ldap" src="org.apache.cocoon.transformation.LDAPTransformer"/>
  
  
      <map:transformer logger="sitemap.transformer.deli" name="xslt" pool-grow="2" pool-max="32" pool-min="8" src="org.apache.cocoon.transformation.DeliTransformer">
        <use-request-parameters>false</use-request-parameters>
        <use-session-parameters>false</use-session-parameters>
        <use-cookie-parameters>false</use-cookie-parameters>
        <transformer-factory>org.apache.xalan.xsltc.trax.TransformerFactoryImpl</transformer-factory>
      </map:transformer>
  
  </map:transformers>
  
    <!--+
        | Serializers consume SAX events and produce a character stream. Every
        | pipeline needs to be terminated by a serializer.
        +-->
    <map:serializers default="html">
      <map:serializer logger="sitemap.serializer.links" name="links" src="org.apache.cocoon.serialization.LinkSerializer"/>
      <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:serializer logger="sitemap.serializer.wml" mime-type="text/vnd.wap.wml" name="wml" src="org.apache.cocoon.serialization.XMLSerializer">
       <doctype-public>-//WAPFORUM//DTD WML 1.1//EN</doctype-public>
       <doctype-system>http://www.wapforum.org/DTD/wml_1.1.xml</doctype-system>
       <encoding>ASCII</encoding>
       <omit-xml-declaration>yes</omit-xml-declaration>
      </map:serializer>
      <map:serializer logger="sitemap.serializer.svgxml" mime-type="image/svg-xml" name="svgxml" src="org.apache.cocoon.serialization.XMLSerializer">
       <doctype-public>-//W3C//DTD SVG 20000303 Stylable//EN</doctype-public>
       <doctype-system>http://www.w3.org/TR/2000/03/WD-SVG-20000303/</doctype-system>
      </map:serializer>
      <map:serializer logger="sitemap.serializer.xhtml" mime-type="text/html" name="xhtml" pool-grow="2" pool-max="64" pool-min="2" src="org.apache.cocoon.serialization.XMLSerializer">
        <doctype-public>-//W3C//DTD XHTML 1.0 Strict//EN</doctype-public>
        <doctype-system>http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd</doctype-system>
        <encoding>UTF-8</encoding>
      </map:serializer>
      <map:serializer logger="sitemap.serializer.text" mime-type="text/plain" name="text" src="org.apache.cocoon.serialization.TextSerializer"/>
      <map:serializer logger="sitemap.serializer.vrml" mime-type="model/vrml" name="vrml" src="org.apache.cocoon.serialization.TextSerializer"/>
    
  
      <map:serializer logger="sitemap.serializer.fo2pdf" mime-type="application/pdf" name="fo2pdf" src="org.apache.cocoon.serialization.FOPSerializer">
        <!-- This element specifies URL to FOP user configuration file.
             It can be absolute file URL or relative to the servlet context.
             Examples:
  
        <user-config>file:/C:/cocoon/fop-config.xml</user-config>
        <user-config>WEB-INF/fop-config.xml</user-config>
        -->
  
        <!-- Should serializer set content length header or not?
             Default is true.
        <set-content-length>true</set-content-length>
        -->
      </map:serializer>
  
      <map:serializer logger="sitemap.serializer.fo2ps" mime-type="application/postscript" name="fo2ps" src="org.apache.cocoon.serialization.FOPSerializer"/>
  
      <map:serializer logger="sitemap.serializer.fo2pcl" mime-type="vnd.hp-PCL" name="fo2pcl" src="org.apache.cocoon.serialization.FOPSerializer"/>
  
     <map:serializer logger="sitemap.serializer.svgxml" mime-type="image/svg-xml" name="svgxml" src="org.apache.cocoon.serialization.XMLSerializer">
      <doctype-public>-//W3C//DTD SVG 20000303 Stylable//EN</doctype-public>
      <doctype-system>http://www.w3.org/TR/2000/03/WD-SVG-20000303/</doctype-system>
     </map:serializer>
  
      <map:serializer logger="sitemap.serializer.svg2png" mime-type="image/jpeg" name="svg2jpeg" src="org.apache.cocoon.serialization.SVGSerializer">
        <parameter name="quality" type="float" value="0.9"/>
      </map:serializer>
  
      <map:serializer logger="sitemap.serializer.svg2png" mime-type="image/png" name="svg2png" src="org.apache.cocoon.serialization.SVGSerializer"/>
  
      <map:serializer mime-type="application/x-shockwave-flash" name="swf" src="org.apache.cocoon.serialization.SWFSerializer"/>
  
      <map:serializer mime-type="application/msword" name="fo2rtf" src="org.apache.cocoon.serialization.RTFSerializer"/>
  
      <map:serializer mime-type="application/pdf" name="itext2pdf" src="org.apache.cocoon.serialization.iTextSerializer"/>
  
   <map:serializer mime-type="application/vnd.ms-excel" name="xls" src="org.apache.cocoon.serialization.HSSFSerializer"/>
  </map:serializers>
  
    <!--+
        | Readers circumvent the XML oriented SAX pipeline model, think of a reader
        | being a generator and a serializer at once thus a pipeline may not
        | contain any generator, transformer or serializer in addition to a
        | reader. They are useful for delivering binary content like images.
        +-->
    <map:readers default="resource">
      <map:reader logger="sitemap.reader.resource" name="resource" pool-max="32" src="org.apache.cocoon.reading.ResourceReader"/>
    
      <map:reader name="jsp" src="org.apache.cocoon.reading.JSPReader"/>
  </map:readers>
  
    <!--+
        | Matchers are executed during pipeline setup. They decide if a
        | pipeline fragment is used within a pipeline. Usually, the decision
        | is based on a match on the requested URI but matchers exist, that
        | match different things as well. Most often the fragment contained in
        | a matcher has a generator as well as a serializer. This is not a
        | necessity, matchers can be nested while chaining does not work.
        +-->
    <map:matchers default="wildcard">
      <map:matcher logger="sitemap.matcher.wildcard" name="wildcard" src="org.apache.cocoon.matching.WildcardURIMatcher"/>
      <map:matcher logger="sitemap.matcher.regexp" name="regexp" src="org.apache.cocoon.matching.RegexpURIMatcher"/>
      <map:matcher logger="sitemap.matcher.request-parameter" name="request-parameter" src="org.apache.cocoon.matching.RequestParameterMatcher"/>
      <map:matcher logger="sitemap.matcher.cookie" name="cookie" src="org.apache.cocoon.matching.CookieMatcher"/>
      <map:matcher logger="sitemap.matcher.header" name="header" src="org.apache.cocoon.matching.HeaderMatcher"/>
      <map:matcher logger="sitemap.matcher.parameter" name="parameter" src="org.apache.cocoon.matching.ParameterMatcher"/>
      <map:matcher logger="sitemap.matcher.sessionstate" name="sessionstate" src="org.apache.cocoon.matching.WildcardSessionAttributeMatcher">
        <attribute-name>org.apache.cocoon.SessionState</attribute-name>
      </map:matcher>
      <map:matcher logger="sitemap.matcher.referer-match" name="referer-match" src="org.apache.cocoon.matching.WildcardHeaderMatcher">
        <header-name>referer</header-name>
      </map:matcher>
        <map:matcher name="usecase" logger="sitemap.matcher.usecase" src="org.apache.cocoon.matching.WildcardRequestParameterMatcher">
          <parameter-name>lenya.usecase</parameter-name>
        </map:matcher>
        <map:matcher name="step" logger="sitemap.matcher.step" src="org.apache.cocoon.matching.WildcardRequestParameterMatcher">
          <parameter-name>lenya.step</parameter-name>
        </map:matcher>
    </map:matchers>
  
    <!--+
        | Selectors are executed during pipeline setup. They can be used to
        | determine which pipeline fragments should be combined. They are best
        | compared with a java switch statement.
        +-->
    <map:selectors default="browser">
     <map:selector logger="sitemap.selector.browser" name="browser" src="org.apache.cocoon.selection.BrowserSelector">
      <!--+
          | NOTE: The appearance indicates the search order. This is very important since
          |       some words may be found in more than one browser description. (MSIE is
          |       presented as "Mozilla/4.0 (Compatible; MSIE 4.01; ...")
          +-->
      <browser name="explorer" useragent="MSIE"/>
      <browser name="pocketexplorer" useragent="MSPIE"/>
      <browser name="handweb" useragent="HandHTTP"/>
      <browser name="avantgo" useragent="AvantGo"/>
      <browser name="imode" useragent="DoCoMo"/>
      <browser name="opera" useragent="Opera"/>
      <browser name="lynx" useragent="Lynx"/>
      <browser name="java" useragent="Java"/>
      <browser name="wap" useragent="Nokia"/>
      <browser name="wap" useragent="UP"/>
      <browser name="wap" useragent="Wapalizer"/>
      <browser name="mozilla5" useragent="Mozilla/5"/>
      <browser name="mozilla5" useragent="Netscape6/"/>
      <browser name="netscape" useragent="Mozilla"/>
     </map:selector>
     <map:selector logger="sitemap.selector.request-parameter" name="request-parameter" src="org.apache.cocoon.selection.RequestParameterSelector">
      <!-- Define now which request parameter to use; or do it later,
           when using this selector, via "parameter-name" parameter.
      <parameter-name>myparam</parameter-name> 
      -->
     </map:selector>
     <map:selector logger="sitemap.selector.request-attribute" name="request-attribute" src="org.apache.cocoon.selection.RequestAttributeSelector">
      <!-- <attribute-name>myparam</attribute-name> -->
     </map:selector>
     <map:selector logger="sitemap.selector.session-attribute" name="session-attribute" src="org.apache.cocoon.selection.SessionAttributeSelector">
      <!-- <attribute-name>myparam</attribute-name> -->
     </map:selector>
     <map:selector logger="sitemap.selector.parameter" name="parameter" src="org.apache.cocoon.selection.ParameterSelector"/>
     <map:selector logger="sitemap.selector.header" name="header" src="org.apache.cocoon.selection.HeaderSelector">
      <!-- <header-name>myparam</header-name> -->
     </map:selector>
     <map:selector logger="sitemap.selector.host" name="host" src="org.apache.cocoon.selection.HostSelector"/>
     <map:selector logger="sitemap.selector.resource-exists" name="resource-exists" src="org.apache.cocoon.selection.ResourceExistsSelector"/>
    
  
  <!-- FIXME: Cocoon M1 -->
  <!--
      <map:selector name="auth-media" src="org.apache.cocoon.webapps.authentication.selection.MediaSelector"/>
  -->
  <!-- FIXME: Latest Cocoon CVS -->
  <!--
      <map:selector name="auth-media" src="org.apache.cocoon.webapps.session.selection.MediaSelector"/>
  -->
  </map:selectors>
  
    <!--+
        | Actions are executed during pipeline setup. Their purpose is to
        | execute some code that doesn't involve touching the stream of
        | pipeline events. Example usage is to update databases, check external 
        | resources, etc.. The execution may fail or complete successfully. Only 
        | if the execution of the action was successful, the pipeline fragment 
        | nested inside the action element is executed, otherwise, it's skipped
        | entirely and execution proceeds from the element right below the action.
        +-->
    <map:actions>
     <map:action logger="sitemap.action.request" name="request" src="org.apache.cocoon.acting.RequestParamAction"/>
     <map:action logger="sitemap.action.form-validator" name="form-validator" src="org.apache.cocoon.acting.FormValidatorAction"/>
     <map:action logger="sitemap.action.session-state" name="session-state" src="org.apache.cocoon.acting.SessionStateAction"/>
     <map:action logger="sitemap.action.session-propagator" name="session-propagator" src="org.apache.cocoon.acting.SessionPropagatorAction"/>
     <map:action logger="sitemap.action.session-isvalid" name="session-isvalid" src="org.apache.cocoon.acting.SessionIsValidAction"/>
     <map:action logger="sitemap.action.resource-exists" name="resource-exists" src="org.apache.cocoon.acting.ResourceExistsAction"/>
     <map:action logger="sitemap.action.set-header" name="set-header" src="org.apache.cocoon.acting.HttpHeaderAction"/>
     <map:action logger="sitemap.action.clear-cache" name="clear-cache" src="org.apache.cocoon.acting.ClearCacheAction"/>
     <map:action logger="sitemap.action.clear-persistent-store" name="clear-persistent-store" src="org.apache.cocoon.acting.ClearPersistentStoreAction"/>
    
  
      <map:action name="session" src="org.apache.cocoon.webapps.session.acting.SessionAction"/>
  
      <map:action name="session-form" src="org.apache.cocoon.webapps.session.acting.SessionFormAction"/>
  
  
      <map:action name="auth-protect" src="org.apache.cocoon.webapps.authentication.acting.AuthAction"/>
      <map:action name="auth-login" src="org.apache.cocoon.webapps.authentication.acting.LoginAction"/>
      <map:action name="auth-logout" src="org.apache.cocoon.webapps.authentication.acting.LogoutAction"/>
      <map:action name="auth-loggedIn" src="org.apache.cocoon.webapps.authentication.acting.LoggedInAction"/>
  
  
      <map:action name="portal-auth" src="org.apache.cocoon.webapps.portal.acting.AuthAction"/>
  
  
     <map:action logger="sitemap.action.source" name="source" src="org.apache.cocoon.acting.SourceMultiAction"/>
  
     <map:action logger="sitemap.action.principal" name="principal" src="org.apache.cocoon.acting.PrincipalMultiAction"/>
  
  
  <!-- =========================== Lenya CMS ================================= -->
  
     <map:action name="parent-child" logger="sitemap.action.parent-child" src="org.apache.lenya.cms.cocoon.acting.ParentChildCreatorAction">
          <tree-authoring href="content/authoring/tree.xml"/>
          <docs href="content/authoring"/>
          <doctypes href="config/doctypes/"/>
     </map:action>
        <map:action name="xopushandler" logger="sitemap.action.xopus" src="org.apache.lenya.cms.cocoon.acting.XopusHandlerAction">
          <xml href="content/authoring/"/>
          <xsl href="xslt"/>
          <xsd href="config/doctypes/schemas"/>
          <temp href="temp"/>
          <rcmlDirectory href="content/rcml"/>
          <backupDirectory href="content/rcbak"/>
        </map:action>
        <map:action name="page-envelope" src="org.apache.lenya.cms.cocoon.acting.PageEnvelopeAction" logger="sitemap.action.page-envelope"/> 
  	  <map:action name="reserved-checkout" src="org.apache.lenya.cms.cocoon.acting.ReservedCheckoutAction" logger="sitemap.action.reserved-checkout"/>
  	  <map:action name="reserved-checkin" src="org.apache.lenya.cms.cocoon.acting.ReservedCheckinAction" logger="sitemap.action.reserved-checkin"/>
  	  <map:action name="rollback" src="org.apache.lenya.cms.cocoon.acting.RollbackAction"/>
  
        <map:action name="file-upload" logger="sitemap.action.upload" src="org.apache.lenya.cms.cocoon.acting.ArticleImageUploadCreatorAction">
          <resources-root href="resources/images/live"/>
          <docs-root href="content/authoring"/>
          <meta-root href="content/authoring/"/>
          <insert-image-before value="false"/>
        </map:action>
        
        <map:action name="task" logger="sitemap.action.task" src="org.apache.lenya.cms.cocoon.acting.TaskAction"/>
        
        <map:action name="uriparametrizer" src="org.apache.lenya.cms.cocoon.acting.URIParametrizerAction" logger="sitemap.action.uriparametrizer"/>
      
        <map:action name="default-create" src="org.apache.lenya.cms.cocoon.acting.DefaultCreatorAction" logger="sitemap.action.default-create">
          <tree-authoring href="content/authoring/sitetree.xml"/>
          <docs href="content/authoring"/>
          <doctypes href="config/doctypes/"/>
        </map:action>
        
        <map:action logger="sitemap.action.multipart" name="multipart" src="org.apache.lenya.cms.cocoon.acting.MultipartHttpServletRequestAction"/>
  
        <map:action logger="sitemap.action.resource-exists-enhanced" name="resource-exists-enhanced" src="org.apache.lenya.cms.cocoon.acting.ResourceExistsAction"/>
        
        <map:action name="authorizer" src="org.apache.lenya.cms.cocoon.acting.DelegatingAuthorizerAction" logger="lenya.sitemap.action.authorizer"/>
        <map:action name="authenticator" src="org.apache.lenya.cms.cocoon.acting.DelegatingAuthenticatorAction" logger="lenya.sitemap.action.authenticator"/>
        
     </map:actions>
  
    <!--+
        | The different pipe implementations
        | 
        | NON-CACHING:
        |   The non caching implementation of cocoon pipelines.
        | 
        | CACHING:
        |   Traditional longest cachable key caching.
        | 
        | CACHING-POINT:
        |   The caching-point pipeline implements an extended             
        |   caching algorithm which is of particular benefit for use with 
        |   those pipelines that utilise cocoon-views and/or provide      
        |   drill-down functionality.                                     
        | 
        | The autoCachingPoint algorithim (if enabled) will automatically
        | cache common elements of the pipeline currently being processed - as well
        | as the entire cachable pipeline according to the "longest cachable key"
        | algorithm.
        | 
        | Consider the following simple pipeline, where generator G is labelled with
        | a cocoon-view enabling the pipeline to serialize data to either html or pdf 
        | depending on the value of cocoon-view (as provided by the request):
        | G - T -  S(html)
        | |__ T -  S(pdf)
        | 
        | If cocoon-view=html, then the caching-point algorithm will not only cache 
        | the longest cachable path, which would be GTS(html) but also the
        | *common element* which in this case would be the results from G. If the
        | next request to this pipeline was cocoon-view=pdf, then there would be no
        | need to invoke the generator a second time, as it's value has already been
        | cached (provided G generates the same cache key)
        | 
        | Also note: One can switch "Off" autoCachingPoint and use "pipeline-hints" to
        | manually indicate that certain pipeline-components should be considered as
        | cache points.
        +-->
     <map:pipes default="caching">
       <map:pipe name="caching" src="org.apache.cocoon.components.pipeline.impl.CachingProcessingPipeline"/>
       <map:pipe name="caching-point" src="org.apache.cocoon.components.pipeline.impl.CachingPointProcessingPipeline">
         <autoCachingPoint>On</autoCachingPoint>
       </map:pipe>
       <map:pipe name="noncaching" src="org.apache.cocoon.components.pipeline.impl.NonCachingProcessingPipeline"/>
     
       <!-- The following two can be used for profiling:-->
       <map:pipe name="profile-caching" src="org.apache.cocoon.components.profiler.ProfilingCachingProcessingPipeline"/>
       <map:pipe name="profile-noncaching" src="org.apache.cocoon.components.profiler.ProfilingNonCachingProcessingPipeline"/>
  </map:pipes>
  
   </map:components>
  
  <!-- =========================== Views =================================== -->
  
    <!--+
        | Views provide diffent, well, views to resources. Views are
        | orthogonal to pipelines. Please refer to the docs.
        +-->
    <map:views>
  
      <map:view name="first" from-position="first">
        <map:serialize type="xml"/>
      </map:view>
  
      <map:view name="last" from-position="last">
        <map:serialize type="xml"/>
      </map:view>
  
      <map:view from-label="content" name="content">
        <map:serialize type="xml"/>
      </map:view>
  
      <map:view from-label="data" name="pretty-content">
        <map:transform src="stylesheets/simple-xml2html.xsl"/>
        <map:serialize type="html"/>
      </map:view>
  
      <map:view from-position="last" name="links">
        <map:serialize type="links"/>
      </map:view>
  
      <map:view from-label="aggregate" name="aggregate">
        <map:serialize type="xml"/>
      </map:view>
    </map:views>
  
  <!-- =========================== Resources ================================= -->
  
    <!--+
        | Resources are pipeline fragments that may be used from different
        | pipeline fragments. For our needs, they behave exactly like
        | pipelines, only that they are not accessible from outside.
        | Hence I will explain what's inside below for pipelines.
        +-->
    <map:resources>
  
      <map:resource name="navigation">
        <map:generate src="lenya/pubs/{pub_id}/content/live/sitetree.xml" />
        <map:transform src="lenya/xslt/util/sitetree2navigation.xsl">
          <map:parameter name="nav_id" value="{nav_id}"/>
        </map:transform>
      </map:resource>
     
      <map:resource name="style-cms-page">
        <map:transform src="lenya/xslt/util/page2xhtml.xsl">
          <map:parameter name="contextprefix" value="{request:contextPath}"/>
        </map:transform>
        <map:serialize/>
      </map:resource>
     
   </map:resources>
  
  <!-- ========================== Action sets ================================ -->
  
   <!--+
       | Action sets group actions together. If some actions are often used
       | together in pipeline fragments, it's easier to group them and refer
       | to the group. For more info, please see the docs.
       +-->
    <map:action-sets>
    </map:action-sets>
  
  <!-- =========================== Pipelines ================================= -->
  
   <!--+
       | Pipelines. The beef. Pipelines specify how the processing of your
       | content is done. Usually, a pipeline consists of several fragments
       | that specify the generation, transformation, and serialization of
       | SAX events.
       |
       | Processing is done in two steps:
       |
       | 1) The top level elements are executed in order of appearance until
       |    one signals success. These top level elements are usually
       |    matchers.
       |
       |    Other components are called depth-first to determine what
       |    fragments make up the processing pipeline. When a component
       |    fails, no nested components are called but the next component on
       |    the same level.
       |
       | 2) Once it is determined which generator, which transformers and
       |    wich serializer is used, these components are executed. During
       |    this, the pipeline may not be changed.
       |
       | You may have as many pipelines in your sitemap as you like.
       +-->
   <map:pipelines>
  
    <map:component-configurations>
      <global-variables>
         <!--+
             | Define global parameters here:
             |   <skin>my_skin</skin>
             |   ...
             | You can access them by {global:*name*}, e.g. {global:skin}.
             | These values are inherited into sub-sitemaps and can
             | be extended there.
             +-->
      </global-variables>
    </map:component-configurations>
  
  
  
  <!-- =========================== Lenya CMS ================================= -->
  
  
  <!-- =========================== Actions ================================= -->
  
  <!-- FIXME: move generic actions out of publication sitemaps, and offer overriding
       capabilities. -->
  
  <!-- =========================== Pipelines ================================= -->
  
      <map:pipeline>
        <map:match pattern="publications.xml">
          <map:generate type="directory" src="lenya/pubs"/>
          <map:transform src="lenya/xslt/util/xinclude.xsl"/>
          <map:transform type="xlink">
            <map:parameter name="href" value="lenya/pubs/dummy.xml"/>
          </map:transform>
          <map:serialize type="xml"/>
        </map:match>
      </map:pipeline>
  
      <map:pipeline>
        <map:match pattern="">
          <map:redirect-to uri="index.html"/>
        </map:match>
        <map:match pattern="index.html">
          <map:aggregate element="lenya" ns="http://lenya.org/2003/publication" prefix="lenya" label="aggregate">
            <map:part src="cocoon:/publications.xml"/>
            <map:part src="lenya/content/introduction.xml"/>
          </map:aggregate>
          <map:transform src="lenya/xslt/util/welcome.xsl"/>
          <map:call resource="style-cms-page"/>
        </map:match>
      </map:pipeline>
  
      <!-- Search with Lucene -->
      <map:pipeline>
        <map:match pattern="lucene/**">
          <map:mount uri-prefix="lucene" src="lenya/lucene.xmap" check-reload="true" reload-method="synchron"/>
        </map:match>
        <map:match pattern="*/search/lucene">
          <map:generate type="serverpages" src="lenya/content/search/search-and-results.xsp">
            <map:parameter name="max-hits-per-page" value="3"/>
            <map:parameter name="max-pages" value="7"/>
            <map:parameter name="number-of-pubs" value="1"/>
            <map:parameter name="pub0-id" value="{1}"/>
            <map:parameter name="pub0-name" value="{1}"/>
            <map:parameter name="pub0-index-dir" value="lenya/pubs/{1}/work/search/lucene/index/index"/>
            <map:parameter name="pub0-excerpt-dir" value="lenya/pubs/{1}/work/search/lucene/htdocs_dump"/>
            <map:parameter name="pub0-prefix" value=""/>
          </map:generate>
          <map:transform src="lenya/xslt/search/sort.xsl"/>
          
          <map:act type="resource-exists" src="lenya/pubs/{1}/lenya/xslt/search/search-and-results.xsl">
            <map:transform src="lenya/pubs/{../1}/lenya/xslt/search/search-and-results.xsl"/>
            <map:serialize type="html"/>
          </map:act>
          <map:transform src="lenya/xslt/search/search-and-results.xsl"/>
          <map:serialize type="html"/>
        </map:match>
        <map:handle-errors type="500">
          <map:serialize type="xml"/>
        </map:handle-errors>
      </map:pipeline>
      <!-- /Search with Lucene -->
  
  
  
      <map:pipeline>
        <!-- Editor Xopus -->
        <map:match pattern="xopus/**">
          <map:mount uri-prefix="xopus" src="lenya/xopus.xmap" check-reload="true" reload-method="synchron"/>
        </map:match>
  
  
        <!-- Editor Bitflux -->
        <map:match pattern="bitflux/**">
          <map:mount uri-prefix="bitflux" src="lenya/bitflux.xmap" check-reload="true" reload-method="synchron"/>
        </map:match>
      </map:pipeline>
  
      <map:pipeline>
      
        <!-- Lenya GUI -->
        <map:match pattern="lenya/**">
          <map:mount uri-prefix="lenya" src="lenya/lenya.xmap" check-reload="true" reload-method="synchron"/>
        </map:match>
        
        <!-- navigation -->
        <map:match pattern="navigation/**">
          <map:mount uri-prefix="navigation" src="lenya/navigation.xmap" check-reload="true" reload-method="synchron"/>
        </map:match>
  
        <!-- uri-parameter/{publication-id}/{parameter}/{area}/{uri} -->
        <map:match pattern="uri-parameter/*/*/*/**">
          <map:mount uri-prefix="uri-parameter/{1}/{2}/" src="lenya/pubs/{1}/parameter-{2}.xmap" check-reload="true" reload-method="synchron"/>
        </map:match>
  
  
        <!-- Edit XHTML with Midas -->
        <map:pipeline>
          <map:match pattern="default/authoring/sugus">
            <map:act type="multipart">
              <map:read src="lenya/resources/misc/midas/midas.html" mime-type="text/html"/>
            </map:act>
            <map:read src="lenya/resources/misc/midas/midas_files/content.html" mime-type="text/html"/>
          </map:match>
  
          <map:match type="usecase" pattern="midas">
            <map:match type="step" pattern="open">
              <map:generate src="lenya/pubs/default/content/authoring/tutorial/index.xml"/>
              <map:transform src="lenya/resources/misc/midas/midas.xsl"/>
              <map:serialize type="html"/>
            </map:match>
  <!--
            <map:match type="step" pattern="save">
              <map:act type="multipart">
                <map:read src="lenya/resources/misc/midas/midas.html" mime-type="text/html"/>
              </map:act>
              <map:read src="lenya/resources/misc/midas/midas_files/content.html" mime-type="text/html"/>
            </map:match>
  -->
          </map:match>
          <map:match pattern="**/midas_content/**">
            <map:generate src="lenya/pubs/default/content/authoring/tutorial/index.xml"/>
            <map:transform src="lenya/resources/misc/midas/remove_dtd.xsl"/>
            <map:serialize type="html"/>
          </map:match>
          <map:match pattern="**/midas_files/**">
            <map:read src="lenya/resources/misc/midas/midas_files/{2}"/>
          </map:match>
  
          <map:handle-errors type="500">
            <map:serialize type="xml"/>
          </map:handle-errors>
        </map:pipeline>
        <!-- /Edit XHTML with Midas -->
  
  
        <!-- Usecases -->
        <map:pipeline>
          <map:match type="usecase" pattern="*">
            <map:mount uri-prefix="" src="lenya/usecase.xmap" check-reload="true" reload-method="synchron"/>
          </map:match>
        </map:pipeline>
  
  
        <!-- Publications -->
  <!-- FIXME: Some publications still use "" and "index.html" as live entry point -->
  <!--
        <map:match pattern="*/">
          <map:redirect-to uri="introduction.html"/>
        </map:match>
        <map:match pattern="*/index.html">
          <map:redirect-to uri="introduction.html"/>
        </map:match>
  -->
        <!-- About Publication -->
        <map:match pattern="*/introduction.html">
          <map:generate src="lenya/pubs/{1}/publication.xml" />
          <map:transform src="lenya/xslt/util/publication.xsl"/>
          <map:call resource="style-cms-page"/>
        </map:match>
  
        <!-- Navigation -->
        <map:match pattern="*/navigation_id*.xml">
          <map:call resource="navigation">
            <map:parameter name="pub_id" value="{1}"/>
            <map:parameter name="nav_id" value="{2}"/>
          </map:call>
          <map:serialize type="xml" />
        </map:match>
        <map:match pattern="*/navigation_id*.html">
          <map:call resource="navigation">
            <map:parameter name="pub_id" value="{1}"/>
            <map:parameter name="nav_id" value="{2}"/>
          </map:call>
          <map:transform src="lenya/xslt/util/navigation2html.xsl"/>
          <map:serialize type="html" />
        </map:match>
        
        <!-- Enter the actual publication (url = "") -->
        <map:match pattern="*/">
          <map:mount uri-prefix="{1}" src="lenya/pubs/{1}/sitemap.xmap" check-reload="true" reload-method="synchron"/>
        </map:match>
        
        <!-- Resources -->
        
        <!-- {publication-id}/{area}/{file} -->
        <map:match pattern="*/*/**">
          <map:act type="resource-exists-enhanced">
            <map:parameter name="url" value="lenya/pubs/{1}/resources/{3}"/>
            <map:parameter name="type" value="file"/>
            <map:mount uri-prefix="" src="lenya/resources.xmap" check-reload="true" reload-method="synchron"/>
          </map:act>
        </map:match>
        
        <!-- lenya/{file} -->
        <map:match pattern="lenya/**">
          <map:act type="resource-exists">
            <map:parameter name="url" value="lenya/resources/{1}"/>
            <map:mount uri-prefix="" src="lenya/resources.xmap" check-reload="true" reload-method="synchron"/>
          </map:act>
        </map:match>
  
      <!-- Admin Area -->
      <map:pipeline>
        <map:match pattern="*/admin/**">
          <map:mount uri-prefix="{1}/admin" src="lenya/admin.xmap" check-reload="true" reload-method="synchron"/>
        </map:match>
      </map:pipeline>
  
      <!-- Info Area -->
      <map:pipeline>
        <map:match pattern="*/info/**">
          <map:mount uri-prefix="{1}/info" src="lenya/info.xmap" check-reload="true" reload-method="synchron"/>
        </map:match>
      </map:pipeline>
        
        <!-- Enter the actual publication -->
        <map:match pattern="*/**">
          <map:mount uri-prefix="{1}" src="lenya/pubs/{1}/sitemap.xmap" check-reload="true" reload-method="synchron"/>
        </map:match>
      </map:pipeline>
  
  
  
   </map:pipelines>
  
  </map:sitemap>
  
  
  
  1.15      +3 -46     cocoon-lenya/src/webapp/lenya/pubs/default/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/default/sitemap.xmap,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- sitemap.xmap	8 Jul 2003 14:35:57 -0000	1.14
  +++ sitemap.xmap	17 Jul 2003 16:26:50 -0000	1.15
  @@ -10,34 +10,14 @@
       <map:readers default="resource"/>
       <map:serializers default="html"/>
       <map:matchers default="wildcard"/>
  -    <map:actions>
  -      <!-- FIXME: Factor out to root sitemap -->
  -      <map:action name="authorizer" src="org.apache.lenya.cms.cocoon.acting.PMLAuthorizerAction" logger="sitemap.action.pml-authorizer">
  -        <authenticator type="default"/>
  -        <policies>default/policies/</policies>
  -        <public>login-screen|do-login|switch-user|logout|.*[.]css|.*[.]jpg|.*[.]gif</public>
  -      </map:action>
  -      <map:action name="authenticator" src="org.apache.lenya.cms.cocoon.acting.IMLAuthenticatorAction" logger="sitemap.action.iml-authenticator">
  -        <type>default</type>
  -        <passwd>default/passwd/</passwd>
  -      </map:action>
  -    </map:actions>
  +    <map:actions/>
     </map:components>
   
     <map:views/>
   
     <map:resources>
  -    <!-- FIXME: Factor out to root sitemap -->
  -    <map:resource name="login">
  -      <map:generate type="serverpages" src="../../content/ac/login.xsp"/>
  -      <map:transform src="../../xslt/ac/login.xsl">
  -        <map:parameter name="publication_name" value="Default Publication"/>
  -        <map:parameter name="publication_id" value="default"/>
  -      </map:transform>
  -      <map:call resource="style-cms-page"/>
  -    </map:resource>
       
  -        <map:resource name="style-cms-page">
  +    <map:resource name="style-cms-page">
         <map:transform src="../../xslt/util/page2xhtml.xsl">
           <map:parameter name="contextprefix" value="{request:contextPath}"/>
         </map:transform>
  @@ -62,27 +42,6 @@
         </map:match>
   
         <map:match pattern="**">
  -        <map:act type="authorizer">
  -          <map:match pattern="login-screen">
  -            <map:call resource="login"/>
  -          </map:match>
  -
  -          <map:match pattern="do-login">
  -	    <!-- FIXME: Factor out to root sitemap -->
  -	    <map:act type="authenticator">
  -              <map:redirect-to uri="{protected_destination}" session="true"/>
  -            </map:act>
  -            <map:redirect-to uri="login-screen?status=failed" session="true"/>
  -          </map:match>
  -
  -          <map:match pattern="logout">
  -	    <!-- FIXME: Factor out to root sitemap -->
  -            <map:generate type="serverpages" src="../../content/ac/logout.xsp"/>
  -            <map:transform src="../../xslt/ac/logout.xsl">
  -              <map:parameter name="publication_name" value="Default Publication"/>
  -            </map:transform>
  -            <map:serialize/>
  -          </map:match>
   
             <!--  ####################################################################### -->
             <!--          Everything below is "protected" by policies-sitemap.xmap        -->
  @@ -102,8 +61,6 @@
               <map:mount uri-prefix="" src="publication-sitemap.xmap"/>
             </map:match>
   
  -        </map:act>
  -        <map:call resource="login"/>
         </map:match>
   
         <map:handle-errors type="500">
  
  
  
  1.28      +1 -37     cocoon-lenya/src/webapp/lenya/pubs/oscom/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/oscom/sitemap.xmap,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- sitemap.xmap	9 Jul 2003 13:11:14 -0000	1.27
  +++ sitemap.xmap	17 Jul 2003 16:26:50 -0000	1.28
  @@ -20,17 +20,6 @@
       <map:serializers default="html"/>
       <map:matchers default="wildcard" />
   
  -    <map:actions>
  -      <map:action name="authorizer" src="org.apache.lenya.cms.cocoon.acting.PMLAuthorizerAction" logger="sitemap.action.pml-authorizer">
  -        <authenticator type="oscom"/>
  -        <policies>oscom/policies/</policies>
  -        <public>login-screen|do-login|switch-user|logout|.*[.]css|.*[.]jpg|.*[.]gif</public>
  -      </map:action>
  -      <map:action name="authenticator" src="org.apache.lenya.cms.cocoon.acting.IMLAuthenticatorAction" logger="sitemap.action.iml-authenticator">
  -        <type>oscom</type>
  -        <passwd>oscom/passwd/</passwd>
  -      </map:action>
  -    </map:actions>
     </map:components>
   
     <map:views>
  @@ -148,29 +137,6 @@
             </map:match>
             
         <map:match pattern="**">
  -        <map:act type="authorizer">
  -          <map:match pattern="login-screen">
  -            <map:call resource="login"/>
  -          </map:match>
  -          
  -          <map:match pattern="do-login">
  -            <map:act type="authenticator">
  -              <map:redirect-to uri="{protected_destination}" session="true"/>
  -            </map:act>
  -            <map:redirect-to uri="login-screen?status=failed" session="true"/>
  -          </map:match>
  -
  -          <map:match pattern="logout">
  -            <map:generate type="serverpages" src="../../content/ac/logout.xsp"/>
  -            <map:transform src="../../xslt/ac/logout.xsl">
  -              <map:parameter name="publication_name" value="OSCOM"/>
  -            </map:transform>
  -            <map:serialize/>
  -          </map:match>
  -
  -          <!--  ####################################################################### -->
  -          <!--          Everything below is "protected" by policies-sitemap.xmap        -->
  -          <!--  ####################################################################### -->
   
             <!-- The authoring area -->
             <map:match pattern="authoring/**">
  @@ -186,8 +152,6 @@
               <map:mount uri-prefix="live" src="live-sitemap.xmap" check-reload="true" reload-method="synchron"/>
             </map:match>
   
  -        </map:act>
  -        <map:call resource="login"/>
         </map:match>
   
   <!--
  
  
  
  1.13      +16 -9     cocoon-lenya/src/webapp/lenya/pubs/oscom/policies-sitemap.xmap
  
  Index: policies-sitemap.xmap
  ===================================================================
  RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/oscom/policies-sitemap.xmap,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- policies-sitemap.xmap	2 May 2003 12:15:28 -0000	1.12
  +++ policies-sitemap.xmap	17 Jul 2003 16:26:51 -0000	1.13
  @@ -33,23 +33,30 @@
        </map:match>
   <!-- /CMS/F Matrix Overview -->
   
  +<!-- CMS/F Matrix Project policy -->
  +     <map:match pattern="*/matrix-project.xml">
  +       <map:act type="resource-exists" src="config/ac/passwd/{1}.iml">
  +         <map:generate type="serverpages" src="config/ac/policies/matrix-project.xsp">
  +           <map:parameter name="name" value="{../1}"/>
  +         </map:generate>
  +         <map:serialize type="xml"/>
  +       </map:act>
  +       <map:generate type="serverpages" src="config/ac/policies/matrix-project.xsp"/>
  +       <map:serialize type="xml"/>
  +     </map:match>
  +<!-- /CMS/F Matrix Project policy -->
  +
   <!-- CMS/F Matrix Project -->
        <map:match pattern="authoring/matrix/*.html.acml">
  -       <map:generate type="serverpages" src="config/ac/policies/matrix-project.xsp">
  -         <map:parameter name="name" value="{1}"/>
  -       </map:generate>
  +       <map:generate src="cocoon:/{1}/matrix-project.xml"/>
          <map:serialize type="xml"/>
        </map:match>
        <map:match pattern="authoring/matrix/body-*.xml.acml">
  -       <map:generate type="serverpages" src="config/ac/policies/matrix-project.xsp">
  -         <map:parameter name="name" value="{1}"/>
  -       </map:generate>
  +       <map:generate src="cocoon:/{1}/matrix-project.xml"/>
          <map:serialize type="xml"/>
        </map:match>
        <map:match pattern="authoring/xopus2/matrix/*.html.acml">
  -       <map:generate type="serverpages" src="config/ac/policies/matrix-project.xsp">
  -         <map:parameter name="name" value="{1}"/>
  -       </map:generate>
  +       <map:generate src="cocoon:/{1}/matrix-project.xml"/>
          <map:serialize type="xml"/>
        </map:match>
   <!-- /CMS/F Matrix Project -->
  
  
  
  1.1                  cocoon-lenya/src/webapp/lenya/pubs/oscom/config/ac/ac.xconf
  
  Index: ac.xconf
  ===================================================================
  <?xml version="1.0"?>
  
  <access-controller type="sitemap">
    <accreditable-manager>
      <parameter name="directory" value="context:///lenya/pubs/oscom/config/ac/passwd"/>
    </accreditable-manager>
  </access-controller>
  
  
  
  1.15      +1 -5      cocoon-lenya/src/webapp/lenya/pubs/oscom/config/menus/overview.xsp
  
  Index: overview.xsp
  ===================================================================
  RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/oscom/config/menus/overview.xsp,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- overview.xsp	9 Jul 2003 12:34:17 -0000	1.14
  +++ overview.xsp	17 Jul 2003 16:26:51 -0000	1.15
  @@ -18,17 +18,13 @@
   
     <xsp-lenya:util/>
   
  -   <xsp:logic>
  -    Publication publication = PublicationFactory.getPublication(objectModel);
  -  </xsp:logic>
  -
     <url-info>
       <context-prefix><xsp-request:get-context-path/></context-prefix>
       <publication-id><input:get-attribute module="page-envelope" as="string" name="publication-id"/></publication-id>
       <area><input:get-attribute module="page-envelope" as="string" name="area"/></area>
       <document-id><input:get-attribute module="page-envelope" as="string" name="document-id"/>.html</document-id>
       <document-url><input:get-attribute module="page-envelope" as="string" name="document-url"/></document-url>
  -    <servlet-context-path><xsp:expr>publication.getServletContext().getCanonicalPath()</xsp:expr></servlet-context-path>
  +    <servlet-context-path><xsp:expr>((Publication) <input:get-attribute module="page-envelope" as="object" name="publication"/>).getServletContext().getCanonicalPath()</xsp:expr></servlet-context-path>
       <publication><input:get-attribute module="page-envelope" as="object" name="publication"/></publication>
     </url-info>
   
  
  
  
  1.1                  cocoon-lenya/src/webapp/lenya/pubs/default/config/ac/policies/subtree-policy.acml
  
  Index: subtree-policy.acml
  ===================================================================
  <?xml version="1.0"?>
  <policy xmlns="http://apache.org/cocoon/lenya/ac/1.0">
  
    <world>
      <role id="visitor"/>
    </world>
  
  </policy> 
  
  
  
  1.1                  cocoon-lenya/src/webapp/lenya/pubs/default/config/ac/passwd/visitor.rml
  
  Index: visitor.rml
  ===================================================================
  <?xml version="1.0" encoding="UTF-8"?>
  <role class="org.apache.lenya.cms.ac.FileRole" id="visitor"/>
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org