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:06 UTC
svn commit: r618888 - in
/cocoon/branches/cocoon-forms-1.0.0/cocoon-forms-impl/src:
changes/changes.xml
main/resources/org/apache/cocoon/forms/resources/forms-field-styling.xsl
Author: joerg
Date: Tue Feb 5 20:56:05 2008
New Revision: 618888
URL: http://svn.apache.org/viewvc?rev=618888&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/cocoon-forms-1.0.0/cocoon-forms-impl/src/changes/changes.xml
cocoon/branches/cocoon-forms-1.0.0/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/forms-field-styling.xsl
Modified: cocoon/branches/cocoon-forms-1.0.0/cocoon-forms-impl/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/cocoon-forms-1.0.0/cocoon-forms-impl/src/changes/changes.xml?rev=618888&r1=618887&r2=618888&view=diff
==============================================================================
--- cocoon/branches/cocoon-forms-1.0.0/cocoon-forms-impl/src/changes/changes.xml (original)
+++ cocoon/branches/cocoon-forms-1.0.0/cocoon-forms-impl/src/changes/changes.xml Tue Feb 5 20:56:05 2008
@@ -26,6 +26,9 @@
<document>
<body>
<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)
Modified: cocoon/branches/cocoon-forms-1.0.0/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/forms-field-styling.xsl
URL: http://svn.apache.org/viewvc/cocoon/branches/cocoon-forms-1.0.0/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/forms-field-styling.xsl?rev=618888&r1=618887&r2=618888&view=diff
==============================================================================
--- cocoon/branches/cocoon-forms-1.0.0/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/forms-field-styling.xsl (original)
+++ cocoon/branches/cocoon-forms-1.0.0/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/forms-field-styling.xsl Tue Feb 5 20:56:05 2008
@@ -908,7 +908,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>
@@ -926,7 +926,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