date:20221209

[struts] branch master updated: WW-5199 Allow forwarding from/to actions

2022-12-09 Thread lukaszlenart

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 afd04ea5a WW-5199 Allow forwarding from/to actions
 new 579796de5 Merge pull request #642 from atlassian/WW-5199-forward-action
afd04ea5a is described below

commit afd04ea5af64768ba61b941a4fdd277674196820
Author: Kusal Kithul-Godage 
AuthorDate: Fri Dec 9 00:26:40 2022 +1100

WW-5199 Allow forwarding from/to actions
---
 .../org/apache/struts2/showcase/DispatcherResultTest.java |  9 ++---
 .../org/apache/struts2/dispatcher/PrepareOperations.java  | 15 +++
 .../struts2/dispatcher/filter/StrutsExecuteFilter.java| 13 +++--
 .../struts2/dispatcher/filter/StrutsPrepareFilter.java|  2 +-
 4 files changed, 17 insertions(+), 22 deletions(-)

diff --git 
a/apps/showcase/src/test/java/it/org/apache/struts2/showcase/DispatcherResultTest.java
 
b/apps/showcase/src/test/java/it/org/apache/struts2/showcase/DispatcherResultTest.java
index 6564270c2..3819e27ab 100644
--- 
a/apps/showcase/src/test/java/it/org/apache/struts2/showcase/DispatcherResultTest.java
+++ 
b/apps/showcase/src/test/java/it/org/apache/struts2/showcase/DispatcherResultTest.java
@@ -43,13 +43,8 @@ public class DispatcherResultTest {
 webClient.getOptions().setThrowExceptionOnFailingStatusCode(false);
 final HtmlPage page = 
webClient.getPage(ParameterUtils.getBaseUrl() + "/dispatcher/forward.action");
 
-//DomElement div = page.getElementById("dispatcher-result");
-//Assert.assertEquals("This page is a result of \"dispatching\" to 
it from an action", div.asNormalizedText());
-// support for forwarding to another action is broken on 
StrutsPrepareFilter/StrutsExecuteFilter
-// it only works in StrutsPrepareAndExecuteFilter
-// this will be fixed in Struts 6.1.x
-
-Assert.assertEquals(404, page.getWebResponse().getStatusCode());
+DomElement div = page.getElementById("dispatcher-result");
+Assert.assertEquals("This page is a result of \"dispatching\" to 
it from an action", div.asNormalizedText());
 }
 }
 
