svn commit: r818711 - in /myfaces/core/trunk: api/src/main/java/javax/faces/component/UIViewParameter.java api/src/main/java/javax/faces/validator/BeanValidator.java impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/AttributeHandler.java

[lu...@apache.org]

Author: lu4242
Date: Fri Sep 25 03:57:53 2009
New Revision: 818711

URL: http://svn.apache.org/viewvc?rev=818711&view=rev
Log:
sync javadoc with latest discussion and comments sent to EG

Modified:
    myfaces/core/trunk/api/src/main/java/javax/faces/component/UIViewParameter.java
    myfaces/core/trunk/api/src/main/java/javax/faces/validator/BeanValidator.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/AttributeHandler.java

Modified: myfaces/core/trunk/api/src/main/java/javax/faces/component/UIViewParameter.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/component/UIViewParameter.java?rev=818711&r1=818710&r2=818711&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/component/UIViewParameter.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/component/UIViewParameter.java Fri Sep 25 03:57:53 2009
@@ -44,7 +44,7 @@
  * 
  * @since 2.0
  */
-@JSFComponent(name = "f:viewParam", bodyContent = "JSP", tagClass = "org.apache.myfaces.taglib.core.ViewParamTag")
+@JSFComponent(name = "f:viewParam", bodyContent = "JSP")
 public class UIViewParameter extends UIInput
 {
     public static final String COMPONENT_FAMILY = "javax.faces.ViewParameter";

Modified: myfaces/core/trunk/api/src/main/java/javax/faces/validator/BeanValidator.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/validator/BeanValidator.java?rev=818711&r1=818710&r2=818711&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/validator/BeanValidator.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/validator/BeanValidator.java Fri Sep 25 03:57:53 2009
@@ -21,6 +21,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFJspProperty;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFProperty;
 import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFValidator;
 
 import javax.el.*;
@@ -49,7 +50,9 @@
  * @author Jan-Kees van Andel
  * @since 2.0
  */
-@JSFValidator
+@JSFValidator(
+        name="f:validateBean",
+        bodyContent="empty")
 @JSFJspProperty(
         name = "binding",
         returnType = "javax.faces.validator.BeanValidator",
@@ -349,6 +352,7 @@
      * Get the Bean Validation validation groups.
      * @return The validation groups String.
      */
+    @JSFProperty
     public String getValidationGroups()
     {
         return validationGroups;
@@ -365,6 +369,18 @@
         postSetValidationGroups();
     }
 
+    @JSFProperty
+    private Boolean isDisabled()
+    {
+        return null;
+    }
+    
+    @JSFProperty
+    private String getFor()
+    {
+        return null;
+    }
+
     /** {@inheritDoc} */
     public boolean isTransient()
     {

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/AttributeHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/AttributeHandler.java?rev=818711&r1=818710&r2=818711&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/AttributeHandler.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/AttributeHandler.java Fri Sep 25 03:57:53 2009
@@ -48,7 +48,7 @@
     @JSFFaceletAttribute(name="name")
     private final TagAttribute _name;
     
-    @JSFFaceletAttribute
+    @JSFFaceletAttribute(name="targets")
     private final TagAttribute _targets;
     
     /**
@@ -56,35 +56,34 @@
      * value (null), the value set on this property is returned as default
      * instead null.
      */
-    @JSFFaceletAttribute
+    @JSFFaceletAttribute(name="default")
     private final TagAttribute _default;
     
-    @JSFFaceletAttribute
+    @JSFFaceletAttribute(name="displayName")
     private final TagAttribute _displayName;
 
     /**
      * Indicate if the attribute is required or not
      * <p>
      * Myfaces specific feature: this attribute is checked only if project stage is
-     * not ProjectStage.Production when a composite component is created.
-     * </p>
+     * not ProjectStage.Production when a composite component is created.</p>
      */
-    @JSFFaceletAttribute
+    @JSFFaceletAttribute(name="required")
     private final TagAttribute _required;
 
-    @JSFFaceletAttribute
+    @JSFFaceletAttribute(name="preferred")
     private final TagAttribute _preferred;
 
-    @JSFFaceletAttribute
+    @JSFFaceletAttribute(name="expert")
     private final TagAttribute _expert;
 
-    @JSFFaceletAttribute
+    @JSFFaceletAttribute(name="shortDescription")
     private final TagAttribute _shortDescription;
 
-    @JSFFaceletAttribute
+    @JSFFaceletAttribute(name="method-signature")
     private final TagAttribute _methodSignature;
 
-    @JSFFaceletAttribute
+    @JSFFaceletAttribute(name="type")
     private final TagAttribute _type;
     
     /**