You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2008/02/12 22:54:33 UTC

svn commit: r627136 - /lenya/sandbox/pubs/docu/sitemap.xmap

Author: andreas
Date: Tue Feb 12 13:54:32 2008
New Revision: 627136

URL: http://svn.apache.org/viewvc?rev=627136&view=rev
Log:
Cleaned up docu pub sitemap.

Modified:
    lenya/sandbox/pubs/docu/sitemap.xmap

Modified: lenya/sandbox/pubs/docu/sitemap.xmap
URL: http://svn.apache.org/viewvc/lenya/sandbox/pubs/docu/sitemap.xmap?rev=627136&r1=627135&r2=627136&view=diff
==============================================================================
--- lenya/sandbox/pubs/docu/sitemap.xmap (original)
+++ lenya/sandbox/pubs/docu/sitemap.xmap Tue Feb 12 13:54:32 2008
@@ -6,9 +6,9 @@
   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
-
+  
+  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.
@@ -20,16 +20,16 @@
 
 
 <!-- ============ cruft removal project: ================
-
-   lenyabody-**  is only used internally in this sitemap and could be refactored without side effects.
-   currently we use lenyabody-raw-[edit|view], lenyabody-[edit|view], and now also document-content.
-   i'm sure this can be simplified.
-
+  
+  lenyabody-**  is only used internally in this sitemap and could be refactored without side effects.
+  currently we use lenyabody-raw-[edit|view], lenyabody-[edit|view], and now also document-content.
+  i'm sure this can be simplified.
+  
 -->
 
 
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
-
+  
   <map:components>
     <map:transformers default="xslt">
       <map:transformer name="metaData" logger="lenya.sitemap.transformer.metaData" src="org.apache.lenya.cms.cocoon.transformation.MetaDataTransformer"/>
@@ -38,93 +38,15 @@
       <map:serializer logger="sitemap.serializer.links" name="links" src="org.apache.lenya.cms.cocoon.serialization.LinkSerializer"/>
     </map:serializers>
   </map:components>
-
-  <map:views>
-<!-- ============ cruft removal project: ================
-
-this view's from-label does not exist.
-
-    <map:view from-label="aggregation" name="aggregation">
-      <map:serialize type="xml"/>
-    </map:view>
-
--->
-    <map:view from-position="last" name="links">
-      <map:serialize type="links" />
-    </map:view>
-  </map:views>
-
-<!-- =========================== Resources ================================= -->
-
-  <map:resources>
-    <map:resource name="style-cms-page">
-      <map:transform type="i18n">      
-        <map:parameter name="locale" value="{request:locale}"/>
-      </map:transform>    
-      <map:transform src="fallback://lenya/xslt/util/page2xhtml.xsl"/>
-      <map:transform src="context://lenya/xslt/util/strip_namespaces.xsl"/>
-      <map:transform type="proxy"/>
-    </map:resource>
-  </map:resources>
   
   <map:pipelines>
-
-    <!-- FIXME: the location of Lenya's cache should either be a global convention 
-         or a per-publication configuration option in publication.xml. -->
-    <map:component-configurations>
-      <global-variables>
-        <cache-dir>work/cache</cache-dir>
-      </global-variables>
-    </map:component-configurations>
-
-
-
-
+    
     <!-- This pipeline handles helper requests and metadata, not the actual publication documents -->
     <map:pipeline>
-
-      <!-- Neutron introspection
-           The location of the introspection file is defined in <link rel="neutron-introspection"/>
-           (see xslt/page2xhtml.xsl).
-      -->
-      <map:match pattern="*/**/introspection.xml">
-        <map:select type="resource-exists">
-          <map:when test="fallback://lenya/modules/neutron/sitemap.xmap">
-            <!-- NB: there are problems with the fallback:// source factory when mounting sitemaps, 
-                 that's why the corresponding input module {fallback:} is used. -->
-            <map:mount 
-              uri-prefix="" 
-              src="{fallback:lenya/modules/neutron/sitemap.xmap}" 
-              check-reload="true" 
-              reload-method="synchron"
-            />
-          </map:when>
-          <map:otherwise>
-            <map:generate src="context:/lenya/content/util/empty.xml"/>
-            <map:serialize type="xml"/>
-          </map:otherwise>
-        </map:select>
-      </map:match>
- 
-<!--
-   FIXME: the whole webdav shebang should be handled by the webdav module sitemap.
--->
-     <!-- catch webdav GET requests. -->
-        <map:match pattern="*/webdav**">
-          <map:mount uri-prefix="{1}/" src="{fallback:lenya/modules/webdav/sitemap.xmap}" check-reload="true" reload-method="synchron"/>    
-        </map:match>
-
-        <!-- catch PUT requests (used by webdav clients) -->
-        <map:select type="request-method">
-          <!-- many client editors like to PUT changes -->
-          <map:when test="PUT">
-            <map:mount uri-prefix="" src="{fallback:lenya/modules/webdav/sitemap.xmap}" check-reload="true" reload-method="synchron"/>
-          </map:when>
-        </map:select>
       
       <!-- FIXME: this should be merged with the getDoctypeXSLT/* matcher below. currently, it is necessary
-           so that "getDoctypeXSLT/" requests do not get eaten by the **/ matcher below. 
-           Plus it should be moved to an internal-only pipeline.
+        so that "getDoctypeXSLT/" requests do not get eaten by the **/ matcher below. 
+        Plus it should be moved to an internal-only pipeline.
       -->
       <map:match pattern="getDoctypeXSLT/">
         <map:generate src="fallback://lenya/modules/docustyle/xslt/page2xhtml.xsl"/>
