From cvs-return-24628-apmail-cocoon-cvs-archive=cocoon.apache.org@cocoon.apache.org Thu Oct 06 12:47:48 2005
Return-Path: <cvs-return-24628-apmail-cocoon-cvs-archive=cocoon.apache.org@cocoon.apache.org>
Delivered-To: apmail-cocoon-cvs-archive@www.apache.org
Received: (qmail 35085 invoked from network); 6 Oct 2005 12:47:47 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 6 Oct 2005 12:47:47 -0000
Received: (qmail 63235 invoked by uid 500); 6 Oct 2005 12:47:46 -0000
Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org
Received: (qmail 63172 invoked by uid 500); 6 Oct 2005 12:47:45 -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>
List-Id: <cvs.cocoon.apache.org>
Delivered-To: mailing list cvs@cocoon.apache.org
Received: (qmail 63132 invoked by uid 99); 6 Oct 2005 12:47:45 -0000
X-ASF-Spam-Status: No, hits=-9.3 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME,WEIRD_PORT
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
    by apache.org (qpsmtpd/0.29) with SMTP; Thu, 06 Oct 2005 05:47:44 -0700
Received: (qmail 34712 invoked by uid 65534); 6 Oct 2005 12:47:24 -0000
Message-ID: <20051006124724.34695.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r306613 - in /cocoon: blocks/core-samples-additional/
 blocks/core-samples-additional/trunk/
 blocks/core-samples-additional/trunk/samples/
 blocks/core-samples-additional/trunk/samples/aggregation/
 blocks/core-samples-additional/trunk/samples...
Date: Thu, 06 Oct 2005 12:47:15 -0000
To: cvs@cocoon.apache.org
From: bdelacretaz@apache.org
X-Mailer: svnmailer-1.0.5
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: bdelacretaz
Date: Thu Oct  6 05:46:39 2005
New Revision: 306613

URL: http://svn.apache.org/viewcvs?rev=306613&view=rev
Log:
remaining core samples moved to core-samples-additional block

Added:
    cocoon/blocks/core-samples-additional/
    cocoon/blocks/core-samples-additional/trunk/
    cocoon/blocks/core-samples-additional/trunk/samples/
    cocoon/blocks/core-samples-additional/trunk/samples/aggregation/
      - copied from r306609, cocoon/trunk/src/webapp/samples/aggregation/
    cocoon/blocks/core-samples-additional/trunk/samples/catalog/
      - copied from r306609, cocoon/trunk/src/webapp/samples/catalog/
    cocoon/blocks/core-samples-additional/trunk/samples/components-samples.xml   (contents, props changed)
      - copied, changed from r306550, cocoon/trunk/src/webapp/samples/components-samples.xml
    cocoon/blocks/core-samples-additional/trunk/samples/core-samples-additional.xsamples
    cocoon/blocks/core-samples-additional/trunk/samples/errorhandling/
      - copied from r306609, cocoon/trunk/src/webapp/samples/errorhandling/
    cocoon/blocks/core-samples-additional/trunk/samples/filter/
      - copied from r306609, cocoon/trunk/src/webapp/samples/filter/
    cocoon/blocks/core-samples-additional/trunk/samples/imagereader/
      - copied from r306609, cocoon/trunk/src/webapp/samples/imagereader/
    cocoon/blocks/core-samples-additional/trunk/samples/misc-samples.xml   (contents, props changed)
      - copied, changed from r306550, cocoon/trunk/src/webapp/samples/misc-samples.xml
    cocoon/blocks/core-samples-additional/trunk/samples/modules/
      - copied from r306609, cocoon/trunk/src/webapp/samples/modules/
    cocoon/blocks/core-samples-additional/trunk/samples/paginator/
      - copied from r306609, cocoon/trunk/src/webapp/samples/paginator/
    cocoon/blocks/core-samples-additional/trunk/samples/protected/
      - copied from r306609, cocoon/trunk/src/webapp/samples/protected/
    cocoon/blocks/core-samples-additional/trunk/samples/samples.xml
    cocoon/blocks/core-samples-additional/trunk/samples/simpleform/
      - copied from r306609, cocoon/trunk/src/webapp/samples/simpleform/
    cocoon/blocks/core-samples-additional/trunk/samples/sitemap.xmap
    cocoon/blocks/core-samples-additional/trunk/samples/sites/
      - copied from r306609, cocoon/trunk/src/webapp/samples/sites/
    cocoon/blocks/core-samples-additional/trunk/samples/slides/
      - copied from r306609, cocoon/trunk/src/webapp/samples/slides/
    cocoon/blocks/core-samples-additional/trunk/samples/sources/
      - copied from r306609, cocoon/trunk/src/webapp/samples/sources/
    cocoon/blocks/core-samples-additional/trunk/samples/stream/
      - copied from r306609, cocoon/trunk/src/webapp/samples/stream/
    cocoon/blocks/core-samples-additional/trunk/samples/stylesheets/
      - copied from r306609, cocoon/trunk/src/webapp/samples/stylesheets/
    cocoon/blocks/core-samples-additional/trunk/samples/text-wrap/
      - copied from r306609, cocoon/trunk/src/webapp/samples/text-wrap/
Removed:
    cocoon/trunk/src/webapp/samples/aggregation/
    cocoon/trunk/src/webapp/samples/catalog/
    cocoon/trunk/src/webapp/samples/components-samples.xml
    cocoon/trunk/src/webapp/samples/errorhandling/
    cocoon/trunk/src/webapp/samples/filter/
    cocoon/trunk/src/webapp/samples/imagereader/
    cocoon/trunk/src/webapp/samples/misc-samples.xml
    cocoon/trunk/src/webapp/samples/modules/
    cocoon/trunk/src/webapp/samples/no-persistent-store.xml
    cocoon/trunk/src/webapp/samples/paginator/
    cocoon/trunk/src/webapp/samples/protected/
    cocoon/trunk/src/webapp/samples/simpleform/
    cocoon/trunk/src/webapp/samples/sites/
    cocoon/trunk/src/webapp/samples/slides/
    cocoon/trunk/src/webapp/samples/sources/
    cocoon/trunk/src/webapp/samples/stream/
    cocoon/trunk/src/webapp/samples/stylesheets/
    cocoon/trunk/src/webapp/samples/text-wrap/
Modified:
    cocoon/blocks/core-samples-additional/trunk/samples/catalog/samples.xml
    cocoon/blocks/core-samples-additional/trunk/samples/catalog/sdocbook2body.xsl
    cocoon/blocks/core-samples-additional/trunk/samples/catalog/sitemap.xmap
    cocoon/blocks/core-samples-additional/trunk/samples/imagereader/sitemap.xmap
    cocoon/blocks/core-samples-additional/trunk/samples/paginator/README.txt
    cocoon/blocks/core-samples-additional/trunk/samples/paginator/content/list.xml
    cocoon/blocks/core-samples-additional/trunk/samples/paginator/content/text.xml
    cocoon/blocks/core-samples-additional/trunk/samples/paginator/sitemap.xmap
    cocoon/blocks/core-samples-additional/trunk/samples/paginator/stylesheets/list2html.xsl
    cocoon/blocks/core-samples-additional/trunk/samples/paginator/stylesheets/pagedlist2html.xsl
    cocoon/blocks/core-samples-additional/trunk/samples/protected/docs/login.xml
    cocoon/blocks/core-samples-additional/trunk/samples/protected/docs/protected.xml
    cocoon/blocks/core-samples-additional/trunk/samples/protected/sitemap.xmap
    cocoon/blocks/core-samples-additional/trunk/samples/protected/stylesheets/simple-page2html.xsl
    cocoon/blocks/core-samples-additional/trunk/samples/sites/jakarta.apache.org/stylesheet.xsl
    cocoon/blocks/core-samples-additional/trunk/samples/sites/java.apache.org/content.xml
    cocoon/blocks/core-samples-additional/trunk/samples/sites/java.apache.org/stylesheet.xsl
    cocoon/blocks/core-samples-additional/trunk/samples/sites/samples.xml
    cocoon/blocks/core-samples-additional/trunk/samples/sites/sitemap.xmap
    cocoon/blocks/core-samples-additional/trunk/samples/slides/sitemap.xmap
    cocoon/blocks/core-samples-additional/trunk/samples/sources/content/simple.xml
    cocoon/blocks/core-samples-additional/trunk/samples/sources/content/upload.xml
    cocoon/blocks/core-samples-additional/trunk/samples/sources/style/dynamic-xsp2xsp.xsl
    cocoon/blocks/core-samples-additional/trunk/samples/stream/sitemap.xmap
    cocoon/blocks/core-samples-additional/trunk/samples/text-wrap/sitemap.xmap
    cocoon/trunk/blocks.properties
    cocoon/trunk/src/webapp/samples/samples.xml

Modified: cocoon/blocks/core-samples-additional/trunk/samples/catalog/samples.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/core-samples-additional/trunk/samples/catalog/samples.xml?rev=306613&r1=306609&r2=306613&view=diff
==============================================================================
--- cocoon/blocks/core-samples-additional/trunk/samples/catalog/samples.xml (original)
+++ cocoon/blocks/core-samples-additional/trunk/samples/catalog/samples.xml Thu Oct  6 05:46:39 2005
@@ -15,7 +15,7 @@
   limitations under the License.
 -->
 
-<!-- CVS $Id: samples.xml,v 1.10 2004/05/23 08:34:31 crossley Exp $ -->
+<!-- CVS $Id$ -->
 
 <samples name="Catalogs and DocBook" xmlns:xlink="http://www.w3.org/1999/xlink">
 

Modified: cocoon/blocks/core-samples-additional/trunk/samples/catalog/sdocbook2body.xsl
URL: http://svn.apache.org/viewcvs/cocoon/blocks/core-samples-additional/trunk/samples/catalog/sdocbook2body.xsl?rev=306613&r1=306609&r2=306613&view=diff
==============================================================================
--- cocoon/blocks/core-samples-additional/trunk/samples/catalog/sdocbook2body.xsl (original)
+++ cocoon/blocks/core-samples-additional/trunk/samples/catalog/sdocbook2body.xsl Thu Oct  6 05:46:39 2005
@@ -15,7 +15,7 @@
   limitations under the License.
 -->
 
-<!-- CVS $Id: sdocbook2body.xsl,v 1.4 2004/03/06 02:25:54 antonio Exp $ -->
+<!-- CVS $Id$ -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 version="1.0">

Modified: cocoon/blocks/core-samples-additional/trunk/samples/catalog/sitemap.xmap
URL: http://svn.apache.org/viewcvs/cocoon/blocks/core-samples-additional/trunk/samples/catalog/sitemap.xmap?rev=306613&r1=306609&r2=306613&view=diff
==============================================================================
--- cocoon/blocks/core-samples-additional/trunk/samples/catalog/sitemap.xmap (original)
+++ cocoon/blocks/core-samples-additional/trunk/samples/catalog/sitemap.xmap Thu Oct  6 05:46:39 2005
@@ -15,7 +15,7 @@
   limitations under the License.
 -->
 
-<!-- CVS $Id: sitemap.xmap,v 1.5 2004/03/06 02:25:54 antonio Exp $ -->
+<!-- CVS $Id$ -->
 
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
 

Copied: cocoon/blocks/core-samples-additional/trunk/samples/components-samples.xml (from r306550, cocoon/trunk/src/webapp/samples/components-samples.xml)
URL: http://svn.apache.org/viewcvs/cocoon/blocks/core-samples-additional/trunk/samples/components-samples.xml?p2=cocoon/blocks/core-samples-additional/trunk/samples/components-samples.xml&p1=cocoon/trunk/src/webapp/samples/components-samples.xml&r1=306550&r2=306613&rev=306613&view=diff
==============================================================================
--- cocoon/trunk/src/webapp/samples/components-samples.xml (original)
+++ cocoon/blocks/core-samples-additional/trunk/samples/components-samples.xml Thu Oct  6 05:46:39 2005
@@ -15,7 +15,7 @@
   limitations under the License.
 -->
 
