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 2007/11/14 21:51:39 UTC

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...

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.
 -->
 
-<!--+
-    | Main samples page
-    |
-    | @version $Id$
-    +-->
-
-<samples name="Additional Cocoon Core Samples" xmlns:xlink="http://www.w3.org/1999/xlink">
+<!--
+  - Main samples page
+  -
+  - @version $Id$
+  -->
+<samples name="Additional Cocoon Core Samples">
 
   <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>
     <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 
+      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.
     </sample>
@@ -49,13 +43,6 @@
   <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,

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 @@
     </sample>
   </group>
 
+  <group name="Cocoon Sitemap">
+    <sample href="sources/" name="Sources">
+      This example shows the usage of sources in the sitemap.
+    </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 href="errorhandling/" name="Error Handling">
+      An example page producing exceptions and handling them. Demonstrates the 
+      error handlers hierarchy and the exception selectors.
+    </sample>
+  </group>
+
   <group name="Cocoon Flow">
     <note>
       These are basic examples of Flow usage, but it is also used in the samples
@@ -49,30 +64,24 @@
     </sample>
   </group>
 
-  <group name="Spring Sample">
-    <sample name="Spring Sample" href="spring/">
-      A simple example of using a per sitemap Spring application context.
-    </sample>
-  </group>
-
   <group name="Internationalization">
     <sample name="Internationalization (i18n) &amp; Localization (l10n)" href="i18n/">
       Samples of the powerful Cocoon i18n and l10n Cocoon tools.
     </sample>
   </group>
 
-  <group name="System Tools And Pages">
-    <sample name="System Tools" href="system/">
-      Display Cocoon status, clear the Cocoon cache, etc.
+  <group name="Development Samples">
+    <sample name="Spring Sample" href="spring/">
+      A simple example of using a per sitemap Spring application context.
+    </sample>
+    <sample name="Class Reloading" href="reloading/">
+      Trivial sample of class reloading.
     </sample>
   </group>
 
-  <group name="Reloading classes">
-    <note>
-      Trivial sample of class reloading
-    </note>
-    <sample name="Reloading" href="reloading/">
-      Class Reloading sample.
+  <group name="System Tools And Pages">
+    <sample name="System Tools" href="system/">
+      Display Cocoon status, clear the Cocoon cache, etc.
     </sample>
   </group>