[GitHub] [struts] Elvin0000 opened a new pull request, #749: File upload progress indicator to master
Elvin opened a new pull request, #749: URL: https://github.com/apache/struts/pull/749 (no comment) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@struts.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [struts] Elvin0000 closed pull request #749: File upload progress indicator to master
Elvin closed pull request #749: File upload progress indicator to master URL: https://github.com/apache/struts/pull/749 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@struts.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [struts] Elvin0000 opened a new pull request, #750: File upload progress indicator elvin
Elvin opened a new pull request, #750: URL: https://github.com/apache/struts/pull/750 (no comment) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@struts.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[struts-examples] branch dependabot/maven/quarkus-plugin.version-3.3.1 created (now 8cb0989)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/quarkus-plugin.version-3.3.1 in repository https://gitbox.apache.org/repos/asf/struts-examples.git at 8cb0989 Bump quarkus-plugin.version from 3.3.0 to 3.3.1 No new revisions were added by this update.
[struts-examples] branch dependabot/maven/org.slf4j-slf4j-simple-2.0.9 created (now 1453b08)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.slf4j-slf4j-simple-2.0.9 in repository https://gitbox.apache.org/repos/asf/struts-examples.git at 1453b08 Bump org.slf4j:slf4j-simple from 2.0.7 to 2.0.9 No new revisions were added by this update.
[struts-examples] branch master updated (e8e0059 -> e6e0af7)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/struts-examples.git from e8e0059 Merge pull request #254 from apache/dependabot/maven/quarkus-plugin.version-3.3.0 add 1453b08 Bump org.slf4j:slf4j-simple from 2.0.7 to 2.0.9 add e6e0af7 Merge pull request #256 from apache/dependabot/maven/org.slf4j-slf4j-simple-2.0.9 No new revisions were added by this update. Summary of changes: portlet/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[struts-examples] branch dependabot/maven/org.slf4j-slf4j-simple-2.0.9 deleted (was 1453b08)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.slf4j-slf4j-simple-2.0.9 in repository https://gitbox.apache.org/repos/asf/struts-examples.git was 1453b08 Bump org.slf4j:slf4j-simple from 2.0.7 to 2.0.9 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 feature/notifications created (now ef744a3)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch feature/notifications in repository https://gitbox.apache.org/repos/asf/struts-examples.git at ef744a3 Redirects GH notifications to commits list This branch includes the following new commits: new ef744a3 Redirects GH notifications to commits list 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] 01/01: Redirects GH notifications to commits list
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch feature/notifications in repository https://gitbox.apache.org/repos/asf/struts-examples.git commit ef744a371773d7e3686076c8577629de407928e1 Author: Lukasz Lenart AuthorDate: Mon Sep 4 07:11:59 2023 +0200 Redirects GH notifications to commits list --- .asf.yaml | 14 ++ 1 file changed, 14 insertions(+) diff --git a/.asf.yaml b/.asf.yaml index 9dd84f1..f2ca9ba 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -1,3 +1,17 @@ # Documentation https://s.apache.org/asfyaml +notifications: + commits: commits@struts.apache.org + # Send all issue emails (new, closed, comments) to issues@ + issues: iss...@struts.apache.org + # Send new/closed PR notifications to commits@ + pullrequests_status: commits@struts.apache.org + # Send individual PR comments/reviews to issues@ + pullrequests_comment: iss...@struts.apache.org + # Link opened PRs with JIRA + jira_options: link label worklog github: del_branch_on_merge: true + autolink_jira: +- WW + dependabot_alerts: true + dependabot_updates: true
[struts-examples] branch master updated (e6e0af7 -> a6d6b73)
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-examples.git from e6e0af7 Merge pull request #256 from apache/dependabot/maven/org.slf4j-slf4j-simple-2.0.9 add ef744a3 Redirects GH notifications to commits list new a6d6b73 Merge pull request #257 from apache/feature/notifications 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: .asf.yaml | 14 ++ 1 file changed, 14 insertions(+)
[struts-examples] 01/01: Merge pull request #257 from apache/feature/notifications
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-examples.git commit a6d6b7319f341dd4abb016e9035f4e94ab70171a Merge: e6e0af7 ef744a3 Author: Lukasz Lenart AuthorDate: Mon Sep 4 07:38:08 2023 +0200 Merge pull request #257 from apache/feature/notifications Redirects GH notifications to commits list .asf.yaml | 14 ++ 1 file changed, 14 insertions(+)
[struts-examples] branch feature/notifications deleted (was ef744a3)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch feature/notifications in repository https://gitbox.apache.org/repos/asf/struts-examples.git was ef744a3 Redirects GH notifications to commits list 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 dependabot/maven/quarkus-plugin.version-3.3.1 updated (8cb0989 -> 1099e95)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/quarkus-plugin.version-3.3.1 in repository https://gitbox.apache.org/repos/asf/struts-examples.git omit 8cb0989 Bump quarkus-plugin.version from 3.3.0 to 3.3.1 add 1453b08 Bump org.slf4j:slf4j-simple from 2.0.7 to 2.0.9 add e6e0af7 Merge pull request #256 from apache/dependabot/maven/org.slf4j-slf4j-simple-2.0.9 add ef744a3 Redirects GH notifications to commits list add a6d6b73 Merge pull request #257 from apache/feature/notifications add 1099e95 Bump quarkus-plugin.version from 3.3.0 to 3.3.1 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 (8cb0989) \ N -- N -- N refs/heads/dependabot/maven/quarkus-plugin.version-3.3.1 (1099e95) 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: .asf.yaml | 14 ++ portlet/pom.xml | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-)
[GitHub] [struts-examples] github-actions[bot] merged pull request #255: Bump quarkus-plugin.version from 3.3.0 to 3.3.1
github-actions[bot] merged PR #255: URL: https://github.com/apache/struts-examples/pull/255 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@struts.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[struts-examples] branch dependabot/maven/quarkus-plugin.version-3.3.1 deleted (was 1099e95)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/quarkus-plugin.version-3.3.1 in repository https://gitbox.apache.org/repos/asf/struts-examples.git was 1099e95 Bump quarkus-plugin.version from 3.3.0 to 3.3.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 master updated (a6d6b73 -> 42e89a5)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/struts-examples.git from a6d6b73 Merge pull request #257 from apache/feature/notifications add 1099e95 Bump quarkus-plugin.version from 3.3.0 to 3.3.1 new 42e89a5 Merge pull request #255 from apache/dependabot/maven/quarkus-plugin.version-3.3.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: quarkus/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[struts-examples] 01/01: Merge pull request #255 from apache/dependabot/maven/quarkus-plugin.version-3.3.1
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/struts-examples.git commit 42e89a5f4ef7478ee7e4cb3460140fb0133e81ab Merge: a6d6b73 1099e95 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Mon Sep 4 05:40:20 2023 + Merge pull request #255 from apache/dependabot/maven/quarkus-plugin.version-3.3.1 Bump quarkus-plugin.version from 3.3.0 to 3.3.1 quarkus/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[struts] 02/15: Update scm and distributionManagement
This is an automated email from the ASF dual-hosted git repository. kusal pushed a commit to branch fork/6.3 in repository https://gitbox.apache.org/repos/asf/struts.git commit 11122ab6eccf96811b1a938acbd438da51aafa38 Author: Kusal Kithul-Godage AuthorDate: Mon Mar 27 17:24:08 2023 +1100 Update scm and distributionManagement --- pom.xml | 39 --- 1 file changed, 12 insertions(+), 27 deletions(-) diff --git a/pom.xml b/pom.xml index d0f86608f..ba18f4440 100644 --- a/pom.xml +++ b/pom.xml @@ -48,36 +48,21 @@ --> - scm:git:https://gitbox.apache.org/repos/asf/struts.git - scm:git:https://gitbox.apache.org/repos/asf/struts.git -https://github.com/apache/struts/ -STRUTS_6_2_0 + scm:git:ssh://g...@stash.atlassian.com:7997/bam/struts2-atlassian.git + scm:git:ssh://g...@stash.atlassian.com:7997/bam/struts2-atlassian.git + https://stash.atlassian.com/projects/BAM/repos/struts2-atlassian/browse +HEAD - -JIRA -https://issues.apache.org/jira/projects/WW - - - -Jenkins -https://builds.apache.org/job/Struts/ - - -mail - -d...@struts.apache.org - - - - - - -struts-site -Apache Struts -https://struts.apache.org/maven/ - + + + + + +atlassian-3rdparty +https://packages.atlassian.com/mvn/maven-3rdparty +
[struts] 03/15: Skip tests and GPG for release
This is an automated email from the ASF dual-hosted git repository. kusal pushed a commit to branch fork/6.3 in repository https://gitbox.apache.org/repos/asf/struts.git commit 29dd8ea7f57e2be2aacabe678d1983b708490bd8 Author: Kusal Kithul-Godage AuthorDate: Mon Mar 27 22:21:42 2023 +1100 Skip tests and GPG for release --- pom.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pom.xml b/pom.xml index ba18f4440..2b29ac958 100644 --- a/pom.xml +++ b/pom.xml @@ -376,6 +376,9 @@ maven-release-plugin 3.0.0-M1 + +-Dmaven.test.skip -Dgpg.skip + maven-jar-plugin
[struts] 05/15: Update POM version to atlassian-1
This is an automated email from the ASF dual-hosted git repository. kusal pushed a commit to branch fork/6.3 in repository https://gitbox.apache.org/repos/asf/struts.git commit 17cec424aa7d882d0e663e83d5a45a4618522820 Author: Kusal Kithul-Godage AuthorDate: Mon Jul 10 19:04:53 2023 +1000 Update POM version to atlassian-1 --- apps/pom.xml| 2 +- apps/rest-showcase/pom.xml | 4 ++-- apps/showcase/pom.xml | 2 +- assembly/pom.xml| 2 +- bom/pom.xml | 2 +- bundles/admin/pom.xml | 2 +- bundles/demo/pom.xml| 2 +- bundles/pom.xml | 2 +- core/pom.xml| 2 +- plugins/async/pom.xml | 2 +- plugins/bean-validation/pom.xml | 2 +- plugins/cdi/pom.xml | 2 +- plugins/config-browser/pom.xml | 2 +- plugins/convention/pom.xml | 2 +- plugins/dwr/pom.xml | 2 +- plugins/embeddedjsp/pom.xml | 2 +- plugins/gxp/pom.xml | 2 +- plugins/jasperreports/pom.xml | 2 +- plugins/javatemplates/pom.xml | 2 +- plugins/jfreechart/pom.xml | 2 +- plugins/json/pom.xml| 2 +- plugins/junit/pom.xml | 2 +- plugins/osgi/pom.xml| 2 +- plugins/oval/pom.xml| 2 +- plugins/pell-multipart/pom.xml | 2 +- plugins/plexus/pom.xml | 2 +- plugins/pom.xml | 2 +- plugins/portlet-mocks/pom.xml | 2 +- plugins/portlet-tiles/pom.xml | 2 +- plugins/portlet/pom.xml | 2 +- plugins/rest/pom.xml| 2 +- plugins/sitemesh/pom.xml| 2 +- plugins/spring/pom.xml | 2 +- plugins/testng/pom.xml | 2 +- plugins/tiles/pom.xml | 2 +- plugins/velocity/pom.xml| 2 +- plugins/xslt/pom.xml| 2 +- pom.xml | 2 +- 38 files changed, 39 insertions(+), 39 deletions(-) diff --git a/apps/pom.xml b/apps/pom.xml index 9f7ba391d..512422603 100644 --- a/apps/pom.xml +++ b/apps/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -6.2.0 +6.2.0-atlassian-1-SNAPSHOT struts2-apps pom diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml index b4c9c6a21..ebff80f72 100644 --- a/apps/rest-showcase/pom.xml +++ b/apps/rest-showcase/pom.xml @@ -24,12 +24,12 @@ org.apache.struts struts2-apps -6.2.0 +6.2.0-atlassian-1-SNAPSHOT struts2-rest-showcase war -6.2.0 +6.2.0-atlassian-1-SNAPSHOT Struts 2 Rest Showcase Webapp Struts 2 Rest Showcase Example diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml index 32f307c59..f69c8adf3 100644 --- a/apps/showcase/pom.xml +++ b/apps/showcase/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-apps -6.2.0 +6.2.0-atlassian-1-SNAPSHOT struts2-showcase diff --git a/assembly/pom.xml b/assembly/pom.xml index 3d05b90c2..781c21afa 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -6.2.0 +6.2.0-atlassian-1-SNAPSHOT struts2-assembly diff --git a/bom/pom.xml b/bom/pom.xml index f7a6868a9..70296d102 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -29,7 +29,7 @@ struts2-bom -6.2.0 +6.2.0-atlassian-1-SNAPSHOT pom Struts 2 Bill of Materials diff --git a/bundles/admin/pom.xml b/bundles/admin/pom.xml index 4e0f1c1de..7592d4902 100644 --- a/bundles/admin/pom.xml +++ b/bundles/admin/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-osgi-bundles -6.2.0 +6.2.0-atlassian-1-SNAPSHOT struts2-osgi-admin-bundle diff --git a/bundles/demo/pom.xml b/bundles/demo/pom.xml index 281252b5e..7887da454 100644 --- a/bundles/demo/pom.xml +++ b/bundles/demo/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-osgi-bundles -6.2.0 +6.2.0-atlassian-1-SNAPSHOT struts2-osgi-demo-bundle diff --git a/bundles/pom.xml b/bundles/pom.xml index 9f3a37712..0c3e35769 100755 --- a/bundles/pom.xml +++ b/bundles/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -6.2.0 +6.2.0-atlassian-1-SNAPSHOT struts2-osgi-bundles diff --git a/core/pom.xml b/core/pom.xml index 1dccd3828..dd1f6df1e 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -6.2.0 +6.2.0-atlassian-1-SNAPSHOT struts2-core jar diff --git a/plugins/async/pom.xml b/plugins/async/pom.xml index 045abd92d..070166b42 100644 --- a/plugins/async/pom.xml +++ b/plugins/async/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-plugins -6.2.0 +6.2.0-atlassian-1-SNAPSHOT struts2-async-plugin diff --git a/plugins/bean-validat
[struts] 07/15: CONFSRVDEV-26354 Port legacy WebWork syntax support (partial revert 7840fa1)
This is an automated email from the ASF dual-hosted git repository.
kusal pushed a commit to branch fork/6.3
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 4762b6c7dab0eddfe2217cc3592a8915192989b4
Author: Kusal Kithul-Godage
AuthorDate: Thu Mar 30 18:19:56 2023 +1100
CONFSRVDEV-26354 Port legacy WebWork syntax support (partial revert 7840fa1)
---
.../org/apache/struts2/components/Component.java | 26 ++
.../struts2/components/DoubleListUIBean.java | 4 +++-
.../org/apache/struts2/components/FormButton.java | 5 +++--
.../java/org/apache/struts2/components/Label.java | 13 ++-
.../java/org/apache/struts2/components/UIBean.java | 5 +++--
5 files changed, 23 insertions(+), 30 deletions(-)
diff --git a/core/src/main/java/org/apache/struts2/components/Component.java
b/core/src/main/java/org/apache/struts2/components/Component.java
index ba0d672bf..8c649276c 100644
--- a/core/src/main/java/org/apache/struts2/components/Component.java
+++ b/core/src/main/java/org/apache/struts2/components/Component.java
@@ -22,7 +22,6 @@ import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.inject.Inject;
import com.opensymphony.xwork2.security.NotExcludedAcceptedPatternsChecker;
-import com.opensymphony.xwork2.util.TextParseUtil;
import com.opensymphony.xwork2.util.ValueStack;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.StringUtils;
@@ -319,14 +318,9 @@ public class Component {
* @return the modified expression wrapped with %{...}
*/
protected String completeExpression(String expr) {
-if (expr == null) {
-return null;
-}
-if (ComponentUtils.isExpression(expr)) {
-LOG.warn("Expression {} is already an expression!", expr);
-return expr;
-}
-return "%{" + expr + "}";
+// Start forked modification
+return expr;
+// End modification
}
/**
@@ -378,16 +372,10 @@ public class Component {
* @return the Object found, or null if not found.
*/
protected Object findValue(String expression, Class toType) {
-if (toType == String.class) {
-if (ComponentUtils.containsExpression(expression)) {
-return TextParseUtil.translateVariables('%', expression,
stack);
-} else {
-return expression;
-}
-} else {
-String strippedExpression = stripExpression(expression);
-return getStack().findValue(strippedExpression, toType,
throwExceptionOnELFailure);
-}
+// Start forked modification
+String strippedExpression = stripExpression(expression);
+return getStack().findValue(strippedExpression, toType,
throwExceptionOnELFailure);
+// End modification
}
/**
diff --git
a/core/src/main/java/org/apache/struts2/components/DoubleListUIBean.java
b/core/src/main/java/org/apache/struts2/components/DoubleListUIBean.java
index 9c4e30a0c..484997df1 100644
--- a/core/src/main/java/org/apache/struts2/components/DoubleListUIBean.java
+++ b/core/src/main/java/org/apache/struts2/components/DoubleListUIBean.java
@@ -186,7 +186,9 @@ public abstract class DoubleListUIBean extends ListUIBean {
Form form = (Form) findAncestor(Form.class);
if (doubleId != null) {
-addParameter("doubleId", findString(doubleId));
+// Start forked modification
+addParameter("doubleId", doubleId);
+// End modification
} else if (form != null) {
addParameter("doubleId", form.getParameters().get("id") + "_" +
escape(doubleName != null ? findString(doubleName) : null));
} else {
diff --git a/core/src/main/java/org/apache/struts2/components/FormButton.java
b/core/src/main/java/org/apache/struts2/components/FormButton.java
index 0ed08d47b..0a12f36b3 100644
--- a/core/src/main/java/org/apache/struts2/components/FormButton.java
+++ b/core/src/main/java/org/apache/struts2/components/FormButton.java
@@ -98,8 +98,9 @@ public abstract class FormButton extends ClosingUIBean {
protected void populateComponentHtmlId(Form form) {
String tmpId = "";
if (id != null) {
-// this check is needed for backwards compatibility with 2.1.x
-tmpId = findString(id);
+// Start forked modification
+tmpId = id;
+// End modification
} else {
if (form != null && form.getParameters().get("id") != null) {
tmpId = tmpId + form.getParameters().get("id").toString() +
"_";
diff --git a/core/src/main/java/org/apache/struts2/components/Label.java
b/core/src/main/java/org/apache/struts2/components/Label.java
index c09b88c80..03b2129a0 100644
--- a/core/src/main/java/org/apache/struts2/components/Label.java
+++ b/core/src/main/java/org/apac
[struts] 14/15: [maven-release-plugin] prepare release struts2-parent-6.3.0-atlassian-1
This is an automated email from the ASF dual-hosted git repository. kusal pushed a commit to branch fork/6.3 in repository https://gitbox.apache.org/repos/asf/struts.git commit 088a5b0ec0021722a4a097406ecc56d07be5a811 Author: Kusal Kithul-Godage AuthorDate: Mon Sep 4 16:00:20 2023 +1000 [maven-release-plugin] prepare release struts2-parent-6.3.0-atlassian-1 --- core/pom.xml | 2 +- plugins/junit/pom.xml| 2 +- plugins/pom.xml | 2 +- plugins/spring/pom.xml | 2 +- plugins/velocity/pom.xml | 2 +- pom.xml | 6 +++--- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index f8192156e..627e0bfcd 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -6.3.0-atlassian-1-SNAPSHOT +6.3.0-atlassian-1 struts2-core jar diff --git a/plugins/junit/pom.xml b/plugins/junit/pom.xml index 334ca2fc8..07a428925 100644 --- a/plugins/junit/pom.xml +++ b/plugins/junit/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-plugins -6.3.0-atlassian-1-SNAPSHOT +6.3.0-atlassian-1 struts2-junit-plugin diff --git a/plugins/pom.xml b/plugins/pom.xml index 2ac99fa72..43f688318 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -6.3.0-atlassian-1-SNAPSHOT +6.3.0-atlassian-1 struts2-plugins diff --git a/plugins/spring/pom.xml b/plugins/spring/pom.xml index 48be43941..686edbfeb 100644 --- a/plugins/spring/pom.xml +++ b/plugins/spring/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-plugins -6.3.0-atlassian-1-SNAPSHOT +6.3.0-atlassian-1 struts2-spring-plugin diff --git a/plugins/velocity/pom.xml b/plugins/velocity/pom.xml index 5e7eef90e..bb86081e3 100644 --- a/plugins/velocity/pom.xml +++ b/plugins/velocity/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-plugins -6.3.0-atlassian-1-SNAPSHOT +6.3.0-atlassian-1 struts2-velocity-plugin diff --git a/pom.xml b/pom.xml index b2ccf8737..3b20176f9 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ 4.0.0 struts2-parent -6.3.0-atlassian-1-SNAPSHOT +6.3.0-atlassian-1 pom Struts 2 https://struts.apache.org/ @@ -51,7 +51,7 @@ scm:git:ssh://g...@stash.atlassian.com:7997/bam/struts2-atlassian.git scm:git:ssh://g...@stash.atlassian.com:7997/bam/struts2-atlassian.git https://stash.atlassian.com/projects/BAM/repos/struts2-atlassian/browse -HEAD +struts2-parent-6.3.0-atlassian-1 @@ -89,7 +89,7 @@ UTF-8 - 2023-09-04T05:35:14Z + 2023-09-04T05:59:57Z 1.8 1.8
[struts] 15/15: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. kusal pushed a commit to branch fork/6.3 in repository https://gitbox.apache.org/repos/asf/struts.git commit 301969bd3d8c47fdcdb783347969bf3acccf9c6c Author: Kusal Kithul-Godage AuthorDate: Mon Sep 4 16:00:27 2023 +1000 [maven-release-plugin] prepare for next development iteration --- core/pom.xml | 2 +- plugins/junit/pom.xml| 2 +- plugins/pom.xml | 2 +- plugins/spring/pom.xml | 2 +- plugins/velocity/pom.xml | 2 +- pom.xml | 6 +++--- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index 627e0bfcd..fb8ddc061 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -6.3.0-atlassian-1 +6.3.0-atlassian-2-SNAPSHOT struts2-core jar diff --git a/plugins/junit/pom.xml b/plugins/junit/pom.xml index 07a428925..e2915edc9 100644 --- a/plugins/junit/pom.xml +++ b/plugins/junit/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-plugins -6.3.0-atlassian-1 +6.3.0-atlassian-2-SNAPSHOT struts2-junit-plugin diff --git a/plugins/pom.xml b/plugins/pom.xml index 43f688318..fca344d9f 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -6.3.0-atlassian-1 +6.3.0-atlassian-2-SNAPSHOT struts2-plugins diff --git a/plugins/spring/pom.xml b/plugins/spring/pom.xml index 686edbfeb..992b9dab4 100644 --- a/plugins/spring/pom.xml +++ b/plugins/spring/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-plugins -6.3.0-atlassian-1 +6.3.0-atlassian-2-SNAPSHOT struts2-spring-plugin diff --git a/plugins/velocity/pom.xml b/plugins/velocity/pom.xml index bb86081e3..35177ae70 100644 --- a/plugins/velocity/pom.xml +++ b/plugins/velocity/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-plugins -6.3.0-atlassian-1 +6.3.0-atlassian-2-SNAPSHOT struts2-velocity-plugin diff --git a/pom.xml b/pom.xml index 3b20176f9..81e29643b 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ 4.0.0 struts2-parent -6.3.0-atlassian-1 +6.3.0-atlassian-2-SNAPSHOT pom Struts 2 https://struts.apache.org/ @@ -51,7 +51,7 @@ scm:git:ssh://g...@stash.atlassian.com:7997/bam/struts2-atlassian.git scm:git:ssh://g...@stash.atlassian.com:7997/bam/struts2-atlassian.git https://stash.atlassian.com/projects/BAM/repos/struts2-atlassian/browse -struts2-parent-6.3.0-atlassian-1 +HEAD @@ -89,7 +89,7 @@ UTF-8 - 2023-09-04T05:59:57Z + 2023-09-04T06:00:27Z 1.8 1.8
[struts] 08/15: [maven-release-plugin] prepare release struts2-parent-6.2.0-atlassian-1
This is an automated email from the ASF dual-hosted git repository. kusal pushed a commit to branch fork/6.3 in repository https://gitbox.apache.org/repos/asf/struts.git commit 82091028bab17095e7d85d35d13875cc884d990f Author: Kusal Kithul-Godage AuthorDate: Mon Jul 10 19:10:05 2023 +1000 [maven-release-plugin] prepare release struts2-parent-6.2.0-atlassian-1 --- core/pom.xml | 2 +- plugins/convention/pom.xml| 2 +- plugins/junit/pom.xml | 2 +- plugins/pom.xml | 2 +- plugins/portlet-mocks/pom.xml | 2 +- plugins/portlet/pom.xml | 2 +- plugins/spring/pom.xml| 2 +- plugins/velocity/pom.xml | 2 +- pom.xml | 6 +++--- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index dd1f6df1e..e48e96a77 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -6.2.0-atlassian-1-SNAPSHOT +6.2.0-atlassian-1 struts2-core jar diff --git a/plugins/convention/pom.xml b/plugins/convention/pom.xml index 0a956a03d..a1d85570d 100644 --- a/plugins/convention/pom.xml +++ b/plugins/convention/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-plugins -6.2.0-atlassian-1-SNAPSHOT +6.2.0-atlassian-1 struts2-convention-plugin diff --git a/plugins/junit/pom.xml b/plugins/junit/pom.xml index 437e3a73d..65e7427a1 100644 --- a/plugins/junit/pom.xml +++ b/plugins/junit/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-plugins -6.2.0-atlassian-1-SNAPSHOT +6.2.0-atlassian-1 struts2-junit-plugin diff --git a/plugins/pom.xml b/plugins/pom.xml index 22fed373d..4fa04ec1e 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -6.2.0-atlassian-1-SNAPSHOT +6.2.0-atlassian-1 struts2-plugins diff --git a/plugins/portlet-mocks/pom.xml b/plugins/portlet-mocks/pom.xml index 7f862bd8a..8c08057aa 100644 --- a/plugins/portlet-mocks/pom.xml +++ b/plugins/portlet-mocks/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-plugins -6.2.0-atlassian-1-SNAPSHOT +6.2.0-atlassian-1 struts2-portlet-mocks-plugin diff --git a/plugins/portlet/pom.xml b/plugins/portlet/pom.xml index a043906df..3c53f7e78 100644 --- a/plugins/portlet/pom.xml +++ b/plugins/portlet/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-plugins -6.2.0-atlassian-1-SNAPSHOT +6.2.0-atlassian-1 struts2-portlet-plugin diff --git a/plugins/spring/pom.xml b/plugins/spring/pom.xml index e1acf1db3..b740f3060 100644 --- a/plugins/spring/pom.xml +++ b/plugins/spring/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-plugins -6.2.0-atlassian-1-SNAPSHOT +6.2.0-atlassian-1 struts2-spring-plugin diff --git a/plugins/velocity/pom.xml b/plugins/velocity/pom.xml index 84d9169d2..cab0d760c 100644 --- a/plugins/velocity/pom.xml +++ b/plugins/velocity/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-plugins -6.2.0-atlassian-1-SNAPSHOT +6.2.0-atlassian-1 struts2-velocity-plugin diff --git a/pom.xml b/pom.xml index 7f01cac0e..9a14c491a 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ 4.0.0 struts2-parent -6.2.0-atlassian-1-SNAPSHOT +6.2.0-atlassian-1 pom Struts 2 https://struts.apache.org/ @@ -51,7 +51,7 @@ scm:git:ssh://g...@stash.atlassian.com:7997/bam/struts2-atlassian.git scm:git:ssh://g...@stash.atlassian.com:7997/bam/struts2-atlassian.git https://stash.atlassian.com/projects/BAM/repos/struts2-atlassian/browse -HEAD +struts2-parent-6.2.0-atlassian-1 @@ -89,7 +89,7 @@ UTF-8 - 2023-06-28T07:08:44Z + 2023-07-10T09:09:42Z 1.8 1.8
[struts] branch fork/6.3 created (now 301969bd3)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch fork/6.3 in repository https://gitbox.apache.org/repos/asf/struts.git at 301969bd3 [maven-release-plugin] prepare for next development iteration This branch includes the following new commits: new 0b3df53a9 Update README.md new 11122ab6e Update scm and distributionManagement new 29dd8ea7f Skip tests and GPG for release new c254d7e51 Comment unnecessary modules new 17cec424a Update POM version to atlassian-1 new e9facfa6e CONFSRVDEV-26304 Add type inference to directive parameters (cherry-picked from 82ef6576c5d and 059de2305af) new 4762b6c7d CONFSRVDEV-26354 Port legacy WebWork syntax support (partial revert 7840fa1) new 82091028b [maven-release-plugin] prepare release struts2-parent-6.2.0-atlassian-1 new 489167f0a [maven-release-plugin] prepare for next development iteration new a647661a9 Merge branch 'fork/6.2' into fork/6.3 new 9e1fd914e Comment more unnecessary modules new fb12482a2 mvn versions:set -DnewVersion=6.3.0-atlassian-1-SNAPSHOT new b480454eb Update README.md new 088a5b0ec [maven-release-plugin] prepare release struts2-parent-6.3.0-atlassian-1 new 301969bd3 [maven-release-plugin] prepare for next development iteration The 15 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] 04/15: Comment unnecessary modules
This is an automated email from the ASF dual-hosted git repository. kusal pushed a commit to branch fork/6.3 in repository https://gitbox.apache.org/repos/asf/struts.git commit c254d7e5196ddc2990021bca2ada7bf6bbb8d182 Author: Kusal Kithul-Godage AuthorDate: Mon Mar 27 22:13:22 2023 +1100 Comment unnecessary modules --- plugins/pom.xml | 42 +- pom.xml | 8 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/plugins/pom.xml b/plugins/pom.xml index 382e0cfe2..5d175f4c4 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -32,33 +32,33 @@ Struts 2 Plugins -async -bean-validation -cdi -config-browser + + + + convention -dwr -embeddedjsp -gxp -jasperreports -javatemplates -jfreechart -json + + + + + + + junit -osgi -oval -pell-multipart -plexus + + + + portlet portlet-mocks -portlet-tiles -rest -sitemesh + + + spring -testng -tiles + + velocity -xslt + diff --git a/pom.xml b/pom.xml index 2b29ac958..97b009d08 100644 --- a/pom.xml +++ b/pom.xml @@ -66,11 +66,11 @@ -bom + core plugins -bundles -apps + + @@ -124,7 +124,7 @@ includeAssembly -!skipAssembly +includeAssembly
[struts] 01/15: Update README.md
This is an automated email from the ASF dual-hosted git repository. kusal pushed a commit to branch fork/6.3 in repository https://gitbox.apache.org/repos/asf/struts.git commit 0b3df53a95aafd50107a99814893baaa7f5976d8 Author: Kusal Kithul-Godage AuthorDate: Mon Jun 26 12:55:26 2023 +1000 Update README.md --- README.md | 34 ++ 1 file changed, 34 insertions(+) diff --git a/README.md b/README.md index ca6366563..e7140fb7f 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,40 @@ See the License for the specific language governing permissions and limitations under the License. --> + +# This branch is an Atlassian fork of Apache Struts + +## Updating this branch fork for a new patch release + +1. Clone this repo and checkout this branch +2. Add upstream repo as a remote: `git remote add apache https://github.com/apache/struts.git` +3. Fetch the upstream tags: `git fetch --tags apache` +4. Merge latest patch version tag into this branch, eg. `git merge STRUTS_2_5_31` +5. Ensure correct snapshot version, eg. `2.5.31-atlassian-1-SNAPSHOT` + +## Creating a new branch fork for a new major/minor release + +1. Clone this repo and checkout this branch +2. Add upstream repo as a remote: `git remote add apache https://github.com/apache/struts.git` +3. Fetch the upstream tags: `git fetch --tags apache` +4. Checkout a new branch from the desired tag, eg. `git checkout -b fork/6.2 STRUTS_6_2_0` +5. Either: + * Merge previous forked branch into new branch, eg. `git merge origin/fork/2.5` + * Cherry-pick desired commits from previous forked branch into new branch, eg. `git cherry-pick `. Please + ensure release related commits are included. +6. Ensure correct snapshot version, eg. `6.2.0-atlassian-1-SNAPSHOT` + +## Releasing a new version + +1. Ensure snapshot versions are correct +2. Ensure that the `scm` and `distributionManagement` sections in `pom.xml` are correct (consistent with previous + releases) +3. Grant yourself Artifactory write permission: `atlas packages permission grant` +4. Commence release, + eg. `mvn -B release:clean release:prepare release:perform -DdevelopmentVersion=6.2.0-atlassian-2-SNAPSHOT` +5. Push SNAPSHOT update: `git push` + +--- The Apache Struts web framework ---
[struts] 12/15: mvn versions:set -DnewVersion=6.3.0-atlassian-1-SNAPSHOT
This is an automated email from the ASF dual-hosted git repository. kusal pushed a commit to branch fork/6.3 in repository https://gitbox.apache.org/repos/asf/struts.git commit fb12482a2979edf7c1bf1699c9a7119fbcaed947 Author: Kusal Kithul-Godage AuthorDate: Mon Sep 4 15:50:00 2023 +1000 mvn versions:set -DnewVersion=6.3.0-atlassian-1-SNAPSHOT --- assembly/pom.xml | 2 +- core/pom.xml | 2 +- plugins/junit/pom.xml| 2 +- plugins/pom.xml | 2 +- plugins/spring/pom.xml | 2 +- plugins/velocity/pom.xml | 2 +- pom.xml | 4 ++-- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/assembly/pom.xml b/assembly/pom.xml index 186dec261..05072dcf2 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -6.3.0 +6.3.0-atlassian-1-SNAPSHOT struts2-assembly diff --git a/core/pom.xml b/core/pom.xml index ed12fb54a..f8192156e 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -6.3.0 +6.3.0-atlassian-1-SNAPSHOT struts2-core jar diff --git a/plugins/junit/pom.xml b/plugins/junit/pom.xml index a66c6d8aa..334ca2fc8 100644 --- a/plugins/junit/pom.xml +++ b/plugins/junit/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-plugins -6.3.0 +6.3.0-atlassian-1-SNAPSHOT struts2-junit-plugin diff --git a/plugins/pom.xml b/plugins/pom.xml index 35c407748..2ac99fa72 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -6.3.0 +6.3.0-atlassian-1-SNAPSHOT struts2-plugins diff --git a/plugins/spring/pom.xml b/plugins/spring/pom.xml index 36c42afd7..48be43941 100644 --- a/plugins/spring/pom.xml +++ b/plugins/spring/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-plugins -6.3.0 +6.3.0-atlassian-1-SNAPSHOT struts2-spring-plugin diff --git a/plugins/velocity/pom.xml b/plugins/velocity/pom.xml index 7c87ba7e4..5e7eef90e 100644 --- a/plugins/velocity/pom.xml +++ b/plugins/velocity/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-plugins -6.3.0 +6.3.0-atlassian-1-SNAPSHOT struts2-velocity-plugin diff --git a/pom.xml b/pom.xml index d656ffe10..b2ccf8737 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ 4.0.0 struts2-parent -6.3.0 +6.3.0-atlassian-1-SNAPSHOT pom Struts 2 https://struts.apache.org/ @@ -89,7 +89,7 @@ UTF-8 - 2023-09-01T05:56:19Z + 2023-09-04T05:35:14Z 1.8 1.8
[struts] 13/15: Update README.md
This is an automated email from the ASF dual-hosted git repository. kusal pushed a commit to branch fork/6.3 in repository https://gitbox.apache.org/repos/asf/struts.git commit b480454ebb750ac80f8a72f630202d573fc39af3 Author: Kusal Kithul-Godage AuthorDate: Mon Sep 4 15:52:13 2023 +1000 Update README.md --- README.md | 12 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index e7140fb7f..00947a6f1 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ 2. Add upstream repo as a remote: `git remote add apache https://github.com/apache/struts.git` 3. Fetch the upstream tags: `git fetch --tags apache` 4. Merge latest patch version tag into this branch, eg. `git merge STRUTS_2_5_31` -5. Ensure correct snapshot version, eg. `2.5.31-atlassian-1-SNAPSHOT` +5. Ensure correct snapshot version, eg. `mvn versions:set -DnewVersion=2.5.31-atlassian-1-SNAPSHOT` ## Creating a new branch fork for a new major/minor release @@ -31,11 +31,8 @@ 2. Add upstream repo as a remote: `git remote add apache https://github.com/apache/struts.git` 3. Fetch the upstream tags: `git fetch --tags apache` 4. Checkout a new branch from the desired tag, eg. `git checkout -b fork/6.2 STRUTS_6_2_0` -5. Either: - * Merge previous forked branch into new branch, eg. `git merge origin/fork/2.5` - * Cherry-pick desired commits from previous forked branch into new branch, eg. `git cherry-pick `. Please - ensure release related commits are included. -6. Ensure correct snapshot version, eg. `6.2.0-atlassian-1-SNAPSHOT` +5. Merge previous forked branch into new branch, eg. `git merge origin/fork/2.5` +6. Ensure correct snapshot version, eg. `mvn versions:set -DnewVersion=6.3.0-atlassian-1-SNAPSHOT` ## Releasing a new version @@ -44,8 +41,7 @@ releases) 3. Grant yourself Artifactory write permission: `atlas packages permission grant` 4. Commence release, - eg. `mvn -B release:clean release:prepare release:perform -DdevelopmentVersion=6.2.0-atlassian-2-SNAPSHOT` -5. Push SNAPSHOT update: `git push` + eg. `mvn -B release:clean release:prepare release:perform -DdevelopmentVersion=6.3.0-atlassian-2-SNAPSHOT` --- The Apache Struts web framework
[struts] 06/15: CONFSRVDEV-26304 Add type inference to directive parameters (cherry-picked from 82ef6576c5d and 059de2305af)
This is an automated email from the ASF dual-hosted git repository.
kusal pushed a commit to branch fork/6.3
in repository https://gitbox.apache.org/repos/asf/struts.git
commit e9facfa6ef4c8d5635321ea6f56b7e51aafe218c
Author: Kusal Kithul-Godage
AuthorDate: Mon Mar 27 21:27:33 2023 +1100
CONFSRVDEV-26304 Add type inference to directive parameters (cherry-picked
from 82ef6576c5d and 059de2305af)
---
.../velocity/components/AbstractDirective.java | 95 +++---
1 file changed, 84 insertions(+), 11 deletions(-)
diff --git
a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/AbstractDirective.java
b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/AbstractDirective.java
index e955b32aa..318a14c53 100644
---
a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/AbstractDirective.java
+++
b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/AbstractDirective.java
@@ -18,14 +18,11 @@
*/
package org.apache.struts2.views.velocity.components;
-import java.io.IOException;
-import java.io.Writer;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import com.opensymphony.xwork2.inject.Container;
+import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.apache.struts2.ServletActionContext;
import org.apache.struts2.components.Component;
import org.apache.velocity.context.InternalContextAdapter;
@@ -33,13 +30,24 @@ import
org.apache.velocity.exception.MethodInvocationException;
import org.apache.velocity.exception.ParseErrorException;
import org.apache.velocity.exception.ResourceNotFoundException;
import org.apache.velocity.runtime.directive.Directive;
+import org.apache.velocity.runtime.parser.node.ASTReference;
+import org.apache.velocity.runtime.parser.node.ASTStringLiteral;
import org.apache.velocity.runtime.parser.node.Node;
+import org.apache.velocity.runtime.parser.node.SimpleNode;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.inject.Container;
-import com.opensymphony.xwork2.util.ValueStack;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.Writer;
+import java.lang.reflect.Field;
+import java.util.HashMap;
+import java.util.Map;
+
+import static java.text.MessageFormat.format;
public abstract class AbstractDirective extends Directive {
+
+private static final Logger LOG =
LogManager.getLogger(AbstractDirective.class);
public String getName() {
return "s" + getBeanName();
}
@@ -143,6 +151,14 @@ public abstract class AbstractDirective extends Directive {
* @throws MethodInvocationException in case of method invocation errors
*/
protected void putProperty(Map propertyMap, InternalContextAdapter
contextAdapter, Node node) throws ParseErrorException,
MethodInvocationException {
+// Start forked modification
+if (putPropertyWithType(propertyMap, contextAdapter, node)) {
+return;
+} else {
+LOG.debug("Property value type preservation failed, falling back
to default string resolution behaviour.");
+}
+// End modification
+
// node.value uses the StrutsValueStack to evaluate the directive's
value parameter
String param = node.value(contextAdapter).toString();
@@ -157,4 +173,61 @@ public abstract class AbstractDirective extends Directive {
throw new ParseErrorException("#" + this.getName() + " arguments
must include an assignment operator! For example #tag( Component
\"template=mytemplate\" ). #tag( TextField \"mytemplate\" ) is illegal!");
}
}
+
+/**
+ * @TODO CONFSRVDEV-24358 : Replace this interim workaround with a more
reliable solution e.g. new Param directive.
+ * Temporary workaround using reflection to preserve type for attributes
based on template variables. This preserves
+ * compatibility for bodyTag/param directives that were converted to
s-prefixed directives in Confluence.
+ */
+private boolean putPropertyWithType(Map propertyMap,
InternalContextAdapter contextAdapter, Node node) {
+String param = node.value(contextAdapter).toString();
+int idx = param.indexOf('=');
+if (idx == -1 || !(node instanceof ASTStringLiteral)) {
+return false;
+}
+try {
+String property = param.substring(0, idx);
+SimpleNode nodeTree = reflectField(node, "nodeTree");
+if (nodeTree != null && nodeTree.jjtGetNumChildren() == 3 &&
nodeTree.jjtGetChild(1) instanceof ASTReference &&
+StringUtils.isBlank(nodeTree.jjtGetChild(2).literal())) {
+
[struts] 10/15: Merge branch 'fork/6.2' into fork/6.3
This is an automated email from the ASF dual-hosted git repository. kusal pushed a commit to branch fork/6.3 in repository https://gitbox.apache.org/repos/asf/struts.git commit a647661a9daa15aa2d32306d200eccbcfba0e599 Merge: 1a88f78a7 489167f0a Author: Kusal Kithul-Godage AuthorDate: Mon Sep 4 15:33:51 2023 +1000 Merge branch 'fork/6.2' into fork/6.3 README.md | 34 .../org/apache/struts2/components/Component.java | 26 ++ .../struts2/components/DoubleListUIBean.java | 4 +- .../org/apache/struts2/components/FormButton.java | 5 +- .../java/org/apache/struts2/components/Label.java | 13 +-- .../java/org/apache/struts2/components/UIBean.java | 5 +- plugins/pom.xml| 42 +- .../velocity/components/AbstractDirective.java | 95 +++--- pom.xml| 50 +--- 9 files changed, 181 insertions(+), 93 deletions(-) diff --cc plugins/pom.xml index f7912fb1d,84d2017d4..c454dd817 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@@ -32,34 -32,33 +32,34 @@@ Struts 2 Plugins - async - bean-validation - cdi - config-browser + + + + convention - dwr - embeddedjsp - gxp - jasperreports - javatemplates - jfreechart - json + + + + + + + junit - osgi - oval - pell-multipart - plexus + + + + portlet +portlet-junit portlet-mocks - portlet-tiles - rest - sitemesh + + + spring - testng - tiles + + velocity - xslt +
[struts] 11/15: Comment more unnecessary modules
This is an automated email from the ASF dual-hosted git repository. kusal pushed a commit to branch fork/6.3 in repository https://gitbox.apache.org/repos/asf/struts.git commit 9e1fd914ec8ec2cce41528a85acf7f90eed2aa6b Author: Kusal Kithul-Godage AuthorDate: Mon Sep 4 15:34:37 2023 +1000 Comment more unnecessary modules --- plugins/pom.xml | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/pom.xml b/plugins/pom.xml index c454dd817..35c407748 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -36,7 +36,7 @@ -convention + @@ -49,9 +49,9 @@ -portlet -portlet-junit -portlet-mocks + + +
[struts] 09/15: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. kusal pushed a commit to branch fork/6.3 in repository https://gitbox.apache.org/repos/asf/struts.git commit 489167f0ac066c7fd51d3a09243f9dbcabfd7bda Author: Kusal Kithul-Godage AuthorDate: Mon Jul 10 19:10:12 2023 +1000 [maven-release-plugin] prepare for next development iteration --- core/pom.xml | 2 +- plugins/convention/pom.xml| 2 +- plugins/junit/pom.xml | 2 +- plugins/pom.xml | 2 +- plugins/portlet-mocks/pom.xml | 2 +- plugins/portlet/pom.xml | 2 +- plugins/spring/pom.xml| 2 +- plugins/velocity/pom.xml | 2 +- pom.xml | 6 +++--- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index e48e96a77..e40c51992 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -6.2.0-atlassian-1 +6.2.0-atlassian-2-SNAPSHOT struts2-core jar diff --git a/plugins/convention/pom.xml b/plugins/convention/pom.xml index a1d85570d..60459b1b3 100644 --- a/plugins/convention/pom.xml +++ b/plugins/convention/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-plugins -6.2.0-atlassian-1 +6.2.0-atlassian-2-SNAPSHOT struts2-convention-plugin diff --git a/plugins/junit/pom.xml b/plugins/junit/pom.xml index 65e7427a1..b9ff136f6 100644 --- a/plugins/junit/pom.xml +++ b/plugins/junit/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-plugins -6.2.0-atlassian-1 +6.2.0-atlassian-2-SNAPSHOT struts2-junit-plugin diff --git a/plugins/pom.xml b/plugins/pom.xml index 4fa04ec1e..84d2017d4 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -6.2.0-atlassian-1 +6.2.0-atlassian-2-SNAPSHOT struts2-plugins diff --git a/plugins/portlet-mocks/pom.xml b/plugins/portlet-mocks/pom.xml index 8c08057aa..927a2653c 100644 --- a/plugins/portlet-mocks/pom.xml +++ b/plugins/portlet-mocks/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-plugins -6.2.0-atlassian-1 +6.2.0-atlassian-2-SNAPSHOT struts2-portlet-mocks-plugin diff --git a/plugins/portlet/pom.xml b/plugins/portlet/pom.xml index 3c53f7e78..6ddde67e6 100644 --- a/plugins/portlet/pom.xml +++ b/plugins/portlet/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-plugins -6.2.0-atlassian-1 +6.2.0-atlassian-2-SNAPSHOT struts2-portlet-plugin diff --git a/plugins/spring/pom.xml b/plugins/spring/pom.xml index b740f3060..6d5276ff0 100644 --- a/plugins/spring/pom.xml +++ b/plugins/spring/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-plugins -6.2.0-atlassian-1 +6.2.0-atlassian-2-SNAPSHOT struts2-spring-plugin diff --git a/plugins/velocity/pom.xml b/plugins/velocity/pom.xml index cab0d760c..a6fce0f15 100644 --- a/plugins/velocity/pom.xml +++ b/plugins/velocity/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-plugins -6.2.0-atlassian-1 +6.2.0-atlassian-2-SNAPSHOT struts2-velocity-plugin diff --git a/pom.xml b/pom.xml index 9a14c491a..01a40bb02 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ 4.0.0 struts2-parent -6.2.0-atlassian-1 +6.2.0-atlassian-2-SNAPSHOT pom Struts 2 https://struts.apache.org/ @@ -51,7 +51,7 @@ scm:git:ssh://g...@stash.atlassian.com:7997/bam/struts2-atlassian.git scm:git:ssh://g...@stash.atlassian.com:7997/bam/struts2-atlassian.git https://stash.atlassian.com/projects/BAM/repos/struts2-atlassian/browse -struts2-parent-6.2.0-atlassian-1 +HEAD @@ -89,7 +89,7 @@ UTF-8 - 2023-07-10T09:09:42Z + 2023-07-10T09:10:11Z 1.8 1.8
[struts] branch fork/6.3 deleted (was 301969bd3)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch fork/6.3 in repository https://gitbox.apache.org/repos/asf/struts.git was 301969bd3 [maven-release-plugin] prepare for next development iteration This change permanently discards the following revisions: discard 301969bd3 [maven-release-plugin] prepare for next development iteration discard 088a5b0ec [maven-release-plugin] prepare release struts2-parent-6.3.0-atlassian-1 discard b480454eb Update README.md discard fb12482a2 mvn versions:set -DnewVersion=6.3.0-atlassian-1-SNAPSHOT discard 9e1fd914e Comment more unnecessary modules discard a647661a9 Merge branch 'fork/6.2' into fork/6.3 discard 489167f0a [maven-release-plugin] prepare for next development iteration discard 82091028b [maven-release-plugin] prepare release struts2-parent-6.2.0-atlassian-1 discard 4762b6c7d CONFSRVDEV-26354 Port legacy WebWork syntax support (partial revert 7840fa1) discard e9facfa6e CONFSRVDEV-26304 Add type inference to directive parameters (cherry-picked from 82ef6576c5d and 059de2305af) discard 17cec424a Update POM version to atlassian-1 discard c254d7e51 Comment unnecessary modules discard 29dd8ea7f Skip tests and GPG for release discard 11122ab6e Update scm and distributionManagement discard 0b3df53a9 Update README.md
