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/12/19 04:08:18 UTC
svn commit: r605398 - in
/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF:
./ components/ components/calendar/ components/calendar/i18n/
components/filter/ components/imagereader/ components/paginator/ co...
Author: vgritsenko
Date: Tue Dec 18 19:08:16 2007
New Revision: 605398
URL: http://svn.apache.org/viewvc?rev=605398&view=rev
Log:
reorganize components samples, move to single directory
Added:
cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/components/calendar/
cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/components/calendar/calendar2html.xslt
- copied, changed from r604984, cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/stylesheets/calendar2html.xslt
cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/components/calendar/i18n/
- copied from r604984, cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/resources/i18n/
cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/components/calendar/sitemap.xmap (with props)
cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/components/filter/
- copied from r604984, cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/filter/
cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/components/imagereader/
- copied from r604984, cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/imagereader/
cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/components/paginator/
- copied from r604984, cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/paginator/
cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/components/samples.xml
- copied, changed from r604984, cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/components-samples.xml
cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/components/sitemap.xmap (with props)
cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/components/stream/
- copied from r604984, cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/stream/
Removed:
cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/components-samples.xml
cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/filter/
cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/imagereader/
cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/paginator/
cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/resources/
cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/stream/
cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/stylesheets/
Modified:
cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/components/calendar/i18n/messages.xml
cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/components/calendar/i18n/messages_fr.xml
cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/components/calendar/i18n/messages_nl.xml
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-additional-sample/src/main/resources/COB-INF/sitemap.xmap
Copied: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/components/calendar/calendar2html.xslt (from r604984, cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/stylesheets/calendar2html.xslt)
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/components/calendar/calendar2html.xslt?p2=cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/components/calendar/calendar2html.xslt&p1=cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/stylesheets/calendar2html.xslt&r1=604984&r2=605398&rev=605398&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/stylesheets/calendar2html.xslt (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/components/calendar/calendar2html.xslt Tue Dec 18 19:08:16 2007
@@ -16,8 +16,9 @@
limitations under the License.
-->
-<!-- CVS $Id$ -->
-
+<!--
+ - $Id$
+ -->
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
@@ -102,10 +103,10 @@
following examples:
</p>
<p>
- <a href="cal?lang=en&country=US">US English</a><br/>
- <a href="cal?lang=en&country=GB">UK English</a><br/>
- <a href="cal?lang=nl">Dutch</a><br/>
- <a href="cal?lang=fr">French</a><br/>
+ <a href="?lang=en&country=US">US English</a><br/>
+ <a href="?lang=en&country=GB">UK English</a><br/>
+ <a href="?lang=nl">Dutch</a><br/>
+ <a href="?lang=fr">French</a><br/>
</p>
<p>Note: the column headers are not localized, you can do that by simply inserting the appropriate
i18n tags and transformer. Check the sample sources (sitemap and XSLT style sheet) and uncomment
Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/components/calendar/i18n/messages.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/components/calendar/i18n/messages.xml?rev=605398&r1=604984&r2=605398&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/components/calendar/i18n/messages.xml (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/components/calendar/i18n/messages.xml Tue Dec 18 19:08:16 2007
@@ -16,19 +16,17 @@
limitations under the License.
-->
-<!--+
- | Default (English) message catalogue file for Cocoon 2 CalendarGenerator sample
- |
- | CVS $Id$
- +-->
-
- <catalogue xml:lang="en">
- <message key="SUNDAY">Sunday</message>
- <message key="MONDAY">Monday</message>
- <message key="TUESDAY">Tuesday</message>
- <message key="WEDNESDAY">Wednesday</message>
- <message key="THURSDAY">Thursday</message>
- <message key="FRIDAY">Friday</message>
- <message key="SATURDAY">Saturday</message>
- </catalogue>
-
+<!--
+ - Default (English) message catalogue file for Cocoon 2 CalendarGenerator sample
+ -
+ - CVS $Id$
+ -->
+<catalogue xml:lang="en">
+ <message key="SUNDAY">Sunday</message>
+ <message key="MONDAY">Monday</message>
+ <message key="TUESDAY">Tuesday</message>
+ <message key="WEDNESDAY">Wednesday</message>
+ <message key="THURSDAY">Thursday</message>
+ <message key="FRIDAY">Friday</message>
+ <message key="SATURDAY">Saturday</message>
+</catalogue>
Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/components/calendar/i18n/messages_fr.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/components/calendar/i18n/messages_fr.xml?rev=605398&r1=604984&r2=605398&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/components/calendar/i18n/messages_fr.xml (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/components/calendar/i18n/messages_fr.xml Tue Dec 18 19:08:16 2007
@@ -16,19 +16,17 @@
limitations under the License.
-->
-<!--+
- | French message catalogue file for Cocoon 2 CalendarGenerator sample
- |
- | CVS $Id$
- +-->
-
- <catalogue xml:lang="fr">
- <message key="SUNDAY">dimanche</message>
- <message key="MONDAY">lundi</message>
- <message key="TUESDAY">mardi</message>
- <message key="WEDNESDAY">mercredi</message>
- <message key="THURSDAY">jeudi</message>
- <message key="FRIDAY">vendredi</message>
- <message key="SATURDAY">samedi</message>
- </catalogue>
-
+<!--
+ - French message catalogue file for Cocoon 2 CalendarGenerator sample
+ -
+ - $Id$
+ -->
+<catalogue xml:lang="fr">
+ <message key="SUNDAY">dimanche</message>
+ <message key="MONDAY">lundi</message>
+ <message key="TUESDAY">mardi</message>
+ <message key="WEDNESDAY">mercredi</message>
+ <message key="THURSDAY">jeudi</message>
+ <message key="FRIDAY">vendredi</message>
+ <message key="SATURDAY">samedi</message>
+</catalogue>
Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/components/calendar/i18n/messages_nl.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/components/calendar/i18n/messages_nl.xml?rev=605398&r1=604984&r2=605398&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/components/calendar/i18n/messages_nl.xml (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/components/calendar/i18n/messages_nl.xml Tue Dec 18 19:08:16 2007
@@ -16,19 +16,17 @@
limitations under the License.
-->
-<!--+
- | Dutch message catalogue file for Cocoon 2 CalendarGenerator sample
- |
- | CVS $Id$
- +-->
-
- <catalogue xml:lang="nl">
- <message key="SUNDAY">Zondag</message>
- <message key="MONDAY">Maandag</message>
- <message key="TUESDAY">Dinsdag</message>
- <message key="WEDNESDAY">Woensdag</message>
- <message key="THURSDAY">Donderdag</message>
- <message key="FRIDAY">Vrijdag</message>
- <message key="SATURDAY">Zaterdag</message>
- </catalogue>
-
+<!--
+ - Dutch message catalogue file for Cocoon 2 CalendarGenerator sample
+ -
+ - $Id$
+ -->
+<catalogue xml:lang="nl">
+ <message key="SUNDAY">Zondag</message>
+ <message key="MONDAY">Maandag</message>
+ <message key="TUESDAY">Dinsdag</message>
+ <message key="WEDNESDAY">Woensdag</message>
+ <message key="THURSDAY">Donderdag</message>
+ <message key="FRIDAY">Vrijdag</message>
+ <message key="SATURDAY">Zaterdag</message>
+</catalogue>
Added: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/components/calendar/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/components/calendar/sitemap.xmap?rev=605398&view=auto
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/components/calendar/sitemap.xmap (added)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/components/calendar/sitemap.xmap Tue Dec 18 19:08:16 2007
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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.
+-->
+
+<!--
+ - $Id$
+ -->
+<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
+
+ <!-- ========================= Components ================================ -->
+
+ <map:components>
+ <map:generators default="file">
+ <map:generator name="calendar"
+ label="content"
+ src="org.apache.cocoon.generation.CalendarGenerator"/>
+ </map:generators>
+
+ <map:transformers default="xslt">
+ <map:transformer name="i18n" src="org.apache.cocoon.transformation.I18nTransformer">
+ <catalogues default="messages">
+ <catalogue id="messages" name="messages" location="i18n"/>
+ </catalogues>
+ </map:transformer>
+ </map:transformers>
+ </map:components>
+
+ <!-- =========================== Views =================================== -->
+
+ <map:views>
+ <map:view name="content" from-label="content">
+ <map:serialize type="xml"/>
+ </map:view>
+
+ <map:view name="pretty-content" from-label="content">
+ <map:serialize type="servletService">
+ <map:parameter name="service" value="servlet:style:/service/system/xml2html"/>
+ </map:serialize>
+ </map:view>
+
+ <map:view name="links" from-position="last">
+ <map:serialize type="links"/>
+ </map:view>
+ </map:views>
+
+ <!-- ========================== Pipelines ================================ -->
+
+ <map:pipelines>
+ <map:pipeline>
+
+ <map:match pattern="">
+ <map:generate type="calendar">
+ <!-- Uncomment and set a value for the desired month and year
+ <map:parameter name="month" value="6"/>
+ <map:parameter name="year" value="1998"/>
+ -->
+ <!-- Uncomment the line below to set a fixed date format -->
+ <!--
+ <map:parameter name="dateFormat" value="EEEE, MMMM d yyyy"/>
+ -->
+ <map:parameter name="lang" value="{request-param:lang}"/>
+ <map:parameter name="country" value="{request-param:country}"/>
+ </map:generate>
+ <map:transform src="calendar2html.xslt"/>
+ <!-- to localize the column headers, remove the comments below -->
+ <!--
+ <map:transform type="i18n">
+ <map:parameter name="default-catalogue-id" value="messages"/>
+ <map:parameter name="locale" value="{request-param:lang}"/>
+ </map:transform>
+ -->
+ <map:serialize />
+ </map:match>
+
+ </map:pipeline>
+
+ </map:pipelines>
+</map:sitemap>
Propchange: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/components/calendar/sitemap.xmap
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/components/calendar/sitemap.xmap
------------------------------------------------------------------------------
svn:keywords = Id Revision Author Date
Copied: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/components/samples.xml (from r604984, cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/components-samples.xml)
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/components/samples.xml?p2=cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/components/samples.xml&p1=cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/components-samples.xml&r1=604984&r2=605398&rev=605398&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/components-samples.xml (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/components/samples.xml Tue Dec 18 19:08:16 2007
@@ -16,19 +16,21 @@
limitations under the License.
-->
-<!-- @version $Id$ -->
-
-<samples xmlns:xlink="http://www.w3.org/1999/xlink" name="Components Samples">
+<!--
+ - $Id$
+ -->
+<samples xmlns:xlink="http://www.w3.org/1999/xlink"
+ name="Components Samples">
<group name="Back">
- <sample name="Back" href="./">
- Back to the samples home page.
- </sample>
- <note>
- These are just some of the many facilities that are included with the
- core. See the main documentation for descriptions of all available
- components.
- </note>
+ <sample name="Back" href="../">
+ Back to the samples home page.
+ </sample>
+ <note>
+ These are just some of the many facilities that are included with the
+ core. See the main documentation for descriptions of all available
+ components.
+ </note>
</group>
<group name="Generators">
@@ -44,7 +46,7 @@
<sample href="imagereader/list" name="Image Directory Generator">
Read a directory, process images and find their attributes.
</sample>
- <sample href="cal" name="Calendar Generator">
+ <sample href="calendar/" name="Calendar Generator">
Generate a calendar for any month and year.
</sample>
</group>
Added: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/components/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/components/sitemap.xmap?rev=605398&view=auto
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/components/sitemap.xmap (added)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/components/sitemap.xmap Tue Dec 18 19:08:16 2007
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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.
+-->
+
+<!--
+ - $Id$
+ -->
+<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
+
+ <!-- =========================== Views =================================== -->
+
+ <map:views>
+ <map:view name="content" from-label="content">
+ <map:serialize type="xml"/>
+ </map:view>
+
+ <map:view name="pretty-content" from-label="content">
+ <map:serialize type="servletService">
+ <map:parameter name="service" value="servlet:style:/service/system/xml2html"/>
+ </map:serialize>
+ </map:view>
+
+ <map:view name="links" from-position="last">
+ <map:serialize type="links"/>
+ </map:view>
+ </map:views>
+
+ <!-- ========================== Pipelines ================================ -->
+
+ <map:pipelines>
+ <map:pipeline>
+
+ <map:match pattern="">
+ <map:generate src="samples.xml"/>
+ <map:serialize type="servletService">
+ <map:parameter name="service" value="servlet:style:/service/common/simple-samples2html"/>
+ </map:serialize>
+ </map:match>
+
+ <map:match pattern="sitemap.xmap">
+ <map:read src="sitemap.xmap" mime-type="text/xml"/>
+ </map:match>
+
+ <!-- ========================= Stream ================================ -->
+
+ <map:match pattern="order">
+ <map:generate src="stream/OrderPage.xml"/>
+ <map:serialize type="servletService">
+ <map:parameter name="service" value="servlet:style:/service/blocks/dynamic-page2html"/>
+ </map:serialize>
+ </map:match>
+
+ <map:match pattern="process-order">
+ <map:generate type="stream">
+ <map:parameter name="form-name" value="Foo"/>
+ </map:generate>
+ <map:serialize type="servletService">
+ <map:parameter name="service" value="servlet:style:/service/system/xml2html"/>
+ </map:serialize>
+ </map:match>
+
+ <!-- ======================= Other Samples =========================== -->
+
+ <map:match pattern="request.html">
+ <map:generate type="request"/>
+ <map:serialize type="servletService">
+ <map:parameter name="service" value="servlet:style:/service/system/xml2html"/>
+ </map:serialize>
+ </map:match>
+
+ <map:match pattern="source-write.xml">
+ <map:generate src="source-writing-transformer.xml"/>
+ <map:transform type="write-source"/>
+ <map:serialize type="xml"/>
+ </map:match>
+
+ <!-- ========================= Automount ============================= -->
+
+ <map:match pattern="*/**">
+ <map:mount uri-prefix="{1}" src="{1}/"/>
+ </map:match>
+ </map:pipeline>
+
+ </map:pipelines>
+</map:sitemap>
Propchange: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/components/sitemap.xmap
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/components/sitemap.xmap
------------------------------------------------------------------------------
svn:keywords = Id Revision Author Date
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=605398&r1=605397&r2=605398&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 Tue Dec 18 19:08:16 2007
@@ -19,12 +19,12 @@
<!--
- Main samples page
-
- - @version $Id$
+ - $Id$
-->
<samples name="Additional Cocoon Core Samples">
<group name="More Core Samples">
- <sample href="components" name="Core Components">
+ <sample href="components/" name="Core Components">
Some samples of various components that are included with the core,
e.g. Stream Generators, Paginator Transformers, Image Readers.
</sample>
Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/sitemap.xmap?rev=605398&r1=605397&r2=605398&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/sitemap.xmap Tue Dec 18 19:08:16 2007
@@ -26,17 +26,7 @@
<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:transformers default="xslt">
- <!-- Configure i18n transformer for Calendar sample -->
- <map:transformer name="i18n" logger="sitemap.transformer.i18n" src="org.apache.cocoon.transformation.I18nTransformer">
- <catalogues default="messages">
- <catalogue id="messages" name="messages" location="resources/i18n"/>
- </catalogues>
- </map:transformer>
- </map:transformers>
</map:components>
<!-- =========================== Views =================================== -->
@@ -73,77 +63,10 @@
<map:read src="sitemap.xmap" mime-type="text/xml"/>
</map:match>
- <!-- ========================= Stream ================================ -->
-
- <map:match pattern="order">
- <map:generate src="stream/OrderPage.xml" />
- <!-- Make use of servlet services -->
- <map:serialize type="servletService">
- <map:parameter name="service" value="servlet:style:/service/blocks/dynamic-page2html" />
- </map:serialize>
- </map:match>
-
- <map:match pattern="process-order">
- <map:generate type="stream">
- <map:parameter name="form-name" value="Foo" />
- </map:generate>
- <!-- Make use of servlet services -->
- <map:serialize type="servletService">
- <map:parameter name="service" value="servlet:style:/service/system/xml2html" />
- </map:serialize>
- </map:match>
-
- <!-- ======================= Other Samples =========================== -->
-
- <map:match pattern="components">
- <map:generate src="components-samples.xml" />
- <map:serialize type="servletService">
- <map:parameter name="service" value="servlet:style:/service/common/simple-samples2html" />
- </map:serialize>
- </map:match>
-
- <map:match pattern="request.html">
- <map:generate type="request" />
- <map:serialize type="servletService">
- <map:parameter name="service" value="servlet:style:/service/system/xml2html" />
- </map:serialize>
- </map:match>
-
- <map:match pattern="source-write.xml">
- <map:generate src="components/source-writing-transformer.xml" />
- <map:transform type="write-source" />
- <map:serialize type="xml" />
- </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"/>
- -->
- <!-- Uncomment the line below to set a fixed date format -->
- <!--
- <map:parameter name="dateFormat" value="EEEE, MMMM d yyyy"/>
- -->
- <map:parameter name="lang" value="{request-param:lang}" />
- <map:parameter name="country" value="{request-param:country}" />
- </map:generate>
- <map:transform src="stylesheets/calendar2html.xslt" />
- <!-- to localize the column headers, remove the comments below -->
- <!--
- <map:transform type="i18n">
- <map:parameter name="default-catalogue-id" value="messages"/>
- <map:parameter name="locale" value="{request-param:lang}"/>
- </map:transform>
- -->
- <map:serialize />
- </map:match>
-
<!-- ======================== Utilities ============================== -->
<map:match pattern="**sitemap.xmap">
- <map:generate src="{0}"/>
- <map:serialize type="xml"/>
+ <map:read src="{0}" mime-type="text/xml"/>
</map:match>
<map:match pattern="linkstatus">
@@ -160,7 +83,7 @@
<!-- ========================= Automount ============================= -->
<map:match pattern="*/**">
- <map:mount uri-prefix="{1}" src="{1}/" />
+ <map:mount uri-prefix="{1}" src="{1}/"/>
</map:match>
</map:pipeline>