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/24 06:14:38 UTC

svn commit: r597806 - /cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/sitemap.xmap

Author: vgritsenko
Date: Fri Nov 23 21:14:35 2007
New Revision: 597806

URL: http://svn.apache.org/viewvc?rev=597806&view=rev
Log:
remove api/ and blocks/ matchers

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

Modified: cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/sitemap.xmap?rev=597806&r1=597805&r2=597806&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/sitemap.xmap Fri Nov 23 21:14:35 2007
@@ -144,15 +144,15 @@
             | depending on the serializer type.
             +-->
         <map:serialize type="servletService">
-          <map:parameter name="service" value="servlet:style:/service/common/simple-page2html" />
+          <map:parameter name="service" value="servlet:style:/service/common/simple-page2html"/>
         </map:serialize>
       </map:match>
 
       <!--+
-          | Show the this sitemap.xmap.
+          | Show this sitemap.xmap file.
           +-->
       <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>
 
       <!--+
@@ -232,13 +232,6 @@
       </map:match>
 
       <!--+
-          | Map the API documentation.
-          +-->
-      <map:match pattern="api/**">
-        <map:read src="api/{1}"/>
-      </map:match>
-
-      <!--+
           | Find a match in the "mount-table.xml" file, if present. It allows to mount other
           | directories without touching this main sitemap (and thus loosing changes on rebuild).
           |
@@ -285,11 +278,6 @@
         </map:select>
       </map:match>
 
-
-      <!-- FIXME: It's a simple work-around -->
-      <map:match pattern="blocks/**">
-        <map:redirect-to uri="{1}/" global="true"/>
-      </map:match>
 
       <!--+
           | Mount everything else by calling the sitemap.xmap file located