diff --git 
a/core/src/main/java/org/apache/struts2/dispatcher/PrepareOperations.java 
b/core/src/main/java/org/apache/struts2/dispatcher/PrepareOperations.java
index 1d6981bb1..a25e372cf 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/PrepareOperations.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/PrepareOperations.java
@@ -52,6 +52,7 @@ public class PrepareOperations {
 
 private Dispatcher dispatcher;
 private static final String STRUTS_ACTION_MAPPING_KEY = 
"struts.actionMapping";
+private static final String NO_ACTION_MAPPING = "noActionMapping";
 public static final String CLEANUP_RECURSION_COUNTER = 
"__cleanup_recursion_counter";
 
 public PrepareOperations(Dispatcher dispatcher) {
@@ -73,7 +74,7 @@ public class PrepareOperations {
 if (oldCounter != null) {
 counter = oldCounter + 1;
 }
-
+
 ActionContext oldContext = ActionContext.getContext();
 if (oldContext != null) {
 // detected existing context, so we are probably in a forward
@@ -172,7 +173,7 @@ public class PrepareOperations {
  * has already been found, otherwise, it creates it and stores it in the 
request.  No mapping will be created in the
  * case of static resource requests or unidentifiable requests for other 
servlets, for example.
  * @param forceLookup if true, the action mapping will be looked up from 
the ActionMapper instance, ignoring if there is one
- * in the request or not 
+ * in the request or not
  *
  * @param request servlet request
  * @param response servlet response
@@ -180,18 +181,24 @@ public class PrepareOperations {
  * @return the action mapping
  */
 public ActionMapping findActionMapping(HttpServletRequest request, 
HttpServletResponse response, boolean forceLookup) {
-ActionMapping mapping = (ActionMapping) 
request.getAttribute(STRUTS_ACTION_MAPPING_KEY);
-if (mapping == null || forceLookup) {
+ActionMapping mapping = null;
+
+Object mappingAttr = request.getAttribute(STRUTS_ACTION_MAPPING_KEY);
+if (mappingAttr == null || forceLookup) {
 try {
 mapping = 
dispatcher.getContainer().getInstance(ActionMapper.class).getMapping(request, 
dispatcher.getConfigurationManager());
 if (mapping != null) {
 request.setAttribute(STRUTS_ACTION_MAPPING_KEY, mapping);
+} else {
+request.setAttribute(STRUTS_ACTION_MAPPING_KEY, 
NO_ACTION_MAPPING);
 }
 } catch (Exception ex) {
 if (dispatcher.isHandleException() |

[struts] branch WW-5264-xslt updated (9b11842bf -> 3dc7598fa)

2022-12-09 Thread lukaszlenart

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


omit 9b11842bf WW-5264 Moves XSLT result into a dedicated plugin
 new 3dc7598fa 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   (9b11842bf)
\
 N -- N -- N   refs/heads/WW-5264-xslt (3dc7598fa)

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:
 .../java/org/apache/struts2/result/xslt/MapAdapter.java   |  4 +++-
 .../apache/struts2/result/xslt/ProxyElementAdapter.java   | 10 --
 .../org/apache/struts2/result/xslt/ProxyNodeAdapter.java  |  5 +++--
 .../apache/struts2/result/xslt/SimpleAdapterDocument.java |  4 +++-
 .../org/apache/struts2/result/xslt/SimpleTextNode.java| 10 +-
 .../java/org/apache/struts2/result/xslt/XSLTResult.java   | 15 ++-
 6 files changed, 16 insertions(+), 32 deletions(-)

[struts] 01/01: WW-5264 Moves XSLT result into a dedicated plugin

2022-12-09 Thread lukaszlenart

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 3dc7598fa34f28a135b44ed82d32ac9155258ed8
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|  30 ++---
 .../struts2/result}/xslt/ProxyAttrAdapter.java |  13 +--
 .../struts2/result}/xslt/ProxyElementAdapter.java  |  27 ++---
 .../struts2/result}/xslt/ProxyNamedNodeMap.java|  10 +-
 .../struts2/result}/xslt/ProxyNodeAdapter.java |  61 +-
 .../struts2/result}/xslt/ProxyTextNodeAdapter.java |   3 +-
 .../struts2/result}/xslt/ServletURIResolver.java   |  26 ++---
 .../result}/xslt/SimpleAdapterDocument.java|  44 +---
 .../struts2/result}/xslt/SimpleNodeList.java   |  16 +--
 .../struts2/result}/xslt/SimpleTextNode.java   |  15 ++-
 .../apache/struts2/result}/xslt/StringAdapter.java |  10 +-
 .../apache/struts2/result}/xslt/XSLTResult.java|  21 +---
 .../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, 402 insertions(+), 421 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_OBJE

[struts] 01/01: WW-5264 Moves XSLT result into a dedicated plugin

2022-12-09 Thread lukaszlenart

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 15dd2f2234e70dd95ed83900f2e255d7daddbca2
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|  30 ++---
 .../struts2/result}/xslt/ProxyAttrAdapter.java |  13 +--
 .../struts2/result}/xslt/ProxyElementAdapter.java  |  27 ++---
 .../struts2/result}/xslt/ProxyNamedNodeMap.java|  10 +-
 .../struts2/result}/xslt/ProxyNodeAdapter.java |  61 +-
 .../struts2/result}/xslt/ProxyTextNodeAdapter.java |   3 +-
 .../struts2/result}/xslt/ServletURIResolver.java   |  26 ++---
 .../result}/xslt/SimpleAdapterDocument.java|  43 ---
 .../struts2/result}/xslt/SimpleNodeList.java   |  16 +--
 .../struts2/result}/xslt/SimpleTextNode.java   |  15 ++-
 .../apache/struts2/result}/xslt/StringAdapter.java |  10 +-
 .../apache/struts2/result}/xslt/XSLTResult.java|  21 +---
 .../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, 401 insertions(+), 421 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_OBJEC

[struts] branch WW-5264-xslt updated (3dc7598fa -> 15dd2f223)

2022-12-09 Thread lukaszlenart

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 3dc7598fa WW-5264 Moves XSLT result into a dedicated plugin
 new 15dd2f223 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   (3dc7598fa)
\
 N -- N -- N   refs/heads/WW-5264-xslt (15dd2f223)

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:
 .../main/java/org/apache/struts2/result/xslt/SimpleAdapterDocument.java  | 1 -
 1 file changed, 1 deletion(-)

[struts] branch master updated (579796de5 -> 0e62b4b53)

