[struts] branch master updated (5a30cdbed -> 35a50ea83)
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 5a30cdbed Merge pull request #629 from apache/WW-5255-script-link add 6330bb1ce WW-4514 Fixes building query string with empty parameters add 6135a7133 WW-4514 Extracts parameters string building into a dedicated class with a proper extension point add 728edbef5 Increases sleep to avoid false test failures add 4a51aacf4 WW-4514 Avoids logging user provided data add bfcc0b589 Swaps expected with actual add 35a50ea83 Merge pull request #630 from apache/WW-4514-url No new revisions were added by this update. Summary of changes: .../StrutsDefaultConfigurationProvider.java| 3 + .../java/org/apache/struts2/StrutsConstants.java | 1 + .../config/StrutsBeanSelectionProvider.java| 2 + .../struts2/url/ParametersStringBuilder.java | 12 +- .../struts2/url/StrutsParametersStringBuilder.java | 91 + .../struts2/views/util/DefaultUrlHelper.java | 80 .../org/apache/struts2/default.properties | 6 + core/src/main/resources/struts-default.xml | 2 + .../exec/StrutsBackgroundProcessTest.java | 2 +- .../url/StrutsParametersStringBuilderTest.java | 99 +++ .../apache/struts2/url/StrutsUrlDecoderTest.java | 8 ++ .../apache/struts2/url/StrutsUrlEncoderTest.java | 7 + .../struts2/views/util/DefaultUrlHelperTest.java | 141 +++-- .../struts2/json/JSONActionRedirectResultTest.java | 25 +++- 14 files changed, 316 insertions(+), 163 deletions(-) copy plugins/json/src/main/java/org/apache/struts2/json/bridge/ParameterizedBridge.java => core/src/main/java/org/apache/struts2/url/ParametersStringBuilder.java (75%) create mode 100644 core/src/main/java/org/apache/struts2/url/StrutsParametersStringBuilder.java create mode 100644 core/src/test/java/org/apache/struts2/url/StrutsParametersStringBuilderTest.java
[struts] 01/01: Merge pull request #631 from apache/WW-5240-doubleselect
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 0fe27a673d858da18ed9cb536cbae3c1bef48fca Merge: 35a50ea83 ac168968a Author: Lukasz Lenart AuthorDate: Sun Nov 6 09:57:14 2022 +0100 Merge pull request #631 from apache/WW-5240-doubleselect [WW-5240] Uses doubleOn* attributes in the template .../resources/template/simple/doubleselect.ftl | 85 ++-- core/src/main/resources/template/simple/select.ftl | 6 +- .../struts2/views/jsp/ui/DoubleSelectTest.java | 233 + .../apache/struts2/views/jsp/ui/DoubleSelect-6.txt | 42 4 files changed, 299 insertions(+), 67 deletions(-)
[struts] branch master updated (35a50ea83 -> 0fe27a673)
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 35a50ea83 Merge pull request #630 from apache/WW-4514-url
add ac168968a WW-5240 Uses doubleOn* attributes in the template This
allows assign custom JS event handlers to the second select box
new 0fe27a673 Merge pull request #631 from apache/WW-5240-doubleselect
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:
.../resources/template/simple/doubleselect.ftl | 85 ++--
core/src/main/resources/template/simple/select.ftl | 6 +-
.../struts2/views/jsp/ui/DoubleSelectTest.java | 233 +
.../ui/{DoubleSelect-1.txt => DoubleSelect-6.txt} | 24 +--
4 files changed, 269 insertions(+), 79 deletions(-)
copy
core/src/test/resources/org/apache/struts2/views/jsp/ui/{DoubleSelect-1.txt =>
DoubleSelect-6.txt} (57%)
[struts] branch master updated: Packages with assembly before publishing nightlies
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 9a431ea47 Packages with assembly before publishing nightlies
9a431ea47 is described below
commit 9a431ea47060abdfad657370e84bc87eaea66a87
Author: Lukasz Lenart
AuthorDate: Sun Nov 6 10:14:17 2022 +0100
Packages with assembly before publishing nightlies
---
Jenkinsfile | 1 +
1 file changed, 1 insertion(+)
diff --git a/Jenkinsfile b/Jenkinsfile
index 1f0fe858a..5737be6b1 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -160,6 +160,7 @@ pipeline {
branch 'master'
}
steps {
+sh './mvnw -B package -DskipTests'
sshPublisher(publishers: [
sshPublisherDesc(
configName: 'Nightlies',
[struts-site] branch master updated: Uses Nightlies instead Jenkins
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-site.git The following commit(s) were added to refs/heads/master by this push: new a1cafc6d6 Uses Nightlies instead Jenkins a1cafc6d6 is described below commit a1cafc6d643a35df865276afda2923f9aace13d1 Author: Lukasz Lenart AuthorDate: Sun Nov 6 10:16:01 2022 +0100 Uses Nightlies instead Jenkins --- source/releases.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/releases.html b/source/releases.html index 6e9c9d738..7a747e81c 100644 --- a/source/releases.html +++ b/source/releases.html @@ -42,7 +42,7 @@ title: Releases Trunk Snapshots - Get involved with the latest and greatest fixes and improvements -https://repository.apache.org/content/repositories/snapshots/org/apache/struts/struts2-assembly/2.6-SNAPSHOT/";> +https://nightlies.apache.org/struts/snapshot/";> Struts 2 Latest Snapshots from Jenkins CI
[struts-site] branch asf-site updated: Automatic Site Publish by Buildbot
This is an automated email from the ASF dual-hosted git repository. git-site-role pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/struts-site.git The following commit(s) were added to refs/heads/asf-site by this push: new cc9326013 Automatic Site Publish by Buildbot cc9326013 is described below commit cc93260137a8b269687515dae30698690c496f44 Author: buildbot AuthorDate: Sun Nov 6 09:16:31 2022 + Automatic Site Publish by Buildbot --- output/core-developers/default-properties.html | 6 ++ output/core-developers/interceptors.html | 2 ++ output/core-developers/struts-default-xml.html | 2 ++ output/releases.html | 2 +- 4 files changed, 11 insertions(+), 1 deletion(-) diff --git a/output/core-developers/default-properties.html b/output/core-developers/default-properties.html index 741a47f39..c6c17eeab 100644 --- a/output/core-developers/default-properties.html +++ b/output/core-developers/default-properties.html @@ -424,6 +424,12 @@ struts.ognl.expressionMaxLength=256 ### These formatters are using a slightly different patterns, please check JavaDocs of both and more details is in WW-5016 struts.date.formatter=dateTimeFormatter +### Defines which instance of ParametersStringBuilder to use, Struts provides just one instance: +### - strutsParametersStringBuilder +### The builder is used by UrlHelp to create a proper query string out of provided parameters map +struts.url.parametersStringBuilder=strutsParametersStringBuilder + +### Defines which instances of encoder and decoder to use, Struts provides one default implementation for each struts.url.encoder=strutsUrlEncoder struts.url.decoder=strutsUrlDecoder diff --git a/output/core-developers/interceptors.html b/output/core-developers/interceptors.html index 263b0a7ef..220987ad3 100644 --- a/output/core-developers/interceptors.html +++ b/output/core-developers/interceptors.html @@ -541,6 +541,8 @@ than reiterate the same list of Interceptors, we can bundle these Interceptors t+ + +https://nightlies.apache.org/struts/snapshot/";> Struts 2 Latest Snapshots from Jenkins CI
[struts-site] branch asf-staging updated: Updates stage by Jenkins
This is an automated email from the ASF dual-hosted git repository. git-site-role pushed a commit to branch asf-staging in repository https://gitbox.apache.org/repos/asf/struts-site.git The following commit(s) were added to refs/heads/asf-staging by this push: new 48c941249 Updates stage by Jenkins 48c941249 is described below commit 48c941249dcc55067d7b504dd51518c3e9c72c69 Author: jenkins AuthorDate: Sun Nov 6 09:18:02 2022 + Updates stage by Jenkins --- content/core-developers/default-properties.html | 6 ++ content/core-developers/interceptors.html | 2 ++ content/core-developers/struts-default-xml.html | 2 ++ content/releases.html | 2 +- 4 files changed, 11 insertions(+), 1 deletion(-) diff --git a/content/core-developers/default-properties.html b/content/core-developers/default-properties.html index 741a47f39..c6c17eeab 100644 --- a/content/core-developers/default-properties.html +++ b/content/core-developers/default-properties.html @@ -424,6 +424,12 @@ struts.ognl.expressionMaxLength=256 ### These formatters are using a slightly different patterns, please check JavaDocs of both and more details is in WW-5016 struts.date.formatter=dateTimeFormatter +### Defines which instance of ParametersStringBuilder to use, Struts provides just one instance: +### - strutsParametersStringBuilder +### The builder is used by UrlHelp to create a proper query string out of provided parameters map +struts.url.parametersStringBuilder=strutsParametersStringBuilder + +### Defines which instances of encoder and decoder to use, Struts provides one default implementation for each struts.url.encoder=strutsUrlEncoder struts.url.decoder=strutsUrlDecoder diff --git a/content/core-developers/interceptors.html b/content/core-developers/interceptors.html index 263b0a7ef..220987ad3 100644 --- a/content/core-developers/interceptors.html +++ b/content/core-developers/interceptors.html @@ -541,6 +541,8 @@ than reiterate the same list of Interceptors, we can bundle these Interceptors t+ + +https://nightlies.apache.org/struts/snapshot/";> Struts 2 Latest Snapshots from Jenkins CI
[struts-site] branch master updated: Adds missing releases
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-site.git The following commit(s) were added to refs/heads/master by this push: new 681be5378 Adds missing releases 681be5378 is described below commit 681be5378fed9336b15d1281e8da9891b2f908eb Author: Lukasz Lenart AuthorDate: Sun Nov 6 10:19:36 2022 +0100 Adds missing releases --- source/releases.html | 33 + 1 file changed, 33 insertions(+) diff --git a/source/releases.html b/source/releases.html index 7a747e81c..94bba7c75 100644 --- a/source/releases.html +++ b/source/releases.html @@ -105,6 +105,39 @@ title: Releases + + + Struts 6.0.3 + +15 September 2022 + + + + Version notes + + + + + Struts 6.0.0 + +6 June 2022 + + + + Version notes + + + + + Struts 2.5.30 + +4 April 2022 + + + + Version notes + + Struts 2.5.29
[struts-site] branch asf-site updated: Automatic Site Publish by Buildbot
This is an automated email from the ASF dual-hosted git repository. git-site-role pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/struts-site.git The following commit(s) were added to refs/heads/asf-site by this push: new 980506fa6 Automatic Site Publish by Buildbot 980506fa6 is described below commit 980506fa617e32ab4773882932f09f310731af5a Author: buildbot AuthorDate: Sun Nov 6 09:19:57 2022 + Automatic Site Publish by Buildbot --- output/releases.html | 33 + 1 file changed, 33 insertions(+) diff --git a/output/releases.html b/output/releases.html index 5ab7ca1f3..751627b8d 100644 --- a/output/releases.html +++ b/output/releases.html @@ -231,6 +231,39 @@ + + + Struts 6.0.3 + +15 September 2022 + + + + https://cwiki.apache.org/confluence/display/WW/Version+Notes+6.0.3";>Version notes + + + + + Struts 6.0.0 + +6 June 2022 + + + + https://cwiki.apache.org/confluence/display/WW/Version+Notes+6.0.0";>Version notes + + + + + Struts 2.5.30 + +4 April 2022 + + + + https://cwiki.apache.org/confluence/display/WW/Version+Notes+2.5.30";>Version notes + + Struts 2.5.29
[struts-site] branch asf-staging updated: Updates stage by Jenkins
This is an automated email from the ASF dual-hosted git repository. git-site-role pushed a commit to branch asf-staging in repository https://gitbox.apache.org/repos/asf/struts-site.git The following commit(s) were added to refs/heads/asf-staging by this push: new b5b056304 Updates stage by Jenkins b5b056304 is described below commit b5b056304a9497e2ec212019dabc789aa41d8c0d Author: jenkins AuthorDate: Sun Nov 6 09:21:22 2022 + Updates stage by Jenkins --- content/releases.html | 33 + 1 file changed, 33 insertions(+) diff --git a/content/releases.html b/content/releases.html index 5ab7ca1f3..751627b8d 100644 --- a/content/releases.html +++ b/content/releases.html @@ -231,6 +231,39 @@ + + + Struts 6.0.3 + +15 September 2022 + + + + https://cwiki.apache.org/confluence/display/WW/Version+Notes+6.0.3";>Version notes + + + + + Struts 6.0.0 + +6 June 2022 + + + + https://cwiki.apache.org/confluence/display/WW/Version+Notes+6.0.0";>Version notes + + + + + Struts 2.5.30 + +4 April 2022 + + + + https://cwiki.apache.org/confluence/display/WW/Version+Notes+2.5.30";>Version notes + + Struts 2.5.29
[struts] branch master updated: Cleans remote before uploading new packages
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 341a8f20e Cleans remote before uploading new packages
341a8f20e is described below
commit 341a8f20e07a7517939a981198daf3e1898dd055
Author: Lukasz Lenart
AuthorDate: Sun Nov 6 11:13:26 2022 +0100
Cleans remote before uploading new packages
---
Jenkinsfile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 5737be6b1..1a5c56c20 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -168,7 +168,8 @@ pipeline {
sshTransfer(
remoteDirectory: '/struts/snapshot',
removePrefix: 'assembly/target/assembly/out',
-sourceFiles:
'assembly/target/assembly/out/struts-*.zip'
+sourceFiles:
'assembly/target/assembly/out/struts-*.zip',
+cleanRemote: true
)
],
verbose: true
[struts] branch WW-5257-checkbox updated (dba97a8e1 -> 138a8d74f)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch WW-5257-checkbox in repository https://gitbox.apache.org/repos/asf/struts.git omit dba97a8e1 WW-5257 Cleans up template new 138a8d74f WW-5257 Cleans up template 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 (dba97a8e1) \ N -- N -- N refs/heads/WW-5257-checkbox (138a8d74f) 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: core/src/main/resources/template/simple/checkbox.ftl | 2 +- core/src/main/resources/template/simple/common-attributes.ftl | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
[struts] 01/01: WW-5257 Cleans up template
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch WW-5257-checkbox
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 138a8d74f019948d2f39865b04dafbdec4634dce
Author: Lukasz Lenart
AuthorDate: Sat Nov 5 08:32:35 2022 +0100
WW-5257 Cleans up template
---
.../main/resources/template/simple/checkbox.ftl| 2 +-
.../template/simple/common-attributes.ftl | 4 +-
.../src/main/resources/template/xhtml/checkbox.ftl | 5 +--
.../struts2/views/jsp/AbstractUITagTest.java | 44 --
.../apache/struts2/views/jsp/ui/CheckboxTest.java | 7
.../apache/struts2/views/jsp/ui/DoubleSelect-5.txt | 2 +-
6 files changed, 30 insertions(+), 34 deletions(-)
diff --git a/core/src/main/resources/template/simple/checkbox.ftl
b/core/src/main/resources/template/simple/checkbox.ftl
index 54507d90a..a344e6d30 100644
--- a/core/src/main/resources/template/simple/checkbox.ftl
+++ b/core/src/main/resources/template/simple/checkbox.ftl
@@ -45,4 +45,4 @@
disabled="disabled"<#rt/>
/>
-
\ No newline at end of file
+<#rt/>
diff --git a/core/src/main/resources/template/simple/common-attributes.ftl
b/core/src/main/resources/template/simple/common-attributes.ftl
index d68c0886b..6c821137b 100644
--- a/core/src/main/resources/template/simple/common-attributes.ftl
+++ b/core/src/main/resources/template/simple/common-attributes.ftl
@@ -19,5 +19,5 @@
*/
-->
<#if parameters.accesskey?has_content>
- accesskey="${parameters.accesskey}"
-
\ No newline at end of file
+ accesskey="${parameters.accesskey}"<#rt/>
+<#rt/>
diff --git a/core/src/main/resources/template/xhtml/checkbox.ftl
b/core/src/main/resources/template/xhtml/checkbox.ftl
index 2ec63e0c8..1471a43f1 100644
--- a/core/src/main/resources/template/xhtml/checkbox.ftl
+++ b/core/src/main/resources/template/xhtml/checkbox.ftl
@@ -106,12 +106,11 @@ ${parameters.label}<#t/>
-
<#if (labelPos!"") != 'top'>
<#include "/${parameters.templateDir}/simple/checkbox.ftl" />
<#if (labelPos!"") != 'top' && (labelPos!"") != 'left'>
-<#if parameters.label??>
+<#if parameters.label??>
<#if parameters.id??>
for="${parameters.id}"<#rt/>
@@ -124,4 +123,4 @@ ${parameters.label}<#t/>
- <#include
"/${parameters.templateDir}/${parameters.expandTheme}/controlfooter.ftl"
/><#nt/>
+<#include
"/${parameters.templateDir}/${parameters.expandTheme}/controlfooter.ftl"
/><#nt/>
diff --git
a/core/src/test/java/org/apache/struts2/views/jsp/AbstractUITagTest.java
b/core/src/test/java/org/apache/struts2/views/jsp/AbstractUITagTest.java
index c0fad07bd..3b0c571fb 100644
--- a/core/src/test/java/org/apache/struts2/views/jsp/AbstractUITagTest.java
+++ b/core/src/test/java/org/apache/struts2/views/jsp/AbstractUITagTest.java
@@ -19,22 +19,23 @@
package org.apache.struts2.views.jsp;
import com.opensymphony.xwork2.ActionContext;
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.LogManager;
import org.apache.commons.beanutils.BeanUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.apache.struts2.ServletActionContext;
import org.apache.struts2.dispatcher.mapper.ActionMapper;
import org.apache.struts2.dispatcher.mapper.DefaultActionMapper;
import org.apache.struts2.views.jsp.ui.AbstractUITag;
import java.io.InputStream;
-import java.lang.reflect.InvocationTargetException;
import java.net.URL;
-import java.util.*;
-
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.StringTokenizer;
-/**
- */
public abstract class AbstractUITagTest extends AbstractTagTest {
private static final Logger LOG =
LogManager.getLogger(AbstractUITagTest.class);
@@ -47,7 +48,7 @@ public abstract class AbstractUITagTest extends
AbstractTagTest {
*
* @author mailto:gie...@it-neering.net";>Rene Gielen
*/
-public class PropertyHolder {
+public static class PropertyHolder {
String name, value, expectation;
public String getName() {
@@ -111,18 +112,16 @@ public abstract class AbstractUITagTest extends
AbstractTagTest {
* subclasses.
*
* @return A Map of PropertyHolders values bound to {@link
org.apache.struts2.views.jsp.AbstractUITagTest.PropertyHolder#getName()}
- * as key.
+ * as key.
*/
protected Map
initializedGenericTagTestProperties() {
-Map result = new HashMap();
+Map result = new HashMap<>();
new PropertyHolder("name", "someName").addToMap(result);
new PropertyHolder("id", "someId").addToMap(result);
new PropertyHolder("cssClass", "cssClass1",
"class=\"cssClass1\"").addToMap(result);
new PropertyHolder("cssStyle", "cssStyle1",
"style=\"cssStyle1\"").addToMap(result);
new PropertyHolder("title", "someTitle").addToMap(result);
new Prop
[struts] branch master updated (341a8f20e -> 0a30eb44e)
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 341a8f20e Cleans remote before uploading new packages add 138a8d74f WW-5257 Cleans up template new 0a30eb44e Merge pull request #632 from apache/WW-5257-checkbox 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/resources/template/simple/checkbox.ftl| 2 +- .../template/simple/common-attributes.ftl | 4 +- .../src/main/resources/template/xhtml/checkbox.ftl | 5 +-- .../struts2/views/jsp/AbstractUITagTest.java | 44 -- .../apache/struts2/views/jsp/ui/CheckboxTest.java | 7 .../apache/struts2/views/jsp/ui/DoubleSelect-5.txt | 2 +- 6 files changed, 30 insertions(+), 34 deletions(-)
[struts] 01/01: Merge pull request #632 from apache/WW-5257-checkbox
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 0a30eb44e6ee2e0a8671c3778c7dc243a1a59c51 Merge: 341a8f20e 138a8d74f Author: Lukasz Lenart AuthorDate: Sun Nov 6 18:00:08 2022 +0100 Merge pull request #632 from apache/WW-5257-checkbox [WW-5257] Cleans up template .../main/resources/template/simple/checkbox.ftl| 2 +- .../template/simple/common-attributes.ftl | 4 +- .../src/main/resources/template/xhtml/checkbox.ftl | 5 +-- .../struts2/views/jsp/AbstractUITagTest.java | 44 -- .../apache/struts2/views/jsp/ui/CheckboxTest.java | 7 .../apache/struts2/views/jsp/ui/DoubleSelect-5.txt | 2 +- 6 files changed, 30 insertions(+), 34 deletions(-)
[struts] branch master updated (0a30eb44e -> 4ab427f2f)
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 0a30eb44e Merge pull request #632 from apache/WW-5257-checkbox add 927c58b7d WW-5258 Upgrades Struts Annotations to version 1.0.8 new 4ab427f2f Merge pull request #633 from apache/WW-5258-annotations 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/site/resources/tags/a-attributes.html | 966 +- .../src/site/resources/tags/action-attributes.html | 144 +- .../resources/tags/actionerror-attributes.html | 726 .../resources/tags/actionmessage-attributes.html | 726 .../src/site/resources/tags/append-attributes.html | 48 +- core/src/site/resources/tags/bean-attributes.html | 64 +- .../site/resources/tags/checkbox-attributes.html | 742 .../resources/tags/checkboxlist-attributes.html| 838 - .../site/resources/tags/combobox-attributes.html | 886 - .../site/resources/tags/component-attributes.html | 710 core/src/site/resources/tags/date-attributes.html | 112 +- .../resources/tags/datetextfield-attributes.html | 726 core/src/site/resources/tags/debug-attributes.html | 710 .../resources/tags/doubleselect-attributes.html| 1446 +++ core/src/site/resources/tags/else-attributes.html | 32 +- .../src/site/resources/tags/elseif-attributes.html | 48 +- .../site/resources/tags/fielderror-attributes.html | 742 core/src/site/resources/tags/file-attributes.html | 742 core/src/site/resources/tags/form-attributes.html | 934 +- .../site/resources/tags/generator-attributes.html | 112 +- core/src/site/resources/tags/head-attributes.html | 710 .../src/site/resources/tags/hidden-attributes.html | 710 core/src/site/resources/tags/i18n-attributes.html | 48 +- core/src/site/resources/tags/if-attributes.html| 48 +- .../site/resources/tags/include-attributes.html| 48 +- .../tags/inputtransferselect-attributes.html | 1078 +-- .../site/resources/tags/iterator-attributes.html | 128 +- core/src/site/resources/tags/label-attributes.html | 726 core/src/site/resources/tags/link-attributes.html | 854 - core/src/site/resources/tags/merge-attributes.html | 48 +- .../src/site/resources/tags/number-attributes.html | 208 +-- .../site/resources/tags/optgroup-attributes.html | 160 +- .../tags/optiontransferselect-attributes.html | 1878 ++-- core/src/site/resources/tags/param-attributes.html | 80 +- .../site/resources/tags/password-attributes.html | 806 - .../site/resources/tags/property-attributes.html | 128 +- core/src/site/resources/tags/push-attributes.html | 48 +- core/src/site/resources/tags/radio-attributes.html | 838 - core/src/site/resources/tags/reset-attributes.html | 790 .../src/site/resources/tags/script-attributes.html | 870 - .../src/site/resources/tags/select-attributes.html | 918 +- core/src/site/resources/tags/set-attributes.html | 102 +- core/src/site/resources/tags/sort-attributes.html | 80 +- .../src/site/resources/tags/submit-attributes.html | 806 - .../src/site/resources/tags/subset-attributes.html | 112 +- core/src/site/resources/tags/text-attributes.html | 128 +- .../site/resources/tags/textarea-attributes.html | 806 - .../site/resources/tags/textfield-attributes.html | 790 core/src/site/resources/tags/token-attributes.html | 710 .../resources/tags/updownselect-attributes.html| 1014 +-- core/src/site/resources/tags/url-attributes.html | 278 +-- pom.xml|2 +- 52 files changed, 13702 insertions(+), 13702 deletions(-)
[struts] 01/01: Merge pull request #633 from apache/WW-5258-annotations
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 4ab427f2f2dfd381131b61057eb7c53792d2d717 Merge: 0a30eb44e 927c58b7d Author: Lukasz Lenart AuthorDate: Sun Nov 6 18:01:20 2022 +0100 Merge pull request #633 from apache/WW-5258-annotations [WW-5258] Upgrades Struts Annotations to version 1.0.8 core/src/site/resources/tags/a-attributes.html | 966 +- .../src/site/resources/tags/action-attributes.html | 144 +- .../resources/tags/actionerror-attributes.html | 726 .../resources/tags/actionmessage-attributes.html | 726 .../src/site/resources/tags/append-attributes.html | 48 +- core/src/site/resources/tags/bean-attributes.html | 64 +- .../site/resources/tags/checkbox-attributes.html | 742 .../resources/tags/checkboxlist-attributes.html| 838 - .../site/resources/tags/combobox-attributes.html | 886 - .../site/resources/tags/component-attributes.html | 710 core/src/site/resources/tags/date-attributes.html | 112 +- .../resources/tags/datetextfield-attributes.html | 726 core/src/site/resources/tags/debug-attributes.html | 710 .../resources/tags/doubleselect-attributes.html| 1446 +++ core/src/site/resources/tags/else-attributes.html | 32 +- .../src/site/resources/tags/elseif-attributes.html | 48 +- .../site/resources/tags/fielderror-attributes.html | 742 core/src/site/resources/tags/file-attributes.html | 742 core/src/site/resources/tags/form-attributes.html | 934 +- .../site/resources/tags/generator-attributes.html | 112 +- core/src/site/resources/tags/head-attributes.html | 710 .../src/site/resources/tags/hidden-attributes.html | 710 core/src/site/resources/tags/i18n-attributes.html | 48 +- core/src/site/resources/tags/if-attributes.html| 48 +- .../site/resources/tags/include-attributes.html| 48 +- .../tags/inputtransferselect-attributes.html | 1078 +-- .../site/resources/tags/iterator-attributes.html | 128 +- core/src/site/resources/tags/label-attributes.html | 726 core/src/site/resources/tags/link-attributes.html | 854 - core/src/site/resources/tags/merge-attributes.html | 48 +- .../src/site/resources/tags/number-attributes.html | 208 +-- .../site/resources/tags/optgroup-attributes.html | 160 +- .../tags/optiontransferselect-attributes.html | 1878 ++-- core/src/site/resources/tags/param-attributes.html | 80 +- .../site/resources/tags/password-attributes.html | 806 - .../site/resources/tags/property-attributes.html | 128 +- core/src/site/resources/tags/push-attributes.html | 48 +- core/src/site/resources/tags/radio-attributes.html | 838 - core/src/site/resources/tags/reset-attributes.html | 790 .../src/site/resources/tags/script-attributes.html | 870 - .../src/site/resources/tags/select-attributes.html | 918 +- core/src/site/resources/tags/set-attributes.html | 102 +- core/src/site/resources/tags/sort-attributes.html | 80 +- .../src/site/resources/tags/submit-attributes.html | 806 - .../src/site/resources/tags/subset-attributes.html | 112 +- core/src/site/resources/tags/text-attributes.html | 128 +- .../site/resources/tags/textarea-attributes.html | 806 - .../site/resources/tags/textfield-attributes.html | 790 core/src/site/resources/tags/token-attributes.html | 710 .../resources/tags/updownselect-attributes.html| 1014 +-- core/src/site/resources/tags/url-attributes.html | 278 +-- pom.xml|2 +- 52 files changed, 13702 insertions(+), 13702 deletions(-)
[struts] branch WW-5259-parser created (now 998991eaa)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch WW-5259-parser in repository https://gitbox.apache.org/repos/asf/struts.git at 998991eaa WW-5259 Extracts UrlHelper#parseQueryString into a dedicated bean This branch includes the following new commits: new 998991eaa WW-5259 Extracts UrlHelper#parseQueryString into a dedicated bean 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-5259 Extracts UrlHelper#parseQueryString into a dedicated bean
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch WW-5259-parser
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 998991eaa57f4169ddab65d85504ace21c3c2951
Author: Lukasz Lenart
AuthorDate: Sun Nov 6 18:50:43 2022 +0100
WW-5259 Extracts UrlHelper#parseQueryString into a dedicated bean
---
.../StrutsDefaultConfigurationProvider.java| 9 +-
.../java/org/apache/struts2/StrutsConstants.java | 3 +-
.../struts2/components/ExtraParameterProvider.java | 4 +-
.../struts2/components/ServletUrlRenderer.java | 29 ++-
.../org/apache/struts2/components/UrlProvider.java | 22 +-
.../config/StrutsBeanSelectionProvider.java| 6 +-
.../struts2/result/ServletDispatcherResult.java| 14 +-
.../struts2/result/ServletRedirectResult.java | 19 +-
...sStringBuilder.java => QueryStringBuilder.java} | 12 +-
...rsStringBuilder.java => QueryStringParser.java} | 6 +-
...gBuilder.java => StrutsQueryStringBuilder.java} | 8 +-
.../struts2/url/StrutsQueryStringParser.java | 99 +
.../java/org/apache/struts2/url/UrlDecoder.java| 4 +
.../java/org/apache/struts2/url/UrlEncoder.java| 4 +
.../struts2/views/util/DefaultUrlHelper.java | 73 ++
.../org/apache/struts2/views/util/UrlHelper.java | 18 +-
.../org/apache/struts2/default.properties | 13 +-
core/src/main/resources/struts-default.xml | 6 +-
.../result/ServletActionRedirectResultTest.java| 11 +-
.../result/ServletDispatcherResultTest.java| 21 +-
.../struts2/result/ServletRedirectResultTest.java | 10 +-
...Test.java => StrutsQueryStringBuilderTest.java} | 14 +-
.../struts2/url/StrutsQueryStringParserTest.java | 84 +++
.../struts2/views/util/DefaultUrlHelperTest.java | 36 +--
.../main/java/org/apache/struts2/JSPRuntime.java | 13 +-
.../org/apache/struts2/EmbeddedJSPResultTest.java | 24 +-
.../struts2/json/JSONActionRedirectResultTest.java | 19 +-
.../struts2/components/PortletUrlRenderer.java | 77 ---
.../result/PortletActionRedirectResult.java| 247 +++--
29 files changed, 530 insertions(+), 375 deletions(-)
diff --git
a/core/src/main/java/com/opensymphony/xwork2/config/providers/StrutsDefaultConfigurationProvider.java
b/core/src/main/java/com/opensymphony/xwork2/config/providers/StrutsDefaultConfigurationProvider.java
index d193c4d24..1f49cc11b 100644
---
a/core/src/main/java/com/opensymphony/xwork2/config/providers/StrutsDefaultConfigurationProvider.java
+++
b/core/src/main/java/com/opensymphony/xwork2/config/providers/StrutsDefaultConfigurationProvider.java
@@ -118,8 +118,10 @@ import
org.apache.struts2.conversion.StrutsTypeConverterCreator;
import org.apache.struts2.conversion.StrutsTypeConverterHolder;
import org.apache.struts2.dispatcher.HttpParameters;
import org.apache.struts2.dispatcher.Parameter;
-import org.apache.struts2.url.ParametersStringBuilder;
-import org.apache.struts2.url.StrutsParametersStringBuilder;
+import org.apache.struts2.url.QueryStringBuilder;
+import org.apache.struts2.url.QueryStringParser;
+import org.apache.struts2.url.StrutsQueryStringBuilder;
+import org.apache.struts2.url.StrutsQueryStringParser;
import org.apache.struts2.url.StrutsUrlDecoder;
import org.apache.struts2.url.StrutsUrlEncoder;
import org.apache.struts2.url.UrlDecoder;
@@ -236,7 +238,8 @@ public class StrutsDefaultConfigurationProvider implements
ConfigurationProvider
.factory(ValueSubstitutor.class, EnvsValueSubstitutor.class,
Scope.SINGLETON)
-.factory(ParametersStringBuilder.class,
StrutsParametersStringBuilder.class, Scope.SINGLETON)
+.factory(QueryStringBuilder.class, StrutsQueryStringBuilder.class,
Scope.SINGLETON)
+.factory(QueryStringParser.class, StrutsQueryStringParser.class,
Scope.SINGLETON)
.factory(UrlEncoder.class, StrutsUrlEncoder.class, Scope.SINGLETON)
.factory(UrlDecoder.class, StrutsUrlDecoder.class, Scope.SINGLETON)
;
diff --git a/core/src/main/java/org/apache/struts2/StrutsConstants.java
b/core/src/main/java/org/apache/struts2/StrutsConstants.java
index 7f6955648..b7dec53b2 100644
--- a/core/src/main/java/org/apache/struts2/StrutsConstants.java
+++ b/core/src/main/java/org/apache/struts2/StrutsConstants.java
@@ -458,7 +458,8 @@ public final class StrutsConstants {
/** See {@link
org.apache.struts2.components.Date#setDateFormatter(DateFormatter)} */
public static final String STRUTS_DATE_FORMATTER = "struts.date.formatter";
-public static final String STRUTS_URL_PARAMETERS_STRING_BUILDER =
"struts.url.parametersStringBuilder";
+public static final String STRUTS_URL_QUERY_STRING_BUILDER =
"struts.url.queryStringBuilder";
+public static final String STRUTS_URL_QUERY_STRING_PARSER =
"struts.url.queryStringParser";
public static final String STRUTS_URL_ENCODER = "st
[struts] branch WW-5259-parser updated (998991eaa -> 47e65e819)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch WW-5259-parser in repository https://gitbox.apache.org/repos/asf/struts.git discard 998991eaa WW-5259 Extracts UrlHelper#parseQueryString into a dedicated bean new 47e65e819 WW-5259 Extracts UrlHelper#parseQueryString into a dedicated bean 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 (998991eaa) \ N -- N -- N refs/heads/WW-5259-parser (47e65e819) 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/url/QueryStringBuilder.java | 3 ++- .../main/java/org/apache/struts2/url/QueryStringParser.java | 3 ++- .../java/org/apache/struts2/url/StrutsQueryStringParser.java | 3 +-- core/src/main/java/org/apache/struts2/url/UrlDecoder.java| 4 +++- core/src/main/java/org/apache/struts2/url/UrlEncoder.java| 4 +++- .../org/apache/struts2/url/StrutsQueryStringParserTest.java | 12 ++-- .../struts2/portlet/result/PortletActionRedirectResult.java | 2 +- 7 files changed, 18 insertions(+), 13 deletions(-)
[struts] 01/01: WW-5259 Extracts UrlHelper#parseQueryString into a dedicated bean
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch WW-5259-parser
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 47e65e819eaee5ff475bba0070940173942bd562
Author: Lukasz Lenart
AuthorDate: Sun Nov 6 18:50:43 2022 +0100
WW-5259 Extracts UrlHelper#parseQueryString into a dedicated bean
---
.../StrutsDefaultConfigurationProvider.java| 9 +-
.../java/org/apache/struts2/StrutsConstants.java | 3 +-
.../struts2/components/ExtraParameterProvider.java | 4 +-
.../struts2/components/ServletUrlRenderer.java | 29 ++-
.../org/apache/struts2/components/UrlProvider.java | 22 +-
.../config/StrutsBeanSelectionProvider.java| 6 +-
.../struts2/result/ServletDispatcherResult.java| 14 +-
.../struts2/result/ServletRedirectResult.java | 19 +-
...sStringBuilder.java => QueryStringBuilder.java} | 13 +-
...rsStringBuilder.java => QueryStringParser.java} | 7 +-
...gBuilder.java => StrutsQueryStringBuilder.java} | 8 +-
.../struts2/url/StrutsQueryStringParser.java | 98
.../java/org/apache/struts2/url/UrlDecoder.java| 8 +-
.../java/org/apache/struts2/url/UrlEncoder.java| 8 +-
.../struts2/views/util/DefaultUrlHelper.java | 73 ++
.../org/apache/struts2/views/util/UrlHelper.java | 18 +-
.../org/apache/struts2/default.properties | 13 +-
core/src/main/resources/struts-default.xml | 6 +-
.../result/ServletActionRedirectResultTest.java| 11 +-
.../result/ServletDispatcherResultTest.java| 21 +-
.../struts2/result/ServletRedirectResultTest.java | 10 +-
...Test.java => StrutsQueryStringBuilderTest.java} | 14 +-
.../struts2/url/StrutsQueryStringParserTest.java | 84 +++
.../struts2/views/util/DefaultUrlHelperTest.java | 36 +--
.../main/java/org/apache/struts2/JSPRuntime.java | 13 +-
.../org/apache/struts2/EmbeddedJSPResultTest.java | 24 +-
.../struts2/json/JSONActionRedirectResultTest.java | 19 +-
.../struts2/components/PortletUrlRenderer.java | 77 ---
.../result/PortletActionRedirectResult.java| 247 +++--
29 files changed, 537 insertions(+), 377 deletions(-)
diff --git
a/core/src/main/java/com/opensymphony/xwork2/config/providers/StrutsDefaultConfigurationProvider.java
b/core/src/main/java/com/opensymphony/xwork2/config/providers/StrutsDefaultConfigurationProvider.java
index d193c4d24..1f49cc11b 100644
---
a/core/src/main/java/com/opensymphony/xwork2/config/providers/StrutsDefaultConfigurationProvider.java
+++
b/core/src/main/java/com/opensymphony/xwork2/config/providers/StrutsDefaultConfigurationProvider.java
@@ -118,8 +118,10 @@ import
org.apache.struts2.conversion.StrutsTypeConverterCreator;
import org.apache.struts2.conversion.StrutsTypeConverterHolder;
import org.apache.struts2.dispatcher.HttpParameters;
import org.apache.struts2.dispatcher.Parameter;
-import org.apache.struts2.url.ParametersStringBuilder;
-import org.apache.struts2.url.StrutsParametersStringBuilder;
+import org.apache.struts2.url.QueryStringBuilder;
+import org.apache.struts2.url.QueryStringParser;
+import org.apache.struts2.url.StrutsQueryStringBuilder;
+import org.apache.struts2.url.StrutsQueryStringParser;
import org.apache.struts2.url.StrutsUrlDecoder;
import org.apache.struts2.url.StrutsUrlEncoder;
import org.apache.struts2.url.UrlDecoder;
@@ -236,7 +238,8 @@ public class StrutsDefaultConfigurationProvider implements
ConfigurationProvider
.factory(ValueSubstitutor.class, EnvsValueSubstitutor.class,
Scope.SINGLETON)
-.factory(ParametersStringBuilder.class,
StrutsParametersStringBuilder.class, Scope.SINGLETON)
+.factory(QueryStringBuilder.class, StrutsQueryStringBuilder.class,
Scope.SINGLETON)
+.factory(QueryStringParser.class, StrutsQueryStringParser.class,
Scope.SINGLETON)
.factory(UrlEncoder.class, StrutsUrlEncoder.class, Scope.SINGLETON)
.factory(UrlDecoder.class, StrutsUrlDecoder.class, Scope.SINGLETON)
;
diff --git a/core/src/main/java/org/apache/struts2/StrutsConstants.java
b/core/src/main/java/org/apache/struts2/StrutsConstants.java
index 7f6955648..b7dec53b2 100644
--- a/core/src/main/java/org/apache/struts2/StrutsConstants.java
+++ b/core/src/main/java/org/apache/struts2/StrutsConstants.java
@@ -458,7 +458,8 @@ public final class StrutsConstants {
/** See {@link
org.apache.struts2.components.Date#setDateFormatter(DateFormatter)} */
public static final String STRUTS_DATE_FORMATTER = "struts.date.formatter";
-public static final String STRUTS_URL_PARAMETERS_STRING_BUILDER =
"struts.url.parametersStringBuilder";
+public static final String STRUTS_URL_QUERY_STRING_BUILDER =
"struts.url.queryStringBuilder";
+public static final String STRUTS_URL_QUERY_STRING_PARSER =
"struts.url.queryStringParser";
public static final String STRUTS_URL_ENCODER = "s
