You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by bd...@apache.org on 2005/10/07 12:33:09 UTC

svn commit: r307077 - in /cocoon: blocks/core-samples-additional/trunk/ blocks/core-samples-additional/trunk/WEB-INF/ blocks/core-samples-additional/trunk/WEB-INF/xconf/ blocks/core-samples-additional/trunk/java/ blocks/core-samples-main/trunk/WEB-INF/...

Author: bdelacretaz
Date: Fri Oct  7 03:32:49 2005
New Revision: 307077

URL: http://svn.apache.org/viewcvs?rev=307077&view=rev
Log:
Samples pages reorganized: the first page shows only the most important samples, selected in src/webapp/samples/blocks/samples-pages.xml, and another page shows all samples

Added:
    cocoon/blocks/core-samples-additional/trunk/WEB-INF/
    cocoon/blocks/core-samples-additional/trunk/WEB-INF/xconf/
    cocoon/blocks/core-samples-additional/trunk/WEB-INF/xconf/cocoon-core-samples-additional.xconf
    cocoon/blocks/core-samples-additional/trunk/java/
    cocoon/blocks/core-samples-additional/trunk/pom.xml
    cocoon/blocks/core-samples-main/trunk/WEB-INF/xconf/
    cocoon/blocks/core-samples-main/trunk/WEB-INF/xconf/cocoon-core-samples-main.xconf
    cocoon/trunk/src/webapp/samples/blocks/filter-blocks.xsl
    cocoon/trunk/src/webapp/samples/blocks/samples-pages.xml
Removed:
    cocoon/trunk/src/webapp/samples/blocks/gump2samples.xsl
Modified:
    cocoon/blocks/core-samples-main/trunk/samples/samples.xml
    cocoon/trunk/src/webapp/samples/blocks/directory2xsamples.xsl
    cocoon/trunk/src/webapp/samples/blocks/sitemap.xmap
    cocoon/trunk/src/webapp/samples/common/style/xsl/html/simple-samples2html.xsl
    cocoon/trunk/src/webapp/samples/sitemap.xmap
    cocoon/trunk/status.xml

Added: cocoon/blocks/core-samples-additional/trunk/WEB-INF/xconf/cocoon-core-samples-additional.xconf
URL: http://svn.apache.org/viewcvs/cocoon/blocks/core-samples-additional/trunk/WEB-INF/xconf/cocoon-core-samples-additional.xconf?rev=307077&view=auto
==============================================================================
--- cocoon/blocks/core-samples-additional/trunk/WEB-INF/xconf/cocoon-core-samples-additional.xconf (added)
+++ cocoon/blocks/core-samples-additional/trunk/WEB-INF/xconf/cocoon-core-samples-additional.xconf Fri Oct  7 03:32:49 2005
@@ -0,0 +1,3 @@
+<components>
+  <!-- nothing special here for now -->
+</components>