-<!-- CVS $Id: components-samples.xml,v 1.8 2004/04/08 20:15:20 ugo Exp $ -->
+<!-- CVS $Id$ -->
 
 <samples xmlns:xlink="http://www.w3.org/1999/xlink" name="Components Samples">
   

Propchange: cocoon/blocks/core-samples-additional/trunk/samples/components-samples.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/blocks/core-samples-additional/trunk/samples/components-samples.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Added: cocoon/blocks/core-samples-additional/trunk/samples/core-samples-additional.xsamples
URL: http://svn.apache.org/viewcvs/cocoon/blocks/core-samples-additional/trunk/samples/core-samples-additional.xsamples?rev=306613&view=auto
==============================================================================
--- cocoon/blocks/core-samples-additional/trunk/samples/core-samples-additional.xsamples (added)
+++ cocoon/blocks/core-samples-additional/trunk/samples/core-samples-additional.xsamples Thu Oct  6 05:46:39 2005
@@ -0,0 +1,27 @@
+<?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.
+-->
+
+<xsamples xpath="/samples" unless="group[@name='Additional core samples']">
+
+  <group name="Additional core samples">
+    <sample name="Additional Core Samples" href="core-samples-additional/">
+      Additional samples of core components 
+      (the main samples are in the core-samples-main block).
+    </sample>
+  </group>
+
+</xsamples>

Modified: cocoon/blocks/core-samples-additional/trunk/samples/imagereader/sitemap.xmap
URL: http://svn.apache.org/viewcvs/cocoon/blocks/core-samples-additional/trunk/samples/imagereader/sitemap.xmap?rev=306613&r1=306609&r2=306613&view=diff
==============================================================================
--- cocoon/blocks/core-samples-additional/trunk/samples/imagereader/sitemap.xmap (original)
+++ cocoon/blocks/core-samples-additional/trunk/samples/imagereader/sitemap.xmap Thu Oct  6 05:46:39 2005
@@ -16,7 +16,7 @@
 -->
 
 <!--
-  CVS $Id: sitemap.xmap,v 1.6 2004/03/21 03:23:10 crossley Exp $
+  CVS $Id$
   
   Image Reader Sample
 -->

Copied: cocoon/blocks/core-samples-additional/trunk/samples/misc-samples.xml (from r306550, cocoon/trunk/src/webapp/samples/misc-samples.xml)
URL: http://svn.apache.org/viewcvs/cocoon/blocks/core-samples-additional/trunk/samples/misc-samples.xml?p2=cocoon/blocks/core-samples-additional/trunk/samples/misc-samples.xml&p1=cocoon/trunk/src/webapp/samples/misc-samples.xml&r1=306550&r2=306613&rev=306613&view=diff
==============================================================================
--- cocoon/trunk/src/webapp/samples/misc-samples.xml (original)
+++ cocoon/blocks/core-samples-additional/trunk/samples/misc-samples.xml Thu Oct  6 05:46:39 2005
@@ -15,7 +15,7 @@
   limitations under the License.
 -->
 
-<!-- CVS $Id: misc-samples.xml,v 1.2 2004/04/05 12:34:22 antonio Exp $ -->
+<!-- CVS $Id$ -->
 
 <samples xmlns:xlink="http://www.w3.org/1999/xlink" name="Miscellaneous samples">
 

Propchange: cocoon/blocks/core-samples-additional/trunk/samples/misc-samples.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/blocks/core-samples-additional/trunk/samples/misc-samples.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: cocoon/blocks/core-samples-additional/trunk/samples/paginator/README.txt
URL: http://svn.apache.org/viewcvs/cocoon/blocks/core-samples-additional/trunk/samples/paginator/README.txt?rev=306613&r1=306609&r2=306613&view=diff
==============================================================================
--- cocoon/blocks/core-samples-additional/trunk/samples/paginator/README.txt (original)
+++ cocoon/blocks/core-samples-additional/trunk/samples/paginator/README.txt Thu Oct  6 05:46:39 2005
@@ -1,5 +1,5 @@
 
-CVS: $Id: README.txt,v 1.2 2004/05/18 09:24:55 unico Exp $
+CVS: $Id$
 
 To get started, read the How-To for this component:
    http://localhost:8888/howto/howto-paginator-transformer.html

Modified: cocoon/blocks/core-samples-additional/trunk/samples/paginator/content/list.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/core-samples-additional/trunk/samples/paginator/content/list.xml?rev=306613&r1=306609&r2=306613&view=diff
==============================================================================
--- cocoon/blocks/core-samples-additional/trunk/samples/paginator/content/list.xml (original)
+++ cocoon/blocks/core-samples-additional/trunk/samples/paginator/content/list.xml Thu Oct  6 05:46:39 2005
@@ -15,7 +15,7 @@
   limitations under the License.
 -->
 
-<!-- CVS: $Id: list.xml,v 1.2 2004/03/06 02:25:49 antonio Exp $ -->
+<!-- CVS: $Id$ -->
 
 <list>
   <item>This is item 1</item>

Modified: cocoon/blocks/core-samples-additional/trunk/samples/paginator/content/text.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/core-samples-additional/trunk/samples/paginator/content/text.xml?rev=306613&r1=306609&r2=306613&view=diff
==============================================================================
--- cocoon/blocks/core-samples-additional/trunk/samples/paginator/content/text.xml (original)
+++ cocoon/blocks/core-samples-additional/trunk/samples/paginator/content/text.xml Thu Oct  6 05:46:39 2005
@@ -15,7 +15,7 @@
   limitations under the License.
 -->
 
-<!-- CVS: $Id: text.xml,v 1.2 2004/03/06 02:25:49 antonio Exp $ -->
+<!-- CVS: $Id$ -->
 
 <list>
   <item>This is the paragraph number one (44 chars).</item>

