Migrates to Struts 7

.github/workflows/maven.yml

@@ -19,7 +19,7 @@ on:
   pull_request:
   push:
     branches:
-      - master
+      - main
 
 permissions: write-all
 

action-chaining/src/main/java/org/apache/struts_examples/ActionA.java

@@ -19,7 +19,7 @@
 
 package org.apache.struts_examples;
 
-import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.ActionSupport;
 
 public class ActionA extends ActionSupport {
 

action-chaining/src/main/java/org/apache/struts_examples/ActionB.java

@@ -19,7 +19,7 @@
 
 package org.apache.struts_examples;
 
-import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.ActionSupport;
 
 public class ActionB extends ActionSupport {
 

annotations/src/main/java/example/actions/HelloAction.java

@@ -1,8 +1,9 @@
 package example.actions;
 
-import com.opensymphony.xwork2.ActionSupport;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.apache.struts2.ActionSupport;
+
 /**
  * Acts as a controller to handle actions
  * related to registering a user.

annotations/src/main/java/example/actions/RegisterAction.java

@@ -1,9 +1,9 @@
 package example.actions;
 
-import com.opensymphony.xwork2.ActionSupport;
 import example.model.Person;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.apache.struts2.ActionSupport;
 import org.apache.struts2.convention.annotation.Action;
 
 /**

annotations/src/main/resources/log4j2.xml

@@ -6,7 +6,6 @@
         </Console>
     </Appenders>
     <Loggers>
-        <Logger name="com.opensymphony.xwork2" level="info"/>
         <Logger name="org.apache.struts2" level="info"/>
         <Logger name="org.apache.struts2.convention" level="debug"/>
         <Logger name="example" level="debug"/>

basic-struts/src/main/resources/log4j2.xml

@@ -6,7 +6,6 @@
         </Console>
     </Appenders>
     <Loggers>
-        <Logger name="com.opensymphony.xwork2" level="info"/>
         <Logger name="org.apache.struts2" level="info"/>
         <Logger name="org.apache.struts2.edit" level="debug"/>
         <Root level="warn">

bean-validation/src/main/java/org/apache/struts/edit/action/EditAction.java

@@ -1,11 +1,11 @@
 package org.apache.struts.edit.action;
 
-import com.opensymphony.xwork2.ActionSupport;
 import jakarta.validation.Valid;
 import org.apache.struts.edit.model.Person;
 import org.apache.struts.edit.model.State;
 import org.apache.struts.edit.service.EditService;
 import org.apache.struts.edit.service.EditServiceInMemory;
+import org.apache.struts2.ActionSupport;
 
 import java.util.ArrayList;
 import java.util.Arrays;

bean-validation/src/main/resources/log4j2.xml

@@ -6,7 +6,6 @@
         </Console>
     </Appenders>
     <Loggers>
-        <Logger name="com.opensymphony.xwork2" level="info"/>
         <Logger name="org.apache.struts2" level="info"/>
         <Logger name="org.apache.struts2.edit" level="debug"/>
         <Root level="warn">

blank/src/main/java/example/ExampleSupport.java

@@ -19,7 +19,7 @@
 
 package example;
 
-import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.ActionSupport;
 
 /**
  * Base Action class for the Tutorial package.

blank/src/main/resources/log4j2.xml

@@ -6,7 +6,6 @@
         </Console>
     </Appenders>
     <Loggers>
-        <Logger name="com.opensymphony.xwork2" level="info"/>
         <Logger name="org.apache.struts2" level="info"/>
         <Root level="warn">
             <AppenderRef ref="STDOUT"/>

blank/src/test/java/example/ConfigTest.java

@@ -19,12 +19,12 @@
 
 package example;
 
-import com.opensymphony.xwork2.ActionSupport;
-import com.opensymphony.xwork2.config.RuntimeConfiguration;
-import com.opensymphony.xwork2.config.entities.ActionConfig;
-import com.opensymphony.xwork2.config.entities.ResultConfig;
-import com.opensymphony.xwork2.config.providers.XmlConfigurationProvider;
+import org.apache.struts2.ActionSupport;
+import org.apache.struts2.config.RuntimeConfiguration;
 import org.apache.struts2.config.StrutsXmlConfigurationProvider;
+import org.apache.struts2.config.entities.ActionConfig;
+import org.apache.struts2.config.entities.ResultConfig;
+import org.apache.struts2.config.providers.XmlConfigurationProvider;
 import org.apache.struts2.junit.StrutsTestCase;
 
 import java.util.List;

blank/src/test/java/example/HelloWorldTest.java

@@ -18,7 +18,7 @@
  */
 package example;
 
-import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.ActionSupport;
 import org.apache.struts2.junit.StrutsTestCase;
 
 public class HelloWorldTest extends StrutsTestCase {

blank/src/test/java/example/LoginTest.java

@@ -19,8 +19,8 @@
 
 package example;
 
-import com.opensymphony.xwork2.ActionSupport;
-import com.opensymphony.xwork2.config.entities.ActionConfig;
+import org.apache.struts2.ActionSupport;
+import org.apache.struts2.config.entities.ActionConfig;
 
 import java.util.List;
 import java.util.Map;

coding-actions/src/main/java/org/apache/struts/helloworld/action/HelloWorldAction.java

@@ -1,28 +1,28 @@
 package org.apache.struts.helloworld.action;
 
-import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts.helloworld.model.MessageStore;
+import org.apache.struts2.ActionSupport;
 
 /**
  * Acts as a Struts 2 controller that responds
  * to a user action by setting the value
- * of the MessageStore model class, and returns a String 
+ * of the MessageStore model class, and returns a String
  * result.
  * @author Bruce Phillips
  *
  */
 public class HelloWorldAction extends ActionSupport {
 
     private static final long serialVersionUID = 1L;
-    
+
     /**
      * The model class that stores the message
      * to display in the view.
      */
     private MessageStore messageStore;
-    
+
     private static int helloCount = 0;
-    
+
     public int getHelloCount() {
         return helloCount;
     }
@@ -38,24 +38,22 @@ public void setUserName(String userName) {
     }
 
     /*
-     * Creates the MessageStore model object, 
-     * increase helloCount by 1 and 
+     * Creates the MessageStore model object,
+     * increase helloCount by 1 and
      * returns success.  The MessageStore model
      * object will be available to the view.
-     * (non-Javadoc)
-     * @see com.opensymphony.xwork2.ActionSupport#execute()
      */
     public String execute() throws Exception {
         messageStore = new MessageStore() ;
-        
+
         //Action included a query string parameter of userName
         //or a form field with name of userName
         if (userName != null) {
             messageStore.setMessage( messageStore.getMessage() + " " + userName);
         }
-        
+
         helloCount++;
-        
+
         return SUCCESS;
     }
 

coding-actions/src/main/resources/log4j2.xml

@@ -6,7 +6,6 @@
         </Console>
     </Appenders>
     <Loggers>
-        <Logger name="com.opensymphony.xwork2" level="info"/>
         <Logger name="org.apache.struts2" level="info"/>
         <Logger name="org.apache.struts2.helloworld" level="debug"/>
         <Root level="warn">

control-tags/src/main/java/org/apache/struts/edit/action/EditAction.java

@@ -1,10 +1,10 @@
 package org.apache.struts.edit.action;
 
-import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts.edit.model.Person;
 import org.apache.struts.edit.model.State;
 import org.apache.struts.edit.service.EditService;
 import org.apache.struts.edit.service.EditServiceInMemory;
+import org.apache.struts2.ActionSupport;
 
 import java.util.ArrayList;
 import java.util.Arrays;

control-tags/src/main/resources/log4j2.xml

@@ -6,7 +6,6 @@
         </Console>
     </Appenders>
     <Loggers>
-        <Logger name="com.opensymphony.xwork2" level="info"/>
         <Logger name="org.apache.struts2" level="info"/>
         <Logger name="org.apache.struts2.edit" level="debug"/>
         <Root level="warn">

crud/src/main/java/org/apache/struts/crud/action/PersonAction.java

@@ -1,22 +1,22 @@
 package org.apache.struts.crud.action;
 
-import com.opensymphony.xwork2.ActionSupport;
-import com.opensymphony.xwork2.Preparable;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.struts.crud.model.Country;
 import org.apache.struts.crud.model.Person;
 import org.apache.struts.crud.service.DefaultPersonService;
 import org.apache.struts.crud.service.PersonService;
+import org.apache.struts2.ActionSupport;
+import org.apache.struts2.Preparable;
 
 /**
  * Acts as a controller to handle actions related to editing a Person.
- * 
+ *
  * @author bruce phillips
  * @author antonio sánchez
  */
 public class PersonAction extends ActionSupport implements Preparable {
-    
+
     private static final Logger LOG = LogManager.getLogger(PersonAction.class.getName());
     private PersonService personService = new DefaultPersonService();
     private Person person;
@@ -32,8 +32,8 @@ public void prepare() throws Exception {
         sports = personService.getSports();
         countries = personService.getCountries();
         genders = personService.getGenders();
-        LOG.info("Prepared support data for Person entity.");        
-        
+        LOG.info("Prepared support data for Person entity.");
+
         if (person != null && person.getPersonId() != null) {
             person = personService.getPerson(person.getPersonId());
             LOG.info("Preparing actual data for Person: " + person);
@@ -48,7 +48,7 @@ public String list() {
         LOG.info("Listing persons");
         return SUCCESS;
     }
-    
+
     /**
      * Save the state of the Person object instance field.
      */
@@ -72,7 +72,7 @@ public String delete() {
         LOG.info("Deleted Person: " + person);
         return SUCCESS;
     }
-    
+
     public Person[] getPersons() {
         return persons;
     }

crud/src/main/resources/log4j2.xml

@@ -6,7 +6,6 @@
         </Console>
     </Appenders>
     <Loggers>
-        <Logger name="com.opensymphony.xwork2" level="info"/>
         <Logger name="org.apache.struts2" level="info"/>
         <Logger name="org.apache.struts.crud" level="debug"/>
         <Root level="info">

debugging-struts/src/main/java/org/apache/struts/helloworld/action/HelloWorldAction.java

@@ -1,36 +1,36 @@
 package org.apache.struts.helloworld.action;
 
-import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts.helloworld.model.MessageStore;
+import org.apache.struts2.ActionSupport;
 
 /**
  * Acts as a Struts 2 controller that responds
  * to a user action by setting the value
- * of the Message model class, and returns a String 
+ * of the Message model class, and returns a String
  * result.
  * @author Bruce Phillips
  *
  */
 public class HelloWorldAction extends ActionSupport {
 
 	private static final long serialVersionUID = 1L;
-	
+
 	/**
 	 * The model class that stores the message
 	 * to display in the view.
 	 */
 	private MessageStore messageStore;
-	
+
 	private static int helloCount = 0;
-	
+
 	public int getHelloCount() {
 		return helloCount;
 	}
 
 	public void setHelloCount(int helloCount) {
 		HelloWorldAction.helloCount = helloCount;
 	}
-	
+
 	private String userName;
 
 	public String getUserName() {
@@ -42,24 +42,22 @@ public void setUserName(String userName) {
 	}
 
 	/*
-	 * Creates the MessageStore model object, 
-	 * increase helloCount by 1 and 
+	 * Creates the MessageStore model object,
+	 * increase helloCount by 1 and
 	 * returns success.  The MessageStore model
 	 * object will be available to the view.
-	 * (non-Javadoc)
-	 * @see com.opensymphony.xwork2.ActionSupport#execute()
 	 */
 	public String execute() throws Exception {
-		
+
 		messageStore = new MessageStore() ;
-		
+
 		//Action included a query string parameter of userName
 		//or a form field with name of userName
 		if (userName != null) {
 			messageStore.setMessage( messageStore.getMessage() + " " + userName);
 		}
 		helloCount++;
-		
+
 		return SUCCESS;
 	}
 

debugging-struts/src/main/java/org/apache/struts/register/action/Register.java

@@ -1,16 +1,15 @@
 package org.apache.struts.register.action;
 
-import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts.register.exceptions.SecurityBreachException;
 import org.apache.struts.register.model.Person;
-
+import org.apache.struts2.ActionSupport;
 
 
 /**
  * Acts as a controller to handle actions related to registering a user.
- * 
+ *
  * @author bruce phillips
- * 
+ *
  */
 public class Register extends ActionSupport {
 

debugging-struts/src/main/resources/log4j2.xml

@@ -6,7 +6,6 @@
         </Console>
     </Appenders>
     <Loggers>
-        <Logger name="com.opensymphony.xwork2" level="info"/>
         <Logger name="org.apache.struts2" level="debug"/>
         <Root level="warn">
             <AppenderRef ref="STDOUT"/>