You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by vg...@apache.org on 2004/04/01 21:01:04 UTC

cvs commit: cocoon-2.1/src/blocks/xsp/conf xsp.xsamples

vgritsenko    2004/04/01 11:01:04

  Modified:    src/blocks/apples/conf apples.xsamples
               src/blocks/asciiart/conf asciiart.xsamples
               src/blocks/authentication-fw/conf authentication-fw.xsamples
               src/blocks/axis/conf axis.xsamples
               src/blocks/chaperon/conf chaperon.xsamples
               src/blocks/cron/conf cron.xsamples
               src/blocks/databases/conf databases.xsamples
               src/blocks/databases/samples samples.xml
               src/blocks/deli/conf deli.xsamples
               src/blocks/eventcache/conf eventcache.xsamples
               src/blocks/fop/conf fop.xsamples
               src/blocks/forms/conf forms.xsamples
               src/blocks/itext/conf itext.xsamples
               src/blocks/javaflow/conf javaflow.xsamples
               src/blocks/jfor/conf jfor.xsamples
               src/blocks/jms/conf jms.xsamples
               src/blocks/jsp/conf jsp.xsamples
               src/blocks/linkrewriter/conf linkrewriter.xsamples
               src/blocks/linkrewriter/samples samples.xml
               src/blocks/linotype/conf linotype.xsamples
               src/blocks/lucene/conf lucene.xsamples
               src/blocks/mail/conf mail.xsamples
               src/blocks/midi/conf midi.xsamples
               src/blocks/ojb/conf ojb.xsamples
               src/blocks/petstore/conf petstore.xsamples
               src/blocks/poi/conf poi.xsamples
               src/blocks/portal/conf portal.xsamples
               src/blocks/portal-fw/conf portal-fw.xsamples
               src/blocks/profiler/conf profiler.xsamples
               src/blocks/proxy/conf proxy.xsamples
               src/blocks/qdox/conf qdox.xsamples
               src/blocks/scratchpad/conf scratchpad.xsamples
               src/blocks/slide/conf slide.xsamples
               src/blocks/slop/conf slop.xsamples
               src/blocks/stx/conf stx.xsamples
               src/blocks/swf/conf swf.xsamples
               src/blocks/web3/conf web3.xsamples
               src/blocks/web3/samples samples.xml
               src/blocks/webdav/conf webdav.xsamples
               src/blocks/xsp/conf xsp.xsamples
  Log:
  Reworking block samples page
  
  Revision  Changes    Path
  1.3       +1 -1      cocoon-2.1/src/blocks/apples/conf/apples.xsamples
  
  Index: apples.xsamples
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/apples/conf/apples.xsamples,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- apples.xsamples	6 Mar 2004 02:25:49 -0000	1.2
  +++ apples.xsamples	1 Apr 2004 19:01:02 -0000	1.3
  @@ -18,7 +18,7 @@
   <xsamples xpath="/samples" unless="group[@name='Apples']">
   
     <group name="Apples">
  -    <sample name="Apples" href="apples/">
  +    <sample name="Apples Block" href="apples/">
         Apples (an alternative flow implementation) examples.
       </sample>
     </group>
  
  
  
  1.5       +1 -1      cocoon-2.1/src/blocks/asciiart/conf/asciiart.xsamples
  
  Index: asciiart.xsamples
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/asciiart/conf/asciiart.xsamples,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- asciiart.xsamples	6 Mar 2004 02:26:19 -0000	1.4
  +++ asciiart.xsamples	1 Apr 2004 19:01:02 -0000	1.5
  @@ -18,7 +18,7 @@
   <xsamples xpath="/samples" unless="group[@name='ASCII Art']">
   
     <group name="ASCII Art">
  -    <sample name="ASCII Art" href="asciiart/">
  +    <sample name="ASCII Art Block" href="asciiart/">
         Plain text files with character-based artwork and diagrams are presented
         in various formats, e.g. plain text, JPEG, PNG
       </sample>
  
  
  
  1.5       +4 -3      cocoon-2.1/src/blocks/authentication-fw/conf/authentication-fw.xsamples
  
  Index: authentication-fw.xsamples
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/authentication-fw/conf/authentication-fw.xsamples,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- authentication-fw.xsamples	6 Mar 2004 02:25:51 -0000	1.4
  +++ authentication-fw.xsamples	1 Apr 2004 19:01:03 -0000	1.5
  @@ -18,11 +18,12 @@
   <xsamples xpath="/samples" unless="group[@name='Authentication Framework']">
   
     <group name="Authentication Framework">
  -    <sample name="Authentication Framework" href="authentication-fw/login">
  +    <sample name="Authentication Framework Block" href="authentication-fw/login">
         This is a demo of the authentication framework integrated into Cocoon.
       </sample>
  -    <sample name="Authentication Framework with Flow" href="authentication-fw/flow/login">
  -      This is the same demo, but using flow instead of actions.
  +    <sample name="Authentication Framework Block (with Flow)" href="authentication-fw/flow/login">
  +      This is the same demo of the authentication framework, but using flow
  +      instead of actions.
       </sample>
     </group>
     
  
  
  
  1.3       +1 -1      cocoon-2.1/src/blocks/axis/conf/axis.xsamples
  
  Index: axis.xsamples
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/axis/conf/axis.xsamples,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- axis.xsamples	6 Mar 2004 02:25:44 -0000	1.2
  +++ axis.xsamples	1 Apr 2004 19:01:03 -0000	1.3
  @@ -18,7 +18,7 @@
   <xsamples xpath="/samples" unless="group[@name='Axis']">
   
     <group name="Axis">
  -    <sample name="Axis" href="axis/">Examples using Apache Axis to give access to Cocoon via SOAP.</sample>
  +    <sample name="Axis Block" href="axis/">Examples using Apache Axis to give access to Cocoon via SOAP.</sample>
     </group>
   
   </xsamples>
  
  
  
  1.4       +3 -3      cocoon-2.1/src/blocks/chaperon/conf/chaperon.xsamples
  
  Index: chaperon.xsamples
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/chaperon/conf/chaperon.xsamples,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- chaperon.xsamples	6 Mar 2004 02:26:03 -0000	1.3
  +++ chaperon.xsamples	1 Apr 2004 19:01:03 -0000	1.4
  @@ -18,9 +18,9 @@
   <xsamples xpath="/samples" unless="group[@name='Chaperon']">
   
     <group name="Chaperon">
  -    <sample name="Chaperon Text Parser" href="chaperon/">
  -      Examples showing how to use the Chaperon Parser to parse common text files
  -      like Wiki or Java files.
  +    <sample name="Chaperon Block" href="chaperon/">
  +      Examples showing how to use the Chaperon text parser to parse common text files
  +      (like Wiki or Java files) into the XML.
       </sample>
     </group>
   </xsamples>
  
  
  
  1.3       +1 -1      cocoon-2.1/src/blocks/cron/conf/cron.xsamples
  
  Index: cron.xsamples
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/cron/conf/cron.xsamples,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- cron.xsamples	6 Mar 2004 02:26:05 -0000	1.2
  +++ cron.xsamples	1 Apr 2004 19:01:03 -0000	1.3
  @@ -18,7 +18,7 @@
   <xsamples xpath="/samples" unless="group[@name='Cron']">
   
     <group name="Cron">
  -    <sample name="Cron" href="cron/">
  +    <sample name="Cron Block" href="cron/">
         Cron block samples.
       </sample>
     </group>
  
  
  
  1.4       +2 -9      cocoon-2.1/src/blocks/databases/conf/databases.xsamples
  
  Index: databases.xsamples
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/databases/conf/databases.xsamples,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- databases.xsamples	6 Mar 2004 02:25:34 -0000	1.3
  +++ databases.xsamples	1 Apr 2004 19:01:03 -0000	1.4
  @@ -18,15 +18,8 @@
   <xsamples xpath="/samples" unless="group[@name='Databases']">
   
     <group name="Databases">
  -    <note>
  -      For the examples of this block to work, either the HSQLDB block
  -      needs to be present as well or another RDBMS backend needs to
  -      be configured. Schema information is contained in each
  -      subdirectory of samples/databases.
  -    </note>
  -
  -    <sample name="Samples" href="databases/samples">
  -      Continue to database block samples.
  +    <sample name="Databases Block" href="databases/samples">
  +      Continue to databases block samples.
       </sample>
     </group>
     
  
  
  
  1.6       +7 -1      cocoon-2.1/src/blocks/databases/samples/samples.xml
  
  Index: samples.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/databases/samples/samples.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- samples.xml	6 Mar 2004 02:25:55 -0000	1.5
  +++ samples.xml	1 Apr 2004 19:01:03 -0000	1.6
  @@ -21,6 +21,12 @@
   
     <group name="Main examples page.">
       <sample name="Back" href="..">to Cocoon examples main page</sample>
  +    <note>
  +      For the examples of this block to work, either the HSQLDB block
  +      needs to be present as well or another RDBMS backend needs to
  +      be configured. Schema information is contained in each
  +      subdirectory of samples/databases.
  +    </note>
     </group>
   
     <group name="SQL Transformer">
  
  
  
  1.3       +1 -1      cocoon-2.1/src/blocks/deli/conf/deli.xsamples
  
  Index: deli.xsamples
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/deli/conf/deli.xsamples,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- deli.xsamples	6 Mar 2004 02:26:13 -0000	1.2
  +++ deli.xsamples	1 Apr 2004 19:01:03 -0000	1.3
  @@ -17,7 +17,7 @@
   <xsamples xpath="/samples" unless="group[@name='DELI']">
     <group name="DELI">
   
  -   <sample name="DELI" href="deli/">
  +   <sample name="DELI Block" href="deli/">
   	DELI allows Cocoon to determine the delivery context of a client device, for example a mobile terminal, using CC/PP or UAProf.
      </sample>
         
  
  
  
  1.5       +1 -1      cocoon-2.1/src/blocks/eventcache/conf/eventcache.xsamples
  
  Index: eventcache.xsamples
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/eventcache/conf/eventcache.xsamples,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- eventcache.xsamples	6 Mar 2004 02:25:38 -0000	1.4
  +++ eventcache.xsamples	1 Apr 2004 19:01:03 -0000	1.5
  @@ -17,7 +17,7 @@
   
   <xsamples xpath="/samples" unless="group[@name='Event Based Cache']">
     <group name="Event Based Cache">
  -    <sample name="Event Based Cache" href="eventcache/demo?pageKey=one">
  +    <sample name="Event Cache Block" href="eventcache/demo?pageKey=one">
         A sample demonstrating a new system of cache invalidation based on 
         events usually external to Cocoon.  Example uses include cache content 
         until a back-end database is updated, or EJB signals an update.
  
  
  
  1.5       +1 -1      cocoon-2.1/src/blocks/fop/conf/fop.xsamples
  
  Index: fop.xsamples
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/fop/conf/fop.xsamples,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- fop.xsamples	6 Mar 2004 02:25:41 -0000	1.4
  +++ fop.xsamples	1 Apr 2004 19:01:03 -0000	1.5
  @@ -18,7 +18,7 @@
   <xsamples xpath="/samples" unless="group[@name='FOP']">
   
     <group name="FOP">
  -    <sample name="FOP PDF serializer" href="fop/">
  +    <sample name="FOP Block" href="fop/">
         Examples of PDF document generation using FOP.
       </sample>
     </group>
  
  
  
  1.3       +1 -1      cocoon-2.1/src/blocks/forms/conf/forms.xsamples
  
  Index: forms.xsamples
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/forms/conf/forms.xsamples,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- forms.xsamples	9 Mar 2004 10:34:05 -0000	1.2
  +++ forms.xsamples	1 Apr 2004 19:01:03 -0000	1.3
  @@ -18,7 +18,7 @@
   <xsamples xpath="/samples" unless="group[@name='Cocoon Forms']">
   
     <group name="Cocoon Forms">
  -    <sample name="Cocoon Forms" href="forms/">
  +    <sample name="Forms Block" href="forms/">
         Cocoon Forms examples.
       </sample>
     </group>
  
  
  
  1.4       +1 -1      cocoon-2.1/src/blocks/itext/conf/itext.xsamples
  
  Index: itext.xsamples
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/itext/conf/itext.xsamples,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- itext.xsamples	6 Mar 2004 02:25:36 -0000	1.3
  +++ itext.xsamples	1 Apr 2004 19:01:03 -0000	1.4
  @@ -18,7 +18,7 @@
   <xsamples xpath="/samples" unless="group[@name='iText']">
   
     <group name="iText">
  -    <sample name="iText PDF serializer" href="itext/">
  +    <sample name="iText Block" href="itext/">
         Examples of PDF document generation using iText.
       </sample>
     </group>
  
  
  
  1.2       +4 -4      cocoon-2.1/src/blocks/javaflow/conf/javaflow.xsamples
  
  Index: javaflow.xsamples
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/javaflow/conf/javaflow.xsamples,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- javaflow.xsamples	29 Mar 2004 17:47:21 -0000	1.1
  +++ javaflow.xsamples	1 Apr 2004 19:01:03 -0000	1.2
  @@ -3,16 +3,16 @@
   <xsamples xpath="/samples" unless="group[@name='Java Flow']">
   
     <group name="Java Flow">
  -    <sample name="Calculator" href="javaflow/calculator.do">
  +    <sample name="Java Flow Block: Calculator" href="javaflow/calculator.do">
         Example for the Java Flow implementation
       </sample>
  -    <sample name="Cocoon Forms" href="javaflow/editForm1.do">
  +    <sample name="Java Flow Block: Cocoon Forms" href="javaflow/editForm1.do">
         Example for the Cocoon Forms and Java Flow.
       </sample>
  -    <sample name="Cocoon Forms Binding" href="javaflow/editForm2.do">
  +    <sample name="Java Flow Block: Cocoon Forms Binding" href="javaflow/editForm2.do">
         Example for the Cocoon Forms Binding and Java Flow.
       </sample>
  -    <sample name="Apache OJB" href="javaflow/showEmployee.do">
  +    <sample name="Java Flow Block: Apache OJB" href="javaflow/showEmployee.do">
         Example for the Cocoon Forms and Java Flow and Apache OJB.
       </sample>
     </group>
  
  
  
  1.4       +1 -1      cocoon-2.1/src/blocks/jfor/conf/jfor.xsamples
  
  Index: jfor.xsamples
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/jfor/conf/jfor.xsamples,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- jfor.xsamples	6 Mar 2004 02:26:00 -0000	1.3
  +++ jfor.xsamples	1 Apr 2004 19:01:03 -0000	1.4
  @@ -18,7 +18,7 @@
   <xsamples xpath="/samples" unless="group[@name='jfor']">
   
     <group name="jfor">
  -    <sample name="jfor RTF serializer" href="jfor/">
  +    <sample name="jfor Block" href="jfor/">
         Examples of RTF document generation.
       </sample>
     </group>
  
  
  
  1.3       +2 -1      cocoon-2.1/src/blocks/jms/conf/jms.xsamples
  
  Index: jms.xsamples
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/jms/conf/jms.xsamples,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- jms.xsamples	6 Mar 2004 02:26:12 -0000	1.2
  +++ jms.xsamples	1 Apr 2004 19:01:03 -0000	1.3
  @@ -17,7 +17,8 @@
   
   <xsamples xpath="/samples" unless="group[@name='JMS']">
     <group name="JMS">
  -  	<sample name="JMS invalidated Event Based Cache" href="jms/database/">
  +    <sample name="JMS Block" href="jms/database/">
  +      JMS invalidated Event Based Cache.
         A sample showing external cache invalidation using database triggers
         emitting either JMS messages or HTTP requests. For this sample, the
         HSQLDB block and the databases block need to be present. For the JMS
  
  
  
  1.4       +2 -2      cocoon-2.1/src/blocks/jsp/conf/jsp.xsamples
  
  Index: jsp.xsamples
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/jsp/conf/jsp.xsamples,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- jsp.xsamples	6 Mar 2004 02:26:10 -0000	1.3
  +++ jsp.xsamples	1 Apr 2004 19:01:03 -0000	1.4
  @@ -18,8 +18,8 @@
   <xsamples xpath="/samples" unless="group[@name='JSP']">
   
     <group name="JSP">
  -    <sample name="Java Server Pages" href="jsp/">
  -      JSP usage with Cocoon
  +    <sample name="JSP Block" href="jsp/">
  +      Java Server Pages (JSP) usage with Cocoon
       </sample>
     </group>
   </xsamples>
  
  
  
  1.4       +1 -2      cocoon-2.1/src/blocks/linkrewriter/conf/linkrewriter.xsamples
  
  Index: linkrewriter.xsamples
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/linkrewriter/conf/linkrewriter.xsamples,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- linkrewriter.xsamples	6 Mar 2004 02:25:49 -0000	1.3
  +++ linkrewriter.xsamples	1 Apr 2004 19:01:03 -0000	1.4
  @@ -18,10 +18,9 @@
   <xsamples xpath="/samples" unless="group[@name='Link Rewriter']">
   
     <group name="Link Rewriter">
  -    <sample name="LinkRewriter Transformer" href="linkrewriter/">
  +    <sample name="LinkRewriter Block" href="linkrewriter/">
         A demo of the LinkRewriterTransformer, which rewrites XML links (by
         default, href attributes) with values looked up from any Input Module.
  -      See http://xml.apache.org/forrest/linking.html
       </sample>
     </group>
     
  
  
  
  1.5       +16 -9     cocoon-2.1/src/blocks/linkrewriter/samples/samples.xml
  
  Index: samples.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/linkrewriter/samples/samples.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- samples.xml	6 Mar 2004 02:25:51 -0000	1.4
  +++ samples.xml	1 Apr 2004 19:01:03 -0000	1.5
  @@ -19,21 +19,28 @@
     <group name="Back">
       <sample name="Back" href="../">
         to the samples main page
  -   </sample>
  - </group>
  +    </sample>
  +  </group>
  +
     <group name="LinkRewriter Demos">
       <sample name="sitedemo" href="sitedemo/welcome">
         a demo with one page, 'welcome', with links that will have ..'s
         progressively added for each directory 'welcome' is in.  Eg, try
         <link href="sitedemo/welcome">welcome</link>, <link
  -        href="sitedemo/foo/welcome">foo/welcome</link>, <link
  -        href="sitedemo/foo/bar/welcome">foo/bar/welcome</link> and watch the
  +      href="sitedemo/foo/welcome">foo/welcome</link>, <link
  +      href="sitedemo/foo/bar/welcome">foo/bar/welcome</link> and watch the
         links change.
  -   </sample>
  -   <sample name="bookdemo" href="bookdemo/index.html">
  -     a demonstration of using a book.xml file to resolve links between pages.
  -   </sample>
  +    </sample>
  +    <sample name="bookdemo" href="bookdemo/index.html">
  +      a demonstration of using a book.xml file to resolve links between pages.
  +    </sample>
  +  </group>
  +  <group name="Docs">
  +    <sample name="See Also" href="http://xml.apache.org/forrest/linking.html">
  +      page on the Forrest site.
  +    </sample>
     </group>
  +
    <!--
     <group name="Documentation">
       <sample name="Docs" href="../../docs/index">
  
  
  
  1.5       +1 -1      cocoon-2.1/src/blocks/linotype/conf/linotype.xsamples
  
  Index: linotype.xsamples
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/linotype/conf/linotype.xsamples,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- linotype.xsamples	6 Mar 2004 02:26:13 -0000	1.4
  +++ linotype.xsamples	1 Apr 2004 19:01:03 -0000	1.5
  @@ -18,7 +18,7 @@
   <xsamples xpath="/samples" unless="group[@name='Linotype']">
   
     <group name="Linotype">
  -    <sample name="Blogging Tool" href="linotype/">
  +    <sample name="Linotype Block" href="linotype/">
         This is a demo of a full blown blogging tool written on top of Apache Cocoon.
       </sample>
     </group>
  
  
  
  1.4       +1 -1      cocoon-2.1/src/blocks/lucene/conf/lucene.xsamples
  
  Index: lucene.xsamples
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/lucene/conf/lucene.xsamples,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- lucene.xsamples	6 Mar 2004 02:25:58 -0000	1.3
  +++ lucene.xsamples	1 Apr 2004 19:01:03 -0000	1.4
  @@ -18,7 +18,7 @@
   <xsamples xpath="/samples" unless="group[@name='Lucene']">
   
     <group name="Lucene">
  -    <sample name="Search with Lucene" href="lucene/welcome">
  +    <sample name="Lucene Block" href="lucene/welcome">
         Examples showing use of Apache Lucene to search.
       </sample>
     </group>
  
  
  
  1.4       +1 -1      cocoon-2.1/src/blocks/mail/conf/mail.xsamples
  
  Index: mail.xsamples
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/mail/conf/mail.xsamples,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- mail.xsamples	6 Mar 2004 02:25:39 -0000	1.3
  +++ mail.xsamples	1 Apr 2004 19:01:03 -0000	1.4
  @@ -18,7 +18,7 @@
   <xsamples xpath="/samples" unless="group[@name='Mail']">
   
     <group name="Mail">
  -    <sample name="Samples" href="mail/samples">
  +    <sample name="Mail Block" href="mail/samples">
         Continue to mail block samples.
       </sample>
     </group>
  
  
  
  1.4       +1 -1      cocoon-2.1/src/blocks/midi/conf/midi.xsamples
  
  Index: midi.xsamples
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/midi/conf/midi.xsamples,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- midi.xsamples	6 Mar 2004 02:26:07 -0000	1.3
  +++ midi.xsamples	1 Apr 2004 19:01:03 -0000	1.4
  @@ -18,7 +18,7 @@
   <xsamples xpath="/samples" unless="group[@name='Midi']">
   
     <group name="Midi">
  -    <sample name="Midi" href="midi/">
  +    <sample name="Midi Block" href="midi/">
         This demonstrates the generation of XMidi (an XML representation of MIDI) from MIDI files.
       </sample>
     </group>
  
  
  
  1.5       +1 -5      cocoon-2.1/src/blocks/ojb/conf/ojb.xsamples
  
  Index: ojb.xsamples
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/ojb/conf/ojb.xsamples,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ojb.xsamples	11 Mar 2004 16:59:50 -0000	1.4
  +++ ojb.xsamples	1 Apr 2004 19:01:03 -0000	1.5
  @@ -18,11 +18,7 @@
   <xsamples xpath="/samples" unless="group[@name='OJB']">
   
     <group name="OJB">
  -    <note>
  -      For the examples of this block to work, you need to download
  -      the Java Data Objects (JDO) Reference Implementation from java.sun.com .
  -    </note>
  -    <sample name="OJB" href="ojb/">
  +    <sample name="OJB Block" href="ojb/">
         Apache Object/Relational Bridge.
       </sample>
     </group>
  
  
  
  1.4       +3 -3      cocoon-2.1/src/blocks/petstore/conf/petstore.xsamples
  
  Index: petstore.xsamples
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/petstore/conf/petstore.xsamples,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- petstore.xsamples	6 Mar 2004 02:25:52 -0000	1.3
  +++ petstore.xsamples	1 Apr 2004 19:01:03 -0000	1.4
  @@ -18,9 +18,9 @@
   <xsamples xpath="/samples" unless="group[@name='Petstore']">
   
     <group name="Petstore">
  -    <sample name="Flowscript version" href="petstore/">
  -      The Cocoon flowscript version of the J2EE PetStore, using various
  -      mechanisms: CocoonForms (Woody), velocity, xsp, jexl, jxforms.
  +    <sample name="Petstore Block" href="petstore/">
  +      The Cocoon Flow version of the J2EE PetStore, using various presentation
  +      mechanisms: CocoonForms (Woody), Velocity, XSP, Jexl.
       </sample>
     </group>
     
  
  
  
  1.3       +2 -1      cocoon-2.1/src/blocks/poi/conf/poi.xsamples
  
  Index: poi.xsamples
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/poi/conf/poi.xsamples,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- poi.xsamples	6 Mar 2004 02:26:05 -0000	1.2
  +++ poi.xsamples	1 Apr 2004 19:01:03 -0000	1.3
  @@ -14,9 +14,10 @@
     See the License for the specific language governing permissions and
     limitations under the License.
   -->
  +
   <xsamples xpath="/samples" unless="group[@name='POI']">
     <group name="POI">
  -    <sample name="POI" href="poi/">
  +    <sample name="POI Block" href="poi/">
         You want to have excel sheets? Here they go ...
      </sample>
     </group>
  
  
  
  1.8       +1 -1      cocoon-2.1/src/blocks/portal/conf/portal.xsamples
  
  Index: portal.xsamples
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/conf/portal.xsamples,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- portal.xsamples	6 Mar 2004 02:26:02 -0000	1.7
  +++ portal.xsamples	1 Apr 2004 19:01:03 -0000	1.8
  @@ -18,7 +18,7 @@
   <xsamples xpath="/samples" unless="group[@name='Portal Engine']">
   
     <group name="Portal Engine">
  -    <sample name="Demo Portal" href="portal/portal">
  +    <sample name="Portal Block" href="portal/portal">
         This is a demo of the new powerful portal engine based on Apache Cocoon.
       </sample>
     </group>
  
  
  
  1.4       +1 -1      cocoon-2.1/src/blocks/portal-fw/conf/portal-fw.xsamples
  
  Index: portal-fw.xsamples
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/portal-fw/conf/portal-fw.xsamples,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- portal-fw.xsamples	6 Mar 2004 02:25:48 -0000	1.3
  +++ portal-fw.xsamples	1 Apr 2004 19:01:04 -0000	1.4
  @@ -18,7 +18,7 @@
   <xsamples xpath="/samples" unless="group[@name='Portal Framework']">
   
     <group name="Portal Framework">
  -    <sample name="Portal Framework" href="portal-fw/sunspotdemoportal">
  +    <sample name="Portal Framework Block" href="portal-fw/sunspotdemoportal">
         This is a demo of the portal framework integrated into Cocoon.
       </sample>
     </group>
  
  
  
  1.4       +1 -1      cocoon-2.1/src/blocks/profiler/conf/profiler.xsamples
  
  Index: profiler.xsamples
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/profiler/conf/profiler.xsamples,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- profiler.xsamples	6 Mar 2004 02:25:43 -0000	1.3
  +++ profiler.xsamples	1 Apr 2004 19:01:04 -0000	1.4
  @@ -18,7 +18,7 @@
   <xsamples xpath="/samples" unless="group[@name='Profiler']">
   
     <group name="Profiler">
  -    <sample name="Profiler" href="profiler/">
  +    <sample name="Profiler Block" href="profiler/">
         This example shows the usage of the Profiler component for
         profiling and debugging of pipelines.
       </sample>
  
  
  
  1.3       +3 -3      cocoon-2.1/src/blocks/proxy/conf/proxy.xsamples
  
  Index: proxy.xsamples
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/proxy/conf/proxy.xsamples,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- proxy.xsamples	6 Mar 2004 02:26:00 -0000	1.2
  +++ proxy.xsamples	1 Apr 2004 19:01:04 -0000	1.3
  @@ -16,9 +16,9 @@
   -->
   <xsamples xpath="/samples" unless="group[@name='Proxy']">
     <group name="Proxy">
  -    <sample name="Proxy" href="proxy/">
  -	  Web Site Syndication using proxies: Integrate remote webapp functionality
  -	  into your website.
  +    <sample name="Proxy Block" href="proxy/">
  +      Web Site Syndication using proxies: Integrate remote webapp functionality
  +      into your website.
      </sample>
     </group>
   </xsamples>
  
  
  
  1.5       +3 -1      cocoon-2.1/src/blocks/qdox/conf/qdox.xsamples
  
  Index: qdox.xsamples
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/qdox/conf/qdox.xsamples,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- qdox.xsamples	6 Mar 2004 02:26:12 -0000	1.4
  +++ qdox.xsamples	1 Apr 2004 19:01:04 -0000	1.5
  @@ -18,7 +18,9 @@
   <xsamples xpath="/samples" unless="group[@name='QDox']">
   
     <group name="QDox">
  -    <sample name="Samples" href="qdox/">Javadoc-like parsing of Java code using QDox.</sample>
  +    <sample name="QDox Block" href="qdox/">
  +      Javadoc-like parsing of Java code using QDox.
  +    </sample>
     </group>
   
   </xsamples>
  
  
  
  1.5       +1 -1      cocoon-2.1/src/blocks/scratchpad/conf/scratchpad.xsamples
  
  Index: scratchpad.xsamples
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/scratchpad/conf/scratchpad.xsamples,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- scratchpad.xsamples	6 Mar 2004 02:25:52 -0000	1.4
  +++ scratchpad.xsamples	1 Apr 2004 19:01:04 -0000	1.5
  @@ -18,7 +18,7 @@
   <xsamples xpath="/samples" unless="group[@name='Scratchpad Samples']">
     
     <group name="Scratchpad Samples">
  -    <sample name="Scratchpad" href="scratchpad/">
  +    <sample name="Scratchpad Block" href="scratchpad/">
         Here you find the samples about the functionality included in the scratchpad, which is the 
         place where new stuff is developed but not yet considered stable enough for production.
       </sample>
  
  
  
  1.5       +1 -1      cocoon-2.1/src/blocks/slide/conf/slide.xsamples
  
  Index: slide.xsamples
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/slide/conf/slide.xsamples,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- slide.xsamples	6 Mar 2004 02:25:49 -0000	1.4
  +++ slide.xsamples	1 Apr 2004 19:01:04 -0000	1.5
  @@ -18,7 +18,7 @@
   <xsamples xpath="/samples" unless="group[@name='Slide']">
   
     <group name="Slide">
  -    <sample name="Slide Integration" href="slide/">
  +    <sample name="Slide Block" href="slide/">
         Slide administration application showing the use of Slide inside Cocoon.
       </sample>
     </group>
  
  
  
  1.4       +7 -8      cocoon-2.1/src/blocks/slop/conf/slop.xsamples
  
  Index: slop.xsamples
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/slop/conf/slop.xsamples,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- slop.xsamples	6 Mar 2004 02:26:06 -0000	1.3
  +++ slop.xsamples	1 Apr 2004 19:01:04 -0000	1.4
  @@ -18,15 +18,14 @@
   <xsamples xpath="/samples" unless="group[@name='Slop']">
   
     <group name="Slop">
  -    <sample name="Slop Text Parser" href="slop/">
  +    <sample name="SLOP Block" href="slop/">
         Examples showing how to use SLOP
  -      (the Simple Line Oriented Parser)
  -      to parse text files
  +      (the Simple Line Oriented Parser) to parse text files
  +    </sample>
  +    <sample name="SLOP Block: YAPT Presentation Tool" href="slop/yapt/">
  +      Yet Another Presentation Tool!
  +      Uses simple structured ASCII files to quickly create
  +      XML-based presentations
       </sample>
  -      <sample name="YAPT Presentation Tool" href="slop/yapt/">
  -        Yet Another Presentation Tool!
  -        Uses simple structured ASCII files to quickly create
  -        XML-based presentations
  -      </sample>
     </group>
   </xsamples>
  
  
  
  1.3       +5 -5      cocoon-2.1/src/blocks/stx/conf/stx.xsamples
  
  Index: stx.xsamples
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/stx/conf/stx.xsamples,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- stx.xsamples	6 Mar 2004 02:25:59 -0000	1.2
  +++ stx.xsamples	1 Apr 2004 19:01:04 -0000	1.3
  @@ -16,9 +16,9 @@
   -->
   <xsamples xpath="/samples" unless="group[@name='STX']">
   
  -    <group name="STX">
  -        <sample name="STX" href="stx/">
  -            Examples of using Streaming Transformations for XML (STX)
  -        </sample>
  -    </group>
  +  <group name="STX">
  +    <sample name="STX Block" href="stx/">
  +      Examples of using Streaming Transformations for XML (STX)
  +    </sample>
  +  </group>
   </xsamples>
  
  
  
  1.5       +2 -2      cocoon-2.1/src/blocks/swf/conf/swf.xsamples
  
  Index: swf.xsamples
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/swf/conf/swf.xsamples,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- swf.xsamples	6 Mar 2004 02:25:53 -0000	1.4
  +++ swf.xsamples	1 Apr 2004 19:01:04 -0000	1.5
  @@ -23,7 +23,7 @@
   <xsamples xpath="/samples" unless="group[@name='SWF']">
   
     <group name="SWF">
  -    <sample name="SWF" href="swf/">
  +    <sample name="SWF Block" href="swf/">
         Flash!
       </sample>
     </group>
  
  
  
  1.5       +1 -6      cocoon-2.1/src/blocks/web3/conf/web3.xsamples
  
  Index: web3.xsamples
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/web3/conf/web3.xsamples,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- web3.xsamples	6 Mar 2004 02:25:46 -0000	1.4
  +++ web3.xsamples	1 Apr 2004 19:01:04 -0000	1.5
  @@ -18,12 +18,7 @@
   <xsamples xpath="/samples" unless="group[@name='Web3']">
   
     <group name="Web3">
  -    <note> 
  -      For the examples of this block to work, an SAP R/3 system and some
  -      SAP java classes need to be available and configured according to the docs that 
  -      can be found in the developer section of the Apache Cocoon documentation.
  -    </note>
  -    <sample name="Samples" href="web3/samples">
  +    <sample name="Web3 Block" href="web3/samples">
         Continue to Web3 block samples.
       </sample>
     </group>
  
  
  
  1.5       +11 -6     cocoon-2.1/src/blocks/web3/samples/samples.xml
  
  Index: samples.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/web3/samples/samples.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- samples.xml	6 Mar 2004 02:26:07 -0000	1.4
  +++ samples.xml	1 Apr 2004 19:01:04 -0000	1.5
  @@ -20,15 +20,20 @@
   <samples xmlns:xlink="http://www.w3.org/1999/xlink" name="web3 block">
   
     <group name="web3">
  -     <sample name="Documentation" href="../../docs/developing/web3.html">
  -       Documentation for this component.
  -     </sample>
  +    <note> 
  +      For the examples of this block to work, an SAP R/3 system and some
  +      SAP java classes need to be available and configured according to the docs that 
  +      can be found in the developer section of the Apache Cocoon documentation.
  +    </note>
  +    <sample name="Documentation" href="../../docs/developing/web3.html">
  +      Documentation for this component.
  +    </sample>
       <sample name="Connect to SAP R/3" href="info.html">
         Demo connection to <b>your</b> SAP system.   
       </sample>
       <sample name="Connect to SAP R/3 (XML)" href="info.xml">
  -     Same as above but produces XML.
  -   </sample>
  +      Same as above but produces XML.
  +    </sample>
     </group>
     
   </samples>
  
  
  
  1.3       +1 -1      cocoon-2.1/src/blocks/webdav/conf/webdav.xsamples
  
  Index: webdav.xsamples
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/webdav/conf/webdav.xsamples,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- webdav.xsamples	6 Mar 2004 02:25:51 -0000	1.2
  +++ webdav.xsamples	1 Apr 2004 19:01:04 -0000	1.3
  @@ -18,7 +18,7 @@
   <xsamples xpath="/samples" unless="group[@name='WebDAV']">
   
     <group name="WebDAV">
  -    <sample href="webdav/" name="WebDAV">
  +    <sample href="webdav/" name="WebDAV Block">
         Using WebDAV with Cocoon
       </sample>
     </group>
  
  
  
  1.3       +1 -1      cocoon-2.1/src/blocks/xsp/conf/xsp.xsamples
  
  Index: xsp.xsamples
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/xsp/conf/xsp.xsamples,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- xsp.xsamples	17 Mar 2004 11:28:21 -0000	1.2
  +++ xsp.xsamples	1 Apr 2004 19:01:04 -0000	1.3
  @@ -17,7 +17,7 @@
   
   <xsamples xpath="/samples" unless="group[@name='XSP']">
     <group name="XSP">
  -    <sample href="xsp/" name="Extensible Server Pages">
  +    <sample href="xsp/" name="XSP Block">
         Extensible Server Pages, or XSP.
       </sample>
     </group>