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/05/01 18:49:46 UTC
svn commit: r534153 [1/2] - in /cocoon/trunk/blocks/cocoon-forms:
cocoon-forms-impl/ cocoon-forms-impl/src/main/resources/COB-INF/
cocoon-forms-impl/src/main/resources/META-INF/cocoon/avalon/
cocoon-forms-impl/src/main/resources/META-INF/cocoon/spring/...
Author: gkossakowski
Date: Tue May 1 09:49:43 2007
New Revision: 534153
URL: http://svn.apache.org/viewvc?view=rev&rev=534153
Log:
Merged whiteboard/ajax-forms-refactoring/cocoon-forms/ changes r517385:534152 into the trunk.
Added:
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/COB-INF/
- copied from r534101, cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/src/main/resources/COB-INF/
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/COB-INF/sitemap.xmap
- copied unchanged from r534101, cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/src/main/resources/COB-INF/sitemap.xmap
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/META-INF/cocoon/spring/
- copied from r534101, cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/src/main/resources/META-INF/cocoon/spring/
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/META-INF/cocoon/spring/cocoon-forms-impl-blockServlet.xml
- copied unchanged from r534101, cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/src/main/resources/META-INF/cocoon/spring/cocoon-forms-impl-blockServlet.xml
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/js/manifest.js
- copied unchanged from r534101, cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/js/manifest.js
Removed:
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/manifest.js
Modified:
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/pom.xml
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/META-INF/cocoon/avalon/cocoon-forms.xconf
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/forms-advanced-field-styling.xsl
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/forms-field-styling.xsl
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/forms-htmlarea-styling.xsl
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/forms-page-styling.xsl
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/js/DropdownDateTimePicker.js
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/js/InfoPopup.js
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/js/MultiValueEditor.js
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/js/MultiValueEditorWithSuggestion.js
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/js/templates/MultiValueEditor.html
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/aggregate/example.js
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/aggregate/sitemap.xmap
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/captcha/flow/captcha.js
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/captcha/sitemap.xmap
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/dreamteam/content/teamTemplate.jx
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/dreamteam/flow/team.js
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/dreamteam/sitemap.xmap
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/flow/binding_example.js
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/flow/bindings.js
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/flow/form_model_gui.js
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/flow/forms_flow_example.js
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/flow/htmlarea.js
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/flow/imagemap.js
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/flow/registration.js
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/flow/upload_example.js
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/ajax_multivalue_with_suggestion_template.xml
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/ajax_suggest_form.xml
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/ajax_suggest_template.xml
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/calculatedfields_template.xml
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/carselector_template.xml
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/datasource_chooser_template.xml
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/dynamicrepeater_dojo_template.xml
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/dynamicrepeater_template.xml
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/dynamicrepeaters_dojo_template.xml
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/file_explorer_model.xml
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/file_explorer_template.xml
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/form1_template.xml
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/form1_template_action_jx-macro.xml
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/inplace_edit_template.xml
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/multipage_template.xml
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/sampletree_template.xml
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/tasktree_template.xml
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/upload_template.xml
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/uploadprogress_template.xml
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/xdoceditor_template.xml
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/library/flow/library.js
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/library/forms/form1_template.xml
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/library/forms/hotel_template.xml
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/library/sitemap.xmap
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/pagination/flow.js
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/pagination/paginated.tpl.xml
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/pagination/sitemap.xmap
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/resources/forms-samples-styling.xsl
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/sitemap.xmap
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/sql/flow/flow.js
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/sql/pages/employee-edit.xml
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/sql/resources/forms-styling.xsl
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/sql/sitemap.xmap
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/swan/flow/swan.js
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/swan/sitemap.xmap
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/META-INF/cocoon/spring/cocoon-forms-sample-blockServlet.xml (contents, props changed)
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/pom.xml?view=diff&rev=534153&r1=534152&r2=534153
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/pom.xml Tue May 1 09:49:43 2007
@@ -34,6 +34,7 @@
<artifactId>cocoon-forms-impl</artifactId>
<name>Cocoon Forms Block Implementation</name>
<version>1.0.0-RC1-SNAPSHOT</version>
+ <url>http://cocoon.apache.org/${docs.m.forms.relPath}</url>
<build>
<plugins>
@@ -107,6 +108,11 @@
</dependency>
<dependency>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-servlet-service-components</artifactId>
+ <version>1.0.0-RC1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
<groupId>org.outerj.daisy</groupId>
<artifactId>daisy-htmlcleaner</artifactId>
@@ -158,12 +164,13 @@
<distributionManagement>
<site>
<id>website</id>
- <url>${docs.deploymentBaseUrl}/blocks/forms/${docs.version}/</url>
+ <url>${docs.deploymentBaseUrl}/${docs.m.forms.relPath}</url>
</site>
</distributionManagement>
<properties>
<docs.name>Cocoon Forms</docs.name>
- <docs.version>1.0</docs.version>
+ <docs.version>${docs.m.forms.version}</docs.version>
</properties>
+
</project>
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/META-INF/cocoon/avalon/cocoon-forms.xconf
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/META-INF/cocoon/avalon/cocoon-forms.xconf?view=diff&rev=534153&r1=534152&r2=534153
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/META-INF/cocoon/avalon/cocoon-forms.xconf (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/META-INF/cocoon/avalon/cocoon-forms.xconf Tue May 1 09:49:43 2007
@@ -191,6 +191,7 @@
<selection-list name="flow-jxpath" class="org.apache.cocoon.forms.datatype.FlowJXPathSelectionListBuilder"/>
<selection-list name="enum" class="org.apache.cocoon.forms.datatype.EnumSelectionListBuilder"/>
<selection-list name="java" class="org.apache.cocoon.forms.datatype.JavaSelectionListBuilder"/>
+ <selection-list name="javascript" class="org.apache.cocoon.forms.datatype.JavaScriptSelectionListBuilder"/>
</forms-selection-lists>
<!--+
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/forms-advanced-field-styling.xsl
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/forms-advanced-field-styling.xsl?view=diff&rev=534153&r1=534152&r2=534153
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/forms-advanced-field-styling.xsl (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/forms-advanced-field-styling.xsl Tue May 1 09:49:43 2007
@@ -29,13 +29,15 @@
<xsl:import href="resource://org/apache/cocoon/forms/resources/forms-field-styling.xsl"/>
<xsl:include href="resource://org/apache/cocoon/forms/resources/forms-calendar-styling.xsl"/>
<xsl:include href="resource://org/apache/cocoon/forms/resources/forms-htmlarea-styling.xsl"/>
+
+ <xsl:param name="forms-resources"/>
<xsl:template match="head" mode="forms-field">
<xsl:apply-imports/>
- <script src="{$resources-uri}/forms/mattkruse-lib/AnchorPosition.js" type="text/javascript"/>
- <script src="{$resources-uri}/forms/mattkruse-lib/PopupWindow.js" type="text/javascript"/>
- <script src="{$resources-uri}/forms/mattkruse-lib/OptionTransfer.js" type="text/javascript"/>
- <script src="{$resources-uri}/forms/mattkruse-lib/selectbox.js" type="text/javascript"/>
+ <script src="{$forms-resources}/mattkruse-lib/AnchorPosition.js" type="text/javascript"/>
+ <script src="{$forms-resources}/mattkruse-lib/PopupWindow.js" type="text/javascript"/>
+ <script src="{$forms-resources}/mattkruse-lib/OptionTransfer.js" type="text/javascript"/>
+ <script src="{$forms-resources}/mattkruse-lib/selectbox.js" type="text/javascript"/>
<xsl:apply-templates select="." mode="forms-htmlarea"/>
</xsl:template>
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/forms-field-styling.xsl
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/forms-field-styling.xsl?view=diff&rev=534153&r1=534152&r2=534153
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/forms-field-styling.xsl (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/forms-field-styling.xsl Tue May 1 09:49:43 2007
@@ -81,25 +81,26 @@
var cocoon;
if (!cocoon)
cocoon = {};
- cocoon.resourcesUri = "<xsl:value-of select="$resources-uri"/>";
+ cocoon.formsResourcesUri = "<xsl:value-of select="$forms-resources"/>";
</script>
- <script src="{$resources-uri}/dojo/dojo.js" type="text/javascript"/> <!-- load dojo -->
+ <script src="{$dojo-resources}/dojo.js" type="text/javascript"/> <!-- load dojo -->
<script type="text/javascript">dojo.require("dojo.widget.*");</script> <!-- require dojo.widget for auto-loading -->
<xsl:if test="$dojo-debug = 'true'"> <!-- require console etc. for dojo debug, if requested -->
<script type="text/javascript">dojo.require("dojo.debug.console"); dojo.require("dojo.widget.Tree");</script>
</xsl:if>
- <script src="{$resources-uri}/forms/js/forms-lib.js" type="text/javascript"/> <!-- load legacy scripts -->
+ <script src="{$forms-resources}/js/forms-lib.js" type="text/javascript"/> <!-- load legacy scripts -->
<!-- load forms library -->
<script type="text/javascript">
- dojo.registerModulePath("cocoon.forms", "../forms/js"); <!-- tell dojo how to find our forms module. NB: (since 2.1.11, replaces cocoon.js) -->
+ dojo.registerModulePath("cocoon.forms", "<xsl:value-of select='concat($forms-resources, "/js")'/>"); <!-- tell dojo how to find our forms module. NB: (since 2.1.11, replaces cocoon.js) -->
dojo.require("cocoon.forms.common"); <!-- tell dojo we require the commons library -->
+ dojo.require("cocoon.forms.manifest"); <!-- tell dojo we require cocoon.forms.manifest registering namespace handler -->
dojo.addOnLoad(cocoon.forms.callOnLoadHandlers); <!-- ask dojo to run our onLoad handlers -->
</script>
<xsl:copy-of select="fi:init/node()"/> <!-- copy optional initialisation from form template -->
<xsl:if test="/*/fi:googlemap"> <!-- googlemap-key TODO: This looks broken to me (JQ) -->
<script src="/*/fi:googlemap/fi:key" type="text/javascript"/>
</xsl:if>
- <link rel="stylesheet" type="text/css" href="{$resources-uri}/forms/css/forms.css"/>
+ <link rel="stylesheet" type="text/css" href="{$forms-resources}/css/forms.css"/>
</xsl:template>
<xsl:template match="fi:init"/> <!-- ignore, was handled above -->
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/forms-htmlarea-styling.xsl
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/forms-htmlarea-styling.xsl?view=diff&rev=534153&r1=534152&r2=534153
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/forms-htmlarea-styling.xsl (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/forms-htmlarea-styling.xsl Tue May 1 09:49:43 2007
@@ -24,13 +24,14 @@
+-->
<xsl:param name="htmlarea-lang">en</xsl:param>
+ <xsl:param name="forms-resources"/>
<xsl:template match="head" mode="forms-htmlarea">
<script type="text/javascript">
- _editor_url = "<xsl:value-of select="concat($resources-uri, '/forms/htmlarea/')"/>";
+ _editor_url = "<xsl:value-of select="concat($forms-resources, '/htmlarea/')"/>";
_editor_lang = "<xsl:value-of select="$htmlarea-lang"/>";
</script>
- <script type="text/javascript" src="{$resources-uri}/forms/htmlarea/htmlarea.js"></script>
+ <script type="text/javascript" src="{$forms-resources}/htmlarea/htmlarea.js"></script>
</xsl:template>
<xsl:template match="body" mode="forms-htmlarea"/>
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/forms-page-styling.xsl
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/forms-page-styling.xsl?view=diff&rev=534153&r1=534152&r2=534153
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/forms-page-styling.xsl (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/forms-page-styling.xsl Tue May 1 09:49:43 2007
@@ -19,6 +19,8 @@
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:fi="http://apache.org/cocoon/forms/1.0#instance"
exclude-result-prefixes="fi">
+ <xsl:param name="forms-resources"/>
+
<!--+
| This stylesheet is designed to be included by 'forms-samples-styling.xsl'.
+-->
@@ -85,7 +87,7 @@
</xsl:attribute>
<xsl:copy-of select="fi:label/node()"/>
<xsl:if test="fi:items/*//fi:validation-message">
- <span class="forms-validation-message forms validation-message"> <img src="{$resources-uri}/forms/js/templates/images/validation-message.gif"/> </span>
+ <span class="forms-validation-message forms validation-message"> <img src="{$forms-resources}/js/templates/images/validation-message.gif"/> </span>
</xsl:if>
</span>
</xsl:for-each>
@@ -161,7 +163,7 @@
</xsl:for-each>
</select>
<xsl:if test="fi:items/*//fi:validation-message">
- <span class="forms-validation-message forms validation-message"> <img src="{$resources-uri}/forms/js/templates/images/validation-message.gif"/> </span>
+ <span class="forms-validation-message forms validation-message"> <img src="{$forms-resources}/js/templates/images/validation-message.gif"/> </span>
</xsl:if>
</legend>
<!-- a div for each of the items -->
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/js/DropdownDateTimePicker.js
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/js/DropdownDateTimePicker.js?view=diff&rev=534153&r1=534152&r2=534153
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/js/DropdownDateTimePicker.js (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/js/DropdownDateTimePicker.js Tue May 1 09:49:43 2007
@@ -41,9 +41,9 @@
isContainer: true,
- dateIconURL: cocoon.resourcesUri + "/forms/js/templates/images/dateIcon.gif",
+ dateIconURL: cocoon.formsResourcesUri + "/js/templates/images/dateIcon.gif",
- timeIconURL: cocoon.resourcesUri + "/forms/js/templates/images/timeIcon.gif",
+ timeIconURL: cocoon.formsResourcesUri + "/js/templates/images/timeIcon.gif",
containerToggle: "plain", /* plain, explode, wipe, fade */
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/js/InfoPopup.js
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/js/InfoPopup.js?view=diff&rev=534153&r1=534152&r2=534153
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/js/InfoPopup.js (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/js/InfoPopup.js Tue May 1 09:49:43 2007
@@ -36,10 +36,10 @@
isContainer: true,
icon: "",
- templatePath: cocoon.resourcesUri + "/forms/js/templates/InfoPopup.html",
- templateCssPath: cocoon.resourcesUri + "/forms/js/templates/InfoPopup.css",
+ templatePath: cocoon.formsResourcesUri + "/js/templates/InfoPopup.html",
+ templateCssPath: cocoon.formsResourcesUri + "/js/templates/InfoPopup.css",
- closeIconURL: cocoon.resourcesUri + "/forms/js/templates/images/close.gif",
+ closeIconURL: cocoon.formsResourcesUri + "/js/templates/images/close.gif",
containerToggle: "plain", /* plain, explode, wipe, fade */
@@ -48,7 +48,7 @@
postMixInProperties: function(args, frag, parent) {
cocoon.forms.InfoPopup.superclass.postMixInProperties(this, args, frag, parent);
- this.iconURL = cocoon.resourcesUri + "/forms/js/templates/images/" + this.icon;
+ this.iconURL = cocoon.formsResourcesUri + "/js/templates/images/" + this.icon;
},
attachTemplateNodes: function(){
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/js/MultiValueEditor.js
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/js/MultiValueEditor.js?view=diff&rev=534153&r1=534152&r2=534153
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/js/MultiValueEditor.js (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/js/MultiValueEditor.js Tue May 1 09:49:43 2007
@@ -39,9 +39,9 @@
cformsIdPrefix: "id-prefix-not-set",
- resourcesUri: cocoon.resourcesUri, // to make this available to the template
+ formsResourcesUri: cocoon.formsResourcesUri, // to make this available to the template
- templatePath: cocoon.resourcesUri + "/forms/js/templates/MultiValueEditor.html",
+ templatePath: cocoon.formsResourcesUri + "/js/templates/MultiValueEditor.html",
fillInTemplate: function(args, frag) {
cocoon.forms.MultiValueEditor.superclass.fillInTemplate(this, args, frag);
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/js/MultiValueEditorWithSuggestion.js
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/js/MultiValueEditorWithSuggestion.js?view=diff&rev=534153&r1=534152&r2=534153
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/js/MultiValueEditorWithSuggestion.js (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/js/MultiValueEditorWithSuggestion.js Tue May 1 09:49:43 2007
@@ -33,22 +33,22 @@
{
widgetsInTemplate: true,
cformsIdPrefix: "id-prefix-not-set",
- dataUrl: "_cocoon/forms/suggest",
+ dataUrl: "servlet:/suggest",
styleClass: "",
popupUri: "",
popupSize: "",
popupLinkText: "",
- resourcesUri: cocoon.resourcesUri,
- templatePath: cocoon.resourcesUri + "/forms/js/templates/MultiValueEditorWithSuggestion.html",
+ resourcesUri: cocoon.formsResourcesUri,
+ templatePath: cocoon.formsResourcesUri + "/js/templates/MultiValueEditorWithSuggestion.html",
_setUpDataUrl: function() {
var dataUrl = this.dataUrl;
if (!dataUrl || dataUrl == "") {
- dataUrl = "_cocoon/forms/suggest/" + this.widgetId + "?filter=%{searchString}";
+ dataUrl = "servlet:/suggest/" + this.widgetId + "?filter=%{searchString}";
} else {
var strings = dataUrl.split("?");
if (strings.length > 1) {
- if (strings[0] == "_cocoon/forms/suggest") {
+ if (strings[0] == "servlet:/suggest") {
strings[0] += "/" + this.widgetId;
}
dataUrl = strings[0] + "?" + strings[1] + "&";
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/js/templates/MultiValueEditor.html
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/js/templates/MultiValueEditor.html?view=diff&rev=534153&r1=534152&r2=534153
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/js/templates/MultiValueEditor.html (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/js/templates/MultiValueEditor.html Tue May 1 09:49:43 2007
@@ -9,11 +9,11 @@
</select>
</td>
<td width="20px">
- <input dojoAttachPoint="deleteButton" type="image" src="${this.resourcesUri}/forms/img/delete.gif"/>
+ <input dojoAttachPoint="deleteButton" type="image" src="${this.formsResourcesUri}/img/delete.gif"/>
<br/>
- <input dojoAttachPoint="moveUpButton" type="image" src="${this.resourcesUri}/forms/img/move_up.gif"/>
+ <input dojoAttachPoint="moveUpButton" type="image" src="${this.formsResourcesUri}/img/move_up.gif"/>
<br/>
- <input dojoAttachPoint="moveDownButton" type="image" src="${this.resourcesUri}/forms/img/move_down.gif"/>
+ <input dojoAttachPoint="moveDownButton" type="image" src="${this.formsResourcesUri}/img/move_down.gif"/>
<br/>
</td>
</tr>
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/aggregate/example.js
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/aggregate/example.js?view=diff&rev=534153&r1=534152&r2=534153
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/aggregate/example.js (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/aggregate/example.js Tue May 1 09:49:43 2007
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-cocoon.load("resource://org/apache/cocoon/forms/flow/javascript/Form.js");
+cocoon.load("servlet:forms:/resource/internal/flow/javascript/Form.js");
Bean.prototype.date;
Bean.prototype.phone;
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/aggregate/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/aggregate/sitemap.xmap?view=diff&rev=534153&r1=534152&r2=534153
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/aggregate/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/aggregate/sitemap.xmap Tue May 1 09:49:43 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:/resource/external/dojo}"/>
+ <map:parameter name="forms-resources" value="{servlet:forms:/resource/external/forms}"/>
</map:transform>
<map:serialize/>
</map:match>
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/captcha/flow/captcha.js
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/captcha/flow/captcha.js?view=diff&rev=534153&r1=534152&r2=534153
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/captcha/flow/captcha.js (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/captcha/flow/captcha.js Tue May 1 09:49:43 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-cocoon.load("resource://org/apache/cocoon/forms/flow/javascript/Form.js");
+cocoon.load("servlet:forms:/resource/internal/flow/javascript/Form.js");
function captcha() {
var form = new Form("forms/captcha.def.xml");
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/captcha/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/captcha/sitemap.xmap?view=diff&rev=534153&r1=534152&r2=534153
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/captcha/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/captcha/sitemap.xmap Tue May 1 09:49:43 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:/resource/external/dojo}"/>
+ <map:parameter name="forms-resources" value="{servlet:forms:/resource/external/forms}"/>
</map:transform>
<map:transform type="i18n">
</map:transform>
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/dreamteam/content/teamTemplate.jx
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/dreamteam/content/teamTemplate.jx?view=diff&rev=534153&r1=534152&r2=534153
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/dreamteam/content/teamTemplate.jx (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/dreamteam/content/teamTemplate.jx Tue May 1 09:49:43 2007
@@ -18,7 +18,7 @@
<jx:template xmlns:jx="http://apache.org/cocoon/templates/jx/1.0" xmlns:cinclude="http://apache.org/cocoon/include/1.0"
xmlns:i18n="http://apache.org/cocoon/i18n/2.1" xmlns:ft="http://apache.org/cocoon/forms/1.0#template" xmlns:fi="http://apache.org/cocoon/forms/1.0#instance">
<!-- Import the macros that define CForms template elements -->
- <jx:import uri="resource://org/apache/cocoon/forms/generation/jx-macros.xml"/>
+ <jx:import uri="servlet:forms:/resource/internal/generation/jx-macros.xml"/>
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/dreamteam/flow/team.js
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/dreamteam/flow/team.js?view=diff&rev=534153&r1=534152&r2=534153
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/dreamteam/flow/team.js (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/dreamteam/flow/team.js Tue May 1 09:49:43 2007
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-cocoon.load("resource://org/apache/cocoon/forms/flow/javascript/Form.js");
+cocoon.load("servlet:forms:/resource/internal/flow/javascript/Form.js");
importClass (Packages.org.apache.cocoon.forms.util.I18nMessage);
var manager = Packages.org.apache.cocoon.forms.samples.dreamteam.Manager.getManager();
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/dreamteam/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/dreamteam/sitemap.xmap?view=diff&rev=534153&r1=534152&r2=534153
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/dreamteam/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/dreamteam/sitemap.xmap Tue May 1 09:49:43 2007
@@ -20,7 +20,7 @@
<map:transformers default="xslt">
<map:transformer name="i18n" src="org.apache.cocoon.transformation.I18nTransformer">
<catalogues default="dreamteam">
- <catalogue id="forms" name="messages" location="resource://org/apache/cocoon/forms/system/i18n"/>
+ <catalogue id="forms" name="messages" location="servlet:forms:/resource/internal/i18n"/>
<catalogue id="dreamteam" name="DreamTeamMessages" location="messages"/>
</catalogues>
</map:transformer>
@@ -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:/resource/external/dojo}"/>
+ <map:parameter name="forms-resources" value="{servlet:forms:/resource/external/forms}"/>
</map:transform>
<map:select type="ajax-request">
<map:when test="true">
@@ -135,9 +136,6 @@
<!-- ========================================= -->
<!-- images -->
<!-- ========================================= -->
- <map:match pattern="resources/*/**">
- <map:read src="resource://org/apache/cocoon/{1}/resources/{2}"/>
- </map:match>
<map:match pattern="flags/*.gif">
<map:read mime-type="image/gif" src="resources/flags/{1}.gif"/>
</map:match>
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/flow/binding_example.js
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/flow/binding_example.js?view=diff&rev=534153&r1=534152&r2=534153
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/flow/binding_example.js (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/flow/binding_example.js Tue May 1 09:49:43 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-cocoon.load("resource://org/apache/cocoon/forms/flow/javascript/Form.js");
+cocoon.load("servlet:forms:/resource/internal/flow/javascript/Form.js");
// The purpose of the form2 example is to edit the contents of an XML file
// or a Java bean through a Cocoon form
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/flow/bindings.js
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/flow/bindings.js?view=diff&rev=534153&r1=534152&r2=534153
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/flow/bindings.js (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/flow/bindings.js Tue May 1 09:49:43 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-cocoon.load("resource://org/apache/cocoon/forms/flow/javascript/Form.js");
+cocoon.load("servlet:forms:/resource/internal/flow/javascript/Form.js");
/**
* Disclaimer:
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/flow/form_model_gui.js
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/flow/form_model_gui.js?view=diff&rev=534153&r1=534152&r2=534153
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/flow/form_model_gui.js (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/flow/form_model_gui.js Tue May 1 09:49:43 2007
@@ -19,7 +19,7 @@
* @version $Id$
*/
-cocoon.load("resource://org/apache/cocoon/forms/flow/javascript/Form.js");
+cocoon.load("servlet:forms:/resource/internal/flow/javascript/Form.js");
function form_model_gui(form) {
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/flow/forms_flow_example.js
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/flow/forms_flow_example.js?view=diff&rev=534153&r1=534152&r2=534153
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/flow/forms_flow_example.js (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/flow/forms_flow_example.js Tue May 1 09:49:43 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-cocoon.load("resource://org/apache/cocoon/forms/flow/javascript/Form.js");
+cocoon.load("servlet:forms:/resource/internal/flow/javascript/Form.js");
function form1(form) {
var locale = determineLocale();
@@ -228,7 +228,7 @@
function do_sampleTree() {
var form = new Form("forms/sampletree_model.xml");
var resolver = cocoon.getComponent(org.apache.excalibur.source.SourceResolver.ROLE);
- var model = new org.apache.cocoon.forms.formmodel.tree.SourceTreeModel(resolver, "context://samples/blocks/forms");
+ var model = new org.apache.cocoon.forms.formmodel.tree.SourceTreeModel(resolver, ".");
form.getChild("files").setModel(model);
form.showForm("sampletree-display-pipeline.jx");
cocoon.sendPage("xmlresult-display-pipeline.jx",
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/flow/htmlarea.js
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/flow/htmlarea.js?view=diff&rev=534153&r1=534152&r2=534153
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/flow/htmlarea.js (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/flow/htmlarea.js Tue May 1 09:49:43 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-cocoon.load("resource://org/apache/cocoon/forms/flow/javascript/Form.js");
+cocoon.load("servlet:forms:/resource/internal/flow/javascript/Form.js");
function htmlarea() {
var form = new Form("forms/htmlarea.xml");
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/flow/imagemap.js
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/flow/imagemap.js?view=diff&rev=534153&r1=534152&r2=534153
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/flow/imagemap.js (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/flow/imagemap.js Tue May 1 09:49:43 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-cocoon.load("resource://org/apache/cocoon/forms/flow/javascript/Form.js");
+cocoon.load("servlet:forms:/resource/internal/flow/javascript/Form.js");
var form = new Form("forms/imagemap.xml");
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/flow/registration.js
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/flow/registration.js?view=diff&rev=534153&r1=534152&r2=534153
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/flow/registration.js (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/flow/registration.js Tue May 1 09:49:43 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-cocoon.load("resource://org/apache/cocoon/forms/flow/javascript/Form.js");
+cocoon.load("servlet:forms:/resource/internal/flow/javascript/Form.js");
function registration() {
var form = new Form("forms/registration.xml");
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/flow/upload_example.js
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/flow/upload_example.js?view=diff&rev=534153&r1=534152&r2=534153
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/flow/upload_example.js (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/flow/upload_example.js Tue May 1 09:49:43 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-cocoon.load("resource://org/apache/cocoon/forms/flow/javascript/Form.js");
+cocoon.load("servlet:forms:/resource/internal/flow/javascript/Form.js");
function upload() {
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/ajax_multivalue_with_suggestion_template.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/ajax_multivalue_with_suggestion_template.xml?view=diff&rev=534153&r1=534152&r2=534153
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/ajax_multivalue_with_suggestion_template.xml (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/ajax_multivalue_with_suggestion_template.xml Tue May 1 09:49:43 2007
@@ -20,7 +20,7 @@
xmlns:fi="http://apache.org/cocoon/forms/1.0#instance"
xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
<!-- Import the macros that define CForms template elements -->
- <jx:import uri="resource://org/apache/cocoon/forms/generation/jx-macros.xml"/>
+ <jx:import uri="servlet:forms:/resource/internal/generation/jx-macros.xml"/>
<h4 class="samplesGroup">AJAX sample</h4>
<title>Cocoon multivalue field with suggestions</title>
<content>
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/ajax_suggest_form.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/ajax_suggest_form.xml?view=diff&rev=534153&r1=534152&r2=534153
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/ajax_suggest_form.xml (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/ajax_suggest_form.xml Tue May 1 09:49:43 2007
@@ -36,7 +36,7 @@
var resolver = cocoon.getComponent(org.apache.excalibur.source.SourceResolver.ROLE);
var filename = filter;
- var src = resolver.resolveURI("context://samples/" + filename);
+ var src = resolver.resolveURI("./" + filename);
var suggestions = [];
if (src.exists() && src.isCollection()) {
// A directory: list its children
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/ajax_suggest_template.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/ajax_suggest_template.xml?view=diff&rev=534153&r1=534152&r2=534153
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/ajax_suggest_template.xml (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/ajax_suggest_template.xml Tue May 1 09:49:43 2007
@@ -17,7 +17,7 @@
-->
<page xmlns:ft="http://apache.org/cocoon/forms/1.0#template" xmlns:fi="http://apache.org/cocoon/forms/1.0#instance" xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
<!-- Import the macros that define CForms template elements -->
- <jx:import uri="resource://org/apache/cocoon/forms/generation/jx-macros.xml"/>
+ <jx:import uri="servlet:forms:/resource/internal/generation/jx-macros.xml"/>
<h4 class="samplesGroup">AJAX sample</h4>
<title>Cocoon suggests</title>
<content>
@@ -28,7 +28,7 @@
<ft:form-template action="continue" method="POST" ajax="true">
<ft:continuation-id/>
- Choose a file in Cocoon's samples. The suggestion-list is written in JavaScript
+ Choose a file in Forms's samples. The suggestion-list is written in JavaScript
(server side) and scans the samples directory with the input given.
<br/>
<ft:widget id="path" type="suggest"/>
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/calculatedfields_template.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/calculatedfields_template.xml?view=diff&rev=534153&r1=534152&r2=534153
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/calculatedfields_template.xml (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/calculatedfields_template.xml Tue May 1 09:49:43 2007
@@ -17,7 +17,7 @@
-->
<page xmlns:ft="http://apache.org/cocoon/forms/1.0#template" xmlns:fi="http://apache.org/cocoon/forms/1.0#instance" xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
<!-- Import the macros that define CForms template elements -->
- <jx:import uri="resource://org/apache/cocoon/forms/generation/jx-macros.xml"/>
+ <jx:import uri="servlet:forms:/resource/internal/generation/jx-macros.xml"/>
<h4 class="samplesGroup">Calculated widgets sample</h4>
<title>Sample form</title>
<content>
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/carselector_template.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/carselector_template.xml?view=diff&rev=534153&r1=534152&r2=534153
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/carselector_template.xml (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/carselector_template.xml Tue May 1 09:49:43 2007
@@ -17,7 +17,7 @@
-->
<page xmlns:ft="http://apache.org/cocoon/forms/1.0#template" xmlns:fi="http://apache.org/cocoon/forms/1.0#instance" xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
<!-- Import the macros that define CForms template elements -->
- <jx:import uri="resource://org/apache/cocoon/forms/generation/jx-macros.xml"/>
+ <jx:import uri="servlet:forms:/resource/internal/generation/jx-macros.xml"/>
<h4 class="samplesGroup">AJAX sample</h4>
<title>Car selector</title>
<para>This example illustrates:
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/datasource_chooser_template.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/datasource_chooser_template.xml?view=diff&rev=534153&r1=534152&r2=534153
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/datasource_chooser_template.xml (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/datasource_chooser_template.xml Tue May 1 09:49:43 2007
@@ -20,7 +20,7 @@
xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
<!-- Import the macros that define CForms template elements -->
- <jx:import uri="resource://org/apache/cocoon/forms/generation/jx-macros.xml"/>
+ <jx:import uri="servlet:forms:/resource/internal/generation/jx-macros.xml"/>
<h4 class="samplesGroup">Union widget sample (with AJAX)</h4>
<title>Datasource chooser</title>
<script type="text/javascript">
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/dynamicrepeater_dojo_template.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/dynamicrepeater_dojo_template.xml?view=diff&rev=534153&r1=534152&r2=534153
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/dynamicrepeater_dojo_template.xml (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/dynamicrepeater_dojo_template.xml Tue May 1 09:49:43 2007
@@ -23,7 +23,7 @@
xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
<!-- Import the macros that define CForms template elements -->
- <jx:import uri="resource://org/apache/cocoon/forms/generation/jx-macros.xml"/>
+ <jx:import uri="servlet:forms:/resource/internal/generation/jx-macros.xml"/>
<h4 class="samplesGroup">Repeater widget with advanced interaction</h4>
<title>Repeater widget with advanced interaction</title>
<style type="text/css">
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/dynamicrepeater_template.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/dynamicrepeater_template.xml?view=diff&rev=534153&r1=534152&r2=534153
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/dynamicrepeater_template.xml (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/dynamicrepeater_template.xml Tue May 1 09:49:43 2007
@@ -23,7 +23,7 @@
xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
<!-- Import the macros that define CForms template elements -->
- <jx:import uri="resource://org/apache/cocoon/forms/generation/jx-macros.xml"/>
+ <jx:import uri="servlet:forms:/resource/internal/generation/jx-macros.xml"/>
<h4 class="samplesGroup">Repeater widget</h4>
<title>Dynamic template</title>
<style type="text/css">
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/dynamicrepeaters_dojo_template.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/dynamicrepeaters_dojo_template.xml?view=diff&rev=534153&r1=534152&r2=534153
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/dynamicrepeaters_dojo_template.xml (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/dynamicrepeaters_dojo_template.xml Tue May 1 09:49:43 2007
@@ -23,7 +23,7 @@
xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
<!-- Import the macros that define CForms template elements -->
- <jx:import uri="resource://org/apache/cocoon/forms/generation/jx-macros.xml"/>
+ <jx:import uri="servlet:forms:/resource/internal/generation/jx-macros.xml"/>
<h4 class="samplesGroup">Repeater widget with advanced interaction</h4>
<title>Repeater widget with advanced interaction</title>
<style type="text/css">
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/file_explorer_model.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/file_explorer_model.xml?view=diff&rev=534153&r1=534152&r2=534153
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/file_explorer_model.xml (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/file_explorer_model.xml Tue May 1 09:49:43 2007
@@ -24,7 +24,7 @@
<fd:widgets>
<fd:tree id="directories" root-visible="true" selection="single">
- <fd:tree-model type="source" src="context://samples/blocks/forms">
+ <fd:tree-model type="source" src=".">
<!-- keep only directories -->
<fd:fileset>
<fd:exclude pattern="*"/>
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/file_explorer_template.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/file_explorer_template.xml?view=diff&rev=534153&r1=534152&r2=534153
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/file_explorer_template.xml (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/file_explorer_template.xml Tue May 1 09:49:43 2007
@@ -19,17 +19,17 @@
xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
<!-- Import the macros that define CForms template elements -->
- <jx:import uri="resource://org/apache/cocoon/forms/generation/jx-macros.xml"/>
+ <jx:import uri="servlet:forms:/resource/internal/generation/jx-macros.xml"/>
<!-- A macro that displays the toggle icons (plus/minus) for the current treeNode -->
<jx:macro name="toggle-icon">
<jx:choose>
<jx:when test="${treeNode.isLeaf()}">
- <img src="resources/forms/img/tree/win/${treeNode.iconType}.gif" border="0"/>
+ <img src="servlet:forms:/resource/external/forms/img/tree/win/${treeNode.iconType}.gif" border="0"/>
</jx:when>
<jx:otherwise>
<a href="#" onclick="return TreeToggleCollapse('${widget.fullName}', '${treeNode.path}')"><img
- src="resources/forms/img/tree/win/${treeNode.iconType}.gif" border="0"/></a>
+ src="servlet:forms:/resource/external/forms/img/tree/win/${treeNode.iconType}.gif" border="0"/></a>
</jx:otherwise>
</jx:choose>
</jx:macro>
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/form1_template.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/form1_template.xml?view=diff&rev=534153&r1=534152&r2=534153
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/form1_template.xml (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/form1_template.xml Tue May 1 09:49:43 2007
@@ -23,7 +23,7 @@
xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
<!-- Import the macros that define CForms template elements -->
- <jx:import uri="resource://org/apache/cocoon/forms/generation/jx-macros.xml"/>
+ <jx:import uri="servlet:forms:/resource/internal/generation/jx-macros.xml"/>
<h4 class="samplesGroup">Widget sampler (Flowscript)</h4>
<title>Sample form</title>
<content>
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/form1_template_action_jx-macro.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/form1_template_action_jx-macro.xml?view=diff&rev=534153&r1=534152&r2=534153
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/form1_template_action_jx-macro.xml (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/form1_template_action_jx-macro.xml Tue May 1 09:49:43 2007
@@ -22,7 +22,7 @@
xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
<!-- Import the macros that define CForms template elements -->
- <jx:import uri="resource://org/apache/cocoon/forms/generation/jx-macros.xml"/>
+ <jx:import uri="servlet:forms:/resource/internal/generation/jx-macros.xml"/>
<title>Sample form</title>
<content>
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/inplace_edit_template.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/inplace_edit_template.xml?view=diff&rev=534153&r1=534152&r2=534153
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/inplace_edit_template.xml (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/inplace_edit_template.xml Tue May 1 09:49:43 2007
@@ -20,7 +20,7 @@
xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
<!-- Import the macros that define CForms template elements -->
- <jx:import uri="resource://org/apache/cocoon/forms/generation/jx-macros.xml"/>
+ <jx:import uri="servlet:forms:/resource/internal/generation/jx-macros.xml"/>
<h4 class="samplesGroup">Inline editing</h4>
<title>Inline editing</title>
<script type="text/javascript">
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/multipage_template.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/multipage_template.xml?view=diff&rev=534153&r1=534152&r2=534153
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/multipage_template.xml (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/multipage_template.xml Tue May 1 09:49:43 2007
@@ -23,7 +23,7 @@
xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
<!-- Import the macros that define CForms template elements -->
- <jx:import uri="resource://org/apache/cocoon/forms/generation/jx-macros.xml"/>
+ <jx:import uri="servlet:forms:/resource/internal/generation/jx-macros.xml"/>
<h4 class="samplesGroup">Widget sampler: one form divided in multiple pages</h4>
<title>Sample multipage form with Ajax updates</title>
<script type="text/javascript">
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/sampletree_template.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/sampletree_template.xml?view=diff&rev=534153&r1=534152&r2=534153
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/sampletree_template.xml (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/sampletree_template.xml Tue May 1 09:49:43 2007
@@ -20,17 +20,17 @@
xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
<!-- Import the macros that define CForms template elements -->
- <jx:import uri="resource://org/apache/cocoon/forms/generation/jx-macros.xml"/>
+ <jx:import uri="servlet:forms:/resource/internal/generation/jx-macros.xml"/>
<!-- A macro that displays the toggle icons (plus/minus) for the current treeNode -->
<jx:macro name="toggle-icon">
<jx:choose>
<jx:when test="${treeNode.isLeaf()}">
- <img src="resources/forms/img/tree/win/${treeNode.iconType}.gif" border="0"/>
+ <img src="servlet:forms:/resource/external/forms/img/tree/win/${treeNode.iconType}.gif" border="0"/>
</jx:when>
<jx:otherwise>
<a href="#" onclick="return TreeToggleCollapse('${widget.fullName}', '${treeNode.path}')"><img
- src="resources/forms/img/tree/win/${treeNode.iconType}.gif" border="0"/></a>
+ src="servlet:forms:/resource/external/forms/img/tree/win/${treeNode.iconType}.gif" border="0"/></a>
</jx:otherwise>
</jx:choose>
</jx:macro>
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/tasktree_template.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/tasktree_template.xml?view=diff&rev=534153&r1=534152&r2=534153
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/tasktree_template.xml (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/tasktree_template.xml Tue May 1 09:49:43 2007
@@ -20,7 +20,7 @@
xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
<!-- Import the macros that define CForms template elements -->
- <jx:import uri="resource://org/apache/cocoon/forms/generation/jx-macros.xml"/>
+ <jx:import uri="servlet:forms:/resource/internal/generation/jx-macros.xml"/>
<!-- Debugging utility that dumps the result of widget.getChildren().
Sometimes useful when setting up recursive templates ! -->
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/upload_template.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/upload_template.xml?view=diff&rev=534153&r1=534152&r2=534153
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/upload_template.xml (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/upload_template.xml Tue May 1 09:49:43 2007
@@ -17,7 +17,7 @@
-->
<page xmlns:ft="http://apache.org/cocoon/forms/1.0#template"
xmlns:fi="http://apache.org/cocoon/forms/1.0#instance" xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
- <jx:import uri="resource://org/apache/cocoon/forms/generation/jx-macros.xml"/>
+ <jx:import uri="servlet:forms:/resource/internal/generation/jx-macros.xml"/>
<h4 class="samplesGroup">Upload widget</h4>
<title>Upload Sample</title>
<content>
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/uploadprogress_template.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/uploadprogress_template.xml?view=diff&rev=534153&r1=534152&r2=534153
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/uploadprogress_template.xml (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/uploadprogress_template.xml Tue May 1 09:49:43 2007
@@ -61,7 +61,7 @@
xmlns:fi="http://apache.org/cocoon/forms/1.0#instance"
xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
- <jx:import uri="resource://org/apache/cocoon/forms/generation/jx-macros.xml"/>
+ <jx:import uri="servlet:forms:/resource/internal/generation/jx-macros.xml"/>
<h4 class="samplesGroup">Upload Progress Sample</h4>
<title>Upload Progress Sample</title>
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/xdoceditor_template.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/xdoceditor_template.xml?view=diff&rev=534153&r1=534152&r2=534153
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/xdoceditor_template.xml (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/xdoceditor_template.xml Tue May 1 09:49:43 2007
@@ -23,7 +23,7 @@
xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
<!-- Import the macros that define CForms template elements -->
- <jx:import uri="resource://org/apache/cocoon/forms/generation/jx-macros.xml"/>
+ <jx:import uri="servlet:forms:/resource/internal/generation/jx-macros.xml"/>
<title>Dynamic template</title>
<style type="text/css">
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/library/flow/library.js
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/library/flow/library.js?view=diff&rev=534153&r1=534152&r2=534153
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/library/flow/library.js (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/library/flow/library.js Tue May 1 09:49:43 2007
@@ -21,7 +21,7 @@
importPackage(org.apache.cocoon.forms.formmodel);
-cocoon.load("resource://org/apache/cocoon/forms/flow/javascript/Form.js");
+cocoon.load("servlet:forms:/resource/internal/flow/javascript/Form.js");
function show_form1(form) {
process_form(form, "form1", "forms/form1_data.xml");
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/library/forms/form1_template.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/library/forms/form1_template.xml?view=diff&rev=534153&r1=534152&r2=534153
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/library/forms/form1_template.xml (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/library/forms/form1_template.xml Tue May 1 09:49:43 2007
@@ -18,7 +18,7 @@
<page xmlns:ft="http://apache.org/cocoon/forms/1.0#template"
xmlns:fi="http://apache.org/cocoon/forms/1.0#instance"
xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
- <jx:import uri="resource://org/apache/cocoon/forms/generation/jx-macros.xml"/>
+ <jx:import uri="servlet:forms:/resource/internal/generation/jx-macros.xml"/>
<title>Form libraries sample</title>
<content>
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/library/forms/hotel_template.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/library/forms/hotel_template.xml?view=diff&rev=534153&r1=534152&r2=534153
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/library/forms/hotel_template.xml (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/library/forms/hotel_template.xml Tue May 1 09:49:43 2007
@@ -18,7 +18,7 @@
<page xmlns:ft="http://apache.org/cocoon/forms/1.0#template"
xmlns:fi="http://apache.org/cocoon/forms/1.0#instance"
xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
- <jx:import uri="resource://org/apache/cocoon/forms/generation/jx-macros.xml"/>
+ <jx:import uri="servlet:forms:/resource/internal/generation/jx-macros.xml"/>
<jx:import uri="libraries/common-types/types_template_jx.xml"/>
<title>Hotel Booking Sample (using Libraries)</title>
<content>
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/library/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/library/sitemap.xmap?view=diff&rev=534153&r1=534152&r2=534153
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/library/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/library/sitemap.xmap Tue May 1 09:49:43 2007
@@ -24,7 +24,7 @@
<map:transformer name="i18n" src="org.apache.cocoon.transformation.I18nTransformer">
<catalogues default="other">
<catalogue id="other" name="OtherMessages" location="messages"/>
- <catalogue id="forms" name="messages" location="resource://org/apache/cocoon/forms/system/i18n"/>
+ <catalogue id="forms" name="messages" location="servlet:forms:/resource/internal/i18n"/>
</catalogues>
</map:transformer>
</map:transformers>
@@ -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:/resource/external/dojo}"/>
+ <map:parameter name="forms-resources" value="{servlet:forms:/resource/external/forms}"/>
</map:transform>
<map:serialize/>
</map:match>
@@ -128,10 +129,6 @@
<map:parameter name="file" value="resources/result_jx.xml"/>
</map:call>
<map:serialize type="xml"/>
- </map:match>
-
- <map:match pattern="resources/*/**">
- <map:read src="resource://org/apache/cocoon/{1}/resources/{2}"/>
</map:match>
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/pagination/flow.js
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/pagination/flow.js?view=diff&rev=534153&r1=534152&r2=534153
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/pagination/flow.js (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/pagination/flow.js Tue May 1 09:49:43 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-cocoon.load("resource://org/apache/cocoon/forms/flow/javascript/Form.js");
+cocoon.load("servlet:forms:/resource/internal/flow/javascript/Form.js");
function do_paginated() {
var form = new Form("paginated.def.xml");
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/pagination/paginated.tpl.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/pagination/paginated.tpl.xml?view=diff&rev=534153&r1=534152&r2=534153
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/pagination/paginated.tpl.xml (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/pagination/paginated.tpl.xml Tue May 1 09:49:43 2007
@@ -20,7 +20,7 @@
xmlns:ft="http://apache.org/cocoon/forms/1.0#template">
<jx:import
- uri="resource://org/apache/cocoon/forms/generation/jx-macros.xml" />
+ uri="servlet:forms:/resource/internal/generation/jx-macros.xml" />
<title>Sample enhanced repeater</title>
<content>
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/pagination/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/pagination/sitemap.xmap?view=diff&rev=534153&r1=534152&r2=534153
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/pagination/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/pagination/sitemap.xmap Tue May 1 09:49:43 2007
@@ -64,7 +64,8 @@
<map:parameter name="file" value="{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:/resource/external/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/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/resources/forms-samples-styling.xsl
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/resources/forms-samples-styling.xsl?view=diff&rev=534153&r1=534152&r2=534153
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/resources/forms-samples-styling.xsl (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/resources/forms-samples-styling.xsl Tue May 1 09:49:43 2007
@@ -23,11 +23,12 @@
| want advanced styling of widgets, change it here!
| See xsl:include as composition and xsl:import as extension/inheritance.
+-->
- <xsl:include href="resource://org/apache/cocoon/forms/resources/forms-page-styling.xsl"/>
- <xsl:include href="resource://org/apache/cocoon/forms/resources/forms-advanced-field-styling.xsl"/>
+ <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"/>
+ <xsl:param name="forms-resources"/>
<xsl:template match="head">
<head>
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/sitemap.xmap?view=diff&rev=534153&r1=534152&r2=534153
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/sitemap.xmap Tue May 1 09:49:43 2007
@@ -30,8 +30,8 @@
<map:transformer name="i18n" src="org.apache.cocoon.transformation.I18nTransformer">
<catalogues default="other">
<catalogue id="other" name="OtherMessages" location="messages"/>
- <catalogue id="forms" name="messages" location="resource://org/apache/cocoon/forms/system/i18n"/>
- <catalogue id="upload" name="messages" location="resource://org/apache/cocoon/ajax/system/i18n"/>
+ <catalogue id="forms" name="messages" location="servlet:forms:/resource/internal/i18n"/>
+ <catalogue id="upload" name="messages" location="servlet:ajax:/resource/internal/i18n"/>
</catalogues>
</map:transformer>
</map:transformers>
@@ -161,7 +161,8 @@
<map:transform type="i18n">
</map:transform>
<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:/resource/external/dojo}"/>
+ <map:parameter name="forms-resources" value="{servlet:forms:/resource/external/forms}"/>
</map:transform>
<map:transform type="i18n">
</map:transform>
@@ -201,7 +202,7 @@
<map:match pattern="_cocoon/forms/suggest">
<map:generate type="suggestion-list"/>
<map:transform type="i18n"/>
- <map:transform src="resource://org/apache/cocoon/forms/resources/selection-list2json.xsl"/>
+ <map:transform src="servlet:forms:/resource/internal/xsl/selection-list2json.xsl"/>
<map:serialize type="json"/>
</map:match>
@@ -210,7 +211,7 @@
</map:match>
<map:match pattern="*.json-combo-data">
<map:generate type="jx" src="forms/{1}json.xml"/>
- <map:transform src="resource://org/apache/cocoon/forms/resources/selection-list2json.xsl"/>
+ <map:transform src="servlet:forms:/resource/internal/xsl/selection-list2json.xsl"/>
<map:serialize type="json"/>
</map:match>
@@ -227,11 +228,13 @@
<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:/resource/external/dojo}"/>
+ <map:parameter name="forms-resources" value="{servlet:forms:/resource/external/forms}"/>
<map:parameter name="dojo-locale" value="{flow-attr:locale}"/>
</map:transform>
<map:transform type="i18n">
</map:transform>
+ <map:transform type="servletLinkRewriter"/>
<map:serialize/>
</map:match>
@@ -250,19 +253,21 @@
<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:/resource/external/dojo}"/>
+ <map:parameter name="forms-resources" value="{servlet:forms:/resource/external/forms}"/>
<map:parameter name="dojo-debug" value="true"/><!-- set to true to turn on dojo debugging in the Browser -->
<map:parameter name="dojo-locale" value="{flow-attr:locale}"/>
</map:transform>
<map:transform type="i18n">
<map:parameter name="locale" value="{flow-attribute:locale}"/>
</map:transform>
+ <map:transform type="servletLinkRewriter"/>
<map:select type="ajax-request">
<map:when test="true"><!-- sending a partial Browser Update -->
<map:select type="request-parameter">
<map:parameter name="parameter-name" value="dojo.transport"/>
<map:when test="iframe"><!-- sending BU via iFrameIO -->
- <map:transform src="resource://org/apache/cocoon/forms/resources/IframeTransport-bu-styling.xsl"/>
+ <map:transform src="servlet:forms:/resource/internal/xsl/IframeTransport-bu-styling.xsl"/>
<map:serialize type="xhtml"/><!-- this is REALLY important -->
</map:when>
<map:otherwise><!-- sending BU via XHR -->
@@ -496,7 +501,8 @@
<map:parameter name="remove" value="{0}"/>
</map:transform>
<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:/resource/external/dojo}"/>
+ <map:parameter name="forms-resources" value="{servlet:forms:/resource/external/forms}"/>
</map:transform>
<map:serialize/>
</map:match>
@@ -505,18 +511,6 @@
<map:generate type="jx" src="forms/htmlarea_success.jx"/>
<map:serialize type="xml"/>
</map:match>
-
- <!-- System-provided resources
- If needed, you can override them with your own pipelines before -->
-
- <!-- for developers: load directly from the source tree, rather than from the jars
- <map:match pattern="resources/*/**">
- <map:read src="file://{realpath:}/../../src/blocks/{1}/trunk/java/org/apache/cocoon/{1}/resources/{2}"/>
- </map:match>
- -->
- <map:match pattern="resources/*/**">
- <map:read src="resource://org/apache/cocoon/{1}/resources/{2}"/>
- </map:match>
<!--
| Sample building a forms-form-gui editor in forms
@@ -577,7 +571,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:/resource/external/dojo}"/>
+ <map:parameter name="forms-resources" value="{servlet:forms:/resource/external/forms}"/>
</map:transform>
<map:serialize type="html" />
</map:match>
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/sql/flow/flow.js
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/sql/flow/flow.js?view=diff&rev=534153&r1=534152&r2=534153
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/sql/flow/flow.js (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/sql/flow/flow.js Tue May 1 09:49:43 2007
@@ -22,7 +22,7 @@
*
* @version $Id$
*/
-cocoon.load("resource://org/apache/cocoon/forms/flow/javascript/Form.js");
+cocoon.load("servlet:forms:/resource/internal/flow/javascript/Form.js");
cocoon.load("flow/jdbi.js");
importClass(org.apache.cocoon.forms.formmodel.WidgetState);
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/sql/pages/employee-edit.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/sql/pages/employee-edit.xml?view=diff&rev=534153&r1=534152&r2=534153
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/sql/pages/employee-edit.xml (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/sql/pages/employee-edit.xml Tue May 1 09:49:43 2007
@@ -23,7 +23,7 @@
xmlns:fi="http://apache.org/cocoon/forms/1.0#instance"
xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
-<jx:import uri="resource://org/apache/cocoon/forms/generation/jx-macros.xml"/>
+<jx:import uri="servlet:forms:/resource/internal/generation/jx-macros.xml"/>
<head>
<title>Employee sheet</title>
</head>
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/sql/resources/forms-styling.xsl
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/sql/resources/forms-styling.xsl?view=diff&rev=534153&r1=534152&r2=534153
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/sql/resources/forms-styling.xsl (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/sql/resources/forms-styling.xsl Tue May 1 09:49:43 2007
@@ -23,11 +23,12 @@
| want advanced styling of widgets, change it here!
| See xsl:include as composition and xsl:import as extension/inheritance.
+-->
- <xsl:include href="resource://org/apache/cocoon/forms/resources/forms-page-styling.xsl"/>
- <xsl:include href="resource://org/apache/cocoon/forms/resources/forms-advanced-field-styling.xsl"/>
+ <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:/resource/external/dojo</xsl:param>
+ <xsl:param name="forms-resources"/>
<xsl:template match="head">
<head>