cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From reinh...@apache.org
Subject svn commit: r638940 - /cocoon/trunk/blocks/cocoon-it/src/main/resources/COB-INF/sitemap.xmap
Date Wed, 19 Mar 2008 17:18:58 GMT
Author: reinhard
Date: Wed Mar 19 10:18:45 2008
New Revision: 638940

URL: http://svn.apache.org/viewvc?rev=638940&view=rev
Log:
"fix" sitemap: the last pipeline mustn't contain a handle-errors section because this would
overrule a handle-errors section at pipelines level

Modified:
    cocoon/trunk/blocks/cocoon-it/src/main/resources/COB-INF/sitemap.xmap

Modified: cocoon/trunk/blocks/cocoon-it/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-it/src/main/resources/COB-INF/sitemap.xmap?rev=638940&r1=638939&r2=638940&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-it/src/main/resources/COB-INF/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-it/src/main/resources/COB-INF/sitemap.xmap Wed Mar 19 10:18:45
2008
@@ -172,17 +172,6 @@
       </map:match>
     </map:pipeline>
 
-    <!-- ~~~~~~~~~~~~~~~~ redirect ~~~~~~~~~~~~~~~ -->
-    <map:pipeline>
-      <map:match pattern="redirect/www.orf.at">
-        <map:redirect-to uri="http://www.orf.at"/>
-      </map:match>
-      <!-- Redirecting to a servlet service doesn't work -->
-      <!--map:match pattern="redirect/sax-pipeline/simple-xml">
-        <map:redirect-to uri="servlet:/sax-pipeline/simple-xml"/>
-      </map:match-->
-    </map:pipeline>
-
     <!-- ~~~~~~~~~~~~~~~~ error handling ~~~~~~~~~~~~~~~ -->
     <map:pipeline>
       <map:match pattern="error-handling/custom-error">
@@ -210,6 +199,17 @@
       </map:handle-errors>
     </map:pipeline>
 
+    <!-- ~~~~~~~~~~~~~~~~ redirect ~~~~~~~~~~~~~~~ -->
+    <map:pipeline>
+      <map:match pattern="redirect/www.orf.at">
+        <map:redirect-to uri="http://www.orf.at"/>
+      </map:match>
+      <!-- Redirecting to a servlet service doesn't work -->
+      <!--map:match pattern="redirect/sax-pipeline/simple-xml">
+        <map:redirect-to uri="servlet:/sax-pipeline/simple-xml"/>
+      </map:match-->
+    </map:pipeline>
+
     <map:handle-errors>
       <map:select type="custom-exception">
         <map:when test="not-found">
@@ -230,6 +230,7 @@
         </map:otherwise>
       </map:select>
     </map:handle-errors>
+
   </map:pipelines>
 
 </map:sitemap>



Mime
View raw message