You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by ch...@apache.org on 2005/09/30 03:39:03 UTC

svn commit: r292597 - in /lenya/trunk/src: confpatch/ modules/search/ webapp/ webapp/lenya/ webapp/lenya/pubs/blog/ webapp/lenya/pubs/default/ webapp/lenya/usecases/kupu/

Author: chestnut
Date: Thu Sep 29 18:38:51 2005
New Revision: 292597

URL: http://svn.apache.org/viewcvs?rev=292597&view=rev
Log:
cleaned up style-cms-page resources in sitemaps,
removed serializer from style-cms-page resource,
statusCode wasn't being passed to the serializer [cocoon bug?],
added match for sucessful HEAD request for document [lightweight request],
added "Last-Modified" header for response to sucessful request

Modified:
    lenya/trunk/src/confpatch/pipelines.xmap
    lenya/trunk/src/confpatch/resources.xmap
    lenya/trunk/src/modules/search/sitemap.xmap
    lenya/trunk/src/webapp/global-sitemap.xmap
    lenya/trunk/src/webapp/lenya/lucene.xmap
    lenya/trunk/src/webapp/lenya/pubs/blog/sitemap.xmap
    lenya/trunk/src/webapp/lenya/pubs/default/sitemap.xmap
    lenya/trunk/src/webapp/lenya/pubs/default/usecase-bxe.xmap
    lenya/trunk/src/webapp/lenya/usecase.xmap
    lenya/trunk/src/webapp/lenya/usecases/kupu/usecase-kupu.xmap

Modified: lenya/trunk/src/confpatch/pipelines.xmap
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/confpatch/pipelines.xmap?rev=292597&r1=292596&r2=292597&view=diff
==============================================================================
--- lenya/trunk/src/confpatch/pipelines.xmap (original)
+++ lenya/trunk/src/confpatch/pipelines.xmap Thu Sep 29 18:38:51 2005
@@ -99,9 +99,8 @@
               <map:parameter name="documentid" value="{page-envelope:document-id}"/>
               <map:parameter name="documenturl" value="{page-envelope:document-url}"/>
             </map:transform>
-            <map:call resource="style-cms-page">
-              <map:parameter name="statusCode" value="404"/>
-            </map:call>
+            <map:call resource="style-cms-page" />
+            <map:serialize status-code="404" />
           </map:when>
            <map:when test="not-found">
              <map:generate src="lenya/content/util/empty.xml" />
@@ -109,9 +108,8 @@
               <map:parameter name="documentid" value="{page-envelope:document-id}"/>
               <map:parameter name="documenturl" value="{page-envelope:document-url}"/>
             </map:transform>
-            <map:call resource="style-cms-page">
-              <map:parameter name="statusCode" value="404"/>
-            </map:call>
+            <map:call resource="style-cms-page" />
+            <map:serialize status-code="404" />
           </map:when>
 	      <map:otherwise>
 	        <map:generate type="notifying"/>
@@ -120,9 +118,8 @@
 	          <map:parameter name="documenturl" value="{page-envelope:document-url}"/>
 	          <map:parameter name="contextPath" value="{request:contextPath}"/>
 	        </map:transform>
-            <map:call resource="style-cms-page">
-              <map:parameter name="statusCode" value="500"/>
-            </map:call>
+            <map:call resource="style-cms-page" />
+            <map:serialize status-code="500" />
 	      </map:otherwise>
         </map:select>
         <map:transform src="fallback://lenya/xslt/util/strip_namespaces.xsl"/>

Modified: lenya/trunk/src/confpatch/resources.xmap
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/confpatch/resources.xmap?rev=292597&r1=292596&r2=292597&view=diff
==============================================================================
--- lenya/trunk/src/confpatch/resources.xmap (original)
+++ lenya/trunk/src/confpatch/resources.xmap Thu Sep 29 18:38:51 2005
@@ -26,20 +26,7 @@
       <map:transform src="fallback://lenya/xslt/util/page2xhtml.xsl">
         <map:parameter name="contextprefix" value="{request:contextPath}"/>
       </map:transform>