Modified: cocoon/blocks/core-samples-additional/trunk/samples/paginator/sitemap.xmap
URL: http://svn.apache.org/viewcvs/cocoon/blocks/core-samples-additional/trunk/samples/paginator/sitemap.xmap?rev=306613&r1=306609&r2=306613&view=diff
==============================================================================
--- cocoon/blocks/core-samples-additional/trunk/samples/paginator/sitemap.xmap (original)
+++ cocoon/blocks/core-samples-additional/trunk/samples/paginator/sitemap.xmap Thu Oct  6 05:46:39 2005
@@ -15,7 +15,7 @@
   limitations under the License.
 -->
 
-<!-- CVS: $Id: sitemap.xmap,v 1.4 2004/03/11 16:25:50 stephan Exp $ -->
+<!-- CVS: $Id$ -->
 
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
 

Modified: cocoon/blocks/core-samples-additional/trunk/samples/paginator/stylesheets/list2html.xsl
URL: http://svn.apache.org/viewcvs/cocoon/blocks/core-samples-additional/trunk/samples/paginator/stylesheets/list2html.xsl?rev=306613&r1=306609&r2=306613&view=diff
==============================================================================
--- cocoon/blocks/core-samples-additional/trunk/samples/paginator/stylesheets/list2html.xsl (original)
+++ cocoon/blocks/core-samples-additional/trunk/samples/paginator/stylesheets/list2html.xsl Thu Oct  6 05:46:39 2005
@@ -15,7 +15,7 @@
   limitations under the License.
 -->
 
-<!-- CVS: $Id: list2html.xsl,v 1.2 2004/03/06 02:26:15 antonio Exp $ -->
+<!-- CVS: $Id$ -->
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 

Modified: cocoon/blocks/core-samples-additional/trunk/samples/paginator/stylesheets/pagedlist2html.xsl
URL: http://svn.apache.org/viewcvs/cocoon/blocks/core-samples-additional/trunk/samples/paginator/stylesheets/pagedlist2html.xsl?rev=306613&r1=306609&r2=306613&view=diff
==============================================================================
--- cocoon/blocks/core-samples-additional/trunk/samples/paginator/stylesheets/pagedlist2html.xsl (original)
+++ cocoon/blocks/core-samples-additional/trunk/samples/paginator/stylesheets/pagedlist2html.xsl Thu Oct  6 05:46:39 2005
@@ -15,7 +15,7 @@
   limitations under the License.
 -->
 
-<!-- CVS: $Id: pagedlist2html.xsl,v 1.2 2004/03/06 02:26:15 antonio Exp $ -->
+<!-- CVS: $Id$ -->
 
 <!DOCTYPE xsl:stylesheet [
  <!ENTITY laquo "&#xAB;" >

Modified: cocoon/blocks/core-samples-additional/trunk/samples/protected/docs/login.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/core-samples-additional/trunk/samples/protected/docs/login.xml?rev=306613&r1=306609&r2=306613&view=diff
==============================================================================
--- cocoon/blocks/core-samples-additional/trunk/samples/protected/docs/login.xml (original)
+++ cocoon/blocks/core-samples-additional/trunk/samples/protected/docs/login.xml Thu Oct  6 05:46:39 2005
@@ -15,7 +15,7 @@
   limitations under the License.
 -->
 
-<!-- CVS: $Id: login.xml,v 1.3 2004/03/06 02:25:56 antonio Exp $ -->
+<!-- CVS: $Id$ -->
 
 <page>
   <title>Login page</title>

Modified: cocoon/blocks/core-samples-additional/trunk/samples/protected/docs/protected.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/core-samples-additional/trunk/samples/protected/docs/protected.xml?rev=306613&r1=306609&r2=306613&view=diff
==============================================================================
--- cocoon/blocks/core-samples-additional/trunk/samples/protected/docs/protected.xml (original)
+++ cocoon/blocks/core-samples-additional/trunk/samples/protected/docs/protected.xml Thu Oct  6 05:46:39 2005
@@ -15,7 +15,7 @@
   limitations under the License.
 -->
 
-<!-- CVS: $Id: protected.xml,v 1.1 2004/03/10 16:16:12 unico Exp $ -->
+<!-- CVS: $Id$ -->
 <page>
   <resources>
     <resource type="file" href="descriptors/auth.xml?cocoon-view=pretty-content">Authenticator</resource>

Modified: cocoon/blocks/core-samples-additional/trunk/samples/protected/sitemap.xmap
URL: http://svn.apache.org/viewcvs/cocoon/blocks/core-samples-additional/trunk/samples/protected/sitemap.xmap?rev=306613&r1=306609&r2=306613&view=diff
==============================================================================
--- cocoon/blocks/core-samples-additional/trunk/samples/protected/sitemap.xmap (original)
+++ cocoon/blocks/core-samples-additional/trunk/samples/protected/sitemap.xmap Thu Oct  6 05:46:39 2005
@@ -15,7 +15,7 @@
   limitations under the License.
 -->
 
-<!-- CVS: $Id: sitemap.xmap,v 1.8 2004/03/11 16:25:50 stephan Exp $ -->
+<!-- CVS: $Id$ -->
 
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
 

Modified: cocoon/blocks/core-samples-additional/trunk/samples/protected/stylesheets/simple-page2html.xsl
URL: http://svn.apache.org/viewcvs/cocoon/blocks/core-samples-additional/trunk/samples/protected/stylesheets/simple-page2html.xsl?rev=306613&r1=306609&r2=306613&view=diff
==============================================================================
--- cocoon/blocks/core-samples-additional/trunk/samples/protected/stylesheets/simple-page2html.xsl (original)
+++ cocoon/blocks/core-samples-additional/trunk/samples/protected/stylesheets/simple-page2html.xsl Thu Oct  6 05:46:39 2005
@@ -15,7 +15,7 @@
   limitations under the License.
 -->
 
-<!-- CVS: $Id: simple-page2html.xsl,v 1.3 2004/03/06 02:25:53 antonio Exp $ -->
+<!-- CVS: $Id$ -->
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 

Added: cocoon/blocks/core-samples-additional/trunk/samples/samples.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/core-samples-additional/trunk/samples/samples.xml?rev=306613&view=auto
==============================================================================
--- cocoon/blocks/core-samples-additional/trunk/samples/samples.xml (added)
+++ cocoon/blocks/core-samples-additional/trunk/samples/samples.xml Thu Oct  6 05:46:39 2005
@@ -0,0 +1,68 @@
+<?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.
+-->
+
+<!--+
+    | Main samples page
+    |
+    | CVS $Id: samples.xml 216123 2005-07-13 07:18:17Z cziegeler $
+    +-->
+
+<samples name="Additional Cocoon Core Samples" xmlns:xlink="http://www.w3.org/1999/xlink">
+
+  <group name="The Power of XML">
+    <sample name="XML-ized web sites" href="sites/">
+      A couple of existing web sites have been xml-ized to show you
+      how easier it is to handle pure-content markup.
+    </sample>   
+    <sample name="Presentation Slides" href="slides/slides">
+      An example of more complex use of XSLT for navigation and content filtering.
+    </sample>   
+    <sample name="Content Syndication &amp; Aggregation" href="aggregation/">
+      Separation of content and style allows not only to serve your content
+      in different ways, but also to syndicate, aggregate or otherwise include
+      and transform content provided by other web sites.
+    </sample>
+    <sample name="Catalog Entity Resolver" href="catalog/">
+      XML is handy but also very complex. Cocoon integrates a number of 
+      facilities to help you during your journey through XML-land. One of these
+      is the centralized handling of resolving network resources 
+      (e.g. DTDs, symbols, character entity sets, images) to local copies
+      through the use of catalogs. Also explains how to use DocBook DTDs.
+    </sample>
+  </group>
+
+  <group name="More Core Samples">
+    <sample href="modules/" name="The Power of Sitemap: Input Modules">
+      This example shows the usage of Input Modules in sitemap attribute expressions.
+    </sample>
+    <sample href="sources/" name="The Power of Sitemap: Sources">
+      This example shows the usage of sources in the sitemap.
+    </sample>    
+    <sample href="errorhandling/" name="Error Handling">
+      An example page producing exceptions and handling them. Demonstrates the 
+      handler hierarchy and the exception selectors.
+    </sample>
+    <sample href="components" name="Core Components">
+      Some samples of various components that are included with the core,
+      e.g. Stream Generators, Paginator Transformers, Image Readers.
+    </sample>
+    <sample href="misc" name="Miscellaneous samples">
+      Some stuff that does not fit into the other groups of samples.
+    </sample>
+  </group>
+
+</samples>

Added: cocoon/blocks/core-samples-additional/trunk/samples/sitemap.xmap
URL: http://svn.apache.org/viewcvs/cocoon/blocks/core-samples-additional/trunk/samples/sitemap.xmap?rev=306613&view=auto
==============================================================================
--- cocoon/blocks/core-samples-additional/trunk/samples/sitemap.xmap (added)
+++ cocoon/blocks/core-samples-additional/trunk/samples/sitemap.xmap Thu Oct  6 05:46:39 2005
@@ -0,0 +1,213 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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: sitemap.xmap 164239 2005-04-22 13:54:29Z reinhard $ -->
+
+<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
+
+  <!-- ========================= Components ================================ -->
+
+  <map:components>
+    <map:generators default="file">
+      <map:generator name="linkstatus" src="org.apache.cocoon.generation.LinkStatusGenerator"/>
+      <map:generator name="calendar" src="org.apache.cocoon.generation.CalendarGenerator"/>
+    </map:generators>
+  </map:components>
+
+  <!-- =========================== Views =================================== -->
+
+  <map:views>
+    <map:view name="content" from-label="content">
+      <map:serialize type="xml"/>
+    </map:view>
+
+    <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:serialize type="links"/>
+    </map:view>
+  </map:views>
+
+  <!-- ========================== Pipelines ================================ -->
+
+  <map:pipelines>
+    <map:component-configurations>
+      <global-variables>
+         <!--+
+             | Define global parameters, used in the input modules GlobalInputModule demo.
+             +-->
+         <global-sitemap>This value is defined in the samples/sitemap.xmap</global-sitemap>
+         <global-sitemap-override>This value is defined in the samples/sitemap.xmap, should be overridden by samples/modules/sitemap.xmap</global-sitemap-override>
+      </global-variables>
+    </map:component-configurations>
+
+    <map:pipeline>
+      <map:match pattern="v">
+        <map:generate type="virtual"/>
+        <map:serialize type="xhtml"/>
+      </map:match>
+
+      <map:match pattern="">
+        <map:generate src="samples.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>
+
+      <!-- ========================= Stream ================================ -->
+
+      <map:match pattern="order">
+        <map:generate src="stream/OrderPage.xml"/>
+        <map:transform src="context://samples/stylesheets/dynamic-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=".xsp"/>
+        </map:transform>
+        <map:serialize type="html"/>
+      </map:match>
+
+      <map:match pattern="process-order">
+        <map:generate type="stream">
+          <map:parameter name="form-name" value="Foo"/>
+        </map:generate>
+        <map:transform src="context://stylesheets/system/xml2html.xslt"/>
+        <map:serialize type="html"/>
+      </map:match>
+
+      <!-- ======================= Other Samples =========================== -->
+
+      <map:match pattern="scratchpad">
+        <map:generate src="scratchpad-samples.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="components">
+        <map:generate src="components-samples.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="misc">
+        <map:generate src="misc-samples.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>
+
+      <!-- ======================== Utilities ============================== -->
+
+      <map:match pattern="**sitemap.xmap">
+        <map:generate src="{0}"/>
+        <map:serialize type="xml"/>
+      </map:match>
+
+      <map:match pattern="linkstatus">
+        <map:redirect-to uri="linkstatus/localhost/8888/docs/index.html"/>
+      </map:match>
+
+      <map:match pattern="linkstatus/*/*/**">
+        <map:generate type="linkstatus" src="http://{1}:{2}/{3}"/>
+        <map:transform src="context://stylesheets/system/linkstatus2html.xslt"/>
+        <map:serialize/>
+      </map:match>
+
+      <map:match pattern="status.html">
+        <map:generate type="status"/>
+        <map:transform src="context://stylesheets/system/status2html.xslt">
+          <map:parameter name="contextPath" value="{request:contextPath}"/>
+        </map:transform>
+        <map:serialize/>
+      </map:match>
+
+      <map:match pattern="status-with-continuations.xml">
+        <map:generate type="status">
+					<map:parameter name="show-cont" value="true"/>
+        </map:generate>
+        <map:serialize type="xml"/>
+      </map:match>     
+      
+      <map:match pattern="status-with-continuations.html">
+        <map:generate src="cocoon:/status-with-continuations.xml"/>
+        <map:transform src="context://stylesheets/system/status2html.xslt">
+          <map:parameter name="contextPath" value="{request:contextPath}"/>
+        </map:transform>
+        <map:serialize/>
+      </map:match>      
+
+      <map:match pattern="clearcache.html">
+        <map:act type="clear-cache">
+          <map:generate src="status" type="status"/>
+          <map:transform src="context://stylesheets/system/status2html.xslt">
+            <map:parameter name="contextPath" value="{request:contextPath}"/>
+          </map:transform>
+          <map:serialize/>
+        </map:act>
+      </map:match>
+
+      <map:match pattern="clearpersistentstore.html">
+        <map:act type="clear-persistent-store">
+          <map:generate src="status" type="status"/>
+          <map:transform src="context://stylesheets/system/status2html.xslt">
+            <map:parameter name="contextPath" value="{request:contextPath}"/>
+          </map:transform>
+          <map:serialize/>
+        </map:act>
+        <map:generate src="no-persistent-store.xml"/>
+        <map:transform src="context://stylesheets/system/xml2html.xslt"/>
+        <map:serialize type="html"/>
+      </map:match>
+
+      <map:match pattern="request.html">
+        <map:generate type="request"/>
+        <map:transform src="context://stylesheets/system/xml2html.xslt"/>
+        <map:serialize/>
+      </map:match>
+
+      <map:match pattern="cal">
+        <map:generate type="calendar" label="content">
+          <!-- Uncomment and set a value for the desired month and year
+          <map:parameter name="month" value="6"/>
+          <map:parameter name="year" value="1998"/>
+          -->
+          <map:parameter name="dateFormat" value="EEEE, MMMM d yyyy"/>
+          <map:parameter name="lang" value="en"/>
+          <map:parameter name="country" value="US"/>
+        </map:generate>
+        <map:transform src="context://stylesheets/system/calendar2html.xslt"/>
+        <map:serialize/>
+      </map:match>
+
+      <!-- ========================= Automount ============================= -->
+
+      <map:match pattern="*/**">
+        <map:mount uri-prefix="{1}" src="{1}/" check-reload="yes"/>
+      </map:match>
+    </map:pipeline>
+
+  </map:pipelines>
+</map:sitemap>

Modified: cocoon/blocks/core-samples-additional/trunk/samples/sites/jakarta.apache.org/stylesheet.xsl
URL: http://svn.apache.org/viewcvs/cocoon/blocks/core-samples-additional/trunk/samples/sites/jakarta.apache.org/stylesheet.xsl?rev=306613&r1=306609&r2=306613&view=diff
==============================================================================
--- cocoon/blocks/core-samples-additional/trunk/samples/sites/jakarta.apache.org/stylesheet.xsl (original)
+++ cocoon/blocks/core-samples-additional/trunk/samples/sites/jakarta.apache.org/stylesheet.xsl Thu Oct  6 05:46:39 2005
@@ -16,7 +16,7 @@
 -->
 
 <!-- Author: Stefano Mazzocchi "stefano@apache.org" -->
-<!-- Version: $Id: stylesheet.xsl,v 1.2 2004/03/06 02:26:16 antonio Exp $ -->
+<!-- Version: $Id$ -->
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 

Modified: cocoon/blocks/core-samples-additional/trunk/samples/sites/java.apache.org/content.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/core-samples-additional/trunk/samples/sites/java.apache.org/content.xml?rev=306613&r1=306609&r2=306613&view=diff
==============================================================================
--- cocoon/blocks/core-samples-additional/trunk/samples/sites/java.apache.org/content.xml (original)
+++ cocoon/blocks/core-samples-additional/trunk/samples/sites/java.apache.org/content.xml Thu Oct  6 05:46:39 2005
@@ -19,7 +19,7 @@
 
  <title>The Java Apache Project News</title>
  <author>Stefano Mazzocchi</author>
- <version>$Id: content.xml,v 1.2 2004/03/06 02:25:35 antonio Exp $</version>
+ <version>$Id$</version>
   
  <newscolumn>
   <news>

Modified: cocoon/blocks/core-samples-additional/trunk/samples/sites/java.apache.org/stylesheet.xsl
URL: http://svn.apache.org/viewcvs/cocoon/blocks/core-samples-additional/trunk/samples/sites/java.apache.org/stylesheet.xsl?rev=306613&r1=306609&r2=306613&view=diff
==============================================================================
--- cocoon/blocks/core-samples-additional/trunk/samples/sites/java.apache.org/stylesheet.xsl (original)
+++ cocoon/blocks/core-samples-additional/trunk/samples/sites/java.apache.org/stylesheet.xsl Thu Oct  6 05:46:39 2005
@@ -16,7 +16,7 @@
 -->
 
 <!-- Author: Stefano Mazzocchi "stefano@apache.org" -->
-<!-- Version: $Id: stylesheet.xsl,v 1.2 2004/03/06 02:25:35 antonio Exp $ -->
+<!-- Version: $Id$ -->
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 

Modified: cocoon/blocks/core-samples-additional/trunk/samples/sites/samples.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/core-samples-additional/trunk/samples/sites/samples.xml?rev=306613&r1=306609&r2=306613&view=diff
==============================================================================
--- cocoon/blocks/core-samples-additional/trunk/samples/sites/samples.xml (original)
+++ cocoon/blocks/core-samples-additional/trunk/samples/sites/samples.xml Thu Oct  6 05:46:39 2005
@@ -15,7 +15,7 @@
   limitations under the License.
 -->
 
-<!-- CVS $Id: samples.xml,v 1.5 2004/04/05 12:34:23 antonio Exp $ -->
+<!-- CVS $Id$ -->
 
 <samples name="XML-ized Web Sites">
 

Modified: cocoon/blocks/core-samples-additional/trunk/samples/sites/sitemap.xmap
URL: http://svn.apache.org/viewcvs/cocoon/blocks/core-samples-additional/trunk/samples/sites/sitemap.xmap?rev=306613&r1=306609&r2=306613&view=diff
==============================================================================
--- cocoon/blocks/core-samples-additional/trunk/samples/sites/sitemap.xmap (original)
+++ cocoon/blocks/core-samples-additional/trunk/samples/sites/sitemap.xmap Thu Oct  6 05:46:39 2005
@@ -15,7 +15,7 @@
   limitations under the License.
 -->
 
-<!-- CVS $Id: sitemap.xmap,v 1.3 2004/03/06 02:26:19 antonio Exp $ -->
+<!-- CVS $Id$ -->
 
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
 

Modified: cocoon/blocks/core-samples-additional/trunk/samples/slides/sitemap.xmap
URL: http://svn.apache.org/viewcvs/cocoon/blocks/core-samples-additional/trunk/samples/slides/sitemap.xmap?rev=306613&r1=306609&r2=306613&view=diff
==============================================================================
--- cocoon/blocks/core-samples-additional/trunk/samples/slides/sitemap.xmap (original)
+++ cocoon/blocks/core-samples-additional/trunk/samples/slides/sitemap.xmap Thu Oct  6 05:46:39 2005
@@ -15,7 +15,7 @@
   limitations under the License.
 -->
 
-<!-- CVS $Id: sitemap.xmap,v 1.5 2004/03/11 16:25:50 stephan Exp $ -->
+<!-- CVS $Id$ -->
 
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
 

Modified: cocoon/blocks/core-samples-additional/trunk/samples/sources/content/simple.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/core-samples-additional/trunk/samples/sources/content/simple.xml?rev=306613&r1=306609&r2=306613&view=diff
==============================================================================
--- cocoon/blocks/core-samples-additional/trunk/samples/sources/content/simple.xml (original)
+++ cocoon/blocks/core-samples-additional/trunk/samples/sources/content/simple.xml Thu Oct  6 05:46:39 2005
@@ -15,7 +15,7 @@
   limitations under the License.
 -->
 
-<!-- CVS $Id: simple.xml,v 1.2 2004/03/06 02:25:45 antonio Exp $ -->
+<!-- CVS $Id$ -->
 
 <page>
   <title>Simple static page, served by sub-sitemap</title>

Modified: cocoon/blocks/core-samples-additional/trunk/samples/sources/content/upload.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/core-samples-additional/trunk/samples/sources/content/upload.xml?rev=306613&r1=306609&r2=306613&view=diff
==============================================================================
--- cocoon/blocks/core-samples-additional/trunk/samples/sources/content/upload.xml (original)
+++ cocoon/blocks/core-samples-additional/trunk/samples/sources/content/upload.xml Thu Oct  6 05:46:39 2005
@@ -15,7 +15,7 @@
   limitations under the License.
 -->
 
-<!-- CVS $Id: upload.xml,v 1.2 2004/03/06 02:25:45 antonio Exp $ -->
+<!-- CVS $Id$ -->
 
 <page>
   <title>Demonstrate file upload as source</title>

Modified: cocoon/blocks/core-samples-additional/trunk/samples/sources/style/dynamic-xsp2xsp.xsl
URL: http://svn.apache.org/viewcvs/cocoon/blocks/core-samples-additional/trunk/samples/sources/style/dynamic-xsp2xsp.xsl?rev=306613&r1=306609&r2=306613&view=diff
==============================================================================
--- cocoon/blocks/core-samples-additional/trunk/samples/sources/style/dynamic-xsp2xsp.xsl (original)
+++ cocoon/blocks/core-samples-additional/trunk/samples/sources/style/dynamic-xsp2xsp.xsl Thu Oct  6 05:46:39 2005
@@ -15,7 +15,7 @@
   limitations under the License.
 -->
 
-<!-- CVS $Id: dynamic-xsp2xsp.xsl,v 1.2 2004/03/06 02:25:49 antonio Exp $ -->
+<!-- CVS $Id$ -->
 
 <xsl:stylesheet version="1.0" 
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"

Modified: cocoon/blocks/core-samples-additional/trunk/samples/stream/sitemap.xmap
URL: http://svn.apache.org/viewcvs/cocoon/blocks/core-samples-additional/trunk/samples/stream/sitemap.xmap?rev=306613&r1=306609&r2=306613&view=diff
==============================================================================
--- cocoon/blocks/core-samples-additional/trunk/samples/stream/sitemap.xmap (original)
+++ cocoon/blocks/core-samples-additional/trunk/samples/stream/sitemap.xmap Thu Oct  6 05:46:39 2005
@@ -15,7 +15,7 @@
   limitations under the License.
 -->
 
-<!-- CVS $Id: sitemap.xmap,v 1.6 2004/03/06 14:05:03 joerg Exp $ -->
+<!-- CVS $Id$ -->
 
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
 

Modified: cocoon/blocks/core-samples-additional/trunk/samples/text-wrap/sitemap.xmap
URL: http://svn.apache.org/viewcvs/cocoon/blocks/core-samples-additional/trunk/samples/text-wrap/sitemap.xmap?rev=306613&r1=306609&r2=306613&view=diff
==============================================================================
--- cocoon/blocks/core-samples-additional/trunk/samples/text-wrap/sitemap.xmap (original)
+++ cocoon/blocks/core-samples-additional/trunk/samples/text-wrap/sitemap.xmap Thu Oct  6 05:46:39 2005
@@ -15,7 +15,7 @@
   limitations under the License.
 -->
 
-<!-- CVS $Id: sitemap.xmap,v 1.3 2004/03/06 02:26:19 antonio Exp $ -->
+<!-- CVS $Id$ -->
 
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
 

Modified: cocoon/trunk/blocks.properties
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks.properties?rev=306613&r1=306612&r2=306613&view=diff
==============================================================================
--- cocoon/trunk/blocks.properties (original)
+++ cocoon/trunk/blocks.properties Thu Oct  6 05:46:39 2005
@@ -60,6 +60,7 @@
 #include.block.bsf=false
 #-----[dependency]: "chaperon" depends on "template" (for samples).
 #include.block.chaperon=false
+#include.block.core-samples-additional=false
 #-----[dependency]: "core-samples-main" depends on "xsp" (for samples).
 #include.block.core-samples-main=false
 #-----[dependency]: "databases" depends on "hsqldb" (for samples).

Modified: cocoon/trunk/src/webapp/samples/samples.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/webapp/samples/samples.xml?rev=306613&r1=306612&r2=306613&view=diff
==============================================================================
--- cocoon/trunk/src/webapp/samples/samples.xml (original)
+++ cocoon/trunk/src/webapp/samples/samples.xml Thu Oct  6 05:46:39 2005
@@ -23,119 +23,17 @@
 
 <samples name="Cocoon Samples" xmlns:xlink="http://www.w3.org/1999/xlink">
 
-  <group name="The Power of XML">
-    <sample name="Hello World!" href="hello-world/">
-      The complete separation between content and style
-      leads to a very powerful multi-channeling solution where you can
-      apply different stylesheets to the same content and generate different
-      flavors of it.
-    </sample>
-    <sample name="XML-ized web sites" href="sites/">
-      A couple of existing web sites have been xml-ized to show you
-      how easier it is to handle pure-content markup.
-    </sample>   
-    <sample name="Presentation Slides" href="slides/slides">
-      An example of more complex use of XSLT for navigation and content filtering.
-    </sample>   
-    <sample name="Internationalization (i18n) &amp; Localization (l10n)" href="i18n/">
-      Since XML is based on Unicode, it can be used to encode all types of
-      languages. Here is an example of the power of such an approach with
-      the help of those i18n and l10n Cocoon facilities.
-    </sample>
-    <sample name="Content Syndication &amp; Aggregation" href="aggregation/">
-      Separation of content and style allows not only to serve your content
-      in different ways, but also to syndicate, aggregate or otherwise include
-      and transform content provided by other web sites.
-    </sample>
-    <sample name="Catalog Entity Resolver" href="catalog/">
-      XML is handy but also very complex. Cocoon integrates a number of 
-      facilities to help you during your journey through XML-land. One of these
-      is the centralized handling of resolving network resources 
-      (e.g. DTDs, symbols, character entity sets, images) to local copies
-      through the use of catalogs. Also explains how to use DocBook DTDs.
-    </sample>
-  </group>
-
-  <group name="More Core Samples">
-    <sample href="modules/" name="The Power of Sitemap: Input Modules">
-      This example shows the usage of Input Modules in sitemap attribute expressions.
-    </sample>
-    <sample href="sources/" name="The Power of Sitemap: Sources">
-      This example shows the usage of sources in the sitemap.
-    </sample>    
-    <sample href="errorhandling/" name="Error Handling">
-      An example page producing exceptions and handling them. Demonstrates the 
-      handler hierarchy and the exception selectors.
-    </sample>
-    <sample href="components" name="Core Components">
-      Some samples of various components that are included with the core,
-      e.g. Stream Generators, Paginator Transformers, Image Readers.
-    </sample>
-    <sample href="misc" name="Miscellaneous samples">
-      Some stuff that does not fit into the other groups of samples.
-    </sample>
-  </group>
-
   <group name="Block Samples">
     <sample name="Blocks with samples" href="blocks/">
-      Functionality outside the core has been moved to units called "blocks".
-      This will lead to a more modular Cocoon. Here you find the many samples 
-      provided by the currently installed blocks. 
+      TODO: all samples are now in blocks, this page should include links to the
+      blocks that we want to show here: core-samples-main, forms. tour, others?
     </sample>
   </group>
 
-  <group name="Cocoon Control Flow">
-    <note>
-      Since the Cocoon Control Flow is a core technology you find more examples
-      that make use of it e.g. Cocoon Forms block, Petstore block, and
-      Supersonic Tour block.
-    </note>      
-    <sample name="Flow" href="flow/">
-      Other examples of Cocoon's control flow of the application.
-    </sample>
-  </group>  
-
-  <group name="Test Pages">
+  <group name="Test pages">
     <sample name="Automated tests" href="test/">
-      Pages used by HTTP-based automated tests.
+      These pages are used by the HtmlUnit automated tests.
     </sample>
   </group>
 
-  <group name="System Tools And Pages">
-    <sample name="Status Page" href="status.html">
-      This page shows the current internal status of cocoon, along with
-      information on the cache and the object stores.
-    </sample>
-    <sample name="Status Page (with continuations)" href="status-with-continuations.html">
-      This page shows the current internal status of cocoon, along with
-      information on the cache and the object stores and the continuations.
-    </sample>    
-    <sample name="Status Page (with continuations - XML)" href="status-with-continuations.xml">
-      This page shows the current internal status of cocoon, along with
-      information on the cache and the object stores and the continuations.
-    </sample>        
-    <sample name="Clear Cache" href="clearcache.html">
-      Empties the Cocoon in-memory cache.
-    </sample>
-    <sample name="Clear Store" href="clearpersistentstore.html">
-      Empties the Cocoon persistent store.
-    </sample>
-    <sample name="Link Status" href="linkstatus">
-      Verify that there are no broken hyperlinks in the local Cocoon
-      documentation. This sample will start at the home page of the local
-      documentation webapp and traverse each internal link, reporting its status
-      in a colour-coded table. Be patient - this process will take a while.
-      NOTE: this will work only if you have included the documentation when 
-      you built the web application
-    </sample>
-  </group>
-
-  <group name="Documentation">
-    <sample name="Core Documentation" href="../docs/">
-      Generated from the xml source.
-    </sample>
-    <sample name="Back" href="..">
-      To the front page.
-    </sample>
-  </group>
 </samples>