cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jo...@apache.org
Subject svn commit: r618887 - in /cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src: changes/changes.xml main/resources/org/apache/cocoon/forms/resources/forms-field-styling.xsl
Date Wed, 06 Feb 2008 04:55:32 GMT
Author: joerg
Date: Tue Feb  5 20:55:32 2008
New Revision: 618887

URL: http://svn.apache.org/viewvc?rev=618887&view=rev
Log:
COCOON-2058: Fix ambiguous rule issue with Forms stylesheets when using Saxon. (Saxon weights
"fi:styling/@*" the same as "fi:styling/@name").

Modified:
    cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/changes/changes.xml
    cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/forms-field-styling.xsl

Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/changes/changes.xml?rev=618887&r1=618886&r2=618887&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/changes/changes.xml (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/changes/changes.xml Tue Feb  5
20:55:32 2008
@@ -25,19 +25,22 @@
 <document>
   <body>
     <release version="1.1.0-M1" date="2008-??-??" description="unreleased">
-      <action dev="joerg" type="fix" fixes-bug="COCOON-2052" due-to="Robin Wyles" due-to-email="rob@robinwyles.com">
-        Allow Ajax submission of forms with empty upload field.
-      </action>
       <action dev="giacomo" type="update">
         The Cocoon Forms springified (as much as possible).
       </action>
     </release>
     <release version="1.0.0" date="2008-??-??" description="unreleased">
+      <action dev="JH" type="fix" fixes-bug="COCOON-2058" due-to="Ralph Collett" due-to-email="ralph.collett@semantico.com">
+        Fix ambiguous rule issue with Forms stylesheets when using Saxon.
+      </action>
       <action dev="vgritsenko" type="fix">
         Fixed concurrency issue in form definition builders code. If you have custom
         widgets, please implement WidgetDefinitionBuilder.buildWidgetDefinition(Element,
WidgetDefinitionBuilderContext)
         method. Do not use WidgetDefinitionBuilder.buildWidgetDefinition(Element) method,
it is intended to be
         implemented only by the top level widget (Form).
+      </action>
+      <action dev="joerg" type="fix" fixes-bug="COCOON-2052" due-to="Robin Wyles" due-to-email="rob@robinwyles.com">
+        Allow Ajax submission of forms with empty upload field.
       </action>
     </release>
     <!-- Here forms block got branched for forms 1.0 and springified form 1.1. -->

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?rev=618887&r1=618886&r2=618887&view=diff
==============================================================================
--- 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 Feb  5 20:55:32 2008
@@ -916,7 +916,7 @@
     </xsl:if>
   </xsl:template>
 
-  <xsl:template match="fi:styling/@*" mode="styling">
+  <xsl:template match="fi:styling/@*" mode="styling" priority="-1">
     <xsl:copy-of select="."/>
   </xsl:template>
 
@@ -934,7 +934,7 @@
         +-->
   </xsl:template>
 
-  <xsl:template match="fi:styling/@type" mode="styling" priority="1">
+  <xsl:template match="fi:styling/@type" mode="styling">
     <!--+
         | Do we have a duplicate semantic usage of @type?
         | @type is only a marker for the stylesheet in general, but some of the



Mime
View raw message