Return-Path: 
 <cvs-return-32147-apmail-cocoon-cvs-archive=cocoon.apache.org@cocoon.apache.org>
Delivered-To: apmail-cocoon-cvs-archive@www.apache.org
Received: (qmail 25071 invoked from network); 26 Oct 2007 01:16:59 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 26 Oct 2007 01:16:59 -0000
Received: (qmail 77041 invoked by uid 500); 26 Oct 2007 01:16:47 -0000
Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org
Received: (qmail 76970 invoked by uid 500); 26 Oct 2007 01:16:47 -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 76959 invoked by uid 99); 26 Oct 2007 01:16:47 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 25 Oct 2007 18:16:47 -0700
X-ASF-Spam-Status: No, hits=-98.5 required=10.0
	tests=ALL_TRUSTED,WEIRD_PORT
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; Fri, 26 Oct 2007 01:16:57 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 4E1451A9832; Thu, 25 Oct 2007 18:16:35 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r588462 - in /cocoon/trunk/blocks/cocoon-welcome: pom.xml
 src/main/resources/COB-INF/samples/group2samples.xsl
 src/main/resources/COB-INF/samples/sitemap.xmap
Date: Fri, 26 Oct 2007 01:16:34 -0000
To: cvs@cocoon.apache.org
From: vgritsenko@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20071026011635.4E1451A9832@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: vgritsenko
Date: Thu Oct 25 18:16:33 2007
New Revision: 588462

URL: http://svn.apache.org/viewvc?rev=588462&view=rev
Log:
add comments to samples/ sitemap

Modified:
    cocoon/trunk/blocks/cocoon-welcome/pom.xml
    cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/samples/group2samples.xsl
    cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/samples/sitemap.xmap

Modified: cocoon/trunk/blocks/cocoon-welcome/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-welcome/pom.xml?rev=588462&r1=588461&r2=588462&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-welcome/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-welcome/pom.xml Thu Oct 25 18:16:33 2007
@@ -17,11 +17,11 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<!--+
-    | @version $Id: pom.xml 565574 2007-08-13 23:47:50Z gkossakowski $
-    +-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
+<!--
+  - @version $Id: pom.xml 565574 2007-08-13 23:47:50Z gkossakowski $
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <packaging>jar</packaging>
   

Modified: cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/samples/group2samples.xsl
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/samples/group2samples.xsl?rev=588462&r1=588461&r2=588462&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/samples/group2samples.xsl (original)
+++ cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/samples/group2samples.xsl Thu Oct 25 18:16:33 2007
@@ -16,15 +16,14 @@
   limitations under the License.
 -->
 
-<!--+
-    | Convert the output of the directory generator into a samples file.
-    |
-    | $Id$
-    +-->
-
-<xsl:stylesheet version="1.0" 
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
-  xmlns:dir="http://apache.org/cocoon/directory/2.0">
+<!--
+  - Convert the output of the directory generator into a samples file.
+  -
+  - $Id$
+  -->
+<xsl:stylesheet version="1.0"
+                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns:dir="http://apache.org/cocoon/directory/2.0">
 
   <xsl:template match="/">
     <samples name="Cocoon Blocks">

Modified: cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/samples/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/samples/sitemap.xmap?rev=588462&r1=588461&r2=588462&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/samples/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/samples/sitemap.xmap Thu Oct 25 18:16:33 2007
@@ -16,24 +16,35 @@
   limitations under the License.
 -->
 
+<!--
+  - This sitemap maps empty URL to the page listing all installed samples,
+  - and forwards all other requests to corresponding sample block.
+  -
+  - $Id$
+  -->
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
   <map:pipelines>
     <map:pipeline>
-      <map:match pattern="*/**">
-        <map:mount uri-prefix="{1}" src="blockcontext:/{1}/"/>
-      </map:match>
-
       <map:match pattern="">
-        <map:generate type="xpathtraversable" src="blockcontext:/"> 
-          <map:parameter name="xpath" value="/xsamples/group"/> 
+        <map:generate type="xpathtraversable" src="blockcontext:/">
+          <map:parameter name="xpath" value="/xsamples/group"/>
           <map:parameter name="depth" value="2"/>
-          <map:parameter name="xmlFiles" value="\.xsamples$"/> 
-        </map:generate> 
+          <map:parameter name="xmlFiles" value="\.xsamples$"/>
+        </map:generate>
         <map:transform src="group2samples.xsl"/>
         <map:transform src="../stylesheets/simple-samples2html.xsl">
           <map:parameter name="contextPath" value="{request:contextPath}"/>
         </map:transform>
-        <map:serialize type="html"/>        
+        <map:serialize type="html"/>
+      </map:match>
+
+      <!--
+        - FIXME VG: I don't think this should be here?
+        - http://localhost:8888/samples/cocoon-chaperon-sample/welcome
+        - avax.servlet.ServletException: No dispatcher for servlet:style-default:/service/common/simple-samples2html
+        -->
+      <map:match pattern="*/**">
+        <map:mount uri-prefix="{1}" src="blockcontext:/{1}/"/>
       </map:match>
     </map:pipeline>
   </map:pipelines>