[struts] 01/01: Merge pull request #639 from apache/WW-5263-csp-naming
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 79eebf37176c29fae528eff8d0e1b1304684c50e Merge: 45b36a13e ea15306aa Author: Lukasz Lenart AuthorDate: Sun Dec 4 11:18:27 2022 +0100 Merge pull request #639 from apache/WW-5263-csp-naming [WW-5263] Uses proper names for CSP, COOP and COEP interceptors core/src/main/resources/struts-default.xml | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-)
[struts] branch master updated (45b36a13e -> 79eebf371)
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 45b36a13e Merge pull request #638 from apache/jira-autolink add ea15306aa WW-5263 Uses porper names for CSP, COOP and COEP interceptors new 79eebf371 Merge pull request #639 from apache/WW-5263-csp-naming 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: core/src/main/resources/struts-default.xml | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-)
[struts] branch WW-5262-beans updated (f8a71bbe3 -> b9b9aaf71)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch WW-5262-beans in repository https://gitbox.apache.org/repos/asf/struts.git omit f8a71bbe3 WW-5262 Extracts excluded classes and beans into dedicated XML config files add 79eebf371 Merge pull request #639 from apache/WW-5263-csp-naming new b9b9aaf71 WW-5262 Extracts excluded classes and beans into dedicated XML config files This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (f8a71bbe3) \ N -- N -- N refs/heads/WW-5262-beans (b9b9aaf71) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. 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:
[struts] 01/01: WW-5262 Extracts excluded classes and beans into dedicated XML config files
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch WW-5262-beans
in repository https://gitbox.apache.org/repos/asf/struts.git
commit b9b9aaf71035697e7df113986148e2f1bc037086
Author: Lukasz Lenart
AuthorDate: Thu Dec 1 07:32:16 2022 +0100
WW-5262 Extracts excluded classes and beans into dedicated XML config files
---
core/src/main/resources/struts-beans.xml | 248 +
core/src/main/resources/struts-default.xml | 297 +
.../src/main/resources/struts-excluded-classes.xml | 106
.../apache/struts2/dispatcher/DispatcherTest.java | 2 +
4 files changed, 358 insertions(+), 295 deletions(-)
diff --git a/core/src/main/resources/struts-beans.xml
b/core/src/main/resources/struts-beans.xml
new file mode 100644
index 0..eac1ff8be
--- /dev/null
+++ b/core/src/main/resources/struts-beans.xml
@@ -0,0 +1,248 @@
+
+
+
+
+https://struts.apache.org/dtds/struts-6.0.dtd";>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/core/src/main/resources/struts-default.xml
b/core/src/main/resources/struts-default.xml
index 0bb197b56..420a2c56a 100644
--- a/core/src/main/resources/struts-default.xml
+++ b/core/src/main/resources/struts-default.xml
@@ -20,307 +20,14 @@
*/
-->
-
https://struts.apache.org/dtds/struts-6.0.dtd";>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/core/src/main/resources/struts-excluded-classes.xml
b/core/src/main/resources/struts-excluded-classes.xml
new file mode 100644
index 0..524194af9
--- /dev/null
+++ b/core/src/main/resources/struts-excluded-classes.xml
@@ -0,0 +1,106 @@
+
+
+
+https://struts.apache.org/dtds/struts-6.0.dtd";>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git
a/core/src/test/java/org/apache/struts2/dispatcher/DispatcherTest.java
b/core/src/test/java/org/apache/struts2/dispatcher/DispatcherTest.java
index 6e996df0d..70a880c7a 100644
--- a/core/src/test/java/org/apache/struts2/dispatcher/DispatcherTest.java
+++ b/core/src/test/java/org/apache/struts2/dispatcher/DispatcherTest.java
@@ -232,6 +232,8 @@ public class DispatcherTest extends StrutsInternalTestCase {
assertNotNull(config);
HashSet expected = new HashSet<>();
expected.add("struts-default.xml");
+expected.add("struts-beans.xml");
+expected.add("struts-excluded-classes.xml");
expected.add("struts-plugin.xml");
expected.add("struts.xml");
assertEquals(expected, config.getLoadedFileNames());
[struts] branch master updated (79eebf371 -> 97691a106)
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 79eebf371 Merge pull request #639 from apache/WW-5263-csp-naming add b9b9aaf71 WW-5262 Extracts excluded classes and beans into dedicated XML config files new 97691a106 Merge pull request #640 from apache/WW-5262-beans 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: core/src/main/resources/struts-beans.xml | 248 + core/src/main/resources/struts-default.xml | 297 + .../src/main/resources/struts-excluded-classes.xml | 106 .../apache/struts2/dispatcher/DispatcherTest.java | 2 + 4 files changed, 358 insertions(+), 295 deletions(-) create mode 100644 core/src/main/resources/struts-beans.xml create mode 100644 core/src/main/resources/struts-excluded-classes.xml
[struts] 01/01: Merge pull request #640 from apache/WW-5262-beans
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 97691a106d1f63d5173a2397b155527535b85764 Merge: 79eebf371 b9b9aaf71 Author: Lukasz Lenart AuthorDate: Sun Dec 4 12:09:00 2022 +0100 Merge pull request #640 from apache/WW-5262-beans [WW-5262] Extracts excluded classes and beans into dedicated XML config files core/src/main/resources/struts-beans.xml | 248 + core/src/main/resources/struts-default.xml | 297 + .../src/main/resources/struts-excluded-classes.xml | 106 .../apache/struts2/dispatcher/DispatcherTest.java | 2 + 4 files changed, 358 insertions(+), 295 deletions(-)
[struts] branch WW-5264-xslt created (now ebd0d4827)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch WW-5264-xslt in repository https://gitbox.apache.org/repos/asf/struts.git at ebd0d4827 WW-5264 Moves XSLT result into a dedicated plugin This branch includes the following new commits: new ebd0d4827 WW-5264 Moves XSLT result into a dedicated plugin 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.
[struts] 01/01: WW-5264 Moves XSLT result into a dedicated plugin
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch WW-5264-xslt
in repository https://gitbox.apache.org/repos/asf/struts.git
commit ebd0d4827efcc1de4685b40829512975f61191a4
Author: Lukasz Lenart
AuthorDate: Sun Dec 4 12:49:44 2022 +0100
WW-5264 Moves XSLT result into a dedicated plugin
---
apps/showcase/pom.xml | 5 +
bom/pom.xml| 5 +
.../java/org/apache/struts2/StrutsConstants.java | 3 -
.../struts2/config/entities/ConstantConfig.java| 1 -
core/src/main/resources/struts-default.xml | 2 +-
plugins/pom.xml| 1 +
plugins/xslt/README.md | 3 +
plugins/{ => xslt}/pom.xml | 62 +++
.../result}/xslt/AbstractAdapterElement.java | 28 ++---
.../struts2/result}/xslt/AbstractAdapterNode.java | 49
.../struts2/result}/xslt/AdapterFactory.java | 25 ++---
.../apache/struts2/result}/xslt/AdapterNode.java | 2 +-
.../apache/struts2/result}/xslt/ArrayAdapter.java | 6 +-
.../apache/struts2/result}/xslt/BeanAdapter.java | 49
.../struts2/result}/xslt/CollectionAdapter.java| 12 +-
.../apache/struts2/result}/xslt/MapAdapter.java| 25 ++---
.../struts2/result}/xslt/ProxyAttrAdapter.java | 12 +-
.../struts2/result}/xslt/ProxyElementAdapter.java | 17 +--
.../struts2/result}/xslt/ProxyNamedNodeMap.java| 10 +-
.../struts2/result}/xslt/ProxyNodeAdapter.java | 39 ---
.../struts2/result}/xslt/ProxyTextNodeAdapter.java | 2 +-
.../struts2/result}/xslt/ServletURIResolver.java | 27 ++---
.../result}/xslt/SimpleAdapterDocument.java| 29 +++--
.../struts2/result}/xslt/SimpleNodeList.java | 16 +--
.../struts2/result}/xslt/SimpleTextNode.java | 2 +-
.../apache/struts2/result}/xslt/StringAdapter.java | 9 +-
.../apache/struts2/result}/xslt/XSLTResult.java| 6 +-
.../apache/struts2/result/xslt/XsltConstants.java | 22 ++--
.../org/apache/struts2/result}/xslt/package.html | 0
.../xslt/src/main/resources/struts-plugin.xml | 21 ++--
.../struts2/result}/xslt/XSLTResultTest.java | 124 ++---
.../src/test/resources/XSLTResultTest-val.xml | 0
.../resources/XSLTResultTest.bad.character.xsl | 0
.../xslt}/src/test/resources/XSLTResultTest.xsl| 0
.../xslt}/src/test/resources/XSLTResultTest2.xsl | 0
.../xslt}/src/test/resources/XSLTResultTest3.xsl | 0
.../test/resources/XSLTResultTest4.badinclude.xsl | 0
.../xslt}/src/test/resources/XSLTResultTest4.xsl | 0
.../xslt}/src/test/resources/XSLTResultTest5.xsl | 0
.../xslt}/src/test/resources/XSLTResultTest6.xsl | 0
pom.xml| 45 +---
41 files changed, 317 insertions(+), 342 deletions(-)
diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml
index add8be9a5..cc6d51d5e 100644
--- a/apps/showcase/pom.xml
+++ b/apps/showcase/pom.xml
@@ -99,6 +99,11 @@
struts2-velocity-plugin
+
+org.apache.struts
+struts2-xslt-plugin
+
+
javax.servlet
javax.servlet-api
diff --git a/bom/pom.xml b/bom/pom.xml
index f1db01489..289e83b02 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -181,6 +181,11 @@
struts2-velocity-plugin
${struts-version.version}
+
+org.apache.struts
+struts2-xslt-plugin
+${struts-version.version}
+
diff --git a/core/src/main/java/org/apache/struts2/StrutsConstants.java
b/core/src/main/java/org/apache/struts2/StrutsConstants.java
index c75ff3d54..9a1920f02 100644
--- a/core/src/main/java/org/apache/struts2/StrutsConstants.java
+++ b/core/src/main/java/org/apache/struts2/StrutsConstants.java
@@ -177,9 +177,6 @@ public final class StrutsConstants {
@Deprecated
public static final String STRUTS_OBJECTFACTORY_SPRING_ENABLE_AOP_SUPPORT
= "struts.objectFactory.spring.enableAopSupport";
-/** Whether or not XSLT templates should not be cached */
-public static final String STRUTS_XSLT_NOCACHE = "struts.xslt.nocache";
-
/** Location of additional configuration properties files to load */
public static final String STRUTS_CUSTOM_PROPERTIES =
"struts.custom.properties";
diff --git
a/core/src/main/java/org/apache/struts2/config/entities/ConstantConfig.java
b/core/src/main/java/org/apache/struts2/config/entities/ConstantConfig.java
index 63c30ce2f..0fe1e300c 100644
--- a/core/src/main/java/org/apache/struts2/config/entities/ConstantConfig.java
+++ b/core/src/main/java/org/apache/struts2/config/entities/ConstantConfig.java
@@ -204,7 +204,6 @@ public class ConstantConfig {
map.put(StrutsConstants.STRUTS_OBJECTFACTORY_SPRING_AUTOWIRE_A
[struts] 01/01: WW-5264 Moves XSLT result into a dedicated plugin
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch WW-5264-xslt
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 9b11842bf2e2a12b6194a54642641a23714bcac1
Author: Lukasz Lenart
AuthorDate: Sun Dec 4 12:49:44 2022 +0100
WW-5264 Moves XSLT result into a dedicated plugin
---
apps/showcase/pom.xml | 5 +
bom/pom.xml| 5 +
.../java/org/apache/struts2/StrutsConstants.java | 3 -
.../struts2/config/entities/ConstantConfig.java| 1 -
core/src/main/resources/struts-default.xml | 2 +-
plugins/pom.xml| 1 +
plugins/xslt/README.md | 3 +
plugins/{ => xslt}/pom.xml | 62 +++
.../result}/xslt/AbstractAdapterElement.java | 31 +++---
.../struts2/result}/xslt/AbstractAdapterNode.java | 117 +--
.../struts2/result}/xslt/AdapterFactory.java | 26 ++---
.../apache/struts2/result}/xslt/AdapterNode.java | 2 +-
.../apache/struts2/result}/xslt/ArrayAdapter.java | 7 +-
.../apache/struts2/result}/xslt/BeanAdapter.java | 57 +-
.../struts2/result}/xslt/CollectionAdapter.java| 13 ++-
.../apache/struts2/result}/xslt/MapAdapter.java| 26 ++---
.../struts2/result}/xslt/ProxyAttrAdapter.java | 13 +--
.../struts2/result}/xslt/ProxyElementAdapter.java | 21 ++--
.../struts2/result}/xslt/ProxyNamedNodeMap.java| 10 +-
.../struts2/result}/xslt/ProxyNodeAdapter.java | 58 +-
.../struts2/result}/xslt/ProxyTextNodeAdapter.java | 3 +-
.../struts2/result}/xslt/ServletURIResolver.java | 26 ++---
.../result}/xslt/SimpleAdapterDocument.java| 40 ---
.../struts2/result}/xslt/SimpleNodeList.java | 16 +--
.../struts2/result}/xslt/SimpleTextNode.java | 5 +-
.../apache/struts2/result}/xslt/StringAdapter.java | 10 +-
.../apache/struts2/result}/xslt/XSLTResult.java| 6 +-
.../apache/struts2/result/xslt/XsltConstants.java | 22 ++--
.../org/apache/struts2/result}/xslt/package.html | 0
.../xslt/src/main/resources/struts-plugin.xml | 21 ++--
.../struts2/result}/xslt/XSLTResultTest.java | 124 ++---
.../src/test/resources/XSLTResultTest-val.xml | 0
.../resources/XSLTResultTest.bad.character.xsl | 0
.../xslt}/src/test/resources/XSLTResultTest.xsl| 0
.../xslt}/src/test/resources/XSLTResultTest2.xsl | 0
.../xslt}/src/test/resources/XSLTResultTest3.xsl | 0
.../test/resources/XSLTResultTest4.badinclude.xsl | 0
.../xslt}/src/test/resources/XSLTResultTest4.xsl | 0
.../xslt}/src/test/resources/XSLTResultTest5.xsl | 0
.../xslt}/src/test/resources/XSLTResultTest6.xsl | 0
pom.xml| 45 +---
41 files changed, 389 insertions(+), 392 deletions(-)
diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml
index add8be9a5..cc6d51d5e 100644
--- a/apps/showcase/pom.xml
+++ b/apps/showcase/pom.xml
@@ -99,6 +99,11 @@
struts2-velocity-plugin
+
+org.apache.struts
+struts2-xslt-plugin
+
+
javax.servlet
javax.servlet-api
diff --git a/bom/pom.xml b/bom/pom.xml
index f1db01489..289e83b02 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -181,6 +181,11 @@
struts2-velocity-plugin
${struts-version.version}
+
+org.apache.struts
+struts2-xslt-plugin
+${struts-version.version}
+
diff --git a/core/src/main/java/org/apache/struts2/StrutsConstants.java
b/core/src/main/java/org/apache/struts2/StrutsConstants.java
index c75ff3d54..9a1920f02 100644
--- a/core/src/main/java/org/apache/struts2/StrutsConstants.java
+++ b/core/src/main/java/org/apache/struts2/StrutsConstants.java
@@ -177,9 +177,6 @@ public final class StrutsConstants {
@Deprecated
public static final String STRUTS_OBJECTFACTORY_SPRING_ENABLE_AOP_SUPPORT
= "struts.objectFactory.spring.enableAopSupport";
-/** Whether or not XSLT templates should not be cached */
-public static final String STRUTS_XSLT_NOCACHE = "struts.xslt.nocache";
-
/** Location of additional configuration properties files to load */
public static final String STRUTS_CUSTOM_PROPERTIES =
"struts.custom.properties";
diff --git
a/core/src/main/java/org/apache/struts2/config/entities/ConstantConfig.java
b/core/src/main/java/org/apache/struts2/config/entities/ConstantConfig.java
index 63c30ce2f..0fe1e300c 100644
--- a/core/src/main/java/org/apache/struts2/config/entities/ConstantConfig.java
+++ b/core/src/main/java/org/apache/struts2/config/entities/ConstantConfig.java
@@ -204,7 +204,6 @@ public class ConstantConfig {
map.put(StrutsConstants.STRUTS_OBJECTFAC
[struts] branch WW-5264-xslt updated (ebd0d4827 -> 9b11842bf)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch WW-5264-xslt in repository https://gitbox.apache.org/repos/asf/struts.git discard ebd0d4827 WW-5264 Moves XSLT result into a dedicated plugin new 9b11842bf WW-5264 Moves XSLT result into a dedicated plugin This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (ebd0d4827) \ N -- N -- N refs/heads/WW-5264-xslt (9b11842bf) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. 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: .../result/xslt/AbstractAdapterElement.java| 5 +- .../struts2/result/xslt/AbstractAdapterNode.java | 72 ++ .../apache/struts2/result/xslt/AdapterFactory.java | 1 - .../apache/struts2/result/xslt/ArrayAdapter.java | 1 + .../apache/struts2/result/xslt/BeanAdapter.java| 10 ++- .../struts2/result/xslt/CollectionAdapter.java | 1 + .../org/apache/struts2/result/xslt/MapAdapter.java | 1 + .../struts2/result/xslt/ProxyAttrAdapter.java | 1 + .../struts2/result/xslt/ProxyElementAdapter.java | 4 ++ .../struts2/result/xslt/ProxyNodeAdapter.java | 23 --- .../struts2/result/xslt/ProxyTextNodeAdapter.java | 1 + .../struts2/result/xslt/ServletURIResolver.java| 1 - .../struts2/result/xslt/SimpleAdapterDocument.java | 11 .../apache/struts2/result/xslt/SimpleNodeList.java | 4 +- .../apache/struts2/result/xslt/SimpleTextNode.java | 3 + .../apache/struts2/result/xslt/StringAdapter.java | 1 + 16 files changed, 81 insertions(+), 59 deletions(-)
[struts-examples] branch dependabot/maven/org.springframework-spring-web-6.0.2 created (now be662ff)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.springframework-spring-web-6.0.2 in repository https://gitbox.apache.org/repos/asf/struts-examples.git at be662ff Bump spring-web from 5.3.23 to 6.0.2 No new revisions were added by this update.
[struts-examples] branch dependabot/maven/javax.servlet-javax.servlet-api-4.0.1 created (now 8199ee8)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/javax.servlet-javax.servlet-api-4.0.1 in repository https://gitbox.apache.org/repos/asf/struts-examples.git at 8199ee8 Bump javax.servlet-api from 3.1.0 to 4.0.1 No new revisions were added by this update.
