myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lu4...@apache.org
Subject svn commit: r694457 - in /myfaces/core/trunk_1.2.x/impl/src/main/resources/META-INF: myfaces_core12.vm myfaces_html12.vm
Date Thu, 11 Sep 2008 20:22:17 GMT
Author: lu4242
Date: Thu Sep 11 13:22:15 2008
New Revision: 694457

URL: http://svn.apache.org/viewvc?rev=694457&view=rev
Log:
MYFACES-1966 facet tag is in both myfaces_core.tld and myfaces_html.tld

Modified:
    myfaces/core/trunk_1.2.x/impl/src/main/resources/META-INF/myfaces_core12.vm
    myfaces/core/trunk_1.2.x/impl/src/main/resources/META-INF/myfaces_html12.vm

Modified: myfaces/core/trunk_1.2.x/impl/src/main/resources/META-INF/myfaces_core12.vm
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/impl/src/main/resources/META-INF/myfaces_core12.vm?rev=694457&r1=694456&r2=694457&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/impl/src/main/resources/META-INF/myfaces_core12.vm (original)
+++ myfaces/core/trunk_1.2.x/impl/src/main/resources/META-INF/myfaces_core12.vm Thu Sep 11
13:22:15 2008
@@ -201,6 +201,7 @@
 #set ($tagList = $model.getTags())
 #foreach( $tag in $tagList )
 #if ($modelIds.contains($tag.modelId))
+#if ($utils.getTagPrefix($tag.name) == $shortname)
    <tag>
       <description><![CDATA[$tag.longDescription]]></description>
       <name>$utils.getTagName($tag.name)</name>
@@ -238,4 +239,5 @@
    </tag>
 #end
 #end
-</taglib>
\ No newline at end of file
+#end
+</taglib>

Modified: myfaces/core/trunk_1.2.x/impl/src/main/resources/META-INF/myfaces_html12.vm
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/impl/src/main/resources/META-INF/myfaces_html12.vm?rev=694457&r1=694456&r2=694457&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/impl/src/main/resources/META-INF/myfaces_html12.vm (original)
+++ myfaces/core/trunk_1.2.x/impl/src/main/resources/META-INF/myfaces_html12.vm Thu Sep 11
13:22:15 2008
@@ -193,6 +193,7 @@
 #set ($tagList = $model.getTags())
 #foreach( $tag in $tagList )
 #if ($modelIds.contains($tag.modelId))
+#if ($utils.getTagPrefix($tag.name) == $shortname)
    <tag>
       <description><![CDATA[$tag.longDescription]]></description>
       <name>$utils.getTagName($tag.name)</name>
@@ -230,4 +231,5 @@
    </tag>
 #end
 #end
+#end
 </taglib>



Mime
View raw message