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/10/26 22:01:44 UTC

svn commit: r588762 - in /cocoon/trunk/blocks: cocoon-ajax/cocoon-ajax-sample/src/main/resources/COB-INF/ cocoon-apples/cocoon-apples-sample/src/main/resources/COB-INF/ cocoon-auth/cocoon-auth-sample/src/main/resources/COB-INF/ cocoon-authentication-fw...

Author: vgritsenko
Date: Fri Oct 26 13:01:41 2007
New Revision: 588762

URL: http://svn.apache.org/viewvc?rev=588762&view=rev
Log:
Restructuring samples page. It looks much better (IMHO) now (see localhost:8888/samples/), but still needs more
text blurbs about particular blocks.

Removed:
    cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/COB-INF/groovyflow.xsamples
Modified:
    cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-sample/src/main/resources/COB-INF/ajax.xsamples
    cocoon/trunk/blocks/cocoon-apples/cocoon-apples-sample/src/main/resources/COB-INF/apples.xsamples
    cocoon/trunk/blocks/cocoon-auth/cocoon-auth-sample/src/main/resources/COB-INF/auth.xsamples
    cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-sample/src/main/resources/COB-INF/authentication-fw.xsamples
    cocoon/trunk/blocks/cocoon-axis/cocoon-axis-sample/src/main/resources/COB-INF/axis.xsamples
    cocoon/trunk/blocks/cocoon-bsf/cocoon-bsf-sample/src/main/resources/COB-INF/bsf.xsamples
    cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-sample/src/main/resources/COB-INF/captcha.xsamples
    cocoon/trunk/blocks/cocoon-cron/cocoon-cron-sample/src/main/resources/COB-INF/cron.xsamples
    cocoon/trunk/blocks/cocoon-databases/cocoon-databases-sample/src/main/resources/COB-INF/databases.xsamples
    cocoon/trunk/blocks/cocoon-deli/cocoon-deli-sample/src/main/resources/COB-INF/deli.xsamples
    cocoon/trunk/blocks/cocoon-eventcache/cocoon-eventcache-sample/src/main/resources/COB-INF/eventcache.xsamples
    cocoon/trunk/blocks/cocoon-faces/cocoon-faces-sample/src/main/resources/COB-INF/faces.xsamples
    cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms.xsamples
    cocoon/trunk/blocks/cocoon-html/cocoon-html-sample/src/main/resources/COB-INF/html.xsamples
    cocoon/trunk/blocks/cocoon-imageop/cocoon-imageop-sample/src/main/resources/COB-INF/imageop.xsamples
    cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-sample/src/main/resources/COB-INF/javaflow.xsamples
    cocoon/trunk/blocks/cocoon-jms/cocoon-jms-sample/src/main/resources/COB-INF/jms.xsamples
    cocoon/trunk/blocks/cocoon-jsp/cocoon-jsp-sample/src/main/resources/COB-INF/jsp.xsamples
    cocoon/trunk/blocks/cocoon-linkrewriter/cocoon-linkrewriter-sample/src/main/resources/COB-INF/linkrewriter.xsamples
    cocoon/trunk/blocks/cocoon-lucene/cocoon-lucene-sample/src/main/resources/COB-INF/lucene.xsamples
    cocoon/trunk/blocks/cocoon-mail/cocoon-mail-sample/src/main/resources/COB-INF/mail.xsamples
    cocoon/trunk/blocks/cocoon-petstore/cocoon-petstore-sample/src/main/resources/COB-INF/petstore.xsamples
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/portal-sample.xsamples
    cocoon/trunk/blocks/cocoon-profiler/cocoon-profiler-sample/src/main/resources/COB-INF/profiler.xsamples
    cocoon/trunk/blocks/cocoon-proxy/cocoon-proxy-sample/src/main/resources/COB-INF/proxy.xsamples
    cocoon/trunk/blocks/cocoon-querybean/cocoon-querybean-sample/src/main/resources/COB-INF/querybean.xsamples
    cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/COB-INF/scratchpad.xsamples
    cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-sample/src/main/resources/COB-INF/session-fw.xsamples
    cocoon/trunk/blocks/cocoon-slop/cocoon-slop-sample/src/main/resources/COB-INF/slop.xsamples
    cocoon/trunk/blocks/cocoon-stx/cocoon-stx-sample/src/main/resources/COB-INF/stx.xsamples
    cocoon/trunk/blocks/cocoon-taglib/cocoon-taglib-sample/src/main/resources/COB-INF/taglib.xsamples
    cocoon/trunk/blocks/cocoon-template/cocoon-template-sample/src/main/resources/COB-INF/template.xsamples
    cocoon/trunk/blocks/cocoon-tour/cocoon-tour-sample/src/main/resources/COB-INF/tour.xsamples
    cocoon/trunk/blocks/cocoon-validation/cocoon-validation-sample/src/main/resources/COB-INF/validation.xsamples
    cocoon/trunk/blocks/cocoon-velocity/cocoon-velocity-sample/src/main/resources/COB-INF/velocity.xsamples
    cocoon/trunk/blocks/cocoon-web3/cocoon-web3-sample/src/main/resources/COB-INF/web3.xsamples
    cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/webdav.xsamples
    cocoon/trunk/blocks/cocoon-xmldb/cocoon-xmldb-sample/src/main/resources/COB-INF/xmldb.xsamples
    cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-sample/src/main/resources/COB-INF/xsp.xsamples

Modified: cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-sample/src/main/resources/COB-INF/ajax.xsamples
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-sample/src/main/resources/COB-INF/ajax.xsamples?rev=588762&r1=588761&r2=588762&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-sample/src/main/resources/COB-INF/ajax.xsamples (original)
+++ cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-sample/src/main/resources/COB-INF/ajax.xsamples Fri Oct 26 13:01:41 2007
@@ -18,7 +18,7 @@
 
 <xsamples xpath="/samples" unless="group[@name='Ajax Block']">
 
