Author: epbernard Date: 2009-03-12 17:33:48 -0400 (Thu, 12 Mar 2009) New Revision: 16152 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/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/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 Log: BVAL-137 prefix for message template key is constraint. instead of validator. 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-03-12 21:20:47 UTC (rev 16151) +++ beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/AssertFalse.java 2009-03-12 21:33:48 UTC (rev 16152) @@ -37,7 +37,7 @@ @Retention(RUNTIME) @Documented public @interface AssertFalse { - String message() default "{validator.assertFalse}"; + String message() default "{constraint.assertFalse}"; 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-03-12 21:20:47 UTC (rev 16151) +++ beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/AssertTrue.java 2009-03-12 21:33:48 UTC (rev 16152) @@ -37,7 +37,7 @@ @Retention(RUNTIME) @Documented public @interface AssertTrue { - String message() default "{validator.assertTrue}"; + String message() default "{constraint.assertTrue}"; 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-03-12 21:20:47 UTC (rev 16151) +++ beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Digits.java 2009-03-12 21:33:48 UTC (rev 16152) @@ -47,7 +47,7 @@ @Retention(RUNTIME) @Documented public @interface Digits { - String message() default "{validator.digits}"; + String message() default "{constraint.digits}"; 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-03-12 21:20:47 UTC (rev 16151) +++ beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Future.java 2009-03-12 21:33:48 UTC (rev 16152) @@ -48,7 +48,7 @@ @Retention(RUNTIME) @Documented public @interface Future { - String message() default "{validator.future}"; + String message() default "{constraint.future}"; 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-03-12 21:20:47 UTC (rev 16151) +++ beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Max.java 2009-03-12 21:33:48 UTC (rev 16152) @@ -48,7 +48,7 @@ @Retention(RUNTIME) @Documented public @interface Max { - String message() default "{validator.max}"; + String message() default "{constraint.max}"; 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-03-12 21:20:47 UTC (rev 16151) +++ beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Min.java 2009-03-12 21:33:48 UTC (rev 16152) @@ -48,7 +48,7 @@ @Retention(RUNTIME) @Documented public @interface Min { - String message() default "{validator.min}"; + String message() default "{constraint.min}"; 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-03-12 21:20:47 UTC (rev 16151) +++ beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/NotNull.java 2009-03-12 21:33:48 UTC (rev 16152) @@ -35,7 +35,7 @@ @Retention(RUNTIME) @Documented public @interface NotNull { - String message() default "{validator.notNull}"; + String message() default "{constraint.notNull}"; 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-03-12 21:20:47 UTC (rev 16151) +++ beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Null.java 2009-03-12 21:33:48 UTC (rev 16152) @@ -35,7 +35,7 @@ @Retention(RUNTIME) @Documented public @interface Null { - String message() default "{validator.null}"; + String message() default "{constraint.null}"; 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-03-12 21:20:47 UTC (rev 16151) +++ beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Past.java 2009-03-12 21:33:48 UTC (rev 16152) @@ -48,7 +48,7 @@ @Retention(RUNTIME) @Documented public @interface Past { - String message() default "{validator.past}"; + String message() default "{constraint.past}"; 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-03-12 21:20:47 UTC (rev 16151) +++ beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Pattern.java 2009-03-12 21:33:48 UTC (rev 16152) @@ -34,7 +34,7 @@ /** * error message template */ - String message() default "{validator.pattern}"; + String message() default "{constraint.pattern}"; /** * 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-03-12 21:20:47 UTC (rev 16151) +++ beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Size.java 2009-03-12 21:33:48 UTC (rev 16152) @@ -43,7 +43,7 @@ @Retention(RUNTIME) @Documented public @interface Size { - String message() default "{validator.size}"; + String message() default "{constraint.size}"; Class<?>[] groups() default {}; /** 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-03-12 21:20:47 UTC (rev 16151) +++ validator/trunk/hibernate-validator/src/main/resources/org/hibernate/validation/ValidationMessages.properties 2009-03-12 21:33:48 UTC (rev 16152) @@ -1,14 +1,14 @@ # $Id$ -validator.notNull=may not be null -validator.size=size must be between {min} and {max} -validator.length=length must be between {min} and {max} -validator.notEmpty=may not be empty -validator.pattern=must match "{regexp}" -validator.min=must be greater than or equal to {value} -validator.max=must be less than or equal to {value} -validator.null=must be null -validator.past=must be in the past -validator.future=must be in the future -validator.assertTrue=must be true -validator.assertFalse=must be false -validator.digits=numeric value out of bounds (<{integer} digits>.<{fraction} digits> expected) +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) 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-03-12 21:20:47 UTC (rev 16151) +++ validator/trunk/hibernate-validator/src/main/resources/org/hibernate/validation/ValidationMessages_de.properties 2009-03-12 21:33:48 UTC (rev 16152) @@ -1,14 +1,14 @@ # $Id$ -validator.notNull=kann nicht null sein -validator.size=muss zwischen {min} und {max} liegen -validator.length=muss zwischen {min} und {max} liegen -validator.notEmpty=kann nicht leer sein -validator.pattern=muss auf Ausdruck "{regexp}" passen -validator.min=muss gr\u00F6ssergleich {value} sein -validator.max=muss kleinergleich {value} sein -validator.null=muss null sein -validator.past=muss in der Vergangenheit liegen -validator.future=muss in der Zukunft liegen -validator.assertTrue=muss wahr sein -validator.assertFalse=muss falsch sein -validator.digits=numerischer Wert aus\u00DFerhalb erlaubten Wertebereichs (<{integer} Ziffern>.<{fraction} Ziffern> erwarted) +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) 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-03-12 21:20:47 UTC (rev 16151) +++ validator/trunk/hibernate-validator/src/main/resources/org/hibernate/validation/ValidationMessages_fr.properties 2009-03-12 21:33:48 UTC (rev 16152) @@ -1,13 +1,13 @@ # $Id$ -validator.notNull=ne peut pas \u00EAtre nul -validator.size=la taille doit \u00EAtre entre {min} et {max} -validator.length=length must be between {min} and {max} -validator.notEmpty=ne peut pas \u00EAtre vide -validator.pattern=doit suivre "{regexp}" -validator.min=doit \u00EAtre plus grand que {value} -validator.max=doit \u00EAtre plus petit que {value} -validator.null=doit \u00EAtre nul -validator.past=doit \u00EAtre dans le pass\u00E9 -validator.future=doit \u00EAtre dans le futur -validator.assertTrue=doit \u00EAtre vrai -validator.assertFalse=doit \u00EAtre faux +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