You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by gk...@apache.org on 2007/04/07 21:20:16 UTC
svn commit: r526475 - in
/cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF:
aggregate/sitemap.xmap captcha/sitemap.xmap dreamteam/sitemap.xmap
library/sitemap.xmap sql/resources/forms-styling.xsl
Author: gkossakowski
Date: Sat Apr 7 12:20:15 2007
New Revision: 526475
URL: http://svn.apache.org/viewvc?view=rev&rev=526475
Log:
Correct resource paths. It is related to COCOON-1993.
Modified:
cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/aggregate/sitemap.xmap
cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/captcha/sitemap.xmap
cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/dreamteam/sitemap.xmap
cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/library/sitemap.xmap
cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/sql/resources/forms-styling.xsl
Modified: cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/aggregate/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/aggregate/sitemap.xmap?view=diff&rev=526475&r1=526474&r2=526475
==============================================================================
--- cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/aggregate/sitemap.xmap (original)
+++ cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/aggregate/sitemap.xmap Sat Apr 7 12:20:15 2007
@@ -69,7 +69,8 @@
<map:parameter name="file" value="{1}_template.xml"/>
</map:call>
<map:transform src="../resources/forms-samples-styling.xsl">
- <map:parameter name="resources-uri" value="../resources"/>
+ <map:parameter name="dojo-resources" value="{servlet:ajax:/resources/dojo}"/>
+ <map:parameter name="forms-resources" value="{servlet:forms:/resource/external/forms}"/>
</map:transform>
<map:serialize/>
</map:match>
Modified: cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/captcha/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/captcha/sitemap.xmap?view=diff&rev=526475&r1=526474&r2=526475
==============================================================================
--- cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/captcha/sitemap.xmap (original)
+++ cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/captcha/sitemap.xmap Sat Apr 7 12:20:15 2007
@@ -87,7 +87,8 @@
<map:parameter name="file" value="forms/{1}.tpl.xml"/>
</map:call>
<map:transform src="../resources/forms-samples-styling.xsl">
- <map:parameter name="resources-uri" value="{request:contextPath}/_cocoon/resources"/>
+ <map:parameter name="dojo-resources" value="{servlet:ajax:/resources/dojo}"/>
+ <map:parameter name="forms-resources" value="{servlet:forms:/resource/external/forms}"/>
</map:transform>
<map:transform type="i18n">
</map:transform>
Modified: cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/dreamteam/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/dreamteam/sitemap.xmap?view=diff&rev=526475&r1=526474&r2=526475
==============================================================================
--- cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/dreamteam/sitemap.xmap (original)
+++ cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/dreamteam/sitemap.xmap Sat Apr 7 12:20:15 2007
@@ -92,7 +92,8 @@
<map:generate type="jx" src="content/teamTemplate.jx"/>
<map:transform type="browser-update"/>
<map:transform src="../resources/forms-samples-styling.xsl">
- <map:parameter name="resources-uri" value="{request:contextPath}/_cocoon/resources"/>
+ <map:parameter name="dojo-resources" value="{servlet:ajax:/resources/dojo}"/>
+ <map:parameter name="forms-resources" value="{servlet:forms:/resource/external/forms}"/>
</map:transform>
<map:select type="ajax-request">
<map:when test="true">
Modified: cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/library/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/library/sitemap.xmap?view=diff&rev=526475&r1=526474&r2=526475
==============================================================================
--- cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/library/sitemap.xmap (original)
+++ cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/library/sitemap.xmap Sat Apr 7 12:20:15 2007
@@ -112,7 +112,8 @@
<map:parameter name="file" value="forms/{1}_template.xml"/>
</map:call>
<map:transform src="../resources/forms-samples-styling.xsl">
- <map:parameter name="resources-uri" value="{request:contextPath}/_cocoon/resources"/>
+ <map:parameter name="dojo-resources" value="{servlet:ajax:/resources/dojo}"/>
+ <map:parameter name="forms-resources" value="{servlet:forms:/resource/external/forms}"/>
</map:transform>
<map:serialize/>
</map:match>
Modified: cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/sql/resources/forms-styling.xsl
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/sql/resources/forms-styling.xsl?view=diff&rev=526475&r1=526474&r2=526475
==============================================================================
--- cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/sql/resources/forms-styling.xsl (original)
+++ cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/sql/resources/forms-styling.xsl Sat Apr 7 12:20:15 2007
@@ -26,8 +26,9 @@
<xsl:include href="servlet:forms:/resource/internal/xsl/forms-page-styling.xsl"/>
<xsl:include href="servlet:forms:/resource/internal/xsl/forms-advanced-field-styling.xsl"/>
- <!-- Location of the resources directory, where JS libs and icons are stored -->
- <xsl:param name="resources-uri">resources</xsl:param>
+ <!-- Location of the resources directories, where JS libs and icons are stored -->
+ <xsl:param name="dojo-resources">servlet:ajax:/resources/dojo</xsl:param>
+ <xsl:param name="forms-resources"/>
<xsl:template match="head">
<head>