-  <group name="Ajax">
+  <group name="Templates And Server Pages">
     <sample name="Ajax Block" href="ajax/">
       Ajax block examples. This block is also used by <a href="forms/">Cocoon Forms</a>.
     </sample>

Modified: cocoon/trunk/blocks/cocoon-apples/cocoon-apples-sample/src/main/resources/COB-INF/apples.xsamples
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-apples/cocoon-apples-sample/src/main/resources/COB-INF/apples.xsamples?rev=588762&r1=588761&r2=588762&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-apples/cocoon-apples-sample/src/main/resources/COB-INF/apples.xsamples (original)
+++ cocoon/trunk/blocks/cocoon-apples/cocoon-apples-sample/src/main/resources/COB-INF/apples.xsamples Fri Oct 26 13:01:41 2007
@@ -16,11 +16,14 @@
   limitations under the License.
 -->
 
-<xsamples xpath="/samples" unless="group[@name='Apples']">
+<!--
+  - $Id$
+  -->
+<xsamples>
 
-  <group name="Apples">
+  <group name="Application Flow Controllers" priority="10">
     <sample name="Apples Block" href="/cocoon-apples-sample/">
-      Apples (an alternative flow implementation) examples.
+      Apples is an alternative control flow implementation.
     </sample>
   </group>
 

Modified: cocoon/trunk/blocks/cocoon-auth/cocoon-auth-sample/src/main/resources/COB-INF/auth.xsamples
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-auth/cocoon-auth-sample/src/main/resources/COB-INF/auth.xsamples?rev=588762&r1=588761&r2=588762&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-auth/cocoon-auth-sample/src/main/resources/COB-INF/auth.xsamples (original)
+++ cocoon/trunk/blocks/cocoon-auth/cocoon-auth-sample/src/main/resources/COB-INF/auth.xsamples Fri Oct 26 13:01:41 2007
@@ -15,10 +15,16 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<xsamples xpath="/samples" unless="group[@name='Auth Block']">
-  <group name="Auth Block">
+
+<!--
+  - $Id: authentication-fw.xsamples 588722 2007-10-26 17:50:42Z vgritsenko $
+  -->
+<xsamples>
+
+  <group name="Application Frameworks">
     <sample name="Auth Block" href="/cocoon-auth-sample/">
       This is a demo of the authentication framework integrated into Cocoon. 
     </sample>
   </group>
+
 </xsamples>

Modified: cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-sample/src/main/resources/COB-INF/authentication-fw.xsamples
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-sample/src/main/resources/COB-INF/authentication-fw.xsamples?rev=588762&r1=588761&r2=588762&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-sample/src/main/resources/COB-INF/authentication-fw.xsamples (original)
+++ cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-sample/src/main/resources/COB-INF/authentication-fw.xsamples Fri Oct 26 13:01:41 2007
@@ -21,8 +21,8 @@
   -->
 <xsamples>
 
-  <group name="Authentication Framework">
-    <sample name="Authentication Framework Block">
+  <group name="Application Frameworks">
+    <sample name="Authentication Framework Block" deprecated="yes">
       Cocoon Authentication Framework examples (deprecated, use <a href="cocoon-auth-sample/">Cocoon Auth Block</a> instead).
     </sample>
   </group>

Modified: cocoon/trunk/blocks/cocoon-axis/cocoon-axis-sample/src/main/resources/COB-INF/axis.xsamples
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-axis/cocoon-axis-sample/src/main/resources/COB-INF/axis.xsamples?rev=588762&r1=588761&r2=588762&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-axis/cocoon-axis-sample/src/main/resources/COB-INF/axis.xsamples (original)
+++ cocoon/trunk/blocks/cocoon-axis/cocoon-axis-sample/src/main/resources/COB-INF/axis.xsamples Fri Oct 26 13:01:41 2007
@@ -21,7 +21,7 @@
   -->
 <xsamples>
 
-  <group name="Axis">
+  <group name="Web And Services">
     <sample name="Axis Block" href="/cocoon-axis-sample/">
       Examples using Apache Axis to give access to Cocoon via SOAP.
     </sample>

Modified: cocoon/trunk/blocks/cocoon-bsf/cocoon-bsf-sample/src/main/resources/COB-INF/bsf.xsamples
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-bsf/cocoon-bsf-sample/src/main/resources/COB-INF/bsf.xsamples?rev=588762&r1=588761&r2=588762&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-bsf/cocoon-bsf-sample/src/main/resources/COB-INF/bsf.xsamples (original)
+++ cocoon/trunk/blocks/cocoon-bsf/cocoon-bsf-sample/src/main/resources/COB-INF/bsf.xsamples Fri Oct 26 13:01:41 2007
@@ -21,7 +21,7 @@
   -->
 <xsamples>
 
-  <group name="BSF">
+  <group name="Templates And Server Pages" priority="25">
     <sample name="BSF Block" href="/cocoon-bsf-sample/">
       Examples using scriptable generators and actions.
     </sample>

Modified: cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-sample/src/main/resources/COB-INF/captcha.xsamples
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-sample/src/main/resources/COB-INF/captcha.xsamples?rev=588762&r1=588761&r2=588762&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-sample/src/main/resources/COB-INF/captcha.xsamples (original)
+++ cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-sample/src/main/resources/COB-INF/captcha.xsamples Fri Oct 26 13:01:41 2007
@@ -16,9 +16,12 @@
   limitations under the License.
 -->
 