Added: cocoon/blocks/core-samples-additional/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/core-samples-additional/trunk/pom.xml?rev=307077&view=auto
==============================================================================
--- cocoon/blocks/core-samples-additional/trunk/pom.xml (added)
+++ cocoon/blocks/core-samples-additional/trunk/pom.xml Fri Oct  7 03:32:49 2005
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright 2005 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.
+-->
+<!--+
+    | @version $Id:$
+    |
+    +-->
+<project>
+  <parent>
+    <groupId>apache-cocoon</groupId>
+    <artifactId>cocoon</artifactId>
+    <version>2.2-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>apache-cocoon</groupId>
+  <artifactId>cocoon-core-samples-additional</artifactId>
+  <version>2.2-SNAPSHOT</version>
+  <packaging>jar</packaging>
+  <build>
+    <sourceDirectory>java</sourceDirectory>
+    <resources>
+      <resource>
+        <directory>java</directory>
+        <excludes>
+          <exclude>**/*.java</exclude>
+        </excludes>
+      </resource>
+    </resources>
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>apache-cocoon</groupId>
+      <artifactId>cocoon-core</artifactId>
+      <version>2.2-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>fop</groupId>
+      <artifactId>fop</artifactId>
+      <version>0.20.5</version>
+    </dependency>
+  </dependencies>
+  <reporting>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-project-info-reports-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </reporting>
+</project>

Added: cocoon/blocks/core-samples-main/trunk/WEB-INF/xconf/cocoon-core-samples-main.xconf
URL: http://svn.apache.org/viewcvs/cocoon/blocks/core-samples-main/trunk/WEB-INF/xconf/cocoon-core-samples-main.xconf?rev=307077&view=auto
==============================================================================
--- cocoon/blocks/core-samples-main/trunk/WEB-INF/xconf/cocoon-core-samples-main.xconf (added)
+++ cocoon/blocks/core-samples-main/trunk/WEB-INF/xconf/cocoon-core-samples-main.xconf Fri Oct  7 03:32:49 2005
@@ -0,0 +1,3 @@
+<components>
+  <!-- nothing special here for now -->
+</components>

Modified: cocoon/blocks/core-samples-main/trunk/samples/samples.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/core-samples-main/trunk/samples/samples.xml?rev=307077&r1=307076&r2=307077&view=diff
==============================================================================
--- cocoon/blocks/core-samples-main/trunk/samples/samples.xml (original)
+++ cocoon/blocks/core-samples-main/trunk/samples/samples.xml Fri Oct  7 03:32:49 2005
@@ -40,13 +40,6 @@
     </sample>
   </group>  
 
-  <group name="TODO: important blocks">
-    <note>
-    	 TODO: "mainstream" blocks should appear on the front page of the samples:
-    	 forms, tour, more?
-    </note>      
-  </group>  
-
   <group name="Internationalization">
     <sample name="Internationalization (i18n) &amp; Localization (l10n)" href="i18n/">
       Samples of the powerful Cocoon i18n and l10n Cocoon tools. 

Modified: cocoon/trunk/src/webapp/samples/blocks/directory2xsamples.xsl
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/webapp/samples/blocks/directory2xsamples.xsl?rev=307077&r1=307076&r2=307077&view=diff
==============================================================================
--- cocoon/trunk/src/webapp/samples/blocks/directory2xsamples.xsl (original)
+++ cocoon/trunk/src/webapp/samples/blocks/directory2xsamples.xsl Fri Oct  7 03:32:49 2005
@@ -15,7 +15,7 @@
   limitations under the License.
 -->
 
-<!-- CVS $Id: directory2xsamples.xsl,v 1.1 2004/04/02 20:40:57 joerg Exp $ -->
+<!-- CVS $Id$ -->
 
 <xsl:stylesheet version="1.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
@@ -33,8 +33,11 @@
   </xsl:template>
 
   <xsl:template match="dir:file">
+    <xsl:variable name="blockName" select="parent::dir:directory/@name"/>
     <xsl:if test="substring-before(@name, '.xsamples')">
-      <sample name="cocoon-block-{substring-before(@name, '.xsamples')}"/>
+      <sample name="cocoon-block-{$blockName}" block-name="{$blockName}">
+        <xsl:copy-of select=".//xsamples"/>
+      </sample>
     </xsl:if>
   </xsl:template>
 

Added: cocoon/trunk/src/webapp/samples/blocks/filter-blocks.xsl
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/webapp/samples/blocks/filter-blocks.xsl?rev=307077&view=auto
==============================================================================
--- cocoon/trunk/src/webapp/samples/blocks/filter-blocks.xsl (added)
+++ cocoon/trunk/src/webapp/samples/blocks/filter-blocks.xsl Fri Oct  7 03:32:49 2005
@@ -0,0 +1,97 @@
+<?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.
+-->
+
+<!--+
+    | Generate a samples page by combining the aggregated xsamples files
+    | with the gump descriptor and a list of blocks to include in the page.
+    |
+    | CVS $Id: gump2samples.xsl 36239 2004-08-11 18:28:06Z vgritsenko $
+    +-->
+
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+  <xsl:param name="currentPage"/>
+  
+  <xsl:variable name="page" select="root/pages/samples-pages/page[@name=$currentPage]"/>
+  <xsl:variable name="xsamples" select="root/xsamples/xsamples"/>
+  <xsl:variable name="gump" select="root/gump/module"/>
+
+  <xsl:template match="/">
+	<samples name="{normalize-space($page/title)}" add-view-links="false">
+	  <xsl:copy-of select="$page/links"/>
+	  <!-- select either all samples or those which are selected in the current page -->
+	  <xsl:choose>
+		  <xsl:when test="$page/@filter-blocks='true'">
+		    <xsl:for-each select="$page/blocks/block">
+		      <xsl:variable name="currentBlock" select="concat('cocoon-block-',@name)"/>
+		      <xsl:apply-templates select="$xsamples/sample[@name=$currentBlock]"/>
+		    </xsl:for-each>
+		  </xsl:when>
+		  
+		  <xsl:otherwise>
+		    <xsl:apply-templates select="$xsamples/sample">
+		      <xsl:sort select="@name"/>
+		    </xsl:apply-templates>
+		    <xsl:call-template name="inactive-blocks"/>
+		  </xsl:otherwise>
+	  </xsl:choose>
+	</samples>  
+  </xsl:template>
+  
+  <xsl:template match="sample">
+    <xsl:apply-templates select="xsamples/*" mode="copy"/>
+  </xsl:template>
+  
+  <xsl:template match="*" mode="copy">
+    <xsl:copy>
+      <xsl:copy-of select="@*"/>
+      <xsl:apply-templates mode="copy"/>
+      <xsl:apply-templates select="." mode="hook"/>
+    </xsl:copy>
+  </xsl:template>
+  
+  <xsl:template match="*" mode="hook"/>
+  
+  <!-- add block name and status to sample -->
+  <xsl:template match="sample" mode="hook">
+    <xsl:variable name="gumpBlockName" select="ancestor::sample[1]/@name"/>
+    <xsl:variable name="gumpInfo" select="$gump/project[@name=$gumpBlockName]"/>
+    <p class="samplesStatusNote">
+    		block: <b><xsl:value-of select="ancestor::sample[1]/@block-name"/></b>
+    		,
+    		status: <b><xsl:value-of select="$gumpInfo/@status"/></b>
+    </p>
+  </xsl:template>
+  
+  <!-- if outputting all blocks, indicate which are not active -->
+  <xsl:template name="inactive-blocks">
+    <additional-info title="Blocks without samples">
+    Here is the list of blocks which have not been included in the build or which do not
+    have samples (i.e. do not have an .xsamples file):
+    <br/>
+    <em>
+    <xsl:for-each select="$gump/project[starts-with(@name,'cocoon-block')]">
+      <xsl:sort select="@name"/>
+      <xsl:variable name="blockName" select="@name"/>
+      <xsl:if test="not($xsamples/sample[@name=$blockName])">
+        <xsl:value-of select="concat(substring-after(@name,'cocoon-block-'),' ')"/>
+      </xsl:if>
+    </xsl:for-each>
+    </em>
+    </additional-info>
+  </xsl:template>
+  
+</xsl:stylesheet>

Added: cocoon/trunk/src/webapp/samples/blocks/samples-pages.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/webapp/samples/blocks/samples-pages.xml?rev=307077&view=auto
==============================================================================
--- cocoon/trunk/src/webapp/samples/blocks/samples-pages.xml (added)
+++ cocoon/trunk/src/webapp/samples/blocks/samples-pages.xml Fri Oct  7 03:32:49 2005
@@ -0,0 +1,50 @@
+<?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.
+-->
+
+<!--
+	Define the available samples pages, and which blocks are visible
+	on which page
+-->
+
+<samples-pages>
+  <page name="main" filter-blocks="true">
+    <title>
+    		Main Cocoon samples and featured new blocks
+    </title>
+    <blocks>
+    		<block name="core-samples-main"/>
+    		<block name="tour"/>
+    		<block name="forms"/>
+    		<block name="ajax"/>
+    </blocks>
+    <links>
+    		<link href="all-samples">All samples</link>
+    		<link href="/">Home</link>
+    </links>
+  </page>
+  
+  <page name="all" filter-blocks="false">
+    <title>
+    		List of all available samples
+    </title>
+    <blocks/>
+    <links>
+    		<link href="main-samples">Main samples</link>
+    		<link href="../test/">Test pages</link>
+    </links>
+  </page>
+</samples-pages>

Modified: cocoon/trunk/src/webapp/samples/blocks/sitemap.xmap
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/webapp/samples/blocks/sitemap.xmap?rev=307077&r1=307076&r2=307077&view=diff
==============================================================================
--- cocoon/trunk/src/webapp/samples/blocks/sitemap.xmap (original)
+++ cocoon/trunk/src/webapp/samples/blocks/sitemap.xmap Fri Oct  7 03:32:49 2005
@@ -19,49 +19,61 @@
 <!-- CVS $Id$ -->
 
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
-
-  <!-- =========================== Views =================================== -->
-
+  
   <map:views>
-    <map:view from-label="content" name="content">
+    <map:view name="debug1" from-label="debug1">
       <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 from-position="last" name="links">
-      <map:serialize type="links"/>
+    <map:view name="debug2" from-label="debug2">
+      <map:serialize type="xml"/>
     </map:view>
   </map:views>
-
-  <!-- =========================== Pipelines ================================ -->
-
+  
   <map:pipelines>
     <map:pipeline>
+    
       <map:match pattern="">
-        <map:aggregate element="root">
-          <map:part src="module.xml" element="gump"/>
-          <map:part src="cocoon:/xsamples"/>
+        <map:redirect-to uri="main-samples"/>
+      </map:match>
+      
+      <!-- generate the samples pages by filtering the aggregation of .xsamples files -->
+      <map:match pattern="*-samples">
+        <map:aggregate label="debug1" element="root">
+          <map:part element="gump" src="module.xml"/>
+          <map:part element="xsamples" src="cocoon:/xsamples"/>
+          <map:part element="pages" src="samples-pages.xml"/>
         </map:aggregate>
-        <map:transform src="gump2samples.xsl"/>
+        
+        <!-- 
+        		keep only blocks defined in samples-pages.xml for the current page,
+        		and mix with gump info
+        -->
+        <map:transform label="debug2" src="filter-blocks.xsl">
+          <map:parameter name="currentPage" value="{1}"/>
+        </map:transform>
+        
         <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>
-
+      
+      <!-- 
+      	aggregate all the xsamples files
+       --> 
       <map:match pattern="xsamples">
-      	<map:generate type="directory" src=".">
+      	<map:generate type="xpathdirectory" src="./">
       	  <map:parameter name="depth" value="2"/>
+      	  <map:parameter name="xpath" value="/xsamples"/>
+      	  <map:parameter name="xmlFiles" value="\.xsamples$"/>
+      	  <map:parameter name="include" value="^[a-z0-9\-]+$|\.xsamples"/>
       	</map:generate>
       	<map:transform src="directory2xsamples.xsl"/>
       	<map:serialize type="xml"/>
       </map:match>
-
-      <!-- ======================== Automount =============================== -->
+      
+      <!-- mount everything else -->
       <map:match pattern="*/**">
         <map:mount check-reload="yes" src="{1}/" uri-prefix="{1}"/>
       </map:match>

