cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gkossakow...@apache.org
Subject svn commit: r522917 - in /cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF: dreamteam/content/ forms/ library/forms/ pagination/ sql/pages/
Date Tue, 27 Mar 2007 14:05:29 GMT
Author: gkossakowski
Date: Tue Mar 27 07:05:27 2007
New Revision: 522917

URL: http://svn.apache.org/viewvc?view=rev&rev=522917
Log:
COCOON-2026: Load JX macros using 'servlet:' source instead of 'resource:'.

Modified:
    cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/dreamteam/content/teamTemplate.jx
    cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/ajax_multivalue_with_suggestion_template.xml
    cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/ajax_suggest_template.xml
    cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/calculatedfields_template.xml
    cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/carselector_template.xml
    cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/datasource_chooser_template.xml
    cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/dynamicrepeater_dojo_template.xml
    cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/dynamicrepeater_template.xml
    cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/dynamicrepeaters_dojo_template.xml
    cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/file_explorer_template.xml
    cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/form1_template.xml
    cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/form1_template_action_jx-macro.xml
    cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/inplace_edit_template.xml
    cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/multipage_template.xml
    cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/sampletree_template.xml
    cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/tasktree_template.xml
    cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/upload_template.xml
    cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/uploadprogress_template.xml
    cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/xdoceditor_template.xml
    cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/library/forms/form1_template.xml
    cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/library/forms/hotel_template.xml
    cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/pagination/paginated.tpl.xml
    cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/sql/pages/employee-edit.xml

Modified: cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/dreamteam/content/teamTemplate.jx
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/dreamteam/content/teamTemplate.jx?view=diff&rev=522917&r1=522916&r2=522917
==============================================================================
--- cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/dreamteam/content/teamTemplate.jx
(original)
+++ cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/dreamteam/content/teamTemplate.jx
Tue Mar 27 07:05:27 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/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/ajax_multivalue_with_suggestion_template.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/ajax_multivalue_with_suggestion_template.xml?view=diff&rev=522917&r1=522916&r2=522917
==============================================================================
--- cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/ajax_multivalue_with_suggestion_template.xml
(original)
+++ cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/ajax_multivalue_with_suggestion_template.xml
Tue Mar 27 07:05:27 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/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/ajax_suggest_template.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/ajax_suggest_template.xml?view=diff&rev=522917&r1=522916&r2=522917
==============================================================================
--- cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/ajax_suggest_template.xml
(original)
+++ cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/ajax_suggest_template.xml
Tue Mar 27 07:05:27 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>

Modified: cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/calculatedfields_template.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/calculatedfields_template.xml?view=diff&rev=522917&r1=522916&r2=522917
==============================================================================
--- cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/calculatedfields_template.xml
(original)
+++ cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/calculatedfields_template.xml
Tue Mar 27 07:05:27 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/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/carselector_template.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/carselector_template.xml?view=diff&rev=522917&r1=522916&r2=522917
==============================================================================
--- cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/carselector_template.xml
(original)
+++ cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/carselector_template.xml
Tue Mar 27 07:05:27 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/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/datasource_chooser_template.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/datasource_chooser_template.xml?view=diff&rev=522917&r1=522916&r2=522917
==============================================================================
--- cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/datasource_chooser_template.xml
(original)
+++ cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/datasource_chooser_template.xml
Tue Mar 27 07:05:27 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/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/dynamicrepeater_dojo_template.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/dynamicrepeater_dojo_template.xml?view=diff&rev=522917&r1=522916&r2=522917
==============================================================================
--- cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/dynamicrepeater_dojo_template.xml
(original)
+++ cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/dynamicrepeater_dojo_template.xml
Tue Mar 27 07:05:27 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/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/dynamicrepeater_template.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/dynamicrepeater_template.xml?view=diff&rev=522917&r1=522916&r2=522917
==============================================================================
--- cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/dynamicrepeater_template.xml
(original)
+++ cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/dynamicrepeater_template.xml
Tue Mar 27 07:05:27 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/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/dynamicrepeaters_dojo_template.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/dynamicrepeaters_dojo_template.xml?view=diff&rev=522917&r1=522916&r2=522917
==============================================================================
--- cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/dynamicrepeaters_dojo_template.xml
(original)
+++ cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/dynamicrepeaters_dojo_template.xml
Tue Mar 27 07:05:27 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/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/file_explorer_template.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/file_explorer_template.xml?view=diff&rev=522917&r1=522916&r2=522917
==============================================================================
--- cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/file_explorer_template.xml
(original)
+++ cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/file_explorer_template.xml
Tue Mar 27 07:05:27 2007
@@ -19,7 +19,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"/>
 
   <!-- A macro that displays the toggle icons (plus/minus) for the current treeNode -->
   <jx:macro name="toggle-icon">

