You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by jo...@apache.org on 2008/02/06 05:56:37 UTC
svn commit: r618889 - in /cocoon/branches/BRANCH_2_1_X:
src/blocks/forms/resources/org/apache/cocoon/forms/resources/forms-field-styling.xsl
status.xml
Author: joerg
Date: Tue Feb 5 20:56:36 2008
New Revision: 618889
URL: http://svn.apache.org/viewvc?rev=618889&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/branches/BRANCH_2_1_X/src/blocks/forms/resources/org/apache/cocoon/forms/resources/forms-field-styling.xsl
cocoon/branches/BRANCH_2_1_X/status.xml
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/forms/resources/org/apache/cocoon/forms/resources/forms-field-styling.xsl
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/blocks/forms/resources/org/apache/cocoon/forms/resources/forms-field-styling.xsl?rev=618889&r1=618888&r2=618889&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/forms/resources/org/apache/cocoon/forms/resources/forms-field-styling.xsl (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/forms/resources/org/apache/cocoon/forms/resources/forms-field-styling.xsl Tue Feb 5 20:56:36 2008
@@ -186,7 +186,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>
@@ -204,7 +204,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
Modified: cocoon/branches/BRANCH_2_1_X/status.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/status.xml?rev=618889&r1=618888&r2=618889&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/status.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/status.xml Tue Feb 5 20:56:36 2008
@@ -182,6 +182,9 @@
<changes>
<release version="2.1.12" date="TBD">
+ <action dev="JH" type="fix" fixes-bug="COCOON-2058" due-to="Ralph Collett" due-to-email="ralph.collett@semantico.com">
+ Forms Block: Fix ambiguous rule issue with Forms stylesheets when using Saxon.
+ </action>
<action dev="CZ" type="fix" fixes-bug="COCOON-2164" due-to="Nico Verwer" due-to-email="nverwer@email.com">
Validation Block: Fix error in JaxpResolver#resolveResource(..) where publicId and systemId where swapped.
</action>