Modified: cocoon/trunk/src/webapp/samples/common/style/xsl/html/simple-samples2html.xsl
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/webapp/samples/common/style/xsl/html/simple-samples2html.xsl?rev=307077&r1=307076&r2=307077&view=diff
==============================================================================
--- cocoon/trunk/src/webapp/samples/common/style/xsl/html/simple-samples2html.xsl (original)
+++ cocoon/trunk/src/webapp/samples/common/style/xsl/html/simple-samples2html.xsl Fri Oct  7 03:32:49 2005
@@ -21,7 +21,7 @@
     | Author: Nicola Ken Barozzi "nicolaken@apache.org"
     | Author: Vadim Gritsenko "vgritsenko@apache.org"
     | Author: Christian Haul "haul@apache.org"
-    | CVS $Id: simple-samples2html.xsl,v 1.11 2004/04/01 19:05:42 vgritsenko Exp $
+    | CVS $Id$
     +-->
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink">
@@ -50,18 +50,24 @@
              <h2><xsl:value-of select="samples/@name"/></h2>
            </td>
            <td nowrap="nowrap" align="right">
-             Orthogonal views:
-             <a href="?cocoon-view=content">Content</a>
-             &#160;
-             <a href="?cocoon-view=pretty-content">Pretty content</a>
-             &#160;
-             <a href="?cocoon-view=links">Links</a>
+	           <xsl:if test="samples/links/*">
+	             <xsl:apply-templates select="samples/links"/>
+	           </xsl:if>
+	           <xsl:if test="not(samples/@add-view-links='false')">
+		             Orthogonal views:
+		             <a href="?cocoon-view=content">Content</a>
+		             &#160;
+		             <a href="?cocoon-view=pretty-content">Pretty content</a>
+		             &#160;
+		             <a href="?cocoon-view=links">Links</a>
+	           </xsl:if>
            </td>
          </tr>
        </table>
 
        <xsl:apply-templates select="samples"/>
