[hibernate-commits] Hibernate SVN: r17427 - beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints and 22 other directories.

[hibernate-commits at lists.jboss.org]

Author: hardy.ferentschik
Date: 2009-08-27 05:47:28 -0400 (Thu, 27 Aug 2009)
New Revision: 17427

Added:
   beanvalidation/trunk/validation-api/src/main/java/javax/validation/Payload.java
Removed:
   beanvalidation/trunk/validation-api/src/main/java/javax/validation/ConstraintPayload.java
Modified:
   beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/AssertFalse.java
   beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/AssertTrue.java
   beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/DecimalMax.java
   beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/DecimalMin.java
   beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Digits.java
   beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Future.java
   beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Max.java
   beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Min.java
   beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/NotNull.java
   beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Null.java
   beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Past.java
   beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Pattern.java
   beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Size.java
   beanvalidation/trunk/validation-api/src/main/java/javax/validation/metadata/ConstraintDescriptor.java
   beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/application/SecurityCheck.java
   beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/ConstraintCompositionTest.java
   beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/FrenchZipcode.java
   beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/FrenchZipcodeWithInvalidOverride.java
   beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/GermanZipcode.java
   beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/Name.java
   beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/NotEmpty.java
   beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/Severity.java
   beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/FirstCompositeConstraint1.java
   beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/FirstCompositeConstraint2.java
   beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/FirstCompositeConstraint3.java
   beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/FirstCompositeConstraint4.java
   beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/SecondCompositeConstraint.java
   beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/SecondCompositeConstraintSingleViolation.java
   beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintdefinition/AlwaysValid.java
   beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/customconstraint/Negative.java
   beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/customconstraint/Positive.java
   beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/ZipCodeCoherenceChecker.java
   beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/groupsequenceisolation/IsAdult.java
   beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/groupsequenceisolation/SafeEncryption.java
   beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/invalidconstraintdefinitions/InvalidConstraintDefinitionsTest.java
   beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/invalidconstraintdefinitions/InvalidDefaultGroup.java
   beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/invalidconstraintdefinitions/InvalidDefaultPayload.java
   beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/invalidconstraintdefinitions/NoGroups.java
   beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/invalidconstraintdefinitions/NoMessage.java
   beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/invalidconstraintdefinitions/ValidInPropertyName.java
   beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/validatorresolution/Ambigious.java
   beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/validatorresolution/CustomConstraint.java
   beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/validatorresolution/PostCodeList.java
   beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/metadata/AccountChecker.java
   beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/metadata/ConstraintDescriptorTest.java
   beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/metadata/NotEmpty.java
   beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/metadata/Severity.java
   beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/NotEmpty.java
   beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/PropertyPathTest.java
   beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/validatorcontext/Dummy.java
   beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validatorfactory/MyConstraint.java
   beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validatorfactory/MySecondConstraint.java
   beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/ConsistentUserInformation.java
   beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/ValidPackage.java
   beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/Length.java
   validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/Length.java
   validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/NotEmpty.java
   validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/metadata/ConstraintDescriptorImpl.java
   validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/StartLessThanEnd.java
   validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/composition/ValidName.java
   validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/composition/ValidNameSingleViolation.java
   validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/util/ReflectionHelperTest.java
Log:
HV-215 - Rename ConstraintPayload to Payload


Deleted: beanvalidation/trunk/validation-api/src/main/java/javax/validation/ConstraintPayload.java
===================================================================
--- beanvalidation/trunk/validation-api/src/main/java/javax/validation/ConstraintPayload.java	2009-08-26 20:34:58 UTC (rev 17426)
+++ beanvalidation/trunk/validation-api/src/main/java/javax/validation/ConstraintPayload.java	2009-08-27 09:47:28 UTC (rev 17427)
@@ -1,15 +0,0 @@
-package javax.validation;
-
-/**
- * Payload type that can be attached to a given
- * constraint declaration.
- * Payloads are typically used to carry on metadata information
- * consumed by a validation client.
- *
- * Use of payloads is not considered portable.
- *
- * @author Emmanuel Bernard
- * @author Gerhard Petracek
- */
-public interface ConstraintPayload {
-}
\ No newline at end of file

Copied: beanvalidation/trunk/validation-api/src/main/java/javax/validation/Payload.java (from rev 17330, beanvalidation/trunk/validation-api/src/main/java/javax/validation/ConstraintPayload.java)
===================================================================
--- beanvalidation/trunk/validation-api/src/main/java/javax/validation/Payload.java	                        (rev 0)
+++ beanvalidation/trunk/validation-api/src/main/java/javax/validation/Payload.java	2009-08-27 09:47:28 UTC (rev 17427)
@@ -0,0 +1,15 @@
+package javax.validation;
+
+/**
+ * Payload type that can be attached to a given
+ * constraint declaration.
+ * Payloads are typically used to carry on metadata information
+ * consumed by a validation client.
+ *
+ * Use of payloads is not considered portable.
+ *
+ * @author Emmanuel Bernard
+ * @author Gerhard Petracek
+ */
+public interface Payload {
+}
\ No newline at end of file


Property changes on: beanvalidation/trunk/validation-api/src/main/java/javax/validation/Payload.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/AssertFalse.java
===================================================================
--- beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/AssertFalse.java	2009-08-26 20:34:58 UTC (rev 17426)
+++ beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/AssertFalse.java	2009-08-27 09:47:28 UTC (rev 17427)
@@ -27,7 +27,7 @@
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 import java.lang.annotation.Target;
 import javax.validation.Constraint;
