Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-05 14:47:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

WW-3714 Moves all classes from com.opensymphony.xwork2 into org.apache.struts2

Browse Source
This commit is contained in:
Kusal Kithul-Godage
2024-10-16 14:00:34 +11:00
parent 08d54d2b66
commit 32bc4045ba
1454 changed files with 6073 additions and 10262 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/velocity/src/main/java/org/apache/struts2/views/velocity/StrutsResourceLoader.java
+1 -1
View File
@@ -18,7 +18,7 @@
*/
package org.apache.struts2.views.velocity;
import com.opensymphony.xwork2.util.ClassLoaderUtil;
import org.apache.struts2.util.ClassLoaderUtil;
import org.apache.velocity.exception.ResourceNotFoundException;
import org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader;
plugins/velocity/src/main/java/org/apache/struts2/views/velocity/StrutsVelocityContext.java
+1 -1
View File
@@ -18,7 +18,7 @@
*/
package org.apache.struts2.views.velocity;
import com.opensymphony.xwork2.util.ValueStack;
import org.apache.struts2.util.ValueStack;
import org.apache.struts2.util.ValueStackProvider;
import org.apache.velocity.VelocityContext;
plugins/velocity/src/main/java/org/apache/struts2/views/velocity/StrutsVelocityManager.java
+4 -4
View File
@@ -18,10 +18,10 @@
*/
package org.apache.struts2.views.velocity;
import com.opensymphony.xwork2.ObjectFactory;
import com.opensymphony.xwork2.inject.Container;
import com.opensymphony.xwork2.inject.Inject;
import com.opensymphony.xwork2.util.ValueStack;
import org.apache.struts2.ObjectFactory;
import org.apache.struts2.inject.Container;
import org.apache.struts2.inject.Inject;
import org.apache.struts2.util.ValueStack;
import jakarta.servlet.ServletContext;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
plugins/velocity/src/main/java/org/apache/struts2/views/velocity/VelocityBeanSelectionProvider.java
+3 -3
View File
@@ -18,9 +18,9 @@
*/
package org.apache.struts2.views.velocity;
import com.opensymphony.xwork2.config.ConfigurationException;
import com.opensymphony.xwork2.inject.ContainerBuilder;
import com.opensymphony.xwork2.util.location.LocatableProperties;
import org.apache.struts2.config.ConfigurationException;
import org.apache.struts2.inject.ContainerBuilder;
import org.apache.struts2.util.location.LocatableProperties;
import org.apache.struts2.config.AbstractBeanSelectionProvider;
import org.apache.struts2.config.StrutsBeanSelectionProvider;
plugins/velocity/src/main/java/org/apache/struts2/views/velocity/VelocityManager.java
+1 -1
View File
@@ -18,7 +18,7 @@
*/
package org.apache.struts2.views.velocity;
import com.opensymphony.xwork2.util.ValueStack;
import org.apache.struts2.util.ValueStack;
import jakarta.servlet.ServletContext;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
plugins/velocity/src/main/java/org/apache/struts2/views/velocity/VelocityStrutsUtil.java
+1 -1
View File
@@ -18,7 +18,7 @@
*/
package org.apache.struts2.views.velocity;
import com.opensymphony.xwork2.util.ValueStack;
import org.apache.struts2.util.ValueStack;
import org.apache.struts2.util.StrutsUtil;
import org.apache.velocity.app.VelocityEngine;
import org.apache.velocity.context.Context;
plugins/velocity/src/main/java/org/apache/struts2/views/velocity/VelocityTools.java
+1 -1
View File
@@ -18,7 +18,7 @@
*/
package org.apache.struts2.views.velocity;
import com.opensymphony.xwork2.ActionContext;
import org.apache.struts2.ActionContext;
import jakarta.servlet.ServletContext;
import org.apache.velocity.app.VelocityEngine;
import org.apache.velocity.context.Context;
plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/AbstractDirective.java
+2 -2
View File
@@ -40,8 +40,8 @@ import org.apache.velocity.exception.ResourceNotFoundException;
import org.apache.velocity.runtime.directive.Directive;
import org.apache.velocity.runtime.parser.node.Node;
import com.opensymphony.xwork2.inject.Container;
import com.opensymphony.xwork2.util.ValueStack;
import org.apache.struts2.inject.Container;
import org.apache.struts2.util.ValueStack;
public abstract class AbstractDirective extends Directive {
public String getName() {
plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/ActionDirective.java
+1 -1
View File
@@ -24,7 +24,7 @@ import jakarta.servlet.http.HttpServletResponse;
import org.apache.struts2.components.ActionComponent;
import org.apache.struts2.components.Component;
import com.opensymphony.xwork2.util.ValueStack;
import org.apache.struts2.util.ValueStack;
/**
* @see ActionComponent
plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/ActionErrorDirective.java
+1 -1
View File
@@ -24,7 +24,7 @@ import jakarta.servlet.http.HttpServletResponse;
import org.apache.struts2.components.ActionError;
import org.apache.struts2.components.Component;
import com.opensymphony.xwork2.util.ValueStack;
import org.apache.struts2.util.ValueStack;
/**
* @see ActionError
plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/ActionMessageDirective.java
+1 -1
View File
@@ -24,7 +24,7 @@ import jakarta.servlet.http.HttpServletResponse;
import org.apache.struts2.components.ActionMessage;
import org.apache.struts2.components.Component;
import com.opensymphony.xwork2.util.ValueStack;
import org.apache.struts2.util.ValueStack;
/**
* @see ActionMessage
plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/AnchorDirective.java
+1 -1
View File
@@ -24,7 +24,7 @@ import jakarta.servlet.http.HttpServletResponse;
import org.apache.struts2.components.Anchor;
import org.apache.struts2.components.Component;
import com.opensymphony.xwork2.util.ValueStack;
import org.apache.struts2.util.ValueStack;
/**
* @see Anchor
plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/BeanDirective.java
+1 -1
View File
@@ -24,7 +24,7 @@ import jakarta.servlet.http.HttpServletResponse;
import org.apache.struts2.components.Bean;
import org.apache.struts2.components.Component;
import com.opensymphony.xwork2.util.ValueStack;
import org.apache.struts2.util.ValueStack;
/**
* @see Bean
plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/CheckBoxDirective.java
+1 -1
View File
@@ -24,7 +24,7 @@ import jakarta.servlet.http.HttpServletResponse;
import org.apache.struts2.components.Checkbox;
import org.apache.struts2.components.Component;
import com.opensymphony.xwork2.util.ValueStack;
import org.apache.struts2.util.ValueStack;
/**
* @see Checkbox
plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/CheckBoxListDirective.java
+1 -1
View File
@@ -24,7 +24,7 @@ import jakarta.servlet.http.HttpServletResponse;
import org.apache.struts2.components.CheckboxList;
import org.apache.struts2.components.Component;
import com.opensymphony.xwork2.util.ValueStack;
import org.apache.struts2.util.ValueStack;
/**
* @see CheckboxList
plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/ComboBoxDirective.java
+1 -1
View File
@@ -24,7 +24,7 @@ import jakarta.servlet.http.HttpServletResponse;
import org.apache.struts2.components.ComboBox;
import org.apache.struts2.components.Component;
import com.opensymphony.xwork2.util.ValueStack;
import org.apache.struts2.util.ValueStack;
/**
* @see ComboBox
plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/ComponentDirective.java
+1 -1
View File
@@ -24,7 +24,7 @@ import jakarta.servlet.http.HttpServletResponse;
import org.apache.struts2.components.Component;
import org.apache.struts2.components.GenericUIBean;
import com.opensymphony.xwork2.util.ValueStack;
import org.apache.struts2.util.ValueStack;
/**
* @see GenericUIBean
plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/DateDirective.java
+1 -1
View File
@@ -24,7 +24,7 @@ import jakarta.servlet.http.HttpServletResponse;
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Date;
import com.opensymphony.xwork2.util.ValueStack;
import org.apache.struts2.util.ValueStack;
/**
* <code>DateDirective</code>
plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/DoubleSelectDirective.java
+1 -1
View File
@@ -24,7 +24,7 @@ import jakarta.servlet.http.HttpServletResponse;
import org.apache.struts2.components.Component;
import org.apache.struts2.components.DoubleSelect;
import com.opensymphony.xwork2.util.ValueStack;
import org.apache.struts2.util.ValueStack;
/**
* @see DoubleSelect
plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/FieldErrorDirective.java
+1 -1
View File
@@ -24,7 +24,7 @@ import jakarta.servlet.http.HttpServletResponse;
import org.apache.struts2.components.Component;
import org.apache.struts2.components.FieldError;
import com.opensymphony.xwork2.util.ValueStack;
import org.apache.struts2.util.ValueStack;
/**
* @see FieldError
plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/FileDirective.java
+1 -1
View File
@@ -24,7 +24,7 @@ import jakarta.servlet.http.HttpServletResponse;
import org.apache.struts2.components.Component;
import org.apache.struts2.components.File;
import com.opensymphony.xwork2.util.ValueStack;
import org.apache.struts2.util.ValueStack;
/**
* @see File
plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/FormDirective.java
+1 -1
View File
@@ -24,7 +24,7 @@ import jakarta.servlet.http.HttpServletResponse;
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Form;
import com.opensymphony.xwork2.util.ValueStack;
import org.apache.struts2.util.ValueStack;
/**
* @see Form
plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/HeadDirective.java
+1 -1
View File
@@ -24,7 +24,7 @@ import jakarta.servlet.http.HttpServletResponse;
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Head;
import com.opensymphony.xwork2.util.ValueStack;
import org.apache.struts2.util.ValueStack;
/**
* @see Head
plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/HiddenDirective.java
+1 -1
View File
@@ -24,7 +24,7 @@ import jakarta.servlet.http.HttpServletResponse;
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Hidden;
import com.opensymphony.xwork2.util.ValueStack;
import org.apache.struts2.util.ValueStack;
/**
* @see Hidden
plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/I18nDirective.java
+1 -1
View File
@@ -24,7 +24,7 @@ import jakarta.servlet.http.HttpServletResponse;
import org.apache.struts2.components.Component;
import org.apache.struts2.components.I18n;
import com.opensymphony.xwork2.util.ValueStack;
import org.apache.struts2.util.ValueStack;
/**
* @see I18n
plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/IncludeDirective.java
+1 -1
View File
@@ -24,7 +24,7 @@ import jakarta.servlet.http.HttpServletResponse;
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Include;
import com.opensymphony.xwork2.util.ValueStack;
import org.apache.struts2.util.ValueStack;
/**
* @see Include
plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/InputTransferSelectDirective.java
+1 -1
View File
@@ -20,7 +20,7 @@ package org.apache.struts2.views.velocity.components;
import org.apache.struts2.components.Component;
import org.apache.struts2.components.InputTransferSelect;
import com.opensymphony.xwork2.util.ValueStack;
import org.apache.struts2.util.ValueStack;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/LabelDirective.java
+1 -1
View File
@@ -24,7 +24,7 @@ import jakarta.servlet.http.HttpServletResponse;
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Label;
import com.opensymphony.xwork2.util.ValueStack;
import org.apache.struts2.util.ValueStack;
/**
* @see Label
plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/OptGroupDirective.java
+1 -1
View File
@@ -24,7 +24,7 @@ import jakarta.servlet.http.HttpServletResponse;
import org.apache.struts2.components.Component;
import org.apache.struts2.components.OptGroup;
import com.opensymphony.xwork2.util.ValueStack;
import org.apache.struts2.util.ValueStack;
/**
* OptGroup velocity directive.
plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/OptionTransferSelectDirective.java
+1 -1
View File
@@ -24,7 +24,7 @@ import jakarta.servlet.http.HttpServletResponse;
import org.apache.struts2.components.Component;
import org.apache.struts2.components.OptionTransferSelect;
import com.opensymphony.xwork2.util.ValueStack;
import org.apache.struts2.util.ValueStack;
/**
* @see OptionTransferSelect
plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/ParamDirective.java
+1 -1
View File
@@ -24,7 +24,7 @@ import jakarta.servlet.http.HttpServletResponse;
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Param;
import com.opensymphony.xwork2.util.ValueStack;
import org.apache.struts2.util.ValueStack;
/**
* @see Param
plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/PasswordDirective.java
+1 -1
View File
@@ -24,7 +24,7 @@ import jakarta.servlet.http.HttpServletResponse;
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Password;
import com.opensymphony.xwork2.util.ValueStack;
import org.apache.struts2.util.ValueStack;
/**
* @see Password
plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/PropertyDirective.java
+1 -1
View File
@@ -24,7 +24,7 @@ import jakarta.servlet.http.HttpServletResponse;
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Property;
import com.opensymphony.xwork2.util.ValueStack;
import org.apache.struts2.util.ValueStack;
/**
*/
plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/PushDirective.java
+1 -1
View File
@@ -24,7 +24,7 @@ import jakarta.servlet.http.HttpServletResponse;
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Push;
import com.opensymphony.xwork2.util.ValueStack;
import org.apache.struts2.util.ValueStack;
/**
* @see Push
plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/RadioDirective.java
+1 -1
View File
@@ -24,7 +24,7 @@ import jakarta.servlet.http.HttpServletResponse;
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Radio;
import com.opensymphony.xwork2.util.ValueStack;
import org.apache.struts2.util.ValueStack;
/**
* @see Radio
plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/ResetDirective.java
+1 -1
View File
@@ -24,7 +24,7 @@ import jakarta.servlet.http.HttpServletResponse;
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Reset;
import com.opensymphony.xwork2.util.ValueStack;
import org.apache.struts2.util.ValueStack;
/**
* @see org.apache.struts2.components.Reset
plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/SelectDirective.java
+1 -1
View File
@@ -24,7 +24,7 @@ import jakarta.servlet.http.HttpServletResponse;
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Select;
import com.opensymphony.xwork2.util.ValueStack;
import org.apache.struts2.util.ValueStack;
/**
* @see Select
plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/SetDirective.java
+1 -1
View File
@@ -24,7 +24,7 @@ import jakarta.servlet.http.HttpServletResponse;
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Set;
import com.opensymphony.xwork2.util.ValueStack;
import org.apache.struts2.util.ValueStack;
/**
* @see Set
plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/SubmitDirective.java
+1 -1
View File
@@ -24,7 +24,7 @@ import jakarta.servlet.http.HttpServletResponse;
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Submit;
import com.opensymphony.xwork2.util.ValueStack;
import org.apache.struts2.util.ValueStack;
/**
* @see Submit
plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/TextAreaDirective.java
+1 -1
View File
@@ -24,7 +24,7 @@ import jakarta.servlet.http.HttpServletResponse;
import org.apache.struts2.components.Component;
import org.apache.struts2.components.TextArea;
import com.opensymphony.xwork2.util.ValueStack;
import org.apache.struts2.util.ValueStack;
/**
* @see TextArea
plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/TextDirective.java
+1 -1
View File
@@ -24,7 +24,7 @@ import jakarta.servlet.http.HttpServletResponse;
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Text;
import com.opensymphony.xwork2.util.ValueStack;
import org.apache.struts2.util.ValueStack;
/**
* @see Text
plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/TextFieldDirective.java
+1 -1
View File
@@ -24,7 +24,7 @@ import jakarta.servlet.http.HttpServletResponse;
import org.apache.struts2.components.Component;
import org.apache.struts2.components.TextField;
import com.opensymphony.xwork2.util.ValueStack;
import org.apache.struts2.util.ValueStack;
/**
* @see TextField
plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/TokenDirective.java
+1 -1
View File
@@ -24,7 +24,7 @@ import jakarta.servlet.http.HttpServletResponse;
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Token;
import com.opensymphony.xwork2.util.ValueStack;
import org.apache.struts2.util.ValueStack;
/**
* @see Token
plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/URLDirective.java
+1 -1
View File
@@ -24,7 +24,7 @@ import jakarta.servlet.http.HttpServletResponse;
import org.apache.struts2.components.Component;
import org.apache.struts2.components.URL;
import com.opensymphony.xwork2.util.ValueStack;
import org.apache.struts2.util.ValueStack;
/**
* @see URL
plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/UpDownSelectDirective.java
+1 -1
View File
@@ -24,7 +24,7 @@ import jakarta.servlet.http.HttpServletResponse;
import org.apache.struts2.components.Component;
import org.apache.struts2.components.UpDownSelect;
import com.opensymphony.xwork2.util.ValueStack;
import org.apache.struts2.util.ValueStack;
/**
* @see UpDownSelect
plugins/velocity/src/main/java/org/apache/struts2/views/velocity/result/VelocityResult.java
+4 -4
View File
@@ -18,10 +18,10 @@
*/
package org.apache.struts2.views.velocity.result;
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.inject.Inject;
import com.opensymphony.xwork2.util.ValueStack;
import org.apache.struts2.ActionContext;
import org.apache.struts2.ActionInvocation;
import org.apache.struts2.inject.Inject;
import org.apache.struts2.util.ValueStack;
import jakarta.servlet.Servlet;
import jakarta.servlet.ServletContext;
import jakarta.servlet.http.HttpServletRequest;
plugins/velocity/src/main/java/org/apache/struts2/views/velocity/template/VelocityTemplateEngine.java
+1 -1
View File
@@ -18,7 +18,7 @@
*/
package org.apache.struts2.views.velocity.template;
import com.opensymphony.xwork2.inject.Inject;
import org.apache.struts2.inject.Inject;
import jakarta.servlet.ServletContext;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
plugins/velocity/src/test/java/org/apache/struts2/views/velocity/StrutsVelocityContextTest.java
+1 -1
View File
@@ -18,7 +18,7 @@
*/
package org.apache.struts2.views.velocity;
import com.opensymphony.xwork2.util.ValueStack;
import org.apache.struts2.util.ValueStack;
import org.apache.velocity.VelocityContext;
import org.junit.Before;
import org.junit.Rule;
plugins/velocity/src/test/java/org/apache/struts2/views/velocity/StrutsVelocityManagerTest.java
+2 -2
View File
@@ -18,8 +18,8 @@
*/
package org.apache.struts2.views.velocity;
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.util.ValueStack;
import org.apache.struts2.ActionContext;
import org.apache.struts2.util.ValueStack;
import jakarta.servlet.ServletContext;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
plugins/velocity/src/test/java/org/apache/struts2/views/velocity/result/VelocityResultTest.java
+4 -4
View File
@@ -18,10 +18,10 @@
*/
package org.apache.struts2.views.velocity.result;
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.ActionProxy;
import com.opensymphony.xwork2.util.ValueStack;
import org.apache.struts2.ActionContext;
import org.apache.struts2.ActionInvocation;
import org.apache.struts2.ActionProxy;
import org.apache.struts2.util.ValueStack;
import org.apache.struts2.junit.XWorkJUnit4TestCase;
import org.apache.struts2.result.StrutsResultSupport;
import org.apache.velocity.Template;
plugins/velocity/src/test/java/org/apache/struts2/views/velocity/template/VelocityTemplateEngineTest.java
+2 -2
View File
@@ -20,8 +20,8 @@ package org.apache.struts2.views.velocity.template;
import com.mockobjects.dynamic.C;
import com.mockobjects.dynamic.Mock;
import com.opensymphony.xwork2.XWorkTestCase;
import com.opensymphony.xwork2.inject.Container;
import org.apache.struts2.XWorkTestCase;
import org.apache.struts2.inject.Container;
import org.apache.struts2.components.template.FreemarkerTemplateEngine;
import org.apache.struts2.components.template.JspTemplateEngine;
import org.apache.struts2.components.template.Template;