(struts-examples) branch fix/conversion-example created (now fcf6d06)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch fix/conversion-example in repository https://gitbox.apache.org/repos/asf/struts-examples.git at fcf6d06 Updates the example to be compatible with Struts 7 It also extends the example to show how to use different approach to error messages This branch includes the following new commits: new fcf6d06 Updates the example to be compatible with Struts 7 It also extends the example to show how to use different approach to error messages 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-examples) branch fix/conversion-example deleted (was fcf6d06)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch fix/conversion-example in repository https://gitbox.apache.org/repos/asf/struts-examples.git was fcf6d06 Updates the example to be compatible with Struts 7 It also extends the example to show how to use different approach to error messages 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-examples) branch main updated: Updates the example to be compatible with Struts 7 (#425)
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/struts-examples.git
The following commit(s) were added to refs/heads/main by this push:
new 92fadcb Updates the example to be compatible with Struts 7 (#425)
92fadcb is described below
commit 92fadcb6753e97ab67233a870d4646aba92d0e87
Author: Lukasz Lenart
AuthorDate: Tue Mar 4 16:43:19 2025 +0100
Updates the example to be compatible with Struts 7 (#425)
It also extends the example to show how to use different approach to error
messages
---
.../main/java/org/apache/struts/example/NumberAction.java| 4
.../src/main/java/org/apache/struts/example/ThemeAction.java | 12
type-conversion/src/main/resources/example.xml | 10 --
type-conversion/src/main/resources/log4j2.xml| 2 +-
.../org/apache/struts/example/NumberAction.properties| 1 +
...rk-conversion.properties => struts-conversion.properties} | 0
type-conversion/src/main/resources/struts.xml| 8 ++--
type-conversion/src/main/webapp/WEB-INF/example/Number.jsp | 3 +++
type-conversion/src/main/webapp/WEB-INF/example/Theme.jsp| 4 +++-
9 files changed, 30 insertions(+), 14 deletions(-)
diff --git
a/type-conversion/src/main/java/org/apache/struts/example/NumberAction.java
b/type-conversion/src/main/java/org/apache/struts/example/NumberAction.java
index 32a78b4..16653cb 100644
--- a/type-conversion/src/main/java/org/apache/struts/example/NumberAction.java
+++ b/type-conversion/src/main/java/org/apache/struts/example/NumberAction.java
@@ -3,6 +3,7 @@ package org.apache.struts.example;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.struts2.ActionSupport;
+import org.apache.struts2.interceptor.parameter.StrutsParameter;
import java.math.BigDecimal;
@@ -27,6 +28,7 @@ public class NumberAction extends ActionSupport {
return bigDecimal;
}
+@StrutsParameter
public void setBigDecimal(BigDecimal bigDecimal) {
this.bigDecimal = bigDecimal;
}
@@ -35,6 +37,7 @@ public class NumberAction extends ActionSupport {
return bigDouble;
}
+@StrutsParameter
public void setBigDouble(Double bigDouble) {
this.bigDouble = bigDouble;
}
@@ -43,6 +46,7 @@ public class NumberAction extends ActionSupport {
return primitiveDouble;
}
+@StrutsParameter
public void setPrimitiveDouble(double primitiveDouble) {
this.primitiveDouble = primitiveDouble;
}
diff --git
a/type-conversion/src/main/java/org/apache/struts/example/ThemeAction.java
b/type-conversion/src/main/java/org/apache/struts/example/ThemeAction.java
index 95fb639..64606dc 100644
--- a/type-conversion/src/main/java/org/apache/struts/example/ThemeAction.java
+++ b/type-conversion/src/main/java/org/apache/struts/example/ThemeAction.java
@@ -24,6 +24,8 @@ import org.apache.logging.log4j.Logger;
import org.apache.struts.model.ThemeDescriptor;
import org.apache.struts.model.Themes;
import org.apache.struts2.ActionSupport;
+import org.apache.struts2.interceptor.parameter.StrutsParameter;
+import org.apache.struts2.validator.annotations.ConversionErrorFieldValidator;
import java.util.Map;
@@ -32,10 +34,10 @@ public class ThemeAction extends ActionSupport {
private static final Logger LOG = LogManager.getLogger(ThemeAction.class);
private Map themes = Themes.list();
-private ThemeDescriptor selectedTheme = Themes.get("simple");
+private ThemeDescriptor selectedTheme;// = Themes.get("simple");
public String execute() throws Exception {
-return SUCCESS;
+return INPUT;
}
public Map getThemes() {
@@ -43,12 +45,14 @@ public class ThemeAction extends ActionSupport {
}
public ThemeDescriptor getSelectedTheme() {
-LOG.info("Existing theme: #0", String.valueOf(selectedTheme));
+LOG.info("Existing theme: {}", String.valueOf(selectedTheme));
return selectedTheme;
}
+@StrutsParameter
+@ConversionErrorFieldValidator(fieldName = "selectedTheme", key =
"error.theme.not.valid", message = "Invalid theme")
public void setSelectedTheme(ThemeDescriptor selectedTheme) {
-LOG.info("Selected theme: #0", String.valueOf(selectedTheme));
+LOG.info("Selected theme: {}", String.valueOf(selectedTheme));
this.selectedTheme = selectedTheme;
}
}
diff --git a/type-conversion/src/main/resources/example.xml
b/type-conversion/src/main/resources/example.xml
index 5535fe6..a83dbdc 100644
--- a/type-conversion/src/main/resources/example.xml
+++ b/type-conversion/src/main/resources/example.xml
@@ -1,23 +1,21 @@
https://struts.apache.org/dtds/struts-2.5.dtd";>
+"-//Apache Software Foundation//DTD Struts Configuration 6.0//EN"
+"https://struts.apache.or
(struts-examples) branch main updated: Bump org.springframework:spring-web from 6.2.0 to 6.2.3 (#418)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/struts-examples.git The following commit(s) were added to refs/heads/main by this push: new 7bba3c3 Bump org.springframework:spring-web from 6.2.0 to 6.2.3 (#418) 7bba3c3 is described below commit 7bba3c3f745e927d5fbcf2a24ca526066a120701 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Tue Mar 4 16:43:28 2025 +0100 Bump org.springframework:spring-web from 6.2.0 to 6.2.3 (#418) Bumps [org.springframework:spring-web](https://github.com/spring-projects/spring-framework) from 6.2.0 to 6.2.3. - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v6.2.0...v6.2.3) --- updated-dependencies: - dependency-name: org.springframework:spring-web dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- rest-angular/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest-angular/pom.xml b/rest-angular/pom.xml index cec040f..066b900 100644 --- a/rest-angular/pom.xml +++ b/rest-angular/pom.xml @@ -35,7 +35,7 @@ org.springframework spring-web -6.2.0 +6.2.3 test
(struts-examples) branch fix/debugging deleted (was 2d4adff)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch fix/debugging in repository https://gitbox.apache.org/repos/asf/struts-examples.git was 2d4adff Fixes the debugging example to be compatible with Struts 7 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-examples) branch main updated: Bump log4j2.version from 2.24.2 to 2.24.3 (#407)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/struts-examples.git The following commit(s) were added to refs/heads/main by this push: new 676caf1 Bump log4j2.version from 2.24.2 to 2.24.3 (#407) 676caf1 is described below commit 676caf1e4730179333a18c9d5cc04d941f0d5be1 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Tue Mar 4 16:43:05 2025 +0100 Bump log4j2.version from 2.24.2 to 2.24.3 (#407) Bumps `log4j2.version` from 2.24.2 to 2.24.3. Updates `org.apache.logging.log4j:log4j-core` from 2.24.2 to 2.24.3 Updates `org.apache.logging.log4j:log4j-api` from 2.24.2 to 2.24.3 Updates `org.apache.logging.log4j:log4j-slf4j-impl` from 2.24.2 to 2.24.3 --- updated-dependencies: - dependency-name: org.apache.logging.log4j:log4j-core dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.logging.log4j:log4j-api dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.logging.log4j:log4j-slf4j-impl dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5287eaf..de6ba47 100644 --- a/pom.xml +++ b/pom.xml @@ -47,7 +47,7 @@ true 7.0.0 -2.24.2 +2.24.3 11.0.18 2.14.1 2.14.1
(struts-examples) branch dependabot/maven/log4j2.version-2.24.3 deleted (was 58117da)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch dependabot/maven/log4j2.version-2.24.3 in repository https://gitbox.apache.org/repos/asf/struts-examples.git was 58117da Bump log4j2.version from 2.24.2 to 2.24.3 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-examples) branch main updated (0c5bc9d -> 7bec9c8)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/struts-examples.git from 0c5bc9d Merge pull request #406 from apache/dependabot/maven/io.quarkus-quarkus-universe-bom-3.17.5 add d9b5aa3 Adds a note about older versions new 7bec9c8 Merge pull request #424 from apache/lukaszlenart-patch-1 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: README.md | 4 1 file changed, 4 insertions(+)
(struts-examples) 01/01: Merge pull request #424 from apache/lukaszlenart-patch-1
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/struts-examples.git commit 7bec9c85d2485ed15925509a897e438413e4dfa2 Merge: 0c5bc9d d9b5aa3 Author: Lukasz Lenart AuthorDate: Tue Mar 4 16:42:29 2025 +0100 Merge pull request #424 from apache/lukaszlenart-patch-1 Adds a note about older versions README.md | 4 1 file changed, 4 insertions(+)
(struts-examples) branch lukaszlenart-patch-1 deleted (was d9b5aa3)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch lukaszlenart-patch-1 in repository https://gitbox.apache.org/repos/asf/struts-examples.git was d9b5aa3 Adds a note about older versions 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-examples) branch main updated (7bec9c8 -> d0a8747)
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/struts-examples.git
from 7bec9c8 Merge pull request #424 from apache/lukaszlenart-patch-1
add d0a8747 Fixes the debugging example to be compatible with Struts 7
(#413)
No new revisions were added by this update.
Summary of changes:
annotations/pom.xml| 10 +++
.../src/main/java/example/actions/IndexAction.java | 26 +++
.../main/java/example/actions/RegisterAction.java | 3 +-
.../src/main/java/example/model/Participant.java | 4 +
.../src/main/webapp/WEB-INF/content/index.jsp | 11 ++-
annotations/src/main/webapp/WEB-INF/web.xml| 4 +
debugging-struts/pom.xml | 79 ++--
.../struts/helloworld/action/HelloWorldAction.java | 86 +++---
.../struts/helloworld/model/MessageStore.java | 34 -
.../apache/struts/register/action/Register.java| 51 +++--
.../exceptions/SecurityBreachException.java| 16 ++--
.../org/apache/struts/register/model/Person.java | 34 +++--
debugging-struts/src/main/resources/log4j2.xml | 2 +-
debugging-struts/src/main/resources/struts.xml | 29 +---
.../webapp/{ => WEB-INF/content}/HelloWorld.jsp| 4 +-
.../src/main/webapp/WEB-INF/content/error.jsp | 24 ++
.../src/main/webapp/WEB-INF/content/index.jsp | 44 +++
.../main/webapp/{ => WEB-INF/content}/login.jsp| 4 +-
.../src/main/webapp/WEB-INF/content/register.jsp | 16 ++--
.../webapp/{ => WEB-INF/content}/securityerror.jsp | 12 +--
.../src/main/webapp/WEB-INF/content/thankyou.jsp | 21 ++
debugging-struts/src/main/webapp/error.jsp | 22 --
.../src/main/webapp/index.html | 15 +++-
debugging-struts/src/main/webapp/index.jsp | 44 ---
debugging-struts/src/main/webapp/register.jsp | 26 ---
debugging-struts/src/main/webapp/thankyou.jsp | 22 --
26 files changed, 333 insertions(+), 310 deletions(-)
create mode 100644 annotations/src/main/java/example/actions/IndexAction.java
create mode 100644 annotations/src/main/java/example/model/Participant.java
rename debugging-struts/src/main/webapp/{ => WEB-INF/content}/HelloWorld.jsp
(68%)
create mode 100644 debugging-struts/src/main/webapp/WEB-INF/content/error.jsp
create mode 100644 debugging-struts/src/main/webapp/WEB-INF/content/index.jsp
rename debugging-struts/src/main/webapp/{ => WEB-INF/content}/login.jsp (62%)
copy annotations/src/main/webapp/WEB-INF/content/register-input.jsp =>
debugging-struts/src/main/webapp/WEB-INF/content/register.jsp (54%)
rename debugging-struts/src/main/webapp/{ =>
WEB-INF/content}/securityerror.jsp (50%)
create mode 100644
debugging-struts/src/main/webapp/WEB-INF/content/thankyou.jsp
delete mode 100644 debugging-struts/src/main/webapp/error.jsp
copy
themes-override/src/main/webapp/WEB-INF/template/simple/common-attributes.ftl
=> debugging-struts/src/main/webapp/index.html (80%)
delete mode 100644 debugging-struts/src/main/webapp/index.jsp
delete mode 100644 debugging-struts/src/main/webapp/register.jsp
delete mode 100644 debugging-struts/src/main/webapp/thankyou.jsp
(struts-examples) branch dependabot/maven/org.springframework-spring-web-6.2.3 deleted (was f89f4b1)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch dependabot/maven/org.springframework-spring-web-6.2.3 in repository https://gitbox.apache.org/repos/asf/struts-examples.git was f89f4b1 Bump org.springframework:spring-web from 6.2.0 to 6.2.3 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-examples) branch main updated: Bump commons-beanutils:commons-beanutils from 1.9.4 to 1.10.1 (#419)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/struts-examples.git The following commit(s) were added to refs/heads/main by this push: new c73d4af Bump commons-beanutils:commons-beanutils from 1.9.4 to 1.10.1 (#419) c73d4af is described below commit c73d4af44084227ffec8827012e8c7f06cd3e93e Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Tue Mar 4 16:43:38 2025 +0100 Bump commons-beanutils:commons-beanutils from 1.9.4 to 1.10.1 (#419) Bumps commons-beanutils:commons-beanutils from 1.9.4 to 1.10.1. --- updated-dependencies: - dependency-name: commons-beanutils:commons-beanutils dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- mailreader2/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mailreader2/pom.xml b/mailreader2/pom.xml index 0a85911..f64d24d 100644 --- a/mailreader2/pom.xml +++ b/mailreader2/pom.xml @@ -50,7 +50,7 @@ commons-beanutils commons-beanutils -1.9.4 +1.10.1
(struts-examples) branch dependabot/maven/commons-beanutils-commons-beanutils-1.10.1 deleted (was 8ab8a7f)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch dependabot/maven/commons-beanutils-commons-beanutils-1.10.1 in repository https://gitbox.apache.org/repos/asf/struts-examples.git was 8ab8a7f Bump commons-beanutils:commons-beanutils from 1.9.4 to 1.10.1 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-examples) branch main updated: Bump io.quarkus:quarkus-universe-bom from 3.17.5 to 3.19.1 (#422)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/struts-examples.git The following commit(s) were added to refs/heads/main by this push: new 2e2991f Bump io.quarkus:quarkus-universe-bom from 3.17.5 to 3.19.1 (#422) 2e2991f is described below commit 2e2991f270e2387bf322789e1e5f24bcac651abd Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Tue Mar 4 16:43:48 2025 +0100 Bump io.quarkus:quarkus-universe-bom from 3.17.5 to 3.19.1 (#422) Bumps [io.quarkus:quarkus-universe-bom](https://github.com/quarkusio/quarkus-platform) from 3.17.5 to 3.19.1. - [Commits](https://github.com/quarkusio/quarkus-platform/compare/3.17.5...3.19.1) --- updated-dependencies: - dependency-name: io.quarkus:quarkus-universe-bom dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- quarkus/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/quarkus/pom.xml b/quarkus/pom.xml index 0b4d1b9..011daa2 100644 --- a/quarkus/pom.xml +++ b/quarkus/pom.xml @@ -14,7 +14,7 @@ UTF-8 -3.17.5 +3.19.1
(struts-examples) branch dependabot/maven/io.quarkus-quarkus-universe-bom-3.19.1 deleted (was e7ff3eb)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch dependabot/maven/io.quarkus-quarkus-universe-bom-3.19.1 in repository https://gitbox.apache.org/repos/asf/struts-examples.git was e7ff3eb Bump io.quarkus:quarkus-universe-bom from 3.17.5 to 3.19.1 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-examples) branch main updated: Bump actions/cache from 4.2.0 to 4.2.2 (#423)
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/struts-examples.git
The following commit(s) were added to refs/heads/main by this push:
new 64699fb Bump actions/cache from 4.2.0 to 4.2.2 (#423)
64699fb is described below
commit 64699fb94895b953f125c6d035d833eda45feea6
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Tue Mar 4 16:43:58 2025 +0100
Bump actions/cache from 4.2.0 to 4.2.2 (#423)
Bumps [actions/cache](https://github.com/actions/cache) from 4.2.0 to 4.2.2.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](https://github.com/actions/cache/compare/v4.2.0...v4.2.2)
---
updated-dependencies:
- dependency-name: actions/cache
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot]
<49699333+dependabot[bot]@users.noreply.github.com>
---
.github/workflows/maven.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 3abbfc7..3b2b56a 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -33,7 +33,7 @@ jobs:
- name: Checkout code
uses: actions/checkout@v4.2.2
- name: Set up cache
-uses: actions/cache@v4.2.0
+uses: actions/cache@v4.2.2
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
(struts-examples) branch dependabot/github_actions/actions/cache-4.2.2 deleted (was 9961466)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch dependabot/github_actions/actions/cache-4.2.2 in repository https://gitbox.apache.org/repos/asf/struts-examples.git was 9961466 Bump actions/cache from 4.2.0 to 4.2.2 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 main updated: Sync tag with main ftl template. (#1212)
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/struts.git
The following commit(s) were added to refs/heads/main by this push:
new f35c808ef Sync tag with main ftl template. (#1212)
f35c808ef is described below
commit f35c808efce514cbcefaf583c0761b50b1f9cdbe
Author: gregh3269
AuthorDate: Tue Mar 4 15:45:45 2025 +
Sync tag with main ftl template. (#1212)
Co-authored-by: Greg Huber
---
.../org/apache/struts2/views/java/simple/CheckboxListHandler.java | 7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git
a/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/CheckboxListHandler.java
b/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/CheckboxListHandler.java
index 2ef97f4f4..2116cad60 100644
---
a/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/CheckboxListHandler.java
+++
b/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/CheckboxListHandler.java
@@ -68,14 +68,15 @@ public class CheckboxListHandler extends AbstractTagHandler
implements TagGenera
.addIfTrue("checked", isChecked(params, itemKeyStr))
.addIfTrue("readonly",
params.get("readonly")).addIfTrue("disabled", disabled)
.addIfExists("tabindex", params.get("tabindex"))
-.addIfExists("id", id + "-" + Integer.toString(cnt));
+.addIfExists("id", id + "-" + Integer.toString(cnt))
+.addIfExists("class", params.get("cssClass"))
+.addIfExists("style", params.get("cssStyle"));
start("input", a);
end("input");
// Label section
a = new Attributes();
-a.add("for", id + "-" +
Integer.toString(cnt)).addIfExists("class", params.get("cssClass"))
-.addIfExists("style", params.get("cssStyle"));
+a.add("for", id + "-" + Integer.toString(cnt)).add("class",
"checkboxLabel");
super.start("label", a);
if (StringUtils.isNotEmpty(itemValueStr))
characters(itemValueStr);
(struts) branch feature/WW-5455-jasperreports7 updated (0b4b4f00f -> 2f92637f8)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch feature/WW-5455-jasperreports7 in repository https://gitbox.apache.org/repos/asf/struts.git from 0b4b4f00f WW-5455 Updates pom to match the latest SNAPSHOT version add 2f92637f8 WW-5455 Cleans up code No new revisions were added by this update. Summary of changes: .../struts2/views/jasperreports7/JasperReport7Result.java | 7 +++ .../struts2/views/jasperreports7/ValueStackShadowMap.java | 13 - .../export/JasperReport7CsvExporterProvider.java| 8 +++- .../export/JasperReport7HtmlExporterProvider.java | 6 ++ .../export/JasperReport7PdfExporterProvider.java| 2 +- .../export/JasperReport7RtfExporterProvider.java| 2 +- .../export/JasperReport7XlsxExporterProvider.java | 2 +- .../export/JasperReport7XmlExporterProvider.java| 2 +- 8 files changed, 20 insertions(+), 22 deletions(-)
(struts) branch feature/WW-5455-jasperreports7 updated (2f92637f8 -> 159bd8cf2)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch feature/WW-5455-jasperreports7 in repository https://gitbox.apache.org/repos/asf/struts.git from 2f92637f8 WW-5455 Cleans up code add 159bd8cf2 WW-5455 Adds the new plugin to BOM No new revisions were added by this update. Summary of changes: assembly/pom.xml | 5 + bom/pom.xml | 5 + 2 files changed, 10 insertions(+)
(struts-examples) 01/01: Updates the example to be compatible with Struts 7 It also extends the example to show how to use different approach to error messages
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch fix/conversion-example
in repository https://gitbox.apache.org/repos/asf/struts-examples.git
commit fcf6d06c9e6de59c7cd0dd941f6b86dc24904d48
Author: Lukasz Lenart
AuthorDate: Tue Mar 4 16:37:11 2025 +0100
Updates the example to be compatible with Struts 7
It also extends the example to show how to use different approach to error
messages
---
.../main/java/org/apache/struts/example/NumberAction.java| 4
.../src/main/java/org/apache/struts/example/ThemeAction.java | 12
type-conversion/src/main/resources/example.xml | 10 --
type-conversion/src/main/resources/log4j2.xml| 2 +-
.../org/apache/struts/example/NumberAction.properties| 1 +
...rk-conversion.properties => struts-conversion.properties} | 0
type-conversion/src/main/resources/struts.xml| 8 ++--
type-conversion/src/main/webapp/WEB-INF/example/Number.jsp | 3 +++
type-conversion/src/main/webapp/WEB-INF/example/Theme.jsp| 4 +++-
9 files changed, 30 insertions(+), 14 deletions(-)
diff --git
a/type-conversion/src/main/java/org/apache/struts/example/NumberAction.java
b/type-conversion/src/main/java/org/apache/struts/example/NumberAction.java
index 32a78b4..16653cb 100644
--- a/type-conversion/src/main/java/org/apache/struts/example/NumberAction.java
+++ b/type-conversion/src/main/java/org/apache/struts/example/NumberAction.java
@@ -3,6 +3,7 @@ package org.apache.struts.example;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.struts2.ActionSupport;
+import org.apache.struts2.interceptor.parameter.StrutsParameter;
import java.math.BigDecimal;
@@ -27,6 +28,7 @@ public class NumberAction extends ActionSupport {
return bigDecimal;
}
+@StrutsParameter
public void setBigDecimal(BigDecimal bigDecimal) {
this.bigDecimal = bigDecimal;
}
@@ -35,6 +37,7 @@ public class NumberAction extends ActionSupport {
return bigDouble;
}
+@StrutsParameter
public void setBigDouble(Double bigDouble) {
this.bigDouble = bigDouble;
}
@@ -43,6 +46,7 @@ public class NumberAction extends ActionSupport {
return primitiveDouble;
}
+@StrutsParameter
public void setPrimitiveDouble(double primitiveDouble) {
this.primitiveDouble = primitiveDouble;
}
diff --git
a/type-conversion/src/main/java/org/apache/struts/example/ThemeAction.java
b/type-conversion/src/main/java/org/apache/struts/example/ThemeAction.java
index 95fb639..64606dc 100644
--- a/type-conversion/src/main/java/org/apache/struts/example/ThemeAction.java
+++ b/type-conversion/src/main/java/org/apache/struts/example/ThemeAction.java
@@ -24,6 +24,8 @@ import org.apache.logging.log4j.Logger;
import org.apache.struts.model.ThemeDescriptor;
import org.apache.struts.model.Themes;
import org.apache.struts2.ActionSupport;
+import org.apache.struts2.interceptor.parameter.StrutsParameter;
+import org.apache.struts2.validator.annotations.ConversionErrorFieldValidator;
import java.util.Map;
@@ -32,10 +34,10 @@ public class ThemeAction extends ActionSupport {
private static final Logger LOG = LogManager.getLogger(ThemeAction.class);
private Map themes = Themes.list();
-private ThemeDescriptor selectedTheme = Themes.get("simple");
+private ThemeDescriptor selectedTheme;// = Themes.get("simple");
public String execute() throws Exception {
-return SUCCESS;
+return INPUT;
}
public Map getThemes() {
@@ -43,12 +45,14 @@ public class ThemeAction extends ActionSupport {
}
public ThemeDescriptor getSelectedTheme() {
-LOG.info("Existing theme: #0", String.valueOf(selectedTheme));
+LOG.info("Existing theme: {}", String.valueOf(selectedTheme));
return selectedTheme;
}
+@StrutsParameter
+@ConversionErrorFieldValidator(fieldName = "selectedTheme", key =
"error.theme.not.valid", message = "Invalid theme")
public void setSelectedTheme(ThemeDescriptor selectedTheme) {
-LOG.info("Selected theme: #0", String.valueOf(selectedTheme));
+LOG.info("Selected theme: {}", String.valueOf(selectedTheme));
this.selectedTheme = selectedTheme;
}
}
diff --git a/type-conversion/src/main/resources/example.xml
b/type-conversion/src/main/resources/example.xml
index 5535fe6..a83dbdc 100644
--- a/type-conversion/src/main/resources/example.xml
+++ b/type-conversion/src/main/resources/example.xml
@@ -1,23 +1,21 @@
https://struts.apache.org/dtds/struts-2.5.dtd";>
+"-//Apache Software Foundation//DTD Struts Configuration 6.0//EN"
+"https://struts.apache.org/dtds/struts-6.0.dtd";>
-
-/WEB-INF/example/Theme.jsp
+/WEB-INF/example/Theme.jsp
-
+
(struts) branch feature/WW-5455-jasperreports7 updated (9253668af -> 91d13bb6e)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch feature/WW-5455-jasperreports7 in repository https://gitbox.apache.org/repos/asf/struts.git discard 9253668af WW-5455 Fixes parent version after re-basing discard 9ed64852f WW-5455 Uses defaultDelimiter as more meaningful name discard e89a3576a WW-5455 Extracts logic to create connection or dataSource discard 0f9323ea4 WW-5455 Defines exporter as an extension point discard 2f3f6a4f9 WW-5455 Allows action to modify result behaviour discard 15fb1435f WW-5455 Defines a new plugin to support Jasper Reports 7 add dba751098 Adds info about homepage and descritpion to Github repo add 0bcb6516b Merge pull request #1151 from apache/feature/homepage add 552f7eba7 WW-5501 Excludes malicious names add bbdb38ded WW-5501 Uses StringUtils.normalizeSpace instead of sanitizeNewlines add 36ca20d3d Merge pull request #1157 from apache/feature/WW-5501-exclude-s7 add 196aa3f36 Bump actions/upload-artifact from 4.4.3 to 4.5.0 add 92b2cb9ee Merge pull request #1155 from apache/dependabot/github_actions/actions/upload-artifact-4.5.0 add 0792d0586 Bump github/codeql-action from 3.27.9 to 3.28.0 add faa3e723a Merge pull request #1154 from apache/dependabot/github_actions/github/codeql-action-3.28.0 add 6b07ee83e Bump org.codehaus.mojo:versions-maven-plugin from 2.17.1 to 2.18.0 add 43295b1f4 Merge pull request #1152 from apache/dependabot/maven/org.codehaus.mojo-versions-maven-plugin-2.18.0 add a9662ee58 [readme] add link to struts site commercial support page add 7c62bfc5a Merge pull request #1160 from ljharb/patch-1 add 3be56a484 Adds additional test cases to match Struts packages add e695ac8a4 Merge pull request #1161 from apache/feature/wildcard-packages add 0114dff50 WW-5503 Removes unused dependencies add 2850315cf Merge pull request #1159 from apache/feature/WW-5503-removes-deps add 44ff04683 Uses exact branch name instead of wildcard add 375d00aa8 Merge pull request #1162 from apache/fix/strict-branch add cadb7a1fb Add YourKit thank you section add 9ac86ed61 Merge pull request #1165 from apache/feature/yourkit add c0a720475 Removes checking branch ref and removes branch name as not needed add ac9a02c68 Merge pull request #1166 from apache/fix/sonar-scan add 80b3108c8 Bump org.freemarker:freemarker from 2.3.33 to 2.3.34 add e5825de28 Merge pull request #1163 from apache/dependabot/maven/org.freemarker-freemarker-2.3.34 add 4f1556c2d Bump org.apache.velocity:velocity-engine-core from 2.3 to 2.4.1 add bd46f587a Merge pull request #1164 from apache/dependabot/maven/org.apache.velocity-velocity-engine-core-2.4.1 add f97e2c29b Updates SECURITY.md add 9e2f92f7a Merge pull request #1172 from apache/fix/supported-versions add 18f3a4902 Updatex dependabot.yml add b36f7bd9c Merge pull request #1173 from apache/fix/dependabot add 93943dbb3 Bump commons-io:commons-io from 2.15.1 to 2.18.0 add 026300b45 Merge pull request #1133 from apache/dependabot/maven/commons-io-commons-io-2.18.0 add db9684e1c WW-5498 Adds devMode errors as action messages to avoid breaking validation logic add fd24a4a9c Merge pull request #1170 from apache/fix/WW-5498-s7 add 6d71674cc WW-5500 Extends pattern to validate multipart uploads add 98df24a2a Merge pull request #1171 from apache/fix/WW-5500-s7 add 9e93bb51d Add jakarta package to exclusion list add b5d94a1f0 Merge pull request #1179 from apache/excl-list add 0931b88b1 Bump log4j2.version from 2.24.2 to 2.24.3 add cebdf6df8 Merge pull request #1178 from apache/dependabot/maven/log4j2.version-2.24.3 add 6cc4a105e Bump github/codeql-action from 3.28.0 to 3.28.1 add 2c023a245 Merge pull request #1182 from apache/dependabot/github_actions/github/codeql-action-3.28.1 add 6d01916f1 Bump actions/upload-artifact from 4.5.0 to 4.6.0 add 30aefaa5d Merge pull request #1183 from apache/dependabot/github_actions/actions/upload-artifact-4.6.0 add 8dfc157be Bump byte-buddy.version from 1.14.11 to 1.15.11 add 71bca19c1 Merge pull request #1176 from apache/dependabot/maven/byte-buddy.version-1.15.11 add 4279511c5 WW-5501 Only exclude malicious file names add fa60e1ceb Merge pull request #1184 from apache/fix/WW-5501-exclude-s7 add c2a5bfe3c WW-5510 Marks support for tooltips as deprecated This will be removed in the minor release, migrate to use native html tooltip support add e0be8270c Merge pull request #1185 from apache/feature/WW-5510-tooltip add 32cd5d0dc Adds 6.7.x branch to nigthlies step add b054b5192 Merge pull request #1186 from apache/fix/nightlies-67 add 181f0073f Bump org.sitemesh:sitemesh from 3.2.1 to 3.2.2 add 9ba5c095f Merge pull request #1189 from apache/dependabot/maven/org.sitemesh-sitemesh-3.2.2
(struts) branch feature/WW-5455-jasperreports7 updated (159bd8cf2 -> 2b15ea0b9)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch feature/WW-5455-jasperreports7 in repository https://gitbox.apache.org/repos/asf/struts.git from 159bd8cf2 WW-5455 Adds the new plugin to BOM add 2b15ea0b9 WW-5455 Fixes broken test No new revisions were added by this update. Summary of changes: .../apache/struts2/views/jasperreports7/JasperReport7ResultTest.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
(struts) branch feature/WW-5455-jasperreports7 updated (91d13bb6e -> 0b4b4f00f)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch feature/WW-5455-jasperreports7 in repository https://gitbox.apache.org/repos/asf/struts.git from 91d13bb6e WW-5455 Fixes parent version after re-basing add 0b4b4f00f WW-5455 Updates pom to match the latest SNAPSHOT version No new revisions were added by this update. Summary of changes: plugins/jasperreports7/pom.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