-      <map:transform src="lenya/xslt/util/strip_namespaces.xsl"/>
-      <map:select type="parameter">
-        <map:parameter name="statusCode" value="{statusCode}"/>
-        <map:when test="">
-          <map:serialize/>
-        </map:when>
-        <!-- FIXME workaround for http://issues.apache.org/bugzilla/show_bug.cgi?id=32336 -->
-        <map:when test="404">
-          <map:serialize status-code="404"/>
-        </map:when>
-        <map:otherwise>
-          <map:serialize status-code="{statusCode}"/>
-        </map:otherwise>
-      </map:select>
+      <map:transform src="context://lenya/xslt/util/strip_namespaces.xsl"/>
     </map:resource>
   </map:resources>
 

Modified: lenya/trunk/src/modules/search/sitemap.xmap
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/modules/search/sitemap.xmap?rev=292597&r1=292596&r2=292597&view=diff
==============================================================================
--- lenya/trunk/src/modules/search/sitemap.xmap (original)
+++ lenya/trunk/src/modules/search/sitemap.xmap Thu Sep 29 18:38:51 2005
@@ -56,6 +56,7 @@
         <map:serialize type="xml"/>
         <!--
       <map:call resource="style-cms-page"/>
+      <map:serialize />
       -->
       </map:match>
     

Modified: lenya/trunk/src/webapp/global-sitemap.xmap
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/global-sitemap.xmap?rev=292597&r1=292596&r2=292597&view=diff
==============================================================================
--- lenya/trunk/src/webapp/global-sitemap.xmap (original)
+++ lenya/trunk/src/webapp/global-sitemap.xmap Thu Sep 29 18:38:51 2005
@@ -27,21 +27,17 @@
       | pipelines, only that they are not accessible from outside.
       | Hence I will explain what's inside below for pipelines.
       +-->
-  <map:resources>
 
+  <map:resources>
     <map:resource name="style-cms-page">
-    <!-- FIXME: due to resolver issues, i18n can currently not be used outside
-        of a publication IF you do not make a hit into a publication context first.     
-         <map:transform type="i18n">      
+      <map:transform type="i18n">      
         <map:parameter name="locale" value="{request:locale}"/>
       </map:transform>    
--->      <map:transform src="lenya/xslt/util/page2xhtml.xsl">
+      <map:transform src="fallback://lenya/xslt/util/page2xhtml.xsl">
         <map:parameter name="contextprefix" value="{request:contextPath}"/>
       </map:transform>
-      <map:transform src="lenya/xslt/util/strip_namespaces.xsl"/>
-      <map:serialize type="xhtml"/>
-    </map:resource>
-   
+      <map:transform src="context://lenya/xslt/util/strip_namespaces.xsl"/>
+    </map:resource>  
     <map:resource name="i18n">
       <map:transform type="i18n">
         <map:parameter name="locale" value="{request:locale}"/>
@@ -325,10 +321,12 @@
         </map:aggregate>
         <map:transform src="lenya/xslt/util/welcome.xsl"/>
         <map:call resource="style-cms-page"/>
+        <map:serialize />
       </map:match>
       <map:match pattern="about.html">
         <map:generate src="lenya/content/about.xml"/>
         <map:call resource="style-cms-page"/>
+        <map:serialize />
       </map:match>
 
       <!-- Publications -->
@@ -374,12 +372,14 @@
         <map:generate src="lenya/pubs/{1}/publication.xml" />
         <map:transform src="lenya/xslt/util/publication.xsl"/>
         <map:call resource="style-cms-page"/>
+        <map:serialize />
       </map:match>
       <!-- Publication Tests-->
       <map:match pattern="*/tests.html">
         <map:generate src="lenya/pubs/{1}/publication-tests.xml" />
         <map:transform src="lenya/xslt/util/publication.xsl"/>
         <map:call resource="style-cms-page"/>
+        <map:serialize />
       </map:match>
       
       <!-- Enter a module -->

Modified: lenya/trunk/src/webapp/lenya/lucene.xmap
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/lucene.xmap?rev=292597&r1=292596&r2=292597&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/lucene.xmap (original)
+++ lenya/trunk/src/webapp/lenya/lucene.xmap Thu Sep 29 18:38:51 2005
@@ -25,19 +25,20 @@
     </map:view>
   </map:views>
   
-    <map:resources>
-      <map:resource name="style-cms-page">
+<!-- =========================== 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:parameter name="contextprefix" value="{request:contextPath}"/>
       </map:transform>
