svn commit: r1431115 - in /struts/struts2/trunk: core/src/main/resources/template/xhtml/ core/src/test/resources/org/apache/struts2/views/jsp/ui/ xwork-core/src/main/java/com/opensymphony/xwork2/valid
Author: lukaszlenart Date: Wed Jan 9 22:21:56 2013 New Revision: 1431115 URL: http://svn.apache.org/viewvc?rev=1431115&view=rev Log: WW-2923 refactors validators to use dedicated params to define expressions Modified: struts/struts2/trunk/core/src/main/resources/template/xhtml/form-close-validate.ftl struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleValidationAction-validation.xml struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-24.txt struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/AbstractRangeValidator.java struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/DateRangeFieldValidator.java struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/DoubleRangeFieldValidator.java struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/IntRangeFieldValidator.java struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/LongRangeFieldValidator.java struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/RegexFieldValidator.java struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/ShortRangeFieldValidator.java struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/MockConfigurationProvider.java struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/validator/DoubleRangeValidatorTest.java struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/validator/validators/DateRangeFieldValidatorTest.java struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/validator/validators/IntRangeFieldValidatorTest.java struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/validator/validators/LongRangeFieldValidatorTest.java struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/validator/validators/ShortRangeFieldValidatorTest.java Modified: struts/struts2/trunk/core/src/main/resources/template/xhtml/form-close-validate.ftl URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/xhtml/form-close-validate.ftl?rev=1431115&r1=1431114&r2=1431115&view=diff == --- struts/struts2/trunk/core/src/main/resources/template/xhtml/form-close-validate.ftl (original) +++ struts/struts2/trunk/core/src/main/resources/template/xhtml/form-close-validate.ftl Wed Jan 9 22:21:56 2013 @@ -98,10 +98,10 @@ END SNIPPET: supported-validators } <#elseif validator.validatorType = "int"> if (continueValidation && field.value != null) { -if (<#if validator.minComparatorValue??>parseInt(field.value) < - ${validator.minComparatorValue?c}<#else>false || -<#if validator.maxComparatorValue??>parseInt(field.value) > - ${validator.maxComparatorValue?c}<#else>false) { +if (<#if validator.min??>parseInt(field.value) < + ${validator.min?c}<#else>false || +<#if validator.max??>parseInt(field.value) > + ${validator.max?c}<#else>false) { addError(field, error); errors = true; <#if validator.shortCircuit>continueValidation = false; @@ -110,10 +110,10 @@ END SNIPPET: supported-validators <#elseif validator.validatorType = "double"> if (continueValidation && field.value != null) { var value = parseFloat(field.value); -if (<#if validator.minInclusive??>value < ${validator.minInclusive}<#else>false || -<#if validator.maxInclusive??>value > ${validator.maxInclusive}<#else>false || -<#if validator.minExclusive??>value <= ${validator.minExclusive}<#else>false || -<#if validator.maxExclusive??>value >= ${validator.maxExclusive}<#else>false) { +if (<#if validator.minInclusive??>value < ${validator.minInclusive?c}<#else>false || +<#if validator.maxInclusive??>value > ${validator.maxInclusive?c}<#else>false || +<#if validator.minExclusive??>value <= ${validator.minExclusive?c}<#else>false || +<#if validator.maxExclusive??>value >= ${validator.maxExclusive?c}<#else>false) { addError(field, error); errors = true; <#if validator.shortCircuit>continueValidation = false; Modified: struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleValidationAction-validation.xml URL: http://svn.
svn commit: r1431122 - /struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/validator/validators/DateRangeFieldValidatorTest.java
Author: lukaszlenart Date: Wed Jan 9 22:35:08 2013 New Revision: 1431122 URL: http://svn.apache.org/viewvc?rev=1431122&view=rev Log: WW-2923 adds support to be Locale independent Modified: struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/validator/validators/DateRangeFieldValidatorTest.java Modified: struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/validator/validators/DateRangeFieldValidatorTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/validator/validators/DateRangeFieldValidatorTest.java?rev=1431122&r1=1431121&r2=1431122&view=diff == --- struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/validator/validators/DateRangeFieldValidatorTest.java (original) +++ struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/validator/validators/DateRangeFieldValidatorTest.java Wed Jan 9 22:35:08 2013 @@ -8,9 +8,12 @@ import com.opensymphony.xwork2.validator import java.util.Calendar; import java.util.Date; +import java.util.Locale; public class DateRangeFieldValidatorTest extends XWorkTestCase { +private Locale copy; + public void testPassValidation() throws Exception { // given ValidationAction action = prepareAction(createDate(2013, 6, 6)); @@ -35,7 +38,7 @@ public class DateRangeFieldValidatorTest // then assertTrue(context.getFieldErrors().size() == 1); -assertEquals("Max is 12/12/13, min is 1/1/13 but value is 3/3/12", context.getFieldErrors().get("dateRange").get(0)); +assertEquals("Max is 12.12.13, min is 01.01.13 but value is 03.03.12", context.getFieldErrors().get("dateRange").get(0)); } public void testMaxValidation() throws Exception { @@ -49,7 +52,7 @@ public class DateRangeFieldValidatorTest // then assertTrue(context.getFieldErrors().size() == 1); -assertEquals("Max is 12/12/13, min is 1/1/13 but value is 4/4/14", context.getFieldErrors().get("dateRange").get(0)); +assertEquals("Max is 12.12.13, min is 01.01.13 but value is 04.04.14", context.getFieldErrors().get("dateRange").get(0)); } private ValidationAction prepareAction(Date range) { @@ -83,4 +86,17 @@ public class DateRangeFieldValidatorTest return validator; } +@Override +public void setUp() throws Exception { +super.setUp(); +copy = Locale.getDefault(); +Locale.setDefault(new Locale("DE")); +} + +@Override +public void tearDown() throws Exception { +super.tearDown(); +Locale.setDefault(copy); +} + }
[CONF] Confluence Changes in the last 24 hours
This is a daily summary of all recent changes in Confluence. - Updated Spaces: - Apache ActiveMQ (https://cwiki.apache.org/confluence/display/ACTIVEMQ) Pages - Apache ActiveMQ Board Report - January 2013 created by chirino (09:02 AM) https://cwiki.apache.org/confluence/display/ACTIVEMQ/Apache+ActiveMQ+Board+Report+-+January+2013 Apache Camel (https://cwiki.apache.org/confluence/display/CAMEL) Pages - Stream caching edited by raulvk (01:47 PM) https://cwiki.apache.org/confluence/display/CAMEL/Stream+caching Apache Cloudstack (https://cwiki.apache.org/confluence/display/CLOUDSTACK) Pages - FS Investigate and add back KVM snapshot support created by fangw (07:26 PM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/FS+Investigate+and+add+back+KVM+snapshot+support FS for 3 foreign language keyboard support created by fangw (07:24 PM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/FS+for+3+foreign+language+keyboard+support API Request Throttling edited by minc (05:48 PM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/API+Request+Throttling Private Host, Cluster, Pod edited by hari.kan...@citrix.com (03:36 PM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/Private+Host%2C+Cluster%2C+Pod Setting up a CloudStack dev environment on Windows edited by barbara...@citrix.com (02:54 PM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/Setting+up+a+CloudStack+dev+environment+on+Windows Support for Intel TXT Technology created by hari.kan...@citrix.com (02:36 PM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/Support+for+Intel+TXT+Technology FS - Persistent Networks edited by likitha.she...@citrix.com (12:36 PM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/FS+-+Persistent+Networks Apache CloudStack Project Bylaws edited by chip.child...@gmail.com (11:04 AM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/Apache+CloudStack+Project+Bylaws FS for Integrating CS alerts via SNMP to external management system edited by anshulg (05:13 AM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/FS+for+Integrating+CS+alerts+via+SNMP+to+external+management+system Apache CloudStack v4 0 Documentation Plan edited by jtomechak (03:46 AM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/Apache+CloudStack+v4+0+Documentation+Plan Documentation Team edited by jtomechak (03:37 AM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/Documentation+Team GSLB (Global Server Load Balancing) Functional specification and Design Document edited by murali.reddy (01:24 AM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/GSLB+%28Global+Server+Load+Balancing%29+Functional+specification+and+Design+Document Apache cTAKES (https://cwiki.apache.org/confluence/display/CTAKES) Pages - cTAKES 3.0 User Guide edited by seanfinan (02:31 PM) https://cwiki.apache.org/confluence/display/CTAKES/cTAKES+3.0+User+Guide Apache CXF (https://cwiki.apache.org/confluence/display/CXF) Pages - CXF 2.5.8 Release Notes created by dkulp (10:00 AM) https://cwiki.apache.org/confluence/display/CXF/CXF+2.5.8+Release+Notes CXF 2.6.5 Release Notes created by dkulp (09:58 AM) https://cwiki.apache.org/confluence/display/CXF/CXF+2.6.5+Release+Notes CXF 2.7.2 Release Notes created by dkulp (09:57 AM) https://cwiki.apache.org/confluence/display/CXF/CXF+2.7.2+Release+Notes CXF 2.7.1 Release Notes edited by dkulp (09:57 AM) https://cwiki.apache.org/confluence/display/CXF/CXF+2.7.1+Release+Notes Download edited by dkulp (09:55 AM) https://cwiki.apache.org/confluence/display/CXF/Download Index edited by dkulp (09:53 AM) https://cwiki.apache.org/confluence/display/CXF/Index Apache CXF Documentation (https://cwiki.apache.org/confluence/display/CXF20DOC) Pages - WSAConfiguration edited by mazzag (07:28 AM) https://cwiki.apache.org/confluence/display/CXF20DOC/WSAConfiguration WSPConfiguration edited by cohei...@apache.org (05:25 AM) https://cwiki.apache.org/confluence/display/CXF20DOC/WSPConfiguration Apache Flex (https://cwiki.apache.org/confluence/display/FLEX) Comments https://cwiki.apache.org/confluence/display/FLEX/Falcon+Overview (1) Apache Geronimo Project Management (https://cwiki.apache.org/confluence/display/GMOxPMGT) Pages - Apache Geronimo Board Report - 2013-01 - January edited by kevan (10:53 AM) https://cwiki.apache.org/conf