Modified: cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/form1_template.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/form1_template.xml?view=diff&rev=522917&r1=522916&r2=522917
==============================================================================
--- cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/form1_template.xml
(original)
+++ cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/form1_template.xml
Tue Mar 27 07:05:27 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/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/form1_template_action_jx-macro.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/form1_template_action_jx-macro.xml?view=diff&rev=522917&r1=522916&r2=522917
==============================================================================
--- cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/form1_template_action_jx-macro.xml
(original)
+++ cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/form1_template_action_jx-macro.xml
Tue Mar 27 07:05:27 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/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/inplace_edit_template.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/inplace_edit_template.xml?view=diff&rev=522917&r1=522916&r2=522917
==============================================================================
--- cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/inplace_edit_template.xml
(original)
+++ cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/inplace_edit_template.xml
Tue Mar 27 07:05:27 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/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/multipage_template.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/multipage_template.xml?view=diff&rev=522917&r1=522916&r2=522917
==============================================================================
--- cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/multipage_template.xml
(original)
+++ cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/multipage_template.xml
Tue Mar 27 07:05:27 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/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/sampletree_template.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/sampletree_template.xml?view=diff&rev=522917&r1=522916&r2=522917
==============================================================================
--- cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/sampletree_template.xml
(original)
+++ cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/sampletree_template.xml
Tue Mar 27 07:05:27 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"/>
   
   <!-- A macro that displays the toggle icons (plus/minus) for the current treeNode -->
   <jx:macro name="toggle-icon">

Modified: cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/tasktree_template.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/tasktree_template.xml?view=diff&rev=522917&r1=522916&r2=522917
==============================================================================
--- cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/tasktree_template.xml
(original)
+++ cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/tasktree_template.xml
Tue Mar 27 07:05:27 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/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/upload_template.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/upload_template.xml?view=diff&rev=522917&r1=522916&r2=522917
==============================================================================
--- cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/upload_template.xml
(original)
+++ cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/upload_template.xml
Tue Mar 27 07:05:27 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/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/uploadprogress_template.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/uploadprogress_template.xml?view=diff&rev=522917&r1=522916&r2=522917
==============================================================================
--- cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/uploadprogress_template.xml
(original)
+++ cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/uploadprogress_template.xml
Tue Mar 27 07:05:27 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/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/xdoceditor_template.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/xdoceditor_template.xml?view=diff&rev=522917&r1=522916&r2=522917
==============================================================================
--- cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/xdoceditor_template.xml
(original)
+++ cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/xdoceditor_template.xml
Tue Mar 27 07:05:27 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/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/library/forms/form1_template.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/library/forms/form1_template.xml?view=diff&rev=522917&r1=522916&r2=522917
==============================================================================
--- cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/library/forms/form1_template.xml
(original)
+++ cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/library/forms/form1_template.xml
Tue Mar 27 07:05:27 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>
     <ft:form-template action="#{$cocoon/continuation/id}.continue" method="POST">

Modified: cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/library/forms/hotel_template.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/library/forms/hotel_template.xml?view=diff&rev=522917&r1=522916&r2=522917
==============================================================================
--- cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/library/forms/hotel_template.xml
(original)
+++ cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/library/forms/hotel_template.xml
Tue Mar 27 07:05:27 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/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/pagination/paginated.tpl.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/pagination/paginated.tpl.xml?view=diff&rev=522917&r1=522916&r2=522917
==============================================================================
--- cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/pagination/paginated.tpl.xml
(original)
+++ cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/pagination/paginated.tpl.xml
Tue Mar 27 07:05:27 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/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/sql/pages/employee-edit.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/sql/pages/employee-edit.xml?view=diff&rev=522917&r1=522916&r2=522917
==============================================================================
--- cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/sql/pages/employee-edit.xml
(original)
+++ cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/sql/pages/employee-edit.xml
Tue Mar 27 07:05:27 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>



Mime
View raw message