Skip to content

Commit

Permalink
Merge pull request #1036 from apache/feature/WW-3714-rename
Browse files Browse the repository at this point in the history 
WW-3714 Moves all classes from com.opensymphony.xwork2 into org.apache.struts2
  • Loading branch information
@lukaszlenart
lukaszlenart authored Nov 1, 2024
2 parents 08d54d2 + 32bc404 commit 99434d9
Show file tree
Hide file tree
Showing 1,454 changed files with 6,118 additions and 10,307 deletions.
6 changes: 3 additions & 3 deletions apps/rest-showcase/src/main/java/org/demo/rest/example/OrdersController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
*/
package org.demo.rest.example;

import com.opensymphony.xwork2.ModelDriven;
import com.opensymphony.xwork2.Validateable;
import com.opensymphony.xwork2.ValidationAwareSupport;
import org.apache.struts2.ModelDriven;
import org.apache.struts2.Validateable;
import org.apache.struts2.ValidationAwareSupport;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.struts2.convention.annotation.Result;
Expand Down
1 change: 0 additions & 1 deletion apps/rest-showcase/src/main/resources/log4j2.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
</Console>
</Appenders>
<Loggers>
<Logger name="com.opensymphony.xwork2" level="info"/>
<Logger name="org.apache.struts2" level="info"/>
<Logger name="org.demo.rest" level="debug"/>
<Root level="warn">
Expand Down
1 change: 0 additions & 1 deletion apps/showcase/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,6 @@
<port>8090</port>
</httpConnector>
<scan>10</scan>
<webAppSourceDirectory>${basedir}/src/main/webapp/</webAppSourceDirectory>
<webApp>
<extraClasspath>
${project.build.directory}/extraclasspath/struts2-velocity-tools-view-jakarta.jar,
Expand Down
2 changes: 1 addition & 1 deletion apps/showcase/src/main/java/org/apache/struts2/showcase/DateAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*/
package org.apache.struts2.showcase;

import com.opensymphony.xwork2.ActionSupport;
import org.apache.struts2.ActionSupport;

import java.text.DateFormat;
import java.util.Calendar;
Expand Down
2 changes: 1 addition & 1 deletion apps/showcase/src/main/java/org/apache/struts2/showcase/DynamicTreeSelectAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*/
package org.apache.struts2.showcase;

import com.opensymphony.xwork2.ActionSupport;
import org.apache.struts2.ActionSupport;
import org.apache.struts2.interceptor.parameter.StrutsParameter;
import org.apache.struts2.showcase.ajax.tree.Category;

Expand Down
2 changes: 1 addition & 1 deletion .../showcase/src/main/java/org/apache/struts2/showcase/LotsOfOptiontransferselectAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*/
package org.apache.struts2.showcase;

import com.opensymphony.xwork2.ActionSupport;
import org.apache.struts2.ActionSupport;
import org.apache.struts2.interceptor.parameter.StrutsParameter;

import java.util.ArrayList;
Expand Down
2 changes: 1 addition & 1 deletion apps/showcase/src/main/java/org/apache/struts2/showcase/LotsOfRichtexteditorAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*/
package org.apache.struts2.showcase;

import com.opensymphony.xwork2.ActionSupport;
import org.apache.struts2.ActionSupport;
import org.apache.struts2.interceptor.parameter.StrutsParameter;

/**
Expand Down
2 changes: 1 addition & 1 deletion apps/showcase/src/main/java/org/apache/struts2/showcase/MoreSelectsAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*/
package org.apache.struts2.showcase;

import com.opensymphony.xwork2.ActionSupport;
import org.apache.struts2.ActionSupport;
import org.apache.struts2.interceptor.parameter.StrutsParameter;

import java.util.ArrayList;
Expand Down
2 changes: 1 addition & 1 deletion apps/showcase/src/main/java/org/apache/struts2/showcase/ShowAjaxDynamicTreeAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*/
package org.apache.struts2.showcase;

import com.opensymphony.xwork2.ActionSupport;
import org.apache.struts2.ActionSupport;
import org.apache.struts2.interceptor.parameter.StrutsParameter;
import org.apache.struts2.showcase.ajax.tree.Category;

Expand Down
2 changes: 1 addition & 1 deletion apps/showcase/src/main/java/org/apache/struts2/showcase/ShowDynamicTreeAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*/
package org.apache.struts2.showcase;

