Author: tchemit Date: 2010-11-18 11:00:39 +0100 (Thu, 18 Nov 2010) New Revision: 1810 Url: http://nuiton.org/repositories/revision/i18n/1810 Log: Evolution #1056: Add validators/validator/message in validators ruleset Modified: trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/resources/org/nuiton/i18n/test/MyBean-validation.xml trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/verify.groovy trunk/maven-i18n-plugin/src/main/resources/validation.rules Modified: trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/resources/org/nuiton/i18n/test/MyBean-validation.xml =================================================================== --- trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/resources/org/nuiton/i18n/test/MyBean-validation.xml 2010-11-18 10:00:28 UTC (rev 1809) +++ trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/resources/org/nuiton/i18n/test/MyBean-validation.xml 2010-11-18 10:00:39 UTC (rev 1810) @@ -25,24 +25,28 @@ --> <!DOCTYPE validators PUBLIC - "-//OpenSymphony Group//XWork Validator 1.0.2//EN" - "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> + "-//OpenSymphony Group//XWork Validator 1.0.2//EN" + "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> <validators> - <field name="field1"> + <validator type="required"> + <message>validationGetter.key3</message> + </validator> + + <field name="field1"> - <field-validator type="required"> - <message>validationGetter.key1</message> - </field-validator> + <field-validator type="required"> + <message>validationGetter.key1</message> + </field-validator> - </field> + </field> - <field name="field2"> + <field name="field2"> - <field-validator type="required"> - <message>validationGetter.key2##${parm1}</message> - </field-validator> + <field-validator type="required"> + <message>validationGetter.key2##${parm1}</message> + </field-validator> - </field> + </field> </validators> Modified: trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/verify.groovy =================================================================== --- trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/verify.groovy 2010-11-18 10:00:28 UTC (rev 1809) +++ trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/verify.groovy 2010-11-18 10:00:39 UTC (rev 1810) @@ -38,6 +38,7 @@ content = file.text; assert content.contains( 'validationGetter.key1=' ); assert content.contains( 'validationGetter.key2=' ); +assert content.contains( 'validationGetter.key3=' ); file = new File(basedir, 'src/main/resources/i18n/parsers-withNewKeys_fr_FR.properties'); assert file.exists(); @@ -49,5 +50,6 @@ assert content.contains( 'javaGetter.key2=' ); assert content.contains( 'validationGetter.key1=' ); assert content.contains( 'validationGetter.key2=' ); +assert content.contains( 'validationGetter.key3=' ); return true; Modified: trunk/maven-i18n-plugin/src/main/resources/validation.rules =================================================================== --- trunk/maven-i18n-plugin/src/main/resources/validation.rules 2010-11-18 10:00:28 UTC (rev 1809) +++ trunk/maven-i18n-plugin/src/main/resources/validation.rules 2010-11-18 10:00:39 UTC (rev 1810) @@ -1,3 +1,4 @@ # Règles pour la validation XWorks //validators/field/field-validator/message +//validators/validator/message