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 2007/11/23 16:02:02 UTC
svn commit: r597677 - /lenya/trunk/src/modules/kupu/sitemap.xmap
Author: andreas
Date: Fri Nov 23 07:02:01 2007
New Revision: 597677
URL: http://svn.apache.org/viewvc?rev=597677&view=rev
Log:
Move proxy module evaluation out of global variable declaration (see bug 43750).
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=597677&r1=597676&r2=597677&view=diff
==============================================================================
--- lenya/trunk/src/modules/kupu/sitemap.xmap (original)
+++ lenya/trunk/src/modules/kupu/sitemap.xmap Fri Nov 23 07:02:01 2007
@@ -55,8 +55,8 @@
<map:component-configurations>
<global-variables>
- <resourceIconUrl>{proxy:/modules/kupu/kupu/apache-lenya/lenya/images/right_arrow.png}</resourceIconUrl>
- <imageBase>{proxy:/modules/kupu/kupu/apache-lenya/lenya/images}</imageBase>
+ <resourceIconUrl>/modules/kupu/kupu/apache-lenya/lenya/images/right_arrow.png</resourceIconUrl>
+ <imageBase>/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="{global:resourceIconUrl}"/>
+ <map:parameter name="resource-icon-url" value="{proxy:{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="{global:resourceIconUrl}"/>
+ <map:parameter name="resource-icon-url" value="{proxy:{global:resourceIconUrl}}"/>
</map:generate>
<map:serialize type="xml"/>
</map:match>
@@ -153,7 +153,7 @@
<map:generate src="fallback://lenya/modules/kupu/resources/kupu/apache-lenya/lenya/drawers/imagelibraries.xml.jx" type="jx">
<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:parameter name="imageBaseUrl" value="{proxy:{global:imageBase}}"/>
</map:generate>
<map:serialize type="xml"/>
</map:match>
@@ -161,7 +161,7 @@
<map:generate src="fallback://lenya/modules/kupu/resources/kupu/apache-lenya/lenya/drawers/linklibraries.xml.jx" type="jx">
<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:parameter name="imageBaseUrl" value="{proxy:{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="{global:resourceIconUrl}"/>
+ <map:parameter name="iconUrl" value="{proxy:{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="{global:resourceIconUrl}"/>
+ <map:parameter name="iconUrl" value="{proxy:{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>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org