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 2010/10/12 06:09:49 UTC

svn commit: r1021620 - /myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/

Author: lu4242
Date: Tue Oct 12 04:09:48 2010
New Revision: 1021620

URL: http://svn.apache.org/viewvc?rev=1021620&view=rev
Log:
MFCOMMONS-18 Use myfaces builder annotations instead doclets

Modified:
    myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/AbstractCSVValidator.java
    myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/AbstractCompareToValidator.java
    myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/AbstractCreditCardValidator.java
    myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/AbstractDateRestrictionValidator.java
    myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/AbstractRegExprValidator.java
    myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/AbstractUrlValidator.java
    myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/EmailValidator.java
    myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/ISBNValidator.java
    myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/ValidatorBase.java

Modified: myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/AbstractCSVValidator.java
URL: http://svn.apache.org/viewvc/myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/AbstractCSVValidator.java?rev=1021620&r1=1021619&r2=1021620&view=diff
==============================================================================
--- myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/AbstractCSVValidator.java (original)
+++ myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/AbstractCSVValidator.java Tue Oct 12 04:09:48 2010
@@ -26,21 +26,23 @@ import javax.faces.context.FacesContext;
 import javax.faces.validator.Validator;
 import javax.faces.validator.ValidatorException;
 
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFProperty;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFValidator;
 import org.apache.myfaces.commons.util.MessageUtils;
 
 /**
  * Validation by validating comma separated values individually.
  * 
- * @JSFValidator
- *   name = "mcv:validateCSV"
- *   class = "org.apache.myfaces.commons.validator.CSVValidator"
- *   tagClass = "org.apache.myfaces.commons.validator.ValidateCSVTag"
- *   serialuidtag = "-8874279182242196266L"
  *
  * @author Lance Frohman
  *
  * @version $Revision$ $Date$
  */
