apache · lukaszlenart · Apr 17, 2025 · Apr 17, 2025 · Apr 17, 2025 · Apr 17, 2025
diff --git a/exclude-parameters/src/main/java/org/apache/struts/edit/action/EditAction.java b/exclude-parameters/src/main/java/org/apache/struts/edit/action/EditAction.java
@@ -10,6 +10,7 @@
 import org.apache.struts.edit.service.EditServiceInMemory;
 import org.apache.struts2.ActionSupport;
 import org.apache.struts2.Preparable;
+import org.apache.struts2.interceptor.parameter.StrutsParameter;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -61,6 +62,7 @@ public String input() throws Exception {
 		return INPUT;
 	}
 
+	@StrutsParameter(depth = 1)
 	public Person getPersonBean() {
 		return personBean;
 	}

diff --git a/exclude-parameters/src/main/resources/struts.xml b/exclude-parameters/src/main/resources/struts.xml
@@ -6,7 +6,7 @@
 <struts>
 
 	<constant name="struts.devMode" value="true" />
-
+	<constant name="struts.allowlist.packageNames" value="org.apache.struts.edit.model" />
 	<package name="basicstruts2" extends="struts-default" >
 
 	    <interceptors>
@@ -20,7 +20,7 @@
 		</interceptors>
 
 		<default-interceptor-ref name="appDefault" />
-
+		<default-action-ref name="index" />
         <!-- If no class attribute is specified the framework will assume success and
         render the result index.jsp -->
         <!-- If no name value for the result node is specified the success value is the default -->

diff --git a/exclude-parameters/src/main/webapp/WEB-INF/web.xml b/exclude-parameters/src/main/webapp/WEB-INF/web.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app id="WebApp_ID" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+<web-app id="WebApp_ID" version="6.0"
+    xmlns="https://jakarta.ee/xml/ns/jakartaee"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd">
 <display-name>Exclude Parameters</display-name>
   <welcome-file-list>
     <welcome-file>index.jsp</welcome-file>

diff --git a/form-processing/src/main/java/org/apache/struts/helloworld/action/HelloWorldAction.java b/form-processing/src/main/java/org/apache/struts/helloworld/action/HelloWorldAction.java
@@ -2,6 +2,7 @@
 
 import org.apache.struts.helloworld.model.MessageStore;
 import org.apache.struts2.ActionSupport;