-      <map:transform src="xslt/util/strip_namespaces.xsl"/>
-      <map:serialize type="xhtml"/>
+      <map:transform src="context://lenya/xslt/util/strip_namespaces.xsl"/>
     </map:resource>
-</map:resources>  
-
+  </map:resources>
+  
   <map:pipelines>
 
     <map:pipeline>
@@ -67,12 +68,13 @@
 
       <map:match pattern="*/search-*/lucene*">
         <map:generate src="cocoon:/{1}/search-{2}/lucene.xml{3}"/>
-        <map:transform src="fallback://lenya/xslt/search/search-and-results.xsl">
+        <map:transform src="fallback://lenya/modules/search/xslt/search-and-results.xsl">
           <map:parameter name="contextprefix" value="{request:contextPath}"/>
           <map:parameter name="publicationid" value="{1}"/>
           <map:parameter name="area" value="{2}"/>
         </map:transform>
       <map:call resource="style-cms-page"/>
+      <map:serialize />
       </map:match>
     </map:pipeline>
    </map:pipelines>

Modified: lenya/trunk/src/webapp/lenya/pubs/blog/sitemap.xmap
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/pubs/blog/sitemap.xmap?rev=292597&r1=292596&r2=292597&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/pubs/blog/sitemap.xmap (original)
+++ lenya/trunk/src/webapp/lenya/pubs/blog/sitemap.xmap Thu Sep 29 18:38:51 2005
@@ -25,19 +25,6 @@
     </map:generators>
   </map:components>
 
-  <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:parameter name="contextprefix" value="{request:contextPath}"/>
-      </map:transform>
-      <map:transform src="fallback://lenya/xslt/util/strip_namespaces.xsl"/>
-      <map:serialize/>
-    </map:resource>
- </map:resources>
-
   <map:pipelines>
     <!-- WebDAV -->
     <map:pipeline>

Modified: lenya/trunk/src/webapp/lenya/pubs/default/sitemap.xmap
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/pubs/default/sitemap.xmap?rev=292597&r1=292596&r2=292597&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/pubs/default/sitemap.xmap (original)
+++ lenya/trunk/src/webapp/lenya/pubs/default/sitemap.xmap Thu Sep 29 18:38:51 2005
@@ -24,7 +24,9 @@
       <map:serialize type="xml"/>
     </map:view>
   </map:views>
-  
+
+<!-- =========================== Resources ================================= -->
+
   <map:resources>
     <map:resource name="style-cms-page">
       <map:transform type="i18n">      
@@ -33,23 +35,10 @@
       <map:transform src="fallback://lenya/xslt/util/page2xhtml.xsl">
         <map:parameter name="contextprefix" value="{request:contextPath}"/>
       </map:transform>
-      <map:transform src="fallback://lenya/xslt/util/strip_namespaces.xsl"/>
-      <map:select type="parameter">
-        <map:parameter name="statusCode" value="{statusCode}"/>
-        <map:when test="">
-          <map:serialize/>
-        </map:when>
-        <!-- FIXME workaround for http://issues.apache.org/bugzilla/show_bug.cgi?id=32336 -->
-        <map:when test="404">
-          <map:serialize status-code="404"/>
-        </map:when>
-        <map:otherwise>
-          <map:serialize status-code="{statusCode}"/>
-        </map:otherwise>
-      </map:select>
+      <map:transform src="context://lenya/xslt/util/strip_namespaces.xsl"/>
     </map:resource>
   </map:resources>
-
+  
   <map:pipelines>
 
     <map:component-configurations>
@@ -180,56 +169,68 @@
       </map:match>
       
       <map:match pattern="*/**.html">
+      
         <map:act type="language-exists">
