Author: epbernard Date: 2009-06-10 14:21:29 -0400 (Wed, 10 Jun 2009) New Revision: 16743 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 validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/Length.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/NotEmpty.java validator/trunk/hibernate-validator/src/main/resources/org/hibernate/validation/ValidationMessages.properties validator/trunk/hibernate-validator/src/main/resources/org/hibernate/validation/ValidationMessages_de.properties validator/trunk/hibernate-validator/src/main/resources/org/hibernate/validation/ValidationMessages_fr.properties validator/trunk/hibernate-validator/src/test/resources/ValidationMessages_es.properties Log: BVAL-160 rename message template key as [f.q.c.n of the constraint].message 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-06-10 17:18:13 UTC (rev 16742) +++ beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/AssertFalse.java 2009-06-10 18:21:29 UTC (rev 16743) @@ -39,7 +39,7 @@ @Documented @Constraint(validatedBy = {}) public @interface AssertFalse { - String message() default "{constraint.assertFalse}"; + String message() default "{javax.validation.constraints.AssertFalse.message}"; Class<?>[] groups() default { }; 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-06-10 17:18:13 UTC (rev 16742) +++ beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/AssertTrue.java 2009-06-10 18:21:29 UTC (rev 16743) @@ -39,7 +39,7 @@ @Documented @Constraint(validatedBy = {}) public @interface AssertTrue { - String message() default "{constraint.assertTrue}"; + String message() default "{javax.validation.constraints.AssertTrue.message}"; Class<?>[] groups() default { }; 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-06-10 17:18:13 UTC (rev 16742) +++ beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/DecimalMax.java 2009-06-10 18:21:29 UTC (rev 16743) @@ -50,7 +50,7 @@ @Documented @Constraint(validatedBy = {}) public @interface DecimalMax { - String message() default "{constraint.decimalmax}"; + String message() default "{javax.validation.constraints.DecimalMax.message}"; Class<?>[] groups() default { }; 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-06-10 17:18:13 UTC (rev 16742) +++ beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/DecimalMin.java 2009-06-10 18:21:29 UTC (rev 16743) @@ -50,7 +50,7 @@ @Documented @Constraint(validatedBy = {}) public @interface DecimalMin { - String message() default "{constraint.decimalmin}"; + String message() default "{javax.validation.constraints.DecimalMin.message}"; Class<?>[] groups() default { }; 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-06-10 17:18:13 UTC (rev 16742) +++ beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Digits.java 2009-06-10 18:21:29 UTC (rev 16743) @@ -47,7 +47,7 @@ @Documented @Constraint(validatedBy = {}) public @interface Digits { - String message() default "{constraint.digits}"; + String message() default "{javax.validation.constraints.Digits.message}"; Class<?>[] groups() default { }; 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-06-10 17:18:13 UTC (rev 16742) +++ beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Future.java 2009-06-10 18:21:29 UTC (rev 16743) @@ -47,7 +47,7 @@ @Documented @Constraint(validatedBy = {}) public @interface Future { - String message() default "{constraint.future}"; + String message() default "{javax.validation.constraints.Future.message}"; Class<?>[] groups() default { }; 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-06-10 17:18:13 UTC (rev 16742) +++ beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Max.java 2009-06-10 18:21:29 UTC (rev 16743) @@ -49,7 +49,7 @@ @Documented @Constraint(validatedBy = {}) public @interface Max { - String message() default "{constraint.max}"; + String message() default "{javax.validation.constraints.Max.message}"; Class<?>[] groups() default { }; 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-06-10 17:18:13 UTC (rev 16742) +++ beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Min.java 2009-06-10 18:21:29 UTC (rev 16743) @@ -49,7 +49,7 @@ @Documented @Constraint(validatedBy = {}) public @interface Min { - String message() default "{constraint.min}"; + String message() default "{javax.validation.constraints.Min.message}"; Class<?>[] groups() default { }; 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-06-10 17:18:13 UTC (rev 16742) +++ beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/NotNull.java 2009-06-10 18:21:29 UTC (rev 16743) @@ -37,7 +37,7 @@ @Documented @Constraint(validatedBy = {}) public @interface NotNull { - String message() default "{constraint.notNull}"; + String message() default "{javax.validation.constraints.NotNull.message}"; Class<?>[] groups() default { }; 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-06-10 17:18:13 UTC (rev 16742) +++ beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Null.java 2009-06-10 18:21:29 UTC (rev 16743) @@ -37,7 +37,7 @@ @Documented @Constraint(validatedBy = {}) public @interface Null { - String message() default "{constraint.null}"; + String message() default "{javax.validation.constraints.Null.message}"; Class<?>[] groups() default { }; 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-06-10 17:18:13 UTC (rev 16742) +++ beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Past.java 2009-06-10 18:21:29 UTC (rev 16743) @@ -47,7 +47,7 @@ @Documented @Constraint(validatedBy = {}) public @interface Past { - String message() default "{constraint.past}"; + String message() default "{javax.validation.constraints.Past.message}"; Class<?>[] groups() default { }; 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-06-10 17:18:13 UTC (rev 16742) +++ beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Pattern.java 2009-06-10 18:21:29 UTC (rev 16743) @@ -53,7 +53,7 @@ /** * @return The error message template. */ - String message() default "{constraint.pattern}"; + String message() default "{javax.validation.constraints.Pattern.message}"; /** * @return The groups the constraint belongs to. 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-06-10 17:18:13 UTC (rev 16742) +++ beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Size.java 2009-06-10 18:21:29 UTC (rev 16743) @@ -45,7 +45,7 @@ @Documented @Constraint(validatedBy = {}) public @interface Size { - String message() default "{constraint.size}"; + String message() default "{javax.validation.constraints.Size.message}"; Class<?>[] groups() default {}; /** Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/Length.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/Length.java 2009-06-10 17:18:13 UTC (rev 16742) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/Length.java 2009-06-10 18:21:29 UTC (rev 16743) @@ -40,7 +40,7 @@ int max() default Integer.MAX_VALUE; - String message() default "{constraint.length}"; + String message() default "{org.hibernate.validation.constraints.Length.message}"; Class<?>[] groups() default { }; } Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/NotEmpty.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/NotEmpty.java 2009-06-10 17:18:13 UTC (rev 16742) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/NotEmpty.java 2009-06-10 18:21:29 UTC (rev 16743) @@ -33,7 +33,7 @@ @Target({ METHOD, FIELD }) @Retention(RUNTIME) public @interface NotEmpty { - String message() default "{constraint.notEmpty}"; + String message() default "{org.hibernate.validation.constraints.NotEmpty.message}"; Class<?>[] groups() default { }; } \ No newline at end of file Modified: validator/trunk/hibernate-validator/src/main/resources/org/hibernate/validation/ValidationMessages.properties =================================================================== --- validator/trunk/hibernate-validator/src/main/resources/org/hibernate/validation/ValidationMessages.properties 2009-06-10 17:18:13 UTC (rev 16742) +++ validator/trunk/hibernate-validator/src/main/resources/org/hibernate/validation/ValidationMessages.properties 2009-06-10 18:21:29 UTC (rev 16743) @@ -1,14 +1,14 @@ # $Id$ -constraint.notNull=may not be null -constraint.size=size must be between {min} and {max} -constraint.length=length must be between {min} and {max} -constraint.notEmpty=may not be empty -constraint.pattern=must match "{regexp}" -constraint.min=must be greater than or equal to {value} -constraint.max=must be less than or equal to {value} -constraint.null=must be null -constraint.past=must be in the past -constraint.future=must be in the future -constraint.assertTrue=must be true -constraint.assertFalse=must be false -constraint.digits=numeric value out of bounds (<{integer} digits>.<{fraction} digits> expected) +javax.validation.constraints.NotNull.message=may not be null +javax.validation.constraints.Size.message=size must be between {min} and {max} +org.hibernate.validation.constraints.Length.message=length must be between {min} and {max} +org.hibernate.validation.constraints.NotEmpty.message=may not be empty +javax.validation.constraints.Pattern.message=must match "{regexp}" +javax.validation.constraints.Min.message=must be greater than or equal to {value} +javax.validation.constraints.Max.message=must be less than or equal to {value} +javax.validation.constraints.Null.message=must be null +javax.validation.constraints.Past.message=must be in the past +javax.validation.constraints.Future.message=must be in the future +javax.validation.constraints.AssertTrue.message=must be true +javax.validation.constraints.AssertFalse.message=must be false +javax.validation.constraints.Digits.message=numeric value out of bounds (<{integer} digits>.<{fraction} digits> expected) Modified: validator/trunk/hibernate-validator/src/main/resources/org/hibernate/validation/ValidationMessages_de.properties =================================================================== --- validator/trunk/hibernate-validator/src/main/resources/org/hibernate/validation/ValidationMessages_de.properties 2009-06-10 17:18:13 UTC (rev 16742) +++ validator/trunk/hibernate-validator/src/main/resources/org/hibernate/validation/ValidationMessages_de.properties 2009-06-10 18:21:29 UTC (rev 16743) @@ -1,14 +1,14 @@ # $Id$ -constraint.notNull=kann nicht null sein -constraint.size=muss zwischen {min} und {max} liegen -constraint.length=muss zwischen {min} und {max} liegen -constraint.notEmpty=kann nicht leer sein -constraint.pattern=muss auf Ausdruck "{regexp}" passen -constraint.min=muss gr\u00F6ssergleich {value} sein -constraint.max=muss kleinergleich {value} sein -constraint.null=muss null sein -constraint.past=muss in der Vergangenheit liegen -constraint.future=muss in der Zukunft liegen -constraint.assertTrue=muss wahr sein -constraint.assertFalse=muss falsch sein -constraint.digits=numerischer Wert aus\u00DFerhalb erlaubten Wertebereichs (<{integer} Ziffern>.<{fraction} Ziffern> erwarted) +javax.validation.constraints.NotNull.message=kann nicht null sein +javax.validation.constraints.Size.message=muss zwischen {min} und {max} liegen +org.hibernate.validation.constraints.Length.message=muss zwischen {min} und {max} liegen +org.hibernate.validation.constraints.NotEmpty.message=kann nicht leer sein +javax.validation.constraints.Pattern.message=muss auf Ausdruck "{regexp}" passen +javax.validation.constraints.Min.message=muss gr\u00F6ssergleich {value} sein +javax.validation.constraints.Max.message=muss kleinergleich {value} sein +javax.validation.constraints.Null.message=muss null sein +javax.validation.constraints.Past.message=muss in der Vergangenheit liegen +javax.validation.constraints.Future.message=muss in der Zukunft liegen +javax.validation.constraints.AssertTrue.message=muss wahr sein +javax.validation.constraints.AssertFalse.message=muss falsch sein +javax.validation.constraints.Digits.message=numerischer Wert aus\u00DFerhalb erlaubten Wertebereichs (<{integer} Ziffern>.<{fraction} Ziffern> erwarted) \ No newline at end of file Modified: validator/trunk/hibernate-validator/src/main/resources/org/hibernate/validation/ValidationMessages_fr.properties =================================================================== --- validator/trunk/hibernate-validator/src/main/resources/org/hibernate/validation/ValidationMessages_fr.properties 2009-06-10 17:18:13 UTC (rev 16742) +++ validator/trunk/hibernate-validator/src/main/resources/org/hibernate/validation/ValidationMessages_fr.properties 2009-06-10 18:21:29 UTC (rev 16743) @@ -1,13 +1,14 @@ # $Id$ -constraint.notNull=ne peut pas \u00EAtre nul -constraint.size=la taille doit \u00EAtre entre {min} et {max} -constraint.length=length must be between {min} and {max} -constraint.notEmpty=ne peut pas \u00EAtre vide -constraint.pattern=doit suivre "{regexp}" -constraint.min=doit \u00EAtre plus grand que {value} -constraint.max=doit \u00EAtre plus petit que {value} -constraint.null=doit \u00EAtre nul -constraint.past=doit \u00EAtre dans le pass\u00E9 -constraint.future=doit \u00EAtre dans le futur -constraint.assertTrue=doit \u00EAtre vrai -constraint.assertFalse=doit \u00EAtre faux +javax.validation.constraints.NotNull.message=ne peut pas \u00EAtre nul +javax.validation.constraints.Size.message=la taille doit \u00EAtre entre {min} et {max} +org.hibernate.validation.constraints.Length.message=length must be between {min} and {max} +org.hibernate.validation.constraints.NotEmpty.message=ne peut pas \u00EAtre vide +javax.validation.constraints.Pattern.message=doit suivre "{regexp}" +javax.validation.constraints.Min.message=doit \u00EAtre plus grand que {value} +javax.validation.constraints.Max.message=doit \u00EAtre plus petit que {value} +javax.validation.constraints.Null.message=doit \u00EAtre nul +javax.validation.constraints.Past.message=doit \u00EAtre dans le pass\u00E9 +javax.validation.constraints.Future.message=doit \u00EAtre dans le futur +javax.validation.constraints.AssertTrue.message=doit \u00EAtre vrai +javax.validation.constraints.AssertFalse.message=doit \u00EAtre faux +javax.validation.constraints.Digits.message=Valeur num\u00E9rique hors limite (<{integer} chiffres>.<{fraction} chiffres> attendus) Modified: validator/trunk/hibernate-validator/src/test/resources/ValidationMessages_es.properties =================================================================== --- validator/trunk/hibernate-validator/src/test/resources/ValidationMessages_es.properties 2009-06-10 17:18:13 UTC (rev 16742) +++ validator/trunk/hibernate-validator/src/test/resources/ValidationMessages_es.properties 2009-06-10 18:21:29 UTC (rev 16743) @@ -1 +1 @@ -constraint.notNull=no puede ser null \ No newline at end of file +javax.validation.constraints.NotNull.message=no puede ser null \ No newline at end of file