[struts] branch action-context-boost updated (0cf39a9 -> 32cbb32)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch action-context-boost in repository https://gitbox.apache.org/repos/asf/struts.git. from 0cf39a9 WW-4789 WW-3788 Cleans up code & JavaDocs formatting add 3ccbcc6 Uses .asf.yaml to enable new notification schema and link PRs with JIRA add 9faa39c Merge pull request #404 from JCgH4164838Gh792C124B5/WW-5069 add 387c203 Merge pull request #409 from JCgH4164838Gh792C124B5/WW-5069_CPickPR404 new 32cbb32 Merge branch 'master' into action-context-boost The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .asf.yaml | 10 ++ .../opensymphony/xwork2/validator/DateRangeValidatorTest.java | 1 + .../xwork2/validator/VisitorFieldValidatorTest.java| 1 + 3 files changed, 12 insertions(+) create mode 100644 .asf.yaml
[struts] 01/01: Merge branch 'master' into action-context-boost
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch action-context-boost in repository https://gitbox.apache.org/repos/asf/struts.git commit 32cbb327c9b7d34163b6a42e90ac176be527db5d Merge: 0cf39a9 387c203 Author: Lukasz Lenart AuthorDate: Thu Apr 30 10:01:40 2020 +0200 Merge branch 'master' into action-context-boost .asf.yaml | 10 ++ .../opensymphony/xwork2/validator/DateRangeValidatorTest.java | 1 + .../xwork2/validator/VisitorFieldValidatorTest.java| 1 + 3 files changed, 12 insertions(+)
[struts] branch action-context-boost updated: WW-4789 WW-3788 Fixes test after reverse merge
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch action-context-boost
in repository https://gitbox.apache.org/repos/asf/struts.git
The following commit(s) were added to refs/heads/action-context-boost by this
push:
new 567ad9c WW-4789 WW-3788 Fixes test after reverse merge
567ad9c is described below
commit 567ad9cdf1a746e77f905e16f9f375773fd6e01b
Author: Lukasz Lenart
AuthorDate: Thu Apr 30 10:03:33 2020 +0200
WW-4789 WW-3788 Fixes test after reverse merge
---
.../com/opensymphony/xwork2/validator/VisitorFieldValidatorTest.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git
a/core/src/test/java/com/opensymphony/xwork2/validator/VisitorFieldValidatorTest.java
b/core/src/test/java/com/opensymphony/xwork2/validator/VisitorFieldValidatorTest.java
index 9f4f0cb..76c2eac 100644
---
a/core/src/test/java/com/opensymphony/xwork2/validator/VisitorFieldValidatorTest.java
+++
b/core/src/test/java/com/opensymphony/xwork2/validator/VisitorFieldValidatorTest.java
@@ -32,6 +32,7 @@ import java.util.Calendar;
import java.util.GregorianCalendar;
import java.util.HashMap;
import java.util.List;
+import java.util.Locale;
import java.util.Map;
/**
@@ -48,7 +49,7 @@ public class VisitorFieldValidatorTest extends XWorkTestCase {
public void setUp() throws Exception {
super.setUp();
-ActionContext.getContext().put(ActionContext.LOCALE, Locale.US); //
Force US Locale for date conversion tests on JDK9+
+ActionContext.getContext().withLocale(Locale.US); // Force US Locale
for date conversion tests on JDK9+
action = container.inject(VisitorValidatorTestAction.class);
TestBean bean = action.getBean();
[struts] 01/01: Merge branch 'master' into WW-5017-drop-validation
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch WW-5017-drop-validation in repository https://gitbox.apache.org/repos/asf/struts.git commit 6428aaf1495b611b466b105b05ad48c099a615ea Merge: 13cbf0e 387c203 Author: Lukasz Lenart AuthorDate: Fri May 1 07:06:49 2020 +0200 Merge branch 'master' into WW-5017-drop-validation .../java/com/opensymphony/xwork2/validator/DateRangeValidatorTest.java | 1 + .../com/opensymphony/xwork2/validator/VisitorFieldValidatorTest.java | 1 + 2 files changed, 2 insertions(+)
[struts] branch WW-5017-drop-validation updated (13cbf0e -> 6428aaf)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch WW-5017-drop-validation in repository https://gitbox.apache.org/repos/asf/struts.git. from 13cbf0e WW-5017 Drops deprecated Validation annotation as not needed add 9faa39c Merge pull request #404 from JCgH4164838Gh792C124B5/WW-5069 add 387c203 Merge pull request #409 from JCgH4164838Gh792C124B5/WW-5069_CPickPR404 new 6428aaf Merge branch 'master' into WW-5017-drop-validation The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../java/com/opensymphony/xwork2/validator/DateRangeValidatorTest.java | 1 + .../com/opensymphony/xwork2/validator/VisitorFieldValidatorTest.java | 1 + 2 files changed, 2 insertions(+)
[struts] 01/01: Merge pull request #408 from apache/WW-4043-moves-test-utils
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/struts.git commit ee3eddda169b1a05fab5ef4d73256e018ba6daa8 Merge: 387c203 1e14438 Author: Lukasz Lenart AuthorDate: Fri May 1 07:07:55 2020 +0200 Merge pull request #408 from apache/WW-4043-moves-test-utils [WW-4043] Moves TestUtils into junit-plugin .../test/java/org/apache/struts2/TestUtils.java| 94 -- .../apache/struts2/json/DefaultJSONWriterTest.java | 1 + .../apache/struts2/json/JSONInterceptorTest.java | 1 + .../org/apache/struts2/json/JSONPopulatorTest.java | 1 + .../org/apache/struts2/json/JSONResultTest.java| 3 +- .../json/JSONValidationInterceptorTest.java| 1 + .../java/org/apache/struts2/util}/TestUtils.java | 58 +++-- 7 files changed, 37 insertions(+), 122 deletions(-)
[struts] branch master updated (387c203 -> ee3eddd)
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/struts.git.
from 387c203 Merge pull request #409 from
JCgH4164838Gh792C124B5/WW-5069_CPickPR404
add 592c942 WW-4043 Moves TestUtils into junit-plugin
add 1e14438 WW-4043 Adds additional function to provide encoding
new ee3eddd Merge pull request #408 from apache/WW-4043-moves-test-utils
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../test/java/org/apache/struts2/TestUtils.java| 94 --
.../apache/struts2/json/DefaultJSONWriterTest.java | 1 +
.../apache/struts2/json/JSONInterceptorTest.java | 1 +
.../org/apache/struts2/json/JSONPopulatorTest.java | 1 +
.../org/apache/struts2/json/JSONResultTest.java| 3 +-
.../json/JSONValidationInterceptorTest.java| 1 +
.../java/org/apache/struts2/util}/TestUtils.java | 58 +++--
7 files changed, 37 insertions(+), 122 deletions(-)
delete mode 100644 core/src/test/java/org/apache/struts2/TestUtils.java
rename plugins/{json/src/test/java/org/apache/struts2/json =>
junit/src/main/java/org/apache/struts2/util}/TestUtils.java (65%)
[struts] branch master updated: rename springconstants to have a uniform naming pattern
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/struts.git The following commit(s) were added to refs/heads/master by this push: new f851497 rename springconstants to have a uniform naming pattern new 158b1d4 Merge pull request #229 from sdutry/WW-4796 f851497 is described below commit f85149791d2bff9953e91051b74f8f69ff450fae Author: Stefaan Dutry AuthorDate: Mon May 28 13:15:09 2018 +0200 rename springconstants to have a uniform naming pattern Also removed constant from cdi-plugin config, as it is suspected to not be used. issue: - WW-4796 --- plugins/cdi/src/main/resources/struts-plugin.xml| 2 -- .../struts2/spring/ClassReloadingXMLWebApplicationContext.java | 2 +- .../src/main/java/org/apache/struts2/spring/SpringConstants.java| 6 +++--- .../java/org/apache/struts2/spring/StrutsSpringObjectFactory.java | 6 +++--- .../apache/struts2/spring/config/entities/SpringConstantConfig.java | 6 +++--- plugins/spring/src/main/resources/struts-plugin.xml | 6 +++--- 6 files changed, 13 insertions(+), 15 deletions(-) diff --git a/plugins/cdi/src/main/resources/struts-plugin.xml b/plugins/cdi/src/main/resources/struts-plugin.xml index bbbd5a9..9c79a33 100644 --- a/plugins/cdi/src/main/resources/struts-plugin.xml +++ b/plugins/cdi/src/main/resources/struts-plugin.xml @@ -30,6 +30,4 @@ - - diff --git a/plugins/spring/src/main/java/org/apache/struts2/spring/ClassReloadingXMLWebApplicationContext.java b/plugins/spring/src/main/java/org/apache/struts2/spring/ClassReloadingXMLWebApplicationContext.java index 03fe9de..4235a67 100644 --- a/plugins/spring/src/main/java/org/apache/struts2/spring/ClassReloadingXMLWebApplicationContext.java +++ b/plugins/spring/src/main/java/org/apache/struts2/spring/ClassReloadingXMLWebApplicationContext.java @@ -52,7 +52,7 @@ import java.util.regex.Pattern; * * * Set "struts.devMode" to "true" - * Set "struts.class.reloading.watchList" to a comma separated list of directories, or jar files (absolute paths) + * Set "struts.objectFactory.spring.class.reloading.watchList" to a comma separated list of directories, or jar files (absolute paths) * Add this to web.xml: * *diff --git a/plugins/spring/src/main/java/org/apache/struts2/spring/SpringConstants.java b/plugins/spring/src/main/java/org/apache/struts2/spring/SpringConstants.java index f174e2f..d577577 100644 --- a/plugins/spring/src/main/java/org/apache/struts2/spring/SpringConstants.java +++ b/plugins/spring/src/main/java/org/apache/struts2/spring/SpringConstants.java @@ -19,7 +19,7 @@ package org.apache.struts2.spring; public class SpringConstants { -public static final String SPRING_CLASS_RELOADING_WATCH_LIST = "struts.class.reloading.watchList"; -public static final String SPRING_CLASS_RELOADING_ACCEPT_CLASSES = "struts.class.reloading.acceptClasses"; -public static final String SPRING_CLASS_RELOADING_RELOAD_CONFIG = "struts.class.reloading.reloadConfig"; +public static final String STRUTS_OBJECTFACTORY_SPRING_CLASS_RELOADING_WATCH_LIST = "struts.objectFactory.spring.class.reloading.watchList"; +public static final String STRUTS_OBJECTFACTORY_SPRING_CLASS_RELOADING_ACCEPT_CLASSES = "struts.objectFactory.spring.class.reloading.acceptClasses"; +public static final String STRUTS_OBJECTFACTORY_SPRING_CLASS_RELOADING_RELOAD_CONFIG = "struts.objectFactory.spring.class.reloading.reloadConfig"; } diff --git a/plugins/spring/src/main/java/org/apache/struts2/spring/StrutsSpringObjectFactory.java b/plugins/spring/src/main/java/org/apache/struts2/spring/StrutsSpringObjectFactory.java index 157518c..f11ea6a 100644 --- a/plugins/spring/src/main/java/org/apache/struts2/spring/StrutsSpringObjectFactory.java +++ b/plugins/spring/src/main/java/org/apache/struts2/spring/StrutsSpringObjectFactory.java @@ -94,9 +94,9 @@ public class StrutsSpringObjectFactory extends SpringObjectFactory { return; } -String watchList = container.getInstance(String.class, SpringConstants.SPRING_CLASS_RELOADING_WATCH_LIST); -String acceptClasses = container.getInstance(String.class, SpringConstants.SPRING_CLASS_RELOADING_ACCEPT_CLASSES); -String reloadConfig = container.getInstance(String.class, SpringConstants.SPRING_CLASS_RELOADING_RELOAD_CONFIG); +String watchList = container.getInstance(String.class, SpringConstants.STRUTS_OBJECTFACTORY_SPRING_CLASS_RELOADING_WATCH_LIST); +String acceptClasses = container.getInstance(String.class, SpringConstants.STRUTS_OBJECTFACTORY_SPRING_CLASS_RELOADING_ACCEPT_CLASSES); +String reloadConfig = container.getInstance(String.class, SpringConstants.STRUTS_OBJECTFACTORY_SPRING_CLASS_RELOADING_RELOAD_CONFIG); if ("true".equals(devMod
[struts-archetypes] branch master updated: Uses Java 8 as a baseline for new projects
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/struts-archetypes.git
The following commit(s) were added to refs/heads/master by this push:
new 51197c1 Uses Java 8 as a baseline for new projects
51197c1 is described below
commit 51197c1a74b853e4960648c0dc76ee3f2dccafd9
Author: Lukasz Lenart
AuthorDate: Fri May 1 08:47:18 2020 +0200
Uses Java 8 as a baseline for new projects
---
.../src/main/resources/archetype-resources/pom.xml| 4 ++--
.../src/main/resources/archetype-resources/pom.xml| 4 ++--
.../src/main/resources/archetype-resources/pom.xml| 4 ++--
.../src/main/resources/archetype-resources/pom.xml| 4 ++--
.../src/main/resources/archetype-resources/pom.xml| 4 ++--
.../src/main/resources/archetype-resources/pom.xml| 4 ++--
.../src/main/resources/archetype-resources/pom.xml| 4 ++--
7 files changed, 14 insertions(+), 14 deletions(-)
diff --git
a/struts2-archetype-angularjs/src/main/resources/archetype-resources/pom.xml
b/struts2-archetype-angularjs/src/main/resources/archetype-resources/pom.xml
index a1f78c8..cc8cbda 100644
--- a/struts2-archetype-angularjs/src/main/resources/archetype-resources/pom.xml
+++ b/struts2-archetype-angularjs/src/main/resources/archetype-resources/pom.xml
@@ -77,8 +77,8 @@
3.6.1
UTF-8
-1.7
-1.7
+1.8
+1.8
diff --git
a/struts2-archetype-blank/src/main/resources/archetype-resources/pom.xml
b/struts2-archetype-blank/src/main/resources/archetype-resources/pom.xml
index 4e0b1a7..756bf7c 100644
--- a/struts2-archetype-blank/src/main/resources/archetype-resources/pom.xml
+++ b/struts2-archetype-blank/src/main/resources/archetype-resources/pom.xml
@@ -64,8 +64,8 @@
3.6.1
UTF-8
-1.7
-1.7
+1.8
+1.8
diff --git
a/struts2-archetype-convention/src/main/resources/archetype-resources/pom.xml
b/struts2-archetype-convention/src/main/resources/archetype-resources/pom.xml
index cf1adfc..9c85b4d 100644
---
a/struts2-archetype-convention/src/main/resources/archetype-resources/pom.xml
+++
b/struts2-archetype-convention/src/main/resources/archetype-resources/pom.xml
@@ -71,8 +71,8 @@
3.6.1
UTF-8
-1.7
-1.7
+1.8
+1.8
diff --git
a/struts2-archetype-dbportlet/src/main/resources/archetype-resources/pom.xml
b/struts2-archetype-dbportlet/src/main/resources/archetype-resources/pom.xml
index a4068f1..8b01057 100644
--- a/struts2-archetype-dbportlet/src/main/resources/archetype-resources/pom.xml
+++ b/struts2-archetype-dbportlet/src/main/resources/archetype-resources/pom.xml
@@ -101,8 +101,8 @@
maven-compiler-plugin
3.6.1
-1.7
-1.7
+1.8
+1.8
diff --git
a/struts2-archetype-plugin/src/main/resources/archetype-resources/pom.xml
b/struts2-archetype-plugin/src/main/resources/archetype-resources/pom.xml
index ff875d8..e8fef12 100644
--- a/struts2-archetype-plugin/src/main/resources/archetype-resources/pom.xml
+++ b/struts2-archetype-plugin/src/main/resources/archetype-resources/pom.xml
@@ -41,8 +41,8 @@
maven-compiler-plugin
3.6.1
-1.7
-1.7
+1.8
+1.8
diff --git
a/struts2-archetype-portlet/src/main/resources/archetype-resources/pom.xml
b/struts2-archetype-portlet/src/main/resources/archetype-resources/pom.xml
index ccd81f0..cad8021 100644
--- a/struts2-archetype-portlet/src/main/resources/archetype-resources/pom.xml
+++ b/struts2-archetype-portlet/src/main/resources/archetype-resources/pom.xml
@@ -50,8 +50,8 @@
maven-compiler-plugin
${plugin.compiler.version}
-1.7
-1.7
+1.8
+1.8
diff --git
a/struts2-archetype-starter/src/main/resources/archetype-resources/pom.xml
b/struts2-archetype-starter/src/main/resources/archetype-resources/pom.xml
index 49dba42..6bb869b 100644
--- a/struts2-archetype-starter/src/main/resources/archetype-resources/pom.xml
+++ b/struts2-archetype-starter/sr