-          <map:select type="resource-exists">
-            <!-- Read from cache -->
-            <!-- If configured within Apache then mod_lenya will nevertheless read from cache -->
-            <map:when test="{global:cache-dir}/{../1}/{../2}.htmlDISABLED">
-              <map:read src="{global:cache-dir}/{../1}/{../2}.html" mime-type="text/html"/>
-            </map:when>
-            <!-- Write to cache and serialize -->
-            <map:otherwise>
+
+          <map:act type="set-header">
+            <map:parameter name="Last-Modified" value="{page-envelope:document-lastmodified}" />
+
+            <!-- HEAD request shouldn't have all the xslt overhead -->
+            <map:select type="request-method">
+              <map:when test="HEAD">
+                <map:generate src="context://lenya/content/util/empty.xml" />
+                <map:serialize type="xhtml"/>
+              </map:when>
+            </map:select>          
+          
+            <map:select type="resource-exists">
+              <!-- Read from cache -->
+              <!-- If configured within Apache then mod_lenya will nevertheless read from cache -->
+              <map:when test="{global:cache-dir}/{../1}/{../2}.htmlDISABLED">
+                <map:read src="{global:cache-dir}/{../1}/{../2}.html" mime-type="text/html"/>
+              </map:when>
+              <!-- Write to cache and serialize -->
+              <map:otherwise>
               
-          <map:generate src="cocoon:/lenyabody-view/{page-envelope:publication-id}/{page-envelope:area}/{page-envelope:document-type}{page-envelope:document-url}"/>
+            <map:generate src="cocoon:/lenyabody-view/{page-envelope:publication-id}/{page-envelope:area}/{page-envelope:document-type}{page-envelope:document-url}"/>
           
-          <map:select type="browser">
-            <map:when test="mozilla5DISABLED">
-              <map:match pattern="authoring/**.html">
-                <map:transform src="cocoon://lenya-page/{page-envelope:publication-id}/{../../1}/{../../2}.xml?doctype={page-envelope:document-type}&amp;uiml=xul"/>
-              </map:match>
-              <map:serialize type="xml" mime-type="application/vnd.mozilla.xul+xml"/>
-            </map:when>
-            <map:otherwise>
-              <map:match pattern="authoring/**.html">
-                <map:transform src="cocoon://lenya-page/{page-envelope:publication-id}/{../../1}/{../../2}.xml?doctype={page-envelope:document-type}"/>
-              </map:match>
-              <map:transform src="fallback://lenya/xslt/util/strip_namespaces.xsl"/>
-              <!-- Write to cache for requests from live area -->
-              <map:select type="parameter">
-                <map:parameter name="parameter-selector-test" value="{../1}"/>
-                <map:when test="live">
-                  <map:transform src="fallback://lenya/xslt/authoring/edit/addSourceTags.xsl">
-                    <map:parameter name="source" value="{global:cache-dir}/{../1}/{../2}.html"/>
-                  </map:transform>
-                  <map:transform type="write-source">
-                    <map:parameter name="serializer" value="xhtml"/>
-                  </map:transform>
-                  <map:transform src="fallback://lenya/xslt/authoring/edit/removeSourceTags.xsl"/>
-                </map:when>
+            <map:select type="browser">
+              <map:when test="mozilla5DISABLED">
+                <map:match pattern="authoring/**.html">
+                  <map:transform src="cocoon://lenya-page/{page-envelope:publication-id}/{../../1}/{../../2}.xml?doctype={page-envelope:document-type}&amp;uiml=xul"/>
+                </map:match>
+                <map:serialize type="xml" mime-type="application/vnd.mozilla.xul+xml"/>
+              </map:when>
+              <map:otherwise>
+                <map:match pattern="authoring/**.html">
+                  <map:transform src="cocoon://lenya-page/{page-envelope:publication-id}/{../../1}/{../../2}.xml?doctype={page-envelope:document-type}"/>
+                </map:match>
+                <map:transform src="fallback://lenya/xslt/util/strip_namespaces.xsl"/>
+                <!-- Write to cache for requests from live area -->
+                <map:select type="parameter">
+                  <map:parameter name="parameter-selector-test" value="{../1}"/>
+                  <map:when test="live">
+                    <map:transform src="fallback://lenya/xslt/authoring/edit/addSourceTags.xsl">
+                      <map:parameter name="source" value="{global:cache-dir}/{../1}/{../2}.html"/>
+                    </map:transform>
+                    <map:transform type="write-source">
+                      <map:parameter name="serializer" value="xhtml"/>
+                    </map:transform>
+                    <map:transform src="fallback://lenya/xslt/authoring/edit/removeSourceTags.xsl"/>
+                  </map:when>
+                </map:select>
+                <map:serialize type="xhtml"/>
+              </map:otherwise>
               </map:select>
-              <map:serialize type="xhtml"/>
-            </map:otherwise>
+              </map:otherwise>
             </map:select>
