You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by ne...@apache.org on 2007/11/13 22:11:49 UTC
svn commit: r594643 - /lenya/trunk/src/modules/kupu/sitemap.xmap
Author: nettings
Date: Tue Nov 13 13:11:49 2007
New Revision: 594643
URL: http://svn.apache.org/viewvc?rev=594643&view=rev
Log:
fix kupu for proxied environments.
kupu users please test - basic editing and saving works, but i have no
idea what all those other features are supposed to do.
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=594643&r1=594642&r2=594643&view=diff
==============================================================================
--- lenya/trunk/src/modules/kupu/sitemap.xmap (original)
+++ lenya/trunk/src/modules/kupu/sitemap.xmap Tue Nov 13 13:11:49 2007
@@ -55,8 +55,8 @@
<map:component-configurations>
<global-variables>
- <resourceIconUrl>modules/kupu/kupu/apache-lenya/lenya/images/right_arrow.png</resourceIconUrl>
- <imageBase>modules/kupu/kupu/apache-lenya/lenya/images</imageBase>
+ <resourceIconUrl>{proxy:/modules/kupu/kupu/apache-lenya/lenya/images/right_arrow.png}</resourceIconUrl>
+ <imageBase>{proxy:/modules/kupu/kupu/apache-lenya/lenya/images}</imageBase>
</global-variables>
</map:component-configurations>
@@ -70,13 +70,13 @@
<!-- Flow callbacks -->
<map:match pattern="sitetree_link_library_template">
<map:generate src="fallback://lenya/modules/kupu/resources/kupu/apache-lenya/lenya/drawers/sitetree_link_library.xml.jx" type="jx">
- <map:parameter name="resource-icon-url" value="{proxy:/{global:resourceIconUrl}}"/>
+ <map:parameter name="resource-icon-url" value="{global:resourceIconUrl}"/>
</map:generate>
<map:serialize type="xml"/>
</map:match>
<map:match pattern="publication_image_library_template">
<map:generate src="fallback://lenya/modules/kupu/resources/kupu/apache-lenya/lenya/drawers/publication_image_library.xml.jx" type="jx">
- <map:parameter name="resource-icon-url" value="{proxy:/{global:resourceIconUrl}}"/>
+ <map:parameter name="resource-icon-url" value="{global:resourceIconUrl}"/>
</map:generate>
<map:serialize type="xml"/>
</map:match>
@@ -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:{request:requestURI}}?lenya.module=kupu&lenya.step=content"/>
- <map:parameter name="context-prefix" value="{request:contextPath}/{page-envelope:publication-id}/modules/kupu"/>
+ value="{proxy:/{page-envelope:publication-id}/{page-envelope:area}{page-envelope:document-path}}?lenya.module=kupu&lenya.step=content"/>
+ <map:parameter name="context-prefix" value="{proxy:/{page-envelope:publication-id}}/modules/kupu"/>
<!-- Only used to display the document path of the edited doc -->
<map:parameter name="document-path" value=""{dublincore:title}""/>
- <map:parameter name="save-destination" value="{proxy:{request:requestURI}}?lenya.event=edit"/>
- <map:parameter name="exit-destination" value="{proxy:{request:requestURI}}?lenya.module=kupu&lenya.step=exit"/>
+ <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&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:{request:requestURI}}?lenya.module=kupu&lenya.step=imagedrawerxsl"/>
+ value="{proxy:/{page-envelope:publication-id}/{page-envelope:area}{page-envelope:document-path}}?lenya.module=kupu&lenya.step=imagedrawerxsl"/>
<map:parameter name="linkdrawer-xsl-uri"
- value="{proxy:{request:requestURI}}?lenya.module=kupu&lenya.step=linkdrawerxsl"/>
+ value="{proxy:/{page-envelope:publication-id}/{page-envelope:area}{page-envelope:document-path}}?lenya.module=kupu&lenya.step=linkdrawerxsl"/>
<map:parameter name="image-libraries-uri"
- value="{proxy:{request:requestURI}}?lenya.module=kupu&lenya.step=image_libraries"/>
+ value="{proxy:/{page-envelope:publication-id}/{page-envelope:area}{page-envelope:document-path}}?lenya.module=kupu&lenya.step=image_libraries"/>
<map:parameter name="link-libraries-uri"
- value="{proxy:{request:requestURI}}?lenya.module=kupu&lenya.step=link_libraries"/>
+ value="{proxy:/{page-envelope:publication-id}/{page-envelope:area}{page-envelope:document-path}}?lenya.module=kupu&lenya.step=link_libraries"/>
</map:transform>
<map:serialize type="xml"/>
</map:match>
@@ -151,17 +151,17 @@
<map:match pattern="image_libraries" type="step">
<map:generate src="fallback://lenya/modules/kupu/resources/kupu/apache-lenya/lenya/drawers/imagelibraries.xml.jx" type="jx">
- <map:parameter name="pubLibUrl" value="{proxy:{request:requestURI}}?lenya.module=kupu&lenya.step=publication_image_library"/>
- <map:parameter name="pageLibUrl" value="{proxy:{request:requestURI}}?lenya.module=kupu&lenya.step=page_image_library"/>
- <map:parameter name="imageBaseUrl" value="{proxy:/{global:imageBase}}"/>
+ <map:parameter name="pubLibUrl" value="{proxy:/{page-envelope:publication-id}/{page-envelope:area}{page-envelope:document-path}}?lenya.module=kupu&lenya.step=publication_image_library"/>
+ <map:parameter name="pageLibUrl" value="{proxy:/{page-envelope:publication-id}/{page-envelope:area}{page-envelope:document-path}}?lenya.module=kupu&lenya.step=page_image_library"/>
+ <map:parameter name="imageBaseUrl" value="{global:imageBase}"/>
</map:generate>
<map:serialize type="xml"/>
</map:match>
<map:match pattern="link_libraries" type="step">
<map:generate src="fallback://lenya/modules/kupu/resources/kupu/apache-lenya/lenya/drawers/linklibraries.xml.jx" type="jx">
- <map:parameter name="pubLibUrl" value="{proxy:{request:requestURI}}?lenya.module=kupu&lenya.step=sitetree_link_library"/>
- <map:parameter name="pageLibUrl" value="{proxy:{request:requestURI}}?lenya.module=kupu&lenya.step=other_link_library"/>
- <map:parameter name="imageBaseUrl" value="{proxy:/{global:imageBase}}"/>
+ <map:parameter name="pubLibUrl" value="{proxy:/{page-envelope:publication-id}/{page-envelope:area}{page-envelope:document-path}}?lenya.module=kupu&lenya.step=sitetree_link_library"/>
+ <map:parameter name="pageLibUrl" value="{proxy:/{page-envelope:publication-id}/{page-envelope:area}{page-envelope:document-path}}?lenya.module=kupu&lenya.step=other_link_library"/>
+ <map:parameter name="imageBaseUrl" value="{global:imageBase}"/>
</map:generate>
<map:serialize type="xml"/>
</map:match>
@@ -169,7 +169,7 @@
<map:match pattern="page_image_library" type="step">
<map:call function="publication_image_library">
<map:parameter name="template" value="publication_image_library_template"/>
- <map:parameter name="iconUrl" value="{proxy:/{global:resourceIconUrl}}"/>
+ <map:parameter name="iconUrl" value="{global:resourceIconUrl}"/>
<map:parameter name="rootPath" value=""/>
<map:parameter name="baseUrl" value="{proxy:/{page-envelope:publication-id}/{page-envelope:area}}"/>
</map:call>
@@ -180,7 +180,7 @@
<map:match pattern="publication_image_library" type="step">
<map:call function="publication_image_library">
<map:parameter name="template" value="publication_image_library_template"/>
- <map:parameter name="iconUrl" value="{proxy:/{global:resourceIconUrl}}"/>
+ <map:parameter name="iconUrl" value="{global:resourceIconUrl}"/>
<map:parameter name="rootPath" value="{page-envelope:document-path}"/>
<map:parameter name="baseUrl" value="{proxy:/{page-envelope:publication-id}/{page-envelope:area}}"/>
</map:call>
@@ -206,7 +206,7 @@
<map:call resource="style-cms-page"/>
<map:serialize />
</map:act>
- <map:redirect-to uri="{request:requestURI}"/>
+ <map:redirect-to uri="{proxy:/{page-envelope:publication-id}/{page-envelope:area}{page-envelope:document-path}.html}"/>
</map:match>
</map:pipeline>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org