branch feature/upgrade_to_xwork_2.5 created (now ce5386c)
This is an automated email from the git hooks/post-receive script. New change to branch feature/upgrade_to_xwork_2.5 in repository nuiton-validator. See https://gitlab.nuiton.org/nuiton/nuiton-validator.git at ce5386c Use xwork 2.5 (now bundled with struts) This branch includes the following new commits: new ce5386c Use xwork 2.5 (now bundled with struts) The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit ce5386c60163e16d49f03072741905b247ef8f64 Author: Brendan Le Ny <bleny@codelutin.com> Date: Wed Oct 11 09:50:02 2017 +0200 Use xwork 2.5 (now bundled with struts) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/upgrade_to_xwork_2.5 in repository nuiton-validator. See https://gitlab.nuiton.org/nuiton/nuiton-validator.git commit ce5386c60163e16d49f03072741905b247ef8f64 Author: Brendan Le Ny <bleny@codelutin.com> Date: Wed Oct 11 09:50:02 2017 +0200 Use xwork 2.5 (now bundled with struts) --- pom.xml | 32 ++++++---------------- .../validator/xwork2/XWork2ScopeValidator.java | 3 +- .../validator/xwork2/XWork2ValidatorUtil.java | 11 ++++---- .../field/CollectionFieldExpressionValidator.java | 4 +++ .../xwork2/field/CollectionUniqueKeyValidator.java | 4 +++ .../field/FieldExpressionWithParamsValidator.java | 4 +++ .../field/NuitonFieldExpressionValidator.java | 4 +++ .../xwork2/field/NuitonFieldValidatorSupport.java | 4 +++ 8 files changed, 36 insertions(+), 30 deletions(-) diff --git a/pom.xml b/pom.xml index 8742bcc..0de2099 100644 --- a/pom.xml +++ b/pom.xml @@ -101,31 +101,17 @@ </dependency> <dependency> - <groupId>org.apache.struts.xwork</groupId> - <artifactId>xwork-core</artifactId> - <version>2.3.31</version> - <exclusions> - <exclusion> - <groupId>asm</groupId> - <artifactId>asm</artifactId> - </exclusion> - <exclusion> - <groupId>asm</groupId> - <artifactId>asm-commons</artifactId> - </exclusion> - <exclusion> - <groupId>javassist</groupId> - <artifactId>javassist</artifactId> - </exclusion> - </exclusions> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-core</artifactId> + <version>2.5.13</version> </dependency> - <dependency> - <groupId>org.javassist</groupId> - <artifactId>javassist</artifactId> - <version>3.20.0-GA</version> - <scope>runtime</scope> - </dependency> + <!--<dependency>--> + <!--<groupId>org.javassist</groupId>--> + <!--<artifactId>javassist</artifactId>--> + <!--<version>3.20.0-GA</version>--> + <!--<scope>runtime</scope>--> + <!--</dependency>--> <dependency> <groupId>commons-logging</groupId> diff --git a/src/main/java/org/nuiton/validator/xwork2/XWork2ScopeValidator.java b/src/main/java/org/nuiton/validator/xwork2/XWork2ScopeValidator.java index b93a70b..f0b20c0 100644 --- a/src/main/java/org/nuiton/validator/xwork2/XWork2ScopeValidator.java +++ b/src/main/java/org/nuiton/validator/xwork2/XWork2ScopeValidator.java @@ -22,6 +22,7 @@ package org.nuiton.validator.xwork2; import com.opensymphony.xwork2.ActionContext; +import com.opensymphony.xwork2.DefaultLocaleProvider; import com.opensymphony.xwork2.ValidationAwareSupport; import com.opensymphony.xwork2.util.ValueStack; import com.opensymphony.xwork2.validator.ActionValidatorManager; @@ -87,7 +88,7 @@ public class XWork2ScopeValidator<O> { this.fieldNames = fieldNames; validationSupport = new ValidationAwareSupport(); - validationContext = new DelegatingValidatorContext(validationSupport); + validationContext = new DelegatingValidatorContext(validationSupport, null, new DefaultLocaleProvider()); if (vs == null) { diff --git a/src/main/java/org/nuiton/validator/xwork2/XWork2ValidatorUtil.java b/src/main/java/org/nuiton/validator/xwork2/XWork2ValidatorUtil.java index e5a4c13..3892a03 100644 --- a/src/main/java/org/nuiton/validator/xwork2/XWork2ValidatorUtil.java +++ b/src/main/java/org/nuiton/validator/xwork2/XWork2ValidatorUtil.java @@ -29,7 +29,6 @@ import com.opensymphony.xwork2.DefaultActionInvocation; import com.opensymphony.xwork2.ObjectFactory; import com.opensymphony.xwork2.Result; import com.opensymphony.xwork2.UnknownHandler; -import com.opensymphony.xwork2.XWorkException; import com.opensymphony.xwork2.config.Configuration; import com.opensymphony.xwork2.config.ConfigurationManager; import com.opensymphony.xwork2.config.entities.ActionConfig; @@ -100,7 +99,7 @@ public class XWork2ValidatorUtil { if (context == null) { // no action context, create a value stack from scratch - ConfigurationManager confManager = new ConfigurationManager(); + ConfigurationManager confManager = new ConfigurationManager("xwork"); Configuration conf = confManager.getConfiguration(); Container container = conf.getContainer(); ValueStackFactory stackFactory = container.getInstance(ValueStackFactory.class); @@ -191,7 +190,7 @@ public class XWork2ValidatorUtil { invocation.setContainer(container); ActionProxyFactory actionProxyFactory = context.getInstance(ActionProxyFactory.class); - ActionProxy actionProxy = actionProxyFactory.createActionProxy(invocation, "java.lang", "java.lang.Object", "nuiton-validation", false, false); + ActionProxy actionProxy = actionProxyFactory.createActionProxy(invocation, "java.lang", "java.lang.Object", null, false, false); invocation.init(actionProxy); context.setActionInvocation(invocation); @@ -333,17 +332,17 @@ public class XWork2ValidatorUtil { } @Override - public ActionConfig handleUnknownAction(String namespace, String actionName) throws XWorkException { + public ActionConfig handleUnknownAction(String namespace, String actionName) { return new ActionConfig.Builder(namespace, actionName, Object.class.getName()).build(); } @Override - public Result handleUnknownResult(ActionContext actionContext, String actionName, ActionConfig actionConfig, String resultCode) throws XWorkException { + public Result handleUnknownResult(ActionContext actionContext, String actionName, ActionConfig actionConfig, String resultCode) { return null; } @Override - public Object handleUnknownActionMethod(Object action, String methodName) throws NoSuchMethodException { + public Object handleUnknownActionMethod(Object action, String methodName) { return null; } } diff --git a/src/main/java/org/nuiton/validator/xwork2/field/CollectionFieldExpressionValidator.java b/src/main/java/org/nuiton/validator/xwork2/field/CollectionFieldExpressionValidator.java index a34b9ae..34e0d03 100644 --- a/src/main/java/org/nuiton/validator/xwork2/field/CollectionFieldExpressionValidator.java +++ b/src/main/java/org/nuiton/validator/xwork2/field/CollectionFieldExpressionValidator.java @@ -26,6 +26,8 @@ import com.opensymphony.xwork2.util.ValueStack; import com.opensymphony.xwork2.validator.ValidationException; import com.opensymphony.xwork2.validator.validators.FieldExpressionValidator; import org.apache.commons.lang3.builder.HashCodeBuilder; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import java.util.Collection; import java.util.Collections; @@ -41,6 +43,8 @@ import java.util.TreeSet; */ public class CollectionFieldExpressionValidator extends NuitonFieldExpressionValidator { + private static final Log log = LogFactory.getLog(CollectionFieldExpressionValidator.class); + public enum Mode { /** au moins une entrée de la collection doit etre valide */ diff --git a/src/main/java/org/nuiton/validator/xwork2/field/CollectionUniqueKeyValidator.java b/src/main/java/org/nuiton/validator/xwork2/field/CollectionUniqueKeyValidator.java index 4871bd2..1a1425a 100644 --- a/src/main/java/org/nuiton/validator/xwork2/field/CollectionUniqueKeyValidator.java +++ b/src/main/java/org/nuiton/validator/xwork2/field/CollectionUniqueKeyValidator.java @@ -24,6 +24,8 @@ package org.nuiton.validator.xwork2.field; import com.opensymphony.xwork2.validator.ValidationException; import com.opensymphony.xwork2.validator.validators.FieldExpressionValidator; import org.apache.commons.lang3.builder.HashCodeBuilder; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import java.util.ArrayList; import java.util.Collection; @@ -41,6 +43,8 @@ import java.util.List; */ public class CollectionUniqueKeyValidator extends NuitonFieldValidatorSupport { + private static final Log log = LogFactory.getLog(CollectionUniqueKeyValidator.class); + /** * pour indiquer la propriété qui contient la liste à valider. * diff --git a/src/main/java/org/nuiton/validator/xwork2/field/FieldExpressionWithParamsValidator.java b/src/main/java/org/nuiton/validator/xwork2/field/FieldExpressionWithParamsValidator.java index 93f57e8..c1354c5 100644 --- a/src/main/java/org/nuiton/validator/xwork2/field/FieldExpressionWithParamsValidator.java +++ b/src/main/java/org/nuiton/validator/xwork2/field/FieldExpressionWithParamsValidator.java @@ -24,6 +24,8 @@ package org.nuiton.validator.xwork2.field; import com.opensymphony.xwork2.util.ValueStack; import com.opensymphony.xwork2.validator.ValidationException; import com.opensymphony.xwork2.validator.validators.FieldExpressionValidator; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.nuiton.converter.ConverterUtil; import java.util.Map; @@ -41,6 +43,8 @@ import java.util.regex.Pattern; */ public class FieldExpressionWithParamsValidator extends NuitonFieldExpressionValidator { + private static final Log log = LogFactory.getLog(FieldExpressionWithParamsValidator.class); + protected static final Pattern EXTRA_BOOLEAN_PARAM_ENTRY_PATTERN = Pattern.compile("(\\w+)\\:(false|true)"); protected static final Pattern EXTRA_SHORT_PARAM_ENTRY_PATTERN = Pattern.compile("(\\w+)\\:(-\\d+|\\d+)"); diff --git a/src/main/java/org/nuiton/validator/xwork2/field/NuitonFieldExpressionValidator.java b/src/main/java/org/nuiton/validator/xwork2/field/NuitonFieldExpressionValidator.java index deeeefd..6612da1 100644 --- a/src/main/java/org/nuiton/validator/xwork2/field/NuitonFieldExpressionValidator.java +++ b/src/main/java/org/nuiton/validator/xwork2/field/NuitonFieldExpressionValidator.java @@ -23,6 +23,8 @@ package org.nuiton.validator.xwork2.field; import com.opensymphony.xwork2.validator.ValidationException; import com.opensymphony.xwork2.validator.validators.FieldExpressionValidator; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; /** * Nuiton default field validator. @@ -39,6 +41,8 @@ import com.opensymphony.xwork2.validator.validators.FieldExpressionValidator; */ public class NuitonFieldExpressionValidator extends FieldExpressionValidator { + private static final Log log = LogFactory.getLog(NuitonFieldExpressionValidator.class); + /** * extra parameter at the very beginning of the * {@link #validate(Object)} method to be able to skip (or not) the diff --git a/src/main/java/org/nuiton/validator/xwork2/field/NuitonFieldValidatorSupport.java b/src/main/java/org/nuiton/validator/xwork2/field/NuitonFieldValidatorSupport.java index d76986c..bb6d8be 100644 --- a/src/main/java/org/nuiton/validator/xwork2/field/NuitonFieldValidatorSupport.java +++ b/src/main/java/org/nuiton/validator/xwork2/field/NuitonFieldValidatorSupport.java @@ -23,6 +23,8 @@ package org.nuiton.validator.xwork2.field; import com.opensymphony.xwork2.validator.ValidationException; import com.opensymphony.xwork2.validator.validators.FieldValidatorSupport; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; /** * Nuiton default field validator. @@ -39,6 +41,8 @@ import com.opensymphony.xwork2.validator.validators.FieldValidatorSupport; */ public abstract class NuitonFieldValidatorSupport extends FieldValidatorSupport { + private static final Log log = LogFactory.getLog(NuitonFieldValidatorSupport.class); + /** * extra parameter at the very beginning of the * {@link #validate(Object)} method to be able to skip (or not) the -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm