Return-Path: Delivered-To: apmail-cocoon-cvs-archive@www.apache.org Received: (qmail 70898 invoked from network); 14 Nov 2007 20:52:09 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 14 Nov 2007 20:52:09 -0000 Received: (qmail 9718 invoked by uid 500); 14 Nov 2007 20:51:56 -0000 Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org Received: (qmail 9665 invoked by uid 500); 14 Nov 2007 20:51:56 -0000 Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@cocoon.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@cocoon.apache.org Received: (qmail 9654 invoked by uid 99); 14 Nov 2007 20:51:56 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 14 Nov 2007 12:51:56 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 14 Nov 2007 20:52:57 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 11E831A9832; Wed, 14 Nov 2007 12:51:44 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r595049 - in /cocoon/trunk/blocks/cocoon-core-sample: cocoon-core-additional-sample/src/main/resources/COB-INF/ cocoon-core-additional-sample/src/main/resources/COB-INF/aggregation/ cocoon-core-additional-sample/src/main/resources/COB-INF/e... Date: Wed, 14 Nov 2007 20:51:39 -0000 To: cvs@cocoon.apache.org From: vgritsenko@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071114205144.11E831A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: vgritsenko Date: Wed Nov 14 12:51:36 2007 New Revision: 595049 URL: http://svn.apache.org/viewvc?rev=595049&view=rev Log: move examples of core cocoon concepts to where they belong (first step towards eliminating cocoon-core-additional-sample block) Added: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/ - copied from r594628, cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/aggregation/ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/aggregate.xml - copied unchanged from r595048, cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/aggregation/aggregate.xml cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/ - copied from r595048, cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/aggregation/content/ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/samples.xml - copied unchanged from r595048, cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/aggregation/samples.xml cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/sitemap.xmap - copied unchanged from r595048, cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/aggregation/sitemap.xmap cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/stylesheets/ - copied from r595048, cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/aggregation/stylesheets/ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/xaggregate.xml - copied unchanged from r595048, cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/aggregation/xaggregate.xml cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/errorhandling/ - copied from r594628, cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/errorhandling/ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/errorhandling/exception/ - copied from r595048, cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/errorhandling/exception/ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/errorhandling/internal/ - copied from r595048, cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/errorhandling/internal/ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/errorhandling/notFound.html - copied unchanged from r595048, cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/errorhandling/notFound.html cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/errorhandling/samples.xml - copied unchanged from r595048, cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/errorhandling/samples.xml cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/errorhandling/sitemap.xmap - copied unchanged from r595048, cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/errorhandling/sitemap.xmap cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/sources/ - copied from r594628, cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/sources/ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/sources/content/ - copied from r595048, cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/sources/content/ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/sources/samples.xml - copied unchanged from r595048, cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/sources/samples.xml cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/sources/sitemap.xmap - copied unchanged from r595048, cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/sources/sitemap.xmap cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/sources/style/ - copied from r595048, cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/sources/style/ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/sources/test.sxw - copied unchanged from r595048, cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/sources/test.sxw cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/sources/test.zip - copied unchanged from r595048, cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/sources/test.zip cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/sources/xsp.xmap - copied unchanged from r595048, cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/sources/xsp.xmap Removed: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/aggregation/ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/errorhandling/ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/sources/ Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/samples.xml cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/samples.xml Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/samples.xml URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/samples.xml?rev=595049&r1=595048&r2=595049&view=diff ============================================================================== --- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/samples.xml (original) +++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/samples.xml Wed Nov 14 12:51:36 2007 @@ -16,31 +16,25 @@ limitations under the License. --> - - - + + A couple of existing web sites have been xml-ized to show you how easier it is to handle pure-content markup. - + An example of more complex use of XSLT for navigation and content filtering. - - - 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. - XML is handy but also very complex. Cocoon integrates a number of + 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 + 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. @@ -49,13 +43,6 @@ This example shows the usage of Input Modules in sitemap attribute expressions. - - - This example shows the usage of sources in the sitemap. - - - An example page producing exceptions and handling them. Demonstrates the - handler hierarchy and the exception selectors. Some samples of various components that are included with the core, Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/samples.xml URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/samples.xml?rev=595049&r1=595048&r2=595049&view=diff ============================================================================== --- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/samples.xml (original) +++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/samples.xml Wed Nov 14 12:51:36 2007 @@ -30,6 +30,21 @@ + + + This example shows the usage of sources in the sitemap. + + + 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. + + + An example page producing exceptions and handling them. Demonstrates the + error handlers hierarchy and the exception selectors. + + + These are basic examples of Flow usage, but it is also used in the samples @@ -49,30 +64,24 @@ - - - A simple example of using a per sitemap Spring application context. - - - Samples of the powerful Cocoon i18n and l10n Cocoon tools. - - - Display Cocoon status, clear the Cocoon cache, etc. + + + A simple example of using a per sitemap Spring application context. + + + Trivial sample of class reloading. - - - Trivial sample of class reloading - - - Class Reloading sample. + + + Display Cocoon status, clear the Cocoon cache, etc.