+<!--
+  - $Id: authentication-fw.xsamples 588722 2007-10-26 17:50:42Z vgritsenko $
+  -->
 <xsamples xpath="/samples" unless="group[@name='CAPTCHA']">
 
-  <group name="CAPTCHA">
+  <group name="Unsorted And Miscellaneous">
     <sample name="CAPTCHA Block" href="/cocoon-captcha-sample/">
       Example usages of CAPTCHAs.
     </sample>

Modified: cocoon/trunk/blocks/cocoon-cron/cocoon-cron-sample/src/main/resources/COB-INF/cron.xsamples
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-cron/cocoon-cron-sample/src/main/resources/COB-INF/cron.xsamples?rev=588762&r1=588761&r2=588762&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-cron/cocoon-cron-sample/src/main/resources/COB-INF/cron.xsamples (original)
+++ cocoon/trunk/blocks/cocoon-cron/cocoon-cron-sample/src/main/resources/COB-INF/cron.xsamples Fri Oct 26 13:01:41 2007
@@ -15,12 +15,16 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!-- CVS $Id: cron.xsamples,v 1.4 2004/07/11 19:47:56 antonio Exp $ -->
-<xsamples xpath="/samples" unless="group[@name='Cron']">
 
-  <group name="Cron">
+<!--
+  - $Id: axis.xsamples 588722 2007-10-26 17:50:42Z vgritsenko $
+  -->
+<xsamples>
+
+  <group name="Backend Components">
     <sample name="Cron Block" href="/cocoon-cron-sample/">
-      Cron block samples.
+      Execute background tasks once or schedule for periodic execution
+      with the help of Quartz based scheduler.
     </sample>
   </group>
   

Modified: cocoon/trunk/blocks/cocoon-databases/cocoon-databases-sample/src/main/resources/COB-INF/databases.xsamples
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-databases/cocoon-databases-sample/src/main/resources/COB-INF/databases.xsamples?rev=588762&r1=588761&r2=588762&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-databases/cocoon-databases-sample/src/main/resources/COB-INF/databases.xsamples (original)
+++ cocoon/trunk/blocks/cocoon-databases/cocoon-databases-sample/src/main/resources/COB-INF/databases.xsamples Fri Oct 26 13:01:41 2007
@@ -16,7 +16,10 @@
   limitations under the License.
 -->
 
-<xsamples xpath="/samples" unless="group[@name='Databases']">
+<!--
+  - $Id: axis.xsamples 588722 2007-10-26 17:50:42Z vgritsenko $
+  -->
+<xsamples>
 
   <group name="Databases">
     <sample name="Databases Block" href="/cocoon-databases-sample/">

Modified: cocoon/trunk/blocks/cocoon-deli/cocoon-deli-sample/src/main/resources/COB-INF/deli.xsamples
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-deli/cocoon-deli-sample/src/main/resources/COB-INF/deli.xsamples?rev=588762&r1=588761&r2=588762&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-deli/cocoon-deli-sample/src/main/resources/COB-INF/deli.xsamples (original)
+++ cocoon/trunk/blocks/cocoon-deli/cocoon-deli-sample/src/main/resources/COB-INF/deli.xsamples Fri Oct 26 13:01:41 2007
@@ -15,13 +15,18 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<xsamples xpath="/samples" unless="group[@name='DELI']">
-  <group name="DELI">
 
-   <sample name="DELI Block" href="/cocoon-deli-sample/">
-	DELI allows Cocoon to determine the delivery context of a client device, for example a mobile terminal, using CC/PP or UAProf.
-   </sample>
-      
+<!--
+  - $Id$
+  -->
+<xsamples>
+
+  <group name="Unsorted And Miscellaneous">
+    <sample name="DELI Block" href="/cocoon-deli-sample/">
+      DELI allows Cocoon to determine the delivery context of a client device,
+      for example a mobile terminal, using CC/PP or UAProf.
+    </sample>
   </group>
+
 </xsamples>
 

Modified: cocoon/trunk/blocks/cocoon-eventcache/cocoon-eventcache-sample/src/main/resources/COB-INF/eventcache.xsamples
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-eventcache/cocoon-eventcache-sample/src/main/resources/COB-INF/eventcache.xsamples?rev=588762&r1=588761&r2=588762&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-eventcache/cocoon-eventcache-sample/src/main/resources/COB-INF/eventcache.xsamples (original)
+++ cocoon/trunk/blocks/cocoon-eventcache/cocoon-eventcache-sample/src/main/resources/COB-INF/eventcache.xsamples Fri Oct 26 13:01:41 2007
@@ -16,12 +16,17 @@
   limitations under the License.
 -->
 
-<xsamples xpath="/samples" unless="group[@name='Event Based Cache']">
-  <group name="Event Based Cache">
+<!--
+  - $Id$
+  -->
+<xsamples>
+
+  <group name="Backend Components">
     <sample name="Event Cache Block" href="/cocoon-eventcache-sample/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.
     </sample>
   </group>
+
 </xsamples>

Modified: cocoon/trunk/blocks/cocoon-faces/cocoon-faces-sample/src/main/resources/COB-INF/faces.xsamples
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-faces/cocoon-faces-sample/src/main/resources/COB-INF/faces.xsamples?rev=588762&r1=588761&r2=588762&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-faces/cocoon-faces-sample/src/main/resources/COB-INF/faces.xsamples (original)
+++ cocoon/trunk/blocks/cocoon-faces/cocoon-faces-sample/src/main/resources/COB-INF/faces.xsamples Fri Oct 26 13:01:41 2007
@@ -16,11 +16,14 @@
   limitations under the License.
 -->
 