-            </map:otherwise>
-          </map:select>
+          </map:act>
         </map:act>
 
-        <!-- There is no version of the requested document-id for the
-             requested language. -->
         <map:generate type="serverpages" src="fallback://lenya/content/exception/missing-language.xsp"/>
         <map:transform src="fallback://lenya/xslt/exception/missing-language.xsl"/>
-        <map:call resource="style-cms-page"/>
-
+        <map:call resource="style-cms-page" />
+        <map:serialize status-code="404" />
       </map:match>
       
     </map:pipeline>

Modified: lenya/trunk/src/webapp/lenya/pubs/default/usecase-bxe.xmap
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/pubs/default/usecase-bxe.xmap?rev=292597&r1=292596&r2=292597&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/pubs/default/usecase-bxe.xmap (original)
+++ lenya/trunk/src/webapp/lenya/pubs/default/usecase-bxe.xmap Thu Sep 29 18:38:51 2005
@@ -23,26 +23,17 @@
   
   <!-- =========================== Resources ================================ -->
   <map:resources>
-        
+
     <map:resource name="style-cms-page">
-      <map:transform type="i18n">
+      <map:transform type="i18n">      
         <map:parameter name="locale" value="{request:locale}"/>
-      </map:transform>
+      </map:transform>    
       <map:transform src="fallback://lenya/xslt/util/page2xhtml.xsl">
         <map:parameter name="contextprefix" value="{request:contextPath}"/>
       </map:transform>
-      <map:transform src="fallback://lenya/xslt/util/strip_namespaces.xsl"/>
-      <map:select type="parameter">
-        <map:parameter name="statusCode" value="{statusCode}"/>
-        <map:when test="">
-          <map:serialize type="xhtml" />
-        </map:when>
-        <map:otherwise>
-          <map:serialize type="xhtml" status-code="{statusCode}"/>
-        </map:otherwise>
-      </map:select>
+      <map:transform src="context://lenya/xslt/util/strip_namespaces.xsl"/>
     </map:resource>
-    
+
     <map:resource name="cms-screen-xml">
           <map:generate src="fallback://lenya/content/{serverpage}" type="serverpages"/>
           <map:transform src="fallback://lenya/xslt/{stylesheet}">
@@ -57,6 +48,7 @@
         <map:parameter name="stylesheet" value="{stylesheet}"/>
       </map:call>
       <map:call resource="style-cms-page"/>
+      <map:serialize />
     </map:resource>
     
     
@@ -89,6 +81,7 @@
              </map:generate>
              <map:transform src="fallback://lenya/xslt/rc/rco-exception.xsl"/>
              <map:call resource="style-cms-page"/>
+             <map:serialize />
            </map:act>
 
            <map:aggregate element="bxe">
@@ -109,7 +102,7 @@
 	     +-->
          <map:generate src="fallback://lenya/resources/misc/bxe/download.xhtml"/>
          <map:call resource="style-cms-page"/>
-         <map:serialize type="xhtml"/>
+         <map:serialize />
 
       </map:match>
       
@@ -158,6 +151,7 @@
             <map:parameter name="languages" value="{page-envelope:publication-languages-csv}"/>
           </map:transform>
         <map:call resource="style-cms-page"/>
+        <map:serialize />
       </map:match>
       
       <map:match pattern="**/*.html">

Modified: lenya/trunk/src/webapp/lenya/usecase.xmap
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/usecase.xmap?rev=292597&r1=292596&r2=292597&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/usecase.xmap (original)
+++ lenya/trunk/src/webapp/lenya/usecase.xmap Thu Sep 29 18:38:51 2005
@@ -30,7 +30,8 @@
     </map:view>
   </map:views>
   
-  <!-- =========================== Resources ================================ -->
+  <!-- =========================== Resources ================================= -->
+
   <map:resources>
     <map:resource name="style-cms-page">
       <map:transform type="i18n">      
@@ -39,10 +40,8 @@
       <map:transform src="fallback://lenya/xslt/util/page2xhtml.xsl">
         <map:parameter name="contextprefix" value="{request:contextPath}"/>
       </map:transform>
-      <map:transform src="xslt/util/strip_namespaces.xsl"/>
-      <map:serialize type="xhtml"/>
+      <map:transform src="context://lenya/xslt/util/strip_namespaces.xsl"/>
     </map:resource>
