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/01/30 03:21:06 UTC

svn commit: r616594 - in /myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces: ./ parse/

Author: lu4242
Date: Tue Jan 29 18:21:05 2008
New Revision: 616594

URL: http://svn.apache.org/viewvc?rev=616594&view=rev
Log:
added component-class-excluded and tag-class-excluded properties on component extensions to allow exclusion on generation for several tomahawk components that cannot be generated

Modified:
    myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/GenerateComponentsMojo.java
    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/ComponentBean.java
    myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/parse/FacesConfigParser.java

Modified: myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/GenerateComponentsMojo.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/GenerateComponentsMojo.java?rev=616594&r1=616593&r2=616594&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/GenerateComponentsMojo.java (original)
+++ myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/GenerateComponentsMojo.java Tue Jan 29 18:21:05 2008
@@ -99,8 +99,11 @@
         int count = 0;
         while (components.hasNext())
         {
-          _generateComponent((ComponentBean)components.next());
-          count++;
+          ComponentBean component = (ComponentBean)components.next();
+          if (!component.isComponentClassExcluded()){
+              _generateComponent(component);
+              count++;
+          }          
         }
         getLog().info("Generated " + count + " component(s)");
       }

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=616594&r1=616593&r2=616594&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 Jan 29 18:21:05 2008
@@ -772,8 +772,11 @@
         int count = 0;
         while (components.hasNext())
         {
-          componentGen.generateTagHandler((ComponentBean)components.next());
-          count++;
+          ComponentBean component = (ComponentBean)components.next();
+          if (!component.isTagClassExcluded()){
+              componentGen.generateTagHandler(component);
+              count++;
+          }
         }
         while (converters.hasNext())
         {

Modified: myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/parse/ComponentBean.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/ComponentBean.java?rev=616594&r1=616593&r2=616594&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/parse/ComponentBean.java (original)
+++ myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/parse/ComponentBean.java Tue Jan 29 18:21:05 2008
@@ -1042,6 +1042,28 @@
     }
   }
 
+  public void setComponentClassExcluded(boolean componentClassExcluded)
+  {
+    _componentClassExcluded = componentClassExcluded;
+  }
+
+  public boolean isComponentClassExcluded()
+  {
+    return _componentClassExcluded;
+  }
+  
+  public void setTagClassExcluded(boolean tagClassExcluded)
+  {
+    _tagClassExcluded = tagClassExcluded;
+  }
+
+  public boolean isTagClassExcluded()
+  {
+    return _tagClassExcluded;
+  }
+
+  private boolean _tagClassExcluded;
+  private boolean _componentClassExcluded;  
   private String  _description;
   private String  _longDescription;
   private String  _componentType;

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=616594&r1=616593&r2=616594&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 Jan 29 18:21:05 2008
@@ -154,6 +154,11 @@
                                    "tagHandler");
     digester.addBeanPropertySetter("faces-config/component/component-extension/implementation-type",
                                    "implementationType");
+    digester.addBeanPropertySetter("faces-config/component/component-extension/component-class-excluded",
+                                   "componentClassExcluded");
+    digester.addBeanPropertySetter("faces-config/component/component-extension/tag-class-excluded",
+                                   "tagClassExcluded");
+    
     digester.addCallMethod("faces-config/component/component-extension/tag-class-modifier",
                            "parseTagClassModifier", 1);
     digester.addCallParam("faces-config/component/component-extension/tag-class-modifier", 0);