(struts) branch master updated (eb469779f -> ce2467522)
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 eb469779f Merge pull request #864 from apache/dependabot/github_actions/actions/upload-artifact-4.3.0 add e299bba11 Update maven-war-plugin to 3.4.0 add 8087ba97e Update maven-site-plugin to 3.12.1 add 028fedd30 Update assertj to 3.25.2 add 77285186d Update slf4j to 2.0.11 add 71d28ed90 Update jackson to 2.16.1 add f8a8172a3 Update spring to 5.3.31 add fd2cf9160 Update log4j2 to 2.21.1 add 8ef55db35 Update maven-dependency-plugin to 3.6.1 add 27f0b5696 Update maven-enforcer-plugin to 3.4.1 add fd7e74867 Update commons-lang3 to 3.14.0 add 218e634bf Update commons-io to 2.15.1 add abd824fdd Update commons-text to 1.11.0 add ce2467522 Merge pull request #863 from sepe81/feature/dependency-updates No new revisions were added by this update. Summary of changes: pom.xml | 24 1 file changed, 12 insertions(+), 12 deletions(-)
(struts) branch dependabot/maven/log4j2.version-2.22.1 updated (8a888ddbd -> a33534a8d)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/log4j2.version-2.22.1 in repository https://gitbox.apache.org/repos/asf/struts.git discard 8a888ddbd Bump log4j2.version from 2.20.0 to 2.22.1 add 55ca7a5b3 WW-5365 Reverts changes introduced in WW-5192 to allow evaluate the value attribute add d8dc720d4 Merge pull request #835 from apache/fix/WW-5365-radio-value add 686189c1b Bump actions/upload-artifact from 4.0.0 to 4.1.0 add 0a94b50bc Merge pull request #842 from apache/dependabot/github_actions/actions/upload-artifact-4.1.0 add 3c8fff46d WW-5352 Clean up OgnlValueStackTest add 9b5cb2d7b WW-5352 Move method to XWorkTestCase add bdcedc55b Merge pull request #841 from apache/WW-5352-ognlvaluestack add 96618ebbd Bump org.apache.commons:commons-compress from 1.23.0 to 1.25.0 add d0ac76b9a Merge pull request #820 from apache/dependabot/maven/org.apache.commons-commons-compress-1.25.0 add e9738698a WW-5387 Fixes remove() signature add fdd996c68 Merge pull request #844 from apache/fix/WW-5387-remove add 72f551f40 WW-5369 Re-define minimal library set add 5ee381182 Merge pull request #847 from apache/fix/WW-5369-min-lib add dc96c257d WW-5374 Allows to prepend reportUri with Servlet context add d5932f82f WW-5374 Uses @code instead of add 790c663dd WW-5374 Adds additional test case to cover disabling prepending context add 3a1a89a54 Merge pull request #845 from apache/fix/WW-5374-context add 9a6411c8c Extends sleep period to avoid breaking a build add dd0f0b05a Merge pull request #849 from apache/fix/longer-sleep add 3ec313aa0 WW-5357 Adds support for disabled attribute to anchor tag add a763071d2 Merge pull request #848 from apache/fix/WW-5357-disabled add 775febbdf Upgrade maven to 3.9.6 and wrapper to 3.2.0 add 1e56b7ce6 Merge pull request #853 from sepe81/feature/upgrade-maven-to-3.9.6 add cde86457a Bump actions/upload-artifact from 4.1.0 to 4.2.0 add ec18f0eef Merge pull request #855 from apache/dependabot/github_actions/actions/upload-artifact-4.2.0 add cf74a4450 Fixes excluding Plexus container in OWASP scan add 65c0427ea Merge pull request #858 from apache/fix/plexus-exclusion add 9f4b67a9a Drops JDK11 build and fixes duplicated steps add 2de30e72a Merge pull request #859 from apache/fix/sped-up-build add e7a13b963 Small spelling and MD fixes (IntelliJ assisted) add 644bd1f8c Mention just the maintenance branches for supported versions add 7843cd5e1 Merge pull request #854 from sepe81/feature/update-security-policy add 2513fcb29 Stops running sonar.yml on forks add 5057aeac8 Merge pull request #862 from apache/lukaszlenart-patch-1 add eca0666f0 WW-5352 Introduce StrutsParameter annotation add ad576f0fd WW-5352 Introduce ThreadAllowlist bean add 4255da3ee WW-5352 First draft implementation add bf3f407b5 WW-5352 Ensure allowlist is cleared if in unexpected state add 4c5f2b026 WW-5352 Add full unit test coverage add e9154b922 Merge branch 'master' into WW-5352-parameter-annotation-3 add 5d7930123 WW-5352 Fix missing curved bracket add 4c60f39c7 WW-5352 Enable annotations for showcase add b2c754226 WW-5352 Dispatcher should up thread allowlist add a57c2882e WW-5352 Reinstate manual allowlist for generic types add 0a71e2c3b WW-5352 Implement auto-allowlisting for Iterator component add 770d31110 WW-5352 Mild optimisation add 6df80041e WW-5352 Auto allowlist parameterized types! add f106b2098 WW-5352 Map-like type support add bf7737fa0 WW-5352 Add unit test coverage for generics add 56d8361b4 WW-5352 Implement transition mode add 49b9c0c78 WW-5352 Ensure superclasses and interfaces allowlisted add 728d695ce WW-5352 Add debug logging for parameter rejections add b50616942 WW-5352 Acceptance test coverage add 71d77df3f WW-5352 Normalise parameter name add bd783a0e1 Merge pull request #832 from apache/WW-5352-parameter-annotation-3 add a358db585 WW-5360 Introduces additional countStr & indexStr to allow to ignore conversion add b83607295 Merge pull request #852 from apache/fix/WW-5360-iterator add 372aad2c6 Bump actions/upload-artifact from 4.2.0 to 4.3.0 add eb469779f Merge pull request #864 from apache/dependabot/github_actions/actions/upload-artifact-4.3.0 add e299bba11 Update maven-war-plugin to 3.4.0 add 8087ba97e Update maven-site-plugin to 3.12.1 add 028fedd30 Update assertj to 3.25.2 add 77285186d Update slf4j to 2.0.11 add 71d28ed90 Update jackson to 2.16.1 add f8a8172a3 Update spring to 5.3.31 add fd2cf9160 Update log4j2 to 2.21.1 add 8ef55db35 Update maven-dependency-plugin to 3.6.1 add 27f0b5696 Update maven-enforcer-plugin to 3.4.1 add fd7e74867 Update commons-lang3 to 3.14.0
(struts) branch dependabot/maven/org.springframework-spring-core-6.0.15 deleted (was cefae262c)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.springframework-spring-core-6.0.15 in repository https://gitbox.apache.org/repos/asf/struts.git was cefae262c Bump org.springframework:spring-core from 5.3.27 to 6.0.15 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 dependabot/maven/spring.platformVersion-6.1.3 updated (488b3840a -> 2281d23a2)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/spring.platformVersion-6.1.3 in repository https://gitbox.apache.org/repos/asf/struts.git discard 488b3840a Bump spring.platformVersion from 5.3.27 to 6.1.3 add cde86457a Bump actions/upload-artifact from 4.1.0 to 4.2.0 add ec18f0eef Merge pull request #855 from apache/dependabot/github_actions/actions/upload-artifact-4.2.0 add cf74a4450 Fixes excluding Plexus container in OWASP scan add 65c0427ea Merge pull request #858 from apache/fix/plexus-exclusion add 9f4b67a9a Drops JDK11 build and fixes duplicated steps add 2de30e72a Merge pull request #859 from apache/fix/sped-up-build add e7a13b963 Small spelling and MD fixes (IntelliJ assisted) add 644bd1f8c Mention just the maintenance branches for supported versions add 7843cd5e1 Merge pull request #854 from sepe81/feature/update-security-policy add 2513fcb29 Stops running sonar.yml on forks add 5057aeac8 Merge pull request #862 from apache/lukaszlenart-patch-1 add eca0666f0 WW-5352 Introduce StrutsParameter annotation add ad576f0fd WW-5352 Introduce ThreadAllowlist bean add 4255da3ee WW-5352 First draft implementation add bf3f407b5 WW-5352 Ensure allowlist is cleared if in unexpected state add 4c5f2b026 WW-5352 Add full unit test coverage add e9154b922 Merge branch 'master' into WW-5352-parameter-annotation-3 add 5d7930123 WW-5352 Fix missing curved bracket add 4c60f39c7 WW-5352 Enable annotations for showcase add b2c754226 WW-5352 Dispatcher should up thread allowlist add a57c2882e WW-5352 Reinstate manual allowlist for generic types add 0a71e2c3b WW-5352 Implement auto-allowlisting for Iterator component add 770d31110 WW-5352 Mild optimisation add 6df80041e WW-5352 Auto allowlist parameterized types! add f106b2098 WW-5352 Map-like type support add bf7737fa0 WW-5352 Add unit test coverage for generics add 56d8361b4 WW-5352 Implement transition mode add 49b9c0c78 WW-5352 Ensure superclasses and interfaces allowlisted add 728d695ce WW-5352 Add debug logging for parameter rejections add b50616942 WW-5352 Acceptance test coverage add 71d77df3f WW-5352 Normalise parameter name add bd783a0e1 Merge pull request #832 from apache/WW-5352-parameter-annotation-3 add a358db585 WW-5360 Introduces additional countStr & indexStr to allow to ignore conversion add b83607295 Merge pull request #852 from apache/fix/WW-5360-iterator add 372aad2c6 Bump actions/upload-artifact from 4.2.0 to 4.3.0 add eb469779f Merge pull request #864 from apache/dependabot/github_actions/actions/upload-artifact-4.3.0 add e299bba11 Update maven-war-plugin to 3.4.0 add 8087ba97e Update maven-site-plugin to 3.12.1 add 028fedd30 Update assertj to 3.25.2 add 77285186d Update slf4j to 2.0.11 add 71d28ed90 Update jackson to 2.16.1 add f8a8172a3 Update spring to 5.3.31 add fd2cf9160 Update log4j2 to 2.21.1 add 8ef55db35 Update maven-dependency-plugin to 3.6.1 add 27f0b5696 Update maven-enforcer-plugin to 3.4.1 add fd7e74867 Update commons-lang3 to 3.14.0 add 218e634bf Update commons-io to 2.15.1 add abd824fdd Update commons-text to 1.11.0 add ce2467522 Merge pull request #863 from sepe81/feature/dependency-updates add 2281d23a2 Bump spring.platformVersion from 5.3.27 to 6.1.3 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 (488b3840a) \ N -- N -- N refs/heads/dependabot/maven/spring.platformVersion-6.1.3 (2281d23a2) 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: .github/workflows/scorecards-analysis.yaml | 2 +- .github/workflows/sonar.yml| 1 + Jenkinsfile| 62 +--- SECURITY.md| 12 +- .../org/apache/struts2/showcase/UITagExample.java | 24 +- .../showcase/action/ParamsAnnotationAction.java| 133 .../struts2/showcase/action/SkillAction.java | 2 + .../struts2/showcase/async/ChatRoomAction.java | 3 + .../struts2/showcase/conversion/AddressAction.java | 4 +- .../showcase/conversion/OperationsEnumAction.java | 2 + .../struts2/showcase/conversion/PersonAction.java | 2 + ...
(struts-site) branch fix/tiles created (now add64dc9a)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch fix/tiles in repository https://gitbox.apache.org/repos/asf/struts-site.git at add64dc9a Cleans up docs about Tiles This branch includes the following new commits: new add64dc9a Cleans up docs about Tiles 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: Cleans up docs about Tiles
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch fix/tiles
in repository https://gitbox.apache.org/repos/asf/struts-site.git
commit add64dc9a782e4af0940ea7664ee8ad770f0ee3c
Author: Lukasz Lenart
AuthorDate: Sat Feb 3 16:13:58 2024 +0100
Cleans up docs about Tiles
---
source/plugins/tiles/index.md | 174 ++
source/plugins/tiles/tiles-use.md | 70 ---
2 files changed, 81 insertions(+), 163 deletions(-)
diff --git a/source/plugins/tiles/index.md b/source/plugins/tiles/index.md
index 4c9ce28a0..9330a538f 100644
--- a/source/plugins/tiles/index.md
+++ b/source/plugins/tiles/index.md
@@ -12,8 +12,8 @@ parent:
* Will be replaced with the ToC, excluding a header
{:toc}
-Tiles is a templating framework designed to easily allow the creation of web
application pages with a consistent look and feel. It can
-be used for both page decorating and componentization.
+Tiles is a templating framework designed to easily allow the creation of web
application pages with a consistent
+look and feel. It can be used for both page decorating and componentization.
The Tiles plugin allows actions to return Tiles pages.
@@ -26,100 +26,88 @@ The Tiles plugin allows actions to return Tiles pages.
The following steps must be taken in order to enable tiles support within your
Struts2 application:
-1. Include the struts-tiles-plugin as a dependency in your web application. If
you are using maven2, the dependency configuration will
- be similar to:
-
-
-```xml
-
- org.apache.struts
- struts2-tiles-plugin
- ${version.tiles}
-
-
-```
-
-2. Register the tiles listener. This listener will typically either be the
standard tiles listener `org.apache.tiles.listener.TilesListener`
- or the Struts2 replacement `org.apache.struts2.tiles.TilesListener`. The
latter provides tighter integration with Struts features such
- as freemarker integration.
-
-
-```xml
-
- org.apache.struts2.tiles.StrutsTilesListener
-
-
-```
-
-3. All package definitions which require tiles support must either extend the
`tiles-default` package or must register
- the [Tiles Result] type definition.
-
-
-```xml
-
-
-
-
-```
+1. Include the struts-tiles-plugin as a dependency in your web application. If
you are using maven2, the dependency
+ configuration will be similar to:
+
+ ```xml
+
+org.apache.struts
+struts2-tiles-plugin
+${version.tiles}
+
+ ```
+2. Register the Tiles listener. This listener will typically either be the
standard tiles listener `org.apache.tiles.listener.TilesListener`
+ or the Struts2 replacement `org.apache.struts2.tiles.TilesListener`. The
latter provides tighter integration with
+ Struts features such as freemarker integration.
+
+ ```xml
+
+
org.apache.struts2.tiles.StrutsTilesListener
+
+ ```
+
+3. All package definitions, which require tiles support, must either extend
the `tiles-default` package or must register
+ the **Tiles Result** type definition.
+
+ ```xml
+
+
+
+ ```
4. Configure your actions to utilize a tiles definition:
-
-```xml
-
- tilesWorks
-
-
-```
+ ```xml
+
+tilesWorks
+
+ ```
5. Instead of xml configuration you can use annotations
-
-```java
-@Result(name = "success", type="tiles")
-@TilesDefinition(extend = "fooLayout", putAttributes = {
-@TilesPutAttribute(name = "header", value = "/WEB-INF/tiles/header.jsp"),
-@TilesPutAttribute(name = "body", value = "/WEB-INF/tiles/body.ftl")
-})
-public class FooAction extends ActionSupport {
-```
-
-6. You have to define Tiles Definitons in a `tiles.xml` file. That can be
placed in `resources` or in `WEB-INF`.
-
-
-```xml
-http://tiles.apache.org/dtds/tiles-config_3_0.dtd";>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-```
-
-As from Struts 2.3.28, the plugin automatically loads all Tiles definitions
matching the following pattern `tiles*.xml` - you don't have
-to specify them via
`org.apache.tiles.definition.DefinitionsFactory.DEFINITIONS_CONFIG` in
`web.xml`, but you can use this option if your
-application is going to work in restricted servlet environment e.g. Google
AppEngine. In such case, definitions will be read from
-the provided init-param.
+ ```java
+ @Result(name = "success", type="tiles")
+ @TilesDefinition(extend = "fooLayout", putAttributes = {
+ @TilesPutAttribute(name = "header", value = "/WEB-INF/tiles/header.jsp"),
+ @TilesPutAttribute(name = "body", value = "/WEB-INF/tiles/body.ftl")
+ })
+ public class FooAction extends ActionSupport {
+ ```
+
+6. You have to define Tiles Definitions in a `tiles.xml` file. That can be
placed in `resources` or in `WEB-INF`.
+
+ ```xml
+ http://tiles.apache.org/dtds/tiles-config_3_0.dtd";>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ```
+
+As from Struts 2.3.28, the plug
(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 33da120ed Updates stage by Jenkins 33da120ed is described below commit 33da120ed2e79738d0f29a6f2021210f3db995d8 Author: jenkins AuthorDate: Sat Feb 3 15:20:45 2024 + Updates stage by Jenkins --- content/plugins/tiles/index.html | 129 +++ 1 file changed, 62 insertions(+), 67 deletions(-) diff --git a/content/plugins/tiles/index.html b/content/plugins/tiles/index.html index 0b3f05e38..29508682b 100644 --- a/content/plugins/tiles/index.html +++ b/content/plugins/tiles/index.html @@ -164,8 +164,8 @@ Installation -Tiles is a templating framework designed to easily allow the creation of web application pages with a consistent look and feel. It can -be used for both page decorating and componentization. +Tiles is a templating framework designed to easily allow the creation of web application pages with a consistent +look and feel. It can be used for both page decorating and componentization. The Tiles plugin allows actions to return Tiles pages. @@ -181,91 +181,85 @@ be used for both page decorating and componentization. The following steps must be taken in order to enable tiles support within your Struts2 application: - Include the struts-tiles-plugin as a dependency in your web application. If you are using maven2, the dependency configuration will - be similar to: + Include the struts-tiles-plugin as a dependency in your web application. If you are using maven2, the dependency + configuration will be similar to: -- - +org.apache.struts -struts2-tiles-plugin -${version.tiles} -+ - - Register the tiles listener. This listener will typically either be the standard tiles listener org.apache.tiles.listener.TilesListener - or the Struts2 replacement org.apache.struts2.tiles.TilesListener. The latter provides tighter integration with Struts features such - as freemarker integration. + Register the Tiles listener. This listener will typically either be the standard tiles listener org.apache.tiles.listener.TilesListener + or the Struts2 replacement org.apache.struts2.tiles.TilesListener. The latter provides tighter integration with + Struts features such as freemarker integration. -org.apache.struts +struts2-tiles-plugin +${version.tiles} +- - +org.apache.struts2.tiles.StrutsTilesListener -+ - All package definitions which require tiles support must either extend the tiles-default package or must register - the [Tiles Result] type definition. + All package definitions, which require tiles support, must either extend the tiles-default package or must register + the Tiles Result type definition. -org.apache.struts2.tiles.StrutsTilesListener +- - +- + Configure your actions to utilize a tiles definition: -+ - - +tilesWorks -+ Instead of xml configuration you can use annotations -@Result(name = "success", type="tiles") -@TilesDefinition(extend = "fooLayout", putAttributes = { -@TilesPutAttribute(name = "header", value = "/WEB-INF/tiles/header.jsp"), -@TilesPutAttribute(name = "body", value = "/WEB-INF/tiles/body.ftl") -}) -public class FooAction extends ActionSupport { + @Result(name = "success", type="tiles") + @TilesDefinition(extend = "fooLayout", putAttributes = { + @TilesPutAttribute(name = "header", value = "/WEB-INF/tiles/header.jsp"), + @TilesPutAttribute(name = "body", value = "/WEB-INF/tiles/body.ftl") + }) + public class FooAction extends ActionSupport { - You have to define Tiles Definitons in a tiles.xml file. That can be placed in resources or in WEB-INF. + You have to define Tiles Definitions in a tiles.xml file. That can be placed in resources or in WEB-INF. -; - -tilesWorks +
(struts-site) 01/01: Cleans up docs about Tiles
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch fix/tiles
in repository https://gitbox.apache.org/repos/asf/struts-site.git
commit f1d48dbb7d476a9c000aa4c78c845356b98aada7
Author: Lukasz Lenart
AuthorDate: Sat Feb 3 16:13:58 2024 +0100
Cleans up docs about Tiles
---
source/plugins/tiles/index.md | 178 +-
source/plugins/tiles/tiles-use.md | 70 ---
2 files changed, 80 insertions(+), 168 deletions(-)
diff --git a/source/plugins/tiles/index.md b/source/plugins/tiles/index.md
index 4c9ce28a0..d3594c26e 100644
--- a/source/plugins/tiles/index.md
+++ b/source/plugins/tiles/index.md
@@ -12,8 +12,8 @@ parent:
* Will be replaced with the ToC, excluding a header
{:toc}
-Tiles is a templating framework designed to easily allow the creation of web
application pages with a consistent look and feel. It can
-be used for both page decorating and componentization.
+Tiles is a templating framework designed to easily allow the creation of web
application pages with a consistent
+look and feel. It can be used for both page decorating and componentization.
The Tiles plugin allows actions to return Tiles pages.
@@ -26,100 +26,83 @@ The Tiles plugin allows actions to return Tiles pages.
The following steps must be taken in order to enable tiles support within your
Struts2 application:
-1. Include the struts-tiles-plugin as a dependency in your web application. If
you are using maven2, the dependency configuration will
- be similar to:
-
-
-```xml
-
- org.apache.struts
- struts2-tiles-plugin
- ${version.tiles}
-
-
-```
-
-2. Register the tiles listener. This listener will typically either be the
standard tiles listener `org.apache.tiles.listener.TilesListener`
- or the Struts2 replacement `org.apache.struts2.tiles.TilesListener`. The
latter provides tighter integration with Struts features such
- as freemarker integration.
-
-
-```xml
-
- org.apache.struts2.tiles.StrutsTilesListener
-
-
-```
-
-3. All package definitions which require tiles support must either extend the
`tiles-default` package or must register
- the [Tiles Result] type definition.
-
-
-```xml
-
-
-
-
-```
+1. Include the struts-tiles-plugin as a dependency in your web application. If
you are using maven2, the dependency
+ configuration will be similar to:
+ ```xml
+
+org.apache.struts
+struts2-tiles-plugin
+${version.tiles}
+
+ ```
+
+2. Register the Tiles listener. This listener will typically either be the
standard tiles listener `org.apache.tiles.listener.TilesListener`
+ or the Struts2 replacement `org.apache.struts2.tiles.TilesListener`. The
latter provides tighter integration with
+ Struts features such as freemarker integration.
+ ```xml
+
+
org.apache.struts2.tiles.StrutsTilesListener
+
+ ```
+
+3. All package definitions, which require tiles support, must either extend
the `tiles-default` package or must register
+ the **Tiles Result** type definition.
+ ```xml
+
+
+
+ ```
4. Configure your actions to utilize a tiles definition:
-
-
-```xml
-
- tilesWorks
-
-
-```
+ ```xml
+
+tilesWorks
+
+ ```
5. Instead of xml configuration you can use annotations
-
-
-```java
-@Result(name = "success", type="tiles")
-@TilesDefinition(extend = "fooLayout", putAttributes = {
-@TilesPutAttribute(name = "header", value = "/WEB-INF/tiles/header.jsp"),
-@TilesPutAttribute(name = "body", value = "/WEB-INF/tiles/body.ftl")
-})
-public class FooAction extends ActionSupport {
-```
-
-6. You have to define Tiles Definitons in a `tiles.xml` file. That can be
placed in `resources` or in `WEB-INF`.
-
-
-```xml
-http://tiles.apache.org/dtds/tiles-config_3_0.dtd";>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-```
-
-As from Struts 2.3.28, the plugin automatically loads all Tiles definitions
matching the following pattern `tiles*.xml` - you don't have
-to specify them via
`org.apache.tiles.definition.DefinitionsFactory.DEFINITIONS_CONFIG` in
`web.xml`, but you can use this option if your
-application is going to work in restricted servlet environment e.g. Google
AppEngine. In such case, definitions will be read from
-the provided init-param.
-
-> Note: When using a Tomcat WAR versoning mechanism which uses `##` you must
specify all the tiles definition directly using
-> the `init-param`, in other case it won't be loaded. It's due to limitation
of `URL` class.
+ ```java
+ @Result(name = "success", type="tiles")
+ @TilesDefinition(extend = "fooLayout", putAttributes = {
+ @TilesPutAttribute(name = "header", value = "/WEB-INF/tiles/header.jsp"),
+ @TilesPutAttribute(name = "body", value = "/WEB-INF/tiles/body.ftl")
+ })
+ public class FooAction extends ActionSupport {
+ ```
+
+6. You have to define Tiles Definitions in a `tiles.xml` file. That can be
placed in `resources` or in `WEB-INF`.
(struts-site) branch fix/tiles updated (add64dc9a -> f1d48dbb7)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch fix/tiles in repository https://gitbox.apache.org/repos/asf/struts-site.git discard add64dc9a Cleans up docs about Tiles new f1d48dbb7 Cleans up docs about Tiles 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 (add64dc9a) \ N -- N -- N refs/heads/fix/tiles (f1d48dbb7) 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/tiles/index.md | 14 -- 1 file changed, 4 insertions(+), 10 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 bfe5f6220 Updates stage by Jenkins bfe5f6220 is described below commit bfe5f6220baefc4c79580abc9194907aba220e92 Author: jenkins AuthorDate: Sat Feb 3 16:17:13 2024 + Updates stage by Jenkins --- content/plugins/tiles/index.html | 138 ++- 1 file changed, 63 insertions(+), 75 deletions(-) diff --git a/content/plugins/tiles/index.html b/content/plugins/tiles/index.html index 29508682b..c7fe6cd11 100644 --- a/content/plugins/tiles/index.html +++ b/content/plugins/tiles/index.html @@ -155,7 +155,6 @@ Features Usage - Accessing Struts attributes I18N @@ -182,103 +181,92 @@ look and feel. It can be used for both page decorating and componentization. Include the struts-tiles-plugin as a dependency in your web application. If you are using maven2, the dependency - configuration will be similar to: + configuration will be similar to: + ```xml - -- - - - Register the Tiles listener. This listener will typically either be the standard tiles listener org.apache.tiles.listener.TilesListener - or the Struts2 replacement org.apache.struts2.tiles.TilesListener. The latter provides tighter integration with - Struts features such as freemarker integration. - - -org.apache.struts -struts2-tiles-plugin -${version.tiles} -- + +org.apache.struts +struts2-tiles-plugin +${version.tiles} + + +2. Register the Tiles listener. This listener will typically either be the standard tiles listener `org.apache.tiles.listener.TilesListener` + or the Struts2 replacement `org.apache.struts2.tiles.TilesListener`. The latter provides tighter integration with + Struts features such as freemarker integration. + ```xml +org.apache.struts2.tiles.StrutsTilesListener -+ All package definitions, which require tiles support, must either extend the tiles-default package or must register - the Tiles Result type definition. - - -org.apache.struts2.tiles.StrutsTilesListener +- - - - - Configure your actions to utilize a tiles definition: + the Tiles Result type definition. + ```xml - -- - + + + + +4. Configure your actions to utilize a tiles definition: + ```xml +tilesWorks -+ - Instead of xml configuration you can use annotations - - - @Result(name = "success", type="tiles") + Instead of xml configuration you can use annotations + @Result(name = "success", type="tiles") @TilesDefinition(extend = "fooLayout", putAttributes = { - @TilesPutAttribute(name = "header", value = "/WEB-INF/tiles/header.jsp"), - @TilesPutAttribute(name = "body", value = "/WEB-INF/tiles/body.ftl") + @TilesPutAttribute(name = "header", value = "/WEB-INF/tiles/header.jsp"), + @TilesPutAttribute(name = "body", value = "/WEB-INF/tiles/body.ftl") }) public class FooAction extends ActionSupport { - - - - You have to define Tiles Definitions in a tiles.xml file. That can be placed in resources or in WEB-INF. + + + You have to define Tiles Definitions in a tiles.xml file. That can be placed in resources or in WEB-INF. + ```xml + ; - - ; -tilesWorks ++ - - + + + + + -- - - - + + + + - <- -
(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 e1718d71e Updates stage by Jenkins
e1718d71e is described below
commit e1718d71e91bf7b2aeeff988401f23207dca70be
Author: jenkins
AuthorDate: Sat Feb 3 16:42:27 2024 +
Updates stage by Jenkins
---
content/plugins/tiles/index.html | 157 +--
1 file changed, 83 insertions(+), 74 deletions(-)
diff --git a/content/plugins/tiles/index.html b/content/plugins/tiles/index.html
index c7fe6cd11..83f1258db 100644
--- a/content/plugins/tiles/index.html
+++ b/content/plugins/tiles/index.html
@@ -155,6 +155,7 @@
Features
Usage
+ Accessing Struts
attributes
I18N
@@ -180,90 +181,98 @@ look and feel. It can be used for both page decorating
and componentization.
The following steps must be taken in order to enable tiles support within
your Struts2 application:
- Include the struts-tiles-plugin as a dependency in your web application.
If you are using maven2, the dependency
- configuration will be similar to:
- ```xml
-
-
-org.apache.struts
-struts2-tiles-plugin
-${version.tiles}
-
-
-2. Register the Tiles listener. This listener will typically either be the
standard tiles listener `org.apache.tiles.listener.TilesListener`
- or the Struts2 replacement `org.apache.struts2.tiles.TilesListener`. The
latter provides tighter integration with
- Struts features such as freemarker integration.
- ```xml
-
-
org.apache.struts2.tiles.StrutsTilesListener
-
-
+
+Include the struts-tiles-plugin as a dependency in your web
application. If you are using maven2, the dependency
+configuration will be similar to:
+
+
+ org.apache.struts
+ struts2-tiles-plugin
+ ${version.tiles}
+
+
+
+
+Register the Tiles listener. This listener will typically either be the
standard tiles listener org.apache.tiles.listener.TilesListener
+or the Struts2 replacement org.apache.struts2.tiles.TilesListener. The latter
provides tighter integration with
+Struts features such as freemarker integration.
+
+
+ org.apache.struts2.tiles.StrutsTilesListener
+
+
+
+
+All package definitions, which require tiles support, must either
extend the tiles-default package or must register
+the Tiles Result type definition.
-
- All package definitions, which require tiles support, must either extend
the tiles-default
package or must register
- the Tiles Result type definition.
- ```xml
-
-
-
-
-
-4. Configure your actions to utilize a tiles definition:
- ```xml
-
-tilesWorks
-
-
+
+
+
+
+
+Configure your actions to utilize a tiles definition:
-
- Instead of xml configuration you can use annotations
- @Result(name = "success", type="tiles")
- @TilesDefinition(extend = "fooLayout", putAttributes = {
- @TilesPutAttribute(name = "header", value
= "/WEB-INF/tiles/header.jsp"),
- @TilesPutAttribute(name = "body", value
= "/WEB-INF/tiles/body.ftl")
- })
- public class FooAction extends ActionSupport {
+
+ tilesWorks
+
+
+
+
+Instead of xml configuration you can use annotations
+
+@Result(name = "success", type="tiles")
+@TilesDefinition(extend = "fooLayout", putAttributes = {
+@TilesPutAttribute(name = "header", value
= "/WEB-INF/tiles/header.jsp"),
+@TilesPutAttribute(name = "body", value
= "/WEB-INF/tiles/body.ftl")
+})
+public class FooAction extends ActionSupport {
+
+
+
+You have to define Tiles Definitions in a tiles.xml file. That can be
placed in resources
or in WEB-INF.
+
+;
+
+
+
+
+
+
+
(struts-site) branch master updated (24f8a1a25 -> 89ccb8db6)
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 24f8a1a25 Merge pull request #227 from apache/WW-5352-struts-param-doc add 04c16955d Cleans up docs about Tiles new 89ccb8db6 Merge pull request #228 from apache/fix/tiles 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/tiles/index.md | 170 ++ source/plugins/tiles/tiles-use.md | 70 2 files changed, 79 insertions(+), 161 deletions(-) delete mode 100644 source/plugins/tiles/tiles-use.md
(struts-site) 01/01: Merge pull request #228 from apache/fix/tiles
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 89ccb8db6f085e9624d8dd0d5d5625df28692884 Merge: 24f8a1a25 04c16955d Author: Lukasz Lenart AuthorDate: Sat Feb 3 17:43:20 2024 +0100 Merge pull request #228 from apache/fix/tiles Cleans up docs about Tiles source/plugins/tiles/index.md | 170 ++ source/plugins/tiles/tiles-use.md | 70 2 files changed, 79 insertions(+), 161 deletions(-)
(struts-site) branch fix/tiles deleted (was 04c16955d)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch fix/tiles in repository https://gitbox.apache.org/repos/asf/struts-site.git was 04c16955d Cleans up docs about Tiles 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 3c62abca1 Automatic Site Publish by Buildbot 3c62abca1 is described below commit 3c62abca161954e2c0cf1d4d97353202904ae00d Author: buildbot AuthorDate: Sat Feb 3 16:43:51 2024 + Automatic Site Publish by Buildbot --- output/plugins/tiles/index.html | 120 - output/plugins/tiles/tiles-use.html | 257 2 files changed, 56 insertions(+), 321 deletions(-) diff --git a/output/plugins/tiles/index.html b/output/plugins/tiles/index.html index 0b3f05e38..83f1258db 100644 --- a/output/plugins/tiles/index.html +++ b/output/plugins/tiles/index.html @@ -164,8 +164,8 @@ Installation -Tiles is a templating framework designed to easily allow the creation of web application pages with a consistent look and feel. It can -be used for both page decorating and componentization. +Tiles is a templating framework designed to easily allow the creation of web application pages with a consistent +look and feel. It can be used for both page decorating and componentization. The Tiles plugin allows actions to return Tiles pages. @@ -181,101 +181,93 @@ be used for both page decorating and componentization. The following steps must be taken in order to enable tiles support within your Struts2 application: - Include the struts-tiles-plugin as a dependency in your web application. If you are using maven2, the dependency configuration will - be similar to: - + +Include the struts-tiles-plugin as a dependency in your web application. If you are using maven2, the dependency +configuration will be similar to: -+ + + + +Register the Tiles listener. This listener will typically either be the standard tiles listener org.apache.tiles.listener.TilesListener +or the Struts2 replacement org.apache.struts2.tiles.TilesListener. The latter provides tighter integration with +Struts features such as freemarker integration. - - - - Register the tiles listener. This listener will typically either be the standard tiles listener org.apache.tiles.listener.TilesListener - or the Struts2 replacement org.apache.struts2.tiles.TilesListener. The latter provides tighter integration with Struts features such - as freemarker integration. - - - org.apache.struts struts2-tiles-plugin ${version.tiles} + + + + +All package definitions, which require tiles support, must either extend the tiles-default package or must register +the Tiles Result type definition. - - - - All package definitions which require tiles support must either extend the tiles-default package or must register - the [Tiles Result] type definition. - - - org.apache.struts2.tiles.StrutsTilesListener + + + + +Configure your actions to utilize a tiles definition: - - - - Configure your actions to utilize a tiles definition: - - - + + + + +Instead of xml configuration you can use annotations - - - - Instead of xml configuration you can use annotations - - -@Result(name = "success", type="tiles") +@Result(name = "success", type="tiles") @TilesDefinition(extend = "fooLayout", putAttributes = { @TilesPutAttribute(name = "header", value = "/WEB-INF/tiles/header.jsp"), @TilesPutAttribute(name = "body", value = "/WEB-INF/tiles/body.ftl") }) public class FooAction extends ActionSupport { - - - - You have to define Tiles Definitons in a tiles.xml file. That can be placed in resources or in WEB-INF. - + + + +You have to define Tiles Definitions in a tiles.xml file. That can be placed in resources or in WEB-INF. -; - tilesWorks - + - +
(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 7d0e1689d Updates stage by Jenkins 7d0e1689d is described below commit 7d0e1689d2229851ed01ce28a6d2cf1215b4c8dd Author: jenkins AuthorDate: Sat Feb 3 16:44:11 2024 + Updates stage by Jenkins
(struts-site) 01/01: Cleans up docs about Tiles
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch fix/tiles
in repository https://gitbox.apache.org/repos/asf/struts-site.git
commit 04c16955d4e33f3d9d507fbd2c97cf7d03c4afbc
Author: Lukasz Lenart
AuthorDate: Sat Feb 3 16:13:58 2024 +0100
Cleans up docs about Tiles
---
source/plugins/tiles/index.md | 170 ++
source/plugins/tiles/tiles-use.md | 70
2 files changed, 79 insertions(+), 161 deletions(-)
diff --git a/source/plugins/tiles/index.md b/source/plugins/tiles/index.md
index 4c9ce28a0..3ecc7daa9 100644
--- a/source/plugins/tiles/index.md
+++ b/source/plugins/tiles/index.md
@@ -12,8 +12,8 @@ parent:
* Will be replaced with the ToC, excluding a header
{:toc}
-Tiles is a templating framework designed to easily allow the creation of web
application pages with a consistent look and feel. It can
-be used for both page decorating and componentization.
+Tiles is a templating framework designed to easily allow the creation of web
application pages with a consistent
+look and feel. It can be used for both page decorating and componentization.
The Tiles plugin allows actions to return Tiles pages.
@@ -26,100 +26,89 @@ The Tiles plugin allows actions to return Tiles pages.
The following steps must be taken in order to enable tiles support within your
Struts2 application:
-1. Include the struts-tiles-plugin as a dependency in your web application. If
you are using maven2, the dependency configuration will
- be similar to:
+1. Include the struts-tiles-plugin as a dependency in your web application. If
you are using maven2, the dependency
+ configuration will be similar to:
+ ```xml
+
+ org.apache.struts
+ struts2-tiles-plugin
+ ${version.tiles}
+
+ ```
-```xml
-
- org.apache.struts
- struts2-tiles-plugin
- ${version.tiles}
-
-
-```
-
-2. Register the tiles listener. This listener will typically either be the
standard tiles listener `org.apache.tiles.listener.TilesListener`
- or the Struts2 replacement `org.apache.struts2.tiles.TilesListener`. The
latter provides tighter integration with Struts features such
- as freemarker integration.
-
-
-```xml
-
- org.apache.struts2.tiles.StrutsTilesListener
-
-
-```
-
-3. All package definitions which require tiles support must either extend the
`tiles-default` package or must register
- the [Tiles Result] type definition.
+2. Register the Tiles listener. This listener will typically either be the
standard tiles listener `org.apache.tiles.listener.TilesListener`
+ or the Struts2 replacement `org.apache.struts2.tiles.TilesListener`. The
latter provides tighter integration with
+ Struts features such as freemarker integration.
+ ```xml
+
+
org.apache.struts2.tiles.StrutsTilesListener
+
+ ```
-```xml
-
-
-
+3. All package definitions, which require tiles support, must either extend
the `tiles-default` package or must register
+ the **Tiles Result** type definition.
-```
+ ```xml
+
+
+
+ ```
4. Configure your actions to utilize a tiles definition:
-
-```xml
-
- tilesWorks
-
-
-```
+ ```xml
+
+ tilesWorks
+
+ ```
5. Instead of xml configuration you can use annotations
-
-```java
-@Result(name = "success", type="tiles")
-@TilesDefinition(extend = "fooLayout", putAttributes = {
-@TilesPutAttribute(name = "header", value = "/WEB-INF/tiles/header.jsp"),
-@TilesPutAttribute(name = "body", value = "/WEB-INF/tiles/body.ftl")
-})
-public class FooAction extends ActionSupport {
-```
-
-6. You have to define Tiles Definitons in a `tiles.xml` file. That can be
placed in `resources` or in `WEB-INF`.
-
-
-```xml
-http://tiles.apache.org/dtds/tiles-config_3_0.dtd";>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-```
-
-As from Struts 2.3.28, the plugin automatically loads all Tiles definitions
matching the following pattern `tiles*.xml` - you don't have
-to specify them via
`org.apache.tiles.definition.DefinitionsFactory.DEFINITIONS_CONFIG` in
`web.xml`, but you can use this option if your
-application is going to work in restricted servlet environment e.g. Google
AppEngine. In such case, definitions will be read from
-the provided init-param.
-
-> Note: When using a Tomcat WAR versoning mechanism which uses `##` you must
specify all the tiles definition directly using
-> the `init-param`, in other case it won't be loaded. It's due to limitation
of `URL` class.
+ ```java
+ @Result(name = "success", type="tiles")
+ @TilesDefinition(extend = "fooLayout", putAttributes = {
+ @TilesPutAttribute(name = "header", value =
"/WEB-INF/tiles/header.jsp"),
+ @TilesPutAttribute(name = "body", value = "/WEB-INF/tiles/body.ftl")
+ })
+ public class FooAction extends ActionSupport {
+ ```
+
+6. You have to define Tiles Definitions in a `tiles.xml` file. That can be
placed
(struts-site) branch fix/tiles updated (f1d48dbb7 -> 04c16955d)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch fix/tiles in repository https://gitbox.apache.org/repos/asf/struts-site.git discard f1d48dbb7 Cleans up docs about Tiles new 04c16955d Cleans up docs about Tiles 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 (f1d48dbb7) \ N -- N -- N refs/heads/fix/tiles (04c16955d) 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/tiles/index.md | 112 ++ 1 file changed, 59 insertions(+), 53 deletions(-)
(struts) 01/01: WW-5390 Fixes generating assemblies during release process
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch fix/WW-5390-assembly in repository https://gitbox.apache.org/repos/asf/struts.git commit 245eb90aa847fc20e63cd5ec193a3dc8b190a983 Author: Lukasz Lenart AuthorDate: Sat Feb 3 18:09:36 2024 +0100 WW-5390 Fixes generating assemblies 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 8151e68e2..212160a4b 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 3aa4e571c..8323bc657 100644 --- a/pom.xml +++ b/pom.xml @@ -375,11 +375,9 @@ org.apache.maven.plugins maven-assembly-plugin +3.6.0 true -true -assembly/out -assembly/work
(struts) branch fix/WW-5390-assembly created (now 245eb90aa)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch fix/WW-5390-assembly in repository https://gitbox.apache.org/repos/asf/struts.git at 245eb90aa WW-5390 Fixes generating assemblies during release process This branch includes the following new commits: new 245eb90aa WW-5390 Fixes generating assemblies during release process 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.
