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/11/14 18:16:10 UTC
svn commit: r594955 - in
/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/errorhandling:
internal/sitemap.xmap sitemap.xmap
Author: vgritsenko
Date: Wed Nov 14 09:16:08 2007
New Revision: 594955
URL: http://svn.apache.org/viewvc?rev=594955&view=rev
Log:
Use servlet:style-default:
Modified:
cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/errorhandling/internal/sitemap.xmap
cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/errorhandling/sitemap.xmap
Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/errorhandling/internal/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/errorhandling/internal/sitemap.xmap?rev=594955&r1=594954&r2=594955&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/errorhandling/internal/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/errorhandling/internal/sitemap.xmap Wed Nov 14 09:16:08 2007
@@ -16,11 +16,11 @@
limitations under the License.
-->
-<!--+
- | Demonstrates internal pipeline error handling.
- |
- | $Id$
- +-->
+<!--
+ - Demonstrates internal pipeline error handling.
+ -
+ - $Id$
+ -->
<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
<map:pipelines>
@@ -40,6 +40,7 @@
</map:match>
</map:pipeline>
+
<map:pipeline>
<map:match pattern="custom-sitemap">
<map:act type="exception" src="validation"/>
@@ -54,6 +55,7 @@
<map:generate type="exception" src="validation"/>
<map:serialize type="xml"/>
</map:match>
+
<map:handle-errors when="always">
<map:generate type="notifying"/>
<map:transform src="error2xml.xslt"/>
@@ -61,6 +63,7 @@
</map:handle-errors>
</map:pipeline>
+
<map:pipeline>
<map:match pattern="">
<map:redirect-to uri="welcome"/>
@@ -68,10 +71,9 @@
<map:match pattern="welcome">
<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:serialize type="servletService">
+ <map:parameter name="service" value="servlet:style-default:/service/common/simple-samples2html"/>
+ </map:serialize>
</map:match>
<map:match pattern="aggregate/*">
Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/errorhandling/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/errorhandling/sitemap.xmap?rev=594955&r1=594954&r2=594955&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/errorhandling/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/errorhandling/sitemap.xmap Wed Nov 14 09:16:08 2007
@@ -16,76 +16,79 @@
limitations under the License.
-->
-<!--+
- | $Id$
- +-->
+<!--
+ - Cocoon error handling samples sitemap
+ -
+ - $Id$
+ -->
<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
<map:components>
<map:generators default="file">
- <map:generator name="exception" src="org.apache.cocoon.samples.errorhandling.ExceptionGenerator" />
+ <map:generator name="exception" src="org.apache.cocoon.samples.errorhandling.ExceptionGenerator"/>
</map:generators>
+
<map:selectors default="browser">
<map:selector name="exception" src="org.apache.cocoon.selection.XPathExceptionSelector">
<exception name="application" class="org.apache.cocoon.samples.errorhandling.ApplicationException">
- <xpath name="application1" test="errorCode=1" />
- <xpath name="application2" test="errorCode=2" />
+ <xpath name="application1" test="errorCode=1"/>
+ <xpath name="application2" test="errorCode=2"/>
</exception>
- <exception name="validation" class="org.apache.cocoon.samples.errorhandling.ValidationException" />
- <exception name="not-found" class="org.apache.cocoon.ResourceNotFoundException" />
- <exception class="java.lang.Throwable" unroll="true" />
+ <exception name="validation" class="org.apache.cocoon.samples.errorhandling.ValidationException"/>
+ <exception name="not-found" class="org.apache.cocoon.ResourceNotFoundException"/>
+ <exception class="java.lang.Throwable" unroll="true"/>
</map:selector>
</map:selectors>
+
<map:actions>
- <map:action name="exception" src="org.apache.cocoon.samples.errorhandling.ExceptionAction" />
+ <map:action name="exception" src="org.apache.cocoon.samples.errorhandling.ExceptionAction"/>
</map:actions>
</map:components>
<map:pipelines>
<map:pipeline>
<map:match pattern="">
- <map:redirect-to uri="welcome" />
+ <map:redirect-to uri="welcome"/>
</map:match>
<map:match pattern="welcome">
- <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-default:/service/common/simple-samples2html" />
+ <map:parameter name="service" value="servlet:style-default:/service/common/simple-samples2html"/>
</map:serialize>
</map:match>
<map:match pattern="not-exists">
- <map:generate src="{0}.xml" />
- <map:serialize />
+ <map:generate src="{0}.xml"/>
+ <map:serialize/>
</map:match>
<map:match pattern="*">
- <map:generate type="exception" src="{1}" />
- <map:serialize />
+ <map:generate type="exception" src="{1}"/>
+ <map:serialize/>
</map:match>
<map:match pattern="internal/**">
- <map:mount uri-prefix="internal" src="internal/" />
+ <map:mount uri-prefix="internal" src="internal/"/>
</map:match>
</map:pipeline>
<map:pipeline>
- <map:mount uri-prefix="exception" src="exception/" />
+ <map:mount uri-prefix="exception" src="exception/"/>
<map:handle-errors>
<map:select type="exception">
<map:when test="not-found">
- <map:generate src="notFound.html" />
- <map:serialize />
+ <map:generate src="notFound.html"/>
+ <map:serialize/>
</map:when>
</map:select>
</map:handle-errors>
</map:pipeline>
<map:handle-errors>
- <map:generate type="notifying" />
- <map:transform src="servlet:style-default:/stylesheets/system/error2html.xslt" />
+ <map:generate type="notifying"/>
+ <map:transform src="servlet:style-default:/stylesheets/system/error2html.xslt"/>
</map:handle-errors>
</map:pipelines>