svn commit: r615888 - /lenya/trunk/src/modules/kupu/sitemap.xmap

Author: andreas
Date: Mon Jan 28 06:17:02 2008
New Revision: 615888

URL: http://svn.apache.org/viewvc?rev=615888&view=rev
Log:
Use document URL instead of document path for Kupu callbacks. This fixes bug 44307.

Modified:
    lenya/trunk/src/modules/kupu/sitemap.xmap

Modified: lenya/trunk/src/modules/kupu/sitemap.xmap
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/kupu/sitemap.xmap?rev=615888&r1=615887&r2=615888&view=diff
==============================================================================
--- lenya/trunk/src/modules/kupu/sitemap.xmap (original)
+++ lenya/trunk/src/modules/kupu/sitemap.xmap Mon Jan 28 06:17:02 2008
@@ -98,22 +98,22 @@
             src="fallback://lenya/modules/kupu/resources/kupu/apache-lenya/kupu/kupumacros.html"/>
           <map:transform src="fallback://lenya/modules/kupu/resources/kupu/apache-lenya/lenya/kupumacros.xsl">
             <map:parameter name="contentfile" 
-              value="{proxy:/{page-envelope:publication-id}/{page-envelope:area}{page-envelope:document-path}}?lenya.module=kupu&amp;lenya.step=content"/>
+              value="{proxy:/{page-envelope:publication-id}/{page-envelope:area}{page-envelope:document-url}}?lenya.module=kupu&amp;lenya.step=content"/>
             <map:parameter name="context-prefix" value="/{page-envelope:publication-id}/modules/kupu"/>
             <!-- Only used to display the document path of the edited doc  -->
             <map:parameter name="document-path" value="&quot;{dublincore:title}&quot;"/>
-            <map:parameter name="save-destination" value="{proxy:/{page-envelope:publication-id}/{page-envelope:area}{page-envelope:document-path}}?lenya.event=edit"/>
-            <map:parameter name="exit-destination" value="{proxy:/{page-envelope:publication-id}/{page-envelope:area}{page-envelope:document-path}}?lenya.module=kupu&amp;lenya.step=exit"/>
+            <map:parameter name="save-destination" value="{proxy:/{page-envelope:publication-id}/{page-envelope:area}{page-envelope:document-url}}?lenya.event=edit"/>
+            <map:parameter name="exit-destination" value="{proxy:/{page-envelope:publication-id}/{page-envelope:area}{page-envelope:document-url}}?lenya.module=kupu&amp;lenya.step=exit"/>
             <map:parameter name="reload-after-save" value="1"/>
             <map:parameter name="use-css" value="1"/>
             <map:parameter name="imagedrawer-xsl-uri" 
-              value="{proxy:/{page-envelope:publication-id}/{page-envelope:area}{page-envelope:document-path}}?lenya.module=kupu&amp;lenya.step=imagedrawerxsl"/>
+              value="{proxy:/{page-envelope:publication-id}/{page-envelope:area}{page-envelope:document-url}}?lenya.module=kupu&amp;lenya.step=imagedrawerxsl"/>
             <map:parameter name="linkdrawer-xsl-uri" 
-              value="{proxy:/{page-envelope:publication-id}/{page-envelope:area}{page-envelope:document-path}}?lenya.module=kupu&amp;lenya.step=linkdrawerxsl"/>
+              value="{proxy:/{page-envelope:publication-id}/{page-envelope:area}{page-envelope:document-url}}?lenya.module=kupu&amp;lenya.step=linkdrawerxsl"/>
             <map:parameter name="image-libraries-uri" 
-              value="{proxy:/{page-envelope:publication-id}/{page-envelope:area}{page-envelope:document-path}}?lenya.module=kupu&amp;lenya.step=image_libraries"/>
+              value="{proxy:/{page-envelope:publication-id}/{page-envelope:area}{page-envelope:document-url}}?lenya.module=kupu&amp;lenya.step=image_libraries"/>
             <map:parameter name="link-libraries-uri" 
-              value="{proxy:/{page-envelope:publication-id}/{page-envelope:area}{page-envelope:document-path}}?lenya.module=kupu&amp;lenya.step=link_libraries"/>
+              value="{proxy:/{page-envelope:publication-id}/{page-envelope:area}{page-envelope:document-url}}?lenya.module=kupu&amp;lenya.step=link_libraries"/>
           </map:transform>
           <map:serialize type="xml"/>
       </map:match>
@@ -206,7 +206,7 @@
             <map:call resource="style-cms-page"/>
             <map:serialize />
           </map:act>
-          <map:redirect-to uri="{proxy:/{page-envelope:publication-id}/{page-envelope:area}{page-envelope:document-path}.html}"/>
+          <map:redirect-to uri="{proxy:/{page-envelope:publication-id}/{page-envelope:area}{page-envelope:document-url}}"/>
         </map:match>
       
     </map:pipeline>