-<xsamples xpath="/samples" unless="group[@name='Faces']">
+<!--
+  - $Id$
+  -->
+<xsamples>
 
-  <group name="Faces">
+  <group name="Templates And Server Pages">
     <sample name="Faces Block" href="/cocoon-faces-sample/">
-      JavaServer Faces integration into Cocoon
+      JavaServer Faces (JSF) integration into Cocoon
     </sample>
   </group>
 

Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms.xsamples
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms.xsamples?rev=588762&r1=588761&r2=588762&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms.xsamples (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms.xsamples Fri Oct 26 13:01:41 2007
@@ -16,9 +16,12 @@
   limitations under the License.
 -->
 
-<xsamples xpath="/samples" unless="group[@name='Cocoon Forms']">
+<!--
+  - $Id: authentication-fw.xsamples 588722 2007-10-26 17:50:42Z vgritsenko $
+  -->
+<xsamples>
 
-  <group name="Cocoon Forms">
+  <group name="Application Frameworks">
     <sample name="Forms Block" href="forms/">
       Cocoon Forms examples.
     </sample>

Modified: cocoon/trunk/blocks/cocoon-html/cocoon-html-sample/src/main/resources/COB-INF/html.xsamples
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-html/cocoon-html-sample/src/main/resources/COB-INF/html.xsamples?rev=588762&r1=588761&r2=588762&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-html/cocoon-html-sample/src/main/resources/COB-INF/html.xsamples (original)
+++ cocoon/trunk/blocks/cocoon-html/cocoon-html-sample/src/main/resources/COB-INF/html.xsamples Fri Oct 26 13:01:41 2007
@@ -16,9 +16,17 @@
   limitations under the License.
 -->
 
-<xsamples xpath="/samples" unless="group[@name='HTML']">
+<!--
+  - $Id$
+  -->
+<xsamples>
 
-  <group name="HTML">
+  <group name="Input Data Formats" priority="50">
+    <sample name="HTML Block" href="/cocoon-html-sample/">
+      Example usages of HTML Block components.
+    </sample>
+  </group>
+  <group name="Data Transformation And Validation">
     <sample name="HTML Block" href="/cocoon-html-sample/">
       Example usages of HTML Block components.
     </sample>

Modified: cocoon/trunk/blocks/cocoon-imageop/cocoon-imageop-sample/src/main/resources/COB-INF/imageop.xsamples
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-imageop/cocoon-imageop-sample/src/main/resources/COB-INF/imageop.xsamples?rev=588762&r1=588761&r2=588762&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-imageop/cocoon-imageop-sample/src/main/resources/COB-INF/imageop.xsamples (original)
+++ cocoon/trunk/blocks/cocoon-imageop/cocoon-imageop-sample/src/main/resources/COB-INF/imageop.xsamples Fri Oct 26 13:01:41 2007
@@ -16,10 +16,13 @@
   limitations under the License.
 -->
 
-<xsamples xpath="/samples" unless="group[@name='Image Effects']">
+<!--
+  - $Id: chaperon.xsamples 588722 2007-10-26 17:50:42Z vgritsenko $
+  -->
+<xsamples>
 
-  <group name="Image Effects">
-    <sample href="/cocoon-imageop-sample/" name="Image Effects">
+  <group name="Data Transformation And Validation">
+    <sample name="Image Effects" href="/cocoon-imageop-sample/">
       Image Effects to be applied to images.
     </sample>
   </group>

Modified: cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-sample/src/main/resources/COB-INF/javaflow.xsamples
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-sample/src/main/resources/COB-INF/javaflow.xsamples?rev=588762&r1=588761&r2=588762&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-sample/src/main/resources/COB-INF/javaflow.xsamples (original)
+++ cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-sample/src/main/resources/COB-INF/javaflow.xsamples Fri Oct 26 13:01:41 2007
@@ -16,9 +16,12 @@
   limitations under the License.
 -->
 
-<xsamples xpath="/samples" unless="group[@name='Java Flow']">
+<!--
+  - $Id$
+  -->
+<xsamples>
 
-  <group name="Java Flow">
+  <group name="Application Flow Controllers" priority="10">
     <sample name="Java Flow Block" href="/cocoon-javaflow-sample/">
       Cocoon Java Flow examples.
     </sample>

Modified: cocoon/trunk/blocks/cocoon-jms/cocoon-jms-sample/src/main/resources/COB-INF/jms.xsamples
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-jms/cocoon-jms-sample/src/main/resources/COB-INF/jms.xsamples?rev=588762&r1=588761&r2=588762&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-jms/cocoon-jms-sample/src/main/resources/COB-INF/jms.xsamples (original)
+++ cocoon/trunk/blocks/cocoon-jms/cocoon-jms-sample/src/main/resources/COB-INF/jms.xsamples Fri Oct 26 13:01:41 2007
@@ -16,8 +16,12 @@
   limitations under the License.
 -->
 
-<xsamples xpath="/samples" unless="group[@name='JMS']">
-  <group name="JMS">
+<!--
+  - $Id$
+  -->
+<xsamples>
+
+  <group name="Backend Components">
     <sample name="JMS Block" href="/cocoon-jms-sample/database/">
       JMS invalidated Event Based Cache.
       A sample showing external cache invalidation using database triggers
@@ -27,4 +31,5 @@
       JMS connection parameters are set in a way to work with the OpenJMS demo.
     </sample>
   </group>
+
 </xsamples>

Modified: cocoon/trunk/blocks/cocoon-jsp/cocoon-jsp-sample/src/main/resources/COB-INF/jsp.xsamples
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-jsp/cocoon-jsp-sample/src/main/resources/COB-INF/jsp.xsamples?rev=588762&r1=588761&r2=588762&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-jsp/cocoon-jsp-sample/src/main/resources/COB-INF/jsp.xsamples (original)
+++ cocoon/trunk/blocks/cocoon-jsp/cocoon-jsp-sample/src/main/resources/COB-INF/jsp.xsamples Fri Oct 26 13:01:41 2007
@@ -16,11 +16,15 @@
   limitations under the License.
 -->
 
-<xsamples xpath="/samples" unless="group[@name='JSP']">
+<!--
+  - $Id$
+  -->
+<xsamples>
 
-  <group name="JSP">
+  <group name="Templates And Server Pages" priority="25">
     <sample name="JSP Block" href="/cocoon-jsp-sample/">
       Java Server Pages (JSP) usage with Cocoon
     </sample>
   </group>
+
 </xsamples>

Modified: cocoon/trunk/blocks/cocoon-linkrewriter/cocoon-linkrewriter-sample/src/main/resources/COB-INF/linkrewriter.xsamples
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-linkrewriter/cocoon-linkrewriter-sample/src/main/resources/COB-INF/linkrewriter.xsamples?rev=588762&r1=588761&r2=588762&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-linkrewriter/cocoon-linkrewriter-sample/src/main/resources/COB-INF/linkrewriter.xsamples (original)
+++ cocoon/trunk/blocks/cocoon-linkrewriter/cocoon-linkrewriter-sample/src/main/resources/COB-INF/linkrewriter.xsamples Fri Oct 26 13:01:41 2007
@@ -16,9 +16,12 @@
   limitations under the License.
 -->
 
-<xsamples xpath="/samples" unless="group[@name='Link Rewriter']">
+<!--
+  - $Id$
+  -->
+<xsamples>
 
-  <group name="Link Rewriter">
+  <group name="Data Transformation And Validation">
     <sample name="LinkRewriter Block" href="/cocoon-linkrewriter-sample/">
       A demo of the LinkRewriterTransformer, which rewrites XML links (by
       default, href attributes) with values looked up from any Input Module.

Modified: cocoon/trunk/blocks/cocoon-lucene/cocoon-lucene-sample/src/main/resources/COB-INF/lucene.xsamples
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-lucene/cocoon-lucene-sample/src/main/resources/COB-INF/lucene.xsamples?rev=588762&r1=588761&r2=588762&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-lucene/cocoon-lucene-sample/src/main/resources/COB-INF/lucene.xsamples (original)
+++ cocoon/trunk/blocks/cocoon-lucene/cocoon-lucene-sample/src/main/resources/COB-INF/lucene.xsamples Fri Oct 26 13:01:41 2007
@@ -15,12 +15,16 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!-- CVS $Id$ -->
-<xsamples xpath="/samples" unless="group[@name='Lucene']">
 
-  <group name="Lucene">
+<!--
+  - $Id$
+  -->
+<xsamples>
+
+  <group name="Backend Components">
     <sample name="Lucene Block" href="/cocoon-lucene-sample/">
       Examples showing use of Apache Lucene to search.
     </sample>
   </group>
+
 </xsamples>

Modified: cocoon/trunk/blocks/cocoon-mail/cocoon-mail-sample/src/main/resources/COB-INF/mail.xsamples
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-mail/cocoon-mail-sample/src/main/resources/COB-INF/mail.xsamples?rev=588762&r1=588761&r2=588762&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-mail/cocoon-mail-sample/src/main/resources/COB-INF/mail.xsamples (original)
+++ cocoon/trunk/blocks/cocoon-mail/cocoon-mail-sample/src/main/resources/COB-INF/mail.xsamples Fri Oct 26 13:01:41 2007
@@ -16,9 +16,12 @@
   limitations under the License.
 -->
 
-<xsamples xpath="/samples" unless="group[@name='Mail']">
+<!--
+  - $Id$
+  -->
+<xsamples>
 
-  <group name="Mail">
+  <group name="Backend Components">
     <sample name="Mail Block" href="/cocoon-mail-samples/">
       Continue to mail block samples.
     </sample>

Modified: cocoon/trunk/blocks/cocoon-petstore/cocoon-petstore-sample/src/main/resources/COB-INF/petstore.xsamples
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-petstore/cocoon-petstore-sample/src/main/resources/COB-INF/petstore.xsamples?rev=588762&r1=588761&r2=588762&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-petstore/cocoon-petstore-sample/src/main/resources/COB-INF/petstore.xsamples (original)
+++ cocoon/trunk/blocks/cocoon-petstore/cocoon-petstore-sample/src/main/resources/COB-INF/petstore.xsamples Fri Oct 26 13:01:41 2007
@@ -16,9 +16,12 @@
   limitations under the License.
 -->
 
-<xsamples xpath="/samples" unless="group[@name='Petstore']">
+<!--
+  - $Id$
+  -->
+<xsamples>
 
-  <group name="Petstore">
+  <group name="Tutorials And Sample Applications">
     <sample name="Petstore Block" href="/cocoon-petstore-sample/">
       The Cocoon Flow version of the J2EE PetStore, using various presentation
       mechanisms: CocoonForms (Woody), Velocity, XSP, Jexl.

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/portal-sample.xsamples
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/portal-sample.xsamples?rev=588762&r1=588761&r2=588762&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/portal-sample.xsamples (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/portal-sample.xsamples Fri Oct 26 13:01:41 2007
@@ -15,11 +15,14 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!-- SVN $Id$ -->
-<xsamples xpath="/samples" unless="group[@name='Portal Engine']">
 
-  <group name="Portal Block">
-    <sample name="Portal Block" href="portal-sample/portal">
+<!--
+  - $Id$
+  -->
+<xsamples>
+
+  <group name="Application Frameworks">
+    <sample name="Portal Block" href="/cocoon-portal-sample/portal">
       This is a demo of the powerful portal engine based on Apache Cocoon. Make sure that
       you have installed the portlet api 1.0 (e.g. in commons/lib for Tomcat or WEB-INF/lib
       for Jetty).

Modified: cocoon/trunk/blocks/cocoon-profiler/cocoon-profiler-sample/src/main/resources/COB-INF/profiler.xsamples
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-profiler/cocoon-profiler-sample/src/main/resources/COB-INF/profiler.xsamples?rev=588762&r1=588761&r2=588762&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-profiler/cocoon-profiler-sample/src/main/resources/COB-INF/profiler.xsamples (original)
+++ cocoon/trunk/blocks/cocoon-profiler/cocoon-profiler-sample/src/main/resources/COB-INF/profiler.xsamples Fri Oct 26 13:01:41 2007
@@ -16,12 +16,16 @@
   limitations under the License.
 -->
 
-<xsamples xpath="/samples" unless="group[@name='Profiler']">
+<!--
+  - $Id$
+  -->
+<xsamples>
 
-  <group name="Profiler">
+  <group name="Unsorted And Miscellaneous">
     <sample name="Profiler Block" href="/cocoon-profiler-sample/">
       This example shows the usage of the Profiler component for
       profiling and debugging of pipelines.
     </sample>
   </group>
+
 </xsamples>

Modified: cocoon/trunk/blocks/cocoon-proxy/cocoon-proxy-sample/src/main/resources/COB-INF/proxy.xsamples
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-proxy/cocoon-proxy-sample/src/main/resources/COB-INF/proxy.xsamples?rev=588762&r1=588761&r2=588762&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-proxy/cocoon-proxy-sample/src/main/resources/COB-INF/proxy.xsamples (original)
+++ cocoon/trunk/blocks/cocoon-proxy/cocoon-proxy-sample/src/main/resources/COB-INF/proxy.xsamples Fri Oct 26 13:01:41 2007
@@ -15,12 +15,17 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<xsamples xpath="/samples" unless="group[@name='Proxy']">
-  <group name="Proxy">
-    <sample name="Proxy Block" href="proxy/">
+
+<!--
+  - $Id$
+  -->
+<xsamples>
+
+  <group name="Web And Services">
+    <sample name="Proxy Block" href="/cocoon-proxy-sample/">
       Web Site Syndication using proxies: Integrate remote webapp functionality
       into your website.
    </sample>
   </group>
-</xsamples>
 
+</xsamples>

Modified: cocoon/trunk/blocks/cocoon-querybean/cocoon-querybean-sample/src/main/resources/COB-INF/querybean.xsamples
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-querybean/cocoon-querybean-sample/src/main/resources/COB-INF/querybean.xsamples?rev=588762&r1=588761&r2=588762&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-querybean/cocoon-querybean-sample/src/main/resources/COB-INF/querybean.xsamples (original)
+++ cocoon/trunk/blocks/cocoon-querybean/cocoon-querybean-sample/src/main/resources/COB-INF/querybean.xsamples Fri Oct 26 13:01:41 2007
@@ -15,12 +15,16 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!-- CVS $Id$ -->
-<xsamples xpath="/samples" unless="group[@name='QueryBean']">
 
-  <group name="QueryBean">
-    <sample name="Query Bean" href="/cocoon-querybean-sample/">
+<!--
+  - $Id$
+  -->
+<xsamples>
+
+  <group name="Unsorted And Miscellaneous">
+    <sample name="Query Bean Block" href="/cocoon-querybean-sample/">
       Examples showing the use of Apache Lucene with CForms to search.
     </sample>
   </group>
+
 </xsamples>

Modified: cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/COB-INF/scratchpad.xsamples
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/COB-INF/scratchpad.xsamples?rev=588762&r1=588761&r2=588762&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/COB-INF/scratchpad.xsamples (original)
+++ cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/COB-INF/scratchpad.xsamples Fri Oct 26 13:01:41 2007
@@ -16,9 +16,12 @@
   limitations under the License.
 -->
 
-<xsamples xpath="/samples" unless="group[@name='Scratchpad Samples']">
+<!--
+  - $Id$
+  -->
+<xsamples>
   
-  <group name="Scratchpad Samples">
+  <group name="Unsorted And Miscellaneous">
     <sample name="Scratchpad Block" href="/cocoon-scratchpad-samples/">
       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.

Modified: cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-sample/src/main/resources/COB-INF/session-fw.xsamples
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-sample/src/main/resources/COB-INF/session-fw.xsamples?rev=588762&r1=588761&r2=588762&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-sample/src/main/resources/COB-INF/session-fw.xsamples (original)
+++ cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-sample/src/main/resources/COB-INF/session-fw.xsamples Fri Oct 26 13:01:41 2007
@@ -16,9 +16,12 @@
   limitations under the License.
 -->
 
-<xsamples xpath="/samples" unless="group[@name='Session Framework']">
+<!--
+  - $Id: authentication-fw.xsamples 588722 2007-10-26 17:50:42Z vgritsenko $
+  -->
+<xsamples>
 
-  <group name="Session Framework">
+  <group name="Application Frameworks">
     <sample name="Session Framework Block" href="/cocoon-session-fw-sample/">
       This is a demo of the session framework integrated into Cocoon.
     </sample>

Modified: cocoon/trunk/blocks/cocoon-slop/cocoon-slop-sample/src/main/resources/COB-INF/slop.xsamples
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-slop/cocoon-slop-sample/src/main/resources/COB-INF/slop.xsamples?rev=588762&r1=588761&r2=588762&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-slop/cocoon-slop-sample/src/main/resources/COB-INF/slop.xsamples (original)
+++ cocoon/trunk/blocks/cocoon-slop/cocoon-slop-sample/src/main/resources/COB-INF/slop.xsamples Fri Oct 26 13:01:41 2007
@@ -16,10 +16,13 @@
   limitations under the License.
 -->
 
-<xsamples xpath="/samples" unless="group[@name='Slop']">
+<!--
+  - $Id$
+  -->
+<xsamples>
 
-  <group name="Slop">
-    <sample name="SLOP Block" href="slop/">
+  <group name="Input Data Formats" priority="50">
+    <sample name="SLOP Block" href="/cocoon-slop-sample/">
       Examples showing how to use SLOP
       (the Simple Line Oriented Parser) to parse text files
     </sample>
@@ -29,4 +32,5 @@
       XML-based presentations
     </sample>
   </group>
+
 </xsamples>

Modified: cocoon/trunk/blocks/cocoon-stx/cocoon-stx-sample/src/main/resources/COB-INF/stx.xsamples
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-stx/cocoon-stx-sample/src/main/resources/COB-INF/stx.xsamples?rev=588762&r1=588761&r2=588762&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-stx/cocoon-stx-sample/src/main/resources/COB-INF/stx.xsamples (original)
+++ cocoon/trunk/blocks/cocoon-stx/cocoon-stx-sample/src/main/resources/COB-INF/stx.xsamples Fri Oct 26 13:01:41 2007
@@ -15,11 +15,16 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<xsamples xpath="/samples" unless="group[@name='STX']">
 
-  <group name="STX">
+<!--
+  - $Id$
+  -->
+<xsamples>
+
+  <group name="Data Transformation And Validation">
     <sample name="STX Block" href="/cocoon-stx-sample/">
       Examples of using Streaming Transformations for XML (STX)
     </sample>
   </group>
+
 </xsamples>

Modified: cocoon/trunk/blocks/cocoon-taglib/cocoon-taglib-sample/src/main/resources/COB-INF/taglib.xsamples
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-taglib/cocoon-taglib-sample/src/main/resources/COB-INF/taglib.xsamples?rev=588762&r1=588761&r2=588762&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-taglib/cocoon-taglib-sample/src/main/resources/COB-INF/taglib.xsamples (original)
+++ cocoon/trunk/blocks/cocoon-taglib/cocoon-taglib-sample/src/main/resources/COB-INF/taglib.xsamples Fri Oct 26 13:01:41 2007
@@ -16,11 +16,15 @@
   limitations under the License.
 -->
 
-<xsamples xpath="/samples" unless="group[@name='Taglib']">
+<!--
+  - $Id$
+  -->
+<xsamples>
 
-  <group name="Taglib">
+  <group name="Templates And Server Pages">
     <sample name="Taglib Block" href="/cocoon-taglib-sample/">
       Examples of taglib transformer usage.
     </sample>
   </group>
+
 </xsamples>

Modified: cocoon/trunk/blocks/cocoon-template/cocoon-template-sample/src/main/resources/COB-INF/template.xsamples
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-template/cocoon-template-sample/src/main/resources/COB-INF/template.xsamples?rev=588762&r1=588761&r2=588762&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-template/cocoon-template-sample/src/main/resources/COB-INF/template.xsamples (original)
+++ cocoon/trunk/blocks/cocoon-template/cocoon-template-sample/src/main/resources/COB-INF/template.xsamples Fri Oct 26 13:01:41 2007
@@ -16,10 +16,16 @@
   limitations under the License.
 -->
 
-<xsamples xpath="/samples" unless="group[@name='Cocoon Template']">
-  <group name="Cocoon Template">
-    <sample name="Template Block" href="template/">
-      Cocoon Template examples.
+<!--
+  - $Id$
+  -->
+<xsamples>
+
+  <group name="Templates And Server Pages" priority="25">
+    <sample name="Template Block" href="/cooon-template-sample/">
+      Cocoon Template is the best of page template technologies offered in Cocoon
+      and it is recommended for all new projects.
     </sample>
   </group>
+
 </xsamples>

Modified: cocoon/trunk/blocks/cocoon-tour/cocoon-tour-sample/src/main/resources/COB-INF/tour.xsamples
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-tour/cocoon-tour-sample/src/main/resources/COB-INF/tour.xsamples?rev=588762&r1=588761&r2=588762&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-tour/cocoon-tour-sample/src/main/resources/COB-INF/tour.xsamples (original)
+++ cocoon/trunk/blocks/cocoon-tour/cocoon-tour-sample/src/main/resources/COB-INF/tour.xsamples Fri Oct 26 13:01:41 2007
@@ -16,12 +16,15 @@
   limitations under the License.
 -->
 
-<xsamples xpath="/samples" unless="group[@name='Supersonic Tour']">
+<!--
+  - $Id$
+  -->
+<xsamples>
 
-  <group name="Supersonic Tour">
+  <group name="Tutorials And Sample Applications">
     <sample name="Supersonic Tour of Cocoon" href="/cocoon-tour-sample/">
-      Introduction and quick overview of the Cocoon Power Trio
-        (Pipelines, Flow, Forms)
+      Introduction and quick overview of the Cocoon Power Trio (Pipelines,
+      Flow, Forms)
     </sample>
   </group>
 

Modified: cocoon/trunk/blocks/cocoon-validation/cocoon-validation-sample/src/main/resources/COB-INF/validation.xsamples
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-validation/cocoon-validation-sample/src/main/resources/COB-INF/validation.xsamples?rev=588762&r1=588761&r2=588762&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-validation/cocoon-validation-sample/src/main/resources/COB-INF/validation.xsamples (original)
+++ cocoon/trunk/blocks/cocoon-validation/cocoon-validation-sample/src/main/resources/COB-INF/validation.xsamples Fri Oct 26 13:01:41 2007
@@ -16,10 +16,13 @@
   limitations under the License.
 -->
 
-<xsamples xpath="/samples" unless="group[@name='VALIDATION']">
+<!--
+  - $Id: chaperon.xsamples 588722 2007-10-26 17:50:42Z vgritsenko $
+  -->
+<xsamples>
 
-  <group name="VALIDATION">
-    <sample name="VALIDATION Block" href="/cocoon-validation-sample/">
+  <group name="Data Transformation And Validation">
+    <sample name="Validation Block" href="/cocoon-validation-sample/">
       Example usages of XML Validation.
     </sample>
   </group>

Modified: cocoon/trunk/blocks/cocoon-velocity/cocoon-velocity-sample/src/main/resources/COB-INF/velocity.xsamples
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-velocity/cocoon-velocity-sample/src/main/resources/COB-INF/velocity.xsamples?rev=588762&r1=588761&r2=588762&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-velocity/cocoon-velocity-sample/src/main/resources/COB-INF/velocity.xsamples (original)
+++ cocoon/trunk/blocks/cocoon-velocity/cocoon-velocity-sample/src/main/resources/COB-INF/velocity.xsamples Fri Oct 26 13:01:41 2007
@@ -16,9 +16,12 @@
   limitations under the License.
 -->
 
-<xsamples xpath="/samples" unless="group[@name='Velocity']">
+<!--
+  - $Id$
+  -->
+<xsamples>
 
-  <group name="Velocity">
+  <group name="Templates And Server Pages" priority="25">
     <sample name="Velocity Block" href="/cocoon-velocity-sample/">
       Examples of generation using Velocity.
     </sample>

Modified: cocoon/trunk/blocks/cocoon-web3/cocoon-web3-sample/src/main/resources/COB-INF/web3.xsamples
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-web3/cocoon-web3-sample/src/main/resources/COB-INF/web3.xsamples?rev=588762&r1=588761&r2=588762&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-web3/cocoon-web3-sample/src/main/resources/COB-INF/web3.xsamples (original)
+++ cocoon/trunk/blocks/cocoon-web3/cocoon-web3-sample/src/main/resources/COB-INF/web3.xsamples Fri Oct 26 13:01:41 2007
@@ -16,9 +16,12 @@
   limitations under the License.
 -->
 
-<xsamples xpath="/samples" unless="group[@name='Web3']">
+<!--
+  - $Id$
+  -->
+<xsamples>
 
-  <group name="Web3">
+  <group name="Backend Components">
     <sample name="Web3 Block" href="/cocoon-web3-samples/">
       Continue to Web3 block samples.
     </sample>

Modified: cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/webdav.xsamples
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/webdav.xsamples?rev=588762&r1=588761&r2=588762&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/webdav.xsamples (original)
+++ cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/webdav.xsamples Fri Oct 26 13:01:41 2007
@@ -16,10 +16,13 @@
   limitations under the License.
 -->
 
-<xsamples xpath="/samples" unless="group[@name='WebDAV']">
+<!--
+  - $Id$
+  -->
+<xsamples>
 
-  <group name="WebDAV">
-    <sample href="/cocoon-webdav-sample/" name="WebDAV Block">
+  <group name="Web And Services">
+    <sample name="WebDAV Block" href="/cocoon-webdav-sample/">
       Using WebDAV with Cocoon
     </sample>
   </group>

Modified: cocoon/trunk/blocks/cocoon-xmldb/cocoon-xmldb-sample/src/main/resources/COB-INF/xmldb.xsamples
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-xmldb/cocoon-xmldb-sample/src/main/resources/COB-INF/xmldb.xsamples?rev=588762&r1=588761&r2=588762&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-xmldb/cocoon-xmldb-sample/src/main/resources/COB-INF/xmldb.xsamples (original)
+++ cocoon/trunk/blocks/cocoon-xmldb/cocoon-xmldb-sample/src/main/resources/COB-INF/xmldb.xsamples Fri Oct 26 13:01:41 2007
@@ -16,9 +16,12 @@
   limitations under the License.
 -->
 
-<xsamples xpath="/samples" unless="group[@name='XML:DB']">
+<!--
+  - $Id: axis.xsamples 588722 2007-10-26 17:50:42Z vgritsenko $
+  -->
+<xsamples>
 
-  <group name="XML:DB">
+  <group name="Databases">
     <sample name="XML:DB Block" href="/cocoon-xmldb-sample/">
       XML database samples.
     </sample>

Modified: cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-sample/src/main/resources/COB-INF/xsp.xsamples
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-sample/src/main/resources/COB-INF/xsp.xsamples?rev=588762&r1=588761&r2=588762&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-sample/src/main/resources/COB-INF/xsp.xsamples (original)
+++ cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-sample/src/main/resources/COB-INF/xsp.xsamples Fri Oct 26 13:01:41 2007
@@ -16,10 +16,16 @@
   limitations under the License.
 -->
 
-<xsamples xpath="/samples" unless="group[@name='XSP']">
-  <group name="XSP">
-    <sample href="/cocoon-xsp-sample/" name="XSP Block">
-      Extensible Server Pages, or XSP.
+<!--
+  - $Id$
+  -->
+<xsamples>
+
+  <group name="Templates And Server Pages" priority="25">
+    <sample name="XSP Block" href="/cocoon-xsp-sample/">
+      Extensible Server Pages, or XSP, is an XML based compiled server
+      pages technology, comparable to JSP.
     </sample>
   </group>
+
 </xsamples>