branch develop updated (7de259d -> a5f0c85)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository nuiton-validator. See http://git.nuiton.org/nuiton-validator.git from 7de259d fix site new cd554e7 fixes #3611: Updates some dependencies new a5f0c85 fixes #3612: Clean org.nuiton.validator.xwork2.XWork2ValidatorUtil init code The 2 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 a5f0c856f013a26c67ef51049d0475b66dca7e04 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Jan 6 11:36:20 2015 +0100 fixes #3612: Clean org.nuiton.validator.xwork2.XWork2ValidatorUtil init code commit cd554e71e3503e729dc7066e9ccef7e82f7281dd Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Jan 6 11:36:06 2015 +0100 fixes #3611: Updates some dependencies Summary of changes: pom.xml | 12 +++++------ .../validator/xwork2/XWork2ValidatorUtil.java | 25 ++++++++++++---------- 2 files changed, 20 insertions(+), 17 deletions(-) -- 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 develop in repository nuiton-validator. See http://git.nuiton.org/nuiton-validator.git commit cd554e71e3503e729dc7066e9ccef7e82f7281dd Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Jan 6 11:36:06 2015 +0100 fixes #3611: Updates some dependencies --- pom.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 57cca21..a707a49 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuitonpom</artifactId> - <version>1.2</version> + <version>1.7</version> </parent> <artifactId>nuiton-validator</artifactId> @@ -13,7 +13,7 @@ <name>Nuiton Validator</name> <description>Simple Validator API</description> - <url>https://doc.nuiton.org/nuiton-validator</url> + <url>https://nuiton-validator.nuiton.org</url> <inceptionYear>2013</inceptionYear> <developers> @@ -69,7 +69,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> - <version>3.0-rc-5</version> + <version>3.0-rc-8</version> </dependency> <dependency> <groupId>org.nuiton</groupId> @@ -86,7 +86,7 @@ <dependency> <groupId>org.apache.struts.xwork</groupId> <artifactId>xwork-core</artifactId> - <version>2.3.16.3</version> + <version>2.3.20</version> <exclusions> <exclusion> <groupId>asm</groupId> @@ -137,13 +137,13 @@ <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>17.0</version> + <version>18.0</version> </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.11</version> + <version>4.12</version> <scope>test</scope> </dependency> -- 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 develop in repository nuiton-validator. See http://git.nuiton.org/nuiton-validator.git commit a5f0c856f013a26c67ef51049d0475b66dca7e04 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Jan 6 11:36:20 2015 +0100 fixes #3612: Clean org.nuiton.validator.xwork2.XWork2ValidatorUtil init code --- .../validator/xwork2/XWork2ValidatorUtil.java | 25 ++++++++++++---------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/src/main/java/org/nuiton/validator/xwork2/XWork2ValidatorUtil.java b/src/main/java/org/nuiton/validator/xwork2/XWork2ValidatorUtil.java index d51c2f2..e5a4c13 100644 --- a/src/main/java/org/nuiton/validator/xwork2/XWork2ValidatorUtil.java +++ b/src/main/java/org/nuiton/validator/xwork2/XWork2ValidatorUtil.java @@ -21,7 +21,6 @@ */ package org.nuiton.validator.xwork2; -import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.ActionProxy; @@ -34,7 +33,6 @@ import com.opensymphony.xwork2.XWorkException; import com.opensymphony.xwork2.config.Configuration; import com.opensymphony.xwork2.config.ConfigurationManager; import com.opensymphony.xwork2.config.entities.ActionConfig; -import com.opensymphony.xwork2.config.entities.UnknownHandlerConfig; import com.opensymphony.xwork2.inject.Container; import com.opensymphony.xwork2.inject.Inject; import com.opensymphony.xwork2.util.ValueStack; @@ -48,7 +46,6 @@ import org.nuiton.util.beans.BeanUtil; import org.nuiton.validator.NuitonValidatorScope; import java.util.HashSet; -import java.util.List; import java.util.Map; import java.util.Set; import java.util.TreeMap; @@ -170,16 +167,22 @@ public class XWork2ValidatorUtil { if (context.getActionInvocation() == null) { // We need sometimes a ActionInvocation (see http://nuiton.org/issues/2837) - Configuration configuration = container.getInstance(Configuration.class); - UnknownHandlerConfig unknownHandlerStack = new UnknownHandlerConfig("nuiton"); - List<UnknownHandlerConfig> unknownHandlerStackList = configuration.getUnknownHandlerStack(); + // ---- + // tchemit-2015-01-06 Don't need this anymore (see http://forge.nuiton.org/issues/3612) - if (unknownHandlerStackList == null) { - unknownHandlerStackList = Lists.newArrayList(); - configuration.setUnknownHandlerStack(unknownHandlerStackList); - } - unknownHandlerStackList.add(0, unknownHandlerStack); +// Configuration configuration = container.getInstance(Configuration.class); +// +// UnknownHandlerConfig unknownHandlerStack = new UnknownHandlerConfig("nuiton"); +// List<UnknownHandlerConfig> unknownHandlerStackList = configuration.getUnknownHandlerStack(); +// +// if (unknownHandlerStackList == null) { +// unknownHandlerStackList = Lists.newArrayList(); +// configuration.setUnknownHandlerStack(unknownHandlerStackList); +// } +// unknownHandlerStackList.add(0, unknownHandlerStack); + // tchemit-2015-01-06 Don't need this anymore (see http://forge.nuiton.org/issues/3612) + // ---- Map<String, Object> extraContext = Maps.newHashMap(); extraContext.put(ActionContext.VALUE_STACK, vs); -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm