Author: chatellier Date: 2010-11-24 15:33:29 +0000 (Wed, 24 Nov 2010) New Revision: 270 Log: Valid project name, selection name, result name as word (alphanum chars) Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/validators/RegexFieldValidator.java trunk/coser-business/src/main/resources/validators.xml trunk/coser-ui/src/main/resources/fr/ifremer/coser/bean/Project-error-validation.xml trunk/coser-ui/src/main/resources/fr/ifremer/coser/bean/RSufiResult-error-validation.xml trunk/coser-ui/src/main/resources/fr/ifremer/coser/bean/Selection-error-validation.xml trunk/pom.xml Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/validators/RegexFieldValidator.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/validators/RegexFieldValidator.java 2010-11-24 15:32:48 UTC (rev 269) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/validators/RegexFieldValidator.java 2010-11-24 15:33:29 UTC (rev 270) @@ -31,7 +31,7 @@ import com.opensymphony.xwork2.validator.validators.FieldValidatorSupport; /** - * Same validator, but empty string is not valid. + * Same validator, but empty or null string is not valid. * * <!-- START SNIPPET: javadoc --> * Validates a string field using a regular expression. @@ -82,10 +82,16 @@ Object value = this.getFieldValue(fieldName, object); // if there is no value - don't do comparison // if a value is required, a required validator should be added to the field - if (value == null || expression == null) { + + if (value == null) { + addFieldError(fieldName, object); return; } + if (expression == null) { + return; + } + // XW-375 - must be a string if (!(value instanceof String)) { return; Modified: trunk/coser-business/src/main/resources/validators.xml =================================================================== --- trunk/coser-business/src/main/resources/validators.xml 2010-11-24 15:32:48 UTC (rev 269) +++ trunk/coser-business/src/main/resources/validators.xml 2010-11-24 15:33:29 UTC (rev 270) @@ -44,7 +44,7 @@ <validator name="stringlength" class="com.opensymphony.xwork2.validator.validators.StringLengthFieldValidator"/> <!-- <validator name="regex" class="com.opensymphony.xwork2.validator.validators.RegexFieldValidator"/> --> <validator name="conditionalvisitor" class="com.opensymphony.xwork2.validator.validators.ConditionalVisitorFieldValidator"/> - + <validator name="checkDouble" class="fr.ifremer.coser.validators.CoserCheckDoubleValidator"/> <validator name="coserDouble" class="fr.ifremer.coser.validators.CoserDoubleValidator"/> <validator name="coserExpression" class="fr.ifremer.coser.validators.CoserExpressionValidator"/> Modified: trunk/coser-ui/src/main/resources/fr/ifremer/coser/bean/Project-error-validation.xml =================================================================== --- trunk/coser-ui/src/main/resources/fr/ifremer/coser/bean/Project-error-validation.xml 2010-11-24 15:32:48 UTC (rev 269) +++ trunk/coser-ui/src/main/resources/fr/ifremer/coser/bean/Project-error-validation.xml 2010-11-24 15:33:29 UTC (rev 270) @@ -27,8 +27,9 @@ "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> <validators> <field name="name"> - <field-validator type="requiredstring"> - <param name="trim">true</param> + <field-validator type="regex"> + <param name="expression">\w+</param> + <param name="trim">false</param> <message>coser.ui.control.project.requiredname</message> </field-validator> </field> Modified: trunk/coser-ui/src/main/resources/fr/ifremer/coser/bean/RSufiResult-error-validation.xml =================================================================== --- trunk/coser-ui/src/main/resources/fr/ifremer/coser/bean/RSufiResult-error-validation.xml 2010-11-24 15:32:48 UTC (rev 269) +++ trunk/coser-ui/src/main/resources/fr/ifremer/coser/bean/RSufiResult-error-validation.xml 2010-11-24 15:33:29 UTC (rev 270) @@ -27,8 +27,9 @@ "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> <validators> <field name="name"> - <field-validator type="requiredstring"> - <param name="trim">true</param> + <field-validator type="regex"> + <param name="expression">\w+</param> + <param name="trim">false</param> <message>coser.ui.result.requiredname</message> </field-validator> </field> Modified: trunk/coser-ui/src/main/resources/fr/ifremer/coser/bean/Selection-error-validation.xml =================================================================== --- trunk/coser-ui/src/main/resources/fr/ifremer/coser/bean/Selection-error-validation.xml 2010-11-24 15:32:48 UTC (rev 269) +++ trunk/coser-ui/src/main/resources/fr/ifremer/coser/bean/Selection-error-validation.xml 2010-11-24 15:33:29 UTC (rev 270) @@ -27,9 +27,16 @@ "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> <validators> <field name="name"> + <field-validator type="regex"> + <param name="expression">\w+</param> + <param name="trim">false</param> + <message>coser.ui.selection.selection.requiredName</message> + </field-validator> + </field> + <field name="description"> <field-validator type="requiredstring"> <param name="trim">true</param> - <message>coser.ui.selection.selection.requiredName</message> + <message>coser.ui.selection.selection.requiredDescription</message> </field-validator> </field> </validators> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-11-24 15:32:48 UTC (rev 269) +++ trunk/pom.xml 2010-11-24 15:33:29 UTC (rev 270) @@ -112,6 +112,12 @@ <artifactId>jaxx-runtime</artifactId> <version>${jaxx.version}</version> <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>com.opensymphony</groupId> + <artifactId>xwork</artifactId> + </exclusion> + </exclusions> </dependency> <dependency>