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/07 22:38:30 UTC
svn commit: r602235 - in /cocoon/trunk/blocks/cocoon-core-sample:
cocoon-core-additional-sample/src/main/resources/COB-INF/sitemap.xmap
cocoon-core-main-sample/src/main/resources/COB-INF/system/sitemap.xmap
Author: vgritsenko
Date: Fri Dec 7 13:38:29 2007
New Revision: 602235
URL: http://svn.apache.org/viewvc?rev=602235&view=rev
Log:
cleanup
Modified:
cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/sitemap.xmap
cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/system/sitemap.xmap
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=602235&r1=602234&r2=602235&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 Fri Dec 7 13:38:29 2007
@@ -16,25 +16,27 @@
limitations under the License.
-->
-<!-- CVS $Id$ -->
-
+<!--
+ - $Id$
+ -->
<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
<!-- ========================= Components ================================ -->
<map:components>
- <map:include-properties dir="properties" />
+ <map:include-properties dir="properties"/>
+
<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: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 -->
+ <!-- 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" />
+ <catalogue id="messages" name="messages" location="resources/i18n"/>
</catalogues>
- <cache-at-startup>true</cache-at-startup>
</map:transformer>
</map:transformers>
</map:components>
@@ -43,18 +45,17 @@
<map:views>
<map:view name="content" from-label="content">
- <map:serialize type="xml" />
+ <map:serialize type="xml"/>
</map:view>
- <map:view from-label="content" name="pretty-content">
- <!-- Make use of servlet services -->
+ <map:view name="pretty-content" from-label="content">
<map:serialize type="servletService">
- <map:parameter name="service" value="servlet:style:/service/system/xml2html" />
+ <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:serialize type="links"/>
</map:view>
</map:views>
@@ -62,22 +63,16 @@
<map:pipelines>
<map:pipeline>
- <!--
- <map:match pattern="v">
- <map:generate type="virtual"/>
- <map:serialize type="xhtml"/>
- </map:match>
- -->
+
<map:match pattern="">
- <map:generate src="samples.xml" />
- <!-- Make use of servlet services -->
+ <map:generate src="samples.xml"/>
<map:serialize type="servletService">
- <map:parameter name="service" value="servlet:style:/service/common/simple-samples2html" />
+ <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:read src="sitemap.xmap" mime-type="text/xml"/>
</map:match>
<!-- ========================= Stream ================================ -->
@@ -149,67 +144,18 @@
<!-- ======================== Utilities ============================== -->
<map:match pattern="**sitemap.xmap">
- <map:generate src="{0}" />
- <map:serialize type="xml" />
+ <map:generate src="{0}"/>
+ <map:serialize type="xml"/>
</map:match>
<map:match pattern="linkstatus">
- <map:redirect-to uri="linkstatus/localhost/8888/docs/index.html" />
+ <map:redirect-to uri="linkstatus/localhost/8888/docs/index.html"/>
</map:match>
<map:match pattern="linkstatus/*/*/**">
- <map:generate type="linkstatus" src="http://{1}:{2}/{3}" />
- <!-- Make use of servlet services -->
- <map:serialize type="servletService">
- <map:parameter name="service" value="servlet:style:/service/system/linkstatus2html" />
- </map:serialize>
- </map:match>
-
- <map:match pattern="status.html">
- <map:generate type="status" />
- <!-- Make use of servlet services -->
- <map:serialize type="servletService">
- <map:parameter name="service" value="servlet:style:/service/system/status2html" />
- </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" />
- <!-- Make use of servlet services -->
+ <map:generate type="linkstatus" src="http://{1}:{2}/{3}"/>
<map:serialize type="servletService">
- <map:parameter name="service" value="servlet:style:/service/system/status2html" />
- </map:serialize>
- </map:match>
-
- <map:match pattern="clearcache.html">
- <map:act type="clear-cache">
- <map:generate src="status" type="status" />
- <!-- Make use of servlet services -->
- <map:serialize type="servletService">
- <map:parameter name="service" value="servlet:style:/service/system/status2html" />
- </map:serialize>
- </map:act>
- </map:match>
-
- <map:match pattern="clearpersistentstore.html">
- <map:act type="clear-persistent-store">
- <map:generate src="status" type="status" />
- <!-- Make use of servlet services -->
- <map:serialize type="servletService">
- <map:parameter name="service" value="servlet:style:/service/system/status2html" />
- </map:serialize>
- </map:act>
- <map:generate src="no-persistent-store.xml" />
- <!-- Make use of servlet services -->
- <map:serialize type="servletService">
- <map:parameter name="service" value="servlet:style:/service/system/xml2html" />
+ <map:parameter name="service" value="servlet:style:/service/system/linkstatus2html"/>
</map:serialize>
</map:match>
Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/system/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/system/sitemap.xmap?rev=602235&r1=602234&r2=602235&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/system/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/system/sitemap.xmap Fri Dec 7 13:38:29 2007
@@ -96,13 +96,6 @@
</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:pipeline>
</map:pipelines>
</map:sitemap>