(struts) 01/02: Fixes creating assembly during release process
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch release/struts-7-0-x in repository https://gitbox.apache.org/repos/asf/struts.git commit 0a3b596648348894f52c3cc3e4b3a3fc1b63b47a Author: Lukasz Lenart AuthorDate: Sat Apr 20 09:17:11 2024 +0200 Fixes creating assembly during release process --- assembly/pom.xml | 1 + pom.xml | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/assembly/pom.xml b/assembly/pom.xml index 8aa56982b..4fb804e25 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -115,6 +115,7 @@ +false src/main/assembly/all.xml src/main/assembly/lib.xml diff --git a/pom.xml b/pom.xml index 4fddf7ceb..3a7a2e5be 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts-master -14 +15 4.0.0 @@ -345,10 +345,8 @@ org.apache.maven.plugins maven-assembly-plugin -3.6.0 true -true
(struts) annotated tag STRUTS_7_0_0_M6 created (now 12f21eedf)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to annotated tag STRUTS_7_0_0_M6 in repository https://gitbox.apache.org/repos/asf/struts.git at 12f21eedf (tag) tagging af53f0d93b8d0c4efa44e24347ebbddc6b69e8d1 (commit) replaces STRUTS_7_0_0_M5 by Lukasz Lenart on Sat Apr 20 09:24:27 2024 +0200 - Log - [maven-release-plugin] copy for tag STRUTS_7_0_0_M6 --- No new revisions were added by this update.
(struts) branch release/struts-7-0-x updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch release/struts-7-0-x in repository https://gitbox.apache.org/repos/asf/struts.git The following commit(s) were added to refs/heads/release/struts-7-0-x by this push: new 2352c6863 [maven-release-plugin] prepare for next development iteration 2352c6863 is described below commit 2352c686312c571e360573b1252d85bc2be9468b Author: Lukasz Lenart AuthorDate: Sat Apr 20 09:24:32 2024 +0200 [maven-release-plugin] prepare for next development iteration --- apps/pom.xml| 2 +- apps/rest-showcase/pom.xml | 4 ++-- apps/showcase/pom.xml | 2 +- assembly/pom.xml| 2 +- bom/pom.xml | 8 core/pom.xml| 2 +- jakarta/freemarker-jakarta/pom.xml | 2 +- jakarta/pom.xml | 2 +- jakarta/sitemesh2-jakarta/pom.xml | 2 +- jakarta/velocity-tools-jsp-jakarta/pom.xml | 2 +- jakarta/velocity-tools-view-jakarta/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/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/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 | 6 +++--- 30 files changed, 36 insertions(+), 36 deletions(-) diff --git a/apps/pom.xml b/apps/pom.xml index 38e1a214b..219bf4ceb 100644 --- a/apps/pom.xml +++ b/apps/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -7.0.0-M6 +7.0.0-M7-SNAPSHOT struts2-apps pom diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml index f476e735c..20759b000 100644 --- a/apps/rest-showcase/pom.xml +++ b/apps/rest-showcase/pom.xml @@ -24,12 +24,12 @@ org.apache.struts struts2-apps -7.0.0-M6 +7.0.0-M7-SNAPSHOT struts2-rest-showcase war -7.0.0-M6 +7.0.0-M7-SNAPSHOT Struts 2 Rest Showcase Webapp Struts 2 Rest Showcase Example diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml index c558edf65..e2ed9f10a 100644 --- a/apps/showcase/pom.xml +++ b/apps/showcase/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-apps -7.0.0-M6 +7.0.0-M7-SNAPSHOT struts2-showcase diff --git a/assembly/pom.xml b/assembly/pom.xml index f2c1225c6..90e4c8e96 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -7.0.0-M6 +7.0.0-M7-SNAPSHOT struts2-assembly diff --git a/bom/pom.xml b/bom/pom.xml index 261ea073f..a8bdb360c 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -25,11 +25,11 @@ org.apache.struts struts2-parent -7.0.0-M6 +7.0.0-M7-SNAPSHOT struts2-bom -7.0.0-M6 +7.0.0-M7-SNAPSHOT pom Struts 2 Bill of Materials @@ -44,7 +44,7 @@ -7.0.0-M6 +7.0.0-M7-SNAPSHOT true true @@ -165,7 +165,7 @@ -STRUTS_7_0_0_M6 +HEAD 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/ diff --git a/core/pom.xml b/core/pom.xml index 520bb2714..bfc4d6e68 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -7.0.0-M6 +7.0.0-M7-SNAPSHOT struts2-core jar diff --git a/jakarta/freemarker-jakarta/pom.xml b/jakarta/freemarker-jakarta/pom.xml index 8b3ff585b..fd7991463 100644 --- a/jakarta/freemarker-jakarta/pom.xml +++ b/jakarta/freemarker-jakarta/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-jakarta -7.0.0-M6 +7.0.0-M7-SNAPSHOT struts2-freemarker-jakarta jar diff --git a/jakarta/pom.xml b/jakarta/pom.xml index e509b8ce2..da0c3f2ae 100644 --- a/jakarta/pom.xml +++ b/jakarta/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -
(struts) 02/02: [maven-release-plugin] prepare release STRUTS_7_0_0_M6
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch release/struts-7-0-x in repository https://gitbox.apache.org/repos/asf/struts.git commit af53f0d93b8d0c4efa44e24347ebbddc6b69e8d1 Author: Lukasz Lenart AuthorDate: Sat Apr 20 09:24:22 2024 +0200 [maven-release-plugin] prepare release STRUTS_7_0_0_M6 --- apps/pom.xml| 2 +- apps/rest-showcase/pom.xml | 4 ++-- apps/showcase/pom.xml | 2 +- assembly/pom.xml| 2 +- bom/pom.xml | 8 core/pom.xml| 2 +- jakarta/freemarker-jakarta/pom.xml | 2 +- jakarta/pom.xml | 2 +- jakarta/sitemesh2-jakarta/pom.xml | 2 +- jakarta/velocity-tools-jsp-jakarta/pom.xml | 2 +- jakarta/velocity-tools-view-jakarta/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/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/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 | 6 +++--- 30 files changed, 36 insertions(+), 36 deletions(-) diff --git a/apps/pom.xml b/apps/pom.xml index 787c3ec93..38e1a214b 100644 --- a/apps/pom.xml +++ b/apps/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -7.0.0-M6-SNAPSHOT +7.0.0-M6 struts2-apps pom diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml index 3b2a7ac6c..f476e735c 100644 --- a/apps/rest-showcase/pom.xml +++ b/apps/rest-showcase/pom.xml @@ -24,12 +24,12 @@ org.apache.struts struts2-apps -7.0.0-M6-SNAPSHOT +7.0.0-M6 struts2-rest-showcase war -7.0.0-M6-SNAPSHOT +7.0.0-M6 Struts 2 Rest Showcase Webapp Struts 2 Rest Showcase Example diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml index 900a3ae8c..c558edf65 100644 --- a/apps/showcase/pom.xml +++ b/apps/showcase/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-apps -7.0.0-M6-SNAPSHOT +7.0.0-M6 struts2-showcase diff --git a/assembly/pom.xml b/assembly/pom.xml index 4fb804e25..f2c1225c6 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -7.0.0-M6-SNAPSHOT +7.0.0-M6 struts2-assembly diff --git a/bom/pom.xml b/bom/pom.xml index 25303221b..261ea073f 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -25,11 +25,11 @@ org.apache.struts struts2-parent -7.0.0-M6-SNAPSHOT +7.0.0-M6 struts2-bom -7.0.0-M6-SNAPSHOT +7.0.0-M6 pom Struts 2 Bill of Materials @@ -44,7 +44,7 @@ -7.0.0-M6-SNAPSHOT +7.0.0-M6 true true @@ -165,7 +165,7 @@ -HEAD +STRUTS_7_0_0_M6 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/ diff --git a/core/pom.xml b/core/pom.xml index fdba1e65a..520bb2714 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -7.0.0-M6-SNAPSHOT +7.0.0-M6 struts2-core jar diff --git a/jakarta/freemarker-jakarta/pom.xml b/jakarta/freemarker-jakarta/pom.xml index c80a01740..8b3ff585b 100644 --- a/jakarta/freemarker-jakarta/pom.xml +++ b/jakarta/freemarker-jakarta/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-jakarta -7.0.0-M6-SNAPSHOT +7.0.0-M6 struts2-freemarker-jakarta jar diff --git a/jakarta/pom.xml b/jakarta/pom.xml index 1613769ae..e509b8ce2 100644 --- a/jakarta/pom.xml +++ b/jakarta/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -7.0.0-M6-SNAPSHOT +7.0.0-M6 struts2-jakarta pom diff --git a/jakarta/sitemesh2-jakarta/pom.xml b/jakarta/sitemesh2-jakarta/pom.xml index 16854fd83..2ee3b49f4 100644 --- a/jakarta
(struts) branch release/struts-7-0-x updated (549c3bc98 -> af53f0d93)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch release/struts-7-0-x in repository https://gitbox.apache.org/repos/asf/struts.git from 549c3bc98 [maven-release-plugin] prepare for next development iteration new 0a3b59664 Fixes creating assembly during release process new af53f0d93 [maven-release-plugin] prepare release STRUTS_7_0_0_M6 The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: apps/pom.xml| 2 +- apps/rest-showcase/pom.xml | 4 ++-- apps/showcase/pom.xml | 2 +- assembly/pom.xml| 3 ++- bom/pom.xml | 8 core/pom.xml| 2 +- jakarta/freemarker-jakarta/pom.xml | 2 +- jakarta/pom.xml | 2 +- jakarta/sitemesh2-jakarta/pom.xml | 2 +- jakarta/velocity-tools-jsp-jakarta/pom.xml | 2 +- jakarta/velocity-tools-view-jakarta/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/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/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 | 10 -- 30 files changed, 38 insertions(+), 39 deletions(-)
svn commit: r68661 - /dev/struts/7.0.0-M3/
Author: lukaszlenart Date: Sat Apr 20 07:39:11 2024 New Revision: 68661 Log: Struts 7.0.0-M6 is out Removed: dev/struts/7.0.0-M3/
svn commit: r68660 - /dev/struts/7.0.0-M6/
Author: lukaszlenart Date: Sat Apr 20 07:38:26 2024 New Revision: 68660 Log: Updates test release 7.0.0-M6 Added: dev/struts/7.0.0-M6/ dev/struts/7.0.0-M6/struts-7.0.0-M6-all.zip (with props) dev/struts/7.0.0-M6/struts-7.0.0-M6-all.zip.asc dev/struts/7.0.0-M6/struts-7.0.0-M6-all.zip.sha256 dev/struts/7.0.0-M6/struts-7.0.0-M6-all.zip.sha512 dev/struts/7.0.0-M6/struts-7.0.0-M6-apps.zip (with props) dev/struts/7.0.0-M6/struts-7.0.0-M6-apps.zip.asc dev/struts/7.0.0-M6/struts-7.0.0-M6-apps.zip.sha256 dev/struts/7.0.0-M6/struts-7.0.0-M6-apps.zip.sha512 dev/struts/7.0.0-M6/struts-7.0.0-M6-docs.zip (with props) dev/struts/7.0.0-M6/struts-7.0.0-M6-docs.zip.asc dev/struts/7.0.0-M6/struts-7.0.0-M6-docs.zip.sha256 dev/struts/7.0.0-M6/struts-7.0.0-M6-docs.zip.sha512 dev/struts/7.0.0-M6/struts-7.0.0-M6-lib.zip (with props) dev/struts/7.0.0-M6/struts-7.0.0-M6-lib.zip.asc dev/struts/7.0.0-M6/struts-7.0.0-M6-lib.zip.sha256 dev/struts/7.0.0-M6/struts-7.0.0-M6-lib.zip.sha512 dev/struts/7.0.0-M6/struts-7.0.0-M6-min-lib.zip (with props) dev/struts/7.0.0-M6/struts-7.0.0-M6-min-lib.zip.asc dev/struts/7.0.0-M6/struts-7.0.0-M6-min-lib.zip.sha256 dev/struts/7.0.0-M6/struts-7.0.0-M6-min-lib.zip.sha512 dev/struts/7.0.0-M6/struts-7.0.0-M6-src.zip (with props) dev/struts/7.0.0-M6/struts-7.0.0-M6-src.zip.asc dev/struts/7.0.0-M6/struts-7.0.0-M6-src.zip.sha256 dev/struts/7.0.0-M6/struts-7.0.0-M6-src.zip.sha512 Added: dev/struts/7.0.0-M6/struts-7.0.0-M6-all.zip == Binary file - no diff available. Propchange: dev/struts/7.0.0-M6/struts-7.0.0-M6-all.zip -- svn:mime-type = application/octet-stream Added: dev/struts/7.0.0-M6/struts-7.0.0-M6-all.zip.asc == --- dev/struts/7.0.0-M6/struts-7.0.0-M6-all.zip.asc (added) +++ dev/struts/7.0.0-M6/struts-7.0.0-M6-all.zip.asc Sat Apr 20 07:38:26 2024 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- + +iQJMBAABCgA2FiEEDgCGmDROYrkGM7fGKEFhBmOvux8FAmYjcGsYHGx1a2Fzemxl +bmFydEBhcGFjaGUub3JnAAoJEChBYQZjr7sfURoP/iidtfxQqqm6tZtpIXAXxZTA +B2ZoKBvTyc9EISpXBnnRJz8H6Kl9geNjvLmLqKKBBsnsqMU812e8bdoak3E+szkV +wlI18xb8hZAIcqYv4c0xe/OZdGIC6yJTS35kRqWBDE1m4cfpvkAstGiNcoGTRGdu +SBuuym60rfCJVq8azWYVLHpesAgGUlPlj5u9aJSHLmBIPULlalJDsf3hv9itG2nF +nXWi+dS5liX7GX1sr8pr28EwYQwYUK/ulRwgi+mTB9AoSSvdDODtzHirK9mryBDb +hu8kH9o/RoGxSovtUzPKB/u4Twg8Ml2vJTk4Ccercj+gyTVKuWO7oBxvkFxYZgZA +BZmQx9JCf0kNxkp8ql8JsaZDt2n1b4AGySr5UmkmgRlrYDuemPO3P06Ph9mLaEFm +gFwzAM1gCnWzrsmJ9fZ/ddU3gB5A99aReqC3MbUMIzkEKC11pTdk8sYKSq0RLn95 +8GBTVaCaQ6OCr+hr7WkrvKQTxRuQ6us25KkvhiUtoOx12rA9RO4i8cFRzse/cwy+ +wDE9wGur5Qji5F8NqEWnngMw9CU8g6oI/0jKJfV1swcLj5Ou9mAxUgVLRM+S6q/X +CbM9a9wVFZW12sYey34fgBh62ho4LHSDjqXA5PLDbU/gcFDJhEMGp0QfYIYAbIfN +YYeX+3mGYvnFH9bk15EF +=xrY5 +-END PGP SIGNATURE- Added: dev/struts/7.0.0-M6/struts-7.0.0-M6-all.zip.sha256 == --- dev/struts/7.0.0-M6/struts-7.0.0-M6-all.zip.sha256 (added) +++ dev/struts/7.0.0-M6/struts-7.0.0-M6-all.zip.sha256 Sat Apr 20 07:38:26 2024 @@ -0,0 +1 @@ +15852a6a080ee05285d9c9019fc71839e47fdc6183d49c1db3ae4f05e3302750 struts-7.0.0-M6-all.zip Added: dev/struts/7.0.0-M6/struts-7.0.0-M6-all.zip.sha512 == --- dev/struts/7.0.0-M6/struts-7.0.0-M6-all.zip.sha512 (added) +++ dev/struts/7.0.0-M6/struts-7.0.0-M6-all.zip.sha512 Sat Apr 20 07:38:26 2024 @@ -0,0 +1 @@ +d6d8bf0919c30d557fed21d910ffde8fa9de04260ad34ea8181da5a32fab64fd420ce30b2de53525dfd198bcadf805a0b64735c6c88e6a8065193bc4d19e40a6 struts-7.0.0-M6-all.zip Added: dev/struts/7.0.0-M6/struts-7.0.0-M6-apps.zip == Binary file - no diff available. Propchange: dev/struts/7.0.0-M6/struts-7.0.0-M6-apps.zip -- svn:mime-type = application/octet-stream Added: dev/struts/7.0.0-M6/struts-7.0.0-M6-apps.zip.asc == --- dev/struts/7.0.0-M6/struts-7.0.0-M6-apps.zip.asc (added) +++ dev/struts/7.0.0-M6/struts-7.0.0-M6-apps.zip.asc Sat Apr 20 07:38:26 2024 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- + +iQJMBAABCgA2FiEEDgCGmDROYrkGM7fGKEFhBmOvux8FAmYjcGwYHGx1a2Fzemxl +bmFydEBhcGFjaGUub3JnAAoJEChBYQZjr7sflw8P/2lRAUzFfFZmxRxYDGl4XPHF +dFStCfErNFL1hQmH+ZVxL7IGSmfUtVoue+9HEuahBbyhOC1rV/Ic/2wKpG30EDMn +12RIJ/EKg/DP6gEhx5Pmc6VjRvb/9ExpxdyPogEk2XjfQkjQ9cSXziwfC8b1lVMG +8XmxQCJjOjc4bAEQZUU2AoXAibCrlb5/poMiQWq9QfKVzGx1P9MKgZxvRUTTtO94 +QFIZQatfmmaWkbCEL7K19dEWZvt9+UKUBwBys7J+eHqAv+E/UImeBx7thVzgnV1u +Hp8V2fT05h5ACyBcXAPt8Taw2qKFIg1eWSLEtnMnKXccw6wOk1BVfEmDXmrw
svn commit: r68662 - /dev/struts/6.4.0/ /release/struts/6.4.0/
Author: lukaszlenart Date: Sat Apr 20 07:47:11 2024 New Revision: 68662 Log: Vote gas passed, Apache Struts 6.4.0 is out Added: release/struts/6.4.0/ - copied from r68661, dev/struts/6.4.0/ Removed: dev/struts/6.4.0/
svn commit: r68664 - /release/struts/6.1.2.2/
Author: lukaszlenart Date: Sat Apr 20 07:48:15 2024 New Revision: 68664 Log: Removes outdated version Removed: release/struts/6.1.2.2/
svn commit: r68665 - /release/struts/6.2.0/
Author: lukaszlenart Date: Sat Apr 20 07:48:26 2024 New Revision: 68665 Log: Removes outdated version Removed: release/struts/6.2.0/
svn commit: r68666 - /release/struts/2.5.31/
Author: lukaszlenart Date: Sat Apr 20 07:48:40 2024 New Revision: 68666 Log: Removes outdated version Removed: release/struts/2.5.31/
svn commit: r68667 - /release/struts/2.5.32/
Author: lukaszlenart Date: Sat Apr 20 07:48:46 2024 New Revision: 68667 Log: Removes outdated version Removed: release/struts/2.5.32/
svn commit: r68663 - /release/struts/6.1.2.1/
Author: lukaszlenart Date: Sat Apr 20 07:48:07 2024 New Revision: 68663 Log: Removes outdated version Removed: release/struts/6.1.2.1/
svn commit: r68668 - /release/struts/6.3.0/
Author: lukaszlenart Date: Sat Apr 20 07:49:00 2024 New Revision: 68668 Log: Removes outdated version Removed: release/struts/6.3.0/
svn commit: r68669 - /release/struts/6.3.0.1/
Author: lukaszlenart Date: Sat Apr 20 07:49:10 2024 New Revision: 68669 Log: Removes outdated version Removed: release/struts/6.3.0.1/
svn commit: r68670 - /release/struts/6.3.0.2/
Author: lukaszlenart Date: Sat Apr 20 07:49:15 2024 New Revision: 68670 Log: Removes outdated version Removed: release/struts/6.3.0.2/
(struts-site) 01/01: Adds an announcement about Struts 6.4.0 and 7.0.0-M6
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch feature/struts-6-4-0
in repository https://gitbox.apache.org/repos/asf/struts-site.git
commit 4e67afe0247d03be6d0bd9134a0f8069c810f1f0
Author: Lukasz Lenart
AuthorDate: Sat Apr 20 10:17:55 2024 +0200
Adds an announcement about Struts 6.4.0 and 7.0.0-M6
---
_config.yml | 16 ++--
source/announce-2024.md | 66 +
source/index.html | 10
source/releases.html| 45 +
4 files changed, 124 insertions(+), 13 deletions(-)
diff --git a/_config.yml b/_config.yml
index 0f31b71a7..e84ca4205 100644
--- a/_config.yml
+++ b/_config.yml
@@ -11,17 +11,17 @@ kramdown:
toc_levels: 1..3
# Simplifies introducing changes related to the latest release
-current_version: 6.3.0.2
-current_version_short: 6302
+current_version: 6.4.0
+current_version_short: 640
current_25x_version: 2.5.33
-prev_version: 6.3.0.1
-prev_version_short: 6301
+prev_version: 6.3.0.2
+prev_version_short: 6302
prev_25_version: 2.5.33
-release_date: 7 December 2023
-prev_release_date: 13 September 2023
+release_date: 19 April 2024
+prev_release_date: 7 December 2023
prev_25_release_date: 7 December 2023
-release_date_short: 20231207-1
-prev_release_date_short: 20230913-1
+release_date_short: 20240419
+prev_release_date_short: 20231207-1
prev_25_release_date_short: 20231207-2
beta_release_date_short: 20160126
diff --git a/source/announce-2024.md b/source/announce-2024.md
new file mode 100644
index 0..a2ea0e2e6
--- /dev/null
+++ b/source/announce-2024.md
@@ -0,0 +1,66 @@
+---
+layout: default
+title: Announcements 2024
+---
+
+# Announcements 2024
+{:.no_toc}
+
+* Will be replaced with the ToC, excluding a header
+{:toc}
+
+
+ Skip to: Announcements - 2023
+
+
+ 20 April 2024 - Apache Struts version 7.0.0-M6 {#a20240420}
+
+The Apache Struts group is pleased to announce that Apache Struts version
7.0.0-MS is available as a Test Build.
+
+The Apache Struts is an elegant, extensible framework for creating
enterprise-ready Java web applications.
+The framework has been designed to streamline the full development cycle, from
building, to deploying,
+to maintaining applications over time.
+
+> Please read the [Version Notes]({{ site.wiki_url }}/Version+Notes+7.0.0-M6)
to find more details about performed
+> bug fixes and improvements.
+
+**This is a test build not ready to be used in production environments!**
+
+The 7.x series of the Apache Struts framework has a minimum requirement of the
following specification versions:
+JakartaEE Servlet API 6.0.0, JakartaEE JSP API 3.0, and Java 17.
+
+Should any issues arise with your use of any version of the Struts framework,
please post your comments to the user list,
+and, if appropriate, file [a tracking ticket]({{ site.jira_url }}).
+
+ 19 April 2024 - Apache Struts version 6.4.0 General Availability
{#a20240419}
+
+The Apache Struts group is pleased to announce that Apache Struts version
6.4.0 is available as a "General Availability"
+release. The GA designation is our highest quality grade.
+
+The Apache Struts is an elegant, extensible framework for creating
enterprise-ready Java web applications.
+The framework has been designed to streamline the full development cycle, from
building, to deploying,
+to maintaining applications over time.
+
+This version contains a lot of proactive security improvements, which should
make your application hard to compromise.
+
+> Please read the [Version Notes]({{ site.wiki_url }}/Version+Notes+6.4.0) to
find more details about performed
+> bug fixes and improvements.
+
+**All developers are strongly advised to perform this upgrade.**
+
+The 6.x series of the Apache Struts framework has a minimum requirement of the
following specification versions:
+Servlet API 3.1, JSP API 2.1, and Java 8.
+
+Should any issues arise with your use of any version of the Struts framework,
please post your comments to the user list,
+and, if appropriate, file [a tracking ticket]({{ site.jira_url }}).
+
+You can download this version from our [download](download.cgi#struts-ga) page.
+
+
+ Skip to: Announcements - 2023
+
+
+
+ Next:
+ Kickstart FAQ
+
diff --git a/source/index.html b/source/index.html
index f9d932c69..04271602f 100644
--- a/source/index.html
+++ b/source/index.html
@@ -27,7 +27,7 @@ title: Welcome to the Apache Struts project
Apache Struts {{ site.current_version }} GA has been releasedon
{{ site.release_date }}.
-Read more in Announcement or in
+Read more in Announcement or in
Version notes
@@ -49,12 +49,12 @@ title: Welcome to the Apache Struts project
-Apache Struts 6.3.0 GA
+Apache Struts 7.0.0-M6
- Apache Struts 6.3.0 GA has been releasedon 4 September 2023.
+ Apache Struts
(struts-site) branch feature/struts-6-4-0 created (now 4e67afe02)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch feature/struts-6-4-0 in repository https://gitbox.apache.org/repos/asf/struts-site.git at 4e67afe02 Adds an announcement about Struts 6.4.0 and 7.0.0-M6 This branch includes the following new commits: new 4e67afe02 Adds an announcement about Struts 6.4.0 and 7.0.0-M6 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-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 88293e5e4 Updates stage by Jenkins 88293e5e4 is described below commit 88293e5e4b8ac30eddc3be1d065dd43f99403780 Author: jenkins AuthorDate: Sat Apr 20 08:22:34 2024 + Updates stage by Jenkins --- .../ajax-event-system.html => announce-2024.html} | 79 +--- .../ajax-client-side-validation.html | 84 ++--- content/download.html | 44 +-- content/index.html | 26 +++ content/plugins/json/index.html| 12 +-- content/plugins/json/json-ajax-validation.html | 86 +++--- content/releases.html | 47 +++- content/security/index.html| 14 +--- .../ajax-and-javascript-recipes.html | 78 ++-- content/tag-developers/ajax-div-template.html | 12 +-- content/tag-developers/ajax-event-system.html | 4 +- 11 files changed, 275 insertions(+), 211 deletions(-) diff --git a/content/tag-developers/ajax-event-system.html b/content/announce-2024.html similarity index 71% copy from content/tag-developers/ajax-event-system.html copy to content/announce-2024.html index ba01d552e..df884004c 100644 --- a/content/tag-developers/ajax-event-system.html +++ b/content/announce-2024.html @@ -7,7 +7,7 @@ - Tag Developers Guide + Announcements 2024 @@ -146,45 +146,70 @@ -https://github.com/apache/struts-site/edit/master/source/tag-developers/ajax-event-system.md"; title="Edit this page on GitHub">Edit on GitHub +https://github.com/apache/struts-site/edit/master/source/announce-2024.md"; title="Edit this page on GitHub">Edit on GitHub -ajax event system +Announcements 2024 + + + + Skip to: Announcements - 2023 + + +20 April 2024 - Apache Struts version 7.0.0-M6 + +The Apache Struts group is pleased to announce that Apache Struts version 7.0.0-MS is available as a Test Build. + +The Apache Struts is an elegant, extensible framework for creating enterprise-ready Java web applications. +The framework has been designed to streamline the full development cycle, from building, to deploying, +to maintaining applications over time. - NOTE: Ajax template (Dojo plugin) is deprecated and won’t be supported any longer. + Please read the https://cwiki.apache.org/confluence/display/WW/Version+Notes+7.0.0-M6";>Version Notes to find more details about performed +bug fixes and improvements. -As you may have seen with the ajax div template and ajax a template, -the framework and Dojo provide a nice way to subscribe and notify of topics from within the browser. A benefit of using -Dojo as the basis of many of these components is being able to loosely couple UI components. There are two -attributes of importance: listenTopics and notifyTopics. +This is a test build not ready to be used in production environments! + +The 7.x series of the Apache Struts framework has a minimum requirement of the following specification versions: +JakartaEE Servlet API 6.0.0, JakartaEE JSP API 3.0, and Java 17. - - If a component has a notifyTopics attribute, then after the processing has been completed a message with be published -to the topic names supplied as a value (comma delimited). - If a component has a listenTopics attribute, then when a message is published to the topic names supplied as a value -(comma delimited), the component will perform custom tag-specific logic ( i.e a DIV tag will re-fresh its content). - +Should any issues arise with your use of any version of the Struts framework, please post your comments to the user list, +and, if appropriate, file https://issues.apache.org/jira/projects/WW/";>a tracking ticket. -As well as this, you can publish and subscribe to topic names with javascript code. To publish to the topic_name topic: +19 April 2024 - Apache Struts version 6.4.0 General Availability + +The Apache Struts group is pleased to announce that Apache Struts version 6.4.0 is available as a “General Availability” +release. The GA designation is our highest quality grade. + +The Apache Struts is an elegant, extensible framework for creating enterprise-ready Java web applications. +The framework has been designed to streamline the full development cycle, from building, to deploying, +to maintaining applications over time. + +This version contains a lot of proactive security improvements, which should make your application hard to compromise. + + + Please read the https://cwiki.apache.org/confluence/display/WW/Version+Notes+6.4.0";>Version Notes to find more details about performed +bug fixes and improvements. + -dojo.event.
(struts-site) 01/01: Adds an announcement about Struts 6.4.0 and 7.0.0-M6
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch feature/struts-6-4-0
in repository https://gitbox.apache.org/repos/asf/struts-site.git
commit 776c4ce732e4e5d4e010953403cc374067409c7d
Author: Lukasz Lenart
AuthorDate: Sat Apr 20 10:17:55 2024 +0200
Adds an announcement about Struts 6.4.0 and 7.0.0-M6
---
_config.yml | 16 ++--
source/announce-2024.md | 66 +
source/index.html | 10
source/releases.html| 45 +
4 files changed, 124 insertions(+), 13 deletions(-)
diff --git a/_config.yml b/_config.yml
index 0f31b71a7..e84ca4205 100644
--- a/_config.yml
+++ b/_config.yml
@@ -11,17 +11,17 @@ kramdown:
toc_levels: 1..3
# Simplifies introducing changes related to the latest release
-current_version: 6.3.0.2
-current_version_short: 6302
+current_version: 6.4.0
+current_version_short: 640
current_25x_version: 2.5.33
-prev_version: 6.3.0.1
-prev_version_short: 6301
+prev_version: 6.3.0.2
+prev_version_short: 6302
prev_25_version: 2.5.33
-release_date: 7 December 2023
-prev_release_date: 13 September 2023
+release_date: 19 April 2024
+prev_release_date: 7 December 2023
prev_25_release_date: 7 December 2023
-release_date_short: 20231207-1
-prev_release_date_short: 20230913-1
+release_date_short: 20240419
+prev_release_date_short: 20231207-1
prev_25_release_date_short: 20231207-2
beta_release_date_short: 20160126
diff --git a/source/announce-2024.md b/source/announce-2024.md
new file mode 100644
index 0..a2ea0e2e6
--- /dev/null
+++ b/source/announce-2024.md
@@ -0,0 +1,66 @@
+---
+layout: default
+title: Announcements 2024
+---
+
+# Announcements 2024
+{:.no_toc}
+
+* Will be replaced with the ToC, excluding a header
+{:toc}
+
+
+ Skip to: Announcements - 2023
+
+
+ 20 April 2024 - Apache Struts version 7.0.0-M6 {#a20240420}
+
+The Apache Struts group is pleased to announce that Apache Struts version
7.0.0-MS is available as a Test Build.
+
+The Apache Struts is an elegant, extensible framework for creating
enterprise-ready Java web applications.
+The framework has been designed to streamline the full development cycle, from
building, to deploying,
+to maintaining applications over time.
+
+> Please read the [Version Notes]({{ site.wiki_url }}/Version+Notes+7.0.0-M6)
to find more details about performed
+> bug fixes and improvements.
+
+**This is a test build not ready to be used in production environments!**
+
+The 7.x series of the Apache Struts framework has a minimum requirement of the
following specification versions:
+JakartaEE Servlet API 6.0.0, JakartaEE JSP API 3.0, and Java 17.
+
+Should any issues arise with your use of any version of the Struts framework,
please post your comments to the user list,
+and, if appropriate, file [a tracking ticket]({{ site.jira_url }}).
+
+ 19 April 2024 - Apache Struts version 6.4.0 General Availability
{#a20240419}
+
+The Apache Struts group is pleased to announce that Apache Struts version
6.4.0 is available as a "General Availability"
+release. The GA designation is our highest quality grade.
+
+The Apache Struts is an elegant, extensible framework for creating
enterprise-ready Java web applications.
+The framework has been designed to streamline the full development cycle, from
building, to deploying,
+to maintaining applications over time.
+
+This version contains a lot of proactive security improvements, which should
make your application hard to compromise.
+
+> Please read the [Version Notes]({{ site.wiki_url }}/Version+Notes+6.4.0) to
find more details about performed
+> bug fixes and improvements.
+
+**All developers are strongly advised to perform this upgrade.**
+
+The 6.x series of the Apache Struts framework has a minimum requirement of the
following specification versions:
+Servlet API 3.1, JSP API 2.1, and Java 8.
+
+Should any issues arise with your use of any version of the Struts framework,
please post your comments to the user list,
+and, if appropriate, file [a tracking ticket]({{ site.jira_url }}).
+
+You can download this version from our [download](download.cgi#struts-ga) page.
+
+
+ Skip to: Announcements - 2023
+
+
+
+ Next:
+ Kickstart FAQ
+
diff --git a/source/index.html b/source/index.html
index f9d932c69..04271602f 100644
--- a/source/index.html
+++ b/source/index.html
@@ -27,7 +27,7 @@ title: Welcome to the Apache Struts project
Apache Struts {{ site.current_version }} GA has been releasedon
{{ site.release_date }}.
-Read more in Announcement or in
+Read more in Announcement or in
Version notes
@@ -49,12 +49,12 @@ title: Welcome to the Apache Struts project
-Apache Struts 6.3.0 GA
+Apache Struts 7.0.0-M6
- Apache Struts 6.3.0 GA has been releasedon 4 September 2023.
+ Apache Struts
(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 42bcdbc09 Updates stage by Jenkins 42bcdbc09 is described below commit 42bcdbc09cca516a6f3e5ec56e539641e663769f Author: jenkins AuthorDate: Sat Apr 20 08:25:29 2024 + Updates stage by Jenkins --- content/releases.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/releases.html b/content/releases.html index 67f338ebe..44a53adaa 100644 --- a/content/releases.html +++ b/content/releases.html @@ -249,7 +249,7 @@ Struts 6.3.0.2 -7 December September 2023 +7 December 2023
(struts-site) branch feature/struts-6-4-0 updated (4e67afe02 -> 776c4ce73)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch feature/struts-6-4-0 in repository https://gitbox.apache.org/repos/asf/struts-site.git discard 4e67afe02 Adds an announcement about Struts 6.4.0 and 7.0.0-M6 new 776c4ce73 Adds an announcement about Struts 6.4.0 and 7.0.0-M6 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 (4e67afe02) \ N -- N -- N refs/heads/feature/struts-6-4-0 (776c4ce73) 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: source/releases.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(struts-site) branch feature/struts-6-4-0 updated (776c4ce73 -> 6bdaa22ba)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch feature/struts-6-4-0 in repository https://gitbox.apache.org/repos/asf/struts-site.git discard 776c4ce73 Adds an announcement about Struts 6.4.0 and 7.0.0-M6 new 6bdaa22ba Adds an announcement about Struts 6.4.0 and 7.0.0-M6 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 (776c4ce73) \ N -- N -- N refs/heads/feature/struts-6-4-0 (6bdaa22ba) 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: source/download.html | 18 -- 1 file changed, 12 insertions(+), 6 deletions(-)
(struts-site) 01/01: Adds an announcement about Struts 6.4.0 and 7.0.0-M6
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch feature/struts-6-4-0
in repository https://gitbox.apache.org/repos/asf/struts-site.git
commit 6bdaa22ba3902aaac6028cd87c5fca043e8d895d
Author: Lukasz Lenart
AuthorDate: Sat Apr 20 10:17:55 2024 +0200
Adds an announcement about Struts 6.4.0 and 7.0.0-M6
---
_config.yml | 16 ++--
source/announce-2024.md | 66 +
source/download.html| 18 +-
source/index.html | 10
source/releases.html| 45 +
5 files changed, 136 insertions(+), 19 deletions(-)
diff --git a/_config.yml b/_config.yml
index 0f31b71a7..e84ca4205 100644
--- a/_config.yml
+++ b/_config.yml
@@ -11,17 +11,17 @@ kramdown:
toc_levels: 1..3
# Simplifies introducing changes related to the latest release
-current_version: 6.3.0.2
-current_version_short: 6302
+current_version: 6.4.0
+current_version_short: 640
current_25x_version: 2.5.33
-prev_version: 6.3.0.1
-prev_version_short: 6301
+prev_version: 6.3.0.2
+prev_version_short: 6302
prev_25_version: 2.5.33
-release_date: 7 December 2023
-prev_release_date: 13 September 2023
+release_date: 19 April 2024
+prev_release_date: 7 December 2023
prev_25_release_date: 7 December 2023
-release_date_short: 20231207-1
-prev_release_date_short: 20230913-1
+release_date_short: 20240419
+prev_release_date_short: 20231207-1
prev_25_release_date_short: 20231207-2
beta_release_date_short: 20160126
diff --git a/source/announce-2024.md b/source/announce-2024.md
new file mode 100644
index 0..a2ea0e2e6
--- /dev/null
+++ b/source/announce-2024.md
@@ -0,0 +1,66 @@
+---
+layout: default
+title: Announcements 2024
+---
+
+# Announcements 2024
+{:.no_toc}
+
+* Will be replaced with the ToC, excluding a header
+{:toc}
+
+
+ Skip to: Announcements - 2023
+
+
+ 20 April 2024 - Apache Struts version 7.0.0-M6 {#a20240420}
+
+The Apache Struts group is pleased to announce that Apache Struts version
7.0.0-MS is available as a Test Build.
+
+The Apache Struts is an elegant, extensible framework for creating
enterprise-ready Java web applications.
+The framework has been designed to streamline the full development cycle, from
building, to deploying,
+to maintaining applications over time.
+
+> Please read the [Version Notes]({{ site.wiki_url }}/Version+Notes+7.0.0-M6)
to find more details about performed
+> bug fixes and improvements.
+
+**This is a test build not ready to be used in production environments!**
+
+The 7.x series of the Apache Struts framework has a minimum requirement of the
following specification versions:
+JakartaEE Servlet API 6.0.0, JakartaEE JSP API 3.0, and Java 17.
+
+Should any issues arise with your use of any version of the Struts framework,
please post your comments to the user list,
+and, if appropriate, file [a tracking ticket]({{ site.jira_url }}).
+
+ 19 April 2024 - Apache Struts version 6.4.0 General Availability
{#a20240419}
+
+The Apache Struts group is pleased to announce that Apache Struts version
6.4.0 is available as a "General Availability"
+release. The GA designation is our highest quality grade.
+
+The Apache Struts is an elegant, extensible framework for creating
enterprise-ready Java web applications.
+The framework has been designed to streamline the full development cycle, from
building, to deploying,
+to maintaining applications over time.
+
+This version contains a lot of proactive security improvements, which should
make your application hard to compromise.
+
+> Please read the [Version Notes]({{ site.wiki_url }}/Version+Notes+6.4.0) to
find more details about performed
+> bug fixes and improvements.
+
+**All developers are strongly advised to perform this upgrade.**
+
+The 6.x series of the Apache Struts framework has a minimum requirement of the
following specification versions:
+Servlet API 3.1, JSP API 2.1, and Java 8.
+
+Should any issues arise with your use of any version of the Struts framework,
please post your comments to the user list,
+and, if appropriate, file [a tracking ticket]({{ site.jira_url }}).
+
+You can download this version from our [download](download.cgi#struts-ga) page.
+
+
+ Skip to: Announcements - 2023
+
+
+
+ Next:
+ Kickstart FAQ
+
diff --git a/source/download.html b/source/download.html
index 7e7e0e5d8..794e893ab 100644
--- a/source/download.html
+++ b/source/download.html
@@ -75,9 +75,10 @@ title: Download a Release
Full Distribution:
-struts-{{ site.current_version }}-all.zip
(73MB)
+struts-{{ site.current_version }}-all.zip
(70MB)
[https://downloads.apache.org/struts/{{ site.current_version
}}/struts-{{ site.current_version }}-all.zip.asc">PGP]
[https://downloads.apache.org/struts/{{ site.current_version
}}/struts-{{ site.current_version }}-all.zip.sha256">SHA256]
+[https://downloads.apache.org/struts
(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 088753119 Updates stage by Jenkins 088753119 is described below commit 088753119d9998889f3647ec7badd02036c5bbdd Author: jenkins AuthorDate: Sat Apr 20 08:33:04 2024 + Updates stage by Jenkins --- content/download.html | 18 -- 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/content/download.html b/content/download.html index 70014e1de..d88262e88 100644 --- a/content/download.html +++ b/content/download.html @@ -220,9 +220,10 @@ Full Distribution: -struts-6.4.0-all.zip (73MB) +struts-6.4.0-all.zip (70MB) [https://downloads.apache.org/struts/6.4.0/struts-6.4.0-all.zip.asc";>PGP] [https://downloads.apache.org/struts/6.4.0/struts-6.4.0-all.zip.sha256";>SHA256] +[https://downloads.apache.org/struts/6.4.0/struts-6.4.0-all.zip.sha512";>SHA512] @@ -230,9 +231,10 @@ Example Applications: -struts-6.4.0-apps.zip (32MB) +struts-6.4.0-apps.zip (35MB) [https://downloads.apache.org/struts/6.4.0/struts-6.4.0-apps.zip.asc";>PGP] [https://downloads.apache.org/struts/6.4.0/struts-6.4.0-apps.zip.sha256";>SHA256] +[https://downloads.apache.org/struts/6.4.0/struts-6.4.0-apps.zip.sha512";>SHA512] @@ -240,9 +242,10 @@ Essential Dependencies Only: -struts-6.4.0-min-lib.zip (4MB) +struts-6.4.0-min-lib.zip (5.9MB) [https://downloads.apache.org/struts/6.4.0/struts-6.4.0-min-lib.zip.asc";>PGP] [https://downloads.apache.org/struts/6.4.0/struts-6.4.0-min-lib.zip.sha256";>SHA256] +[https://downloads.apache.org/struts/6.4.0/struts-6.4.0-min-lib.zip.sha512";>SHA512] @@ -250,9 +253,10 @@ All Dependencies: -struts-6.4.0-lib.zip (24MB) +struts-6.4.0-lib.zip (25.5MB) [https://downloads.apache.org/struts/6.4.0/struts-6.4.0-lib.zip.asc";>PGP] [https://downloads.apache.org/struts/6.4.0/struts-6.4.0-lib.zip.sha256";>SHA256] +[https://downloads.apache.org/struts/6.4.0/struts-6.4.0-lib.zip.sha512";>SHA512] @@ -260,9 +264,10 @@ Documentation: -struts-6.4.0-docs.zip (12MB) +struts-6.4.0-docs.zip (2.5MB) [https://downloads.apache.org/struts/6.4.0/struts-6.4.0-docs.zip.asc";>PGP] [https://downloads.apache.org/struts/6.4.0/struts-6.4.0-docs.zip.sha256";>SHA256] +[https://downloads.apache.org/struts/6.4.0/struts-6.4.0-docs.zip.sha512";>SHA512] @@ -270,9 +275,10 @@ Source: -struts-6.4.0-src.zip (6MB) +struts-6.4.0-src.zip (6.8MB) [https://downloads.apache.org/struts/6.4.0/struts-6.4.0-src.zip.asc";>PGP] [https://downloads.apache.org/struts/6.4.0/struts-6.4.0-src.zip.sha256";>SHA256] +[https://downloads.apache.org/struts/6.4.0/struts-6.4.0-src.zip.sha512";>SHA512]
(struts-site) branch master updated (5ab183fd3 -> c77dc4556)
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-site.git from 5ab183fd3 Merge pull request #233 from sclaup/patch-1 add 6bdaa22ba Adds an announcement about Struts 6.4.0 and 7.0.0-M6 new c77dc4556 Merge pull request #235 from apache/feature/struts-6-4-0 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: _config.yml | 16 ++-- source/announce-2024.md | 66 + source/download.html| 18 +- source/index.html | 10 source/releases.html| 45 + 5 files changed, 136 insertions(+), 19 deletions(-) create mode 100644 source/announce-2024.md
(struts-site) 01/01: Merge pull request #235 from apache/feature/struts-6-4-0
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 commit c77dc455621faed01d3375742bc0372a7f598ca1 Merge: 5ab183fd3 6bdaa22ba Author: Lukasz Lenart AuthorDate: Sat Apr 20 10:36:12 2024 +0200 Merge pull request #235 from apache/feature/struts-6-4-0 Adds an announcement about Struts 6.4.0 and 7.0.0-M6 _config.yml | 16 ++-- source/announce-2024.md | 66 + source/download.html| 18 +- source/index.html | 10 source/releases.html| 45 + 5 files changed, 136 insertions(+), 19 deletions(-)
(struts-site) branch feature/struts-6-4-0 deleted (was 6bdaa22ba)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch feature/struts-6-4-0 in repository https://gitbox.apache.org/repos/asf/struts-site.git was 6bdaa22ba Adds an announcement about Struts 6.4.0 and 7.0.0-M6 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-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 1e715bb71 Automatic Site Publish by Buildbot
1e715bb71 is described below
commit 1e715bb7132c857c6bff321cd06ad2769aefe553
Author: buildbot
AuthorDate: Sat Apr 20 08:36:41 2024 +
Automatic Site Publish by Buildbot
---
output/{index.html => announce-2024.html} | 162 +++--
output/core-developers/default-properties.html | 3 +
output/download.html | 50
output/index.html | 26 ++--
output/releases.html | 47 ++-
5 files changed, 159 insertions(+), 129 deletions(-)
diff --git a/output/index.html b/output/announce-2024.html
similarity index 67%
copy from output/index.html
copy to output/announce-2024.html
index d85a68a98..df884004c 100644
--- a/output/index.html
+++ b/output/announce-2024.html
@@ -7,18 +7,18 @@
- Welcome to the Apache Struts project
+ Announcements 2024
+
+
- https://buttons.github.io/buttons.js";>
-
(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 a2959adc0 Updates stage by Jenkins a2959adc0 is described below commit a2959adc0797a62de5b3734cd9be9600b1480e73 Author: jenkins AuthorDate: Sat Apr 20 08:40:26 2024 + Updates stage by Jenkins
(struts) branch WW-5418-struts-sec deleted (was 7e9f6e84f)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch WW-5418-struts-sec in repository https://gitbox.apache.org/repos/asf/struts.git was 7e9f6e84f WW-5418 Exclude Tomcat Jasper classes 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 master updated (f5cfb88f1 -> 3c21e8229)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/struts.git from f5cfb88f1 Merge pull request #915 from atlassian-forks/issue/WW-5417-bump-ongl-version-to-fix-security-issue add 100f5052d WW-5418 Forbid enums add 7e9f6e84f WW-5418 Exclude Tomcat Jasper classes new 3c21e8229 Merge pull request #916 from apache/WW-5418-struts-sec 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: .../opensymphony/xwork2/ognl/SecurityMemberAccess.java | 16 core/src/main/resources/struts-excluded-classes.xml | 2 ++ .../com/opensymphony/xwork2/ognl/OgnlValueStackTest.java | 8 .../xwork2/ognl/SecurityMemberAccessTest.java| 2 +- 4 files changed, 7 insertions(+), 21 deletions(-)
(struts) 01/01: Merge pull request #916 from apache/WW-5418-struts-sec
This is an automated email from the ASF dual-hosted git repository. kusal pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/struts.git commit 3c21e8229031e9ef5f8548ae0f5aca8e7436a9a2 Merge: f5cfb88f1 7e9f6e84f Author: Kusal Kithul-Godage AuthorDate: Sat Apr 20 20:01:06 2024 +1000 Merge pull request #916 from apache/WW-5418-struts-sec WW-5418 Forbid Enums and Jasper classes .../opensymphony/xwork2/ognl/SecurityMemberAccess.java | 16 core/src/main/resources/struts-excluded-classes.xml | 2 ++ .../com/opensymphony/xwork2/ognl/OgnlValueStackTest.java | 8 .../xwork2/ognl/SecurityMemberAccessTest.java| 2 +- 4 files changed, 7 insertions(+), 21 deletions(-)
(struts) 01/01: Merge remote-tracking branch 'origin/master' into merge-master-to-70-2024-04-20
This is an automated email from the ASF dual-hosted git repository. kusal pushed a commit to branch merge-master-to-70-2024-04-20 in repository https://gitbox.apache.org/repos/asf/struts.git commit 8ad75f26d806e52dbac606d087a56887d05a25ab Merge: 2352c6863 3c21e8229 Author: Kusal Kithul-Godage AuthorDate: Sat Apr 20 20:48:47 2024 +1000 Merge remote-tracking branch 'origin/master' into merge-master-to-70-2024-04-20 assembly/pom.xml | 2 + core/pom.xml | 9 + .../com/opensymphony/xwork2/XWorkTestCase.java | 35 ++- .../xwork2/config/entities/PackageConfig.java | 13 ++ .../xwork2/config/impl/DefaultConfiguration.java | 18 +- .../providers/XmlDocConfigurationProvider.java | 25 ++- .../xwork2/ognl/DefaultOgnlCacheFactory.java | 8 +- .../xwork2/ognl/SecurityMemberAccess.java | 36 ++-- .../com/opensymphony/xwork2/util/ProxyUtil.java| 59 - .../java/org/apache/struts2/StrutsConstants.java | 3 + .../config/StrutsXmlConfigurationProvider.java | 1 + .../struts2/config/entities/ConstantConfig.java| 20 ++ .../org/apache/struts2/dispatcher/Dispatcher.java | 36 .../apache/struts2/dispatcher/InitOperations.java | 25 +-- .../struts2/dispatcher/PrepareOperations.java | 18 +- .../filter/StrutsPrepareAndExecuteFilter.java | 10 +- .../dispatcher/filter/StrutsPrepareFilter.java | 10 +- .../org/apache/struts2/default.properties | 3 + core/src/main/resources/struts-6.5.dtd | 158 ++ .../src/main/resources/struts-excluded-classes.xml | 2 + .../xwork2/config/ConfigurationTest.java | 36 .../XmlConfigurationProviderPackagesTest.java | 68 -- .../xwork2/ognl/OgnlValueStackTest.java| 8 +- .../xwork2/ognl/SecurityMemberAccessTest.java | 2 +- .../apache/struts2/dispatcher/DispatcherTest.java | 26 +++ .../struts2/dispatcher/InitOperationsTest.java | 86 ...rutsPrepareAndExecuteFilterIntegrationTest.java | 13 +- .../struts2/ognl/OgnlSetPossiblePropertyTest.java | 240 + .../apache/struts2/views/jsp/ui/DebugTagTest.java | 22 +- .../providers/xwork-test-package-extends-final.xml | 37 .../config/providers/xwork-test-package-final.xml | 37 plugins/bean-validation/pom.xml| 2 +- plugins/rest/pom.xml | 4 +- .../xwork2/ognl/SecurityMemberAccessProxyTest.java | 54 +++-- pom.xml| 9 +- 35 files changed, 897 insertions(+), 238 deletions(-) diff --cc core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java index 70bbf70dd,a1f9094d1..6d21ef693 --- a/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java @@@ -72,12 -72,13 +72,13 @@@ import org.apache.struts2.ognl.ThreadAl import org.apache.struts2.util.ObjectFactoryDestroyable; import org.apache.struts2.util.fs.JBossFileManager; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.File; import java.io.IOException; + import java.util.Arrays; import java.util.Collection; import java.util.HashSet; import java.util.List; diff --cc core/src/test/java/org/apache/struts2/dispatcher/StrutsPrepareAndExecuteFilterIntegrationTest.java index cc434571c,c7d525722..470c6d47e --- a/core/src/test/java/org/apache/struts2/dispatcher/StrutsPrepareAndExecuteFilterIntegrationTest.java +++ b/core/src/test/java/org/apache/struts2/dispatcher/StrutsPrepareAndExecuteFilterIntegrationTest.java @@@ -26,13 -26,10 +26,10 @@@ import org.springframework.mock.web.Moc import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; - import jakarta.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; import java.io.IOException; - import java.util.ArrayList; - import java.util.regex.Pattern; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --cc plugins/bean-validation/pom.xml index 5d2f8f40a,f789b404d..bb13eb00a --- a/plugins/bean-validation/pom.xml +++ b/plugins/bean-validation/pom.xml @@@ -39,12 -39,11 +39,12 @@@ -javax.validation -validation-api -2.0.1.Final + jakarta.validation +
(struts) branch merge-master-to-70-2024-04-20 created (now 8ad75f26d)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch merge-master-to-70-2024-04-20 in repository https://gitbox.apache.org/repos/asf/struts.git at 8ad75f26d Merge remote-tracking branch 'origin/master' into merge-master-to-70-2024-04-20 This branch includes the following new commits: new 8ad75f26d Merge remote-tracking branch 'origin/master' into merge-master-to-70-2024-04-20 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(struts) branch WW-5353-stronger-security-defaults created (now e6e6ee85e)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch WW-5353-stronger-security-defaults in repository https://gitbox.apache.org/repos/asf/struts.git at e6e6ee85e WW-5353 Stronger security defaults for 7.0 This branch includes the following new commits: new e6e6ee85e WW-5353 Stronger security defaults for 7.0 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-5353 Stronger security defaults for 7.0
This is an automated email from the ASF dual-hosted git repository. kusal pushed a commit to branch WW-5353-stronger-security-defaults in repository https://gitbox.apache.org/repos/asf/struts.git commit e6e6ee85e0a66b3a66a1064e08390cacdeca6745 Author: Kusal Kithul-Godage AuthorDate: Sat Apr 20 21:08:43 2024 +1000 WW-5353 Stronger security defaults for 7.0 --- .../org/apache/struts2/default.properties | 30 ++ 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/core/src/main/resources/org/apache/struts2/default.properties b/core/src/main/resources/org/apache/struts2/default.properties index 14200e690..42ffb8de5 100644 --- a/core/src/main/resources/org/apache/struts2/default.properties +++ b/core/src/main/resources/org/apache/struts2/default.properties @@ -212,13 +212,33 @@ struts.freemarker.mru.max.strong.size=0 struts.xslt.nocache=false ### Whether to always select the namespace to be everything before the last slash or not -struts.mapper.alwaysSelectFullNamespace=false +struts.mapper.alwaysSelectFullNamespace=true ### Whether to fallback to empty namespace when request namespace does not match any in configuration -struts.actionConfig.fallbackToEmptyNamespace=true - -### Whether to allow static field access in OGNL expressions or not -struts.ognl.allowStaticFieldAccess=true +struts.actionConfig.fallbackToEmptyNamespace=false + +### Whether to allow static field access in OGNL expressions, not recommended! +struts.ognl.allowStaticFieldAccess=false + +### Whether OGNL can access these types of classes, not recommended! +struts.disallowDefaultPackageAccess=true +struts.disallowProxyObjectAccess=true + +### Whether OGNL can instantiate arbitrary map classes, not recommended! +struts.ognl.disallowCustomOgnlMap=true + +### OGNL context access, highly recommended to uncomment if context access from expressions not needed! +# struts.ognl.valueStackFallbackToContext=false +# struts.ognl.excludedNodeTypes=ognl.ASTRootVarRef,ognl.ASTThisVarRef,ognl.ASTVarRef + +### Whether to enable OGNL allowlist, protects against critical vulnerabilities, strongly recommended to keep enabled! +struts.allowlist.enable=true +### Whether to require @StrutsParameter annotations on Action parameter injection methods +### Synergizes with OGNL allowlist, strongly recommended to keep enabled! +struts.parameters.requireAnnotations=true +### Whether to drop @StrutsParameter annotation requirement on simple setter methods +### Useful for transitioning legacy applications, but highly recommended to set to false as soon as possible! +struts.parameters.requireAnnotations.transitionMode=false ### Whether to throw a RuntimeException when a property is not found ### in an expression, or when the expression evaluation fails
(struts) branch WW-5353-stronger-security-defaults updated (e6e6ee85e -> 5d9c039b2)
This is an automated email from the ASF dual-hosted git repository.
kusal pushed a change to branch WW-5353-stronger-security-defaults
in repository https://gitbox.apache.org/repos/asf/struts.git
from e6e6ee85e WW-5353 Stronger security defaults for 7.0
add 5d9c039b2 WW-5353 Test fixes
No new revisions were added by this update.
Summary of changes:
.../xwork2/ognl/accessor/CompoundRootAccessor.java| 8 +++-
.../org/apache/struts2/util/StrutsTestCaseHelper.java | 13 -
.../org/apache/struts2/StrutsInternalTestCase.java| 4 +++-
.../apache/struts2/StrutsJUnit4InternalTestCase.java | 4 +++-
core/src/test/java/org/apache/struts2/TestAction.java | 19 +++
...{StrutsTestCase.java => TestNGStrutsTestCase.java} | 2 +-
.../struts2/testng/TestNGStrutsTestCaseTest.java | 7 ++-
7 files changed, 43 insertions(+), 14 deletions(-)
rename
plugins/testng/src/main/java/org/apache/struts2/testng/{StrutsTestCase.java =>
TestNGStrutsTestCase.java} (97%)
(struts) branch WW-5353-stronger-security-defaults updated (5d9c039b2 -> 9f9a0e389)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch WW-5353-stronger-security-defaults in repository https://gitbox.apache.org/repos/asf/struts.git discard 5d9c039b2 WW-5353 Test fixes add 9f9a0e389 WW-5353 Test fixes 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 (5d9c039b2) \ N -- N -- N refs/heads/WW-5353-stronger-security-defaults (9f9a0e389) 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: core/src/main/java/org/apache/struts2/util/StrutsTestCaseHelper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(struts) branch WW-5353-stronger-security-defaults updated (9f9a0e389 -> 0d614a7af)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch WW-5353-stronger-security-defaults in repository https://gitbox.apache.org/repos/asf/struts.git from 9f9a0e389 WW-5353 Test fixes add 0d614a7af WW-5353 One more test fix No new revisions were added by this update. Summary of changes: .../src/main/java/org/apache/struts2/junit/StrutsTestCase.java | 10 ++ 1 file changed, 6 insertions(+), 4 deletions(-)
(struts) branch merge-master-to-70-2024-04-20 updated (8ad75f26d -> 570f634c9)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch merge-master-to-70-2024-04-20 in repository https://gitbox.apache.org/repos/asf/struts.git omit 8ad75f26d Merge remote-tracking branch 'origin/master' into merge-master-to-70-2024-04-20 add 570f634c9 Merge remote-tracking branch 'origin/master' into merge-master-to-70-2024-04-20 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 (8ad75f26d) \ N -- N -- N refs/heads/merge-master-to-70-2024-04-20 (570f634c9) 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: pom.xml | 14 +- 1 file changed, 13 insertions(+), 1 deletion(-)
(struts) branch WW-5353-stronger-security-defaults updated (0d614a7af -> 9adc618df)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch WW-5353-stronger-security-defaults in repository https://gitbox.apache.org/repos/asf/struts.git discard 0d614a7af WW-5353 One more test fix discard 9f9a0e389 WW-5353 Test fixes discard e6e6ee85e WW-5353 Stronger security defaults for 7.0 discard 8ad75f26d Merge remote-tracking branch 'origin/master' into merge-master-to-70-2024-04-20 add 570f634c9 Merge remote-tracking branch 'origin/master' into merge-master-to-70-2024-04-20 add 90d6193ce WW-5353 Stronger security defaults for 7.0 add 8fa19ebb7 WW-5353 Test fixes add 9adc618df WW-5353 One more test fix 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 (0d614a7af) \ N -- N -- N refs/heads/WW-5353-stronger-security-defaults (9adc618df) 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: pom.xml | 14 +- 1 file changed, 13 insertions(+), 1 deletion(-)
(struts) branch WW-5353-stronger-security-defaults updated (9adc618df -> 5e80a3231)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch WW-5353-stronger-security-defaults in repository https://gitbox.apache.org/repos/asf/struts.git discard 9adc618df WW-5353 One more test fix discard 8fa19ebb7 WW-5353 Test fixes discard 90d6193ce WW-5353 Stronger security defaults for 7.0 discard 570f634c9 Merge remote-tracking branch 'origin/master' into merge-master-to-70-2024-04-20 add d0204f315 Merge remote-tracking branch 'origin/master' into merge-master-to-70-2024-04-20 add 85cf09b7d WW-5353 Stronger security defaults for 7.0 add bb75ec799 WW-5353 Test fixes add 5e80a3231 WW-5353 One more test fix 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 (9adc618df) \ N -- N -- N refs/heads/WW-5353-stronger-security-defaults (5e80a3231) 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: pom.xml | 7 +-- 1 file changed, 1 insertion(+), 6 deletions(-)
(struts) branch merge-master-to-70-2024-04-20 updated (570f634c9 -> d0204f315)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch merge-master-to-70-2024-04-20 in repository https://gitbox.apache.org/repos/asf/struts.git omit 570f634c9 Merge remote-tracking branch 'origin/master' into merge-master-to-70-2024-04-20 add d0204f315 Merge remote-tracking branch 'origin/master' into merge-master-to-70-2024-04-20 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 (570f634c9) \ N -- N -- N refs/heads/merge-master-to-70-2024-04-20 (d0204f315) 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: pom.xml | 7 +-- 1 file changed, 1 insertion(+), 6 deletions(-)
(struts) branch WW-5353-stronger-security-defaults updated (5e80a3231 -> f57b7c8c4)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch WW-5353-stronger-security-defaults in repository https://gitbox.apache.org/repos/asf/struts.git discard 5e80a3231 WW-5353 One more test fix discard bb75ec799 WW-5353 Test fixes add f57b7c8c4 WW-5353 Test fixes 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 (5e80a3231) \ N -- N -- N refs/heads/WW-5353-stronger-security-defaults (f57b7c8c4) 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: .../java/org/apache/struts2/util/StrutsTestCaseHelper.java | 2 +- .../test/java/org/apache/struts2/StrutsInternalTestCase.java | 4 +--- .../java/org/apache/struts2/StrutsJUnit4InternalTestCase.java | 4 +--- .../src/main/java/org/apache/struts2/junit/StrutsTestCase.java | 10 -- 4 files changed, 7 insertions(+), 13 deletions(-)
(struts) branch WW-5353-stronger-security-defaults updated (f57b7c8c4 -> 5d4ad83cc)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch WW-5353-stronger-security-defaults in repository https://gitbox.apache.org/repos/asf/struts.git discard f57b7c8c4 WW-5353 Test fixes add 5d4ad83cc WW-5353 Test fixes 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 (f57b7c8c4) \ N -- N -- N refs/heads/WW-5353-stronger-security-defaults (5d4ad83cc) 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: .../junit/src/test/java/org/apache/struts2/junit/JUnitTestAction.java | 2 ++ 1 file changed, 2 insertions(+)
(struts-site) 01/01: Fixes reference to the new filters and update plugins' layout
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch fix/sitemesh
in repository https://gitbox.apache.org/repos/asf/struts-site.git
commit a8327a0be7954486bbb4d666d1b20806346937ac
Author: Lukasz Lenart
AuthorDate: Sat Apr 20 15:39:02 2024 +0200
Fixes reference to the new filters and update plugins' layout
---
source/_layouts/plugin.html | 59 -
source/core-developers/web-xml.md | 2 +-
source/plugins/async/index.md | 4 +-
source/plugins/bean-validation/index.md | 4 +-
source/plugins/cdi/index.md | 4 +-
source/plugins/codebehind/index.md | 4 +-
source/plugins/config-browser/index.md | 4 +-
source/plugins/convention/converting.md | 3 ++
source/plugins/convention/index.md | 4 +-
source/plugins/dwr/index.md | 4 +-
source/plugins/embedded-jsp/index.md| 4 +-
source/plugins/jasperreports/index.md | 4 +-
source/plugins/java-8-support/index.md | 4 +-
source/plugins/javatemplates/index.md | 4 +-
source/plugins/jfreechart/index.md | 4 +-
source/plugins/jsf/index.md | 4 +-
source/plugins/json/index.md| 4 +-
source/plugins/json/json-ajax-validation.md | 2 +-
source/plugins/junit/index.md | 4 +-
source/plugins/osgi/index.md| 4 +-
source/plugins/oval/index.md| 4 +-
source/plugins/plexus/index.md | 4 +-
source/plugins/portlet-tiles/index.md | 4 +-
source/plugins/portlet/index.md | 4 +-
source/plugins/rest/index.md| 4 +-
source/plugins/sitegraph/index.md | 4 +-
source/plugins/sitemesh/index.md| 50
source/plugins/spring/index.md | 4 +-
source/plugins/struts-1/index.md| 4 +-
source/plugins/testng/index.md | 4 +-
source/plugins/tiles-3/index.md | 4 +-
source/plugins/tiles/index.md | 4 +-
source/plugins/velocity/index.md| 2 +-
33 files changed, 84 insertions(+), 142 deletions(-)
diff --git a/source/_layouts/plugin.html b/source/_layouts/plugin.html
deleted file mode 100644
index b7ecc649e..0
--- a/source/_layouts/plugin.html
+++ /dev/null
@@ -1,59 +0,0 @@
-
-
-
-
-
-
-
-
-
- {{ page.title }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-var _paq = window._paq = window._paq || [];
-/* tracker methods like "setCustomDimension" should be called before
"trackPageView" */
-/* We explicitly disable cookie tracking to avoid privacy issues */
-_paq.push(['disableCookies']);
-_paq.push(['trackPageView']);
-_paq.push(['enableLinkTracking']);
-(function() {
- var u="//analytics.apache.org/";
- _paq.push(['setTrackerUrl', u+'matomo.php']);
- _paq.push(['setSiteId', '41']);
- var d=document, g=d.createElement('script'),
s=d.getElementsByTagName('script')[0];
- g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
-})();
-
-
-
-
-
-{% include header.html %}
-
-
-
-Edit on
GitHub
-{% if page.parent %}
-<<
back to {{ page.parent.title }}
-{% else %}
-<< back to Plugins
-{% endif %}
-{{ content }}
-
-
-
-{% include footer.html %}
-
-
-
diff --git a/source/core-developers/web-xml.md
b/source/core-developers/web-xml.md
index 5e947b663..b56c4e1a4 100644
--- a/source/core-developers/web-xml.md
+++ b/source/core-developers/web-xml.md
@@ -43,7 +43,7 @@ Configuring `web.xml` for the framework is a matter of adding
a filter and filte
```
-See [SiteMesh Plugin](../plugins/sitemesh-plugin) for an example on when to
use separate Filters for prepare and execution phase.
+See [SiteMesh Plugin](../plugins/sitemesh/) for an example on when to use
separate Filters for prepare and execution phase.
## Custom mapping
diff --git a/source/plugins/async/index.md b/source/plugins/async/index.md
index 7c19b29e4..46575b0fb 100644
--- a/source/plugins/async/index.md
+++ b/source/plugins/async/index.md
@@ -1,8 +1,8 @@
---
-layout: plugin
+layout: default
title: Async Plugin
parent:
- url: /plugins
+ url: plugins
title: Plugins
---
diff --git a/source/plugins/bean-validation/index.md
b/source/plugins/bean-validation/index.md
index 51a6064e4..cd92687d9 100644
--- a/source/plugins/bean-validation/index.md
+++ b/source/plugins/bean-validation/index.md
@@ -1,8 +1,8 @@
---
-layout: plugin
+layout: default
title: Bean Validation Plugin
parent:
-url: /plugins
+url: plugins
title: Plugins
---
diff --git a/source/plugins/cdi/index.md b/source/plugins/cdi/index.md
index e26cd3be1..d11f46d87 100644
--- a/source/plugins/cdi/index.md
+++ b/source/plugins/cdi/index.md
@@ -1,8 +1,8 @@
---
-layout: plugin
+layout: default
title: CDI Plugin
parent:
-url: /plugins
+url: plugins
(struts-site) branch fix/sitemesh created (now a8327a0be)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch fix/sitemesh in repository https://gitbox.apache.org/repos/asf/struts-site.git at a8327a0be Fixes reference to the new filters and update plugins' layout This branch includes the following new commits: new a8327a0be Fixes reference to the new filters and update plugins' layout 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-site) 01/01: Fixes reference to the new filters and update plugins' layout
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch fix/sitemesh
in repository https://gitbox.apache.org/repos/asf/struts-site.git
commit d0acb231c52f6cd4900b1ccfb7e01d0937d469d4
Author: Lukasz Lenart
AuthorDate: Sat Apr 20 15:39:02 2024 +0200
Fixes reference to the new filters and update plugins' layout
---
source/_layouts/plugin.html | 59 -
source/core-developers/web-xml.md | 11 +++---
source/plugins/async/index.md | 4 +-
source/plugins/bean-validation/index.md | 4 +-
source/plugins/cdi/index.md | 4 +-
source/plugins/codebehind/index.md | 4 +-
source/plugins/config-browser/index.md | 4 +-
source/plugins/convention/converting.md | 3 ++
source/plugins/convention/index.md | 4 +-
source/plugins/dwr/index.md | 4 +-
source/plugins/embedded-jsp/index.md| 4 +-
source/plugins/jasperreports/index.md | 4 +-
source/plugins/java-8-support/index.md | 4 +-
source/plugins/javatemplates/index.md | 4 +-
source/plugins/jfreechart/index.md | 4 +-
source/plugins/jsf/index.md | 4 +-
source/plugins/json/index.md| 4 +-
source/plugins/json/json-ajax-validation.md | 2 +-
source/plugins/junit/index.md | 4 +-
source/plugins/osgi/index.md| 4 +-
source/plugins/oval/index.md| 4 +-
source/plugins/plexus/index.md | 4 +-
source/plugins/portlet-tiles/index.md | 4 +-
source/plugins/portlet/index.md | 4 +-
source/plugins/rest/index.md| 4 +-
source/plugins/sitegraph/index.md | 4 +-
source/plugins/sitemesh/index.md| 50
source/plugins/spring/index.md | 4 +-
source/plugins/struts-1/index.md| 4 +-
source/plugins/testng/index.md | 4 +-
source/plugins/tiles-3/index.md | 4 +-
source/plugins/tiles/index.md | 4 +-
source/plugins/velocity/index.md| 2 +-
33 files changed, 89 insertions(+), 146 deletions(-)
diff --git a/source/_layouts/plugin.html b/source/_layouts/plugin.html
deleted file mode 100644
index b7ecc649e..0
--- a/source/_layouts/plugin.html
+++ /dev/null
@@ -1,59 +0,0 @@
-
-
-
-
-
-
-
-
-
- {{ page.title }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-var _paq = window._paq = window._paq || [];
-/* tracker methods like "setCustomDimension" should be called before
"trackPageView" */
-/* We explicitly disable cookie tracking to avoid privacy issues */
-_paq.push(['disableCookies']);
-_paq.push(['trackPageView']);
-_paq.push(['enableLinkTracking']);
-(function() {
- var u="//analytics.apache.org/";
- _paq.push(['setTrackerUrl', u+'matomo.php']);
- _paq.push(['setSiteId', '41']);
- var d=document, g=d.createElement('script'),
s=d.getElementsByTagName('script')[0];
- g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
-})();
-
-
-
-
-
-{% include header.html %}
-
-
-
-Edit on
GitHub
-{% if page.parent %}
-<<
back to {{ page.parent.title }}
-{% else %}
-<< back to Plugins
-{% endif %}
-{{ content }}
-
-
-
-{% include footer.html %}
-
-
-
diff --git a/source/core-developers/web-xml.md
b/source/core-developers/web-xml.md
index 5e947b663..38dd4e64e 100644
--- a/source/core-developers/web-xml.md
+++ b/source/core-developers/web-xml.md
@@ -10,10 +10,11 @@ title: web.xml
{:toc}
The `web.xml` web application descriptor file represents the core of the Java
web application, so it is appropriate
-that it is also part of the core of the Struts framework. In the `web.xml`
file, Struts defines its FilterDispatcher,
-the Servlet Filter class that initializes the Struts framework and handles all
requests. This filter can contain
-initialization parameters that affect what, if any, additional configuration
files are loaded and how the framework
-should behave.
+that it is also part of the core of the Struts framework. In the `web.xml`
file you can use one of the two options:
+1. Configure
`org.apache.struts2.dispatcher.filter.StrutsPrepareAndExecuteFilter` which acts
as a central
+ point of initializing the Struts framework and handles all requests.
+2. Use combination of
`org.apache.struts2.dispatcher.filter.StrutsPrepareFilter` and
`org.apache.struts2.dispatcher.filter.StrutsExecuteFilter`
+ to support custom integration with other frameworks like Sitemesh.
## Simple Example
@@ -43,7 +44,7 @@ Configuring `web.xml` for the framework is a matter of adding
a filter and filte
```
-See [SiteMesh Plugin](../plugins/sitemesh-plugin) for an example on when to
use separate Filters for prepare and execution phase.
+See [SiteMesh Plugin](../plugins/sitemesh/) for an example on
(struts-site) branch fix/sitemesh updated (d0acb231c -> 0c076d8d4)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch fix/sitemesh in repository https://gitbox.apache.org/repos/asf/struts-site.git discard d0acb231c Fixes reference to the new filters and update plugins' layout new 0c076d8d4 Fixes reference to the new filters and update plugins' layout 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 (d0acb231c) \ N -- N -- N refs/heads/fix/sitemesh (0c076d8d4) 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: source/plugins/async/index.md | 2 +- source/plugins/bean-validation/index.md | 2 +- source/plugins/cdi/index.md | 2 +- source/plugins/codebehind/index.md | 2 +- source/plugins/config-browser/index.md | 2 +- source/plugins/convention/index.md | 2 +- source/plugins/dwr/index.md | 2 +- source/plugins/embedded-jsp/index.md| 2 +- source/plugins/jasperreports/index.md | 2 +- source/plugins/java-8-support/index.md | 2 +- source/plugins/javatemplates/index.md | 2 +- source/plugins/jfreechart/index.md | 2 +- source/plugins/jsf/index.md | 2 +- source/plugins/json/index.md| 2 +- source/plugins/junit/index.md | 2 +- source/plugins/osgi/index.md| 2 +- source/plugins/oval/index.md| 2 +- source/plugins/plexus/index.md | 2 +- source/plugins/portlet-tiles/index.md | 2 +- source/plugins/portlet/index.md | 2 +- source/plugins/rest/index.md| 2 +- source/plugins/sitegraph/index.md | 2 +- source/plugins/sitemesh/index.md| 4 +--- source/plugins/spring/index.md | 2 +- source/plugins/struts-1/index.md| 2 +- source/plugins/testng/index.md | 2 +- source/plugins/tiles-3/index.md | 2 +- source/plugins/tiles/index.md | 2 +- source/plugins/velocity/index.md| 2 +- 29 files changed, 29 insertions(+), 31 deletions(-)
(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 94709e7b1 Updates stage by Jenkins
94709e7b1 is described below
commit 94709e7b136499a29d1a737c2a6059fd0dd9abec
Author: jenkins
AuthorDate: Sat Apr 20 13:51:22 2024 +
Updates stage by Jenkins
---
.../ajax-client-side-validation.html | 84 ++---
content/core-developers/web-xml.html | 11 ++-
content/plugins/json/index.html| 12 +--
content/plugins/json/json-ajax-validation.html | 86 +++---
.../ajax-and-javascript-recipes.html | 78 ++--
content/tag-developers/ajax-div-template.html | 12 +--
content/tag-developers/ajax-event-system.html | 4 +-
7 files changed, 145 insertions(+), 142 deletions(-)
diff --git a/content/core-developers/ajax-client-side-validation.html
b/content/core-developers/ajax-client-side-validation.html
index 396dfbea1..9570c2e5f 100644
--- a/content/core-developers/ajax-client-side-validation.html
+++ b/content/core-developers/ajax-client-side-validation.html
@@ -509,21 +509,21 @@ It takes care of hiding validation errors that might be
present, submit the form
*
* @param event onSubmit event
*/
-function ajaxFormValidation(event) {
-event.preventDefault();
-_removeValidationErrors();
-var _form = $(event.target);
-var _formData = _form.serialize(true);
+function ajaxFormValidation(event) {
+event.preventDefault();
+_removeValidationErrors();
+var _form = $(event.target);
+var _formData = _form.serialize(true);
// prepare visual feedback
// you may want to use other elements here
-var originalButton = _form.find('.btn-primary');
+var originalButton = _form.find('.btn-primary');
// note: jQuery returns an array-like object
-if (originalButton && originalButton.length && originalButton.length > 0) {
-originalButton.hide();
-var feedbackElement
= $('').insertAfter(originalButton);
+if (originalButton && originalButton.length && originalButton.length > 0) {
+originalButton.hide();
+var feedbackElement
= $('').insertAfter(originalButton);
var restoreFunction
= function() {
-originalButton.show();
-feedbackElement.remove();
+originalButton.show();
+feedbackElement.remove();
}
}
var options = {
@@ -531,48 +531,48 @@ It takes care of hiding validation errors that might be
present, submit the form
async: true,
processData: false,
type: 'POST',
-success: function (response, statusText, xhr) {
-if (response.location) {
+success: function (response, statusText, xhr) {
+if (response.location) {
// no validation errors
// action has been executed and sent a
redirect URL wrapped as JSON
// cannot use a normal http-redirect
(status-code 3xx) as this would be followed by browsers and would not be
available here
// follow JSON-redirect
window.location.href
= response.location;
} else {
-if (restoreFunction) {
-restoreFunction();
+if (restoreFunction) {
+restoreFunction();
}
-_handleValidationResult(_form, response);
+_handleValidationResult(_form, response);
}
},
error: function(xhr, textStatus, errorThrown) {
-if (restoreFunction) {
-restoreFunction();
+if (restoreFunction) {
+restoreFunction();
}
// struts sends status code 400 when validation
errors are present
-if (xhr.status
=== 400)
{
-_handleValidationResult(_form, JSON.parse(xhr.responseText))
+if (xhr.status
=== 400)
{
+_handleValidationResult(_form, JSON.parse(xhr.responseText))
} else {
// a real error occurred -> show user an
error message
-_handleValidationResult(_form, {errors: ['Network or server
error!']})
+_handleValidationResult(_form, {errors: ['Network or server
error!']})
}
}
}
// send request, after delay to make sure everybody
notices the visual feedback :)
-window.setTimeout(function() {
+window.setTimeout(function() {
var url = _form[0].action;
-jQuery.ajax(url, options);
+jQuery.ajax(url, options);
}, 1000);
}
/**
* Removes validation errors from HTML DOM.
*/
-function _re
(struts-site) 01/01: Fixes reference to the new filters and update plugins' layout
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch fix/sitemesh
in repository https://gitbox.apache.org/repos/asf/struts-site.git
commit 156ce676bc3ee90a1f8005ea8e0dddc5d2036b34
Author: Lukasz Lenart
AuthorDate: Sat Apr 20 15:39:02 2024 +0200
Fixes reference to the new filters and update plugins' layout
---
source/_layouts/plugin.html | 59 -
source/core-developers/web-xml.md | 11 +++---
source/plugins/async/index.md | 2 +-
source/plugins/bean-validation/index.md | 2 +-
source/plugins/cdi/index.md | 2 +-
source/plugins/codebehind/index.md | 2 +-
source/plugins/config-browser/index.md | 2 +-
source/plugins/convention/converting.md | 3 ++
source/plugins/convention/index.md | 2 +-
source/plugins/dwr/index.md | 2 +-
source/plugins/embedded-jsp/index.md| 2 +-
source/plugins/jasperreports/index.md | 2 +-
source/plugins/java-8-support/index.md | 2 +-
source/plugins/javatemplates/index.md | 2 +-
source/plugins/jfreechart/index.md | 2 +-
source/plugins/jsf/index.md | 2 +-
source/plugins/json/index.md| 2 +-
source/plugins/json/json-ajax-validation.md | 2 +-
source/plugins/junit/index.md | 2 +-
source/plugins/osgi/index.md| 2 +-
source/plugins/oval/index.md| 2 +-
source/plugins/plexus/index.md | 2 +-
source/plugins/portlet-tiles/index.md | 2 +-
source/plugins/portlet/index.md | 2 +-
source/plugins/rest/index.md| 2 +-
source/plugins/sitegraph/index.md | 2 +-
source/plugins/sitemesh/index.md| 52 -
source/plugins/spring/index.md | 2 +-
source/plugins/struts-1/index.md| 2 +-
source/plugins/testng/index.md | 2 +-
source/plugins/tiles-3/index.md | 2 +-
source/plugins/tiles/index.md | 2 +-
32 files changed, 61 insertions(+), 120 deletions(-)
diff --git a/source/_layouts/plugin.html b/source/_layouts/plugin.html
deleted file mode 100644
index b7ecc649e..0
--- a/source/_layouts/plugin.html
+++ /dev/null
@@ -1,59 +0,0 @@
-
-
-
-
-
-
-
-
-
- {{ page.title }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-var _paq = window._paq = window._paq || [];
-/* tracker methods like "setCustomDimension" should be called before
"trackPageView" */
-/* We explicitly disable cookie tracking to avoid privacy issues */
-_paq.push(['disableCookies']);
-_paq.push(['trackPageView']);
-_paq.push(['enableLinkTracking']);
-(function() {
- var u="//analytics.apache.org/";
- _paq.push(['setTrackerUrl', u+'matomo.php']);
- _paq.push(['setSiteId', '41']);
- var d=document, g=d.createElement('script'),
s=d.getElementsByTagName('script')[0];
- g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
-})();
-
-
-
-
-
-{% include header.html %}
-
-
-
-Edit on
GitHub
-{% if page.parent %}
-<<
back to {{ page.parent.title }}
-{% else %}
-<< back to Plugins
-{% endif %}
-{{ content }}
-
-
-
-{% include footer.html %}
-
-
-
diff --git a/source/core-developers/web-xml.md
b/source/core-developers/web-xml.md
index 5e947b663..38dd4e64e 100644
--- a/source/core-developers/web-xml.md
+++ b/source/core-developers/web-xml.md
@@ -10,10 +10,11 @@ title: web.xml
{:toc}
The `web.xml` web application descriptor file represents the core of the Java
web application, so it is appropriate
-that it is also part of the core of the Struts framework. In the `web.xml`
file, Struts defines its FilterDispatcher,
-the Servlet Filter class that initializes the Struts framework and handles all
requests. This filter can contain
-initialization parameters that affect what, if any, additional configuration
files are loaded and how the framework
-should behave.
+that it is also part of the core of the Struts framework. In the `web.xml`
file you can use one of the two options:
+1. Configure
`org.apache.struts2.dispatcher.filter.StrutsPrepareAndExecuteFilter` which acts
as a central
+ point of initializing the Struts framework and handles all requests.
+2. Use combination of
`org.apache.struts2.dispatcher.filter.StrutsPrepareFilter` and
`org.apache.struts2.dispatcher.filter.StrutsExecuteFilter`
+ to support custom integration with other frameworks like Sitemesh.
## Simple Example
@@ -43,7 +44,7 @@ Configuring `web.xml` for the framework is a matter of adding
a filter and filte
```
-See [SiteMesh Plugin](../plugins/sitemesh-plugin) for an example on when to
use separate Filters for prepare and execution phase.
+See [SiteMesh Plugin](../plugins/sitemesh/) for an example on when to use
separate Filters for prepare and execut
(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 21eb939f1 Updates stage by Jenkins 21eb939f1 is described below commit 21eb939f1c31614aa6e192cbe2c7c2f4877e51ff Author: jenkins AuthorDate: Sat Apr 20 13:51:58 2024 + Updates stage by Jenkins --- content/plugins/async/index.html | 2 +- content/plugins/bean-validation/index.html | 2 +- content/plugins/cdi/index.html | 2 +- content/plugins/codebehind/index.html | 2 +- content/plugins/config-browser/index.html | 2 +- content/plugins/convention/converting.html | 2 +- content/plugins/convention/index.html | 2 +- content/plugins/dwr/index.html | 2 +- content/plugins/embedded-jsp/index.html| 2 +- content/plugins/jasperreports/index.html | 2 +- content/plugins/java-8-support/index.html | 2 +- content/plugins/javatemplates/index.html | 2 +- content/plugins/jfreechart/index.html | 2 +- content/plugins/jsf/index.html | 2 +- content/plugins/json/index.html| 2 +- content/plugins/junit/index.html | 2 +- content/plugins/osgi/index.html| 2 +- content/plugins/oval/index.html| 2 +- content/plugins/plexus/index.html | 2 +- content/plugins/portlet-tiles/index.html | 2 +- content/plugins/portlet/index.html | 2 +- content/plugins/rest/index.html| 2 +- content/plugins/sitegraph/index.html | 2 +- content/plugins/sitemesh/index.html| 6 +- content/plugins/spring/index.html | 2 +- content/plugins/struts-1/index.html| 2 +- content/plugins/testng/index.html | 2 +- content/plugins/tiles-3/index.html | 2 +- content/plugins/tiles/index.html | 2 +- content/plugins/velocity/index.html| 2 +- 30 files changed, 30 insertions(+), 34 deletions(-) diff --git a/content/plugins/async/index.html b/content/plugins/async/index.html index 967d88874..a7b017938 100644 --- a/content/plugins/async/index.html +++ b/content/plugins/async/index.html @@ -148,7 +148,7 @@ https://github.com/apache/struts-site/edit/master/source/plugins/async/index.md"; title="Edit this page on GitHub">Edit on GitHub -<< back to Plugins +<< back to Plugins Async Plugin diff --git a/content/plugins/bean-validation/index.html b/content/plugins/bean-validation/index.html index 7af22d667..14a18ba30 100644 --- a/content/plugins/bean-validation/index.html +++ b/content/plugins/bean-validation/index.html @@ -148,7 +148,7 @@ https://github.com/apache/struts-site/edit/master/source/plugins/bean-validation/index.md"; title="Edit this page on GitHub">Edit on GitHub -<< back to Plugins +<< back to Plugins Bean Validation Plugin diff --git a/content/plugins/cdi/index.html b/content/plugins/cdi/index.html index d743d1673..1aa2d6eb2 100644 --- a/content/plugins/cdi/index.html +++ b/content/plugins/cdi/index.html @@ -148,7 +148,7 @@ https://github.com/apache/struts-site/edit/master/source/plugins/cdi/index.md"; title="Edit this page on GitHub">Edit on GitHub -<< back to Plugins +<< back to Plugins CDI Plugin diff --git a/content/plugins/codebehind/index.html b/content/plugins/codebehind/index.html index 1c6456f28..7a214a97e 100644 --- a/content/plugins/codebehind/index.html +++ b/content/plugins/codebehind/index.html @@ -148,7 +148,7 @@ https://github.com/apache/struts-site/edit/master/source/plugins/codebehind/index.md"; title="Edit this page on GitHub">Edit on GitHub -<< back to Plugins +<< back to Plugins Codebehind Plugin diff --git a/content/plugins/config-browser/index.html b/content/plugins/config-browser/index.html index dfffe58b3..6e0a79591 100644 --- a/content/plugins/config-browser/index.html +++ b/content/plugins/config-browser/index.html @@ -148,7 +148,7 @@ https://github.com/apache/struts-site/edit/master/source/plugins/config-browser/index.md"; title="Edit this page on GitHub">Edit on GitHub -<< back to Plugins +<< back to Plugins Config Browser Plugin diff --git a/content/plugins/convention/converting.html b/content/plugins/convention/converting.html index 75a110dc0..f6bc6892e 100644 --- a/content/plugins/convention/converting.html +++ b/content/plugins/convention/converting.html @@ -148,7 +148,7 @@ https://github.com/apache/struts-site/edit/master/source/plugins/convention/converting.md"; title="Edit this page on GitHub">Edit on GitHub -<< back to Convention plugin +<< back to Convention plugin « back to Convention Plugin diff --git a/content/plugins/convention/index.html b/content/plugins/convention/index.html index 65f8b5272..7
(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 6b2168b97 Updates stage by Jenkins 6b2168b97 is described below commit 6b2168b9794a82ac988000386173c4fa2863c909 Author: jenkins AuthorDate: Sat Apr 20 13:52:33 2024 + Updates stage by Jenkins
(struts-site) branch fix/sitemesh updated (a8327a0be -> d0acb231c)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch fix/sitemesh in repository https://gitbox.apache.org/repos/asf/struts-site.git discard a8327a0be Fixes reference to the new filters and update plugins' layout new d0acb231c Fixes reference to the new filters and update plugins' layout 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 (a8327a0be) \ N -- N -- N refs/heads/fix/sitemesh (d0acb231c) 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: source/core-developers/web-xml.md | 9 + 1 file changed, 5 insertions(+), 4 deletions(-)
(struts-site) branch fix/sitemesh updated (c6949698d -> 851e2bb6b)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch fix/sitemesh in repository https://gitbox.apache.org/repos/asf/struts-site.git discard c6949698d Fixes reference to the new filters and update plugins' layout new 851e2bb6b Fixes reference to the new filters and update plugins' layout 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 (c6949698d) \ N -- N -- N refs/heads/fix/sitemesh (851e2bb6b) 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: source/plugins/index.md | 62 - 1 file changed, 31 insertions(+), 31 deletions(-)
(struts-site) 01/01: Fixes reference to the new filters and update plugins' layout
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch fix/sitemesh
in repository https://gitbox.apache.org/repos/asf/struts-site.git
commit 851e2bb6bd3d66379cbaac1fb1f47955fc74baa2
Author: Lukasz Lenart
AuthorDate: Sat Apr 20 15:39:02 2024 +0200
Fixes reference to the new filters and update plugins' layout
---
source/_layouts/plugin.html | 59 ---
source/core-developers/web-xml.md | 11 ++---
source/plugins/async/index.md | 4 +-
source/plugins/bean-validation/index.md | 4 +-
source/plugins/cdi/index.md | 4 +-
source/plugins/codebehind/index.md | 4 +-
source/plugins/config-browser/index.md | 4 +-
source/plugins/convention/converting.md | 5 ++-
source/plugins/convention/index.md | 4 +-
source/plugins/dwr/index.md | 4 +-
source/plugins/embedded-jsp/index.md| 4 +-
source/plugins/index.md | 62 ++---
source/plugins/jasperreports/index.md | 4 +-
source/plugins/java-8-support/index.md | 4 +-
source/plugins/javatemplates/index.md | 4 +-
source/plugins/jfreechart/index.md | 4 +-
source/plugins/jsf/index.md | 4 +-
source/plugins/json/index.md| 4 +-
source/plugins/json/json-ajax-validation.md | 2 +-
source/plugins/junit/index.md | 4 +-
source/plugins/osgi/index.md| 4 +-
source/plugins/oval/index.md| 4 +-
source/plugins/plexus/index.md | 4 +-
source/plugins/portlet-tiles/index.md | 4 +-
source/plugins/portlet/index.md | 4 +-
source/plugins/rest/index.md| 4 +-
source/plugins/sitegraph/index.md | 4 +-
source/plugins/sitemesh/index.md| 52 +++-
source/plugins/spring/index.md | 4 +-
source/plugins/struts-1/index.md| 4 +-
source/plugins/testng/index.md | 4 +-
source/plugins/tiles-3/index.md | 4 +-
source/plugins/tiles/index.md | 4 +-
source/plugins/velocity/index.md| 2 +-
34 files changed, 120 insertions(+), 181 deletions(-)
diff --git a/source/_layouts/plugin.html b/source/_layouts/plugin.html
deleted file mode 100644
index b7ecc649e..0
--- a/source/_layouts/plugin.html
+++ /dev/null
@@ -1,59 +0,0 @@
-
-
-
-
-
-
-
-
-
- {{ page.title }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-var _paq = window._paq = window._paq || [];
-/* tracker methods like "setCustomDimension" should be called before
"trackPageView" */
-/* We explicitly disable cookie tracking to avoid privacy issues */
-_paq.push(['disableCookies']);
-_paq.push(['trackPageView']);
-_paq.push(['enableLinkTracking']);
-(function() {
- var u="//analytics.apache.org/";
- _paq.push(['setTrackerUrl', u+'matomo.php']);
- _paq.push(['setSiteId', '41']);
- var d=document, g=d.createElement('script'),
s=d.getElementsByTagName('script')[0];
- g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
-})();
-
-
-
-
-
-{% include header.html %}
-
-
-
-Edit on
GitHub
-{% if page.parent %}
-<<
back to {{ page.parent.title }}
-{% else %}
-<< back to Plugins
-{% endif %}
-{{ content }}
-
-
-
-{% include footer.html %}
-
-
-
diff --git a/source/core-developers/web-xml.md
b/source/core-developers/web-xml.md
index 5e947b663..38dd4e64e 100644
--- a/source/core-developers/web-xml.md
+++ b/source/core-developers/web-xml.md
@@ -10,10 +10,11 @@ title: web.xml
{:toc}
The `web.xml` web application descriptor file represents the core of the Java
web application, so it is appropriate
-that it is also part of the core of the Struts framework. In the `web.xml`
file, Struts defines its FilterDispatcher,
-the Servlet Filter class that initializes the Struts framework and handles all
requests. This filter can contain
-initialization parameters that affect what, if any, additional configuration
files are loaded and how the framework
-should behave.
+that it is also part of the core of the Struts framework. In the `web.xml`
file you can use one of the two options:
+1. Configure
`org.apache.struts2.dispatcher.filter.StrutsPrepareAndExecuteFilter` which acts
as a central
+ point of initializing the Struts framework and handles all requests.
+2. Use combination of
`org.apache.struts2.dispatcher.filter.StrutsPrepareFilter` and
`org.apache.struts2.dispatcher.filter.StrutsExecuteFilter`
+ to support custom integration with other frameworks like Sitemesh.
## Simple Example
@@ -43,7 +44,7 @@ Configuring `web.xml` for the framework is a matter of adding
a filter and filte
```
-See [SiteMesh Plugin](../plugins/sitemesh-plugin) for an example on when to
use separate Filters for prepare and e
(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 ebaafed52 Updates stage by Jenkins ebaafed52 is described below commit ebaafed52bcb975a56b42db1cf9d2d5ff64dc656 Author: jenkins AuthorDate: Sat Apr 20 13:43:43 2024 + Updates stage by Jenkins --- content/core-developers/web-xml.html | 2 +- content/plugins/async/index.html | 4 +- content/plugins/bean-validation/index.html | 4 +- content/plugins/cdi/index.html | 4 +- content/plugins/codebehind/index.html | 4 +- content/plugins/config-browser/index.html | 4 +- content/plugins/convention/converting.html | 2 + content/plugins/convention/index.html | 4 +- content/plugins/dwr/index.html | 4 +- content/plugins/embedded-jsp/index.html| 4 +- content/plugins/jasperreports/index.html | 4 +- content/plugins/java-8-support/index.html | 4 +- content/plugins/javatemplates/index.html | 4 +- content/plugins/jfreechart/index.html | 4 +- content/plugins/jsf/index.html | 4 +- content/plugins/json/index.html| 4 +- content/plugins/json/json-ajax-validation.html | 193 + content/plugins/junit/index.html | 4 +- content/plugins/osgi/index.html| 4 +- content/plugins/oval/index.html| 4 +- content/plugins/plexus/index.html | 4 +- content/plugins/portlet-tiles/index.html | 4 +- content/plugins/portlet/index.html | 4 +- .../plugins/portlet/struts-2-portlet-tutorial.html | 193 + content/plugins/rest/index.html| 4 +- content/plugins/sitegraph/index.html | 4 +- content/plugins/sitemesh/index.html| 56 +++--- content/plugins/spring/index.html | 4 +- .../spring-session-components-workarounds.html | 193 + content/plugins/struts-1/index.html| 4 +- content/plugins/testng/index.html | 4 +- content/plugins/tiles-3/index.html | 4 +- content/plugins/tiles/index.html | 4 +- content/plugins/velocity/index.html| 2 +- 34 files changed, 88 insertions(+), 661 deletions(-) diff --git a/content/core-developers/web-xml.html b/content/core-developers/web-xml.html index b1dee9200..78a466e7c 100644 --- a/content/core-developers/web-xml.html +++ b/content/core-developers/web-xml.html @@ -192,7 +192,7 @@ should behave. -See SiteMesh Plugin for an example on when to use separate Filters for prepare and execution phase. +See SiteMesh Plugin for an example on when to use separate Filters for prepare and execution phase. Custom mapping diff --git a/content/plugins/async/index.html b/content/plugins/async/index.html index ed24ec747..967d88874 100644 --- a/content/plugins/async/index.html +++ b/content/plugins/async/index.html @@ -13,7 +13,7 @@ - + @@ -148,7 +148,7 @@ https://github.com/apache/struts-site/edit/master/source/plugins/async/index.md"; title="Edit this page on GitHub">Edit on GitHub -<< back to Plugins +<< back to Plugins Async Plugin diff --git a/content/plugins/bean-validation/index.html b/content/plugins/bean-validation/index.html index 220bd6b7b..7af22d667 100644 --- a/content/plugins/bean-validation/index.html +++ b/content/plugins/bean-validation/index.html @@ -13,7 +13,7 @@ - + @@ -148,7 +148,7 @@ https://github.com/apache/struts-site/edit/master/source/plugins/bean-validation/index.md"; title="Edit this page on GitHub">Edit on GitHub -<< back to Plugins +<< back to Plugins Bean Validation Plugin diff --git a/content/plugins/cdi/index.html b/content/plugins/cdi/index.html index d2afcacb6..d743d1673 100644 --- a/content/plugins/cdi/index.html +++ b/content/plugins/cdi/index.html @@ -13,7 +13,7 @@ - + @@ -148,7 +148,7 @@ https://github.com/apache/struts-site/edit/master/source/plugins/cdi/index.md"; title="Edit this page on GitHub">Edit on GitHub -<< back to Plugins +<< back to Plugins CDI Plugin diff --git a/content/plugins/codebehind/index.html b/content/plugins/codebehind/index.html index aff2be0e7..1c6456f28 100644 --- a/content/plugins/codebehind/index.html +++ b/content/plugins/codebehind/index.html @@ -13,7 +13,7 @@ - + @@ -148,7 +148,7 @@ https://github.com/apache/struts-site/edit/master/source/plugi
(struts-site) branch fix/sitemesh updated (851e2bb6b -> 976bde06d)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch fix/sitemesh in repository https://gitbox.apache.org/repos/asf/struts-site.git discard 851e2bb6b Fixes reference to the new filters and update plugins' layout new 976bde06d Fixes reference to the new filters and update plugins' layout 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 (851e2bb6b) \ N -- N -- N refs/heads/fix/sitemesh (976bde06d) 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: source/plugins/json/json-ajax-validation.md| 2 +- source/plugins/portlet/struts-2-portlet-tutorial.md| 5 - source/plugins/spring/index.md | 2 -- source/plugins/spring/spring-session-components-workarounds.md | 6 -- 4 files changed, 5 insertions(+), 10 deletions(-) delete mode 100644 source/plugins/spring/spring-session-components-workarounds.md
(struts-site) branch master updated (c77dc4556 -> 47cbae9fc)
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-site.git from c77dc4556 Merge pull request #235 from apache/feature/struts-6-4-0 add 976bde06d Fixes reference to the new filters and update plugins' layout new 47cbae9fc Merge pull request #236 from apache/fix/sitemesh 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: source/_layouts/plugin.html| 59 source/core-developers/web-xml.md | 11 ++-- source/plugins/async/index.md | 4 +- source/plugins/bean-validation/index.md| 4 +- source/plugins/cdi/index.md| 4 +- source/plugins/codebehind/index.md | 4 +- source/plugins/config-browser/index.md | 4 +- source/plugins/convention/converting.md| 5 +- source/plugins/convention/index.md | 4 +- source/plugins/dwr/index.md| 4 +- source/plugins/embedded-jsp/index.md | 4 +- source/plugins/index.md| 62 +++--- source/plugins/jasperreports/index.md | 4 +- source/plugins/java-8-support/index.md | 4 +- source/plugins/javatemplates/index.md | 4 +- source/plugins/jfreechart/index.md | 4 +- source/plugins/jsf/index.md| 4 +- source/plugins/json/index.md | 4 +- source/plugins/json/json-ajax-validation.md| 4 +- source/plugins/junit/index.md | 4 +- source/plugins/osgi/index.md | 4 +- source/plugins/oval/index.md | 4 +- source/plugins/plexus/index.md | 4 +- source/plugins/portlet-tiles/index.md | 4 +- source/plugins/portlet/index.md| 4 +- .../plugins/portlet/struts-2-portlet-tutorial.md | 5 +- source/plugins/rest/index.md | 4 +- source/plugins/sitegraph/index.md | 4 +- source/plugins/sitemesh/index.md | 52 +- source/plugins/spring/index.md | 6 +-- .../spring-session-components-workarounds.md | 6 --- source/plugins/struts-1/index.md | 4 +- source/plugins/testng/index.md | 4 +- source/plugins/tiles-3/index.md| 4 +- source/plugins/tiles/index.md | 4 +- source/plugins/velocity/index.md | 2 +- 36 files changed, 125 insertions(+), 191 deletions(-) delete mode 100644 source/_layouts/plugin.html delete mode 100644 source/plugins/spring/spring-session-components-workarounds.md
(struts-site) branch fix/sitemesh deleted (was 976bde06d)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch fix/sitemesh in repository https://gitbox.apache.org/repos/asf/struts-site.git was 976bde06d Fixes reference to the new filters and update plugins' layout 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-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 0501f8045 Automatic Site Publish by Buildbot 0501f8045 is described below commit 0501f8045c59ebfb8c9d5dc6a34f98a8361f8856 Author: buildbot AuthorDate: Sat Apr 20 13:58:19 2024 + Automatic Site Publish by Buildbot --- output/core-developers/web-xml.html| 13 +- output/plugins/async/index.html| 4 +- output/plugins/bean-validation/index.html | 4 +- output/plugins/cdi/index.html | 4 +- output/plugins/codebehind/index.html | 4 +- output/plugins/config-browser/index.html | 4 +- output/plugins/convention/converting.html | 6 +- output/plugins/convention/index.html | 4 +- output/plugins/dwr/index.html | 4 +- output/plugins/embedded-jsp/index.html | 4 +- output/plugins/index.html | 2 +- output/plugins/jasperreports/index.html| 4 +- output/plugins/java-8-support/index.html | 4 +- output/plugins/javatemplates/index.html| 4 +- output/plugins/jfreechart/index.html | 4 +- output/plugins/jsf/index.html | 4 +- output/plugins/json/index.html | 4 +- output/plugins/json/json-ajax-validation.html | 4 +- output/plugins/junit/index.html| 4 +- output/plugins/osgi/index.html | 4 +- output/plugins/oval/index.html | 4 +- output/plugins/plexus/index.html | 4 +- output/plugins/portlet-tiles/index.html| 4 +- output/plugins/portlet/index.html | 4 +- .../plugins/portlet/struts-2-portlet-tutorial.html | 4 +- output/plugins/rest/index.html | 4 +- output/plugins/sitegraph/index.html| 4 +- output/plugins/sitemesh/index.html | 60 +++ output/plugins/spring/index.html | 6 +- .../spring-session-components-workarounds.html | 192 - output/plugins/struts-1/index.html | 4 +- output/plugins/testng/index.html | 4 +- output/plugins/tiles-3/index.html | 4 +- output/plugins/tiles/index.html| 4 +- output/plugins/velocity/index.html | 2 +- 35 files changed, 98 insertions(+), 295 deletions(-) diff --git a/output/core-developers/web-xml.html b/output/core-developers/web-xml.html index b1dee9200..4ed498a9b 100644 --- a/output/core-developers/web-xml.html +++ b/output/core-developers/web-xml.html @@ -160,10 +160,13 @@ The web.xml web application descriptor file represents the core of the Java web application, so it is appropriate -that it is also part of the core of the Struts framework. In the web.xml file, Struts defines its FilterDispatcher, -the Servlet Filter class that initializes the Struts framework and handles all requests. This filter can contain -initialization parameters that affect what, if any, additional configuration files are loaded and how the framework -should behave. +that it is also part of the core of the Struts framework. In the web.xml file you can use one of the two options: + + Configure org.apache.struts2.dispatcher.filter.StrutsPrepareAndExecuteFilter which acts as a central + point of initializing the Struts framework and handles all requests. + Use combination of org.apache.struts2.dispatcher.filter.StrutsPrepareFilter and org.apache.struts2.dispatcher.filter.StrutsExecuteFilter + to support custom integration with other frameworks like Sitemesh. + Simple Example @@ -192,7 +195,7 @@ should behave. -See SiteMesh Plugin for an example on when to use separate Filters for prepare and execution phase. +See SiteMesh Plugin for an example on when to use separate Filters for prepare and execution phase. Custom mapping diff --git a/output/plugins/async/index.html b/output/plugins/async/index.html index ed24ec747..a46dc1733 100644 --- a/output/plugins/async/index.html +++ b/output/plugins/async/index.html @@ -13,7 +13,7 @@ - + @@ -148,7 +148,7 @@ https://github.com/apache/struts-site/edit/master/source/plugins/async/index.md"; title="Edit this page on GitHub">Edit on GitHub -<< back to Plugins +<< back to Plugins Async Plugin diff --git a/output/plugins/bean-validation/index.html b/output/plugins/bean-validation/index.html index 220bd6b7b..005fc7ae0 100644 --- a/output/plugins/bean-validation/index.html +++ b/output/plugins/bean-validation/index.html @@ -13,7 +13,7 @@ - + @@ -148,7 +
(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 64b387636 Updates stage by Jenkins
64b387636 is described below
commit 64b387636d2ec12f44683adff5b49e6ba1fdd233
Author: jenkins
AuthorDate: Sat Apr 20 13:58:40 2024 +
Updates stage by Jenkins
---
.../ajax-client-side-validation.html | 84 +++
content/plugins/index.html | 2 +-
content/plugins/json/index.html| 12 +-
content/plugins/json/json-ajax-validation.html | 279 +
.../plugins/portlet/struts-2-portlet-tutorial.html | 193 +-
content/plugins/spring/index.html | 2 -
.../ajax-and-javascript-recipes.html | 78 +++---
content/tag-developers/ajax-div-template.html | 12 +-
content/tag-developers/ajax-event-system.html | 4 +-
9 files changed, 523 insertions(+), 143 deletions(-)
diff --git a/content/core-developers/ajax-client-side-validation.html
b/content/core-developers/ajax-client-side-validation.html
index 9570c2e5f..396dfbea1 100644
--- a/content/core-developers/ajax-client-side-validation.html
+++ b/content/core-developers/ajax-client-side-validation.html
@@ -509,21 +509,21 @@ It takes care of hiding validation errors that might be
present, submit the form
*
* @param event onSubmit event
*/
-function ajaxFormValidation(event) {
-event.preventDefault();
-_removeValidationErrors();
-var _form = $(event.target);
-var _formData = _form.serialize(true);
+function ajaxFormValidation(event) {
+event.preventDefault();
+_removeValidationErrors();
+var _form = $(event.target);
+var _formData = _form.serialize(true);
// prepare visual feedback
// you may want to use other elements here
-var originalButton = _form.find('.btn-primary');
+var originalButton = _form.find('.btn-primary');
// note: jQuery returns an array-like object
-if (originalButton && originalButton.length && originalButton.length > 0) {
-originalButton.hide();
-var feedbackElement
= $('').insertAfter(originalButton);
+if (originalButton && originalButton.length && originalButton.length > 0) {
+originalButton.hide();
+var feedbackElement
= $('').insertAfter(originalButton);
var restoreFunction
= function() {
-originalButton.show();
-feedbackElement.remove();
+originalButton.show();
+feedbackElement.remove();
}
}
var options = {
@@ -531,48 +531,48 @@ It takes care of hiding validation errors that might be
present, submit the form
async: true,
processData: false,
type: 'POST',
-success: function (response, statusText, xhr) {
-if (response.location) {
+success: function (response, statusText, xhr) {
+if (response.location) {
// no validation errors
// action has been executed and sent a
redirect URL wrapped as JSON
// cannot use a normal http-redirect
(status-code 3xx) as this would be followed by browsers and would not be
available here
// follow JSON-redirect
window.location.href
= response.location;
} else {
-if (restoreFunction) {
-restoreFunction();
+if (restoreFunction) {
+restoreFunction();
}
-_handleValidationResult(_form, response);
+_handleValidationResult(_form, response);
}
},
error: function(xhr, textStatus, errorThrown) {
-if (restoreFunction) {
-restoreFunction();
+if (restoreFunction) {
+restoreFunction();
}
// struts sends status code 400 when validation
errors are present
-if (xhr.status
=== 400)
{
-_handleValidationResult(_form, JSON.parse(xhr.responseText))
+if (xhr.status
=== 400)
{
+_handleValidationResult(_form, JSON.parse(xhr.responseText))
} else {
// a real error occurred -> show user an
error message
-_handleValidationResult(_form, {errors: ['Network or server
error!']})
+_handleValidationResult(_form, {errors: ['Network or server
error!']})
}
}
}
// send request, after delay to make sure everybody
notices the visual feedback :)
-window.setTimeout(function() {
+window.setTimeout(function() {
var url = _form[0].action;
-jQuery.ajax(url, options);
+jQuer
(struts-site) 01/01: Fixes reference to the new filters and update plugins' layout
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch fix/sitemesh
in repository https://gitbox.apache.org/repos/asf/struts-site.git
commit 0c076d8d4eb1e991186e873b7c15a09410a5728a
Author: Lukasz Lenart
AuthorDate: Sat Apr 20 15:39:02 2024 +0200
Fixes reference to the new filters and update plugins' layout
---
source/_layouts/plugin.html | 59 -
source/core-developers/web-xml.md | 11 +++---
source/plugins/async/index.md | 2 +-
source/plugins/bean-validation/index.md | 2 +-
source/plugins/cdi/index.md | 2 +-
source/plugins/codebehind/index.md | 2 +-
source/plugins/config-browser/index.md | 2 +-
source/plugins/convention/converting.md | 3 ++
source/plugins/convention/index.md | 2 +-
source/plugins/dwr/index.md | 2 +-
source/plugins/embedded-jsp/index.md| 2 +-
source/plugins/jasperreports/index.md | 2 +-
source/plugins/java-8-support/index.md | 2 +-
source/plugins/javatemplates/index.md | 2 +-
source/plugins/jfreechart/index.md | 2 +-
source/plugins/jsf/index.md | 2 +-
source/plugins/json/index.md| 2 +-
source/plugins/json/json-ajax-validation.md | 2 +-
source/plugins/junit/index.md | 2 +-
source/plugins/osgi/index.md| 2 +-
source/plugins/oval/index.md| 2 +-
source/plugins/plexus/index.md | 2 +-
source/plugins/portlet-tiles/index.md | 2 +-
source/plugins/portlet/index.md | 2 +-
source/plugins/rest/index.md| 2 +-
source/plugins/sitegraph/index.md | 2 +-
source/plugins/sitemesh/index.md| 52 -
source/plugins/spring/index.md | 2 +-
source/plugins/struts-1/index.md| 2 +-
source/plugins/testng/index.md | 2 +-
source/plugins/tiles-3/index.md | 2 +-
source/plugins/tiles/index.md | 2 +-
32 files changed, 61 insertions(+), 120 deletions(-)
diff --git a/source/_layouts/plugin.html b/source/_layouts/plugin.html
deleted file mode 100644
index b7ecc649e..0
--- a/source/_layouts/plugin.html
+++ /dev/null
@@ -1,59 +0,0 @@
-
-
-
-
-
-
-
-
-
- {{ page.title }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-var _paq = window._paq = window._paq || [];
-/* tracker methods like "setCustomDimension" should be called before
"trackPageView" */
-/* We explicitly disable cookie tracking to avoid privacy issues */
-_paq.push(['disableCookies']);
-_paq.push(['trackPageView']);
-_paq.push(['enableLinkTracking']);
-(function() {
- var u="//analytics.apache.org/";
- _paq.push(['setTrackerUrl', u+'matomo.php']);
- _paq.push(['setSiteId', '41']);
- var d=document, g=d.createElement('script'),
s=d.getElementsByTagName('script')[0];
- g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
-})();
-
-
-
-
-
-{% include header.html %}
-
-
-
-Edit on
GitHub
-{% if page.parent %}
-<<
back to {{ page.parent.title }}
-{% else %}
-<< back to Plugins
-{% endif %}
-{{ content }}
-
-
-
-{% include footer.html %}
-
-
-
diff --git a/source/core-developers/web-xml.md
b/source/core-developers/web-xml.md
index 5e947b663..38dd4e64e 100644
--- a/source/core-developers/web-xml.md
+++ b/source/core-developers/web-xml.md
@@ -10,10 +10,11 @@ title: web.xml
{:toc}
The `web.xml` web application descriptor file represents the core of the Java
web application, so it is appropriate
-that it is also part of the core of the Struts framework. In the `web.xml`
file, Struts defines its FilterDispatcher,
-the Servlet Filter class that initializes the Struts framework and handles all
requests. This filter can contain
-initialization parameters that affect what, if any, additional configuration
files are loaded and how the framework
-should behave.
+that it is also part of the core of the Struts framework. In the `web.xml`
file you can use one of the two options:
+1. Configure
`org.apache.struts2.dispatcher.filter.StrutsPrepareAndExecuteFilter` which acts
as a central
+ point of initializing the Struts framework and handles all requests.
+2. Use combination of
`org.apache.struts2.dispatcher.filter.StrutsPrepareFilter` and
`org.apache.struts2.dispatcher.filter.StrutsExecuteFilter`
+ to support custom integration with other frameworks like Sitemesh.
## Simple Example
@@ -43,7 +44,7 @@ Configuring `web.xml` for the framework is a matter of adding
a filter and filte
```
-See [SiteMesh Plugin](../plugins/sitemesh-plugin) for an example on when to
use separate Filters for prepare and execution phase.
+See [SiteMesh Plugin](../plugins/sitemesh/) for an example on when to use
separate Filters for prepare and execut
(struts-site) branch fix/sitemesh updated (0c076d8d4 -> 156ce676b)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch fix/sitemesh in repository https://gitbox.apache.org/repos/asf/struts-site.git discard 0c076d8d4 Fixes reference to the new filters and update plugins' layout new 156ce676b Fixes reference to the new filters and update plugins' layout 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 (0c076d8d4) \ N -- N -- N refs/heads/fix/sitemesh (156ce676b) 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: source/plugins/convention/converting.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(struts) branch master updated (3c21e8229 -> efdaf7e50)
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 3c21e8229 Merge pull request #916 from apache/WW-5418-struts-sec add 268ed789e Bump org.assertj:assertj-core from 3.25.2 to 3.25.3 new efdaf7e50 Merge pull request #909 from apache/dependabot/maven/org.assertj-assertj-core-3.25.3 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: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(struts) 01/01: Merge pull request #909 from apache/dependabot/maven/org.assertj-assertj-core-3.25.3
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 efdaf7e50f6660ca011b5fe219adf1b91f59edab Merge: 3c21e8229 268ed789e Author: Lukasz Lenart AuthorDate: Sat Apr 20 15:59:26 2024 +0200 Merge pull request #909 from apache/dependabot/maven/org.assertj-assertj-core-3.25.3 Bump org.assertj:assertj-core from 3.25.2 to 3.25.3 pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(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 700476e8c Updates stage by Jenkins
700476e8c is described below
commit 700476e8c9017095cecacc3dd85de4baa321c60d
Author: jenkins
AuthorDate: Sat Apr 20 14:00:26 2024 +
Updates stage by Jenkins
---
content/plugins/json/json-ajax-validation.html | 193 +
.../plugins/portlet/struts-2-portlet-tutorial.html | 193 +
content/plugins/spring/index.html | 2 +
3 files changed, 4 insertions(+), 384 deletions(-)
diff --git a/content/plugins/json/json-ajax-validation.html
b/content/plugins/json/json-ajax-validation.html
index 6c7306ce0..8f463ddf3 100644
--- a/content/plugins/json/json-ajax-validation.html
+++ b/content/plugins/json/json-ajax-validation.html
@@ -1,156 +1,4 @@
-
-
-
-
-
-
-
-
-
- JSON Ajax validation
-
-
-
-
-
-
-
-
-
-
-
-
-
-var _paq = window._paq = window._paq || [];
-/* tracker methods like "setCustomDimension" should be called before
"trackPageView" */
-/* We explicitly disable cookie tracking to avoid privacy issues */
-_paq.push(['disableCookies']);
-_paq.push(['trackPageView']);
-_paq.push(['enableLinkTracking']);
-(function() {
- var u="//analytics.apache.org/";
- _paq.push(['setTrackerUrl', u+'matomo.php']);
- _paq.push(['setSiteId', '41']);
- var d=document, g=d.createElement('script'),
s=d.getElementsByTagName('script')[0];
- g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
-})();
-
-
-
-
-
-https://github.com/apache/struts"; class="github-ribbon">
- https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa.png?resize=149%2C149";
class="attachment-full size-full" alt="Fork me on GitHub" data-recalc-dims="1">
-
-
-
-
-
-
-
-
-Menu
-Toggle navigation
-
-
-
-
-
-
-
-
-
-
-Home
-
-
-Welcome
-Download
-Releases
-Announcements
-http://www.apache.org/licenses/";>License
-https://www.apache.org/foundation/thanks.html";>Thanks!
-https://www.apache.org/foundation/sponsorship.html";>Sponsorship
-https://privacy.apache.org/policies/privacy-policy-public.html";>Privacy
Policy
-
-
-
-
-Support
-
-
-User Mailing List
-https://issues.apache.org/jira/browse/WW";>Issue
Tracker
-Reporting Security Issues
-Commercial
Support
-
-https://cwiki.apache.org/confluence/display/WW/Migration+Guide";>Version
Notes
-https://cwiki.apache.org/confluence/display/WW/Security+Bulletins";>Security
Bulletins
-
-Maven Project
Info
-Struts
Core Dependencies
-Plugin
Dependencies
-
-
-
-
-Documentation
-
-
-Birds Eye
-Key Technologies
-Kickstart FAQ
-https://cwiki.apache.org/confluence/display/WW/Home";>Wiki
-
-Getting Started
-Security Guide
-Core Developers Guide
-Tag Developers Guide
-Maven Archetypes
-Plugins
-Struts
Core API
-Tag
reference
-https://cwiki.apache.org/confluence/display/WW/FAQs";>FAQs
-http://cwiki.apache.org/S2PLUGINS/home.html";>Plugin registry
-
-
-
-
-Contributing
-
-
-You at Struts
-How to Help FAQ
-Development Lists
-
-Submitting
patches
-Source Code and Builds
-Coding standards
-Contributors Guide
-
-Release
Guidelines
-PMC Charter
-Volunteers
-https://gitbox.apache.org/repos/asf?p=struts.git";>Source
Repository
-Updating the
website
-
-
-http://www.apache.org/";>
-
-
-
-
-
-
-
-
-
-
-https://github.com/apache/struts-site/edit/master/source/plugins/json/json-ajax-validation.md";
title="Edit this page on GitHub">Edi
(struts-site) 01/01: Fixes reference to the new filters and update plugins' layout
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch fix/sitemesh
in repository https://gitbox.apache.org/repos/asf/struts-site.git
commit c6949698dec90237b2aae629c448876eed6fc374
Author: Lukasz Lenart
AuthorDate: Sat Apr 20 15:39:02 2024 +0200
Fixes reference to the new filters and update plugins' layout
---
source/_layouts/plugin.html | 59 -
source/core-developers/web-xml.md | 11 +++---
source/plugins/async/index.md | 4 +-
source/plugins/bean-validation/index.md | 4 +-
source/plugins/cdi/index.md | 4 +-
source/plugins/codebehind/index.md | 4 +-
source/plugins/config-browser/index.md | 4 +-
source/plugins/convention/converting.md | 5 ++-
source/plugins/convention/index.md | 4 +-
source/plugins/dwr/index.md | 4 +-
source/plugins/embedded-jsp/index.md| 4 +-
source/plugins/jasperreports/index.md | 4 +-
source/plugins/java-8-support/index.md | 4 +-
source/plugins/javatemplates/index.md | 4 +-
source/plugins/jfreechart/index.md | 4 +-
source/plugins/jsf/index.md | 4 +-
source/plugins/json/index.md| 4 +-
source/plugins/json/json-ajax-validation.md | 2 +-
source/plugins/junit/index.md | 4 +-
source/plugins/osgi/index.md| 4 +-
source/plugins/oval/index.md| 4 +-
source/plugins/plexus/index.md | 4 +-
source/plugins/portlet-tiles/index.md | 4 +-
source/plugins/portlet/index.md | 4 +-
source/plugins/rest/index.md| 4 +-
source/plugins/sitegraph/index.md | 4 +-
source/plugins/sitemesh/index.md| 52 -
source/plugins/spring/index.md | 4 +-
source/plugins/struts-1/index.md| 4 +-
source/plugins/testng/index.md | 4 +-
source/plugins/tiles-3/index.md | 4 +-
source/plugins/tiles/index.md | 4 +-
source/plugins/velocity/index.md| 2 +-
33 files changed, 89 insertions(+), 150 deletions(-)
diff --git a/source/_layouts/plugin.html b/source/_layouts/plugin.html
deleted file mode 100644
index b7ecc649e..0
--- a/source/_layouts/plugin.html
+++ /dev/null
@@ -1,59 +0,0 @@
-
-
-
-
-
-
-
-
-
- {{ page.title }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-var _paq = window._paq = window._paq || [];
-/* tracker methods like "setCustomDimension" should be called before
"trackPageView" */
-/* We explicitly disable cookie tracking to avoid privacy issues */
-_paq.push(['disableCookies']);
-_paq.push(['trackPageView']);
-_paq.push(['enableLinkTracking']);
-(function() {
- var u="//analytics.apache.org/";
- _paq.push(['setTrackerUrl', u+'matomo.php']);
- _paq.push(['setSiteId', '41']);
- var d=document, g=d.createElement('script'),
s=d.getElementsByTagName('script')[0];
- g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
-})();
-
-
-
-
-
-{% include header.html %}
-
-
-
-Edit on
GitHub
-{% if page.parent %}
-<<
back to {{ page.parent.title }}
-{% else %}
-<< back to Plugins
-{% endif %}
-{{ content }}
-
-
-
-{% include footer.html %}
-
-
-
diff --git a/source/core-developers/web-xml.md
b/source/core-developers/web-xml.md
index 5e947b663..38dd4e64e 100644
--- a/source/core-developers/web-xml.md
+++ b/source/core-developers/web-xml.md
@@ -10,10 +10,11 @@ title: web.xml
{:toc}
The `web.xml` web application descriptor file represents the core of the Java
web application, so it is appropriate
-that it is also part of the core of the Struts framework. In the `web.xml`
file, Struts defines its FilterDispatcher,
-the Servlet Filter class that initializes the Struts framework and handles all
requests. This filter can contain
-initialization parameters that affect what, if any, additional configuration
files are loaded and how the framework
-should behave.
+that it is also part of the core of the Struts framework. In the `web.xml`
file you can use one of the two options:
+1. Configure
`org.apache.struts2.dispatcher.filter.StrutsPrepareAndExecuteFilter` which acts
as a central
+ point of initializing the Struts framework and handles all requests.
+2. Use combination of
`org.apache.struts2.dispatcher.filter.StrutsPrepareFilter` and
`org.apache.struts2.dispatcher.filter.StrutsExecuteFilter`
+ to support custom integration with other frameworks like Sitemesh.
## Simple Example
@@ -43,7 +44,7 @@ Configuring `web.xml` for the framework is a matter of adding
a filter and filte
```
-See [SiteMesh Plugin](../plugins/sitemesh-plugin) for an example on when to
use separate Filters for prepare and execution phase.
+See [SiteMesh Plugin](../plugins/sitemesh/) for an example o
(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 e9dde54a4 Updates stage by Jenkins e9dde54a4 is described below commit e9dde54a482ebf440dfbc3e954766fc3c69457f6 Author: jenkins AuthorDate: Sat Apr 20 13:54:22 2024 + Updates stage by Jenkins --- content/plugins/async/index.html | 2 +- content/plugins/bean-validation/index.html | 2 +- content/plugins/cdi/index.html | 2 +- content/plugins/codebehind/index.html | 2 +- content/plugins/config-browser/index.html | 2 +- content/plugins/convention/converting.html | 4 +--- content/plugins/convention/index.html | 2 +- content/plugins/dwr/index.html | 2 +- content/plugins/embedded-jsp/index.html| 2 +- content/plugins/jasperreports/index.html | 2 +- content/plugins/java-8-support/index.html | 2 +- content/plugins/javatemplates/index.html | 2 +- content/plugins/jfreechart/index.html | 2 +- content/plugins/jsf/index.html | 2 +- content/plugins/json/index.html| 2 +- content/plugins/junit/index.html | 2 +- content/plugins/osgi/index.html| 2 +- content/plugins/oval/index.html| 2 +- content/plugins/plexus/index.html | 2 +- content/plugins/portlet-tiles/index.html | 2 +- content/plugins/portlet/index.html | 2 +- content/plugins/rest/index.html| 2 +- content/plugins/sitegraph/index.html | 2 +- content/plugins/sitemesh/index.html| 2 +- content/plugins/spring/index.html | 2 +- content/plugins/struts-1/index.html| 2 +- content/plugins/testng/index.html | 2 +- content/plugins/tiles-3/index.html | 2 +- content/plugins/tiles/index.html | 2 +- content/plugins/velocity/index.html| 2 +- 30 files changed, 30 insertions(+), 32 deletions(-) diff --git a/content/plugins/async/index.html b/content/plugins/async/index.html index a7b017938..a46dc1733 100644 --- a/content/plugins/async/index.html +++ b/content/plugins/async/index.html @@ -148,7 +148,7 @@ https://github.com/apache/struts-site/edit/master/source/plugins/async/index.md"; title="Edit this page on GitHub">Edit on GitHub -<< back to Plugins +<< back to Plugins Async Plugin diff --git a/content/plugins/bean-validation/index.html b/content/plugins/bean-validation/index.html index 14a18ba30..005fc7ae0 100644 --- a/content/plugins/bean-validation/index.html +++ b/content/plugins/bean-validation/index.html @@ -148,7 +148,7 @@ https://github.com/apache/struts-site/edit/master/source/plugins/bean-validation/index.md"; title="Edit this page on GitHub">Edit on GitHub -<< back to Plugins +<< back to Plugins Bean Validation Plugin diff --git a/content/plugins/cdi/index.html b/content/plugins/cdi/index.html index 1aa2d6eb2..285a0fd60 100644 --- a/content/plugins/cdi/index.html +++ b/content/plugins/cdi/index.html @@ -148,7 +148,7 @@ https://github.com/apache/struts-site/edit/master/source/plugins/cdi/index.md"; title="Edit this page on GitHub">Edit on GitHub -<< back to Plugins +<< back to Plugins CDI Plugin diff --git a/content/plugins/codebehind/index.html b/content/plugins/codebehind/index.html index 7a214a97e..2a6b440b1 100644 --- a/content/plugins/codebehind/index.html +++ b/content/plugins/codebehind/index.html @@ -148,7 +148,7 @@ https://github.com/apache/struts-site/edit/master/source/plugins/codebehind/index.md"; title="Edit this page on GitHub">Edit on GitHub -<< back to Plugins +<< back to Plugins Codebehind Plugin diff --git a/content/plugins/config-browser/index.html b/content/plugins/config-browser/index.html index 6e0a79591..6a6447bd0 100644 --- a/content/plugins/config-browser/index.html +++ b/content/plugins/config-browser/index.html @@ -148,7 +148,7 @@ https://github.com/apache/struts-site/edit/master/source/plugins/config-browser/index.md"; title="Edit this page on GitHub">Edit on GitHub -<< back to Plugins +<< back to Plugins Config Browser Plugin diff --git a/content/plugins/convention/converting.html b/content/plugins/convention/converting.html index f6bc6892e..05106b01d 100644 --- a/content/plugins/convention/converting.html +++ b/content/plugins/convention/converting.html @@ -150,9 +150,7 @@ << back to Convention plugin -« back to Convention Plugin - -Converting application from Codebehind to Convention Plugin +Converting application from Codebehind to Convention Plugin Changes required diff --git a/content/plugins/convention/index.html b/content/plugins/convention/index.html index 758e6f685..0fa087f96 100644 --- a/content/plugins
(struts-site) branch fix/sitemesh updated (156ce676b -> c6949698d)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch fix/sitemesh in repository https://gitbox.apache.org/repos/asf/struts-site.git discard 156ce676b Fixes reference to the new filters and update plugins' layout new c6949698d Fixes reference to the new filters and update plugins' layout 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 (156ce676b) \ N -- N -- N refs/heads/fix/sitemesh (c6949698d) 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: source/plugins/async/index.md | 2 +- source/plugins/bean-validation/index.md | 2 +- source/plugins/cdi/index.md | 2 +- source/plugins/codebehind/index.md | 2 +- source/plugins/config-browser/index.md | 2 +- source/plugins/convention/converting.md | 2 -- source/plugins/convention/index.md | 2 +- source/plugins/dwr/index.md | 2 +- source/plugins/embedded-jsp/index.md| 2 +- source/plugins/jasperreports/index.md | 2 +- source/plugins/java-8-support/index.md | 2 +- source/plugins/javatemplates/index.md | 2 +- source/plugins/jfreechart/index.md | 2 +- source/plugins/jsf/index.md | 2 +- source/plugins/json/index.md| 2 +- source/plugins/junit/index.md | 2 +- source/plugins/osgi/index.md| 2 +- source/plugins/oval/index.md| 2 +- source/plugins/plexus/index.md | 2 +- source/plugins/portlet-tiles/index.md | 2 +- source/plugins/portlet/index.md | 2 +- source/plugins/rest/index.md| 2 +- source/plugins/sitegraph/index.md | 2 +- source/plugins/sitemesh/index.md| 2 +- source/plugins/spring/index.md | 2 +- source/plugins/struts-1/index.md| 2 +- source/plugins/testng/index.md | 2 +- source/plugins/tiles-3/index.md | 2 +- source/plugins/tiles/index.md | 2 +- source/plugins/velocity/index.md| 2 +- 30 files changed, 29 insertions(+), 31 deletions(-)
(struts-site) 01/01: Fixes reference to the new filters and update plugins' layout
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch fix/sitemesh
in repository https://gitbox.apache.org/repos/asf/struts-site.git
commit 976bde06dde1dbae77e0af09726778e1866b4cad
Author: Lukasz Lenart
AuthorDate: Sat Apr 20 15:39:02 2024 +0200
Fixes reference to the new filters and update plugins' layout
---
source/_layouts/plugin.html| 59
source/core-developers/web-xml.md | 11 ++--
source/plugins/async/index.md | 4 +-
source/plugins/bean-validation/index.md| 4 +-
source/plugins/cdi/index.md| 4 +-
source/plugins/codebehind/index.md | 4 +-
source/plugins/config-browser/index.md | 4 +-
source/plugins/convention/converting.md| 5 +-
source/plugins/convention/index.md | 4 +-
source/plugins/dwr/index.md| 4 +-
source/plugins/embedded-jsp/index.md | 4 +-
source/plugins/index.md| 62 +++---
source/plugins/jasperreports/index.md | 4 +-
source/plugins/java-8-support/index.md | 4 +-
source/plugins/javatemplates/index.md | 4 +-
source/plugins/jfreechart/index.md | 4 +-
source/plugins/jsf/index.md| 4 +-
source/plugins/json/index.md | 4 +-
source/plugins/json/json-ajax-validation.md| 4 +-
source/plugins/junit/index.md | 4 +-
source/plugins/osgi/index.md | 4 +-
source/plugins/oval/index.md | 4 +-
source/plugins/plexus/index.md | 4 +-
source/plugins/portlet-tiles/index.md | 4 +-
source/plugins/portlet/index.md| 4 +-
.../plugins/portlet/struts-2-portlet-tutorial.md | 5 +-
source/plugins/rest/index.md | 4 +-
source/plugins/sitegraph/index.md | 4 +-
source/plugins/sitemesh/index.md | 52 +-
source/plugins/spring/index.md | 6 +--
.../spring-session-components-workarounds.md | 6 ---
source/plugins/struts-1/index.md | 4 +-
source/plugins/testng/index.md | 4 +-
source/plugins/tiles-3/index.md| 4 +-
source/plugins/tiles/index.md | 4 +-
source/plugins/velocity/index.md | 2 +-
36 files changed, 125 insertions(+), 191 deletions(-)
diff --git a/source/_layouts/plugin.html b/source/_layouts/plugin.html
deleted file mode 100644
index b7ecc649e..0
--- a/source/_layouts/plugin.html
+++ /dev/null
@@ -1,59 +0,0 @@
-
-
-
-
-
-
-
-
-
- {{ page.title }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-var _paq = window._paq = window._paq || [];
-/* tracker methods like "setCustomDimension" should be called before
"trackPageView" */
-/* We explicitly disable cookie tracking to avoid privacy issues */
-_paq.push(['disableCookies']);
-_paq.push(['trackPageView']);
-_paq.push(['enableLinkTracking']);
-(function() {
- var u="//analytics.apache.org/";
- _paq.push(['setTrackerUrl', u+'matomo.php']);
- _paq.push(['setSiteId', '41']);
- var d=document, g=d.createElement('script'),
s=d.getElementsByTagName('script')[0];
- g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
-})();
-
-
-
-
-
-{% include header.html %}
-
-
-
-Edit on
GitHub
-{% if page.parent %}
-<<
back to {{ page.parent.title }}
-{% else %}
-<< back to Plugins
-{% endif %}
-{{ content }}
-
-
-
-{% include footer.html %}
-
-
-
diff --git a/source/core-developers/web-xml.md
b/source/core-developers/web-xml.md
index 5e947b663..38dd4e64e 100644
--- a/source/core-developers/web-xml.md
+++ b/source/core-developers/web-xml.md
@@ -10,10 +10,11 @@ title: web.xml
{:toc}
The `web.xml` web application descriptor file represents the core of the Java
web application, so it is appropriate
-that it is also part of the core of the Struts framework. In the `web.xml`
file, Struts defines its FilterDispatcher,
-the Servlet Filter class that initializes the Struts framework and handles all
requests. This filter can contain
-initialization parameters that affect what, if any, additional configuration
files are loaded and how the framework
-should behave.
+that it is also part of the core of the Struts framework. In the `web.xml`
file you can use one of the two options:
+1. Configure
`org.apache.struts2.dispatcher.filter.StrutsPrepareAndExecuteFilter` which acts
as a central
+ point of initializing the Struts framework and handles all requests.
+2. Use combination of
`org.apache.struts2.dispatcher.filter.StrutsPrepareFilter` and
`org.apache.struts2.dispatcher.filter.S
(struts-site) 01/01: Merge pull request #236 from apache/fix/sitemesh
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 commit 47cbae9fc203df2a4d00d77e7c528ac8ed53fbe7 Merge: c77dc4556 976bde06d Author: Lukasz Lenart AuthorDate: Sat Apr 20 15:57:46 2024 +0200 Merge pull request #236 from apache/fix/sitemesh Fixes reference to the new filters and update plugins' layout source/_layouts/plugin.html| 59 source/core-developers/web-xml.md | 11 ++-- source/plugins/async/index.md | 4 +- source/plugins/bean-validation/index.md| 4 +- source/plugins/cdi/index.md| 4 +- source/plugins/codebehind/index.md | 4 +- source/plugins/config-browser/index.md | 4 +- source/plugins/convention/converting.md| 5 +- source/plugins/convention/index.md | 4 +- source/plugins/dwr/index.md| 4 +- source/plugins/embedded-jsp/index.md | 4 +- source/plugins/index.md| 62 +++--- source/plugins/jasperreports/index.md | 4 +- source/plugins/java-8-support/index.md | 4 +- source/plugins/javatemplates/index.md | 4 +- source/plugins/jfreechart/index.md | 4 +- source/plugins/jsf/index.md| 4 +- source/plugins/json/index.md | 4 +- source/plugins/json/json-ajax-validation.md| 4 +- source/plugins/junit/index.md | 4 +- source/plugins/osgi/index.md | 4 +- source/plugins/oval/index.md | 4 +- source/plugins/plexus/index.md | 4 +- source/plugins/portlet-tiles/index.md | 4 +- source/plugins/portlet/index.md| 4 +- .../plugins/portlet/struts-2-portlet-tutorial.md | 5 +- source/plugins/rest/index.md | 4 +- source/plugins/sitegraph/index.md | 4 +- source/plugins/sitemesh/index.md | 52 +- source/plugins/spring/index.md | 6 +-- .../spring-session-components-workarounds.md | 6 --- source/plugins/struts-1/index.md | 4 +- source/plugins/testng/index.md | 4 +- source/plugins/tiles-3/index.md| 4 +- source/plugins/tiles/index.md | 4 +- source/plugins/velocity/index.md | 2 +- 36 files changed, 125 insertions(+), 191 deletions(-)
(struts) branch dependabot/maven/org.assertj-assertj-core-3.25.3 deleted (was 268ed789e)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch dependabot/maven/org.assertj-assertj-core-3.25.3 in repository https://gitbox.apache.org/repos/asf/struts.git was 268ed789e Bump org.assertj:assertj-core from 3.25.2 to 3.25.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) branch release/struts-7-0-x updated (2352c6863 -> 831689b26)
This is an automated email from the ASF dual-hosted git repository.
kusal pushed a change to branch release/struts-7-0-x
in repository https://gitbox.apache.org/repos/asf/struts.git
from 2352c6863 [maven-release-plugin] prepare for next development iteration
add f8381fbdb [maven-release-plugin] prepare release STRUTS_6_4_0
add 5e8b81b38 [maven-release-plugin] prepare for next development iteration
add a6d6d918f Reverts release and fixes issue with assembly
add 9c5c80d17 [maven-release-plugin] prepare release STRUTS_6_4_0
add c6d13f101 [maven-release-plugin] prepare for next development iteration
add efa20426c WW-5406 Ensure Action excluded patterns are reinjected
add 1a6e2fef7 WW-5406 Add deprecation JavaDocs
add ed0c7287d WW-5406 Revert breaking API change
add 929a60184 Merge pull request #910 from apache/WW-5406-excluded-patterns
add 0074b7028 WW-5407 extend SecurityMemberAccess proxy detection to other
proxies
add 5f717cdb8 WW-5407 tweak ProxyUtil#isHibernateProxyMember to make it
neat
add 0aa2f269f Merge pull request #911 from
atlassian-forks/issue/WW-5407-extend-SecurityMemberAccess-proxy-detection-to-proxies
add e2ec11457 WW-5408 add option to not fallback to empty namespace when
unresolved
add f9f632757 /WW-5408 rename
struts.disableActionConfigFallbackToEmptyNamespace to
struts.actionConfig.fallbackToEmptyNamespace
add 1d51d00ec WW-5408 add struts.actionConfig.fallbackToEmptyNamespace as
true in default.properties
add 1562e66a8 Merge pull request #912 from
atlassian-forks/issue/WW-5408-add-option-to-not-fallback-to-empty-namespace-when-unresolved
add ad49ea866 WW-5406 Fix injection order issue for excluded patterns
add 431053679 Merge pull request #917 from apache/WW-5406-injection-order
add bf5f29132 WW-5409 introduce final attribute to package element which
make them unextendable
add 4088f2ee2 WW-5409 update new dtd from 6.4.0 to 6.5.0
add 85783a0cc WW-5409 rename 6.5.0.dtd to 6.5.dtd to follow the naming
pattern
add 63267a8e0 Merge pull request #914 from
atlassian-forks/issue/WW-5409-introduce-final-attribute-to-package-element
add 0a720971c WW-5417 bump ognl version to fix security issue
add 62b4b65c4 WW-5417 update ognl.version as 3.3.5
add f5cfb88f1 Merge pull request #915 from
atlassian-forks/issue/WW-5417-bump-ongl-version-to-fix-security-issue
add 100f5052d WW-5418 Forbid enums
add 7e9f6e84f WW-5418 Exclude Tomcat Jasper classes
add 3c21e8229 Merge pull request #916 from apache/WW-5418-struts-sec
add d0204f315 Merge remote-tracking branch 'origin/master' into
merge-master-to-70-2024-04-20
add 831689b26 Merge pull request #918 from
apache/merge-master-to-70-2024-04-20
No new revisions were added by this update.
Summary of changes:
assembly/pom.xml | 2 +
core/pom.xml | 9 +
.../com/opensymphony/xwork2/XWorkTestCase.java | 35 ++-
.../xwork2/config/entities/PackageConfig.java | 13 ++
.../xwork2/config/impl/DefaultConfiguration.java | 18 +-
.../providers/XmlDocConfigurationProvider.java | 25 ++-
.../xwork2/ognl/DefaultOgnlCacheFactory.java | 8 +-
.../xwork2/ognl/SecurityMemberAccess.java | 36 ++--
.../com/opensymphony/xwork2/util/ProxyUtil.java| 59 -
.../java/org/apache/struts2/StrutsConstants.java | 3 +
.../config/StrutsXmlConfigurationProvider.java | 1 +
.../struts2/config/entities/ConstantConfig.java| 20 ++
.../org/apache/struts2/dispatcher/Dispatcher.java | 36
.../apache/struts2/dispatcher/InitOperations.java | 25 +--
.../struts2/dispatcher/PrepareOperations.java | 18 +-
.../filter/StrutsPrepareAndExecuteFilter.java | 10 +-
.../dispatcher/filter/StrutsPrepareFilter.java | 10 +-
.../org/apache/struts2/default.properties | 3 +
.../resources/{struts-6.0.dtd => struts-6.5.dtd} | 5 +-
.../src/main/resources/struts-excluded-classes.xml | 2 +
.../xwork2/config/ConfigurationTest.java | 36
.../XmlConfigurationProviderPackagesTest.java | 68 --
.../xwork2/ognl/OgnlValueStackTest.java| 8 +-
.../xwork2/ognl/SecurityMemberAccessTest.java | 2 +-
.../apache/struts2/dispatcher/DispatcherTest.java | 26 +++
.../struts2/dispatcher/InitOperationsTest.java | 86
...rutsPrepareAndExecuteFilterIntegrationTest.java | 13 +-
.../struts2/ognl/OgnlSetPossiblePropertyTest.java | 240 +
.../apache/struts2/views/jsp/ui/DebugTagTest.java | 22 +-
.../xwork-test-package-extends-final.xml} | 14 +-
.../config/providers/xwork-test-package-final.xml} | 14 +-
plugins/bean-validation/pom.xml| 2 +-
plugins/rest/pom.xml | 4 +-
.../xwork2/ognl/SecurityMemberAccessProxyTest.java | 54 +++--
pom.xml
(struts) branch merge-master-to-70-2024-04-20 deleted (was d0204f315)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch merge-master-to-70-2024-04-20 in repository https://gitbox.apache.org/repos/asf/struts.git was d0204f315 Merge remote-tracking branch 'origin/master' into merge-master-to-70-2024-04-20 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-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 7e9ac9852 Updates stage by Jenkins
7e9ac9852 is described below
commit 7e9ac98524b15eebfd682c31cf66857939afebbe
Author: jenkins
AuthorDate: Sat Apr 20 21:38:25 2024 +
Updates stage by Jenkins
---
content/plugins/json/json-ajax-validation.html | 193 -
.../plugins/portlet/struts-2-portlet-tutorial.html | 193 -
content/plugins/spring/index.html | 2 -
content/security/index.html| 14 +-
4 files changed, 394 insertions(+), 8 deletions(-)
diff --git a/content/plugins/json/json-ajax-validation.html
b/content/plugins/json/json-ajax-validation.html
index 8f463ddf3..6c7306ce0 100644
--- a/content/plugins/json/json-ajax-validation.html
+++ b/content/plugins/json/json-ajax-validation.html
@@ -1,4 +1,156 @@
-JSON Ajax Validation
+
+
+
+
+
+
+
+
+
+ JSON Ajax validation
+
+
+
+
+
+
+
+
+
+
+
+
+
+var _paq = window._paq = window._paq || [];
+/* tracker methods like "setCustomDimension" should be called before
"trackPageView" */
+/* We explicitly disable cookie tracking to avoid privacy issues */
+_paq.push(['disableCookies']);
+_paq.push(['trackPageView']);
+_paq.push(['enableLinkTracking']);
+(function() {
+ var u="//analytics.apache.org/";
+ _paq.push(['setTrackerUrl', u+'matomo.php']);
+ _paq.push(['setSiteId', '41']);
+ var d=document, g=d.createElement('script'),
s=d.getElementsByTagName('script')[0];
+ g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
+})();
+
+
+
+
+
+https://github.com/apache/struts"; class="github-ribbon">
+ https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa.png?resize=149%2C149";
class="attachment-full size-full" alt="Fork me on GitHub" data-recalc-dims="1">
+
+
+
+
+
+
+
+
+Menu
+Toggle navigation
+
+
+
+
+
+
+
+
+
+
+Home
+
+
+Welcome
+Download
+Releases
+Announcements
+http://www.apache.org/licenses/";>License
+https://www.apache.org/foundation/thanks.html";>Thanks!
+https://www.apache.org/foundation/sponsorship.html";>Sponsorship
+https://privacy.apache.org/policies/privacy-policy-public.html";>Privacy
Policy
+
+
+
+
+Support
+
+
+User Mailing List
+https://issues.apache.org/jira/browse/WW";>Issue
Tracker
+Reporting Security Issues
+Commercial
Support
+
+https://cwiki.apache.org/confluence/display/WW/Migration+Guide";>Version
Notes
+https://cwiki.apache.org/confluence/display/WW/Security+Bulletins";>Security
Bulletins
+
+Maven Project
Info
+Struts
Core Dependencies
+Plugin
Dependencies
+
+
+
+
+Documentation
+
+
+Birds Eye
+Key Technologies
+Kickstart FAQ
+https://cwiki.apache.org/confluence/display/WW/Home";>Wiki
+
+Getting Started
+Security Guide
+Core Developers Guide
+Tag Developers Guide
+Maven Archetypes
+Plugins
+Struts
Core API
+Tag
reference
+https://cwiki.apache.org/confluence/display/WW/FAQs";>FAQs
+http://cwiki.apache.org/S2PLUGINS/home.html";>Plugin registry
+
+
+
+
+Contributing
+
+
+You at Struts
+How to Help FAQ
+Development Lists
+
+Submitting
patches
+Source Code and Builds
+Coding standards
+Contributors Guide
+
+Release
Guidelines
+PMC Charter
+Volunteers
+https://gitbox.apache.org/repos/asf?p=struts.git";>Source
Repository
+Updating the
website
+
+
+http://www.apache.org/";>
+
+
+
+
+
+
+
+
+
+
+https://github.com/apache/struts-site/edit/master/