@@ -140,40 +62,19 @@
       </map:match>
       
       <!-- Requests ending in a slash are redirected to the corresponding index.html page to mimic
-           standard web browser behaviour. -->
+        standard web browser behaviour. -->
       <!-- FIXME: this will trigger a HTTP redirect. Maybe it's more effective to do an internal redirect using
-           a cocoon:/ URI? An apache httpd server will not send a HTTP redirect when a directory is requested, but
-           serve the index.html file implicitly IIRC. -->
+        a cocoon:/ URI? An apache httpd server will not send a HTTP redirect when a directory is requested, but
+        serve the index.html file implicitly IIRC. -->
       <map:match pattern="**/">
         <map:redirect-to uri="index.html"/>
       </map:match>
-
+      
     </map:pipeline>
     
-
+    
     <map:pipeline type="caching">
       
-      <!-- RSS formatting. 
-           FIXME: this should be handled by an RSS feed module!
-      -->
-      <map:match pattern="**.rss">
-        <map:generate src="{resource-type:format-rss}"/>
-        <map:serialize type="xml"/>
-      </map:match>
-      
-      <!-- FIXME: either this should be moved into a metadata module, or at least we need to establish
-           some standard for magic extra suffixes and stick to it.
-           Here we use .html.meta, bxe uses .bxe.html.
-      -->
-      <map:match pattern="*/**.html.meta">
-        <map:generate type="lenyaMetaData" src="lenya-document:{page-envelope:document-uuid},area={1}"/>
-        <map:serialize type="xml"/>
-      </map:match>
-      <map:match pattern="**meta">
-        <map:generate type="lenyaMetaData" src="lenya-document:{request-param:uuid},lang={request-param:lang},pubid={request-param:pubid},area={request-param:area}"/>
-        <map:serialize type="xml"/>
-      </map:match>
-      
       <!-- {1:rendertype}/{2:pub}/{3:area}/{4:path} -->
       <map:match pattern="document-content/*/*/*/**">
         <map:act type="language-exists">
@@ -196,8 +97,8 @@
       </map:match>
       
       <!-- 
-         This matcher aggregates the Lenya page: breadcrumbs, tabs, menu etc. and the actual document content.
-         /lenyabody-raw-{1:rendertype}/{2:publication-id}/{3:area}/{4:doctype}/{5:default-language}/{6:language}/{7:path} 
+        This matcher aggregates the Lenya page: breadcrumbs, tabs, menu etc. and the actual document content.
+        /lenyabody-raw-{1:rendertype}/{2:publication-id}/{3:area}/{4:doctype}/{5:default-language}/{6:language}/{7:path} 
       -->
       <map:match pattern="lenyabody-raw-*/*/*/*/*/*/**">
         <map:aggregate element="cmsbody">
@@ -209,7 +110,7 @@
         </map:aggregate>
         <map:serialize type="xml"/>
       </map:match>
-
+      
       <!--
         This match provides the XSLT to render a given doctype to XHTML
         It checks for the existence of a doctype-specific one, and if none
@@ -228,17 +129,17 @@
         </map:select>
         <map:serialize type="xml"/>
       </map:match>
-
+      
     </map:pipeline>
-        
+    
     <!-- This is the pipeline that ultimately builds the page. -->
     <map:pipeline type="noncaching">
-
+      
       <!-- 
-         This matcher takes the raw aggregated page content and applies SVG rendering and a doctype-specific
-         XSL transformation. It makes some meta information available to the XSLT, and demonstrates the use
-         of the LenyaMetaDataTransformer (see below).
-         /lenyabody-{1:rendertype}/{2:publication-id}/{3:area}/{4:doctype}/{5:path} 
+        This matcher takes the raw aggregated page content and applies SVG rendering and a doctype-specific
+        XSL transformation. It makes some meta information available to the XSLT, and demonstrates the use
+        of the LenyaMetaDataTransformer (see below).
+        /lenyabody-{1:rendertype}/{2:publication-id}/{3:area}/{4:doctype}/{5:path} 
       -->
       <map:match pattern="lenyabody-*/*/*/*/**">
         <map:generate src="cocoon:/lenyabody-raw-{1}/{2}/{3}/{4}/{page-envelope:default-language}/{page-envelope:document-language}/{5}"/>