2022-12-09 Thread lukaszlenart

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 579796de5 Merge pull request #642 from atlassian/WW-5199-forward-action
 add 15dd2f223 WW-5264 Moves XSLT result into a dedicated plugin
 new 0e62b4b53 Merge pull request #641 from apache/WW-5264-xslt

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:
 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/{testng => xslt}/pom.xml   |  23 ++--
 .../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|  30 ++---
 .../struts2/result}/xslt/ProxyAttrAdapter.java |  13 +--
 .../struts2/result}/xslt/ProxyElementAdapter.java  |  27 ++---
 .../struts2/result}/xslt/ProxyNamedNodeMap.java|  10 +-
 .../struts2/result}/xslt/ProxyNodeAdapter.java |  61 +-
 .../struts2/result}/xslt/ProxyTextNodeAdapter.java |   3 +-
 .../struts2/result}/xslt/ServletURIResolver.java   |  26 ++---
 .../result}/xslt/SimpleAdapterDocument.java|  43 ---
 .../struts2/result}/xslt/SimpleNodeList.java   |  16 +--
 .../struts2/result}/xslt/SimpleTextNode.java   |  15 ++-
 .../apache/struts2/result}/xslt/StringAdapter.java |  10 +-
 .../apache/struts2/result}/xslt/XSLTResult.java|  21 +---
 .../apache/struts2/result/xslt/XsltConstants.java  |  17 +--
 .../org/apache/struts2/result}/xslt/package.html   |   0
 .../xslt/src/main/resources/struts-plugin.xml  |   9 +-
 .../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, 388 insertions(+), 378 deletions(-)
 create mode 100644 plugins/xslt/README.md
 copy plugins/{testng => xslt}/pom.xml (86%)
 rename {core/src/main/java/org/apache/struts2/views => 
plugins/xslt/src/main/java/org/apache/struts2/result}/xslt/AbstractAdapterElement.java
 (86%)
 rename {core/src/main/java/org/apache/struts2/views => 
plugins/xslt/src/main/java/org/apache/struts2/result}/xslt/AbstractAdapterNode.java
 (76%)
 rename {core/src/main/java/org/apache/struts2/views => 
plugins/xslt/src/main/java/org/apache/struts2/result}/xslt/AdapterFactory.java 
(91%)
 rename {core/src/main/java/org/apache/struts2/views => 
plugins/xslt/src/main/java/org/apache/struts2/result}/xslt/AdapterNode.java 
(98%)
 rename {core/src/main/java/org/apache/struts2/views => 
plugins/xslt/src/main/java/org/apache/struts2/result}/xslt/ArrayAdapter.java 
(89%)
 rename {core/src/main/java/org/apache/struts2/views => 
plugins/xslt/src/main/java/org/apache/struts2/result}/xslt/BeanAdapter.java 
(77%)
 rename {core/src/main/java/org/apache/struts2/views => 
plugins/xslt/src/main/java/org/apache/struts2/result}/xslt/CollectionAdapter.java
 (84%)
 rename {core/src/main/java/org/apache/struts2/views => 
plugins/xslt/src/main/java/org/apache/struts2/result}/xslt/MapAdapter.java (72%)
 rename {core/src/main/java/org/apache/struts2/views => 
plugins/xslt/src/main/java/org/apache/struts2/result}/xslt/ProxyAttrAdapter.java
 (93%)
 rename {core/src/main/java/org/apache/struts2/views => 
plugins/xslt/src/main/java/org/apache/struts2/result}/xslt/ProxyElementAdapter.java
 (89%)
 rename {core/src/main/java/org/apache/struts2/views => 
plugins/xslt/src/main/java/org/apache/struts2/result}/xslt/ProxyNamedNodeMap.java
 (93%)
 rename {core/src/main/java/org/apache/struts2/views => 
plugins/xsl

[struts] 01/01: Merge pull request #641 from apache/WW-5264-xslt

2022-12-09 Thread lukaszlenart

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 0e62b4b53456e3158393a050d30475896ce6d549
Merge: 579796de5 15dd2f223
Author: Lukasz Lenart 
AuthorDate: Fri Dec 9 10:07:03 2022 +0100

Merge pull request #641 from apache/WW-5264-xslt

[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|  30 ++---
 .../struts2/result}/xslt/ProxyAttrAdapter.java |  13 +--
 .../struts2/result}/xslt/ProxyElementAdapter.java  |  27 ++---
 .../struts2/result}/xslt/ProxyNamedNodeMap.java|  10 +-
 .../struts2/result}/xslt/ProxyNodeAdapter.java |  61 +-
 .../struts2/result}/xslt/ProxyTextNodeAdapter.java |   3 +-
 .../struts2/result}/xslt/ServletURIResolver.java   |  26 ++---
 .../result}/xslt/SimpleAdapterDocument.java|  43 ---
 .../struts2/result}/xslt/SimpleNodeList.java   |  16 +--
 .../struts2/result}/xslt/SimpleTextNode.java   |  15 ++-
 .../apache/struts2/result}/xslt/StringAdapter.java |  10 +-
 .../apache/struts2/result}/xslt/XSLTResult.java|  21 +---
 .../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, 401 insertions(+), 421 deletions(-)

[struts] 01/01: Applies permission to GH workflows

2022-12-09 Thread lukaszlenart

