Return-Path: 
 <cvs-return-30423-apmail-cocoon-cvs-archive=cocoon.apache.org@cocoon.apache.org>
Delivered-To: apmail-cocoon-cvs-archive@www.apache.org
Received: (qmail 94227 invoked from network); 13 Apr 2007 18:48:58 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 13 Apr 2007 18:48:58 -0000
Received: (qmail 94927 invoked by uid 500); 13 Apr 2007 18:49:04 -0000
Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org
Received: (qmail 94872 invoked by uid 500); 13 Apr 2007 18:49:04 -0000
Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cocoon.apache.org
list-help: <mailto:cvs-help@cocoon.apache.org>
list-unsubscribe: <mailto:cvs-unsubscribe@cocoon.apache.org>
List-Post: <mailto:cvs@cocoon.apache.org>
List-Id: <cvs.cocoon.apache.org>
Delivered-To: mailing list cvs@cocoon.apache.org
Received: (qmail 94861 invoked by uid 99); 13 Apr 2007 18:49:04 -0000
Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 13 Apr 2007 11:49:03 -0700
X-ASF-Spam-Status: No, hits=-99.5 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 13 Apr 2007 11:48:57 -0700
Received: by eris.apache.org (Postfix, from userid 65534)
	id 08DDC1A9842; Fri, 13 Apr 2007 11:48:37 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r528585 - in
 /cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF:
 ./ aggregate/ captcha/ dreamteam/ library/ pagination/ resources/
 sql/resources/
Date: Fri, 13 Apr 2007 18:48:36 -0000
To: cvs@cocoon.apache.org
From: gkossakowski@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20070413184837.08DDC1A9842@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: gkossakowski
Date: Fri Apr 13 11:48:35 2007
New Revision: 528585

URL: http://svn.apache.org/viewvc?view=rev&rev=528585
Log:
Make Ajax follow convention on resource URLs discussed in this thread: http://thread.gmane.org/gmane.text.xml.cocoon.devel/71697

Modified:
    cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/aggregate/sitemap.xmap
    cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/captcha/sitemap.xmap
    cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/dreamteam/sitemap.xmap
    cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/library/sitemap.xmap
    cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/pagination/sitemap.xmap
    cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/resources/forms-samples-styling.xsl
    cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/sitemap.xmap
    cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/sql/resources/forms-styling.xsl

Modified: cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/aggregate/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/aggregate/sitemap.xmap?view=diff&rev=528585&r1=528584&r2=528585
==============================================================================
--- cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/aggregate/sitemap.xmap (original)
+++ cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/aggregate/sitemap.xmap Fri Apr 13 11:48:35 2007
@@ -69,7 +69,7 @@
           <map:parameter name="file" value="{1}_template.xml"/>
         </map:call>
         <map:transform src="../resources/forms-samples-styling.xsl">
-          <map:parameter name="dojo-resources" value="{servlet:ajax:/resources/dojo}"/>
+          <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/>

Modified: cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/captcha/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/captcha/sitemap.xmap?view=diff&rev=528585&r1=528584&r2=528585
==============================================================================
--- cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/captcha/sitemap.xmap (original)
+++ cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/captcha/sitemap.xmap Fri Apr 13 11:48:35 2007
@@ -87,7 +87,7 @@
          <map:parameter name="file" value="forms/{1}.tpl.xml"/>
        </map:call>
        <map:transform src="../resources/forms-samples-styling.xsl">
-         <map:parameter name="dojo-resources" value="{servlet:ajax:/resources/dojo}"/>
+         <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">

Modified: cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/dreamteam/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/dreamteam/sitemap.xmap?view=diff&rev=528585&r1=528584&r2=528585
==============================================================================
--- cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/dreamteam/sitemap.xmap (original)
+++ cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/dreamteam/sitemap.xmap Fri Apr 13 11:48:35 2007
@@ -92,7 +92,7 @@
         <map:generate type="jx" src="content/teamTemplate.jx"/>
         <map:transform type="browser-update"/>
         <map:transform src="../resources/forms-samples-styling.xsl">
-          <map:parameter name="dojo-resources" value="{servlet:ajax:/resources/dojo}"/>
+          <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">