@@ -258,28 +159,6 @@
           <map:parameter name="author" value="{properties:pubs.default.author}"/>
           <map:parameter name="nodeName" value="{page-envelope:document-name}"/>
         </map:transform>
-        
-       <!-- FIXME: why is the title handling inside a language-exists action? please document! -->  
-        <map:act type="language-exists">
-          <map:transform src="fallback://xslt/addXhtmlTitle.xsl">
-            <map:parameter name="title" value="{dublincore:title}"/>
-          </map:transform>
-        </map:act>
-
-        <!-- This is a demonstration of the generic meta data transformer
-          described in bug 39891.
-          
-          1) define the ns: xmlns:meta="http://apache.org/lenya/meta/1.0/"
-          2) use it in above xsl like e.g.
-          <meta:value ns="http://purl.org/dc/elements/1.1/" element="date" uuid="{@uuid}"/>
-          
-          Where @ns is the namespace for which you want to retrieve the @element for.
-          If there is more then one element registered then the transformer returns:
-          <value xmlns="http://apache.org/lenya/meta/1.0/" value="2005-09-11 12:44:05" element="date" />
-          <value xmlns="http://apache.org/lenya/meta/1.0/" value="2006-09-11 12:44:05" element="date" />
-          
-          Otherwise it will return the value as characters.
-        -->
         <map:transform type="metaData">
           <map:parameter name='pubid' value='{page-envelope:publication-id}'/>
           <map:parameter name='area' value='{page-envelope:area}'/>
@@ -290,49 +169,28 @@
         <map:transform type="uuid2url"/>
         <map:serialize type="xml"/>
       </map:match>
-
+      
     </map:pipeline>
     
     <!-- This is the main entry point into the publication. This
-    pipeline uses the uriparametrizer to determine the doctype of this
-    request. It then aggregates the lenya menu (for the given area) and
-    the lenya body, the actual document. -->
+      pipeline uses the uriparametrizer to determine the doctype of this
+      request. It then aggregates the lenya menu (for the given area) and
+      the lenya body, the actual document. -->
     <map:pipeline>
       
       <!-- 
-         FIXME: this is a BXE-specific hack that should be handled by BXE's module sitemap. The publication 
-         should not be concerned with BXE-specific pre-processing of documents.
-      -->
-      <map:match pattern="**.bxe.html">
-        <map:generate src="cocoon:/lenyabody-edit/{page-envelope:publication-id}/{page-envelope:area}/{page-envelope:document-type}{page-envelope:document-path}"/>
-        <map:transform type="proxy"/>
-        <map:serialize type="xml"/>
-      </map:match>
-      
-      <!-- 
         Finally: this matcher handles requests for publication documents. 
         /{1:area}/{2:document-path}.html
       -->
       <map:match pattern="*/**.html">
         
-        <!-- 
-          The default publication does not have content by default. This check provides the user with a dialog
-          to import example content. It's not needed for production systems.
-        --> 
-        <map:select type="resource-exists">
-          <map:when test="lenya://lenya/pubs/{page-envelope:publication-id}/content/authoring/sitetree.xml"/>
-          <map:otherwise>
-            <map:redirect-to uri="{request:requestUri}?lenya.usecase=export.importExampleContent"/>
-          </map:otherwise>
-        </map:select>
-      
         <!-- If the requested language version of the document exists, we set a last-modified header. -->
         <map:act type="language-exists">
           <map:act type="set-header">
             <map:parameter name="Last-Modified" value="{date-iso8601-rfc822:{page-envelope:document-lastmodified}}" />
           </map:act>
         </map:act>
-            
+        
         <!-- 
           HEAD requests shouldn't have all the xslt overhead, all the user wants is the HTTP header information.
           So the actual content generation is bypassed.
@@ -343,78 +201,39 @@
             <map:serialize type="xhtml"/>
           </map:when>
         </map:select>          