-    
   </map:resources>
   
   <!-- =========================== Pipelines ================================ -->
@@ -137,6 +136,7 @@
                   </map:generate>
                   <map:transform src="fallback://lenya/xslt/rc/rco-exception.xsl"/>
                   <map:call resource="style-cms-page"/>
+                  <map:serialize />
                 </map:act>
                 
                 <map:generate src="content/util/empty.xml"/>
@@ -154,6 +154,7 @@
               </map:act>
               <map:generate src="resources/misc/xopus/download.xhtml"/>
               <map:call resource="style-cms-page"/>
+              <map:serialize />
             </map:match>
           </map:match>
           
@@ -173,6 +174,7 @@
             	      </map:generate>
                 	  <map:transform src="fallback://lenya/xslt/rc/rco-exception.xsl"/>
         	          <map:call resource="style-cms-page"/>
+        	          <map:serialize />
                 	</map:act>
         
                   <map:generate type="stream"/>
@@ -222,6 +224,7 @@
               </map:generate>
               <map:transform src="fallback://lenya/xslt/rc/rco-exception.xsl"/>
               <map:call resource="style-cms-page"/>
+              <map:serialize />
             </map:act>
             <map:redirect-to session="true" uri="{request:requestURI}"/>
           </map:match>
@@ -243,6 +246,7 @@
               </map:generate>
               <map:transform src="fallback://lenya/xslt/rc/rco-exception.xsl"/>
               <map:call resource="style-cms-page"/>
+              <map:serialize />
             </map:act>
             <map:redirect-to session="true" uri="{request:requestURI}"/>
           </map:match>

Modified: lenya/trunk/src/webapp/lenya/usecases/kupu/usecase-kupu.xmap
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/usecases/kupu/usecase-kupu.xmap?rev=292597&r1=292596&r2=292597&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/usecases/kupu/usecase-kupu.xmap (original)
+++ lenya/trunk/src/webapp/lenya/usecases/kupu/usecase-kupu.xmap Thu Sep 29 18:38:51 2005
@@ -31,19 +31,20 @@
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
   <!-- =========================== Components ================================ -->
   <map:components/>
-  <!-- =========================== Resources ================================ -->
+  <!-- =========================== 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="{global:basedir}/xslt/util/page2xhtml.xsl">
+      <map:transform src="fallback://lenya/xslt/util/page2xhtml.xsl">
         <map:parameter name="contextprefix" value="{request:contextPath}"/>
       </map:transform>
-      <map:transform src="{global:basedir}/xslt/util/strip_namespaces.xsl"/>
-      <map:serialize type="xhtml"/>
-    </map:resource>    
-  </map:resources>  
+      <map:transform src="context://lenya/xslt/util/strip_namespaces.xsl"/>
+    </map:resource>
+  </map:resources>
+  
   <!-- =========================== Flow ===================================== -->
   <map:flow language="javascript">
     <map:script src="usecase-kupu.js"/>
@@ -109,6 +110,7 @@
                 </map:generate>
                 <map:transform src="{global:basedir}/xslt/rc/rco-exception.xsl"/>
                 <map:call resource="style-cms-page"/>
+                <map:serialize />
               </map:act>
               <map:generate 
                 src="fallback://lenya/resources/kupu/apache-lenya/kupu/kupumacros.html"/>
@@ -138,6 +140,7 @@
             <!-- If Kupu is not installed; Action failed -->
             <map:generate src="{global:basedir}/resources/misc/kupu/download.xhtml"/>
             <map:call resource="style-cms-page"/>
+            <map:serialize />
           </map:match>
         </map:match>
         <!-- Requested by Kupu to load the document into the editor -->    
@@ -220,6 +223,7 @@
             </map:generate>
             <map:transform src="{global:basedir}/xslt/rc/rco-exception.xsl"/>
             <map:call resource="style-cms-page"/>
+            <map:serialize />
           </map:act>
           <map:redirect-to uri="{request:requestURI}"/>
         </map:match>
@@ -243,6 +247,7 @@
                 </map:generate>
                 <map:transform src="fallback://lenya/xslt/rc/rco-exception.xsl"/>
                 <map:call resource="style-cms-page"/>
+                <map:serialize />
               </map:act>
               
               <map:call function="editDocument">



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