You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2008/11/29 01:05:58 UTC

svn commit: r721590 - in /myfaces/tomahawk/trunk: core12/src/main/resources/META-INF/tomahawk12.vm pom.xml sandbox/core12/src/main/resources/META-INF/tomahawk12.vm

Author: lu4242
Date: Fri Nov 28 16:05:58 2008
New Revision: 721590

URL: http://svn.apache.org/viewvc?rev=721590&view=rev
Log:
TOMAHAWK-1376 id attribute for html components on JSF 1.2 could be set via an rtexprvalue (but not by a ValueExpression)

Modified:
    myfaces/tomahawk/trunk/core12/src/main/resources/META-INF/tomahawk12.vm
    myfaces/tomahawk/trunk/pom.xml
    myfaces/tomahawk/trunk/sandbox/core12/src/main/resources/META-INF/tomahawk12.vm

Modified: myfaces/tomahawk/trunk/core12/src/main/resources/META-INF/tomahawk12.vm
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core12/src/main/resources/META-INF/tomahawk12.vm?rev=721590&r1=721589&r2=721590&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core12/src/main/resources/META-INF/tomahawk12.vm (original)
+++ myfaces/tomahawk/trunk/core12/src/main/resources/META-INF/tomahawk12.vm Fri Nov 28 16:05:58 2008
@@ -70,6 +70,7 @@
 #elseif ($property.isLiteralOnly())
          <rtexprvalue>false</rtexprvalue>
 #else
+#if ( "$!property.isRtexprvalue()" == "")
 #set ($type = $utils.getClassFromFullClass($property.className))
 #if ($type == "String")
          <deferred-value></deferred-value>
@@ -78,6 +79,9 @@
              <type>$property.className</type>
          </deferred-value>
 #end
+#else
+         <rtexprvalue>$property.isRtexprvalue().booleanValue()</rtexprvalue>
+#end
 #end
 #if ($property.longDescription)
          <description><![CDATA[$property.longDescription]]></description>

Modified: myfaces/tomahawk/trunk/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/pom.xml?rev=721590&r1=721589&r2=721590&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/pom.xml (original)
+++ myfaces/tomahawk/trunk/pom.xml Fri Nov 28 16:05:58 2008
@@ -162,7 +162,7 @@
       - against *when jsf1.2 is selected*. When jsf1.1 or a Sun implementation
       - are selected for running the examples, this is ignored.
       -->
-    <myfaces-core12-version>1.2.5</myfaces-core12-version>
+    <myfaces-core12-version>1.2.6-SNAPSHOT</myfaces-core12-version>
 
     <!--  
       - Define what shared lib version tomahawk12 and sandbox12 code will be compiled with.

Modified: myfaces/tomahawk/trunk/sandbox/core12/src/main/resources/META-INF/tomahawk12.vm
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/core12/src/main/resources/META-INF/tomahawk12.vm?rev=721590&r1=721589&r2=721590&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core12/src/main/resources/META-INF/tomahawk12.vm (original)
+++ myfaces/tomahawk/trunk/sandbox/core12/src/main/resources/META-INF/tomahawk12.vm Fri Nov 28 16:05:58 2008
@@ -70,6 +70,7 @@
 #elseif ($property.isLiteralOnly())
          <rtexprvalue>false</rtexprvalue>
 #else
+#if ( "$!property.isRtexprvalue()" == "")
 #set ($type = $utils.getClassFromFullClass($property.className))
 #if ($type == "String")
          <deferred-value></deferred-value>
@@ -78,6 +79,9 @@
              <type>$property.className</type>
          </deferred-value>
 #end
+#else
+         <rtexprvalue>$property.isRtexprvalue().booleanValue()</rtexprvalue>
+#end
 #end
 #if ($property.longDescription)
          <description><![CDATA[$property.longDescription]]></description>
@@ -222,4 +226,4 @@
    </tag>
 #end
 #end
-</taglib>
\ No newline at end of file
+</taglib>