myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lu4...@apache.org
Subject svn commit: r627156 - in /myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces: GenerateJspTaglibsMojo.java parse/FacesConfigParser.java parse/ValidatorBean.java
Date Tue, 12 Feb 2008 22:24:50 GMT
Author: lu4242
Date: Tue Feb 12 14:24:49 2008
New Revision: 627156

URL: http://svn.apache.org/viewvc?rev=627156&view=rev
Log:
Validator property tag-class-excluded added for reference validator on tomahawk 1.2

Modified:
    myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/GenerateJspTaglibsMojo.java
    myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/parse/FacesConfigParser.java
    myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/parse/ValidatorBean.java

Modified: myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/GenerateJspTaglibsMojo.java
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/GenerateJspTaglibsMojo.java?rev=627156&r1=627155&r2=627156&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/GenerateJspTaglibsMojo.java
(original)
+++ myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/GenerateJspTaglibsMojo.java
Tue Feb 12 14:24:49 2008
@@ -785,8 +785,11 @@
         }
         while (validators.hasNext())
         {
-          validatorGen.generateTagHandler((ValidatorBean)validators.next(), generatedSourceDirectory);
-          count++;
+          ValidatorBean validator = (ValidatorBean)validators.next();
+          if (!validator.isTagClassExcluded()){
+              validatorGen.generateTagHandler(validator, generatedSourceDirectory);
+              count++;    
+          }          
         }
         getLog().info("Generated " + count + " JSP tag(s)");
       }

Modified: myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/parse/FacesConfigParser.java
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/parse/FacesConfigParser.java?rev=627156&r1=627155&r2=627156&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/parse/FacesConfigParser.java
(original)
+++ myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/parse/FacesConfigParser.java
Tue Feb 12 14:24:49 2008
@@ -371,7 +371,9 @@
     digester.addCallMethod("faces-config/validator/validator-extension/tag-class-modifier",
                            "parseTagClassModifier", 1);
     digester.addCallParam("faces-config/validator/validator-extension/tag-class-modifier",
0);
-
+    digester.addBeanPropertySetter("faces-config/validator/property/property-extension/tag-attribute-excluded",
+            "tagAttributeExcluded");
+    
     // faces-config/validator/property/property-extension
     digester.addBeanPropertySetter("faces-config/validator/property/property-extension/tag-attribute-excluded",
                                    "tagAttributeExcluded");

Modified: myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/parse/ValidatorBean.java
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/parse/ValidatorBean.java?rev=627156&r1=627155&r2=627156&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/parse/ValidatorBean.java
(original)
+++ myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/parse/ValidatorBean.java
Tue Feb 12 14:24:49 2008
@@ -137,11 +137,22 @@
   {
     addValidatorClassModifier(_parseModifier(modifier));
   }
+  
+  public void setTagClassExcluded(boolean tagClassExcluded)
+  {
+    _tagClassExcluded = tagClassExcluded;
+  }
+
+  public boolean isTagClassExcluded()
+  {
+    return _tagClassExcluded;
+  }
 
   private String  _validatorId;
   private String  _validatorClass;
   private String  _validatorSuperClass;
   private int     _validatorClassModifiers;
+  private boolean _tagClassExcluded;
 
 
   static private final Logger _LOG = Logger.getLogger(ValidatorBean.class.getName());



Mime
View raw message