You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ar...@apache.org on 2007/11/09 03:26:47 UTC
svn commit: r593398 - in
/myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/resources/org/apache/myfaces/trinidadbuild/plugin/faces/resources:
transform.xsl transform12.xsl
Author: arobinson74
Date: Thu Nov 8 18:26:46 2007
New Revision: 593398
URL: http://svn.apache.org/viewvc?rev=593398&view=rev
Log:
Fix for TRINIDAD-810 -- Change the output location of the attribute-values element when there is a property-metadata element present in the source file
Modified:
myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/resources/org/apache/myfaces/trinidadbuild/plugin/faces/resources/transform.xsl
myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/resources/org/apache/myfaces/trinidadbuild/plugin/faces/resources/transform12.xsl
Modified: myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/resources/org/apache/myfaces/trinidadbuild/plugin/faces/resources/transform.xsl
URL: http://svn.apache.org/viewvc/myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/resources/org/apache/myfaces/trinidadbuild/plugin/faces/resources/transform.xsl?rev=593398&r1=593397&r2=593398&view=diff
==============================================================================
--- myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/resources/org/apache/myfaces/trinidadbuild/plugin/faces/resources/transform.xsl (original)
+++ myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/resources/org/apache/myfaces/trinidadbuild/plugin/faces/resources/transform.xsl Thu Nov 8 18:26:46 2007
@@ -404,13 +404,16 @@
<xsl:template match="//javaee:property-extension[mfp:property-metadata]" priority="1" >
<xsl:element name="property-extension" >
- <xsl:apply-templates/>
+ <!-- do not copy the property values, but instead let them be picked up in the property-metadata element -->
+ <xsl:apply-templates select="*[name() != 'mfp:property-values']" />
</xsl:element>
</xsl:template>
<xsl:template match="//mfp:property-metadata" >
<xsl:element name="property-metadata" >
<xsl:apply-templates/>
+ <!-- pick up any property-values elements from the parent node -->
+ <xsl:apply-templates select="../mfp:property-values" />
</xsl:element>
</xsl:template>
Modified: myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/resources/org/apache/myfaces/trinidadbuild/plugin/faces/resources/transform12.xsl
URL: http://svn.apache.org/viewvc/myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/resources/org/apache/myfaces/trinidadbuild/plugin/faces/resources/transform12.xsl?rev=593398&r1=593397&r2=593398&view=diff
==============================================================================
--- myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/resources/org/apache/myfaces/trinidadbuild/plugin/faces/resources/transform12.xsl (original)
+++ myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/resources/org/apache/myfaces/trinidadbuild/plugin/faces/resources/transform12.xsl Thu Nov 8 18:26:46 2007
@@ -387,13 +387,16 @@
<xsl:template match="//javaee:property-extension[mfp:property-metadata]" priority="1" >
<xsl:element name="property-extension" >
- <xsl:apply-templates/>
+ <!-- do not copy the property values, but instead let them be picked up in the property-metadata element -->
+ <xsl:apply-templates select="*[name() != 'mfp:property-values']" />
</xsl:element>
</xsl:template>
<xsl:template match="//mfp:property-metadata" >
<xsl:element name="property-metadata" >
<xsl:apply-templates/>
+ <!-- pick up any property-values elements from the parent node -->
+ <xsl:apply-templates select="../mfp:property-values" />
</xsl:element>
</xsl:template>