import com.opensymphony.xwork2.ActionSupport;
import org.apache.struts2.ActionSupport;
import org.apache.struts2.showcase.ajax.tree.Category;

// START SNIPPET: treeExampleDynamicJavaShow
Expand Down
6 changes: 3 additions & 3 deletions apps/showcase/src/main/java/org/apache/struts2/showcase/UITagExample.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
*/
package org.apache.struts2.showcase;

import com.opensymphony.xwork2.ActionSupport;
import com.opensymphony.xwork2.Validateable;
import com.opensymphony.xwork2.util.ValueStack;
import org.apache.struts2.ActionSupport;
import org.apache.struts2.Validateable;
import org.apache.struts2.util.ValueStack;
import org.apache.struts2.ServletActionContext;
import org.apache.struts2.interceptor.parameter.StrutsParameter;

Expand Down
2 changes: 1 addition & 1 deletion apps/showcase/src/main/java/org/apache/struts2/showcase/action/AbstractCRUDAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*/
package org.apache.struts2.showcase.action;

import com.opensymphony.xwork2.ActionSupport;
import org.apache.struts2.ActionSupport;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.struts2.interceptor.parameter.StrutsParameter;
Expand Down
2 changes: 1 addition & 1 deletion apps/showcase/src/main/java/org/apache/struts2/showcase/action/EmployeeAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*/
package org.apache.struts2.showcase.action;

import com.opensymphony.xwork2.Preparable;
import org.apache.struts2.Preparable;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.struts2.interceptor.parameter.StrutsParameter;
Expand Down
2 changes: 1 addition & 1 deletion apps/showcase/src/main/java/org/apache/struts2/showcase/action/ExampleAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*/
package org.apache.struts2.showcase.action;

import com.opensymphony.xwork2.ActionSupport;
import org.apache.struts2.ActionSupport;

import java.util.Arrays;
import java.util.Date;
Expand Down
4 changes: 2 additions & 2 deletions apps/showcase/src/main/java/org/apache/struts2/showcase/action/JSPEvalAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
*/
package org.apache.struts2.showcase.action;

import com.opensymphony.xwork2.Action;
import com.opensymphony.xwork2.interceptor.annotations.After;
import org.apache.struts2.Action;
import org.apache.struts2.interceptor.annotations.After;
import org.apache.struts2.ServletActionContext;
import org.apache.struts2.interceptor.parameter.StrutsParameter;

Expand Down
2 changes: 1 addition & 1 deletion apps/showcase/src/main/java/org/apache/struts2/showcase/action/ParamsAnnotationAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*/
package org.apache.struts2.showcase.action;

import com.opensymphony.xwork2.ActionSupport;
import org.apache.struts2.ActionSupport;
import org.apache.struts2.interceptor.parameter.StrutsParameter;
import org.apache.struts2.showcase.model.MyDto;

Expand Down
2 changes: 1 addition & 1 deletion apps/showcase/src/main/java/org/apache/struts2/showcase/action/SkillAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*/
package org.apache.struts2.showcase.action;

import com.opensymphony.xwork2.Preparable;
import org.apache.struts2.Preparable;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.struts2.interceptor.parameter.StrutsParameter;
Expand Down
2 changes: 1 addition & 1 deletion apps/showcase/src/main/java/org/apache/struts2/showcase/actionchaining/ActionChain1.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*/
package org.apache.struts2.showcase.actionchaining;

import com.opensymphony.xwork2.ActionSupport;
import org.apache.struts2.ActionSupport;
import org.apache.struts2.interceptor.parameter.StrutsParameter;