This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a commit to branch gh-permission
in repository https://gitbox.apache.org/repos/asf/struts.git

commit 0b67350084086f8a6067ae865d8fb715ab3a6a9a
Author: Lukasz Lenart 
AuthorDate: Fri Dec 9 10:25:59 2022 +0100

Applies permission to GH workflows
---
 .github/workflows/codeql.yml | 10 +-
 .github/workflows/maven.yml  |  2 ++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 147129c17..cc9af2b6d 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -20,6 +20,14 @@ on:
 branches: [ "master" ]
   pull_request:
 
+permissions:
+  # Needed to upload the results to code-scanning dashboard.
+  security-events: write
+  actions: read
+  contents: read
+  # Needed to access OIDC token.
+  id-token: write
+
 jobs:
   analyze:
 name: Analyze
@@ -38,7 +46,7 @@ jobs:
 - name: Initialize CodeQL
   uses: github/codeql-action/init@v2
   with:
-languages: ${{ matrix.language }}
+languages: ${{ matrix.language }}
 - name: Autobuild
   uses: github/codeql-action/autobuild@v2
 - name: Perform CodeQL Analysis
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 9a0d796aa..7218879ba 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -21,6 +21,8 @@ on:
 branches:
   - master
 
+permissions: read-all
+
 env:
   MAVEN_OPTS: -Xmx2048m -Xms1024m
   LANG: en_US.utf8

[struts] branch gh-permission created (now 0b6735008)

2022-12-09 Thread lukaszlenart

This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a change to branch gh-permission
in repository https://gitbox.apache.org/repos/asf/struts.git


  at 0b6735008 Applies permission to GH workflows

This branch includes the following new commits:

 new 0b6735008 Applies permission to GH workflows

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] branch master updated (0e62b4b53 -> 56d905d72)

2022-12-09 Thread lukaszlenart

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 0e62b4b53 Merge pull request #641 from apache/WW-5264-xslt
 add 0b6735008 Applies permission to GH workflows
 new 56d905d72 Merge pull request #643 from apache/gh-permission

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:
 .github/workflows/codeql.yml | 10 +-
 .github/workflows/maven.yml  |  2 ++
 2 files changed, 11 insertions(+), 1 deletion(-)

[struts] 01/01: Merge pull request #643 from apache/gh-permission

2022-12-09 Thread lukaszlenart

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 56d905d726393f7d7a6c7c80ba7b225911dd8c00
Merge: 0e62b4b53 0b6735008
Author: Lukasz Lenart 
AuthorDate: Fri Dec 9 10:36:39 2022 +0100

Merge pull request #643 from apache/gh-permission

Applies permission to GH workflows

 .github/workflows/codeql.yml | 10 +-
 .github/workflows/maven.yml  |  2 ++
 2 files changed, 11 insertions(+), 1 deletion(-)

[struts-examples] branch dependabot/maven/rest-angular/org.springframework-spring-web-6.0.0 created (now 3da3623)

2022-12-09 Thread github-bot

This is an automated email from the ASF dual-hosted git repository.

github-bot pushed a change to branch 
dependabot/maven/rest-angular/org.springframework-spring-web-6.0.0
in repository https://gitbox.apache.org/repos/asf/struts-examples.git


  at 3da3623  Bump spring-web from 5.3.23 to 6.0.0 in /rest-angular

No new revisions were added by this update.

[struts] branch dependabot/maven/org.springframework-spring-web-6.0.0 created (now feff03e91)

2022-12-09 Thread github-bot

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.0
in repository https://gitbox.apache.org/repos/asf/struts.git


  at feff03e91 Bump spring-web from 5.3.23 to 6.0.0

No new revisions were added by this update.

[struts] branch master updated: WW-5199 Allow forwarding from/to actions

[struts] branch WW-5264-xslt updated (9b11842bf -> 3dc7598fa)

[struts] 01/01: WW-5264 Moves XSLT result into a dedicated plugin

[struts] 01/01: WW-5264 Moves XSLT result into a dedicated plugin

[struts] branch WW-5264-xslt updated (3dc7598fa -> 15dd2f223)

[struts] branch master updated (579796de5 -> 0e62b4b53)

[struts] 01/01: Merge pull request #641 from apache/WW-5264-xslt

[struts] 01/01: Applies permission to GH workflows

[struts] branch gh-permission created (now 0b6735008)

[struts] branch master updated (0e62b4b53 -> 56d905d72)

[struts] 01/01: Merge pull request #643 from apache/gh-permission

[struts-examples] branch dependabot/maven/rest-angular/org.springframework-spring-web-6.0.0 created (now 3da3623)

[struts] branch dependabot/maven/org.springframework-spring-web-6.0.0 created (now feff03e91)

13 matches

Site Navigation

Mail list logo

Footer information