Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cocoon.apache.org
Date: 7 Sep 2003 06:11:39 -0000
Message-ID: <20030907061139.20141.qmail@minotaur.apache.org>
From: vgritsenko@apache.org
To: cocoon-2.1-cvs@apache.org
Subject: cvs commit: cocoon-2.1/src/blocks/apples/samples sitemap.xmap

vgritsenko    2003/09/06 23:11:39

  Modified:    src/blocks/apples/samples sitemap.xmap
  Log:
  Add views
  
  Revision  Changes    Path
  1.4       +45 -34    cocoon-2.1/src/blocks/apples/samples/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/apples/samples/sitemap.xmap,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- sitemap.xmap	29 Aug 2003 22:33:00 -0000	1.3
  +++ sitemap.xmap	7 Sep 2003 06:11:39 -0000	1.4
  @@ -1,5 +1,11 @@
   <?xml version="1.0" encoding="ISO-8859-1"?>
   
  +<!--+
  +    | Apples block samples sitemap
  +    |
  +    | CVS $Id$
  +    +-->
  +
   <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
     
     <map:components>
  @@ -24,34 +30,41 @@
       <map:pipes default="caching"/>
     </map:components>
     
  +<!-- =========================== Views =================================== -->
  +
     <map:views>
  -    <map:view name="content" from-label="content">
  +    <map:view from-label="content" name="content">
         <map:serialize type="xml"/>
       </map:view>
  -    <map:view name="pretty-content" from-label="data">
  +
  +    <map:view from-label="content" name="pretty-content">
         <map:transform src="context://stylesheets/system/xml2html.xslt"/>
         <map:serialize type="html"/>
       </map:view>
  -    <map:view name="links" from-position="last">
  +
  +    <map:view from-position="last" name="links">
         <map:serialize type="links"/>
       </map:view>
     </map:views>
  -  
  +
  +
     <map:resources>
       <map:resource name="serialize-jx-screen" >
  -        <map:transform src="context://samples/common/style/xsl/html/simple-page2html.xsl">
  -          <map:parameter name="servletPath" value="{request:servletPath}"/>
  -          <map:parameter name="sitemapURI" value="{request:sitemapURI}"/>
  -          <map:parameter name="contextPath" value="{request:contextPath}"/>
  -          <map:parameter name="file" value="/samples/apples/{screen-src}"/>
  -          <map:parameter name="remove" value="{0}"/>
  -        </map:transform>
  -        <map:serialize type="html" />    
  +      <map:transform src="context://samples/common/style/xsl/html/simple-page2html.xsl">
  +        <map:parameter name="servletPath" value="{request:servletPath}"/>
  +        <map:parameter name="sitemapURI" value="{request:sitemapURI}"/>
  +        <map:parameter name="contextPath" value="{request:contextPath}"/>
  +        <map:parameter name="file" value="/samples/apples/{screen-src}"/>
  +        <map:parameter name="remove" value="{0}"/>
  +      </map:transform>
  +      <map:serialize type="html" />    
       </map:resource>
     </map:resources>
  -  
  +
  +
     <map:flow language="apples"/>
  -  
  +
  +
     <map:pipelines>
       <map:pipeline>
   
  @@ -62,16 +75,16 @@
           </map:transform>
           <map:serialize/>
         </map:match>
  -      
  +
         <map:match pattern="*.continue">
           <map:call continuation="{1}"/>
         </map:match>
   
   
  -      <!--
  +      <!--+
             |   Binding form sample, reuses pipelines stolen from woody
  -        -->
  -      
  +          +-->
  +
         <map:match pattern="form2xml.flow">
           <map:call function="org.apache.cocoon.components.flow.apples.samples.BindingWoodyApple">
             <map:parameter name="form-src" value="context://samples/woody/forms/form2_model.xml"/>
  @@ -84,14 +97,14 @@
         </map:match>
   
   
  -      <!-- 
  +      <!--+ 
             |  Calculator sample, uses stolen and modified xsp's from flowscript sample
  -          -->
  +          +-->
   
         <map:match pattern="calc.flow">
           <map:call function="org.apache.cocoon.components.flow.apples.samples.CalculationApple"/>
         </map:match>
  -      
  +
         <map:match pattern="calc/*">
           <map:generate type="serverpages" src="calc/{1}.xsp"/>
           <map:transform src="context://samples/common/style/xsl/html/simple-page2html.xsl">
  @@ -105,28 +118,27 @@
         </map:match>
   
   
  -      
  -      <!-- 
  +      <!--+ 
             |  Guess Game sample, borrowed setup from the uses stolen and modified xsp's from flowscript
  -          -->
  +          +-->
   
         <map:match pattern="guess.flow">
           <map:call function="org.apache.cocoon.components.flow.apples.samples.GuessGameApple"/>
         </map:match>
  -      
  -      
  -      <!-- 
  +
  +
  +      <!--+ 
             |  Tower of Hanoi Puzzle sample.
  -          -->
  +          +-->
   
         <map:match pattern="hanoi.flow">
           <map:call function="org.apache.cocoon.components.flow.apples.samples.HanoiApple"/>
         </map:match>
   
   
  -      <!-- 
  -          |    JX screen pipes 
  -          -->    
  +      <!--+ 
  +          |  JX screen pipes 
  +          +-->    
   
         <map:match pattern="hanoi/hanoi.jx">
           <map:generate type="jx" src="hanoi/hanoi.jx"/>
  @@ -135,15 +147,14 @@
             <map:parameter name="screen-src" value="hanoi/hanoi.jx"/>
           </map:call>
         </map:match>
  -                  
  +
         <map:match pattern="*/*.jx">
           <map:generate type="jx" src="{1}/{2}.jx"/>
           <map:call resource="serialize-jx-screen">
             <map:parameter name="screen-src" value="{1}/{2}.jx"/>
           </map:call>
         </map:match>
  -      
  -      
  +
       </map:pipeline>
     </map:pipelines>
   </map:sitemap>