Return-Path: 
 <cvs-return-17748-apmail-cocoon-cvs-archive=cocoon.apache.org@cocoon.apache.org>
Delivered-To: apmail-cocoon-cvs-archive@www.apache.org
Received: (qmail 44934 invoked from network); 10 Mar 2004 16:16:14 -0000
Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12)
  by minotaur-2.apache.org with SMTP; 10 Mar 2004 16:16:14 -0000
Received: (qmail 31400 invoked by uid 500); 10 Mar 2004 16:16:08 -0000
Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org
Received: (qmail 31237 invoked by uid 500); 10 Mar 2004 16:16:07 -0000
Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cocoon.apache.org
list-help: <mailto:cvs-help@cocoon.apache.org>
list-unsubscribe: <mailto:cvs-unsubscribe@cocoon.apache.org>
list-post: <mailto:cvs@cocoon.apache.org>
Delivered-To: mailing list cvs@cocoon.apache.org
Received: (qmail 31225 invoked by uid 500); 10 Mar 2004 16:16:07 -0000
Delivered-To: apmail-cocoon-2.1-cvs@apache.org
Received: (qmail 31222 invoked from network); 10 Mar 2004 16:16:07 -0000
Received: from unknown (HELO minotaur.apache.org) (209.237.227.194)
  by daedalus.apache.org with SMTP; 10 Mar 2004 16:16:07 -0000
Received: (qmail 44877 invoked by uid 1758); 10 Mar 2004 16:16:12 -0000
Date: 10 Mar 2004 16:16:12 -0000
Message-ID: <20040310161612.44876.qmail@minotaur.apache.org>
From: unico@apache.org
To: cocoon-2.1-cvs@apache.org
Subject: cvs commit: cocoon-2.1/src/webapp/samples/protected sitemap.xmap
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N
X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N

unico       2004/03/10 08:16:12

  Modified:    src/webapp/samples/protected sitemap.xmap
  Added:       src/webapp/samples/protected/docs protected.xml
  Removed:     src/webapp/samples/protected/docs protected.xsp
  Log:
  remove dependency on xsp from protected samples
  
  Revision  Changes    Path
  1.1                  cocoon-2.1/src/webapp/samples/protected/docs/protected.xml
  
  Index: protected.xml
  ===================================================================
  <?xml version="1.0"?>
  <!--
    Copyright 1999-2004 The Apache Software Foundation
  
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
    You may obtain a copy of the License at
  
        http://www.apache.org/licenses/LICENSE-2.0
  
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
  -->
  
  <!-- CVS: $Id: protected.xml,v 1.1 2004/03/10 16:16:12 unico Exp $ -->
  <page>
    <resources>
      <resource type="file" href="descriptors/auth.xml?cocoon-view=pretty-content">Authenticator</resource>
      <resource type="file" href="descriptors/params.xml?cocoon-view=pretty-content">Validator</resource>
      <resource type="doc" href="userdocs/actions/database-actions.html">Actions</resource>
    </resources>
    <title>Protected area</title>
    <content>
      <linkbar/>
      <para>
        Wow, you have entered secret area, 
        now its time to examine sub-sitemap and
        think about what can be improved regarding flow control and especially
        aspect capturing, so that it is not necessary to check session in every
        map:match fragment. :-))
        <br/>
        &#160; -- Martin Man
      </para>
      <para>You are logged in under username: ${parameters.getParameter('username')}</para>
      <para>Your department id is: ${parameters.getParameter('department_id')}</para>
      <para>Your web page theme is: ${parameters.getParameter('theme')}</para>
    </content>
  </page>
  <!-- vim: set et ts=2 sw=2: -->
  
  
  
  1.7       +6 -2      cocoon-2.1/src/webapp/samples/protected/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/protected/sitemap.xmap,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- sitemap.xmap	6 Mar 2004 02:26:20 -0000	1.6
  +++ sitemap.xmap	10 Mar 2004 16:16:12 -0000	1.7
  @@ -104,7 +104,11 @@
             <map:parameter name="descriptor" value="descriptors/params.xml"/>
             <map:parameter name="validate" value="username,department_id,theme"/>
             <!-- generate protected content -->
  -          <map:generate type="serverpages" src="docs/protected.xsp"/>
  +          <map:generate type="jx" src="docs/protected.xml">
  +            <map:parameter name="username" value="{session-attr:username}"/>
  +            <map:parameter name="department_id" value="{session-attr:department_id}"/>
  +            <map:parameter name="theme" value="{session-attr:theme}"/>
  +          </map:generate>
             <map:transform src="stylesheets/{theme}-page2html.xsl">
               <map:parameter name="servletPath" value="{request:servletPath}"/>
               <map:parameter name="sitemapURI" value="{request:sitemapURI}"/>