+import org.apache.struts2.interceptor.parameter.StrutsParameter;
 
 /**
  * Acts as a Struts 2 controller that responds
@@ -37,6 +38,7 @@ public String getUserName() {
         return userName;
     }
 
+    @StrutsParameter
     public void setUserName(String userName) {
         this.userName = userName;
     }

diff --git a/form-processing/src/main/java/org/apache/struts/register/action/Register.java b/form-processing/src/main/java/org/apache/struts/register/action/Register.java
@@ -2,8 +2,8 @@
 
 import org.apache.struts.register.model.Person;
 import org.apache.struts2.ActionSupport;
+import org.apache.struts2.interceptor.parameter.StrutsParameter;
 
-import java.util.ArrayList;
 import java.util.List;
 
 public class Register extends ActionSupport {
@@ -17,15 +17,10 @@ public String execute2() throws Exception {
     }
 
     public String input() throws Exception {
-        this.options = new ArrayList<>();
-        this.options.add(3);
         return INPUT;
     }
 
-    public String cancel2() throws Exception {
-        return SUCCESS;
-    }
-
+    @StrutsParameter(depth = 1)
     public Person getPersonBean() {
         return personBean;
     }
@@ -34,6 +29,7 @@ public void setPersonBean(Person person) {
         personBean = person;
     }
 
+    @StrutsParameter(depth = 1)
     public List<Integer> getOptions() {
         return options;
     }

diff --git a/form-processing/src/main/resources/struts.xml b/form-processing/src/main/resources/struts.xml
@@ -6,6 +6,7 @@
     <constant name="struts.devMode" value="true" />
     <constant name="struts.enable.DynamicMethodInvocation" value="true"/>
     <constant name="struts.mapper.action.prefix.enabled" value="true"/>
+    <constant name="struts.allowlist.classes" value="org.apache.struts.helloworld.model.MessageStore"/>
 
     <package name="basicstruts" namespace="/" extends="struts-default">
         <default-action-ref name="index"/>
@@ -33,7 +34,7 @@
         <action name="register" class="org.apache.struts.register.action.Register" method="input">
             <result name="input">/WEB-INF/register.jsp</result>
         </action>
-        <action name="register-cancel" class="org.apache.struts.register.action.Register" method="cancel2">
+        <action name="register-cancel">
             <result type="redirectAction">index</result>
         </action>
         <action name="register-submit" class="org.apache.struts.register.action.Register" method="execute2">

diff --git a/form-processing/src/main/webapp/WEB-INF/index.jsp b/form-processing/src/main/webapp/WEB-INF/index.jsp
@@ -20,6 +20,6 @@
       <s:submit value="Submit" />
     </s:form>
 
-    <p><a href="register">Please register</a> for our prize drawing.</p>
+    <p><a href="<s:url action='register'/>">Please register</a> for our prize drawing.</p>
   </body>
 </html>
diff --git a/form-processing/src/main/webapp/WEB-INF/register.jsp b/form-processing/src/main/webapp/WEB-INF/register.jsp
@@ -9,7 +9,7 @@
 <body>
 <h3>Register for a prize by completing this form.</h3>
 
-<s:form action="register-submit" namespace="test">
+<s:form action="register-submit" namespace="/test">
     <s:textfield name="personBean.firstName" label="First name"/>
     <s:textfield name="personBean.lastName" label="Last name"/>
     <s:textfield name="personBean.email" label="Email"/>

diff --git a/form-processing/src/main/webapp/WEB-INF/web.xml b/form-processing/src/main/webapp/WEB-INF/web.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app id="WebApp_ID" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+<web-app id="WebApp_ID" version="6.0"
+    xmlns="https://jakarta.ee/xml/ns/jakartaee"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd">
     <display-name>Form_Processing_Struts2_Mvn</display-name>
 
     <filter>

diff --git a/form-tags/src/main/java/org/apache/struts/edit/action/EditAction.java b/form-tags/src/main/java/org/apache/struts/edit/action/EditAction.java
@@ -5,6 +5,7 @@
 import org.apache.struts.edit.service.EditService;
 import org.apache.struts.edit.service.EditServiceInMemory;
 import org.apache.struts2.ActionSupport;
+import org.apache.struts2.interceptor.parameter.StrutsParameter;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -36,6 +37,7 @@ public String input() throws Exception {
         return INPUT;
     }
 
+    @StrutsParameter(depth = 1)
     public Person getPersonBean() {
         return personBean;
     }

diff --git a/form-tags/src/main/webapp/WEB-INF/web.xml b/form-tags/src/main/webapp/WEB-INF/web.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
-         http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
-         version="3.1">
+<web-app id="WebApp_ID" version="6.0"
+    xmlns="https://jakarta.ee/xml/ns/jakartaee"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd">
 
     <display-name>Form Tags</display-name>
     <welcome-file-list>

diff --git a/form-validation/src/main/java/org/apache/struts/helloworld/action/HelloWorldAction.java b/form-validation/src/main/java/org/apache/struts/helloworld/action/HelloWorldAction.java
@@ -2,6 +2,7 @@
 
 import org.apache.struts.helloworld.model.MessageStore;
 import org.apache.struts2.ActionSupport;
+import org.apache.struts2.interceptor.parameter.StrutsParameter;
 
 /**
  * Acts as a Struts 2 controller that responds
@@ -37,6 +38,7 @@ public String getUserName() {
 		return userName;
 	}
 
+	@StrutsParameter
 	public void setUserName(String userName) {
 		this.userName = userName;
 	}

diff --git a/form-validation/src/main/java/org/apache/struts/register/action/Register.java b/form-validation/src/main/java/org/apache/struts/register/action/Register.java
@@ -2,6 +2,7 @@
 
 import org.apache.struts.register.model.Person;
 import org.apache.struts2.ActionSupport;
+import org.apache.struts2.interceptor.parameter.StrutsParameter;
 
 /**
  * Acts as a controller to handle actions
@@ -48,7 +49,7 @@ public void validate(){
 
 	}
 
-
+	@StrutsParameter(depth = 1)
 	public Person getPersonBean() {
 
 		return personBean;

diff --git a/form-validation/src/main/resources/struts.xml b/form-validation/src/main/resources/struts.xml
@@ -8,7 +8,7 @@
 	<constant name="struts.devMode" value="true" />
 
 	<package name="basicstruts2" extends="struts-default">
-
+		<default-action-ref name="index" />
         <!-- If no class attribute is specified the framework will assume success and
         render the result index.jsp -->
         <!-- If no name value for the result node is specified the success value is the default -->
@@ -22,9 +22,13 @@
 			<result name="success">/HelloWorld.jsp</result>
 		</action>
 
+		<action name="registerForm" class="org.apache.struts.register.action.Register" method="input">
+			<result name="input">/register.jsp</result>
+		</action>
+
 	  <action name="register" class="org.apache.struts.register.action.Register" method="execute">
-		<result name="success">/thankyou.jsp</result>
-		<result name="input">/register.jsp</result>
+			<result name="success">/thankyou.jsp</result>
+			<result name="input">/register.jsp</result>
 	  </action>
 
 	</package>

diff --git a/form-validation/src/main/webapp/WEB-INF/web.xml b/form-validation/src/main/webapp/WEB-INF/web.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app id="WebApp_ID" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+<web-app id="WebApp_ID" version="6.0"
+    xmlns="https://jakarta.ee/xml/ns/jakartaee"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd">
 <display-name>Form Validation</display-name>
   <welcome-file-list>
     <welcome-file>index.jsp</welcome-file>

diff --git a/form-validation/src/main/webapp/index.jsp b/form-validation/src/main/webapp/index.jsp
@@ -25,6 +25,6 @@
 
 </s:form>
 
-<p><a href="register.jsp">Please register</a> for our prize drawing.</p>
+<p><a href="<s:url action='registerForm' />">Please register</a> for our prize drawing.</p>
 </body>
 </html>
diff --git a/form-xml-validation/src/main/java/org/apache/struts/edit/action/EditAction.java b/form-xml-validation/src/main/java/org/apache/struts/edit/action/EditAction.java
@@ -5,6 +5,7 @@
 import org.apache.struts.edit.service.EditService;
 import org.apache.struts.edit.service.EditServiceInMemory;
 import org.apache.struts2.ActionSupport;
+import org.apache.struts2.interceptor.parameter.StrutsParameter;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -38,6 +39,7 @@ public String input() throws Exception {
         return INPUT;
     }
 
+    @StrutsParameter(depth = 1)
     public Person getPersonBean() {
         return personBean;
     }

diff --git a/form-xml-validation/src/main/webapp/WEB-INF/web.xml b/form-xml-validation/src/main/webapp/WEB-INF/web.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app id="WebApp_ID" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+<web-app id="WebApp_ID" version="6.0"
+    xmlns="https://jakarta.ee/xml/ns/jakartaee"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd">
   <display-name>Form XML Validation</display-name>
   <welcome-file-list>
     <welcome-file>index.jsp</welcome-file>

diff --git a/helloworld/src/main/resources/struts.xml b/helloworld/src/main/resources/struts.xml
@@ -7,6 +7,7 @@
 
     <constant name="struts.devMode" value="true"/>
     <constant name="struts.action.extension" value=","/>
+    <constant name="struts.allowlist.packageNames" value="org.apache.struts.helloworld.model"/>
 
     <package name="basicstruts2" namespace="/" extends="struts-default">
         <default-action-ref name="index"/>

diff --git a/helloworld/src/main/webapp/WEB-INF/web.xml b/helloworld/src/main/webapp/WEB-INF/web.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app id="WebApp_ID" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+<web-app id="WebApp_ID" version="6.0"
+    xmlns="https://jakarta.ee/xml/ns/jakartaee"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd">
     <display-name>Hello World Struts 2</display-name>
     <welcome-file-list>
         <welcome-file>/index</welcome-file>

diff --git a/http-session/src/main/java/org/apache/struts/helloworld/action/HelloWorldAction.java b/http-session/src/main/java/org/apache/struts/helloworld/action/HelloWorldAction.java
@@ -4,6 +4,7 @@
 import org.apache.struts2.ActionSupport;
 import org.apache.struts2.action.ParameterNameAware;
 import org.apache.struts2.action.SessionAware;
+import org.apache.struts2.interceptor.parameter.StrutsParameter;
 
 import java.util.Map;
 
@@ -29,6 +30,7 @@ public String getUserName() {
         return userName;
     }
 
+    @StrutsParameter
     public void setUserName(String userName) {
         this.userName = userName;
     }

diff --git a/http-session/src/main/resources/struts.xml b/http-session/src/main/resources/struts.xml
@@ -6,6 +6,7 @@
 <struts>
 
 	<constant name="struts.devMode" value="true" />
+	<constant name="struts.allowlist.classes" value="org.apache.struts.helloworld.model.MessageStore" />
 
 	<package name="basicstruts2" extends="struts-default">
 
@@ -27,6 +28,7 @@
 
 		<default-interceptor-ref name="appDefault" />
 
+		<default-action-ref name="index" />
         <!-- If no class attribute is specified the framework will assume success and
         render the result index.jsp -->
         <!-- If no name value for the result node is specified the success value is the default -->

diff --git a/http-session/src/main/webapp/WEB-INF/web.xml b/http-session/src/main/webapp/WEB-INF/web.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app id="WebApp_ID" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+<web-app id="WebApp_ID" version="6.0"
+    xmlns="https://jakarta.ee/xml/ns/jakartaee"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd">
 <display-name>HTTP Session Struts 2</display-name>
   <welcome-file-list>
     <welcome-file>index.jsp</welcome-file>

diff --git a/interceptors/src/main/java/org/apache/struts/register/action/Register.java b/interceptors/src/main/java/org/apache/struts/register/action/Register.java
@@ -2,6 +2,7 @@
 
 import org.apache.struts.register.model.Person;
 import org.apache.struts2.ActionSupport;
+import org.apache.struts2.interceptor.parameter.StrutsParameter;
 
 /**
  * Acts as a controller to handle actions
@@ -48,7 +49,7 @@ public void validate(){
 
 	}
 
-
+	@StrutsParameter(depth = 1)
 	public Person getPersonBean() {
 
 		return personBean;

diff --git a/interceptors/src/main/resources/struts.xml b/interceptors/src/main/resources/struts.xml
@@ -9,6 +9,7 @@
 
 	<package name="basicstruts2" extends="struts-default" >
 
+		<default-action-ref name="index" />
         <!-- If no class attribute is specified the framework will assume success and
         render the result index.jsp -->
         <!-- If no name value for the result node is specified the success value is the default -->

diff --git a/interceptors/src/main/webapp/WEB-INF/web.xml b/interceptors/src/main/webapp/WEB-INF/web.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" id="WebApp_ID" version="3.0">
+<web-app id="WebApp_ID" version="6.0"
+    xmlns="https://jakarta.ee/xml/ns/jakartaee"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd">
 <display-name>Interceptors Struts 2</display-name>
   <welcome-file-list>
     <welcome-file>index.jsp</welcome-file>

diff --git a/message-resource/src/main/java/org/apache/struts/helloworld/action/HelloWorldAction.java b/message-resource/src/main/java/org/apache/struts/helloworld/action/HelloWorldAction.java
@@ -2,6 +2,7 @@
 
 import org.apache.struts.helloworld.model.MessageStore;
 import org.apache.struts2.ActionSupport;
+import org.apache.struts2.interceptor.parameter.StrutsParameter;
 
 /**
  * Acts as a Struts 2 controller that responds
@@ -37,6 +38,7 @@ public String getUserName() {
 		return userName;
 	}
 
+	@StrutsParameter  
 	public void setUserName(String userName) {
 		this.userName = userName;
 	}