You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ma...@apache.org on 2009/06/06 02:45:42 UTC
svn commit: r782176 - in
/myfaces/trinidad-maven/branches/1.2.10.1-branch/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces:
GenerateJspTaglibsMojo.java parse/FacesConfigParser.java
parse/PropertyBean.java
Author: matzew
Date: Sat Jun 6 00:45:42 2009
New Revision: 782176
URL: http://svn.apache.org/viewvc?rev=782176&view=rev
Log:
TRINIDAD-1499 - Regression issues with jsp tag class generation from move to jsr276 metadata
Thanks to Bill Baggett for his patch
Modified:
myfaces/trinidad-maven/branches/1.2.10.1-branch/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateJspTaglibsMojo.java
myfaces/trinidad-maven/branches/1.2.10.1-branch/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/FacesConfigParser.java
myfaces/trinidad-maven/branches/1.2.10.1-branch/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/PropertyBean.java
Modified: myfaces/trinidad-maven/branches/1.2.10.1-branch/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateJspTaglibsMojo.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad-maven/branches/1.2.10.1-branch/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateJspTaglibsMojo.java?rev=782176&r1=782175&r2=782176&view=diff
==============================================================================
--- myfaces/trinidad-maven/branches/1.2.10.1-branch/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateJspTaglibsMojo.java (original)
+++ myfaces/trinidad-maven/branches/1.2.10.1-branch/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateJspTaglibsMojo.java Sat Jun 6 00:45:42 2009
@@ -610,8 +610,7 @@
}
stream.writeEndElement();
}
- else if ((!property.isLiteralOnly() &&
- (!(property.getValueExpression() != null && property.getValueExpression().equals("PROHIBITED")))) ||
+ else if (!property.isLiteralOnly() ||
// "binding" is always a deferred-value
"binding".equals(propertyName))
{
Modified: myfaces/trinidad-maven/branches/1.2.10.1-branch/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/FacesConfigParser.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad-maven/branches/1.2.10.1-branch/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/FacesConfigParser.java?rev=782176&r1=782175&r2=782176&view=diff
==============================================================================
--- myfaces/trinidad-maven/branches/1.2.10.1-branch/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/FacesConfigParser.java (original)
+++ myfaces/trinidad-maven/branches/1.2.10.1-branch/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/FacesConfigParser.java Sat Jun 6 00:45:42 2009
@@ -282,6 +282,7 @@
digester.addCallMethod("faces-config/component/property/property-extension/property-metadata/property-values",
"parsePropertyValues", 1);
digester.addCallParam("faces-config/component/property/property-extension/property-metadata/property-values", 0);
+ digester.addBeanPropertySetter("faces-config/component/property/property-extension/property-metadata/deprecated");
digester.setRuleNamespaceURI(oldNamespace);
}
Modified: myfaces/trinidad-maven/branches/1.2.10.1-branch/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/PropertyBean.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad-maven/branches/1.2.10.1-branch/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/PropertyBean.java?rev=782176&r1=782175&r2=782176&view=diff
==============================================================================
--- myfaces/trinidad-maven/branches/1.2.10.1-branch/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/PropertyBean.java (original)
+++ myfaces/trinidad-maven/branches/1.2.10.1-branch/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/PropertyBean.java Sat Jun 6 00:45:42 2009
@@ -507,6 +507,12 @@
public void setValueExpression(String valueExpression)
{
this._valueExpression = valueExpression;
+ // This is for backward compatibility from jsr-276 metadata. The old element
+ // <mfp:literal-only>true</mfp:literal-only> is now
+ // <fmd:value-expression>PROHIBITED</fmd:value-expression>. There are a number of places
+ // that look at literalOnly, so we just make it transparent at the lowest level.
+ if (valueExpression.equals("PROHIBITED"))
+ setLiteralOnly(true);
}
/**