-import javax.validation.ConstraintPayload;
+import javax.validation.Payload;
 
 /**
  * The annotated element must be false.
@@ -46,7 +46,7 @@
 
 	Class<?>[] groups() default { };
 
-	Class<? extends ConstraintPayload>[] payload() default {};
+	Class<? extends Payload>[] payload() default {};
 
 	/**
 	 * Defines several @AssertFalse annotations on the same element

Modified: beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/AssertTrue.java
===================================================================
--- beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/AssertTrue.java	2009-08-26 20:34:58 UTC (rev 17426)
+++ beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/AssertTrue.java	2009-08-27 09:47:28 UTC (rev 17427)
@@ -24,7 +24,7 @@
 import static java.lang.annotation.ElementType.*;
 import static java.lang.annotation.ElementType.PARAMETER;
 import javax.validation.Constraint;
-import javax.validation.ConstraintPayload;
+import javax.validation.Payload;
 
 /**
  * The annotated element must be true.
@@ -43,7 +43,7 @@
 
 	Class<?>[] groups() default { };
 
-	Class<? extends ConstraintPayload>[] payload() default {};
+	Class<? extends Payload>[] payload() default {};
 
 	/**
 	 * Defines several @AssertTrue annotations on the same element

Modified: beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/DecimalMax.java
===================================================================
--- beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/DecimalMax.java	2009-08-26 20:34:58 UTC (rev 17426)
+++ beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/DecimalMax.java	2009-08-27 09:47:28 UTC (rev 17427)
@@ -24,7 +24,7 @@
 import static java.lang.annotation.ElementType.*;
 import static java.lang.annotation.ElementType.PARAMETER;
 import javax.validation.Constraint;
-import javax.validation.ConstraintPayload;
+import javax.validation.Payload;
 
 /**
  * The annotated element must be a number whose value must be lower or
@@ -54,7 +54,7 @@
 
 	Class<?>[] groups() default { };
 
-	Class<? extends ConstraintPayload>[] payload() default {};
+	Class<? extends Payload>[] payload() default {};
 
 	/**
 	 * The String representation of the max value according to the

Modified: beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/DecimalMin.java
===================================================================
--- beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/DecimalMin.java	2009-08-26 20:34:58 UTC (rev 17426)
+++ beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/DecimalMin.java	2009-08-27 09:47:28 UTC (rev 17427)
@@ -24,7 +24,7 @@
 import static java.lang.annotation.ElementType.*;
 import static java.lang.annotation.ElementType.PARAMETER;
 import javax.validation.Constraint;
-import javax.validation.ConstraintPayload;
+import javax.validation.Payload;
 
 /**
  * The annotated element must be a number whose value must be higher or
@@ -54,7 +54,7 @@
 
 	Class<?>[] groups() default { };
 
-	Class<? extends ConstraintPayload>[] payload() default {};
+	Class<? extends Payload>[] payload() default {};
 
 	/**
 	 * The String representation of the min value according to the

Modified: beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Digits.java
===================================================================
--- beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Digits.java	2009-08-26 20:34:58 UTC (rev 17426)
+++ beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Digits.java	2009-08-27 09:47:28 UTC (rev 17427)
@@ -24,7 +24,7 @@
 import static java.lang.annotation.ElementType.*;
 import static java.lang.annotation.ElementType.PARAMETER;
 import javax.validation.Constraint;
-import javax.validation.ConstraintPayload;
+import javax.validation.Payload;
 
 /**
  * The annotated element must be a number within accepted range
@@ -50,7 +50,7 @@
 
 	Class<?>[] groups() default { };
 
-	Class<? extends ConstraintPayload>[] payload() default {};
+	Class<? extends Payload>[] payload() default {};
 
 	/**
 	 * @return maximum number of integral digits accepted for this number.

Modified: beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Future.java
===================================================================
--- beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Future.java	2009-08-26 20:34:58 UTC (rev 17426)
+++ beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Future.java	2009-08-27 09:47:28 UTC (rev 17427)
@@ -24,7 +24,7 @@
 import static java.lang.annotation.ElementType.*;
 import static java.lang.annotation.ElementType.PARAMETER;
 import javax.validation.Constraint;
-import javax.validation.ConstraintPayload;
+import javax.validation.Payload;
 
 /**
  * The annotated element must be a date in the future.
@@ -51,7 +51,7 @@
 
 	Class<?>[] groups() default { };
 
-	Class<? extends ConstraintPayload>[] payload() default {};
+	Class<? extends Payload>[] payload() default {};
 
 	/**
 	 * Defines several @Future annotations on the same element

Modified: beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Max.java
===================================================================
--- beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Max.java	2009-08-26 20:34:58 UTC (rev 17426)
+++ beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Max.java	2009-08-27 09:47:28 UTC (rev 17427)
@@ -24,7 +24,7 @@
 import static java.lang.annotation.ElementType.*;
 import static java.lang.annotation.ElementType.PARAMETER;
 import javax.validation.Constraint;
-import javax.validation.ConstraintPayload;
+import javax.validation.Payload;
 
 /**
  * The annotated element must be a number whose value must be lower or
@@ -53,7 +53,7 @@
 
 	Class<?>[] groups() default { };
 
-	Class<? extends ConstraintPayload>[] payload() default {};
+	Class<? extends Payload>[] payload() default {};
 
 	/**
 	 * @return value the element must be lower or equal to

Modified: beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Min.java
===================================================================
--- beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Min.java	2009-08-26 20:34:58 UTC (rev 17426)
+++ beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Min.java	2009-08-27 09:47:28 UTC (rev 17427)
@@ -24,7 +24,7 @@
 import static java.lang.annotation.ElementType.*;
 import static java.lang.annotation.ElementType.PARAMETER;
 import javax.validation.Constraint;
-import javax.validation.ConstraintPayload;
+import javax.validation.Payload;
 
 /**
  * The annotated element must be a number whose value must be higher or
@@ -53,7 +53,7 @@
 
 	Class<?>[] groups() default { };
 
-	Class<? extends ConstraintPayload>[] payload() default {};
+	Class<? extends Payload>[] payload() default {};
 
 	/**
 	 * @return value the element must be higher or equal to

Modified: beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/NotNull.java
===================================================================
--- beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/NotNull.java	2009-08-26 20:34:58 UTC (rev 17426)
+++ beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/NotNull.java	2009-08-27 09:47:28 UTC (rev 17427)
@@ -24,7 +24,7 @@
 import static java.lang.annotation.ElementType.*;
 import static java.lang.annotation.ElementType.PARAMETER;
 import javax.validation.Constraint;
-import javax.validation.ConstraintPayload;
+import javax.validation.Payload;
 
 /**
  * The annotated element must not be <code>null</code>.
@@ -41,7 +41,7 @@
 
 	Class<?>[] groups() default { };
 
-	Class<? extends ConstraintPayload>[] payload() default {};
+	Class<? extends Payload>[] payload() default {};
 
 	/**
 	 * Defines several @NotNull annotations on the same element

Modified: beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Null.java
===================================================================
--- beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Null.java	2009-08-26 20:34:58 UTC (rev 17426)
+++ beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Null.java	2009-08-27 09:47:28 UTC (rev 17427)
@@ -24,7 +24,7 @@
 import static java.lang.annotation.ElementType.*;
 import static java.lang.annotation.ElementType.PARAMETER;
 import javax.validation.Constraint;
-import javax.validation.ConstraintPayload;
+import javax.validation.Payload;
 
 /**
  * The annotated element must be null.
@@ -41,7 +41,7 @@
 
 	Class<?>[] groups() default { };
 
-	Class<? extends ConstraintPayload>[] payload() default {};
+	Class<? extends Payload>[] payload() default {};
 
 	/**
 	 * Defines several @Null annotations on the same element

Modified: beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Past.java
===================================================================
--- beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Past.java	2009-08-26 20:34:58 UTC (rev 17426)
+++ beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Past.java	2009-08-27 09:47:28 UTC (rev 17427)
@@ -24,7 +24,7 @@
 import static java.lang.annotation.ElementType.*;
 import static java.lang.annotation.ElementType.PARAMETER;
 import javax.validation.Constraint;
-import javax.validation.ConstraintPayload;
+import javax.validation.Payload;
 
 /**
  * The annotated element must be a date in the past.
@@ -51,7 +51,7 @@
 
 	Class<?>[] groups() default { };
 
-	Class<? extends ConstraintPayload>[] payload() default {};
+	Class<? extends Payload>[] payload() default {};
 
 	/**
 	 * Defines several @Past annotations on the same element

Modified: beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Pattern.java
===================================================================
--- beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Pattern.java	2009-08-26 20:34:58 UTC (rev 17426)
+++ beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Pattern.java	2009-08-27 09:47:28 UTC (rev 17427)
@@ -24,7 +24,7 @@
 import static java.lang.annotation.ElementType.PARAMETER;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 import javax.validation.Constraint;
-import javax.validation.ConstraintPayload;
+import javax.validation.Payload;
 
 /**
  * The annotated String must match the following regular expression.
@@ -63,7 +63,7 @@
 	/**
 	 * @return The payload associated to the constraint
 	 */