-
+       <xsl:apply-templates select="samples/additional-info"/>
+       
        <p class="copyright">
          Copyright &#169; @year@ <a href="http://www.apache.org/">The Apache Software Foundation</a>.
          All rights reserved.
@@ -201,4 +207,16 @@
   <xsl:template match="text()" priority="-1">
     <xsl:value-of select="."/>
   </xsl:template>
+  
+  <xsl:template match="links/link">
+    <a href="{@href}">
+      <xsl:value-of select="."/>
+    </a>
+  </xsl:template>
+  
+  <xsl:template match="additional-info">
+    <h4><xsl:value-of select="@title"/></h4>
+    <xsl:copy-of select="node()"/>
+  </xsl:template>
+  
 </xsl:stylesheet>

Modified: cocoon/trunk/src/webapp/samples/sitemap.xmap
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/webapp/samples/sitemap.xmap?rev=307077&r1=307076&r2=307077&view=diff
==============================================================================
--- cocoon/trunk/src/webapp/samples/sitemap.xmap (original)
+++ cocoon/trunk/src/webapp/samples/sitemap.xmap Fri Oct  7 03:32:49 2005
@@ -15,195 +15,23 @@
   limitations under the License.
 -->
 
-<!-- CVS $Id$ -->
+<!-- 
+	samples sitemap, gets .xsamples files from blocks (all samples
+	are in blocks now) and displays links to available samples
+	
+	$Id$ 
+-->
 
 <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"/>
+        <!-- all samples are in blocks now -->
+        <map:redirect-to uri="blocks/"/>
       </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 ============================= -->
-
+	  <!-- mount everything else -->
       <map:match pattern="*/**">
         <map:mount uri-prefix="{1}" src="{1}/" check-reload="yes"/>
       </map:match>

Modified: cocoon/trunk/status.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/status.xml?rev=307077&r1=307076&r2=307077&view=diff
==============================================================================
--- cocoon/trunk/status.xml (original)
+++ cocoon/trunk/status.xml Fri Oct  7 03:32:49 2005
@@ -198,6 +198,10 @@
 
   <changes>
   <release version="@version@" date="@date@">
+    <action dev="BD" type="update">
+      Samples pages reorganized: the first page shows only the most important samples, selected
+      in src/webapp/samples/blocks/samples-pages.xml, and another page shows all samples.
+    </action>
     <action dev="RG" type="fix" fixes-bug="34802" due-to="Roy Huang" due-to-email="roy_huang@nbmgroup.com">
       PageLabelLinkService generated the wrong url when using 3 layer tabs with showallnav.
     </action>