(struts) branch merge/master-to-7xx-2024-04-07 deleted (was e5e6145c3)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch merge/master-to-7xx-2024-04-07 in repository https://gitbox.apache.org/repos/asf/struts.git was e5e6145c3 Merge remote-tracking branch 'origin/master' into merge/master-to-7xx-2024-04-07 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(struts) branch release/struts-7-0-x updated (4939d3cef -> f59a06063)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch release/struts-7-0-x in repository https://gitbox.apache.org/repos/asf/struts.git from 4939d3cef Merge pull request #893 from gregh3269/fix-STRUTS_7_0_0_M3-upload-file-name add ceb0a9a73 Bump net.sf.jasperreports:jasperreports from 6.20.6 to 6.21.0 add c553c93fa Merge pull request #843 from apache/dependabot/maven/net.sf.jasperreports-jasperreports-6.21.0 add 9d2a7649c Updates link to build status on Jenkins add 93fa72ee1 Merge pull request #878 from apache/fix/build-status add 43d180f36 Bump org.apache.maven.doxia:doxia-core from 1.9.1 to 1.12.0 add d9ed77d3f Merge pull request #879 from apache/dependabot/maven/org.apache.maven.doxia-doxia-core-1.12.0 add 94b2ee7ce Bump slf4j.version from 2.0.11 to 2.0.12 add 82491eff8 Merge pull request #880 from apache/dependabot/maven/slf4j.version-2.0.12 add 8283ded5e Bump org.apache.maven.doxia:doxia-module-markdown from 1.9.1 to 1.12.0 add 3aa63e8cb Merge pull request #883 from apache/dependabot/maven/org.apache.maven.doxia-doxia-module-markdown-1.12.0 add 1ddf446f7 Bump commons-validator:commons-validator from 1.6 to 1.8.0 add 0c4e21145 Merge pull request #882 from apache/dependabot/maven/commons-validator-commons-validator-1.8.0 add 43f119796 Bump org.apache.commons:commons-compress from 1.25.0 to 1.26.0 add 154132d46 Merge pull request #884 from apache/dependabot/maven/org.apache.commons-commons-compress-1.26.0 add ac6095d1a Bump maven-surefire-plugin.version from 3.0.0-M7 to 3.2.5 add 6648cbdb2 Merge pull request #886 from apache/dependabot/maven/maven-surefire-plugin.version-3.2.5 add f45998102 WW-5401 Improves logging around wrapping request and detecting multipart request add c32018127 WW-5401 Fixes typo add ac6c88ad4 WW-5401 Uses same message approach add e08f637be Merge pull request #892 from apache/feature/WW-5401-logging add 29422e47f WW-5364 Fix potential NPE in XmlDocConfigurationProvider add 86aee4b0e Merge pull request #894 from apache/WW-5364-npe add db0bd4385 Converts multiple file uploads example to use Action based upload add cdc931e26 Merge pull request #895 from apache/fix/file-uploads add cda2a2b23 WW-5251 Reinstate deleted interfaces with transparent compat add 19698e1fd WW-5251 Fix ParameterAware add dc774c484 WW-5251 Reinstate RequestAware add 7281d7e2e Merge pull request #898 from apache/WW-5251-retrofit-compat add 6950fcb75 Enables required review by codeowners add 66c1ac431 Merge pull request #899 from apache/feature/codeowners-review add 93c11aaf6 WW-5251 Fix deprecated interface method signature add c774e23ef Merge pull request #900 from apache/WW-5251-retrofit-compat add c7ae61482 WW-5402 Auto loads Tiles definitions from classpath add 689d17d27 Merge pull request #896 from apache/feature/WW-5402-autoload-classptah add 273c3a1a9 Uses proper context name in branch protection rule add 5cf746f53 Merge pull request #901 from apache/fix/branch-protction add 7a79576bb Bump log4j2.version from 2.21.1 to 2.23.1 add ee38cd5b1 Merge pull request #902 from apache/dependabot/maven/log4j2.version-2.23.1 add db725518e WW-5390 Fixes creating assembly and attaching sources when preparing a new release add 0f6d5dbb2 Merge pull request #903 from apache/fix/WW-5390-assembly add e5e6145c3 Merge remote-tracking branch 'origin/master' into merge/master-to-7xx-2024-04-07 add f59a06063 Merge pull request #904 from apache/merge/master-to-7xx-2024-04-07 No new revisions were added by this update. Summary of changes: .asf.yaml | 8 +- README.md | 2 +- .../showcase/fileupload/FileUploadAction.java | 5 +- .../MultipleFileUploadUsingArrayAction.java| 82 ++--- .../MultipleFileUploadUsingListAction.java | 88 +++--- .../providers/XmlDocConfigurationProvider.java | 4 +- .../apache/struts2/action/UploadedFilesAware.java | 3 +- .../org/apache/struts2/dispatcher/Dispatcher.java | 13 ++- .../multipart/AbstractMultiPartRequest.java| 11 +- .../multipart/JakartaMultiPartRequest.java | 7 +- .../multipart/JakartaStreamMultiPartRequest.java | 6 +- .../dispatcher/multipart/MultiPartRequest.java | 2 +- .../multipart/MultiPartRequestWrapper.java | 3 +- .../dispatcher/multipart/StrutsUploadedFile.java | 4 +- .../struts2/dispatcher/multipart/UploadedFile.java | 4 +- .../interceptor/AbstractFileUploadInterceptor.java | 3 +- .../interceptor/ActionFileUploadInterceptor.java | 7 +- .../struts2/interceptor/ApplicationAware.java} | 18 ++- .../struts2/interceptor/HttpParametersAware.java} | 18 ++- .../struts2/interceptor/ParameterAware.java}
(struts) branch WW-5406-excluded-patterns created (now b27a28d20)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch WW-5406-excluded-patterns in repository https://gitbox.apache.org/repos/asf/struts.git at b27a28d20 WW-5406 Ensure Action excluded patterns are reinjected This branch includes the following new commits: new b27a28d20 WW-5406 Ensure Action excluded patterns are reinjected 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-5406 Ensure Action excluded patterns are reinjected
This is an automated email from the ASF dual-hosted git repository.
kusal pushed a commit to branch WW-5406-excluded-patterns
in repository https://gitbox.apache.org/repos/asf/struts.git
commit b27a28d2078742bbc95e711d8f844f9948e47e25
Author: Kusal Kithul-Godage
AuthorDate: Mon Apr 8 23:03:42 2024 +1000
WW-5406 Ensure Action excluded patterns are reinjected
---
.../org/apache/struts2/dispatcher/Dispatcher.java | 29 ++
.../apache/struts2/dispatcher/InitOperations.java | 25 +++
.../struts2/dispatcher/PrepareOperations.java | 16 ++--
.../filter/StrutsPrepareAndExecuteFilter.java | 6 +++--
.../dispatcher/filter/StrutsPrepareFilter.java | 6 +++--
5 files changed, 42 insertions(+), 40 deletions(-)
diff --git a/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
b/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
index 5bad0b4fe..8c7aa5e67 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
@@ -78,6 +78,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.File;
import java.io.IOException;
+import java.util.Arrays;
import java.util.Collection;
import java.util.HashSet;
import java.util.List;
@@ -88,6 +89,10 @@ import java.util.Set;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.regex.Pattern;
+import static java.util.Collections.emptyList;
+import static java.util.Collections.unmodifiableList;
+import static java.util.stream.Collectors.toList;
+
/**
* A utility class the actual dispatcher delegates most of its tasks to. Each
instance
* of the primary dispatcher holds an instance of this dispatcher to be shared
for
@@ -162,6 +167,9 @@ public class Dispatcher {
*/
private Pattern multipartValidationPattern =
Pattern.compile(MULTIPART_FORM_DATA_REGEX);
+private String actionExcludedPatternsSeparator = ",";
+private List actionExcludedPatterns = emptyList();
+
/**
* Provide list of default configuration files.
*/
@@ -340,6 +348,27 @@ public class Dispatcher {
this.multipartValidationPattern =
Pattern.compile(multipartValidationRegex);
}
+@Inject(value = StrutsConstants.STRUTS_ACTION_EXCLUDE_PATTERN_SEPARATOR,
required = false)
+public void setActionExcludedPatternsSeparator(String separator) {
+this.actionExcludedPatternsSeparator = separator;
+}
+
+@Inject(value = StrutsConstants.STRUTS_ACTION_EXCLUDE_PATTERN, required =
false)
+public void setActionExcludedPatterns(String excludedPatterns) {
+this.actionExcludedPatterns =
buildExcludedPatternsList(actionExcludedPatternsSeparator,
actionExcludedPatternsSeparator);
+}
+
+private static List buildExcludedPatternsList(String patterns,
String separator) {
+if (patterns == null || patterns.trim().isEmpty()) {
+return emptyList();
+}
+return
unmodifiableList(Arrays.stream(patterns.split(separator)).map(String::trim).map(Pattern::compile).collect(toList()));
+}
+
+public List getActionExcludedPatterns() {
+return actionExcludedPatterns;
+}
+
@Inject
public void setValueStackFactory(ValueStackFactory valueStackFactory) {
this.valueStackFactory = valueStackFactory;
diff --git
a/core/src/main/java/org/apache/struts2/dispatcher/InitOperations.java
b/core/src/main/java/org/apache/struts2/dispatcher/InitOperations.java
index 367aeba55..f5cf21a91 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/InitOperations.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/InitOperations.java
@@ -19,10 +19,7 @@
package org.apache.struts2.dispatcher;
import com.opensymphony.xwork2.ActionContext;
-import org.apache.struts2.StrutsConstants;
-import java.util.ArrayList;
-import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
@@ -100,27 +97,11 @@ public class InitOperations {
* @param dispatcher The dispatcher to check for exclude pattern
configuration
* @return a List of Patterns for request to exclude if apply, or
null
* @see org.apache.struts2.StrutsConstants#STRUTS_ACTION_EXCLUDE_PATTERN
+ * @deprecated since 6.4.0, use {@link
Dispatcher#getActionExcludedPatterns()} instead.
*/
+@Deprecated
public List buildExcludedPatternsList(Dispatcher dispatcher) {
-String excludePatterns =
dispatcher.getContainer().getInstance(String.class,
StrutsConstants.STRUTS_ACTION_EXCLUDE_PATTERN);
-String separator = dispatcher.getContainer().getInstance(String.class,
StrutsConstants.STRUTS_ACTION_EXCLUDE_PATTERN_SEPARATOR);
-if (separator == null) {
-separator = ",";
-}
-return buildExcludedPatternsList(excludePatterns, separator);
-}
-
-private List buildExclu
(struts) branch WW-5406-excluded-patterns updated (b27a28d20 -> 6f6b1367e)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch WW-5406-excluded-patterns in repository https://gitbox.apache.org/repos/asf/struts.git discard b27a28d20 WW-5406 Ensure Action excluded patterns are reinjected add 6f6b1367e WW-5406 Ensure Action excluded patterns are reinjected 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 (b27a28d20) \ N -- N -- N refs/heads/WW-5406-excluded-patterns (6f6b1367e) 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. No new revisions were added by this update. Summary of changes: .../main/java/org/apache/struts2/dispatcher/Dispatcher.java | 2 +- .../StrutsPrepareAndExecuteFilterIntegrationTest.java | 13 ++--- 2 files changed, 3 insertions(+), 12 deletions(-)
(struts) branch WW-5406-excluded-patterns updated (6f6b1367e -> efa20426c)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch WW-5406-excluded-patterns in repository https://gitbox.apache.org/repos/asf/struts.git discard 6f6b1367e WW-5406 Ensure Action excluded patterns are reinjected add efa20426c WW-5406 Ensure Action excluded patterns are reinjected 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 (6f6b1367e) \ N -- N -- N refs/heads/WW-5406-excluded-patterns (efa20426c) 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. No new revisions were added by this update. Summary of changes: .../apache/struts2/dispatcher/DispatcherTest.java | 26 +++ .../struts2/dispatcher/InitOperationsTest.java | 86 -- 2 files changed, 26 insertions(+), 86 deletions(-) delete mode 100644 core/src/test/java/org/apache/struts2/dispatcher/InitOperationsTest.java