-	Class<? extends ConstraintPayload>[] payload() default {};
+	Class<? extends Payload>[] payload() default {};
 
 	/**
 	 * Possible Regexp flags

Modified: beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Size.java
===================================================================
--- beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Size.java	2009-08-26 20:34:58 UTC (rev 17426)
+++ beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Size.java	2009-08-27 09:47:28 UTC (rev 17427)
@@ -24,7 +24,7 @@
 import static java.lang.annotation.ElementType.PARAMETER;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 import javax.validation.Constraint;
-import javax.validation.ConstraintPayload;
+import javax.validation.Payload;
 
 /**
  * The annotated element size must be between the specified boundaries (included).
@@ -49,7 +49,7 @@
 	
 	Class<?>[] groups() default {};
 
-	Class<? extends ConstraintPayload>[] payload() default {};
+	Class<? extends Payload>[] payload() default {};
 
 	/**
 	 * @return size the element must be higher or equal to

Modified: beanvalidation/trunk/validation-api/src/main/java/javax/validation/metadata/ConstraintDescriptor.java
===================================================================
--- beanvalidation/trunk/validation-api/src/main/java/javax/validation/metadata/ConstraintDescriptor.java	2009-08-26 20:34:58 UTC (rev 17426)
+++ beanvalidation/trunk/validation-api/src/main/java/javax/validation/metadata/ConstraintDescriptor.java	2009-08-27 09:47:28 UTC (rev 17427)
@@ -22,7 +22,7 @@
 import java.util.Map;
 import java.util.Set;
 import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintPayload;
+import javax.validation.Payload;
 
 /**
  * Describes a single constraint and its composing constraints.
@@ -55,7 +55,7 @@
 	 *
 	 * @return payload classes hosted on the constraint or an empty set if none.
 	 */
-	Set<Class<ConstraintPayload>> getPayload();
+	Set<Class<Payload>> getPayload();
 
 	/**
 	 * Immutable list of the constraint validation implementation classes.

Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/application/SecurityCheck.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/application/SecurityCheck.java	2009-08-26 20:34:58 UTC (rev 17426)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/application/SecurityCheck.java	2009-08-27 09:47:28 UTC (rev 17427)
@@ -27,7 +27,7 @@
 import javax.validation.Constraint;
 import javax.validation.ConstraintValidator;
 import javax.validation.ConstraintValidatorContext;
-import javax.validation.ConstraintPayload;
+import javax.validation.Payload;
 
 /**
  * @author Hardy Ferentschik
@@ -41,7 +41,7 @@
 
 	public abstract Class<?>[] groups() default { };
 
-	public abstract Class<? extends ConstraintPayload>[] payload() default {};
+	public abstract Class<? extends Payload>[] payload() default {};
 
 	public class SecurityCheckValidator implements ConstraintValidator<SecurityCheck, Object> {
 

Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/ConstraintCompositionTest.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/ConstraintCompositionTest.java	2009-08-26 20:34:58 UTC (rev 17426)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/ConstraintCompositionTest.java	2009-08-27 09:47:28 UTC (rev 17427)
@@ -22,7 +22,7 @@
 import java.util.List;
 import java.util.Set;
 import javax.validation.ConstraintDefinitionException;
-import javax.validation.ConstraintPayload;
+import javax.validation.Payload;
 import javax.validation.ConstraintViolation;
 import javax.validation.UnexpectedTypeException;
 import javax.validation.Validator;
@@ -274,10 +274,10 @@
 		assertCorrectConstraintTypes( constraintViolations, NotNull.class );
 
 		ConstraintViolation<Friend> constraintViolation = constraintViolations.iterator().next();
-		Set<Class<ConstraintPayload>> payloads = constraintViolation.getConstraintDescriptor().getPayload();
+		Set<Class<Payload>> payloads = constraintViolation.getConstraintDescriptor().getPayload();
 
 		assertTrue( payloads.size() == 1, "There should be one payload in the set" );
-		Class<ConstraintPayload> payload = payloads.iterator().next();
+		Class<Payload> payload = payloads.iterator().next();
 		assertTrue( payload.getName().equals( Severity.Warn.class.getName() ), "Unexpected payload" );
 	}
 

Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/FrenchZipcode.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/FrenchZipcode.java	2009-08-26 20:34:58 UTC (rev 17426)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/FrenchZipcode.java	2009-08-27 09:47:28 UTC (rev 17427)
@@ -26,7 +26,7 @@
 import java.lang.annotation.Target;
 import javax.validation.Constraint;
 import javax.validation.OverridesAttribute;
-import javax.validation.ConstraintPayload;
+import javax.validation.Payload;
 import javax.validation.constraints.Pattern;
 import javax.validation.constraints.Size;
 
@@ -47,7 +47,7 @@
 
 	Class<?>[] groups() default { };
 
-	Class<? extends ConstraintPayload>[] payload() default {};
+	Class<? extends Payload>[] payload() default {};
 
 	@OverridesAttribute.List({
 			@OverridesAttribute(constraint = Size.class, name = "min"),

Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/FrenchZipcodeWithInvalidOverride.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/FrenchZipcodeWithInvalidOverride.java	2009-08-26 20:34:58 UTC (rev 17426)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/FrenchZipcodeWithInvalidOverride.java	2009-08-27 09:47:28 UTC (rev 17427)
@@ -26,7 +26,7 @@
 import java.lang.annotation.Target;
 import javax.validation.Constraint;
 import javax.validation.OverridesAttribute;
-import javax.validation.ConstraintPayload;
+import javax.validation.Payload;
 import javax.validation.constraints.Pattern;
 import javax.validation.constraints.Size;
 
@@ -47,7 +47,7 @@
 
 	public abstract Class<?>[] groups() default { };
 
-	public abstract Class<? extends ConstraintPayload>[] payload() default {};
+	public abstract Class<? extends Payload>[] payload() default {};
 
 	@OverridesAttribute.List({
 			@OverridesAttribute(constraint = Size.class, name = "min"),

Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/GermanZipcode.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/GermanZipcode.java	2009-08-26 20:34:58 UTC (rev 17426)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/GermanZipcode.java	2009-08-27 09:47:28 UTC (rev 17427)
@@ -28,7 +28,7 @@
 import javax.validation.ReportAsSingleViolation;
 import javax.validation.ConstraintValidator;
 import javax.validation.ConstraintValidatorContext;
-import javax.validation.ConstraintPayload;
+import javax.validation.Payload;
 
 /**
  * Constraint used to test nested composing constraints.
@@ -46,7 +46,7 @@
 
 	public abstract Class<?>[] groups() default { };
 
-	public abstract Class<? extends ConstraintPayload>[] payload() default {};
+	public abstract Class<? extends Payload>[] payload() default {};
 
 	public class GermanZipcodeConstraintValidator implements ConstraintValidator<GermanZipcode, String> {
 

Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/Name.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/Name.java	2009-08-26 20:34:58 UTC (rev 17426)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/Name.java	2009-08-27 09:47:28 UTC (rev 17427)
@@ -25,7 +25,7 @@
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 import java.lang.annotation.Target;
 import javax.validation.Constraint;
-import javax.validation.ConstraintPayload;
+import javax.validation.Payload;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 
@@ -43,5 +43,5 @@
 
 	Class<?>[] groups() default { };
 
-	Class<? extends ConstraintPayload>[] payload() default { };
+	Class<? extends Payload>[] payload() default { };
 }
\ No newline at end of file

Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/NotEmpty.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/NotEmpty.java	2009-08-26 20:34:58 UTC (rev 17426)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/NotEmpty.java	2009-08-27 09:47:28 UTC (rev 17427)
@@ -27,7 +27,7 @@
 import javax.validation.Constraint;
 import javax.validation.ConstraintValidator;
 import javax.validation.ConstraintValidatorContext;
-import javax.validation.ConstraintPayload;
+import javax.validation.Payload;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 
@@ -45,7 +45,7 @@
 
 	Class<?>[] groups() default { };
 
-	Class<? extends ConstraintPayload>[] payload() default {};
+	Class<? extends Payload>[] payload() default {};
 
 	public class NotEmptyValidator implements ConstraintValidator<NotEmpty, String> {
 

Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/Severity.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/Severity.java	2009-08-26 20:34:58 UTC (rev 17426)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/Severity.java	2009-08-27 09:47:28 UTC (rev 17427)
@@ -17,19 +17,19 @@
 */
 package org.hibernate.jsr303.tck.tests.constraints.constraintcomposition;
 