public class ActionChain1 extends ActionSupport {
Expand Down
2 changes: 1 addition & 1 deletion apps/showcase/src/main/java/org/apache/struts2/showcase/actionchaining/ActionChain2.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*/
package org.apache.struts2.showcase.actionchaining;

import com.opensymphony.xwork2.ActionSupport;
import org.apache.struts2.ActionSupport;
import org.apache.struts2.interceptor.parameter.StrutsParameter;

public class ActionChain2 extends ActionSupport {
Expand Down
2 changes: 1 addition & 1 deletion apps/showcase/src/main/java/org/apache/struts2/showcase/actionchaining/ActionChain3.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*/
package org.apache.struts2.showcase.actionchaining;

import com.opensymphony.xwork2.ActionSupport;
import org.apache.struts2.ActionSupport;
import org.apache.struts2.interceptor.parameter.StrutsParameter;

public class ActionChain3 extends ActionSupport {
Expand Down
2 changes: 1 addition & 1 deletion apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/AjaxTestAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*/
package org.apache.struts2.showcase.ajax;

import com.opensymphony.xwork2.Action;
import org.apache.struts2.Action;
import org.apache.struts2.interceptor.parameter.StrutsParameter;

import java.io.Serializable;
Expand Down
2 changes: 1 addition & 1 deletion apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/AutocompleterExampleAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*/
package org.apache.struts2.showcase.ajax;

import com.opensymphony.xwork2.ActionSupport;
import org.apache.struts2.ActionSupport;
import org.apache.struts2.interceptor.parameter.StrutsParameter;

import java.util.ArrayList;
Expand Down
2 changes: 1 addition & 1 deletion apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/Example4ShowPanelAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*/
package org.apache.struts2.showcase.ajax;

import com.opensymphony.xwork2.ActionSupport;
import org.apache.struts2.ActionSupport;
import org.apache.struts2.interceptor.parameter.StrutsParameter;

import java.text.SimpleDateFormat;
Expand Down
2 changes: 1 addition & 1 deletion apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/Example5Action.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*/
package org.apache.struts2.showcase.ajax;

import com.opensymphony.xwork2.ActionSupport;
import org.apache.struts2.ActionSupport;
import org.apache.struts2.interceptor.parameter.StrutsParameter;

public class Example5Action extends ActionSupport {
Expand Down
2 changes: 1 addition & 1 deletion apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/tree/GetCategory.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*/
package org.apache.struts2.showcase.ajax.tree;

import com.opensymphony.xwork2.ActionSupport;
import org.apache.struts2.ActionSupport;
import org.apache.struts2.interceptor.parameter.StrutsParameter;

/**
Expand Down
2 changes: 1 addition & 1 deletion apps/showcase/src/main/java/org/apache/struts2/showcase/async/ChatRoomAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*/
package org.apache.struts2.showcase.async;

import com.opensymphony.xwork2.ActionSupport;
import org.apache.struts2.ActionSupport;
import org.apache.struts2.interceptor.parameter.StrutsParameter;

import java.util.ArrayList;
Expand Down
8 changes: 4 additions & 4 deletions ...howcase/src/main/java/org/apache/struts2/showcase/chat/ChatAuthenticationInterceptor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@
package org.apache.struts2.showcase.chat;


import com.opensymphony.xwork2.Action;
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.interceptor.AbstractInterceptor;
import org.apache.struts2.Action;
import org.apache.struts2.ActionContext;
import org.apache.struts2.ActionInvocation;
import org.apache.struts2.interceptor.AbstractInterceptor;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;

Expand Down
8 changes: 4 additions & 4 deletions apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatInterceptor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@
*/
package org.apache.struts2.showcase.chat;

import com.opensymphony.xwork2.Action;
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.interceptor.AbstractInterceptor;
import org.apache.struts2.Action;
import org.apache.struts2.ActionContext;
import org.apache.struts2.ActionInvocation;
import org.apache.struts2.interceptor.AbstractInterceptor;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;

Expand Down
2 changes: 1 addition & 1 deletion apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatLoginAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*/
package org.apache.struts2.showcase.chat;

import com.opensymphony.xwork2.ActionSupport;
import org.apache.struts2.ActionSupport;
import org.apache.struts2.action.SessionAware;
import org.apache.struts2.interceptor.parameter.StrutsParameter;

Expand Down
2 changes: 1 addition & 1 deletion apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatLogoutAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*/
package org.apache.struts2.showcase.chat;

import com.opensymphony.xwork2.ActionSupport;
import org.apache.struts2.ActionSupport;

import java.util.Map;

Expand Down
2 changes: 1 addition & 1 deletion apps/showcase/src/main/java/org/apache/struts2/showcase/chat/CrudRoomAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*/
package org.apache.struts2.showcase.chat;

import com.opensymphony.xwork2.ActionSupport;
import org.apache.struts2.ActionSupport;
import org.apache.struts2.interceptor.parameter.StrutsParameter;

public class CrudRoomAction extends ActionSupport {
Expand Down
4 changes: 2 additions & 2 deletions apps/showcase/src/main/java/org/apache/struts2/showcase/chat/DateConverter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
*/
package org.apache.struts2.showcase.chat;

import com.opensymphony.xwork2.conversion.impl.XWorkConverter;
import com.opensymphony.xwork2.inject.Inject;
import org.apache.struts2.conversion.impl.XWorkConverter;
import org.apache.struts2.inject.Inject;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.struts2.util.StrutsTypeConverter;
Expand Down
2 changes: 1 addition & 1 deletion apps/showcase/src/main/java/org/apache/struts2/showcase/chat/EnterRoomAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*/
package org.apache.struts2.showcase.chat;

import com.opensymphony.xwork2.ActionSupport;
import org.apache.struts2.ActionSupport;
import org.apache.struts2.action.SessionAware;
import org.apache.struts2.interceptor.parameter.StrutsParameter;

Expand Down
2 changes: 1 addition & 1 deletion apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ExitRoomAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*/
package org.apache.struts2.showcase.chat;

import com.opensymphony.xwork2.ActionSupport;
import org.apache.struts2.ActionSupport;
import org.apache.struts2.action.SessionAware;
import org.apache.struts2.interceptor.parameter.StrutsParameter;

Expand Down
2 changes: 1 addition & 1 deletion ...howcase/src/main/java/org/apache/struts2/showcase/chat/MessagesAvailableInRoomAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*/
package org.apache.struts2.showcase.chat;

import com.opensymphony.xwork2.ActionSupport;
import org.apache.struts2.ActionSupport;
import org.apache.struts2.interceptor.parameter.StrutsParameter;

import java.util.ArrayList;
Expand Down
2 changes: 1 addition & 1 deletion apps/showcase/src/main/java/org/apache/struts2/showcase/chat/RoomsAvailableAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*/
package org.apache.struts2.showcase.chat;

import com.opensymphony.xwork2.ActionSupport;
import org.apache.struts2.ActionSupport;

import java.util.ArrayList;
import java.util.List;
Expand Down
2 changes: 1 addition & 1 deletion apps/showcase/src/main/java/org/apache/struts2/showcase/chat/SendMessageToRoomAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*/
package org.apache.struts2.showcase.chat;

import com.opensymphony.xwork2.ActionSupport;
import org.apache.struts2.ActionSupport;
import org.apache.struts2.action.SessionAware;
import org.apache.struts2.interceptor.parameter.StrutsParameter;

Expand Down
2 changes: 1 addition & 1 deletion apps/showcase/src/main/java/org/apache/struts2/showcase/chat/UsersAvailableAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*/
package org.apache.struts2.showcase.chat;

import com.opensymphony.xwork2.ActionSupport;
import org.apache.struts2.ActionSupport;

import java.util.ArrayList;
import java.util.List;
Expand Down
2 changes: 1 addition & 1 deletion apps/showcase/src/main/java/org/apache/struts2/showcase/chat/UsersAvailableInRoomAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*/
package org.apache.struts2.showcase.chat;

import com.opensymphony.xwork2.ActionSupport;
import org.apache.struts2.ActionSupport;
import org.apache.struts2.interceptor.parameter.StrutsParameter;

import java.util.ArrayList;
Expand Down
2 changes: 1 addition & 1 deletion apps/showcase/src/main/java/org/apache/struts2/showcase/conversion/AddressAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*/
package org.apache.struts2.showcase.conversion;

import com.opensymphony.xwork2.ActionSupport;
import org.apache.struts2.ActionSupport;
import org.apache.struts2.interceptor.parameter.StrutsParameter;

import java.util.LinkedHashSet;
Expand Down
2 changes: 1 addition & 1 deletion apps/showcase/src/main/java/org/apache/struts2/showcase/conversion/OperationsEnumAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*/
package org.apache.struts2.showcase.conversion;

import com.opensymphony.xwork2.ActionSupport;
import org.apache.struts2.ActionSupport;
import org.apache.struts2.interceptor.parameter.StrutsParameter;

import java.util.Arrays;
Expand Down
2 changes: 1 addition & 1 deletion apps/showcase/src/main/java/org/apache/struts2/showcase/conversion/PersonAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*/
package org.apache.struts2.showcase.conversion;

import com.opensymphony.xwork2.ActionSupport;
import org.apache.struts2.ActionSupport;
import org.apache.struts2.interceptor.parameter.StrutsParameter;

import java.util.List;
Expand Down
Loading

0 comments on commit 99434d9

Please sign in to comment.