-      
-            <!-- 
-               FIXME: the "rendertype" parameter is a hack for BXE and should be handled by the bxe module. 
-               Moreover, it doesn't make much sense to cache documents in the authoring area that are about to be edited anyway.
-            -->
-            <map:select type="parameter">
-              <map:parameter name="parameter-selector-test" value="{request-param:rendertype}"/>
-              <map:when test="edit">
-                <!-- put the bxe_xpath attribute into the page -->
-                <map:generate src="cocoon:/lenyabody-edit/{page-envelope:publication-id}/{page-envelope:area}/{page-envelope:document-type}{page-envelope:document-path}"/>
-              </map:when>
-              <map:otherwise>
-                <!-- sane page w/o hacks -->
-                <map:generate src="cocoon:/lenyabody-view/{page-envelope:publication-id}/{page-envelope:area}/{page-envelope:document-type}{page-envelope:document-path}"/>
-              </map:otherwise>
-            </map:select>
-
-            <!-- Menu generation -->
-            <map:select type="parameter">
-              <!-- you remember that {1} is the area, right? -->
-              <map:parameter name="parameter-selector-test" value="{1}"/>
-              <map:when test="live">
-                <!-- do nothing for live -->
-              </map:when>
-              <map:otherwise>
-                <!-- for all other areas, we want a GUI menu (handled by global-sitemap.xmap -->
-                <!-- FIXME: the ?doctype parameter doesn't seem to be used (see global-sitemap.xmap). -->
-                <map:transform src="cocoon://lenya-page/{page-envelope:publication-id}/{1}/{2}.xml?doctype={page-envelope:document-type}"/>
-                <!-- 
-                   external broken link reporting (pretty much untested) 
-                   TODO: External Links checking should be optional on a document by document basis.
-                -->
-                <!--
-                <map:transform src="fallback://lenya/xslt/authoring/addJavaScript.xsl">
-                  <map:parameter name="scriptSRC" value="/modules/linkcheck/linkreporter.js"/>
-                </map:transform>
-                -->
-              </map:otherwise>
-            </map:select>
-
-            <!-- 
-               strip xhtml namespace prefix to ensure compatibility with non-XML conformant browsers
-               workaround to avoid empty script, style and textarea tags (firefox chokes on those)
-            -->
-            <map:transform src="fallback://lenya/xslt/util/strip_namespaces.xsl"/>
-
-            <!-- the proxy transformer handles proxy-related URL rewriting -->
-            <map:transform type="proxy"/>
-
+        
+        <map:generate src="cocoon:/lenyabody-view/{page-envelope:publication-id}/{page-envelope:area}/{page-envelope:document-type}{page-envelope:document-path}"/>
+        
+        <map:select type="parameter">
+          <!-- you remember that {1} is the area, right? -->
+          <map:parameter name="parameter-selector-test" value="{1}"/>
+          <map:when test="live"/>
+          <map:otherwise>
+            <map:transform src="cocoon://lenya-page/{page-envelope:publication-id}/{1}/{2}.xml"/>
+          </map:otherwise>
+        </map:select>
+        <map:transform src="fallback://lenya/xslt/util/strip_namespaces.xsl"/>
+        <map:transform type="proxy"/>
+        
         <map:act type="language-exists">
           <map:serialize type="xhtml"/>
         </map:act>
-        <!-- 
-           When the requested document does not exist, we generate a nice error page.
-           Still, it's not what the user wants, so make sure we send a 404 "not found".
-        -->
         <map:serialize type="xhtml" status-code="404"/>
-
+        
       </map:match>
       
     </map:pipeline>
-      
+    
     <!--
-       This pipeline handles all requests that do *not* end in ".html".
+      This pipeline handles all requests that do *not* end in ".html".
     -->
     <map:pipeline>
       <map:match pattern="*/**">
         <map:act type="language-exists">
           <!--
-             A workaround for a byte-range issue with PDFs,
-             see http://marc.theaimsgroup.com/?l=xml-cocoon-dev&amp;m=112496255207733&amp;w=2 .
-             FIXME: still necessary?
+            A workaround for a byte-range issue with PDFs,
+            see http://marc.theaimsgroup.com/?l=xml-cocoon-dev&amp;m=112496255207733&amp;w=2 .
+            FIXME: still necessary?
           -->
           <map:match type="regexp" pattern="(.*\.)(pdf|PDF|Pdf)$"> 
             <map:read src="lenya-document:{page-envelope:document-uuid},lang={page-envelope:document-language}{link:rev}" mime-type="application/pdf">
@@ -424,7 +243,7 @@
           <!-- Documents other than *.html are served as-is and do not require processing: -->
           <map:read src="lenya-document:{page-envelope:document-uuid},lang={page-envelope:document-language}{link:rev}"/>
         </map:act>
-
+        
         <!-- 
           If the action above fails (e.g. the document does not exist), call into the lenyabody pipeline.
           It will generate a nice document-does-not-exist page for us.
@@ -440,11 +259,11 @@
         <map:transform src="fallback://lenya/xslt/util/strip_namespaces.xsl"/>
         <map:transform type="proxy"/>
         <map:serialize type="xhtml" status-code="404"/>
-
+        
       </map:match>
-
+      
     </map:pipeline>
-
-
+    
+    
   </map:pipelines>
 </map:sitemap>



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org