+@JSFValidator(
+   name = "mcv:validateCSV",
+   clazz = "org.apache.myfaces.commons.validator.CSVValidator",
+   tagClass = "org.apache.myfaces.commons.validator.ValidateCSVTag",
+   serialuidtag = "-8874279182242196266L")
 public abstract class AbstractCSVValidator extends ValidatorBase {
     /**
      * <p>The standard converter id for this converter.</p>
@@ -56,9 +58,9 @@ public abstract class AbstractCSVValidat
     private static final String DEFAULT_SEPARATOR = ",";
 
     /**
-     * @JSFProperty
      * @return the VALIDATOR_ID of the actual validator to be used
      */
+    @JSFProperty
     public abstract String getSubvalidatorId();
 
     /**
@@ -67,10 +69,11 @@ public abstract class AbstractCSVValidat
     public abstract void setSubvalidatorId(String subvalidatorId);
 
     /**
-     * @JSFProperty
-     *   literalOnly = "true"
+     * 
      * @return the separator character to separate values
      */
+    @JSFProperty(
+       literalOnly = true)
     public abstract String getSeparator();
 
     /**

Modified: myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/AbstractCompareToValidator.java
URL: http://svn.apache.org/viewvc/myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/AbstractCompareToValidator.java?rev=1021620&r1=1021619&r2=1021620&view=diff
==============================================================================
--- myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/AbstractCompareToValidator.java (original)
+++ myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/AbstractCompareToValidator.java Tue Oct 12 04:09:48 2010
@@ -35,6 +35,8 @@ import javax.faces.render.RenderKitFacto
 import javax.faces.render.Renderer;
 import javax.faces.validator.ValidatorException;
 
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFProperty;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFValidator;
 import org.apache.myfaces.commons.util.MessageUtils;
 
 /**
@@ -100,15 +102,15 @@ import org.apache.myfaces.commons.util.M
  *   <li> Perhaps an exception should be thrown if the two values are not Comparable and no Comparator is specified.</li>
  * </ul>
  *   
- * @JSFValidator
- *   name = "mcv:validateCompareTo"
- *   class = "org.apache.myfaces.commons.validator.CompareToValidator"
- *   tagClass = "org.apache.myfaces.commons.validator.ValidateCompareToTag"
- *   serialuidtag = "-8879289182242196266L"
  *   
  * @author Mike Kienenberger (latest modification by $Author$)
  * @version $Revision$ $Date$
  */
+@JSFValidator(
+   name = "mcv:validateCompareTo",
+   clazz = "org.apache.myfaces.commons.validator.CompareToValidator",
+   tagClass = "org.apache.myfaces.commons.validator.ValidateCompareToTag",
+   serialuidtag = "-8879289182242196266L")
 public abstract class AbstractCompareToValidator extends ValidatorBase {
     /**
      * <p>The standard converter id for this converter.</p>
@@ -351,9 +353,9 @@ public abstract class AbstractCompareToV
     /**
      * The JSF id of the component with which to compare values.
      * 
-     * @JSFProperty
      * @return the foreign component_id, on which a value should be validated
      */
+    @JSFProperty
     public abstract String getFor();
 
     /**
@@ -364,9 +366,9 @@ public abstract class AbstractCompareToV
     /**
      * Operator for comparison: equals: eq, ==, =, not equals: ne, !=, greater than: gt, &gt;, less than: lt, &lt;, greater than or equals: ge, &gt;=, less than or equals: le, &lt;=
      * 
-     * @JSFProperty
      * @return
      */
+    @JSFProperty
     public abstract String getOperator();
 
     public abstract void setOperator(String operator);
@@ -375,9 +377,9 @@ public abstract class AbstractCompareToV
      * Value binding for an alternate java.util.Comparator object if component 
      * values don't implement Comparable
      * 
-     * @JSFProperty
      * @return
      */
+    @JSFProperty
     public abstract Object getComparator();
 
     public abstract void setComparator(Object comparator);
@@ -385,9 +387,9 @@ public abstract class AbstractCompareToV
     /**
      * custom operator name in error message (ie "after" instead of "greater than" for dates)
      * 
-     * @JSFProperty
      * @return
      */
+    @JSFProperty
     public abstract String getAlternateOperatorName();
 
     public abstract void setAlternateOperatorName(String alternateOperatorName);

Modified: myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/AbstractCreditCardValidator.java
URL: http://svn.apache.org/viewvc/myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/AbstractCreditCardValidator.java?rev=1021620&r1=1021619&r2=1021620&view=diff
==============================================================================
--- myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/AbstractCreditCardValidator.java (original)
+++ myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/AbstractCreditCardValidator.java Tue Oct 12 04:09:48 2010
@@ -23,21 +23,23 @@ import javax.faces.component.UIComponent
 import javax.faces.context.FacesContext;
 import javax.faces.validator.ValidatorException;
 
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFProperty;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFValidator;
+
 /**
  * A custom validator for creditCards, based upon Jakarta Commons. 
  * 
  * Unless otherwise specified, all attributes accept static values or EL expressions
  * 
- * @JSFValidator
- *   name = "mcv:validateCreditCard"
- *   class = "org.apache.myfaces.commons.validator.CreditCardValidator"
- *   bodyContent = "empty"
- *   tagClass = "org.apache.myfaces.commons.validator.ValidateCreditCardTag"
- *   serialuidtag = "3810660506302799072L"
- * 
  * @author mwessendorf (latest modification by $Author$)
  * @version $Revision$ $Date$
  */
+@JSFValidator(
+   name = "mcv:validateCreditCard",
+   clazz = "org.apache.myfaces.commons.validator.CreditCardValidator",
+   bodyContent = "empty",
+   tagClass = "org.apache.myfaces.commons.validator.ValidateCreditCardTag",
+   serialuidtag = "3810660506302799072L")
 public abstract class AbstractCreditCardValidator extends ValidatorBase {
 
     /**
@@ -123,41 +125,41 @@ public abstract class AbstractCreditCard
     /**
      * american express cards
      * 
-     * @JSFProperty
-     *   defaultValue = "true"
      */
+    @JSFProperty(
+       defaultValue = "true")
     public abstract boolean isAmex();
 
     /**
      * validation for discover
      * 
-     * @JSFProperty
-     *   defaultValue = "true"
      */
+    @JSFProperty(
+            defaultValue = "true")
     public abstract boolean isDiscover();
 
     /**
      * validation for mastercard
      * 
-     * @JSFProperty
-     *   defaultValue = "true"
      */
+    @JSFProperty(
+            defaultValue = "true")
     public abstract boolean isMastercard();
 
     /**
      * none of the given cardtypes is allowed.
      * 
-     * @JSFProperty
-     *   defaultValue = "false"
      */
+    @JSFProperty(
+            defaultValue = "false")
     public abstract boolean isNone();
 
     /**
      * validation for visa
      * 
-     * @JSFProperty
-     *   defaultValue = "true"
      */
+    @JSFProperty(
+            defaultValue = "true")
     public abstract boolean isVisa();
 
     public abstract void setAmex(boolean b);

Modified: myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/AbstractDateRestrictionValidator.java
URL: http://svn.apache.org/viewvc/myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/AbstractDateRestrictionValidator.java?rev=1021620&r1=1021619&r2=1021620&view=diff
==============================================================================
--- myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/AbstractDateRestrictionValidator.java (original)
+++ myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/AbstractDateRestrictionValidator.java Tue Oct 12 04:09:48 2010
@@ -35,19 +35,21 @@ import javax.faces.convert.DateTimeConve
 import javax.faces.validator.Validator;
 import javax.faces.validator.ValidatorException;
 
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFProperty;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFValidator;
 import org.apache.myfaces.commons.validator.model.DateListProvider;
 
 /**
  * Validate that the date entered is within a given restriction.
  * 
- * @JSFValidator
- *   name = "mcv:validateDateRestriction"
- *   class = "org.apache.myfaces.commons.validator.DateRestrictionValidator"
- *   bodyContent = "empty"
- *   tagClass = "org.apache.myfaces.commons.validator.ValidateDateRestrictionTag"
- *   serialuidtag = "6805174635196400967L"
  *
  */
+@JSFValidator(
+   name = "mcv:validateDateRestriction",
+   clazz = "org.apache.myfaces.commons.validator.DateRestrictionValidator",
+   bodyContent = "empty",
+   tagClass = "org.apache.myfaces.commons.validator.ValidateDateRestrictionTag",
+   serialuidtag = "6805174635196400967L")
 public abstract class AbstractDateRestrictionValidator extends ValidatorBase
 {
 
@@ -97,8 +99,8 @@ public abstract class AbstractDateRestri
      * The attribute takes a whitespace delimited list of months.
      * Possible values are jan, feb, mar, apr, may, jun, jul, aug, sep, oct, nov, dec.
      * 
-     * @JSFProperty
      */
+    @JSFProperty
     public abstract String[] getInvalidMonths();
 
     public abstract void setInvalidMonths(String[] invalidMonths);
@@ -108,8 +110,8 @@ public abstract class AbstractDateRestri
      * The attribute takes whitespace delimited list of weekdays.
      * Possible values are sun, mon, tue, wed, thu, fri, sat.
      * 
-     * @JSFProperty
      */
+    @JSFProperty
     public abstract String[] getInvalidDaysOfWeek();
 
     public abstract void setInvalidDaysOfWeek(String[] invalidDaysOfWeek);
@@ -118,8 +120,8 @@ public abstract class AbstractDateRestri
      * To specifiy a concrete List of Dates, use the invalidDays attribute and wire it
      * to a DateListProvider implementation. This returns a list of dates, which are invalid.
      * 
-     * @JSFProperty
      */
+    @JSFProperty
     public abstract DateListProvider getInvalidDays();
 
     public abstract void setInvalidDays(DateListProvider invalidDays);

Modified: myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/AbstractRegExprValidator.java
URL: http://svn.apache.org/viewvc/myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/AbstractRegExprValidator.java?rev=1021620&r1=1021619&r2=1021620&view=diff
==============================================================================
--- myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/AbstractRegExprValidator.java (original)
+++ myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/AbstractRegExprValidator.java Tue Oct 12 04:09:48 2010
@@ -24,23 +24,23 @@ import javax.faces.context.FacesContext;
 import javax.faces.validator.ValidatorException;
 
 import org.apache.commons.validator.GenericValidator;
-import org.apache.myfaces.commons.validator.ValidatorBase;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFProperty;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFValidator;
 
 /**
  * A custom validator for reg. expr., based upons Jakarta Commons. 
  * 
  * Unless otherwise specified, all attributes accept static values or EL expressions.
  * 
- * @JSFValidator
- *   name = "mcv:validateRegExpr"
- *   class = "org.apache.myfaces.commons.validator.RegExprValidator"
- *   tagClass = "org.apache.myfaces.commons.validator.ValidateRegExprTag"
- *   serialuidtag = "-449945949876262076L"
  * 
  * @author mwessendorf (latest modification by $Author$)
  * @version $Revision$ $Date$
  */
-
+@JSFValidator(
+   name = "mcv:validateRegExpr",
+   clazz = "org.apache.myfaces.commons.validator.RegExprValidator",
+   tagClass = "org.apache.myfaces.commons.validator.ValidateRegExprTag",
+   serialuidtag = "-449945949876262076L")
 public abstract class AbstractRegExprValidator extends ValidatorBase {
     /**
      * <p>The standard converter id for this converter.</p>
@@ -80,10 +80,10 @@ public abstract class AbstractRegExprVal
     /**
      * the pattern, which is the base of the validation
      * 
-     * @JSFProperty
-     *   literalOnly = "true"
      * @return the pattern, on which a value should be validated
      */
+    @JSFProperty(
+       literalOnly = true)
     public abstract String getPattern();
 
     /**

Modified: myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/AbstractUrlValidator.java
URL: http://svn.apache.org/viewvc/myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/AbstractUrlValidator.java?rev=1021620&r1=1021619&r2=1021620&view=diff
==============================================================================
--- myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/AbstractUrlValidator.java (original)
+++ myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/AbstractUrlValidator.java Tue Oct 12 04:09:48 2010
@@ -24,19 +24,22 @@ import javax.faces.component.UIComponent
 import javax.faces.context.FacesContext;
 import javax.faces.validator.ValidatorException;
 
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFProperty;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFValidator;
+
 /**
  * A custom validator for url format, based upons Jakarta Commons.
  * 
- * @JSFValidator
- *   name = "mcv:validateUrl"
- *   class = "org.apache.myfaces.commons.validator.UrlValidator"
- *   tagClass = "org.apache.myfaces.commons.validator.ValidateUrlTag"
- *   serialuidtag = "6041422002721046221L"
  *
  * @author Fabian Frederick
  *
  * @version $Revision$ $Date$
  */
+@JSFValidator(
+   name = "mcv:validateUrl",
+   clazz = "org.apache.myfaces.commons.validator.UrlValidator",
+   tagClass = "org.apache.myfaces.commons.validator.ValidateUrlTag",
+   serialuidtag = "6041422002721046221L")
 public abstract class AbstractUrlValidator extends ValidatorBase {
 
     /**
@@ -133,8 +136,8 @@ public abstract class AbstractUrlValidat
      * 
      *  If no schemes are provided, default to this set ("http", "https", "ftp").
      * 
-     * @JSFProperty
      */
+    @JSFProperty
     public abstract String getSchemes();
 
     public abstract void setAllow2Slashes(boolean _allow2Slashes);
@@ -142,9 +145,10 @@ public abstract class AbstractUrlValidat
     /**
      *  Allow two slashes in the path component of the URL.
      * 
-     * @JSFProperty
-     *   defaultValue = "false"
+     * 
      */
+    @JSFProperty(
+       defaultValue = "false")
     public abstract boolean isAllow2Slashes();
 
     public abstract void setAllowAllSchemas(boolean _allowAllSchemas);
@@ -153,9 +157,9 @@ public abstract class AbstractUrlValidat
      *  Allows all validly formatted schemes to pass validation instead of 
      *  supplying a set of valid schemes.
      *  
-     * @JSFProperty
-     *   defaultValue = "false"
      */
+    @JSFProperty(
+       defaultValue = "false")
     public abstract boolean isAllowAllSchemas();
 
 }

Modified: myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/EmailValidator.java
URL: http://svn.apache.org/viewvc/myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/EmailValidator.java?rev=1021620&r1=1021619&r2=1021620&view=diff
==============================================================================
--- myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/EmailValidator.java (original)
+++ myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/EmailValidator.java Tue Oct 12 04:09:48 2010
@@ -24,6 +24,7 @@ import javax.faces.context.FacesContext;
 import javax.faces.validator.ValidatorException;
 
 import org.apache.commons.validator.GenericValidator;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFValidator;
 
 
 /**
@@ -31,14 +32,14 @@ import org.apache.commons.validator.Gene
  * 
  * Unless otherwise specified, all attributes accept static values or EL expressions.
  * 
- * @JSFValidator
- *   name = "mcv:validateEmail"
- *   tagClass = "org.apache.myfaces.commons.validator.ValidateEmailTag"
- *   serialuidtag = "6041422002721046221L"
  *   
  * @author mwessendorf (latest modification by $Author$)
  * @version $Revision$ $Date$
  */
+@JSFValidator(
+   name = "mcv:validateEmail",
+   tagClass = "org.apache.myfaces.commons.validator.ValidateEmailTag",
+   serialuidtag = "6041422002721046221L")
 public class EmailValidator extends ValidatorBase {
 
     /**

Modified: myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/ISBNValidator.java
URL: http://svn.apache.org/viewvc/myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/ISBNValidator.java?rev=1021620&r1=1021619&r2=1021620&view=diff
==============================================================================
--- myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/ISBNValidator.java (original)
+++ myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/ISBNValidator.java Tue Oct 12 04:09:48 2010
@@ -23,20 +23,20 @@ import javax.faces.component.UIComponent
 import javax.faces.context.FacesContext;
 import javax.faces.validator.ValidatorException;
 
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFValidator;
 import org.apache.myfaces.commons.util.MessageUtils;
 
 /**
  * A custom validator for isbn codes, based upons Jakarta Commons.
  * 
- * @JSFValidator
- *   name = "mcv:validateISBN"
- *   tagClass = "org.apache.myfaces.commons.validator.ValidateISBNTag"
- *   serialuidtag = "5230653358032218656L"
  *   
  * @author <a href="mailto:matzew@apache.org">Matthias We&szlig;endorf</a> (latest modification by $Author$)
  * @version $Revision$ $Date$
  */
-
+@JSFValidator(
+   name = "mcv:validateISBN",
+   tagClass = "org.apache.myfaces.commons.validator.ValidateISBNTag",
+   serialuidtag = "5230653358032218656L")
 public class ISBNValidator extends ValidatorBase {
 
     /**
@@ -88,4 +88,4 @@ public class ISBNValidator extends Valid
 
     }
 
-}
\ No newline at end of file
+}

Modified: myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/ValidatorBase.java
URL: http://svn.apache.org/viewvc/myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/ValidatorBase.java?rev=1021620&r1=1021619&r2=1021620&view=diff
==============================================================================
--- myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/ValidatorBase.java (original)
+++ myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/ValidatorBase.java Tue Oct 12 04:09:48 2010
@@ -32,15 +32,17 @@ import javax.faces.component.StateHolder
 import javax.faces.context.FacesContext;
 import javax.faces.validator.Validator;
 
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFProperty;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFValidator;
 import org.apache.myfaces.commons.util.MessageUtils;
 
 /**
  * Base validator implementation for Apache MyFaces Commons Validators.
  *
- * @JSFValidator
- *   configExcluded = "true"
- *   tagClass = "org.apache.myfaces.commons.validator.ValidatorBaseTag"
  */
+@JSFValidator(
+   configExcluded = true,
+   tagClass = "org.apache.myfaces.commons.validator.ValidatorBaseTag")
 public abstract class ValidatorBase implements StateHolder, Validator {
 
     private String _summaryMessage = null;
@@ -50,9 +52,9 @@ public abstract class ValidatorBase impl
     /**
      * alternate validation error summary message format string
      * 
-     * @JSFProperty
      * @return  The summary message to be displayed
      */
+    @JSFProperty
     public String getSummaryMessage()
     {
         if (_summaryMessage != null) return _summaryMessage;
@@ -72,10 +74,10 @@ public abstract class ValidatorBase impl
      * alternate validation error detail message format string 
      * (use 'message' and 'detailMessage' alternatively)
      * 
-     * @JSFProperty
      * @return  The message.
      * @deprecated Use getDetailMessage()
      */
+    @JSFProperty
     public String getMessage() {
         return getDetailMessage();
     }
@@ -94,9 +96,9 @@ public abstract class ValidatorBase impl
      * alternate validation error detail message format string 
      * (use 'message' and 'detailMessage' alternatively)
      *
-     * @JSFProperty
      * @return  The detail message.
      */
+    @JSFProperty
     public String getDetailMessage() {
         if (_detailMessage != null) return _detailMessage;
         ValueExpression vb = getValueExpression("detailMessage");