[myfaces-trinidad-maven] 12/17: TRINIDAD-1499 - Regression issues with jsp tag class generation from move to jsr276 metadata

[de...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

deki pushed a commit to branch 1.2.10.1-branch
in repository https://gitbox.apache.org/repos/asf/myfaces-trinidad-maven.git

commit 5a0991b949e898770d0e535d6b7f30d70da45c59
Author: Matthias Wessendorf <ma...@apache.org>
AuthorDate: Sat Jun 6 00:45:42 2009 +0000

    TRINIDAD-1499 - Regression issues with jsp tag class generation from move to jsr276 metadata
    
    Thanks to Bill Baggett for his patch
---
 .../myfaces/trinidadbuild/plugin/faces/GenerateJspTaglibsMojo.java  | 3 +--
 .../myfaces/trinidadbuild/plugin/faces/parse/FacesConfigParser.java | 1 +
 .../myfaces/trinidadbuild/plugin/faces/parse/PropertyBean.java      | 6 ++++++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateJspTaglibsMojo.java b/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateJspTaglibsMojo.java
index 3bd4825..3fbecae 100644
--- a/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateJspTaglibsMojo.java
+++ b/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateJspTaglibsMojo.java
@@ -610,8 +610,7 @@ public class GenerateJspTaglibsMojo extends AbstractFacesMojo
           }
           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))
         {
diff --git a/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/FacesConfigParser.java b/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/FacesConfigParser.java
index 45fb044..dae2548 100644
--- a/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/FacesConfigParser.java
+++ b/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/FacesConfigParser.java
@@ -282,6 +282,7 @@ public class FacesConfigParser
     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);
   }
diff --git a/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/PropertyBean.java b/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/PropertyBean.java
index 1f1a36d..2f7c6f0 100644
--- a/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/PropertyBean.java
+++ b/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/PropertyBean.java
@@ -507,6 +507,12 @@ public class PropertyBean extends AttributeBean
   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);
   }
 
   /**

-- 
To stop receiving notification emails like this one, please contact
"commits@myfaces.apache.org" <co...@myfaces.apache.org>.