cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gkossakow...@apache.org
Subject svn commit: r520445 - in /cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/src/main/resources: COB-INF/ org/apache/cocoon/forms/resources/ org/apache/cocoon/forms/resources/js/
Date Tue, 20 Mar 2007 15:51:37 GMT
Author: gkossakowski
Date: Tue Mar 20 08:51:36 2007
New Revision: 520445

URL: http://svn.apache.org/viewvc?view=rev&rev=520445
Log:
Make Forms follow convention on path discussed in this thread: http://thread.gmane.org/gmane.text.xml.cocoon.devel/71697
Removing default values for paths from xsl files as they prove to be more harmful than helpful.

Modified:
    cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/src/main/resources/COB-INF/sitemap.xmap
    cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/forms-advanced-field-styling.xsl
    cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/forms-htmlarea-styling.xsl
    cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/forms-page-styling.xsl
    cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/js/manifest.js

Modified: cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/src/main/resources/COB-INF/sitemap.xmap?view=diff&rev=520445&r1=520444&r2=520445
==============================================================================
--- cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/src/main/resources/COB-INF/sitemap.xmap
(original)
+++ cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/src/main/resources/COB-INF/sitemap.xmap
Tue Mar 20 08:51:36 2007
@@ -18,31 +18,37 @@
 
 <!-- SVN $Id$ -->
 
-<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
+<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             xsi:schemaLocation="http://apache.org/cocoon/sitemap/1.0 http://cocoon.apache.org/schema/sitemap/cocoon-sitemap-1.0.xsd">
 
   <map:pipelines>
-    <map:pipeline>
+  
+    <map:pipeline id="internal-resource">
     
-      <map:match pattern="system/i18n/*">
+      <map:match pattern="resource/internal/i18n/*">
       	<map:read src="resource://org/apache/cocoon/forms/system/i18n/{1}"/>
       </map:match>
     
-      <map:match pattern="system/**.xsl">
+      <map:match pattern="resource/internal/xsl/**.xsl">
       	<map:read src="resource://org/apache/cocoon/forms/resources/{1}.xsl"/>
       </map:match>
       
-      <map:match pattern="system/flow/**">
+      <map:match pattern="resource/internal/flow/**">
       	<map:read src="resource://org/apache/cocoon/forms/flow/{1}"/>
       </map:match>
+    </map:pipeline>
+    
+    <map:pipeline id="external-resource">
     
-      <map:match pattern="resources/forms/**.js">
+      <map:match pattern="resource/external/forms/**.js">
       	<map:read src="resource://org/apache/cocoon/forms/resources/{1}.js" type="servletLinkRewriter"/>
       </map:match>
     
-      <map:match pattern="resources/forms/**">
+      <map:match pattern="resource/external/forms/**">
       	<map:read src="resource://org/apache/cocoon/forms/resources/{1}"/>
       </map:match>
 
     </map:pipeline>
+    
   </map:pipelines>
 </map:sitemap>

Modified: cocoon/whiteboard/ajax-forms-refactoring/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/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/forms-advanced-field-styling.xsl?view=diff&rev=520445&r1=520444&r2=520445
==============================================================================
--- cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/forms-advanced-field-styling.xsl
(original)
+++ cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/forms-advanced-field-styling.xsl
Tue Mar 20 08:51:36 2007
@@ -30,7 +30,7 @@
   <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">servlet:forms:/resources/forms</xsl:param>
+  <xsl:param name="forms-resources"/>
 
   <xsl:template match="head" mode="forms-field">
     <xsl:apply-imports/>

Modified: cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/forms-htmlarea-styling.xsl
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/forms-htmlarea-styling.xsl?view=diff&rev=520445&r1=520444&r2=520445
==============================================================================
--- cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/forms-htmlarea-styling.xsl
(original)
+++ cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/forms-htmlarea-styling.xsl
Tue Mar 20 08:51:36 2007
@@ -24,7 +24,7 @@
       +-->
 
   <xsl:param name="htmlarea-lang">en</xsl:param>
-  <xsl:param name="forms-resources">servlet:forms:/resources/forms</xsl:param>
+  <xsl:param name="forms-resources"/>
 
   <xsl:template match="head" mode="forms-htmlarea">
     <script type="text/javascript">

Modified: cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/forms-page-styling.xsl
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/forms-page-styling.xsl?view=diff&rev=520445&r1=520444&r2=520445
==============================================================================
--- cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/forms-page-styling.xsl
(original)
+++ cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/forms-page-styling.xsl
Tue Mar 20 08:51:36 2007
@@ -19,7 +19,7 @@
                 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">servlet:forms:/resources/forms</xsl:param>
+  <xsl:param name="forms-resources"/>
   
   <!--+
       | This stylesheet is designed to be included by 'forms-samples-styling.xsl'.

Modified: cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/js/manifest.js
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/js/manifest.js?view=diff&rev=520445&r1=520444&r2=520445
==============================================================================
--- cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/js/manifest.js
(original)
+++ cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/js/manifest.js
Tue Mar 20 08:51:36 2007
@@ -62,7 +62,7 @@
 
     dojo.registerModulePath("cocoon.ajax", "servlet:ajax:/resources/ajax/js"); // cocoon.forms
has a dependency on the cocoon.ajax module libraries
 
-    dojo.registerModulePath("cocoon.forms", "servlet:/resources/forms/js");
+    dojo.registerModulePath("cocoon.forms", "servlet:/resource/external/forms/js");
     dojo.registerNamespace("forms", "cocoon.forms", formsResolver);
     
 })();



Mime
View raw message