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 2009/11/20 23:33:42 UTC
svn commit: r882746 - in /myfaces/core/trunk/impl/src/main:
java/org/apache/myfaces/taglib/core/ resources/META-INF/
Author: lu4242
Date: Fri Nov 20 22:33:39 2009
New Revision: 882746
URL: http://svn.apache.org/viewvc?rev=882746&view=rev
Log:
MYFACES-2411 Update api to match latest signature
Modified:
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/taglib/core/LoadBundleTag.java
myfaces/core/trunk/impl/src/main/resources/META-INF/myfaces_core12.vm
myfaces/core/trunk/impl/src/main/resources/META-INF/myfaces_facelet_core20.vm
myfaces/core/trunk/impl/src/main/resources/META-INF/myfaces_facelet_html20.vm
myfaces/core/trunk/impl/src/main/resources/META-INF/myfaces_html12.vm
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/taglib/core/LoadBundleTag.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/taglib/core/LoadBundleTag.java?rev=882746&r1=882745&r2=882746&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/taglib/core/LoadBundleTag.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/taglib/core/LoadBundleTag.java Fri Nov 20 22:33:39 2009
@@ -65,7 +65,7 @@
/**
* The base name of the resource bundle.
*/
- @JSFJspAttribute(required = true, className="javax.el.ValueExpression",
+ @JSFJspAttribute(className="javax.el.ValueExpression",
deferredValueType="java.lang.String")
public void setBasename(ValueExpression basename)
{
Modified: myfaces/core/trunk/impl/src/main/resources/META-INF/myfaces_core12.vm
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/resources/META-INF/myfaces_core12.vm?rev=882746&r1=882745&r2=882746&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/resources/META-INF/myfaces_core12.vm (original)
+++ myfaces/core/trunk/impl/src/main/resources/META-INF/myfaces_core12.vm Fri Nov 20 22:33:39 2009
@@ -79,8 +79,14 @@
#else
#if ( "$!property.isRtexprvalue()" == "")
#set ($type = $utils.getClassFromFullClass($property.className))
-#if ($type == "String")
- <deferred-value></deferred-value>
+#if($property.deferredValueType)
+ <deferred-value>
+ <type>$property.deferredValueType</type>
+ </deferred-value>
+#elseif ($type == "String")
+ <deferred-value>
+ <type>java.lang.String</type>
+ </deferred-value>
#elseif (($property.className == "java.util.Locale") && ($component.name == "f:view"))
<deferred-value>
<type>java.lang.Object</type>
@@ -134,8 +140,14 @@
<rtexprvalue>false</rtexprvalue>
#else
#set ($type = $utils.getClassFromFullClass($property.className))
-#if ($type == "String")
- <deferred-value></deferred-value>
+#if($property.deferredValueType)
+ <deferred-value>
+ <type>$property.deferredValueType</type>
+ </deferred-value>
+#elseif ($type == "String")
+ <deferred-value>
+ <type>java.lang.String</type>
+ </deferred-value>
#elseif ($property.className == "java.util.Locale" && $component.name == "f:convertDateTime")
<deferred-value>
<type>java.lang.Object</type>
@@ -190,8 +202,14 @@
<rtexprvalue>false</rtexprvalue>
#else
#set ($type = $utils.getClassFromFullClass($property.className))
-#if ($type == "String")
- <deferred-value></deferred-value>
+#if($property.deferredValueType)
+ <deferred-value>
+ <type>$property.deferredValueType</type>
+ </deferred-value>
+#elseif ($type == "String")
+ <deferred-value>
+ <type>java.lang.String</type>
+ </deferred-value>
#else
<deferred-value>
<type>$property.className</type>
Modified: myfaces/core/trunk/impl/src/main/resources/META-INF/myfaces_facelet_core20.vm
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/resources/META-INF/myfaces_facelet_core20.vm?rev=882746&r1=882745&r2=882746&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/resources/META-INF/myfaces_facelet_core20.vm (original)
+++ myfaces/core/trunk/impl/src/main/resources/META-INF/myfaces_facelet_core20.vm Fri Nov 20 22:33:39 2009
@@ -81,8 +81,14 @@
#else
#if ( "$!property.isRtexprvalue()" == "")
#set ($type = $utils.getClassFromFullClass($property.className))
-#if ($type == "String")
- <deferred-value></deferred-value>
+#if($property.deferredValueType)
+ <deferred-value>
+ <type>$property.deferredValueType</type>
+ </deferred-value>
+#elseif ($type == "String")
+ <deferred-value>
+ <type>java.lang.String</type>
+ </deferred-value>
#elseif (($property.className == "java.util.Locale") && ($component.name == "f:view"))
<deferred-value>
<type>java.lang.Object</type>
@@ -139,8 +145,14 @@
<rtexprvalue>false</rtexprvalue>
#else
#set ($type = $utils.getClassFromFullClass($property.className))
-#if ($type == "String")
- <deferred-value></deferred-value>
+#if($property.deferredValueType)
+ <deferred-value>
+ <type>$property.deferredValueType</type>
+ </deferred-value>
+#elseif ($type == "String")
+ <deferred-value>
+ <type>java.lang.String</type>
+ </deferred-value>
#elseif ($property.className == "java.util.Locale" && $component.name == "f:convertDateTime")
<deferred-value>
<type>java.lang.Object</type>
@@ -198,8 +210,14 @@
<rtexprvalue>false</rtexprvalue>
#else
#set ($type = $utils.getClassFromFullClass($property.className))
-#if ($type == "String")
- <deferred-value></deferred-value>
+#if($property.deferredValueType)
+ <deferred-value>
+ <type>$property.deferredValueType</type>
+ </deferred-value>
+#elseif ($type == "String")
+ <deferred-value>
+ <type>java.lang.String</type>
+ </deferred-value>
#else
<deferred-value>
<type>$property.className</type>
Modified: myfaces/core/trunk/impl/src/main/resources/META-INF/myfaces_facelet_html20.vm
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/resources/META-INF/myfaces_facelet_html20.vm?rev=882746&r1=882745&r2=882746&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/resources/META-INF/myfaces_facelet_html20.vm (original)
+++ myfaces/core/trunk/impl/src/main/resources/META-INF/myfaces_facelet_html20.vm Fri Nov 20 22:33:39 2009
@@ -81,8 +81,14 @@
#else
#if ( "$!property.isRtexprvalue()" == "")
#set ($type = $utils.getClassFromFullClass($property.className))
-#if ($type == "String")
- <deferred-value></deferred-value>
+#if($property.deferredValueType)
+ <deferred-value>
+ <type>$property.deferredValueType</type>
+ </deferred-value>
+#elseif ($type == "String")
+ <deferred-value>
+ <type>java.lang.String</type>
+ </deferred-value>
#else
<deferred-value>
<type>$property.className</type>
@@ -135,8 +141,16 @@
<rtexprvalue>false</rtexprvalue>
#else
#set ($type = $utils.getClassFromFullClass($property.className))
-#if ($type == "String")
- <deferred-value></deferred-value>
+#if($property.deferredValueType)
+ <deferred-value>
+ <type>$property.deferredValueType</type>
+ </deferred-value>
+#elseif ($type == "String")
+ <deferred-value>
+ <type>java.lang.String</type>
+ </deferred-value>
+
+
#else
<deferred-value>
<type>$property.className</type>
@@ -186,8 +200,14 @@
<rtexprvalue>false</rtexprvalue>
#else
#set ($type = $utils.getClassFromFullClass($property.className))
-#if ($type == "String")
- <deferred-value></deferred-value>
+#if($property.deferredValueType)
+ <deferred-value>
+ <type>$property.deferredValueType</type>
+ </deferred-value>
+#elseif ($type == "String")
+ <deferred-value>
+ <type>java.lang.String</type>
+ </deferred-value>
#else
<deferred-value>
<type>$property.className</type>
Modified: myfaces/core/trunk/impl/src/main/resources/META-INF/myfaces_html12.vm
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/resources/META-INF/myfaces_html12.vm?rev=882746&r1=882745&r2=882746&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/resources/META-INF/myfaces_html12.vm (original)
+++ myfaces/core/trunk/impl/src/main/resources/META-INF/myfaces_html12.vm Fri Nov 20 22:33:39 2009
@@ -79,8 +79,14 @@
#else
#if ( "$!property.isRtexprvalue()" == "")
#set ($type = $utils.getClassFromFullClass($property.className))
-#if ($type == "String")
- <deferred-value></deferred-value>
+#if($property.deferredValueType)
+ <deferred-value>
+ <type>$property.deferredValueType</type>
+ </deferred-value>
+#elseif ($type == "String")
+ <deferred-value>
+ <type>java.lang.String</type>
+ </deferred-value>
#else
<deferred-value>
<type>$property.className</type>
@@ -130,8 +136,16 @@
<rtexprvalue>false</rtexprvalue>
#else
#set ($type = $utils.getClassFromFullClass($property.className))
-#if ($type == "String")
- <deferred-value></deferred-value>
+#if($property.deferredValueType)
+ <deferred-value>
+ <type>$property.deferredValueType</type>
+ </deferred-value>
+#elseif ($type == "String")
+ <deferred-value>
+ <type>java.lang.String</type>
+ </deferred-value>
+
+
#else
<deferred-value>
<type>$property.className</type>
@@ -178,8 +192,14 @@
<rtexprvalue>false</rtexprvalue>
#else
#set ($type = $utils.getClassFromFullClass($property.className))
-#if ($type == "String")
- <deferred-value></deferred-value>
+#if($property.deferredValueType)
+ <deferred-value>
+ <type>$property.deferredValueType</type>
+ </deferred-value>
+#elseif ($type == "String")
+ <deferred-value>
+ <type>java.lang.String</type>
+ </deferred-value>
#else
<deferred-value>
<type>$property.className</type>