Return-Path: 
 <cvs-return-13919-apmail-cocoon-cvs-archive=cocoon.apache.org@cocoon.apache.org>
Delivered-To: apmail-cocoon-cvs-archive@www.apache.org
Received: (qmail 23624 invoked from network); 29 Aug 2003 22:33:07 -0000
Received: from daedalus.apache.org (HELO apache.org) (208.185.179.12)
  by minotaur-2.apache.org with SMTP; 29 Aug 2003 22:33:07 -0000
Received: (qmail 48120 invoked by uid 500); 29 Aug 2003 22:32:51 -0000
Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org
Received: (qmail 48069 invoked by uid 500); 29 Aug 2003 22:32:50 -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 48053 invoked by uid 500); 29 Aug 2003 22:32:50 -0000
Delivered-To: apmail-cocoon-2.1-cvs@apache.org
Received: (qmail 48009 invoked from network); 29 Aug 2003 22:32:49 -0000
Received: from unknown (HELO minotaur.apache.org) (209.237.227.194)
  by daedalus.apache.org with SMTP; 29 Aug 2003 22:32:49 -0000
Received: (qmail 23592 invoked by uid 1546); 29 Aug 2003 22:33:00 -0000
Date: 29 Aug 2003 22:33:00 -0000
Message-ID: <20030829223300.23591.qmail@minotaur.apache.org>
From: mpo@apache.org
To: cocoon-2.1-cvs@apache.org
Subject: cvs commit: cocoon-2.1/src/blocks/apples/samples sitemap.xmap
 welcome.xml
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

