Merge pull request #207 from apache/feature/commercial-support
List of companies providing commercial support
diff --git a/source/announce-2023.md b/source/announce-2023.md
index 7ef10e5..48f8465 100644
--- a/source/announce-2023.md
+++ b/source/announce-2023.md
@@ -13,6 +13,15 @@
Skip to: <a href="announce-2022">Announcements - 2022</a>
</p>
+#### 30 October 2023 - Apache Struts 2.5.x End-Of-Life (EOL) Announcement {#a20231030}
+
+The Apache Struts Project Team would like to inform you that the Struts 2.5.x web framework will reach
+its end of life in 6 months and won't be longer officially supported.
+
+Please check the following reading to find more details.
+
+- [Apache Struts 2.5.x EOL Announcement](struts25-eol-announcement), including a detailed Q/A section
+
#### 13 September 2023 - Apache Struts version 6.3.0.1 General Availability {#a20230913-1}
The Apache Struts group is pleased to announce that Apache Struts version 6.3.0.1 is available as a "General Availability"
diff --git a/source/core-developers/accessing-application-session-request-objects.md b/source/core-developers/accessing-application-session-request-objects.md
index 774d1cf..9128720 100644
--- a/source/core-developers/accessing-application-session-request-objects.md
+++ b/source/core-developers/accessing-application-session-request-objects.md
@@ -64,13 +64,13 @@
the `#application` stack value.
The `#attr` stack value will search the `javax.servlet.jsp.PageContext` for the specified key. If the `PageContext`
-doesn't exist, it will search the request, session, and application scopes, in that order.
+doesn't exist, it will search the `request`, `session` and `application` scopes, in that order.
-**Accessing attributes in the Application, Session, Request, or Page scope from a JSP**
+**Accessing attributes in the Application, Session, Request or Page scope from a JSP**
+
+Retrieve the attribute (property), with key `myId`, from the specified scope:
```jsp
-<p>Retrieve the attribute (property), with key myId, from the specified scope:</p>
-
<s:property value="#application.myId" />
<s:property value="#session.myId" />
@@ -78,6 +78,8 @@
<s:property value="#request.myId" />
<s:property value="#attr.myId" />
-
-<p>Reminder: #attr is for Page scope attributes first, but will search the remaining scopes, in order, seeking a match.</p>
```
+
+**Note**: `#attr` is for Page scope attributes first, but will search the remaining scopes, in order, seeking a match.
+In opposite using just `#` means you want to fetch a value from the top of the [ValueStack](../tag-developers/access-to-valuestack-from-jsps)
+without searching down the stack.
diff --git a/source/index.html b/source/index.html
index aaaa6d3..04a5c63 100644
--- a/source/index.html
+++ b/source/index.html
@@ -65,11 +65,11 @@
</p>
</div>
<div class="column col-md-4">
- <h2>Apache Struts 2.3.x EOL</h2>
+ <h2>Apache Struts 2.5.x EOL</h2>
<p>
- The Apache Struts Team informs about discontinuing support for Struts 2.3.x branch, we recommend migration
+ The Apache Struts Team informs about discontinuing support for Struts 2.5.x branch, we recommend migration
to the latest version of Struts, read more in
- <a href="announce-2019#a20190912">Announcement</a>
+ <a href="announce-2023#a20231030">Announcement</a>
</p>
</div>
</div>
diff --git a/source/struts23-eol-announcement.md b/source/struts23-eol-announcement.md
index 71e4b68..54d2c6c 100644
--- a/source/struts23-eol-announcement.md
+++ b/source/struts23-eol-announcement.md
@@ -18,7 +18,8 @@
All resources will stay where they are. The documentation will still be accessible from the Apache Struts homepage, as well as the downloads
for all released Struts 2.3.x versions. All of the Struts 2.3.x source code can be found in the Apache Struts Git repository under branch
- `support-2-3`, now and in future. All released Maven artifacts will still be accessible in Maven Central.
+ [support/struts-2-3-x(https://github.com/apache/struts/tree/support/struts-2-3-x), now and in the future.
+ All released Maven artifacts will still be accessible in Maven Central.
* **Given a major security problem or a serious bug is reported for Struts 2.3.x in near future, can we expect a new release with fixes?**
diff --git a/source/struts25-eol-announcement.md b/source/struts25-eol-announcement.md
new file mode 100644
index 0000000..87a4db6
--- /dev/null
+++ b/source/struts25-eol-announcement.md
@@ -0,0 +1,51 @@
+---
+layout: default
+title: Apache Struts 2.5.x EOL Announcement
+---
+
+# Apache Struts 2.5.x End-Of-Life (EOL) Announcement
+
+**The Apache Struts Project Team would like to inform you that the Struts 2.5.x web framework will reach its
+end of life in 6 months and won't be longer officially supported.**
+
+This announcement takes place on 2023-10-30 and starting from that date we will only support Apache Struts 2.5.x
+in case of security vulnerabilities. Within those 6 months period you can expect that we do our best to keep
+Struts 2.5.x branch secure, but some of the security related changes cannot happen without architectural changes that
+can affect backward compatibility. This what happened to Struts 2.5.x, we introduced some internal changes to improve
+overall framework's security.
+
+## Questions and Answers
+
+* **With the announcement of Struts 2.5.x EOL, what happens to Struts 2.5.x resources?**
+
+ All resources will stay where they are. The documentation will still be accessible from the Apache Struts homepage,
+ as well as the downloads for all released Struts 2.5.x versions. All the Struts 2.5.x source code can be found
+ in the Apache Struts Git repository under branch [support/struts-2-5-x](https://github.com/apache/struts/tree/support/struts-2-5-x),
+ now and in the future. All released Maven artifacts will still be accessible in Maven Central.
+
+* **Given a major security problem or a serious bug is reported for Struts 2.5.x in near future, can we expect a new release with fixes?**
+
+ Yes, we will continue to support Struts 2.5.x in case of security issues for the next 6 months, after that time
+ we won't support this branch in any case.
+
+* **Is there an immediate need to eliminate Struts 2.5.x from my projects?**
+
+ As far as the Struts team is currently aware of, there is no urgent issue posing the immediate need to eliminate
+ Struts 2.5.x usage from your projects. However, you should consider migration to the latest available version
+ as we stop supporting this version in 6 months.
+
+* **We plan to start a new project based on Struts 2.5.x. Can we still do so?**
+
+ Basically yes, but we would not recommend doing so. As long as no code line is written, it is very easy to conceptually
+ select the latest version of Struts 2.
+
+* **My friends / colleagues and I would like to see Struts 2.5.x being maintained again. What can we do?**
+
+ You are free to put effort in Struts 2.5.x. There are basically one possibility: fork the existing source and support
+ it on your own.
+
+* **I'm using Apache Struts 6.x.x, what will happen with this version?**
+
+ Struts 6.x.x is still actively supported, we are working on new versions as well as we are preparing
+ a new Struts 7.x.x version. Migration from Struts 2.5.x to Struts 6.x.x will a way smoother than switching from
+ Struts 2.5.x to Struts 7.x.x.
diff --git a/source/tag-developers/access-to-valuestack-from-jsps.md b/source/tag-developers/access-to-valuestack-from-jsps.md
index d6ab899..b9b05d6 100644
--- a/source/tag-developers/access-to-valuestack-from-jsps.md
+++ b/source/tag-developers/access-to-valuestack-from-jsps.md
@@ -1,6 +1,9 @@
---
layout: default
title: Access to ValueStack from JSPs
+parent:
+ title: JSP
+ url: jsp
---
# Access to ValueStack from JSPs
diff --git a/source/tag-developers/include-tag.md b/source/tag-developers/include-tag.md
index 514231d..5f6c540 100644
--- a/source/tag-developers/include-tag.md
+++ b/source/tag-developers/include-tag.md
@@ -18,10 +18,28 @@
> through the `<s:property.../>` tag since no ValueStack will be created. You can, however, access them in a servlet
> via the HttpServletRequest object or from a JSP page via a scriptlet.
-**How To access parameters**
+### How to access parameters
-Parameters are passed as request parameters, so use the `${param.ParamName}` notation to access them. Do not use
-the **property** tag to access parameters in included files.
+Parameters are passed as request parameters, so use the `${param.paramName}` notation to access them. Do not use
+the `<s:property/>` tag to access parameters in included files.
+
+Below it's an example how you can access parameters passed into the included page:
+
+with scope:
+```
+<s:set var="innerName" scope="page">${param.paramName}</s:set>
+<s:property value="#attr.innerName"/>
+```
+
+with no scope:
+```jsp
+<s:set var="innerName">${param.paramName}</s:set>
+<s:property value="innerName"/>
+<s:property value="#attr.innerName"/>
+<s:property value="#innerName"/>
+```
+
+> **Note**: You can access such params without using JSTL, just use `${param.paramName}` notation.
## Attributes
@@ -46,7 +64,7 @@
</s:include>
```
-do an include to myJsp.jsp page with parameters `param1=value1` and `param2=value2`
+do an include to `myJsp.jsp` page with parameters `param1=value1` and `param2=value2`
**Example 3**
@@ -57,4 +75,23 @@
</s:include>
```
-do an include to myJsp.jsp page with parameters `param1=value1` and `param2=value2`
+do an include to `myJsp.jsp` page with parameters `param1=value1` and `param2=value2`
+
+**Example 4**
+
+accessing passed parameters in the included page
+
+with scope:
+```jsp
+<s:set var="param1" scope="page">${param.param1}</s:set>
+<s:property value="#attr.param1"/>
+```
+
+with no scope:
+```jsp
+<s:set var="param2">${param.param2}</s:set>
+<s:property value="param2"/>
+
+<s:property value="#attr.param2"/>
+<s:property value="#param2"/>
+```