-import javax.validation.ConstraintPayload;
+import javax.validation.Payload;
 
 /**
  * @author Hardy Ferentschik
  */
 
 public class Severity {
-	public static class Info implements ConstraintPayload {
+	public static class Info implements Payload {
 	}
 
-	public static class Warn implements ConstraintPayload {
+	public static class Warn implements Payload {
 	}
 
-	public static class Error implements ConstraintPayload {
+	public static class Error implements Payload {
 	}
 }

Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/FirstCompositeConstraint1.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/FirstCompositeConstraint1.java	2009-08-26 20:34:58 UTC (rev 17426)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/FirstCompositeConstraint1.java	2009-08-27 09:47:28 UTC (rev 17427)
@@ -1,4 +1,4 @@
-// $Id:$
+// $Id$
 /*
 * JBoss, Home of Professional Open Source
 * Copyright 2008, Red Hat Middleware LLC, and individual contributors
@@ -23,7 +23,7 @@
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 import java.lang.annotation.Target;
 import javax.validation.Constraint;
-import javax.validation.ConstraintPayload;
+import javax.validation.Payload;
 import javax.validation.constraints.Pattern;
 
 /**
@@ -39,5 +39,5 @@
 
 	public abstract Class<?>[] groups() default { };
 
-	public abstract Class<? extends ConstraintPayload>[] payload() default { };
+	public abstract Class<? extends Payload>[] payload() default { };
 }

Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/FirstCompositeConstraint2.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/FirstCompositeConstraint2.java	2009-08-26 20:34:58 UTC (rev 17426)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/FirstCompositeConstraint2.java	2009-08-27 09:47:28 UTC (rev 17427)
@@ -1,4 +1,4 @@
-// $Id:$
+// $Id$
 /*
 * JBoss, Home of Professional Open Source
 * Copyright 2008, Red Hat Middleware LLC, and individual contributors
@@ -24,7 +24,7 @@
 import static java.lang.annotation.ElementType.FIELD;
 import javax.validation.constraints.Pattern;
 import javax.validation.Constraint;
-import javax.validation.ConstraintPayload;
+import javax.validation.Payload;
 import javax.validation.ReportAsSingleViolation;
 
 /**
@@ -41,5 +41,5 @@
 
 	public abstract Class<?>[] groups() default { };
 
-	public abstract Class<? extends ConstraintPayload>[] payload() default { };
+	public abstract Class<? extends Payload>[] payload() default { };
 }
\ No newline at end of file

Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/FirstCompositeConstraint3.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/FirstCompositeConstraint3.java	2009-08-26 20:34:58 UTC (rev 17426)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/FirstCompositeConstraint3.java	2009-08-27 09:47:28 UTC (rev 17427)
@@ -1,4 +1,4 @@
-// $Id:$
+// $Id$
 /*
 * JBoss, Home of Professional Open Source
 * Copyright 2008, Red Hat Middleware LLC, and individual contributors
@@ -24,8 +24,7 @@
 import static java.lang.annotation.ElementType.FIELD;
 import javax.validation.constraints.Pattern;
 import javax.validation.Constraint;
-import javax.validation.ConstraintPayload;
-import javax.validation.ReportAsSingleViolation;
+import javax.validation.Payload;
 
 /**
  * @author Hardy Ferentschik
@@ -40,5 +39,5 @@
 
 	public abstract Class<?>[] groups() default { };
 
-	public abstract Class<? extends ConstraintPayload>[] payload() default { };
+	public abstract Class<? extends Payload>[] payload() default { };
 }
\ No newline at end of file

Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/FirstCompositeConstraint4.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/FirstCompositeConstraint4.java	2009-08-26 20:34:58 UTC (rev 17426)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/FirstCompositeConstraint4.java	2009-08-27 09:47:28 UTC (rev 17427)
@@ -1,4 +1,4 @@
-// $Id:$
+// $Id$
 /*
 * JBoss, Home of Professional Open Source
 * Copyright 2008, Red Hat Middleware LLC, and individual contributors
@@ -24,7 +24,7 @@
 import static java.lang.annotation.ElementType.FIELD;
 import javax.validation.constraints.Pattern;
 import javax.validation.Constraint;
-import javax.validation.ConstraintPayload;
+import javax.validation.Payload;
 import javax.validation.ReportAsSingleViolation;
 
 /**
@@ -41,5 +41,5 @@
 
 	public abstract Class<?>[] groups() default { };
 
-	public abstract Class<? extends ConstraintPayload>[] payload() default { };
+	public abstract Class<? extends Payload>[] payload() default { };
 }
\ No newline at end of file

Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/SecondCompositeConstraint.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/SecondCompositeConstraint.java	2009-08-26 20:34:58 UTC (rev 17426)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/SecondCompositeConstraint.java	2009-08-27 09:47:28 UTC (rev 17427)
@@ -1,4 +1,4 @@
-// $Id:$
+// $Id$
 /*
 * JBoss, Home of Professional Open Source
 * Copyright 2008, Red Hat Middleware LLC, and individual contributors
@@ -24,8 +24,7 @@
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 import java.lang.annotation.Target;
 import javax.validation.Constraint;
-import javax.validation.ConstraintPayload;
-import javax.validation.ReportAsSingleViolation;
+import javax.validation.Payload;
 import javax.validation.constraints.Pattern;
 import javax.validation.constraints.Size;
 
@@ -42,5 +41,5 @@
 
 	public abstract Class<?>[] groups() default { };
 
-	public abstract Class<? extends ConstraintPayload>[] payload() default { };
+	public abstract Class<? extends Payload>[] payload() default { };
 }
\ No newline at end of file

Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/SecondCompositeConstraintSingleViolation.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/SecondCompositeConstraintSingleViolation.java	2009-08-26 20:34:58 UTC (rev 17426)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/SecondCompositeConstraintSingleViolation.java	2009-08-27 09:47:28 UTC (rev 17427)
@@ -1,4 +1,4 @@
-// $Id:$
+// $Id$
 /*
 * JBoss, Home of Professional Open Source
 * Copyright 2008, Red Hat Middleware LLC, and individual contributors
@@ -24,7 +24,7 @@
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 import java.lang.annotation.Target;
 import javax.validation.Constraint;
-import javax.validation.ConstraintPayload;
+import javax.validation.Payload;
 import javax.validation.ReportAsSingleViolation;
 import javax.validation.constraints.Pattern;
 import javax.validation.constraints.Size;
@@ -43,5 +43,5 @@
 
 	public abstract Class<?>[] groups() default { };
 
-	public abstract Class<? extends ConstraintPayload>[] payload() default { };
+	public abstract Class<? extends Payload>[] payload() default { };
 }
\ No newline at end of file

Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintdefinition/AlwaysValid.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintdefinition/AlwaysValid.java	2009-08-26 20:34:58 UTC (rev 17426)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintdefinition/AlwaysValid.java	2009-08-27 09:47:28 UTC (rev 17427)
@@ -27,7 +27,7 @@
 import javax.validation.Constraint;
 import javax.validation.ConstraintValidator;
 import javax.validation.ConstraintValidatorContext;
-import javax.validation.ConstraintPayload;
+import javax.validation.Payload;
 
 /**
  * @author Hardy Ferentschik
@@ -43,7 +43,7 @@
 
 	public abstract boolean alwaysValid();
 
-	public abstract Class<? extends ConstraintPayload>[] payload() default {};
+	public abstract Class<? extends Payload>[] payload() default {};
 
 	public class StaticConstraintValidator implements ConstraintValidator<AlwaysValid, Object> {
 

Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/customconstraint/Negative.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/customconstraint/Negative.java	2009-08-26 20:34:58 UTC (rev 17426)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/customconstraint/Negative.java	2009-08-27 09:47:28 UTC (rev 17427)
@@ -25,7 +25,7 @@
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 import java.lang.annotation.Target;
 import javax.validation.Constraint;
-import javax.validation.ConstraintPayload;
+import javax.validation.Payload;
 
 /**
  * @author Emmanuel Bernard
@@ -39,5 +39,5 @@
 
 	public abstract Class<?>[] groups() default { };
 
-	public abstract Class<? extends ConstraintPayload>[] payload() default { };
+	public abstract Class<? extends Payload>[] payload() default { };
 }
\ No newline at end of file

Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/customconstraint/Positive.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/customconstraint/Positive.java	2009-08-26 20:34:58 UTC (rev 17426)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/customconstraint/Positive.java	2009-08-27 09:47:28 UTC (rev 17427)
@@ -25,7 +25,7 @@
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 import java.lang.annotation.Target;
 import javax.validation.Constraint;
-import javax.validation.ConstraintPayload;
+import javax.validation.Payload;
 
 /**
  * @author Emmanuel Bernard
@@ -39,5 +39,5 @@
 
 	public abstract Class<?>[] groups() default { };
 
-	public abstract Class<? extends ConstraintPayload>[] payload() default { };
+	public abstract Class<? extends Payload>[] payload() default { };
 }
\ No newline at end of file

Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/ZipCodeCoherenceChecker.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/ZipCodeCoherenceChecker.java	2009-08-26 20:34:58 UTC (rev 17426)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/ZipCodeCoherenceChecker.java	2009-08-27 09:47:28 UTC (rev 17427)
@@ -24,7 +24,7 @@
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 import java.lang.annotation.Target;
 import javax.validation.Constraint;
-import javax.validation.ConstraintPayload;
+import javax.validation.Payload;
 
 /**
  * @author Emmanuel Bernard
@@ -38,5 +38,5 @@
 
 	public abstract Class<?>[] groups() default { };
 
-	public abstract Class<? extends ConstraintPayload>[] payload() default { };
+	public abstract Class<? extends Payload>[] payload() default { };
 }
\ No newline at end of file

Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/groupsequenceisolation/IsAdult.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/groupsequenceisolation/IsAdult.java	2009-08-26 20:34:58 UTC (rev 17426)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/groupsequenceisolation/IsAdult.java	2009-08-27 09:47:28 UTC (rev 17427)
@@ -27,7 +27,7 @@
 import javax.validation.Constraint;
 import javax.validation.ConstraintValidator;
 import javax.validation.ConstraintValidatorContext;
-import javax.validation.ConstraintPayload;
+import javax.validation.Payload;
 
 /**
  * @author Hardy Ferentschik
@@ -41,7 +41,7 @@
 
 	public abstract Class<?>[] groups() default { };
 
-	public abstract Class<? extends ConstraintPayload>[] payload() default {};
+	public abstract Class<? extends Payload>[] payload() default {};
 
 
 	public class IsAdultValidator implements ConstraintValidator<IsAdult, Integer> {

Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/groupsequenceisolation/SafeEncryption.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/groupsequenceisolation/SafeEncryption.java	2009-08-26 20:34:58 UTC (rev 17426)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/groupsequenceisolation/SafeEncryption.java	2009-08-27 09:47:28 UTC (rev 17427)
@@ -25,7 +25,7 @@
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 import java.lang.annotation.Target;
 import javax.validation.Constraint;
-import javax.validation.ConstraintPayload;
+import javax.validation.Payload;
 import javax.validation.ConstraintValidator;
 import javax.validation.ConstraintValidatorContext;
 
@@ -41,7 +41,7 @@
 
 	public abstract Class<?>[] groups() default { };
 
-	public abstract Class<? extends ConstraintPayload>[] payload() default { };
+	public abstract Class<? extends Payload>[] payload() default { };
 
 	public class SafeEncryptionValidator implements ConstraintValidator<SafeEncryption, String> {
 		public void initialize(SafeEncryption parameters) {

Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/invalidconstraintdefinitions/InvalidConstraintDefinitionsTest.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/invalidconstraintdefinitions/InvalidConstraintDefinitionsTest.java	2009-08-26 20:34:58 UTC (rev 17426)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/invalidconstraintdefinitions/InvalidConstraintDefinitionsTest.java	2009-08-27 09:47:28 UTC (rev 17427)
@@ -152,7 +152,7 @@
 		try {
 			Validator validator = TestUtil.getValidatorUnderTest();
 			validator.validate( new DummyEntityInvalidPayloadClass() );
-			fail( "The default payload parameter has to be of type Class<? extends ConstraintPayload>[]. The validation should have failed." );
+			fail( "The default payload parameter has to be of type Class<? extends Payload>[]. The validation should have failed." );
 		}
 		catch ( ConstraintDefinitionException e ) {
 			// success

Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/invalidconstraintdefinitions/InvalidDefaultGroup.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/invalidconstraintdefinitions/InvalidDefaultGroup.java	2009-08-26 20:34:58 UTC (rev 17426)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/invalidconstraintdefinitions/InvalidDefaultGroup.java	2009-08-27 09:47:28 UTC (rev 17427)
@@ -25,7 +25,7 @@
 import javax.validation.Constraint;
 import javax.validation.ConstraintValidator;
 import javax.validation.ConstraintValidatorContext;
-import javax.validation.ConstraintPayload;
+import javax.validation.Payload;
 import javax.validation.groups.Default;
 
 /**
@@ -40,7 +40,7 @@
 
 	public abstract Class<?>[] groups() default Default.class;
 
-	public abstract Class<? extends ConstraintPayload>[] payload() default {};
+	public abstract Class<? extends Payload>[] payload() default {};
 
 	public class InvalidDefaultGroupValidator implements ConstraintValidator<InvalidDefaultGroup, Object> {
 

Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/invalidconstraintdefinitions/InvalidDefaultPayload.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/invalidconstraintdefinitions/InvalidDefaultPayload.java	2009-08-26 20:34:58 UTC (rev 17426)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/invalidconstraintdefinitions/InvalidDefaultPayload.java	2009-08-27 09:47:28 UTC (rev 17427)
@@ -23,7 +23,7 @@
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 import java.lang.annotation.Target;
 import javax.validation.Constraint;
-import javax.validation.ConstraintPayload;
+import javax.validation.Payload;
 import javax.validation.ConstraintValidator;
 import javax.validation.ConstraintValidatorContext;
 
@@ -39,9 +39,9 @@
 
 	public abstract Class<?>[] groups() default { };
 
-	public abstract Class<? extends ConstraintPayload>[] payload() default DummyPayload.class;
+	public abstract Class<? extends Payload>[] payload() default DummyPayload.class;
 
-	public class DummyPayload implements ConstraintPayload {
+	public class DummyPayload implements Payload {
 
 	}
 

Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/invalidconstraintdefinitions/NoGroups.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/invalidconstraintdefinitions/NoGroups.java	2009-08-26 20:34:58 UTC (rev 17426)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/invalidconstraintdefinitions/NoGroups.java	2009-08-27 09:47:28 UTC (rev 17427)
@@ -23,7 +23,7 @@
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 import java.lang.annotation.Target;
 import javax.validation.Constraint;
-import javax.validation.ConstraintPayload;
+import javax.validation.Payload;
 import javax.validation.ConstraintValidator;
 import javax.validation.ConstraintValidatorContext;
 
@@ -37,7 +37,7 @@
 public @interface NoGroups {
 	String message() default "default message";
 
-	Class<? extends ConstraintPayload>[] payload() default { };
+	Class<? extends Payload>[] payload() default { };
 
 	public class NoGroupsValidator implements ConstraintValidator<NoGroups, Object> {
 

Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/invalidconstraintdefinitions/NoMessage.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/invalidconstraintdefinitions/NoMessage.java	2009-08-26 20:34:58 UTC (rev 17426)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/invalidconstraintdefinitions/NoMessage.java	2009-08-27 09:47:28 UTC (rev 17427)
@@ -23,7 +23,7 @@
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 import java.lang.annotation.Target;
 import javax.validation.Constraint;
-import javax.validation.ConstraintPayload;
+import javax.validation.Payload;
 import javax.validation.ConstraintValidator;
 import javax.validation.ConstraintValidatorContext;
 
@@ -37,7 +37,7 @@
 public @interface NoMessage {
 	Class<?>[] groups() default { };
 
-	Class<? extends ConstraintPayload>[] payload() default { };
+	Class<? extends Payload>[] payload() default { };
 
 	public class NoMessageValidator implements ConstraintValidator<NoMessage, Object> {
 

Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/invalidconstraintdefinitions/ValidInPropertyName.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/invalidconstraintdefinitions/ValidInPropertyName.java	2009-08-26 20:34:58 UTC (rev 17426)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/invalidconstraintdefinitions/ValidInPropertyName.java	2009-08-27 09:47:28 UTC (rev 17427)
@@ -23,7 +23,7 @@
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 import java.lang.annotation.Target;
 import javax.validation.Constraint;
-import javax.validation.ConstraintPayload;
+import javax.validation.Payload;
 import javax.validation.ConstraintValidator;
 import javax.validation.ConstraintValidatorContext;
 
@@ -39,7 +39,7 @@
 
 	Class<?>[] groups() default { };
 
-	Class<? extends ConstraintPayload>[] payload() default { };
+	Class<? extends Payload>[] payload() default { };
 
 	int validLength() default 0;
 

Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/validatorresolution/Ambigious.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/validatorresolution/Ambigious.java	2009-08-26 20:34:58 UTC (rev 17426)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/validatorresolution/Ambigious.java	2009-08-27 09:47:28 UTC (rev 17427)
@@ -28,7 +28,7 @@
 import javax.validation.Constraint;
 import javax.validation.ConstraintValidator;
 import javax.validation.ConstraintValidatorContext;
-import javax.validation.ConstraintPayload;
+import javax.validation.Payload;
 
 /**
  * A test constraint which can lead to a error when trying to reslove the validator.
@@ -46,7 +46,7 @@
 
 	public abstract Class<?>[] groups() default { };
 
-	public abstract Class<? extends ConstraintPayload>[] payload() default {};
+	public abstract Class<? extends Payload>[] payload() default {};
 
 
 	public class AmbigiousValidatorForBar implements ConstraintValidator<Ambigious, Bar> {

Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/validatorresolution/CustomConstraint.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/validatorresolution/CustomConstraint.java	2009-08-26 20:34:58 UTC (rev 17426)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/validatorresolution/CustomConstraint.java	2009-08-27 09:47:28 UTC (rev 17427)
@@ -25,7 +25,7 @@
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 import java.lang.annotation.Target;
 import javax.validation.Constraint;
-import javax.validation.ConstraintPayload;
+import javax.validation.Payload;
 import javax.validation.ConstraintValidator;
 import javax.validation.ConstraintValidatorContext;
 
@@ -49,7 +49,7 @@
 
 	public abstract Class<?>[] groups() default { };
 
-	public abstract Class<? extends ConstraintPayload>[] payload() default { };
+	public abstract Class<? extends Payload>[] payload() default { };
 
 
 	public class ValidatorBaseClass implements ConstraintValidator<CustomConstraint, BaseClass> {

Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/validatorresolution/PostCodeList.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/validatorresolution/PostCodeList.java	2009-08-26 20:34:58 UTC (rev 17426)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/validatorresolution/PostCodeList.java	2009-08-27 09:47:28 UTC (rev 17427)
@@ -28,7 +28,7 @@
 import javax.validation.Constraint;
 import javax.validation.ConstraintValidator;
 import javax.validation.ConstraintValidatorContext;
-import javax.validation.ConstraintPayload;
+import javax.validation.Payload;
 
 /**
  * A test constraint which can lead to a error when trying to reslove the validator.
@@ -46,7 +46,7 @@
 
 	public abstract Class<?>[] groups() default { };
 
-	public abstract Class<? extends ConstraintPayload>[] payload() default {};
+	public abstract Class<? extends Payload>[] payload() default {};
 
 	public class PostCodeListValidatorForNumber
 			implements ConstraintValidator<PostCodeList, Collection<? extends Number>> {

Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/metadata/AccountChecker.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/metadata/AccountChecker.java	2009-08-26 20:34:58 UTC (rev 17426)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/metadata/AccountChecker.java	2009-08-27 09:47:28 UTC (rev 17427)
@@ -25,7 +25,7 @@
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 import java.lang.annotation.Target;
 import javax.validation.Constraint;
-import javax.validation.ConstraintPayload;
+import javax.validation.Payload;
 
 /**
  * @author Hardy Ferentschik
@@ -40,5 +40,5 @@
 
 	public abstract Class<?>[] groups() default { };
 
-	public abstract Class<? extends ConstraintPayload>[] payload() default {};
+	public abstract Class<? extends Payload>[] payload() default {};
 }

Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/metadata/ConstraintDescriptorTest.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/metadata/ConstraintDescriptorTest.java	2009-08-26 20:34:58 UTC (rev 17426)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/metadata/ConstraintDescriptorTest.java	2009-08-27 09:47:28 UTC (rev 17427)
@@ -19,7 +19,7 @@
 
 import java.util.Map;
 import java.util.Set;
-import javax.validation.ConstraintPayload;
+import javax.validation.Payload;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 import javax.validation.groups.Default;
@@ -153,7 +153,7 @@
 	@SpecAssertion(section = "5.5", id = "g")
 	public void testPayload() {
 		ConstraintDescriptor<?> descriptor = getConstraintDescriptor( Person.class, "firstName" );
-		Set<Class<ConstraintPayload>> payload = descriptor.getPayload();
+		Set<Class<Payload>> payload = descriptor.getPayload();
 		assertTrue( payload.size() == 1 );
 		assertEquals( payload.iterator().next(), Severity.Info.class, "Wrong payload" );
 

Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/metadata/NotEmpty.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/metadata/NotEmpty.java	2009-08-26 20:34:58 UTC (rev 17426)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/metadata/NotEmpty.java	2009-08-27 09:47:28 UTC (rev 17427)
@@ -24,7 +24,7 @@
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 import java.lang.annotation.Target;
 import javax.validation.Constraint;
-import javax.validation.ConstraintPayload;
+import javax.validation.Payload;
 import javax.validation.OverridesAttribute;
 import javax.validation.ReportAsSingleViolation;
 import javax.validation.constraints.NotNull;
@@ -45,7 +45,7 @@
 
 	public abstract Class<?>[] groups() default { };
 
-	public abstract Class<? extends ConstraintPayload>[] payload() default { };
+	public abstract Class<? extends Payload>[] payload() default { };
 
 	@OverridesAttribute(constraint = Size.class, name = "min")
 	public abstract int min() default 5;

Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/metadata/Severity.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/metadata/Severity.java	2009-08-26 20:34:58 UTC (rev 17426)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/metadata/Severity.java	2009-08-27 09:47:28 UTC (rev 17427)
@@ -17,11 +17,11 @@
 */
 package org.hibernate.jsr303.tck.tests.metadata;
 
-import javax.validation.ConstraintPayload;
+import javax.validation.Payload;
 
 /**
  * @author Emmanuel Bernard
  */
 public interface Severity {
-	interface Info extends ConstraintPayload {}
+	interface Info extends Payload {}
 }

Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/NotEmpty.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/NotEmpty.java	2009-08-26 20:34:58 UTC (rev 17426)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/NotEmpty.java	2009-08-27 09:47:28 UTC (rev 17427)
@@ -24,7 +24,7 @@
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 import java.lang.annotation.Target;
 import javax.validation.Constraint;
-import javax.validation.ConstraintPayload;
+import javax.validation.Payload;
 import javax.validation.OverridesAttribute;
 import javax.validation.ReportAsSingleViolation;
 import javax.validation.constraints.NotNull;
@@ -45,7 +45,7 @@
 
 	public abstract Class<?>[] groups() default { };
 
-	public abstract Class<? extends ConstraintPayload>[] payload() default { };
+	public abstract Class<? extends Payload>[] payload() default { };
 
 	@OverridesAttribute(constraint = Size.class, name = "min")
 	public abstract int min() default 5;

Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/PropertyPathTest.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/PropertyPathTest.java	2009-08-26 20:34:58 UTC (rev 17426)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/PropertyPathTest.java	2009-08-27 09:47:28 UTC (rev 17427)
@@ -26,7 +26,7 @@
 import java.util.Map;
 import java.util.Set;
 import javax.validation.Constraint;
-import javax.validation.ConstraintPayload;
+import javax.validation.Payload;
 import javax.validation.ConstraintValidator;
 import javax.validation.ConstraintValidatorContext;
 import javax.validation.ConstraintViolation;
@@ -242,7 +242,7 @@
 
 		public abstract Class<?>[] groups() default { };
 
-		public abstract Class<? extends ConstraintPayload>[] payload() default { };
+		public abstract Class<? extends Payload>[] payload() default { };
 	}
 
 	public static class SpecialValidator implements ConstraintValidator<Special, VerySpecialClass> {

Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/validatorcontext/Dummy.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/validatorcontext/Dummy.java	2009-08-26 20:34:58 UTC (rev 17426)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/validatorcontext/Dummy.java	2009-08-27 09:47:28 UTC (rev 17427)
@@ -24,7 +24,7 @@
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 import java.lang.annotation.Target;
 import javax.validation.Constraint;
-import javax.validation.ConstraintPayload;
+import javax.validation.Payload;
 
 /**
  * @author Hardy Ferentschik
@@ -38,5 +38,5 @@
 
 	Class<?>[] groups() default { };
 
-	Class<? extends ConstraintPayload>[] payload() default { };
+	Class<? extends Payload>[] payload() default { };
 }
\ No newline at end of file

Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validatorfactory/MyConstraint.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validatorfactory/MyConstraint.java	2009-08-26 20:34:58 UTC (rev 17426)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validatorfactory/MyConstraint.java	2009-08-27 09:47:28 UTC (rev 17427)
@@ -25,7 +25,7 @@
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 import java.lang.annotation.Target;
 import javax.validation.Constraint;
-import javax.validation.ConstraintPayload;
+import javax.validation.Payload;
 
 /**
  * @author Hardy Ferentschik
@@ -39,5 +39,5 @@
 
 	public abstract Class<?>[] groups() default { };
 
-	public abstract Class<? extends ConstraintPayload>[] payload() default {};
+	public abstract Class<? extends Payload>[] payload() default {};
 }
\ No newline at end of file

Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validatorfactory/MySecondConstraint.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validatorfactory/MySecondConstraint.java	2009-08-26 20:34:58 UTC (rev 17426)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validatorfactory/MySecondConstraint.java	2009-08-27 09:47:28 UTC (rev 17427)
@@ -25,7 +25,7 @@
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 import java.lang.annotation.Target;
 import javax.validation.Constraint;
-import javax.validation.ConstraintPayload;
+import javax.validation.Payload;
 
 /**
  * @author Hardy Ferentschik
@@ -39,5 +39,5 @@
 
 	public abstract Class<?>[] groups() default { };
 
-	public abstract Class<? extends ConstraintPayload>[] payload() default { };
+	public abstract Class<? extends Payload>[] payload() default { };
 }
\ No newline at end of file

Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/ConsistentUserInformation.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/ConsistentUserInformation.java	2009-08-26 20:34:58 UTC (rev 17426)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/ConsistentUserInformation.java	2009-08-27 09:47:28 UTC (rev 17427)
@@ -25,7 +25,7 @@
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 import java.lang.annotation.Target;
 import javax.validation.Constraint;
-import javax.validation.ConstraintPayload;
+import javax.validation.Payload;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Pattern;
 
@@ -42,7 +42,7 @@
 
 	public abstract Class<?>[] groups() default { };
 
-	public abstract Class<? extends ConstraintPayload>[] payload() default { };
+	public abstract Class<? extends Payload>[] payload() default { };
 
 	public abstract String stringParam() default "";
 

Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/ValidPackage.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/ValidPackage.java	2009-08-26 20:34:58 UTC (rev 17426)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/ValidPackage.java	2009-08-27 09:47:28 UTC (rev 17427)
@@ -25,7 +25,7 @@
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 import java.lang.annotation.Target;
 import javax.validation.Constraint;
-import javax.validation.ConstraintPayload;
+import javax.validation.Payload;
 import javax.validation.ConstraintValidator;
 import javax.validation.ConstraintValidatorContext;
 
@@ -42,7 +42,7 @@
 
 	public abstract Class<?>[] groups() default { };
 
-	public abstract Class<? extends ConstraintPayload>[] payload() default { };
+	public abstract Class<? extends Payload>[] payload() default { };
 
 	public class ValidPackageValidator implements ConstraintValidator<ValidPackage, Package> {
 

Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/Length.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/Length.java	2009-08-26 20:34:58 UTC (rev 17426)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/Length.java	2009-08-27 09:47:28 UTC (rev 17427)
@@ -25,7 +25,7 @@
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 import java.lang.annotation.Target;
 import javax.validation.Constraint;
-import javax.validation.ConstraintPayload;
+import javax.validation.Payload;
 
 /**
  * Validate that the string is between min and max included
@@ -46,5 +46,5 @@
 
 	public abstract Class<?>[] groups() default { };
 
-	Class<? extends ConstraintPayload>[] payload() default { };
+	Class<? extends Payload>[] payload() default { };
 }
\ No newline at end of file

Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/Length.java
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/Length.java	2009-08-26 20:34:58 UTC (rev 17426)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/Length.java	2009-08-27 09:47:28 UTC (rev 17427)
@@ -25,7 +25,7 @@
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 import java.lang.annotation.Target;
 import javax.validation.Constraint;
-import javax.validation.ConstraintPayload;
+import javax.validation.Payload;
 
 import org.hibernate.validator.constraints.impl.LengthValidator;
 
@@ -48,5 +48,5 @@
 
 	Class<?>[] groups() default { };
 
-	Class<? extends ConstraintPayload>[] payload() default { };
+	Class<? extends Payload>[] payload() default { };
 }

Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/NotEmpty.java
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/NotEmpty.java	2009-08-26 20:34:58 UTC (rev 17426)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/NotEmpty.java	2009-08-27 09:47:28 UTC (rev 17427)
@@ -24,7 +24,7 @@
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 import java.lang.annotation.Target;
 import javax.validation.Constraint;
-import javax.validation.ConstraintPayload;
+import javax.validation.Payload;
 import javax.validation.ReportAsSingleViolation;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
@@ -44,5 +44,5 @@
 
 	Class<?>[] groups() default { };
 
-	Class<? extends ConstraintPayload>[] payload() default { };
+	Class<? extends Payload>[] payload() default { };
 }
\ No newline at end of file

Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/metadata/ConstraintDescriptorImpl.java
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/metadata/ConstraintDescriptorImpl.java	2009-08-26 20:34:58 UTC (rev 17426)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/metadata/ConstraintDescriptorImpl.java	2009-08-27 09:47:28 UTC (rev 17427)
@@ -31,7 +31,7 @@
 import java.util.Set;
 import javax.validation.Constraint;
 import javax.validation.ConstraintDefinitionException;
-import javax.validation.ConstraintPayload;
+import javax.validation.Payload;
 import javax.validation.ConstraintValidator;
 import javax.validation.OverridesAttribute;
 import javax.validation.ReportAsSingleViolation;
@@ -83,7 +83,7 @@
 	 */
 	private final Map<String, Object> attributes;
 
-	private final Set<Class<ConstraintPayload>> payloads;
+	private final Set<Class<Payload>> payloads;
 
 	/**
 	 * The composing constraints for this constraints.
@@ -120,11 +120,11 @@
 		this( annotation, constraintHelper, null );
 	}
 
-	private Set<Class<ConstraintPayload>> buildPayloadSet(T annotation) {
-		Set<Class<ConstraintPayload>> payloadSet = new HashSet<Class<ConstraintPayload>>();
-		Class<ConstraintPayload>[] payloadFromAnnotation;
+	private Set<Class<Payload>> buildPayloadSet(T annotation) {
+		Set<Class<Payload>> payloadSet = new HashSet<Class<Payload>>();
+		Class<Payload>[] payloadFromAnnotation;
 		try {
-			//TODO be extra safe and make sure this is an array of ConstraintPayload
+			//TODO be extra safe and make sure this is an array of Payload
 			GetAnnotationParameter<Class[]> action = GetAnnotationParameter.action(
 					annotation, PAYLOAD, Class[].class
 			);
@@ -216,7 +216,7 @@
 		return groups;
 	}
 
-	public Set<Class<ConstraintPayload>> getPayload() {
+	public Set<Class<Payload>> getPayload() {
 		return payloads;
 	}
 

Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/StartLessThanEnd.java
===================================================================
--- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/StartLessThanEnd.java	2009-08-26 20:34:58 UTC (rev 17426)
+++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/StartLessThanEnd.java	2009-08-27 09:47:28 UTC (rev 17427)
@@ -1,4 +1,4 @@
-// $Id:$
+// $Id$
 /*
 * JBoss, Home of Professional Open Source
 * Copyright 2008, Red Hat Middleware LLC, and individual contributors
@@ -22,7 +22,7 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 import javax.validation.Constraint;
-import javax.validation.ConstraintPayload;
+import javax.validation.Payload;
 
 
 /**
@@ -36,6 +36,6 @@
 
 	Class<?>[] groups() default { };
 
-	Class<? extends ConstraintPayload>[] payload() default { };
+	Class<? extends Payload>[] payload() default { };
 }
 

Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/composition/ValidName.java
===================================================================
--- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/composition/ValidName.java	2009-08-26 20:34:58 UTC (rev 17426)
+++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/composition/ValidName.java	2009-08-27 09:47:28 UTC (rev 17427)
@@ -1,4 +1,4 @@
-// $Id:$
+// $Id$
 /*
 * JBoss, Home of Professional Open Source
 * Copyright 2008, Red Hat Middleware LLC, and individual contributors
@@ -23,7 +23,7 @@
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 import java.lang.annotation.Target;
 import javax.validation.Constraint;
-import javax.validation.ConstraintPayload;
+import javax.validation.Payload;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 
@@ -43,5 +43,5 @@
 
 	public abstract Class<?>[] groups() default { };
 
-	public abstract Class<? extends ConstraintPayload>[] payload() default { };
+	public abstract Class<? extends Payload>[] payload() default { };
 }
\ No newline at end of file

Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/composition/ValidNameSingleViolation.java
===================================================================
--- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/composition/ValidNameSingleViolation.java	2009-08-26 20:34:58 UTC (rev 17426)
+++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/composition/ValidNameSingleViolation.java	2009-08-27 09:47:28 UTC (rev 17427)
@@ -1,4 +1,4 @@
-// $Id:$
+// $Id$
 /*
 * JBoss, Home of Professional Open Source
 * Copyright 2008, Red Hat Middleware LLC, and individual contributors
@@ -23,7 +23,7 @@
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 import java.lang.annotation.Target;
 import javax.validation.Constraint;
-import javax.validation.ConstraintPayload;
+import javax.validation.Payload;
 import javax.validation.ReportAsSingleViolation;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
@@ -45,5 +45,5 @@
 
 	Class<?>[] groups() default { };
 
-	Class<? extends ConstraintPayload>[] payload() default { };
+	Class<? extends Payload>[] payload() default { };
 }

Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/util/ReflectionHelperTest.java
===================================================================
--- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/util/ReflectionHelperTest.java	2009-08-26 20:34:58 UTC (rev 17426)
+++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/util/ReflectionHelperTest.java	2009-08-27 09:47:28 UTC (rev 17427)
@@ -27,7 +27,7 @@
 import java.util.Map;
 import java.util.SortedMap;
 import java.util.TreeSet;
-import javax.validation.ConstraintPayload;
+import javax.validation.Payload;
 import javax.validation.ValidationException;
 import javax.validation.constraints.NotNull;
 import javax.validation.groups.Default;
@@ -133,9 +133,9 @@
 				return new Class<?>[] { Default.class };
 			}
 
-			public Class<? extends ConstraintPayload>[] payload() {
+			public Class<? extends Payload>[] payload() {
 				@SuppressWarnings("unchecked")
-				Class<? extends ConstraintPayload>[] classes = new Class[] { };
+				Class<? extends Payload>[] classes = new Class[] { };
 				return classes;
 			}