mpo         2003/08/29 15:33:00

  Modified:    src/blocks/apples/samples sitemap.xmap welcome.xml
  Log:
  Adding the new samples to the sitemap and the welcome page.
  
  Revision  Changes    Path
  1.3       +131 -65   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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- sitemap.xmap	6 Aug 2003 15:54:13 -0000	1.2
  +++ sitemap.xmap	29 Aug 2003 22:33:00 -0000	1.3
  @@ -1,71 +1,77 @@
  -<?xml version="1.0"?>
  -<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
  -
  - <map:components>
  -
  -  <map:generators default="file">   
  -    <map:generator name="woody" src="org.apache.cocoon.woody.generation.WoodyGenerator" logger="woody"/>
  -    <map:generator name="jx" src="org.apache.cocoon.generation.JXTemplateGenerator" label="content,data" logger="sitemap.generator.jx"/>
  -  </map:generators>
  -
  -  <map:transformers default="xalan">    
  -    <map:transformer name="woody" src="org.apache.cocoon.woody.transformation.WoodyTemplateTransformer" logger="woody"/>
  -    <map:transformer name="i18n" src="org.apache.cocoon.transformation.I18nTransformer">
  -      <catalogues default="other">
  -        <catalogue id="other" name="OtherMessages" location="context://samples/woody/messages"/>
  -        <catalogue id="woody" name="WoodyMessages" location="context://samples/woody/messages"/>
  -      </catalogues>
  -      <cache-at-startup>true</cache-at-startup>
  -    </map:transformer>
  -  </map:transformers>
  -
  -  <map:selectors default="browser">
  -    <map:selector name="request-method" src="org.apache.cocoon.selection.RequestMethodSelector"/>
  -  </map:selectors>
  -
  -  <map:actions/>
  -
  -  <map:pipes default="caching">
  -  </map:pipes>
  -
  - </map:components>
  -
  - <map:views>
  -  <map:view name="content" from-label="content">
  -   <map:serialize type="xml"/>
  -  </map:view>
  -
  -  <map:view name="pretty-content" from-label="data">
  -   <map:transform src="context://stylesheets/system/xml2html.xslt"/>
  -   <map:serialize type="html"/>
  -  </map:view>
  -
  -  <map:view name="links" from-position="last">
  -   <map:serialize type="links"/>
  -  </map:view>
  - </map:views>
  -
  -  <map:flow language="apples" />
  -
  - <map:pipelines>
  -   <map:pipeline>
  -
  -     <map:match pattern="">
  -      <map:generate src="welcome.xml"/>
  -      <map:transform src="context://samples/common/style/xsl/html/simple-samples2html.xsl">
  -         <map:parameter name="contextPath" value="{request:contextPath}"/>
  -      </map:transform>
  -      <map:serialize/>
  -     </map:match>
  +<?xml version="1.0" encoding="ISO-8859-1"?>
   
  -     <!--
  -        | Binding form sample, stolen from woody
  -        -->
  -     
  +<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
  +  
  +  <map:components>
  +    <map:generators default="file">
  +      <map:generator name="woody" src="org.apache.cocoon.woody.generation.WoodyGenerator" logger="woody"/>
  +      <map:generator name="jx" src="org.apache.cocoon.generation.JXTemplateGenerator" label="content,data" logger="sitemap.generator.jx"/>
  +    </map:generators>
  +    <map:transformers default="xalan">
  +      <map:transformer name="woody" src="org.apache.cocoon.woody.transformation.WoodyTemplateTransformer" logger="woody"/>
  +      <map:transformer name="i18n" src="org.apache.cocoon.transformation.I18nTransformer">
  +        <catalogues default="other">
  +          <catalogue id="other" name="OtherMessages" location="context://samples/woody/messages"/>
  +          <catalogue id="woody" name="WoodyMessages" location="context://samples/woody/messages"/>
  +        </catalogues>
  +        <cache-at-startup>true</cache-at-startup>
  +      </map:transformer>
  +    </map:transformers>
  +    <map:selectors default="browser">
  +      <map:selector name="request-method" src="org.apache.cocoon.selection.RequestMethodSelector"/>
  +    </map:selectors>
  +    <map:actions/>
  +    <map:pipes default="caching"/>
  +  </map:components>
  +  
  +  <map:views>
  +    <map:view name="content" from-label="content">
  +      <map:serialize type="xml"/>
  +    </map:view>
  +    <map:view name="pretty-content" from-label="data">
  +      <map:transform src="context://stylesheets/system/xml2html.xslt"/>
  +      <map:serialize type="html"/>
  +    </map:view>
  +    <map:view name="links" from-position="last">
  +      <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:resource>
  +  </map:resources>
  +  
  +  <map:flow language="apples"/>
  +  
  +  <map:pipelines>
  +    <map:pipeline>
  +
  +      <map:match pattern="">
  +        <map:generate src="welcome.xml"/>
  +        <map:transform src="context://samples/common/style/xsl/html/simple-samples2html.xsl">
  +          <map:parameter name="contextPath" value="{request:contextPath}"/>
  +        </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"/>
  @@ -77,7 +83,67 @@
           </map:call>
         </map:match>
   
  -   </map:pipeline>
  - </map:pipelines>
   
  +      <!-- 
  +          |  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">
  +          <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/calc/{1}.xsp"/>
  +          <map:parameter name="remove" value="{0}"/>
  +        </map:transform>
  +        <map:serialize/>
  +      </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 
  +          -->    
  +
  +      <map:match pattern="hanoi/hanoi.jx">
  +        <map:generate type="jx" src="hanoi/hanoi.jx"/>
  +        <map:transform src="hanoi/hanoi.xsl" />
  +        <map:call resource="serialize-jx-screen">
  +          <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>
  
  
  
  1.2       +4 -1      cocoon-2.1/src/blocks/apples/samples/welcome.xml
  
  Index: welcome.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/apples/samples/welcome.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- welcome.xml	4 Aug 2003 08:38:01 -0000	1.1
  +++ welcome.xml	29 Aug 2003 22:33:00 -0000	1.2
  @@ -14,7 +14,10 @@
    </group>
   
    <group name="Apples Samples">
  -  <sample name="Apple doing Woody XML Binding" href="form2xml.flow">An Apple controlling a form for just editing an XML file.</sample>
  +  <sample name="Woody XML Binding."     href="form2xml.flow">An Apple controlling a form for just editing an XML file.</sample>
  +  <sample name="Calculation."           href="calc.flow">Simplistic calculator implementation.</sample>
  +  <sample name="Number Guessing."       href="guess.flow">Number Guessing game.</sample>
  +  <sample name="Tower of Hanoi puzzle." href="hanoi.flow">The popular mind puzzle.</sample>
    </group>
   
   </samples>