Modified: cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/library/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/library/sitemap.xmap?view=diff&rev=528585&r1=528584&r2=528585
==============================================================================
--- cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/library/sitemap.xmap (original)
+++ cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/library/sitemap.xmap Fri Apr 13 11:48:35 2007
@@ -112,7 +112,7 @@
           <map:parameter name="file" value="forms/{1}_template.xml"/>
         </map:call>
         <map:transform src="../resources/forms-samples-styling.xsl">
-          <map:parameter name="dojo-resources" value="{servlet:ajax:/resources/dojo}"/>
+          <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/>

Modified: cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/pagination/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/pagination/sitemap.xmap?view=diff&rev=528585&r1=528584&r2=528585
==============================================================================
--- cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/pagination/sitemap.xmap (original)
+++ cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/pagination/sitemap.xmap Fri Apr 13 11:48:35 2007
@@ -64,7 +64,7 @@
           <map:parameter name="file" value="{1}.tpl.xml"/>
         </map:call>
          <map:transform src="../resources/forms-samples-styling.xsl">
-           <map:parameter name="dojo-resources" value="{servlet:ajax:/resources/dojo}"/>
+           <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">

Modified: cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/resources/forms-samples-styling.xsl
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/resources/forms-samples-styling.xsl?view=diff&rev=528585&r1=528584&r2=528585
==============================================================================
--- cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/resources/forms-samples-styling.xsl (original)
+++ cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/resources/forms-samples-styling.xsl Fri Apr 13 11:48:35 2007
@@ -27,7 +27,7 @@
   <xsl:include href="servlet:forms:/resource/internal/xsl/forms-advanced-field-styling.xsl"/>
 
   <!-- Location of the resources directories, where JS libs and icons are stored -->
-  <xsl:param name="dojo-resources">servlet:ajax:/resources/dojo</xsl:param>
+  <xsl:param name="dojo-resources"/>
   <xsl:param name="forms-resources"/>
   
   <xsl:template match="head">

Modified: cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/sitemap.xmap?view=diff&rev=528585&r1=528584&r2=528585
==============================================================================
--- cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/sitemap.xmap (original)
+++ cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/sitemap.xmap Fri Apr 13 11:48:35 2007
@@ -161,7 +161,7 @@
        <map:transform type="i18n">
        </map:transform>
        <map:transform src="resources/forms-samples-styling.xsl">
- 		 <map:parameter name="dojo-resources" value="{servlet:ajax:/resources/dojo}"/>
+ 		 <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">
@@ -228,7 +228,7 @@
          <map:parameter name="file" value="forms/{1}_template.xml"/>
        </map:call>
        <map:transform src="resources/forms-samples-styling.xsl">
- 		 <map:parameter name="dojo-resources" value="{servlet:ajax:/resources/dojo}"/>
+ 		 <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>
@@ -253,7 +253,7 @@
          <map:parameter name="file" value="forms/{1}_template.xml"/>
        </map:call>
        <map:transform src="resources/forms-samples-styling.xsl">
- 		 <map:parameter name="dojo-resources" value="{servlet:ajax:/resources/dojo}"/>
+ 		 <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}"/>
@@ -501,7 +501,7 @@
          <map:parameter name="remove" value="{0}"/>
        </map:transform>
        <map:transform src="resources/forms-samples-styling.xsl">
-         <map:parameter name="dojo-resources" value="{servlet:ajax:/resources/dojo}"/>
+         <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/>
@@ -571,7 +571,7 @@
          <map:parameter name="file" value="forms/{1}_template.xml"/>
        </map:call>
        <map:transform src="resources/forms-samples-styling.xsl">
-         <map:parameter name="dojo-resources" value="{servlet:ajax:/resources/dojo}"/>
+         <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" />

Modified: cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/sql/resources/forms-styling.xsl
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/sql/resources/forms-styling.xsl?view=diff&rev=528585&r1=528584&r2=528585
==============================================================================
--- cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/sql/resources/forms-styling.xsl (original)
+++ cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/sql/resources/forms-styling.xsl Fri Apr 13 11:48:35 2007
@@ -27,7 +27,7 @@
   <xsl:include href="servlet:forms:/resource/internal/xsl/forms-advanced-field-styling.xsl"/>
 
   <!-- Location of the resources directories, where JS libs and icons are stored -->
-  <xsl:param name="dojo-resources">servlet:ajax:/resources/dojo</xsl:param>
+  <xsl:param name="dojo-resources">servlet:ajax:/resource/external/dojo</xsl:param>
   <xsl:param name="forms-resources"/>
   
   <xsl:template match="head">