diff --git a/core/src/main/java/org/apache/struts2/ServletActionContext.java b/core/src/main/java/org/apache/struts2/ServletActionContext.java
index 7de75bc15..ac2152e8c 100644
--- a/core/src/main/java/org/apache/struts2/ServletActionContext.java
+++ b/core/src/main/java/org/apache/struts2/ServletActionContext.java
@@ -17,14 +17,15 @@
*/
package org.apache.struts2;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import java.util.Map;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.jsp.PageContext;
-import java.util.Map;
+
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.util.OgnlValueStack;
/**
@@ -38,6 +39,7 @@ public class ServletActionContext extends ActionContext implements StrutsStatics
public static final String STRUTS_VALUESTACK_KEY = "struts.valueStack";
+ @SuppressWarnings("unused")
private ServletActionContext(Map context) {
super(context);
}
diff --git a/core/src/main/java/org/apache/struts2/StrutsException.java b/core/src/main/java/org/apache/struts2/StrutsException.java
index 5ea450761..afa774834 100644
--- a/core/src/main/java/org/apache/struts2/StrutsException.java
+++ b/core/src/main/java/org/apache/struts2/StrutsException.java
@@ -26,6 +26,9 @@ import com.opensymphony.xwork2.util.location.Locatable;
*/
public class StrutsException extends XWorkException implements Locatable {
+ private static final long serialVersionUID = 888724366243600135L;
+
+
/**
* Constructs a StrutsException with no detail message.
*/
diff --git a/core/src/main/java/org/apache/struts2/components/ActionComponent.java b/core/src/main/java/org/apache/struts2/components/ActionComponent.java
index ac87e4780..9df4b5891 100644
--- a/core/src/main/java/org/apache/struts2/components/ActionComponent.java
+++ b/core/src/main/java/org/apache/struts2/components/ActionComponent.java
@@ -17,28 +17,29 @@
*/
package org.apache.struts2.components;
+import java.io.IOException;
+import java.io.Writer;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.jsp.PageContext;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.struts2.ServletActionContext;
import org.apache.struts2.StrutsException;
import org.apache.struts2.dispatcher.Dispatcher;
import org.apache.struts2.dispatcher.RequestMap;
import org.apache.struts2.views.jsp.TagUtils;
+
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionProxy;
import com.opensymphony.xwork2.ActionProxyFactory;
import com.opensymphony.xwork2.config.Configuration;
import com.opensymphony.xwork2.util.OgnlValueStack;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import javax.servlet.ServletContext;
-import javax.servlet.jsp.PageContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import java.io.IOException;
-import java.io.Writer;
-import java.util.HashMap;
-import java.util.Map;
/**
*
diff --git a/core/src/main/java/org/apache/struts2/components/ActionError.java b/core/src/main/java/org/apache/struts2/components/ActionError.java
index b5ac53b1c..5753e09b5 100644
--- a/core/src/main/java/org/apache/struts2/components/ActionError.java
+++ b/core/src/main/java/org/apache/struts2/components/ActionError.java
@@ -17,11 +17,11 @@
*/
package org.apache.struts2.components;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
*
*
diff --git a/core/src/main/java/org/apache/struts2/components/ActionMessage.java b/core/src/main/java/org/apache/struts2/components/ActionMessage.java
index 1be6c5ec6..40350ad4f 100644
--- a/core/src/main/java/org/apache/struts2/components/ActionMessage.java
+++ b/core/src/main/java/org/apache/struts2/components/ActionMessage.java
@@ -17,11 +17,11 @@
*/
package org.apache.struts2.components;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
*
*
diff --git a/core/src/main/java/org/apache/struts2/components/Anchor.java b/core/src/main/java/org/apache/struts2/components/Anchor.java
index 35b48e25a..6063c6ce3 100644
--- a/core/src/main/java/org/apache/struts2/components/Anchor.java
+++ b/core/src/main/java/org/apache/struts2/components/Anchor.java
@@ -17,11 +17,11 @@
*/
package org.apache.struts2.components;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
*
*
diff --git a/core/src/main/java/org/apache/struts2/components/AppendIterator.java b/core/src/main/java/org/apache/struts2/components/AppendIterator.java
index 1a03b831c..e70fdaa41 100644
--- a/core/src/main/java/org/apache/struts2/components/AppendIterator.java
+++ b/core/src/main/java/org/apache/struts2/components/AppendIterator.java
@@ -24,10 +24,10 @@ import java.util.List;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
import org.apache.struts2.components.Param.UnnamedParametric;
import org.apache.struts2.util.AppendIteratorFilter;
import org.apache.struts2.util.MakeIterator;
+
import com.opensymphony.xwork2.util.OgnlValueStack;
/**
diff --git a/core/src/main/java/org/apache/struts2/components/Bean.java b/core/src/main/java/org/apache/struts2/components/Bean.java
index 9ba8e294f..94ed687f3 100644
--- a/core/src/main/java/org/apache/struts2/components/Bean.java
+++ b/core/src/main/java/org/apache/struts2/components/Bean.java
@@ -17,14 +17,15 @@
*/
package org.apache.struts2.components;
+import java.io.Writer;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
import com.opensymphony.util.ClassLoaderUtil;
import com.opensymphony.xwork2.ObjectFactory;
import com.opensymphony.xwork2.util.OgnlUtil;
import com.opensymphony.xwork2.util.OgnlValueStack;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import java.io.Writer;
/**
*
diff --git a/core/src/main/java/org/apache/struts2/components/Checkbox.java b/core/src/main/java/org/apache/struts2/components/Checkbox.java
index 42acfb389..52816a8d0 100644
--- a/core/src/main/java/org/apache/struts2/components/Checkbox.java
+++ b/core/src/main/java/org/apache/struts2/components/Checkbox.java
@@ -17,11 +17,11 @@
*/
package org.apache.struts2.components;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
*
* Renders an HTML input element of type checkbox, populated by the specified property from the OgnlValueStack.
diff --git a/core/src/main/java/org/apache/struts2/components/CheckboxList.java b/core/src/main/java/org/apache/struts2/components/CheckboxList.java
index 42f4a737e..ba12714fa 100644
--- a/core/src/main/java/org/apache/struts2/components/CheckboxList.java
+++ b/core/src/main/java/org/apache/struts2/components/CheckboxList.java
@@ -17,11 +17,11 @@
*/
package org.apache.struts2.components;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
*
*
diff --git a/core/src/main/java/org/apache/struts2/components/ClosingUIBean.java b/core/src/main/java/org/apache/struts2/components/ClosingUIBean.java
index e6e715c33..a70fbea83 100644
--- a/core/src/main/java/org/apache/struts2/components/ClosingUIBean.java
+++ b/core/src/main/java/org/apache/struts2/components/ClosingUIBean.java
@@ -17,13 +17,15 @@
*/
package org.apache.struts2.components;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import java.io.Writer;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import java.io.Writer;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
/**
* ClosingUIBean is the standard superclass for UI components such as div etc.
diff --git a/core/src/main/java/org/apache/struts2/components/ComboBox.java b/core/src/main/java/org/apache/struts2/components/ComboBox.java
index 9324b57ba..d874b0abe 100644
--- a/core/src/main/java/org/apache/struts2/components/ComboBox.java
+++ b/core/src/main/java/org/apache/struts2/components/ComboBox.java
@@ -17,19 +17,17 @@
*/
package org.apache.struts2.components;
-import java.lang.reflect.Array;
-import java.util.Arrays;
import java.util.Collection;
import java.util.Iterator;
import java.util.Map;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.struts2.util.MakeIterator;
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
*
* The combo box is basically an HTML INPUT of type text and HTML SELECT grouped together to give you a combo box
diff --git a/core/src/main/java/org/apache/struts2/components/Component.java b/core/src/main/java/org/apache/struts2/components/Component.java
index 30f534ba3..5f37dcdb4 100644
--- a/core/src/main/java/org/apache/struts2/components/Component.java
+++ b/core/src/main/java/org/apache/struts2/components/Component.java
@@ -17,21 +17,6 @@
*/
package org.apache.struts2.components;
-import org.apache.struts2.StrutsException;
-import org.apache.struts2.util.FastByteArrayOutputStream;
-import org.apache.struts2.views.jsp.TagUtils;
-import org.apache.struts2.views.util.ContextUtil;
-import org.apache.struts2.views.util.UrlHelper;
-import org.apache.struts2.dispatcher.mapper.ActionMapping;
-import org.apache.struts2.dispatcher.mapper.ActionMapper;
-import org.apache.struts2.dispatcher.mapper.ActionMapperFactory;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-import com.opensymphony.xwork2.util.TextParseUtil;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.PrintWriter;
import java.io.Writer;
@@ -40,6 +25,21 @@ import java.util.Iterator;
import java.util.Map;
import java.util.Stack;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.struts2.StrutsException;
+import org.apache.struts2.dispatcher.mapper.ActionMapper;
+import org.apache.struts2.dispatcher.mapper.ActionMapperFactory;
+import org.apache.struts2.dispatcher.mapper.ActionMapping;
+import org.apache.struts2.util.FastByteArrayOutputStream;
+import org.apache.struts2.views.jsp.TagUtils;
+import org.apache.struts2.views.util.ContextUtil;
+import org.apache.struts2.views.util.UrlHelper;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.TextParseUtil;
+
/**
* Base class to extend for UI components.
*
@@ -47,8 +47,6 @@ import java.util.Stack;
*
*/
public class Component {
- private static final Log LOG = LogFactory.getLog(Component.class);
-
public static final String COMPONENT_STACK = "__component_stack";
protected OgnlValueStack stack;
@@ -324,7 +322,6 @@ public class Component {
* @param scheme http or https
* @param includeContext should the context path be included or not
* @param encodeResult should the url be encoded
- * @deprecated Since Struts 2.0.0
* @return the action url.
*/
protected String determineActionURL(String action, String namespace, String method,
@@ -338,25 +335,6 @@ public class Component {
return UrlHelper.buildUrl(uri, req, res, parameters, scheme, includeContext, encodeResult);
}
- /**
- * Renders an action URL by consulting the {@link org.apache.struts2.dispatcher.mapper.ActionMapper}.
- * @param action the action
- * @param namespace the namespace
- * @param req HTTP request
- * @param res HTTP response
- * @param parameters parameters
- * @param scheme http or https
- * @param includeContext should the context path be included or not
- * @param encodeResult should the url be encoded
- * @return the action url.
- */
- protected String determineActionURL(String action, String namespace,
- HttpServletRequest req, HttpServletResponse res, Map parameters, String scheme,
- boolean includeContext, boolean encodeResult) {
- return determineActionURL(action, namespace, null, req, res, parameters,
- scheme, includeContext, encodeResult);
- }
-
/**
* Determines the namespace of the current page being renderdd. Useful for Form, URL, and href generations.
* @param namespace the namespace
diff --git a/core/src/main/java/org/apache/struts2/components/Date.java b/core/src/main/java/org/apache/struts2/components/Date.java
index ce53f6e46..f6ef74b2f 100644
--- a/core/src/main/java/org/apache/struts2/components/Date.java
+++ b/core/src/main/java/org/apache/struts2/components/Date.java
@@ -17,12 +17,6 @@
*/
package org.apache.struts2.components;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.TextProvider;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
import java.io.IOException;
import java.io.Writer;
import java.text.DateFormat;
@@ -31,6 +25,13 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.TextProvider;
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
*
*
diff --git a/core/src/main/java/org/apache/struts2/components/DatePicker.java b/core/src/main/java/org/apache/struts2/components/DatePicker.java
index 925cc2e1d..5f6bd639f 100644
--- a/core/src/main/java/org/apache/struts2/components/DatePicker.java
+++ b/core/src/main/java/org/apache/struts2/components/DatePicker.java
@@ -17,11 +17,11 @@
*/
package org.apache.struts2.components;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
*
*
diff --git a/core/src/main/java/org/apache/struts2/components/Debug.java b/core/src/main/java/org/apache/struts2/components/Debug.java
index 8e1a24a19..bd9ebf98e 100644
--- a/core/src/main/java/org/apache/struts2/components/Debug.java
+++ b/core/src/main/java/org/apache/struts2/components/Debug.java
@@ -1,17 +1,19 @@
package org.apache.struts2.components;
-import com.opensymphony.xwork2.util.OgnlUtil;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-import org.apache.struts2.StrutsException;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import java.io.Writer;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.struts2.StrutsException;
+
+import com.opensymphony.xwork2.util.OgnlUtil;
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
*
* Renders an debug tag.
diff --git a/core/src/main/java/org/apache/struts2/components/Div.java b/core/src/main/java/org/apache/struts2/components/Div.java
index ee80de62c..48e3f785e 100644
--- a/core/src/main/java/org/apache/struts2/components/Div.java
+++ b/core/src/main/java/org/apache/struts2/components/Div.java
@@ -17,14 +17,14 @@
*/
package org.apache.struts2.components;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.struts2.views.util.UrlHelper;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import com.opensymphony.xwork2.util.OgnlValueStack;
/**
*
diff --git a/core/src/main/java/org/apache/struts2/components/DoubleListUIBean.java b/core/src/main/java/org/apache/struts2/components/DoubleListUIBean.java
index da19d5beb..50fc21611 100644
--- a/core/src/main/java/org/apache/struts2/components/DoubleListUIBean.java
+++ b/core/src/main/java/org/apache/struts2/components/DoubleListUIBean.java
@@ -19,11 +19,11 @@ package org.apache.struts2.components;
import java.util.Map;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* DoubleListUIBean is the standard superclass of all Struts double list handling components.
*
diff --git a/core/src/main/java/org/apache/struts2/components/DoubleSelect.java b/core/src/main/java/org/apache/struts2/components/DoubleSelect.java
index b7612318b..7fba5eb3f 100644
--- a/core/src/main/java/org/apache/struts2/components/DoubleSelect.java
+++ b/core/src/main/java/org/apache/struts2/components/DoubleSelect.java
@@ -17,11 +17,11 @@
*/
package org.apache.struts2.components;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
*
* Renders two HTML select elements with second one changing displayed values depending on selected entry of first one.
diff --git a/core/src/main/java/org/apache/struts2/components/Else.java b/core/src/main/java/org/apache/struts2/components/Else.java
index e395264e5..91589bfc5 100644
--- a/core/src/main/java/org/apache/struts2/components/Else.java
+++ b/core/src/main/java/org/apache/struts2/components/Else.java
@@ -17,11 +17,11 @@
*/
package org.apache.struts2.components;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import java.io.Writer;
import java.util.Map;
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
*
*
diff --git a/core/src/main/java/org/apache/struts2/components/ElseIf.java b/core/src/main/java/org/apache/struts2/components/ElseIf.java
index c43d896f2..ac22c4df2 100644
--- a/core/src/main/java/org/apache/struts2/components/ElseIf.java
+++ b/core/src/main/java/org/apache/struts2/components/ElseIf.java
@@ -17,10 +17,10 @@
*/
package org.apache.struts2.components;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import java.io.Writer;
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
*
*
diff --git a/core/src/main/java/org/apache/struts2/components/FieldError.java b/core/src/main/java/org/apache/struts2/components/FieldError.java
index 56df3ec65..c7bce142e 100644
--- a/core/src/main/java/org/apache/struts2/components/FieldError.java
+++ b/core/src/main/java/org/apache/struts2/components/FieldError.java
@@ -17,13 +17,15 @@
*/
package org.apache.struts2.components;
-import org.apache.struts2.components.Param.UnnamedParametric;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import java.util.ArrayList;
+import java.util.List;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.List;
+
+import org.apache.struts2.components.Param.UnnamedParametric;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
/**
*
diff --git a/core/src/main/java/org/apache/struts2/components/File.java b/core/src/main/java/org/apache/struts2/components/File.java
index 432f1acab..3f4537d42 100644
--- a/core/src/main/java/org/apache/struts2/components/File.java
+++ b/core/src/main/java/org/apache/struts2/components/File.java
@@ -17,14 +17,14 @@
*/
package org.apache.struts2.components;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
*
* Renders an HTML file input element.
diff --git a/core/src/main/java/org/apache/struts2/components/Form.java b/core/src/main/java/org/apache/struts2/components/Form.java
index f83e88743..e80ad19b1 100644
--- a/core/src/main/java/org/apache/struts2/components/Form.java
+++ b/core/src/main/java/org/apache/struts2/components/Form.java
@@ -17,6 +17,25 @@
*/
package org.apache.struts2.components;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.struts2.StrutsConstants;
+import org.apache.struts2.config.Settings;
+import org.apache.struts2.dispatcher.Dispatcher;
+import org.apache.struts2.dispatcher.mapper.ActionMapperFactory;
+import org.apache.struts2.dispatcher.mapper.ActionMapping;
+import org.apache.struts2.portlet.context.PortletActionContext;
+import org.apache.struts2.portlet.util.PortletUrlHelper;
+import org.apache.struts2.views.util.UrlHelper;
+
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.ObjectFactory;
@@ -30,20 +49,6 @@ import com.opensymphony.xwork2.validator.ActionValidatorManagerFactory;
import com.opensymphony.xwork2.validator.FieldValidator;
import com.opensymphony.xwork2.validator.ValidationInterceptor;
import com.opensymphony.xwork2.validator.Validator;
-import org.apache.commons.lang.StringUtils;
-import org.apache.struts2.StrutsConstants;
-import org.apache.struts2.config.Settings;
-import org.apache.struts2.dispatcher.Dispatcher;
-import org.apache.struts2.dispatcher.mapper.ActionMapperFactory;
-import org.apache.struts2.dispatcher.mapper.ActionMapping;
-import org.apache.struts2.portlet.context.PortletActionContext;
-import org.apache.struts2.portlet.util.PortletUrlHelper;
-import org.apache.struts2.views.util.UrlHelper;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.*;
-import java.util.Set;
/**
*
diff --git a/core/src/main/java/org/apache/struts2/components/FormButton.java b/core/src/main/java/org/apache/struts2/components/FormButton.java
index d0d0df9ed..75e78ad74 100644
--- a/core/src/main/java/org/apache/struts2/components/FormButton.java
+++ b/core/src/main/java/org/apache/struts2/components/FormButton.java
@@ -17,11 +17,11 @@
*/
package org.apache.struts2.components;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* FormButton.
*/
diff --git a/core/src/main/java/org/apache/struts2/components/GenericUIBean.java b/core/src/main/java/org/apache/struts2/components/GenericUIBean.java
index 27fbe8d74..1fc37ae75 100644
--- a/core/src/main/java/org/apache/struts2/components/GenericUIBean.java
+++ b/core/src/main/java/org/apache/struts2/components/GenericUIBean.java
@@ -17,12 +17,13 @@
*/
package org.apache.struts2.components;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-import org.apache.struts2.util.ContainUtil;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.util.ContainUtil;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
*
*
diff --git a/core/src/main/java/org/apache/struts2/components/Head.java b/core/src/main/java/org/apache/struts2/components/Head.java
index b68f28737..7d73a5888 100644
--- a/core/src/main/java/org/apache/struts2/components/Head.java
+++ b/core/src/main/java/org/apache/struts2/components/Head.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.components;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-import org.apache.struts2.config.Settings;
-import org.apache.struts2.StrutsConstants;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.StrutsConstants;
+import org.apache.struts2.config.Settings;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
*
*
diff --git a/core/src/main/java/org/apache/struts2/components/Hidden.java b/core/src/main/java/org/apache/struts2/components/Hidden.java
index b51596a89..08b4b19d6 100644
--- a/core/src/main/java/org/apache/struts2/components/Hidden.java
+++ b/core/src/main/java/org/apache/struts2/components/Hidden.java
@@ -17,11 +17,11 @@
*/
package org.apache.struts2.components;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
*
* Renders an HTML input element of type hidden, populated by the specified property from the OgnlValueStack.
diff --git a/core/src/main/java/org/apache/struts2/components/I18n.java b/core/src/main/java/org/apache/struts2/components/I18n.java
index 0a6147515..ff6877243 100644
--- a/core/src/main/java/org/apache/struts2/components/I18n.java
+++ b/core/src/main/java/org/apache/struts2/components/I18n.java
@@ -17,18 +17,17 @@
*/
package org.apache.struts2.components;
+import java.io.Writer;
+import java.util.Locale;
+import java.util.ResourceBundle;
+
+import org.apache.struts2.StrutsException;
+
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.LocaleProvider;
import com.opensymphony.xwork2.TextProviderSupport;
import com.opensymphony.xwork2.util.LocalizedTextUtil;
import com.opensymphony.xwork2.util.OgnlValueStack;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.struts2.StrutsException;
-
-import java.io.Writer;
-import java.util.Locale;
-import java.util.ResourceBundle;
/**
*
@@ -78,8 +77,6 @@ import java.util.ResourceBundle;
* description="Get a resource bundle and place it on the value stack"
*/
public class I18n extends Component {
- private static final Log LOG = LogFactory.getLog(I18n.class);
-
protected boolean pushed;
protected String name;
diff --git a/core/src/main/java/org/apache/struts2/components/If.java b/core/src/main/java/org/apache/struts2/components/If.java
index 8b16f974f..1ee051b7f 100644
--- a/core/src/main/java/org/apache/struts2/components/If.java
+++ b/core/src/main/java/org/apache/struts2/components/If.java
@@ -17,10 +17,10 @@
*/
package org.apache.struts2.components;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import java.io.Writer;
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
*
*
diff --git a/core/src/main/java/org/apache/struts2/components/Include.java b/core/src/main/java/org/apache/struts2/components/Include.java
index 8a08eee0b..847f0aa03 100644
--- a/core/src/main/java/org/apache/struts2/components/Include.java
+++ b/core/src/main/java/org/apache/struts2/components/Include.java
@@ -17,14 +17,17 @@
*/
package org.apache.struts2.components;
-import org.apache.struts2.config.Settings;
-import org.apache.struts2.util.FastByteArrayOutputStream;
-import org.apache.struts2.RequestUtils;
-import org.apache.struts2.StrutsConstants;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
+import java.io.Writer;
+import java.net.URLEncoder;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Stack;
+import java.util.StringTokenizer;
import javax.servlet.RequestDispatcher;
import javax.servlet.ServletException;
@@ -33,12 +36,15 @@ import javax.servlet.ServletRequest;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpServletResponseWrapper;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
-import java.io.Writer;
-import java.net.URLEncoder;
-import java.util.*;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.struts2.RequestUtils;
+import org.apache.struts2.StrutsConstants;
+import org.apache.struts2.config.Settings;
+import org.apache.struts2.util.FastByteArrayOutputStream;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
/**
*
diff --git a/core/src/main/java/org/apache/struts2/components/IteratorComponent.java b/core/src/main/java/org/apache/struts2/components/IteratorComponent.java
index a240dc027..109677060 100644
--- a/core/src/main/java/org/apache/struts2/components/IteratorComponent.java
+++ b/core/src/main/java/org/apache/struts2/components/IteratorComponent.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.components;
-import org.apache.struts2.util.MakeIterator;
-import org.apache.struts2.views.jsp.IteratorStatus;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import java.io.Writer;
import java.util.Iterator;
+import org.apache.struts2.util.MakeIterator;
+import org.apache.struts2.views.jsp.IteratorStatus;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
*
*
diff --git a/core/src/main/java/org/apache/struts2/components/Label.java b/core/src/main/java/org/apache/struts2/components/Label.java
index 3e3563f0c..06ec79d8b 100644
--- a/core/src/main/java/org/apache/struts2/components/Label.java
+++ b/core/src/main/java/org/apache/struts2/components/Label.java
@@ -17,11 +17,11 @@
*/
package org.apache.struts2.components;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
*
* Renders an HTML LABEL that will allow you to output label:name combination that has the same format treatment as
diff --git a/core/src/main/java/org/apache/struts2/components/ListUIBean.java b/core/src/main/java/org/apache/struts2/components/ListUIBean.java
index cd9d53adb..03058172d 100644
--- a/core/src/main/java/org/apache/struts2/components/ListUIBean.java
+++ b/core/src/main/java/org/apache/struts2/components/ListUIBean.java
@@ -17,16 +17,18 @@
*/
package org.apache.struts2.components;
-import org.apache.struts2.util.ContainUtil;
-import org.apache.struts2.util.MakeIterator;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import java.lang.reflect.Array;
import java.util.Collection;
import java.util.Map;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.struts2.util.ContainUtil;
+import org.apache.struts2.util.MakeIterator;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* DoubleListUIBean is the standard superclass of all Struts list handling components.
*
diff --git a/core/src/main/java/org/apache/struts2/components/MergeIterator.java b/core/src/main/java/org/apache/struts2/components/MergeIterator.java
index be6e77b94..7eb799b88 100644
--- a/core/src/main/java/org/apache/struts2/components/MergeIterator.java
+++ b/core/src/main/java/org/apache/struts2/components/MergeIterator.java
@@ -24,10 +24,10 @@ import java.util.List;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
import org.apache.struts2.components.Param.UnnamedParametric;
import org.apache.struts2.util.MakeIterator;
import org.apache.struts2.util.MergeIteratorFilter;
+
import com.opensymphony.xwork2.util.OgnlValueStack;
/**
diff --git a/core/src/main/java/org/apache/struts2/components/Panel.java b/core/src/main/java/org/apache/struts2/components/Panel.java
index 8b7a89f15..81f992e91 100644
--- a/core/src/main/java/org/apache/struts2/components/Panel.java
+++ b/core/src/main/java/org/apache/struts2/components/Panel.java
@@ -17,11 +17,12 @@
*/
package org.apache.struts2.components;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import java.io.Writer;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import java.io.Writer;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
/**
*
diff --git a/core/src/main/java/org/apache/struts2/components/Param.java b/core/src/main/java/org/apache/struts2/components/Param.java
index 9da9f7633..679a89187 100644
--- a/core/src/main/java/org/apache/struts2/components/Param.java
+++ b/core/src/main/java/org/apache/struts2/components/Param.java
@@ -17,12 +17,12 @@
*/
package org.apache.struts2.components;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import java.io.Writer;
import org.apache.struts2.StrutsException;
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
*
* This tag can be used to parameterize other tags.
diff --git a/core/src/main/java/org/apache/struts2/components/Password.java b/core/src/main/java/org/apache/struts2/components/Password.java
index 6d77f3986..52ec2675b 100644
--- a/core/src/main/java/org/apache/struts2/components/Password.java
+++ b/core/src/main/java/org/apache/struts2/components/Password.java
@@ -17,11 +17,11 @@
*/
package org.apache.struts2.components;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
*
* Render an HTML input tag of type password.
diff --git a/core/src/main/java/org/apache/struts2/components/Property.java b/core/src/main/java/org/apache/struts2/components/Property.java
index 3c5380f11..8bc39ece9 100644
--- a/core/src/main/java/org/apache/struts2/components/Property.java
+++ b/core/src/main/java/org/apache/struts2/components/Property.java
@@ -17,15 +17,15 @@
*/
package org.apache.struts2.components;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-import com.opensymphony.util.TextUtils;
-
-import java.io.Writer;
import java.io.IOException;
+import java.io.Writer;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import com.opensymphony.util.TextUtils;
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
*
*
diff --git a/core/src/main/java/org/apache/struts2/components/Push.java b/core/src/main/java/org/apache/struts2/components/Push.java
index 5146f0bf8..620846f05 100644
--- a/core/src/main/java/org/apache/struts2/components/Push.java
+++ b/core/src/main/java/org/apache/struts2/components/Push.java
@@ -17,10 +17,10 @@
*/
package org.apache.struts2.components;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import java.io.Writer;
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
*
* Push value on stack for simplified usage.
diff --git a/core/src/main/java/org/apache/struts2/components/Radio.java b/core/src/main/java/org/apache/struts2/components/Radio.java
index 45252b5a3..b982402e7 100644
--- a/core/src/main/java/org/apache/struts2/components/Radio.java
+++ b/core/src/main/java/org/apache/struts2/components/Radio.java
@@ -17,11 +17,11 @@
*/
package org.apache.struts2.components;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
*
* Render a radio button input field.
diff --git a/core/src/main/java/org/apache/struts2/components/RemoteCallUIBean.java b/core/src/main/java/org/apache/struts2/components/RemoteCallUIBean.java
index efe9457ce..25e5bf788 100644
--- a/core/src/main/java/org/apache/struts2/components/RemoteCallUIBean.java
+++ b/core/src/main/java/org/apache/struts2/components/RemoteCallUIBean.java
@@ -17,11 +17,11 @@
*/
package org.apache.struts2.components;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* RemoteCallUIBean is superclass for all components dealing with remote calls.
*
diff --git a/core/src/main/java/org/apache/struts2/components/Reset.java b/core/src/main/java/org/apache/struts2/components/Reset.java
index 3feaf62f2..edd125a45 100644
--- a/core/src/main/java/org/apache/struts2/components/Reset.java
+++ b/core/src/main/java/org/apache/struts2/components/Reset.java
@@ -17,11 +17,11 @@
*/
package org.apache.struts2.components;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
*
* Render a reset button. The reset tag is used together with the form tag to provide form resetting.
diff --git a/core/src/main/java/org/apache/struts2/components/Select.java b/core/src/main/java/org/apache/struts2/components/Select.java
index eff232c38..1a058f145 100644
--- a/core/src/main/java/org/apache/struts2/components/Select.java
+++ b/core/src/main/java/org/apache/struts2/components/Select.java
@@ -17,11 +17,11 @@
*/
package org.apache.struts2.components;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
*
*
diff --git a/core/src/main/java/org/apache/struts2/components/Set.java b/core/src/main/java/org/apache/struts2/components/Set.java
index ed5ce6bf6..3f6c7e7df 100644
--- a/core/src/main/java/org/apache/struts2/components/Set.java
+++ b/core/src/main/java/org/apache/struts2/components/Set.java
@@ -17,10 +17,10 @@
*/
package org.apache.struts2.components;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import java.io.Writer;
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
*
* The set tag assigns a value to a variable in a specified scope. It is useful when you wish to assign a variable to a
diff --git a/core/src/main/java/org/apache/struts2/components/Submit.java b/core/src/main/java/org/apache/struts2/components/Submit.java
index 273b86184..da121e602 100644
--- a/core/src/main/java/org/apache/struts2/components/Submit.java
+++ b/core/src/main/java/org/apache/struts2/components/Submit.java
@@ -17,11 +17,11 @@
*/
package org.apache.struts2.components;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
*
* Render a submit button. The submit tag is used together with the form tag to provide asynchronous form submissions.
diff --git a/core/src/main/java/org/apache/struts2/components/TabbedPanel.java b/core/src/main/java/org/apache/struts2/components/TabbedPanel.java
index 583429618..3787a8fcb 100644
--- a/core/src/main/java/org/apache/struts2/components/TabbedPanel.java
+++ b/core/src/main/java/org/apache/struts2/components/TabbedPanel.java
@@ -17,12 +17,13 @@
*/
package org.apache.struts2.components;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import java.util.ArrayList;
+import java.util.List;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.List;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
/**
*
diff --git a/core/src/main/java/org/apache/struts2/components/TextArea.java b/core/src/main/java/org/apache/struts2/components/TextArea.java
index 3c4e996e6..6e2840535 100644
--- a/core/src/main/java/org/apache/struts2/components/TextArea.java
+++ b/core/src/main/java/org/apache/struts2/components/TextArea.java
@@ -17,11 +17,11 @@
*/
package org.apache.struts2.components;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
*
* Render HTML textarea tag.
diff --git a/core/src/main/java/org/apache/struts2/components/TextField.java b/core/src/main/java/org/apache/struts2/components/TextField.java
index c195380ce..4e3248dbd 100644
--- a/core/src/main/java/org/apache/struts2/components/TextField.java
+++ b/core/src/main/java/org/apache/struts2/components/TextField.java
@@ -17,11 +17,11 @@
*/
package org.apache.struts2.components;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
*
* Render an HTML input field of type text
diff --git a/core/src/main/java/org/apache/struts2/components/Token.java b/core/src/main/java/org/apache/struts2/components/Token.java
index df133703e..50a921862 100644
--- a/core/src/main/java/org/apache/struts2/components/Token.java
+++ b/core/src/main/java/org/apache/struts2/components/Token.java
@@ -17,12 +17,14 @@
*/
package org.apache.struts2.components;
-import org.apache.struts2.util.TokenHelper;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import java.util.Map;
+
+import org.apache.struts2.util.TokenHelper;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
/**
*
diff --git a/core/src/main/java/org/apache/struts2/components/Tree.java b/core/src/main/java/org/apache/struts2/components/Tree.java
index abf5659f7..44353e69a 100644
--- a/core/src/main/java/org/apache/struts2/components/Tree.java
+++ b/core/src/main/java/org/apache/struts2/components/Tree.java
@@ -17,11 +17,12 @@
*/
package org.apache.struts2.components;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import java.io.Writer;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import java.io.Writer;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
/**
*
diff --git a/core/src/main/java/org/apache/struts2/components/TreeNode.java b/core/src/main/java/org/apache/struts2/components/TreeNode.java
index c2e4ce97a..b4109b64e 100644
--- a/core/src/main/java/org/apache/struts2/components/TreeNode.java
+++ b/core/src/main/java/org/apache/struts2/components/TreeNode.java
@@ -17,11 +17,11 @@
*/
package org.apache.struts2.components;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
*
*
diff --git a/core/src/main/java/org/apache/struts2/components/UIBean.java b/core/src/main/java/org/apache/struts2/components/UIBean.java
index 9a7ae46c3..365f2f4fe 100644
--- a/core/src/main/java/org/apache/struts2/components/UIBean.java
+++ b/core/src/main/java/org/apache/struts2/components/UIBean.java
@@ -17,6 +17,17 @@
*/
package org.apache.struts2.components;
+import java.io.Writer;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.struts2.StrutsConstants;
import org.apache.struts2.components.template.Template;
import org.apache.struts2.components.template.TemplateEngine;
@@ -24,18 +35,9 @@ import org.apache.struts2.components.template.TemplateEngineManager;
import org.apache.struts2.components.template.TemplateRenderingContext;
import org.apache.struts2.config.Settings;
import org.apache.struts2.views.util.ContextUtil;
+
import com.opensymphony.xwork2.config.ConfigurationException;
import com.opensymphony.xwork2.util.OgnlValueStack;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.Writer;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
/**
* UIBean is the standard superclass of all Struts UI componentns.
diff --git a/core/src/main/java/org/apache/struts2/components/URL.java b/core/src/main/java/org/apache/struts2/components/URL.java
index 2454bbc69..224c6ef7b 100644
--- a/core/src/main/java/org/apache/struts2/components/URL.java
+++ b/core/src/main/java/org/apache/struts2/components/URL.java
@@ -17,20 +17,6 @@
*/
package org.apache.struts2.components;
-import org.apache.struts2.StrutsException;
-import org.apache.struts2.portlet.context.PortletActionContext;
-import org.apache.struts2.portlet.util.PortletUrlHelper;
-import org.apache.struts2.views.util.UrlHelper;
-import org.apache.struts2.dispatcher.Dispatcher;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-import com.opensymphony.xwork2.util.XWorkContinuationConfig;
-import com.opensymphony.xwork2.ActionContext;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpUtils;
import java.io.IOException;
import java.io.Writer;
import java.util.Collections;
@@ -38,6 +24,21 @@ import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.Map;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.struts2.StrutsException;
+import org.apache.struts2.dispatcher.Dispatcher;
+import org.apache.struts2.portlet.context.PortletActionContext;
+import org.apache.struts2.portlet.util.PortletUrlHelper;
+import org.apache.struts2.views.util.UrlHelper;
+
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.XWorkContinuationConfig;
+
/**
*
*
@@ -295,7 +296,6 @@ public class URL extends Component {
/**
* The method of action to use
* @s.tagattribute required="false"
- * @deprecated Since Struts 2.0.0
*/
public void setMethod(String method) {
this.method = method;
diff --git a/core/src/main/java/org/apache/struts2/components/table/AbstractFilterModel.java b/core/src/main/java/org/apache/struts2/components/table/AbstractFilterModel.java
index 5c097827e..e0fc5cbc9 100644
--- a/core/src/main/java/org/apache/struts2/components/table/AbstractFilterModel.java
+++ b/core/src/main/java/org/apache/struts2/components/table/AbstractFilterModel.java
@@ -17,10 +17,11 @@
*/
package org.apache.struts2.components.table;
+import java.util.Vector;
+
import javax.swing.table.AbstractTableModel;
import javax.swing.table.DefaultTableModel;
import javax.swing.table.TableModel;
-import java.util.Vector;
/**
diff --git a/core/src/main/java/org/apache/struts2/components/table/SortFilterModel.java b/core/src/main/java/org/apache/struts2/components/table/SortFilterModel.java
index be82b2f0b..235d43cb7 100644
--- a/core/src/main/java/org/apache/struts2/components/table/SortFilterModel.java
+++ b/core/src/main/java/org/apache/struts2/components/table/SortFilterModel.java
@@ -17,15 +17,16 @@
*/
package org.apache.struts2.components.table;
-import javax.swing.*;
-import javax.swing.event.TableModelEvent;
-import javax.swing.event.TableModelListener;
-import javax.swing.table.TableModel;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.util.ArrayList;
import java.util.Collections;
+import javax.swing.JTable;
+import javax.swing.event.TableModelEvent;
+import javax.swing.event.TableModelListener;
+import javax.swing.table.TableModel;
+
/**
*/
diff --git a/core/src/main/java/org/apache/struts2/components/table/WebTable.java b/core/src/main/java/org/apache/struts2/components/table/WebTable.java
index d22cc78a1..4b8778e87 100644
--- a/core/src/main/java/org/apache/struts2/components/table/WebTable.java
+++ b/core/src/main/java/org/apache/struts2/components/table/WebTable.java
@@ -17,21 +17,23 @@
*/
package org.apache.struts2.components.table;
-import org.apache.struts2.StrutsException;
-import org.apache.struts2.components.GenericUIBean;
-import org.apache.struts2.components.table.renderer.CellRenderer;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.swing.table.TableModel;
import java.io.Writer;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.NoSuchElementException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.swing.table.TableModel;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.struts2.StrutsException;
+import org.apache.struts2.components.GenericUIBean;
+import org.apache.struts2.components.table.renderer.CellRenderer;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @s.tag name="table" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.ui.table.WebTableTag"
* description="Instantiate a JavaBean and place it in the context."
diff --git a/core/src/main/java/org/apache/struts2/components/table/renderer/DateCellRenderer.java b/core/src/main/java/org/apache/struts2/components/table/renderer/DateCellRenderer.java
index ab80655bb..ee7d3ca0e 100644
--- a/core/src/main/java/org/apache/struts2/components/table/renderer/DateCellRenderer.java
+++ b/core/src/main/java/org/apache/struts2/components/table/renderer/DateCellRenderer.java
@@ -17,10 +17,10 @@
*/
package org.apache.struts2.components.table.renderer;
-import org.apache.struts2.components.table.WebTable;
-
import java.text.SimpleDateFormat;
+import org.apache.struts2.components.table.WebTable;
+
/**
*/
diff --git a/core/src/main/java/org/apache/struts2/components/table/renderer/NumericCellRenderer.java b/core/src/main/java/org/apache/struts2/components/table/renderer/NumericCellRenderer.java
index c77e56733..420004b35 100644
--- a/core/src/main/java/org/apache/struts2/components/table/renderer/NumericCellRenderer.java
+++ b/core/src/main/java/org/apache/struts2/components/table/renderer/NumericCellRenderer.java
@@ -17,10 +17,10 @@
*/
package org.apache.struts2.components.table.renderer;
-import org.apache.struts2.components.table.WebTable;
-
import java.text.DecimalFormat;
+import org.apache.struts2.components.table.WebTable;
+
/**
*/
diff --git a/core/src/main/java/org/apache/struts2/components/template/BaseTemplateEngine.java b/core/src/main/java/org/apache/struts2/components/template/BaseTemplateEngine.java
index 89f1c9159..e4b65f1fd 100644
--- a/core/src/main/java/org/apache/struts2/components/template/BaseTemplateEngine.java
+++ b/core/src/main/java/org/apache/struts2/components/template/BaseTemplateEngine.java
@@ -17,10 +17,6 @@
*/
package org.apache.struts2.components.template;
-import com.opensymphony.util.ClassLoaderUtil;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
@@ -30,6 +26,11 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import com.opensymphony.util.ClassLoaderUtil;
+
/**
* Base class for template engines.
*/
diff --git a/core/src/main/java/org/apache/struts2/components/template/FreemarkerTemplateEngine.java b/core/src/main/java/org/apache/struts2/components/template/FreemarkerTemplateEngine.java
index a52e919f6..bcdace221 100644
--- a/core/src/main/java/org/apache/struts2/components/template/FreemarkerTemplateEngine.java
+++ b/core/src/main/java/org/apache/struts2/components/template/FreemarkerTemplateEngine.java
@@ -17,26 +17,29 @@
*/
package org.apache.struts2.components.template;
-import org.apache.struts2.ServletActionContext;
-import org.apache.struts2.views.freemarker.FreemarkerManager;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.ActionInvocation;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-import com.opensymphony.util.ClassLoaderUtil;
-import freemarker.template.Configuration;
-import freemarker.template.SimpleHash;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.Writer;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.struts2.ServletActionContext;
+import org.apache.struts2.views.freemarker.FreemarkerManager;
+
+import com.opensymphony.util.ClassLoaderUtil;
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
+import freemarker.template.Configuration;
+import freemarker.template.SimpleHash;
+
/**
* Freemarker based template engine.
*/
diff --git a/core/src/main/java/org/apache/struts2/components/template/JspTemplateEngine.java b/core/src/main/java/org/apache/struts2/components/template/JspTemplateEngine.java
index 5db2cceab..277bd0ed7 100644
--- a/core/src/main/java/org/apache/struts2/components/template/JspTemplateEngine.java
+++ b/core/src/main/java/org/apache/struts2/components/template/JspTemplateEngine.java
@@ -17,17 +17,19 @@
*/
package org.apache.struts2.components.template;
-import org.apache.struts2.ServletActionContext;
-import org.apache.struts2.components.Include;
-import org.apache.struts2.components.UIBean;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import java.util.Iterator;
+import java.util.List;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.jsp.PageContext;
-import java.util.Iterator;
-import java.util.List;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.struts2.ServletActionContext;
+import org.apache.struts2.components.Include;
+import org.apache.struts2.components.UIBean;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
/**
* JSP based template engine.
diff --git a/core/src/main/java/org/apache/struts2/components/template/TemplateEngineManager.java b/core/src/main/java/org/apache/struts2/components/template/TemplateEngineManager.java
index 93339e7f6..e4cf9e0d6 100644
--- a/core/src/main/java/org/apache/struts2/components/template/TemplateEngineManager.java
+++ b/core/src/main/java/org/apache/struts2/components/template/TemplateEngineManager.java
@@ -17,11 +17,11 @@
*/
package org.apache.struts2.components.template;
-import org.apache.struts2.config.Settings;
-
import java.util.HashMap;
import java.util.Map;
+import org.apache.struts2.config.Settings;
+
/**
* The TemplateEngineManager will return a template engine for the template
*/
diff --git a/core/src/main/java/org/apache/struts2/components/template/TemplateRenderingContext.java b/core/src/main/java/org/apache/struts2/components/template/TemplateRenderingContext.java
index a1d229e03..3a94404d7 100644
--- a/core/src/main/java/org/apache/struts2/components/template/TemplateRenderingContext.java
+++ b/core/src/main/java/org/apache/struts2/components/template/TemplateRenderingContext.java
@@ -17,12 +17,13 @@
*/
package org.apache.struts2.components.template;
-import org.apache.struts2.components.UIBean;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import java.io.Writer;
import java.util.Map;
+import org.apache.struts2.components.UIBean;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* Context used when rendering templates.
*/
diff --git a/core/src/main/java/org/apache/struts2/components/template/VelocityTemplateEngine.java b/core/src/main/java/org/apache/struts2/components/template/VelocityTemplateEngine.java
index 81d7a3921..c9d0ae531 100644
--- a/core/src/main/java/org/apache/struts2/components/template/VelocityTemplateEngine.java
+++ b/core/src/main/java/org/apache/struts2/components/template/VelocityTemplateEngine.java
@@ -17,22 +17,23 @@
*/
package org.apache.struts2.components.template;
-import org.apache.struts2.ServletActionContext;
-import org.apache.struts2.views.velocity.VelocityManager;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.velocity.app.VelocityEngine;
-import org.apache.velocity.context.Context;
-
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.Writer;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.struts2.ServletActionContext;
+import org.apache.struts2.views.velocity.VelocityManager;
+import org.apache.velocity.app.VelocityEngine;
+import org.apache.velocity.context.Context;
+
/**
* Velocity based template engine.
*/
diff --git a/core/src/main/java/org/apache/struts2/config/DefaultSettings.java b/core/src/main/java/org/apache/struts2/config/DefaultSettings.java
index 5086033ba..dacb970be 100644
--- a/core/src/main/java/org/apache/struts2/config/DefaultSettings.java
+++ b/core/src/main/java/org/apache/struts2/config/DefaultSettings.java
@@ -17,15 +17,16 @@
*/
package org.apache.struts2.config;
-import com.opensymphony.xwork2.util.LocalizedTextUtil;
-import org.apache.struts2.StrutsConstants;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
import java.util.ArrayList;
import java.util.Iterator;
import java.util.StringTokenizer;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.struts2.StrutsConstants;
+
+import com.opensymphony.xwork2.util.LocalizedTextUtil;
+
/**
* Default implementation of Settings - creates and delegates to other settingss by using an internal
diff --git a/core/src/main/java/org/apache/struts2/config/Settings.java b/core/src/main/java/org/apache/struts2/config/Settings.java
index 1d5132f76..69f63df41 100644
--- a/core/src/main/java/org/apache/struts2/config/Settings.java
+++ b/core/src/main/java/org/apache/struts2/config/Settings.java
@@ -17,15 +17,16 @@
*/
package org.apache.struts2.config;
-import com.opensymphony.xwork2.ObjectFactory;
-import org.apache.struts2.StrutsConstants;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
import java.util.Iterator;
import java.util.Locale;
import java.util.StringTokenizer;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.struts2.StrutsConstants;
+
+import com.opensymphony.xwork2.ObjectFactory;
+
/**
* Handles all Struts config properties. Implementation of this class is pluggable (the
diff --git a/core/src/main/java/org/apache/struts2/config_browser/ActionNamesAction.java b/core/src/main/java/org/apache/struts2/config_browser/ActionNamesAction.java
index 407ada55c..e332ffb8f 100644
--- a/core/src/main/java/org/apache/struts2/config_browser/ActionNamesAction.java
+++ b/core/src/main/java/org/apache/struts2/config_browser/ActionNamesAction.java
@@ -17,14 +17,15 @@
*/
package org.apache.struts2.config_browser;
-import com.opensymphony.xwork2.ActionSupport;
-import com.opensymphony.xwork2.config.entities.ActionConfig;
-import org.apache.struts2.config.Settings;
-import org.apache.struts2.StrutsConstants;
-
import java.util.Set;
import java.util.TreeSet;
+import org.apache.struts2.StrutsConstants;
+import org.apache.struts2.config.Settings;
+
+import com.opensymphony.xwork2.ActionSupport;
+import com.opensymphony.xwork2.config.entities.ActionConfig;
+
/**
* ActionNamesAction
*
diff --git a/core/src/main/java/org/apache/struts2/config_browser/ConfigurationHelper.java b/core/src/main/java/org/apache/struts2/config_browser/ConfigurationHelper.java
index 5a6cece48..09f0b29e7 100644
--- a/core/src/main/java/org/apache/struts2/config_browser/ConfigurationHelper.java
+++ b/core/src/main/java/org/apache/struts2/config_browser/ConfigurationHelper.java
@@ -17,14 +17,14 @@
*/
package org.apache.struts2.config_browser;
-import com.opensymphony.xwork2.config.entities.ActionConfig;
-
import java.util.Collections;
import java.util.Map;
import java.util.Set;
import org.apache.struts2.dispatcher.Dispatcher;
+import com.opensymphony.xwork2.config.entities.ActionConfig;
+
/**
* ConfigurationHelper
*/
diff --git a/core/src/main/java/org/apache/struts2/config_browser/ListValidatorsAction.java b/core/src/main/java/org/apache/struts2/config_browser/ListValidatorsAction.java
index f0a0cb734..8cafe365e 100644
--- a/core/src/main/java/org/apache/struts2/config_browser/ListValidatorsAction.java
+++ b/core/src/main/java/org/apache/struts2/config_browser/ListValidatorsAction.java
@@ -17,14 +17,15 @@
*/
package org.apache.struts2.config_browser;
-import com.opensymphony.xwork2.ActionSupport;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.validator.ActionValidatorManagerFactory;
-import org.apache.struts2.util.ClassLoaderUtils;
-
import java.util.Collections;
import java.util.List;
+import org.apache.struts2.util.ClassLoaderUtils;
+
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.ActionSupport;
+import com.opensymphony.xwork2.validator.ActionValidatorManagerFactory;
+
/**
* ListValidatorsAction loads the validations for a given class and context
*
diff --git a/core/src/main/java/org/apache/struts2/config_browser/ShowConfigAction.java b/core/src/main/java/org/apache/struts2/config_browser/ShowConfigAction.java
index ba8787438..94de49c80 100644
--- a/core/src/main/java/org/apache/struts2/config_browser/ShowConfigAction.java
+++ b/core/src/main/java/org/apache/struts2/config_browser/ShowConfigAction.java
@@ -17,16 +17,18 @@
*/
package org.apache.struts2.config_browser;
-import com.opensymphony.xwork2.ObjectFactory;
-import com.opensymphony.xwork2.config.entities.ActionConfig;
-import ognl.OgnlRuntime;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
import java.beans.PropertyDescriptor;
import java.util.Set;
import java.util.TreeSet;
+import ognl.OgnlRuntime;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import com.opensymphony.xwork2.ObjectFactory;
+import com.opensymphony.xwork2.config.entities.ActionConfig;
+
/**
* ShowConfigAction
*/
diff --git a/core/src/main/java/org/apache/struts2/config_browser/ShowValidatorAction.java b/core/src/main/java/org/apache/struts2/config_browser/ShowValidatorAction.java
index b74eed18f..aa5386b8c 100644
--- a/core/src/main/java/org/apache/struts2/config_browser/ShowValidatorAction.java
+++ b/core/src/main/java/org/apache/struts2/config_browser/ShowValidatorAction.java
@@ -17,13 +17,6 @@
*/
package org.apache.struts2.config_browser;
-import com.opensymphony.xwork2.util.OgnlUtil;
-import com.opensymphony.xwork2.validator.Validator;
-import ognl.Ognl;
-import ognl.OgnlException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
import java.beans.BeanInfo;
import java.beans.IntrospectionException;
import java.beans.Introspector;
@@ -33,11 +26,22 @@ import java.util.Map;
import java.util.Set;
import java.util.TreeSet;
+import ognl.Ognl;
+import ognl.OgnlException;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import com.opensymphony.xwork2.util.OgnlUtil;
+import com.opensymphony.xwork2.validator.Validator;
+
/**
* ShowValidatorAction
*
*/
public class ShowValidatorAction extends ListValidatorsAction {
+ private static final long serialVersionUID = 4061534149317835177L;
+
private static Log log = LogFactory.getLog(ShowValidatorAction.class);
Set properties = Collections.EMPTY_SET;
diff --git a/core/src/main/java/org/apache/struts2/dispatcher/ActionContextCleanUp.java b/core/src/main/java/org/apache/struts2/dispatcher/ActionContextCleanUp.java
index 981ad8515..5be0044f9 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/ActionContextCleanUp.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/ActionContextCleanUp.java
@@ -17,14 +17,22 @@
*/
package org.apache.struts2.dispatcher;
-import com.opensymphony.xwork2.ActionContext;
+import java.io.IOException;
+
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import javax.servlet.*;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
+import com.opensymphony.xwork2.ActionContext;
/**
*
diff --git a/core/src/main/java/org/apache/struts2/dispatcher/ApplicationMap.java b/core/src/main/java/org/apache/struts2/dispatcher/ApplicationMap.java
index 89e9921b7..79e782f39 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/ApplicationMap.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/ApplicationMap.java
@@ -17,9 +17,14 @@
*/
package org.apache.struts2.dispatcher;
-import javax.servlet.ServletContext;
import java.io.Serializable;
-import java.util.*;
+import java.util.AbstractMap;
+import java.util.Enumeration;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import javax.servlet.ServletContext;
/**
diff --git a/core/src/main/java/org/apache/struts2/dispatcher/DefaultActionSupport.java b/core/src/main/java/org/apache/struts2/dispatcher/DefaultActionSupport.java
index c438d4347..91164aa29 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/DefaultActionSupport.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/DefaultActionSupport.java
@@ -21,6 +21,7 @@ package org.apache.struts2.dispatcher;
import javax.servlet.http.HttpServletRequest;
import org.apache.struts2.ServletActionContext;
+
import com.opensymphony.xwork2.ActionSupport;
/**
diff --git a/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java b/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
index 94c563aa1..25cac5b6a 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
@@ -17,40 +17,55 @@
*/
package org.apache.struts2.dispatcher;
-import com.opensymphony.util.ClassLoaderUtil;
-import com.opensymphony.util.FileManager;
-import com.opensymphony.xwork2.*;
-import com.opensymphony.xwork2.config.ConfigurationException;
-import com.opensymphony.xwork2.config.ConfigurationManager;
-import com.opensymphony.xwork2.config.providers.XmlConfigurationProvider;
-import com.opensymphony.xwork2.util.*;
-import com.opensymphony.xwork2.util.location.Location;
-import com.opensymphony.xwork2.util.location.LocationUtils;
-import freemarker.template.Template;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.struts2.ServletActionContext;
-import org.apache.struts2.StrutsConstants;
-import org.apache.struts2.StrutsStatics;
-import org.apache.struts2.impl.StrutsObjectFactory;
-import org.apache.struts2.impl.StrutsActionProxyFactory;
-import org.apache.struts2.config.Settings;
-import org.apache.struts2.config.StrutsXMLConfigurationProvider;
-import org.apache.struts2.dispatcher.mapper.ActionMapping;
-import org.apache.struts2.dispatcher.multipart.MultiPartRequest;
-import org.apache.struts2.dispatcher.multipart.MultiPartRequestWrapper;
-import org.apache.struts2.util.AttributeMap;
-import org.apache.struts2.util.ObjectFactoryDestroyable;
-import org.apache.struts2.util.ObjectFactoryInitializable;
-import org.apache.struts2.views.freemarker.FreemarkerManager;
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import java.io.File;
-import java.io.IOException;
-import java.util.*;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.struts2.ServletActionContext;
+import org.apache.struts2.StrutsConstants;
+import org.apache.struts2.StrutsStatics;
+import org.apache.struts2.config.Settings;
+import org.apache.struts2.config.StrutsXMLConfigurationProvider;
+import org.apache.struts2.dispatcher.mapper.ActionMapping;
+import org.apache.struts2.dispatcher.multipart.MultiPartRequest;
+import org.apache.struts2.dispatcher.multipart.MultiPartRequestWrapper;
+import org.apache.struts2.impl.StrutsActionProxyFactory;
+import org.apache.struts2.impl.StrutsObjectFactory;
+import org.apache.struts2.util.AttributeMap;
+import org.apache.struts2.util.ObjectFactoryDestroyable;
+import org.apache.struts2.util.ObjectFactoryInitializable;
+import org.apache.struts2.views.freemarker.FreemarkerManager;
+
+import com.opensymphony.util.ClassLoaderUtil;
+import com.opensymphony.util.FileManager;
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.ActionProxy;
+import com.opensymphony.xwork2.ActionProxyFactory;
+import com.opensymphony.xwork2.ObjectFactory;
+import com.opensymphony.xwork2.Result;
+import com.opensymphony.xwork2.config.ConfigurationException;
+import com.opensymphony.xwork2.config.ConfigurationManager;
+import com.opensymphony.xwork2.config.providers.XmlConfigurationProvider;
+import com.opensymphony.xwork2.util.LocalizedTextUtil;
+import com.opensymphony.xwork2.util.ObjectTypeDeterminer;
+import com.opensymphony.xwork2.util.ObjectTypeDeterminerFactory;
+import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.XWorkContinuationConfig;
+import com.opensymphony.xwork2.util.location.Location;
+import com.opensymphony.xwork2.util.location.LocationUtils;
+
+import freemarker.template.Template;
/**
* A utility class the actual dispatcher delegates most of its tasks to. Each instance
@@ -77,7 +92,6 @@ public class Dispatcher {
private ConfigurationManager configurationManager;
private boolean portletSupportActive;
private boolean devMode = false;
- private boolean compatibilityMode = true;
// used to get WebLogic to play nice
private boolean paramsWorkaroundEnabled = false;
diff --git a/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcherCompatWeblogic61.java b/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcherCompatWeblogic61.java
index 95cc349a9..9063bb903 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcherCompatWeblogic61.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcherCompatWeblogic61.java
@@ -17,16 +17,16 @@
*/
package org.apache.struts2.dispatcher;
-import org.apache.struts2.config.ServletContextSingleton;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
import javax.servlet.Filter;
import javax.servlet.FilterConfig;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.http.HttpSession;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.struts2.config.ServletContextSingleton;
+
/**
* When running Weblogic Server 6.1, this class should be
diff --git a/core/src/main/java/org/apache/struts2/dispatcher/HttpHeaderResult.java b/core/src/main/java/org/apache/struts2/dispatcher/HttpHeaderResult.java
index 331ef2533..2fd46744c 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/HttpHeaderResult.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/HttpHeaderResult.java
@@ -17,18 +17,20 @@
*/
package org.apache.struts2.dispatcher;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletResponse;
+
import org.apache.struts2.ServletActionContext;
+
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.Result;
import com.opensymphony.xwork2.util.OgnlValueStack;
import com.opensymphony.xwork2.util.TextParseUtil;
-import javax.servlet.http.HttpServletResponse;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
/**
*
diff --git a/core/src/main/java/org/apache/struts2/dispatcher/RequestMap.java b/core/src/main/java/org/apache/struts2/dispatcher/RequestMap.java
index 2299012e8..a4183b52b 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/RequestMap.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/RequestMap.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.dispatcher;
-import javax.servlet.http.HttpServletRequest;
import java.io.Serializable;
import java.util.AbstractMap;
import java.util.Enumeration;
import java.util.HashSet;
import java.util.Set;
+import javax.servlet.http.HttpServletRequest;
+
/**
* A simple implementation of the {@link java.util.Map} interface to handle a collection of request attributes.
diff --git a/core/src/main/java/org/apache/struts2/dispatcher/ServletActionRedirectResult.java b/core/src/main/java/org/apache/struts2/dispatcher/ServletActionRedirectResult.java
index c51ed9822..4ff18bc58 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/ServletActionRedirectResult.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/ServletActionRedirectResult.java
@@ -28,8 +28,8 @@ import org.apache.struts2.dispatcher.mapper.ActionMapperFactory;
import org.apache.struts2.dispatcher.mapper.ActionMapping;
import org.apache.struts2.views.util.UrlHelper;
-import com.opensymphony.xwork2.config.entities.ResultConfig;
import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.config.entities.ResultConfig;
/**
*
diff --git a/core/src/main/java/org/apache/struts2/dispatcher/ServletDispatcherResult.java b/core/src/main/java/org/apache/struts2/dispatcher/ServletDispatcherResult.java
index a4f980fbe..697f3e57c 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/ServletDispatcherResult.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/ServletDispatcherResult.java
@@ -17,16 +17,17 @@
*/
package org.apache.struts2.dispatcher;
-import org.apache.struts2.ServletActionContext;
-import com.opensymphony.xwork2.ActionInvocation;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
import javax.servlet.RequestDispatcher;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.jsp.PageContext;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.struts2.ServletActionContext;
+
+import com.opensymphony.xwork2.ActionInvocation;
+
/**
*
diff --git a/core/src/main/java/org/apache/struts2/dispatcher/ServletRedirectResult.java b/core/src/main/java/org/apache/struts2/dispatcher/ServletRedirectResult.java
index 309e97711..11d97c598 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/ServletRedirectResult.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/ServletRedirectResult.java
@@ -17,16 +17,17 @@
*/
package org.apache.struts2.dispatcher;
-import org.apache.struts2.ServletActionContext;
-import org.apache.struts2.dispatcher.mapper.ActionMapperFactory;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.ActionInvocation;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.struts2.ServletActionContext;
+import org.apache.struts2.dispatcher.mapper.ActionMapperFactory;
+
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.ActionInvocation;
+
/**
*
diff --git a/core/src/main/java/org/apache/struts2/dispatcher/SessionMap.java b/core/src/main/java/org/apache/struts2/dispatcher/SessionMap.java
index e05915f7d..2ebdc4423 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/SessionMap.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/SessionMap.java
@@ -17,10 +17,17 @@
*/
package org.apache.struts2.dispatcher;
+import java.io.Serializable;
+import java.util.AbstractMap;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
-import java.io.Serializable;
-import java.util.*;
/**
diff --git a/core/src/main/java/org/apache/struts2/dispatcher/StreamResult.java b/core/src/main/java/org/apache/struts2/dispatcher/StreamResult.java
index aedcafe63..31701b214 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/StreamResult.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/StreamResult.java
@@ -17,15 +17,16 @@
*/
package org.apache.struts2.dispatcher;
-import com.opensymphony.xwork2.ActionInvocation;
-
-import javax.servlet.http.HttpServletResponse;
import java.io.InputStream;
import java.io.OutputStream;
+import javax.servlet.http.HttpServletResponse;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import com.opensymphony.xwork2.ActionInvocation;
+
/**
*
*
diff --git a/core/src/main/java/org/apache/struts2/dispatcher/StrutsRequestWrapper.java b/core/src/main/java/org/apache/struts2/dispatcher/StrutsRequestWrapper.java
index 4b6255b61..1d206631e 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/StrutsRequestWrapper.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/StrutsRequestWrapper.java
@@ -17,12 +17,12 @@
*/
package org.apache.struts2.dispatcher;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletRequestWrapper;
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
*
*
diff --git a/core/src/main/java/org/apache/struts2/dispatcher/StrutsResultSupport.java b/core/src/main/java/org/apache/struts2/dispatcher/StrutsResultSupport.java
index 08932ef46..89cc35647 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/StrutsResultSupport.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/StrutsResultSupport.java
@@ -23,6 +23,7 @@ import java.net.URLEncoder;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.struts2.StrutsStatics;
+
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.Result;
import com.opensymphony.xwork2.util.TextParseUtil;
diff --git a/core/src/main/java/org/apache/struts2/dispatcher/VelocityResult.java b/core/src/main/java/org/apache/struts2/dispatcher/VelocityResult.java
index 58a9e43f0..0a91b737b 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/VelocityResult.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/VelocityResult.java
@@ -17,19 +17,8 @@
*/
package org.apache.struts2.dispatcher;
-import org.apache.struts2.ServletActionContext;
-import org.apache.struts2.StrutsConstants;
-import org.apache.struts2.config.Settings;
-import org.apache.struts2.views.JspSupportServlet;
-import org.apache.struts2.views.velocity.VelocityManager;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.ActionInvocation;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.velocity.Template;
-import org.apache.velocity.app.VelocityEngine;
-import org.apache.velocity.context.Context;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
import javax.servlet.Servlet;
import javax.servlet.ServletContext;
@@ -37,8 +26,21 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.jsp.JspFactory;
import javax.servlet.jsp.PageContext;
-import java.io.OutputStreamWriter;
-import java.io.Writer;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.struts2.ServletActionContext;
+import org.apache.struts2.StrutsConstants;
+import org.apache.struts2.config.Settings;
+import org.apache.struts2.views.JspSupportServlet;
+import org.apache.struts2.views.velocity.VelocityManager;
+import org.apache.velocity.Template;
+import org.apache.velocity.app.VelocityEngine;
+import org.apache.velocity.context.Context;
+
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.util.OgnlValueStack;
/**
diff --git a/core/src/main/java/org/apache/struts2/dispatcher/mapper/ActionMapperFactory.java b/core/src/main/java/org/apache/struts2/dispatcher/mapper/ActionMapperFactory.java
index f7fa868e2..ad3ce291e 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/mapper/ActionMapperFactory.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/mapper/ActionMapperFactory.java
@@ -17,15 +17,15 @@
*/
package org.apache.struts2.dispatcher.mapper;
-import org.apache.struts2.config.Settings;
-import org.apache.struts2.StrutsConstants;
-import org.apache.struts2.StrutsException;
+import java.util.HashMap;
-import com.opensymphony.xwork2.ObjectFactory;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.struts2.StrutsConstants;
+import org.apache.struts2.StrutsException;
+import org.apache.struts2.config.Settings;
-import java.util.HashMap;
+import com.opensymphony.xwork2.ObjectFactory;
/**
*
diff --git a/core/src/main/java/org/apache/struts2/dispatcher/mapper/ActionMapping.java b/core/src/main/java/org/apache/struts2/dispatcher/mapper/ActionMapping.java
index ddfec6017..3680ddff0 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/mapper/ActionMapping.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/mapper/ActionMapping.java
@@ -17,10 +17,10 @@
*/
package org.apache.struts2.dispatcher.mapper;
-import com.opensymphony.xwork2.Result;
-
import java.util.Map;
+import com.opensymphony.xwork2.Result;
+
/**
* Simple class that holds the action mapping information used to invoke a
* Struts action. The name and namespace are required, but the params map
diff --git a/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java b/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
index 7519bba55..e7ae59e13 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
@@ -17,6 +17,13 @@
*/
package org.apache.struts2.dispatcher.mapper;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+
import org.apache.struts2.RequestUtils;
import org.apache.struts2.StrutsConstants;
import org.apache.struts2.config.Settings;
@@ -26,12 +33,6 @@ import org.apache.struts2.util.PrefixTrie;
import com.opensymphony.xwork2.config.Configuration;
import com.opensymphony.xwork2.config.entities.PackageConfig;
-import javax.servlet.http.HttpServletRequest;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
/**
*
*
diff --git a/core/src/main/java/org/apache/struts2/dispatcher/mapper/RestfulActionMapper.java b/core/src/main/java/org/apache/struts2/dispatcher/mapper/RestfulActionMapper.java
index 269abd3c1..3c57b0661 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/mapper/RestfulActionMapper.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/mapper/RestfulActionMapper.java
@@ -17,20 +17,20 @@
*/
package org.apache.struts2.dispatcher.mapper;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.apache.struts2.RequestUtils;
-
-import com.opensymphony.xwork2.config.Configuration;
-
-import javax.servlet.http.HttpServletRequest;
import java.net.URLDecoder;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import java.util.StringTokenizer;
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.struts2.RequestUtils;
+
+import com.opensymphony.xwork2.config.Configuration;
+
/**
* A custom action mapper using the following format:
*
diff --git a/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequest.java b/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequest.java
index 12af2232c..4cb541e6d 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequest.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequest.java
@@ -17,16 +17,24 @@
*/
package org.apache.struts2.dispatcher.multipart;
-import org.apache.commons.fileupload.*;
-import org.apache.commons.fileupload.servlet.ServletFileUpload;
-import org.apache.commons.fileupload.disk.DiskFileItemFactory;
-import org.apache.commons.fileupload.disk.DiskFileItem;
-
-import javax.servlet.http.HttpServletRequest;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.commons.fileupload.FileItem;
+import org.apache.commons.fileupload.FileUploadException;
+import org.apache.commons.fileupload.RequestContext;
+import org.apache.commons.fileupload.disk.DiskFileItem;
+import org.apache.commons.fileupload.disk.DiskFileItemFactory;
+import org.apache.commons.fileupload.servlet.ServletFileUpload;
/**
* Multipart form data request adapter for Jakarta Commons Fileupload package.
diff --git a/core/src/main/java/org/apache/struts2/dispatcher/multipart/MultiPartRequestWrapper.java b/core/src/main/java/org/apache/struts2/dispatcher/multipart/MultiPartRequestWrapper.java
index 502c153a8..3b754cb51 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/multipart/MultiPartRequestWrapper.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/multipart/MultiPartRequestWrapper.java
@@ -17,18 +17,25 @@
*/
package org.apache.struts2.dispatcher.multipart;
-import org.apache.struts2.config.Settings;
-import org.apache.struts2.dispatcher.StrutsRequestWrapper;
-import org.apache.struts2.StrutsConstants;
-import org.apache.struts2.util.ClassLoaderUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import javax.servlet.http.HttpServletRequest;
import java.io.File;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Vector;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.struts2.StrutsConstants;
+import org.apache.struts2.config.Settings;
+import org.apache.struts2.dispatcher.StrutsRequestWrapper;
+import org.apache.struts2.util.ClassLoaderUtils;
/**
diff --git a/core/src/main/java/org/apache/struts2/impl/ActionContextImpl.java b/core/src/main/java/org/apache/struts2/impl/ActionContextImpl.java
index 10b2655ed..bc61e0414 100644
--- a/core/src/main/java/org/apache/struts2/impl/ActionContextImpl.java
+++ b/core/src/main/java/org/apache/struts2/impl/ActionContextImpl.java
@@ -2,13 +2,14 @@
package org.apache.struts2.impl;
-import com.opensymphony.xwork2.ActionInvocation;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.List;
+
import org.apache.struts2.spi.ActionContext;
import org.apache.struts2.spi.Result;
-import java.lang.reflect.Method;
-import java.util.List;
-import java.util.ArrayList;
+import com.opensymphony.xwork2.ActionInvocation;
public class ActionContextImpl implements ActionContext {
diff --git a/core/src/main/java/org/apache/struts2/impl/InterceptorAdapter.java b/core/src/main/java/org/apache/struts2/impl/InterceptorAdapter.java
index a6274ce5e..68e3d57ec 100644
--- a/core/src/main/java/org/apache/struts2/impl/InterceptorAdapter.java
+++ b/core/src/main/java/org/apache/struts2/impl/InterceptorAdapter.java
@@ -3,13 +3,15 @@
package org.apache.struts2.impl;
import static org.apache.struts2.impl.RequestContextImpl.ILLEGAL_PROCEED;
-import com.opensymphony.xwork2.interceptor.Interceptor;
-import com.opensymphony.xwork2.ActionInvocation;
import java.util.concurrent.Callable;
+import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.interceptor.Interceptor;
+
public class InterceptorAdapter implements Interceptor {
+ private static final long serialVersionUID = 8020658947818231684L;
final org.apache.struts2.spi.Interceptor delegate;
public InterceptorAdapter(org.apache.struts2.spi.Interceptor delegate) {
diff --git a/core/src/main/java/org/apache/struts2/impl/MessagesImpl.java b/core/src/main/java/org/apache/struts2/impl/MessagesImpl.java
index d358ca841..32a759e37 100644
--- a/core/src/main/java/org/apache/struts2/impl/MessagesImpl.java
+++ b/core/src/main/java/org/apache/struts2/impl/MessagesImpl.java
@@ -2,11 +2,19 @@
package org.apache.struts2.impl;
-import com.opensymphony.xwork2.TextProvider;
-import com.opensymphony.xwork2.DefaultTextProvider;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.EnumMap;
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
import org.apache.struts2.Messages;
-import java.util.*;
+import com.opensymphony.xwork2.DefaultTextProvider;
+import com.opensymphony.xwork2.TextProvider;
public class MessagesImpl implements Messages {
diff --git a/core/src/main/java/org/apache/struts2/impl/RequestContextImpl.java b/core/src/main/java/org/apache/struts2/impl/RequestContextImpl.java
index 08e9c42b6..1d853806e 100644
--- a/core/src/main/java/org/apache/struts2/impl/RequestContextImpl.java
+++ b/core/src/main/java/org/apache/struts2/impl/RequestContextImpl.java
@@ -2,24 +2,29 @@
package org.apache.struts2.impl;
-import com.opensymphony.xwork2.ActionInvocation;
-import org.apache.struts2.Messages;
-import static org.apache.struts2.StrutsStatics.*;
-import org.apache.struts2.dispatcher.RequestMap;
-import org.apache.struts2.spi.ActionContext;
-import org.apache.struts2.spi.RequestContext;
-import org.apache.struts2.spi.ValueStack;
+import static org.apache.struts2.StrutsStatics.HTTP_REQUEST;
+import static org.apache.struts2.StrutsStatics.HTTP_RESPONSE;
+import static org.apache.struts2.StrutsStatics.SERVLET_CONTEXT;
-import javax.servlet.ServletContext;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.concurrent.Callable;
+import javax.servlet.ServletContext;
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.struts2.Messages;
+import org.apache.struts2.dispatcher.RequestMap;
+import org.apache.struts2.spi.ActionContext;
+import org.apache.struts2.spi.RequestContext;
+import org.apache.struts2.spi.ValueStack;
+
+import com.opensymphony.xwork2.ActionInvocation;
+
public class RequestContextImpl implements RequestContext {
com.opensymphony.xwork2.ActionContext xworkContext;
diff --git a/core/src/main/java/org/apache/struts2/impl/ResultAdapter.java b/core/src/main/java/org/apache/struts2/impl/ResultAdapter.java
index 5cbbd12ce..f71c8f32f 100644
--- a/core/src/main/java/org/apache/struts2/impl/ResultAdapter.java
+++ b/core/src/main/java/org/apache/struts2/impl/ResultAdapter.java
@@ -2,11 +2,12 @@
package org.apache.struts2.impl;
-import com.opensymphony.xwork2.Result;
import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.Result;
public class ResultAdapter implements Result {
+ private static final long serialVersionUID = -5107033078266553554L;
final org.apache.struts2.spi.Result delegate;
public ResultAdapter(org.apache.struts2.spi.Result delegate) {
diff --git a/core/src/main/java/org/apache/struts2/impl/StrutsActionProxy.java b/core/src/main/java/org/apache/struts2/impl/StrutsActionProxy.java
index 3c5eb6aff..f13340531 100644
--- a/core/src/main/java/org/apache/struts2/impl/StrutsActionProxy.java
+++ b/core/src/main/java/org/apache/struts2/impl/StrutsActionProxy.java
@@ -2,15 +2,17 @@
package org.apache.struts2.impl;
-import com.opensymphony.xwork2.DefaultActionProxy;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.config.Configuration;
-
import java.util.Map;
import java.util.concurrent.Callable;
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.DefaultActionProxy;
+import com.opensymphony.xwork2.config.Configuration;
+
public class StrutsActionProxy extends DefaultActionProxy {
+ private static final long serialVersionUID = -2434901249671934080L;
+
public StrutsActionProxy(Configuration cfg, String namespace, String actionName, Map extraContext,
boolean executeResult, boolean cleanupContext) throws Exception {
super(cfg, namespace, actionName, extraContext, executeResult, cleanupContext);
diff --git a/core/src/main/java/org/apache/struts2/impl/StrutsActionProxyFactory.java b/core/src/main/java/org/apache/struts2/impl/StrutsActionProxyFactory.java
index 3231b767b..c55e5fd14 100644
--- a/core/src/main/java/org/apache/struts2/impl/StrutsActionProxyFactory.java
+++ b/core/src/main/java/org/apache/struts2/impl/StrutsActionProxyFactory.java
@@ -2,12 +2,12 @@
package org.apache.struts2.impl;
+import java.util.Map;
+
import com.opensymphony.xwork2.ActionProxy;
import com.opensymphony.xwork2.DefaultActionProxyFactory;
import com.opensymphony.xwork2.config.Configuration;
-import java.util.Map;
-
public class StrutsActionProxyFactory extends DefaultActionProxyFactory {
public ActionProxy createActionProxy(Configuration config, String namespace, String actionName, Map extraContext)
diff --git a/core/src/main/java/org/apache/struts2/impl/StrutsObjectFactory.java b/core/src/main/java/org/apache/struts2/impl/StrutsObjectFactory.java
index efd385b4e..dda52dfd6 100644
--- a/core/src/main/java/org/apache/struts2/impl/StrutsObjectFactory.java
+++ b/core/src/main/java/org/apache/struts2/impl/StrutsObjectFactory.java
@@ -2,16 +2,16 @@
package org.apache.struts2.impl;
+import java.util.HashMap;
+import java.util.Map;
+
import com.opensymphony.xwork2.ObjectFactory;
import com.opensymphony.xwork2.Result;
-import com.opensymphony.xwork2.util.OgnlUtil;
+import com.opensymphony.xwork2.config.ConfigurationException;
import com.opensymphony.xwork2.config.entities.InterceptorConfig;
import com.opensymphony.xwork2.config.entities.ResultConfig;
-import com.opensymphony.xwork2.config.ConfigurationException;
import com.opensymphony.xwork2.interceptor.Interceptor;
-
-import java.util.Map;
-import java.util.HashMap;
+import com.opensymphony.xwork2.util.OgnlUtil;
public class StrutsObjectFactory extends ObjectFactory {
diff --git a/core/src/main/java/org/apache/struts2/impl/ValueStackAdapter.java b/core/src/main/java/org/apache/struts2/impl/ValueStackAdapter.java
index c2f389e4c..aa168b14c 100644
--- a/core/src/main/java/org/apache/struts2/impl/ValueStackAdapter.java
+++ b/core/src/main/java/org/apache/struts2/impl/ValueStackAdapter.java
@@ -2,10 +2,11 @@
package org.apache.struts2.impl;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import java.util.Iterator;
+
import org.apache.struts2.spi.ValueStack;
-import java.util.Iterator;
+import com.opensymphony.xwork2.util.OgnlValueStack;
public class ValueStackAdapter implements ValueStack {
diff --git a/core/src/main/java/org/apache/struts2/interceptor/BackgroundProcess.java b/core/src/main/java/org/apache/struts2/interceptor/BackgroundProcess.java
index a64f5753f..ba82b1719 100644
--- a/core/src/main/java/org/apache/struts2/interceptor/BackgroundProcess.java
+++ b/core/src/main/java/org/apache/struts2/interceptor/BackgroundProcess.java
@@ -17,10 +17,10 @@
*/
package org.apache.struts2.interceptor;
-import com.opensymphony.xwork2.ActionInvocation;
-
import java.io.Serializable;
+import com.opensymphony.xwork2.ActionInvocation;
+
/**
* Background thread to be executed by the ExecuteAndWaitInterceptor.
*
diff --git a/core/src/main/java/org/apache/struts2/interceptor/CreateSessionInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/CreateSessionInterceptor.java
index 74b4d34ce..a81dcd4f2 100644
--- a/core/src/main/java/org/apache/struts2/interceptor/CreateSessionInterceptor.java
+++ b/core/src/main/java/org/apache/struts2/interceptor/CreateSessionInterceptor.java
@@ -19,8 +19,8 @@ package org.apache.struts2.interceptor;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
import org.apache.struts2.ServletActionContext;
+
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.interceptor.AbstractInterceptor;
diff --git a/core/src/main/java/org/apache/struts2/interceptor/MessageStoreInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/MessageStoreInterceptor.java
index f8a752b24..6eb0dc3d2 100644
--- a/core/src/main/java/org/apache/struts2/interceptor/MessageStoreInterceptor.java
+++ b/core/src/main/java/org/apache/struts2/interceptor/MessageStoreInterceptor.java
@@ -217,7 +217,6 @@ public class MessageStoreInterceptor implements Interceptor {
_log.debug("retrieve error / message from session to populate into action ["+action+"]");
- ValidationAware vaidationAwareAction = (ValidationAware) action;
Collection actionErrors = (Collection) session.get(actionErrorsSessionKey);
Collection actionMessages = (Collection) session.get(actionMessagesSessionKey);
Map fieldErrors = (Map) session.get(fieldErrorsSessionKey);
diff --git a/core/src/main/java/org/apache/struts2/interceptor/PrincipalProxy.java b/core/src/main/java/org/apache/struts2/interceptor/PrincipalProxy.java
index a43b65ed0..e513071be 100644
--- a/core/src/main/java/org/apache/struts2/interceptor/PrincipalProxy.java
+++ b/core/src/main/java/org/apache/struts2/interceptor/PrincipalProxy.java
@@ -17,9 +17,10 @@
*/
package org.apache.struts2.interceptor;
-import javax.servlet.http.HttpServletRequest;
import java.security.Principal;
+import javax.servlet.http.HttpServletRequest;
+
/**
* Proxy class used together with PrincipalAware interface. It allows to get indirect access to
* HttpServletRequest Principal related methods.
diff --git a/core/src/main/java/org/apache/struts2/interceptor/ScopeInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/ScopeInterceptor.java
index 5adc49f77..c5a68588a 100644
--- a/core/src/main/java/org/apache/struts2/interceptor/ScopeInterceptor.java
+++ b/core/src/main/java/org/apache/struts2/interceptor/ScopeInterceptor.java
@@ -17,20 +17,21 @@
*/
package org.apache.struts2.interceptor;
+import java.util.IdentityHashMap;
+import java.util.Map;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.struts2.ServletActionContext;
+import org.apache.struts2.StrutsException;
+import org.apache.struts2.dispatcher.SessionMap;
+
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.ActionProxy;
import com.opensymphony.xwork2.interceptor.AbstractInterceptor;
import com.opensymphony.xwork2.interceptor.PreResultListener;
import com.opensymphony.xwork2.util.OgnlValueStack;
-import org.apache.struts2.dispatcher.SessionMap;
-import org.apache.struts2.ServletActionContext;
-import org.apache.struts2.StrutsException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import java.util.IdentityHashMap;
-import java.util.Map;
/**
*
diff --git a/core/src/main/java/org/apache/struts2/interceptor/ServletConfigInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/ServletConfigInterceptor.java
index 689e9a8c6..96b1039ba 100644
--- a/core/src/main/java/org/apache/struts2/interceptor/ServletConfigInterceptor.java
+++ b/core/src/main/java/org/apache/struts2/interceptor/ServletConfigInterceptor.java
@@ -19,16 +19,17 @@ package org.apache.struts2.interceptor;
import java.util.Map;
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
import org.apache.struts2.StrutsStatics;
import org.apache.struts2.util.ServletContextAware;
+
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.interceptor.AbstractInterceptor;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.ServletContext;
-
/**
*
diff --git a/core/src/main/java/org/apache/struts2/interceptor/TokenInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/TokenInterceptor.java
index 8149cc8c9..515c08388 100644
--- a/core/src/main/java/org/apache/struts2/interceptor/TokenInterceptor.java
+++ b/core/src/main/java/org/apache/struts2/interceptor/TokenInterceptor.java
@@ -20,6 +20,7 @@ package org.apache.struts2.interceptor;
import java.util.Map;
import org.apache.struts2.util.TokenHelper;
+
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.ValidationAware;
diff --git a/core/src/main/java/org/apache/struts2/interceptor/TokenSessionStoreInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/TokenSessionStoreInterceptor.java
index c10c84224..21d375766 100644
--- a/core/src/main/java/org/apache/struts2/interceptor/TokenSessionStoreInterceptor.java
+++ b/core/src/main/java/org/apache/struts2/interceptor/TokenSessionStoreInterceptor.java
@@ -17,17 +17,19 @@
*/
package org.apache.struts2.interceptor;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+
import org.apache.struts2.ServletActionContext;
import org.apache.struts2.util.InvocationSessionStore;
import org.apache.struts2.util.TokenHelper;
+
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.Result;
import com.opensymphony.xwork2.util.OgnlValueStack;
-import javax.servlet.http.HttpServletRequest;
-import java.util.Map;
-
/**
*
diff --git a/core/src/main/java/org/apache/struts2/interceptor/debugging/DebuggingInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/debugging/DebuggingInterceptor.java
index 74e1c7d50..94108130f 100644
--- a/core/src/main/java/org/apache/struts2/interceptor/debugging/DebuggingInterceptor.java
+++ b/core/src/main/java/org/apache/struts2/interceptor/debugging/DebuggingInterceptor.java
@@ -17,17 +17,6 @@
*/
package org.apache.struts2.interceptor.debugging;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.ActionInvocation;
-import com.opensymphony.xwork2.interceptor.Interceptor;
-import com.opensymphony.xwork2.interceptor.PreResultListener;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.struts2.ServletActionContext;
-import org.apache.struts2.views.freemarker.FreemarkerResult;
-
-import javax.servlet.http.HttpServletResponse;
import java.beans.BeanInfo;
import java.beans.Introspector;
import java.beans.PropertyDescriptor;
@@ -36,7 +25,25 @@ import java.io.PrintWriter;
import java.io.StringWriter;
import java.lang.reflect.Array;
import java.lang.reflect.Method;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.struts2.ServletActionContext;
+import org.apache.struts2.views.freemarker.FreemarkerResult;
+
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.interceptor.Interceptor;
+import com.opensymphony.xwork2.interceptor.PreResultListener;
+import com.opensymphony.xwork2.util.OgnlValueStack;
/**
* Provides several different debugging screens to provide insight into the
diff --git a/core/src/main/java/org/apache/struts2/jsf/FacesInterceptor.java b/core/src/main/java/org/apache/struts2/jsf/FacesInterceptor.java
index 9539956f9..e086260ec 100644
--- a/core/src/main/java/org/apache/struts2/jsf/FacesInterceptor.java
+++ b/core/src/main/java/org/apache/struts2/jsf/FacesInterceptor.java
@@ -19,12 +19,8 @@ package org.apache.struts2.jsf;
import javax.faces.context.FacesContext;
-import com.opensymphony.xwork2.Action;
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionInvocation;
-import com.opensymphony.xwork2.Result;
-import com.opensymphony.xwork2.config.entities.ActionConfig;
-import com.opensymphony.xwork2.config.entities.ResultConfig;
import com.opensymphony.xwork2.interceptor.Interceptor;
/**
diff --git a/core/src/main/java/org/apache/struts2/jsf/StrutsNavigationHandler.java b/core/src/main/java/org/apache/struts2/jsf/StrutsNavigationHandler.java
index 9329d615b..5f53fdbfc 100644
--- a/core/src/main/java/org/apache/struts2/jsf/StrutsNavigationHandler.java
+++ b/core/src/main/java/org/apache/struts2/jsf/StrutsNavigationHandler.java
@@ -19,7 +19,6 @@ package org.apache.struts2.jsf;
import java.util.Map;
-import javax.faces.FactoryFinder;
import javax.faces.application.NavigationHandler;
import javax.faces.context.FacesContext;
diff --git a/core/src/main/java/org/apache/struts2/plexus/PlexusFilter.java b/core/src/main/java/org/apache/struts2/plexus/PlexusFilter.java
index 2dc86966f..fb4e060d2 100644
--- a/core/src/main/java/org/apache/struts2/plexus/PlexusFilter.java
+++ b/core/src/main/java/org/apache/struts2/plexus/PlexusFilter.java
@@ -17,16 +17,23 @@
*/
package org.apache.struts2.plexus;
+import java.io.IOException;
+import java.util.Collections;
+
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.codehaus.plexus.PlexusContainer;
-import javax.servlet.*;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-import java.io.IOException;
-import java.util.Collections;
-
/**
* Creates a plexus container for the application, session, and request
*/
diff --git a/core/src/main/java/org/apache/struts2/plexus/PlexusLifecycleListener.java b/core/src/main/java/org/apache/struts2/plexus/PlexusLifecycleListener.java
index 3e1f30e8f..90aea4cb9 100644
--- a/core/src/main/java/org/apache/struts2/plexus/PlexusLifecycleListener.java
+++ b/core/src/main/java/org/apache/struts2/plexus/PlexusLifecycleListener.java
@@ -17,10 +17,7 @@
*/
package org.apache.struts2.plexus;
-import org.codehaus.plexus.DefaultPlexusContainer;
-import org.codehaus.plexus.PlexusContainer;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import java.util.Collections;
import javax.servlet.ServletContext;
import javax.servlet.ServletContextEvent;
@@ -28,7 +25,11 @@ import javax.servlet.ServletContextListener;
import javax.servlet.http.HttpSession;
import javax.servlet.http.HttpSessionEvent;
import javax.servlet.http.HttpSessionListener;
-import java.util.Collections;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.codehaus.plexus.DefaultPlexusContainer;
+import org.codehaus.plexus.PlexusContainer;
/**
* Manages the Plexus lifecycle for the servlet and session contexts
diff --git a/core/src/main/java/org/apache/struts2/plexus/PlexusObjectFactory.java b/core/src/main/java/org/apache/struts2/plexus/PlexusObjectFactory.java
index 732358f59..3fc478f52 100644
--- a/core/src/main/java/org/apache/struts2/plexus/PlexusObjectFactory.java
+++ b/core/src/main/java/org/apache/struts2/plexus/PlexusObjectFactory.java
@@ -17,6 +17,16 @@
*/
package org.apache.struts2.plexus;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.servlet.ServletContext;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.struts2.util.ObjectFactoryInitializable;
+import org.codehaus.plexus.PlexusContainer;
+
import com.opensymphony.xwork2.Action;
import com.opensymphony.xwork2.ObjectFactory;
import com.opensymphony.xwork2.Result;
@@ -27,14 +37,6 @@ import com.opensymphony.xwork2.config.entities.ResultConfig;
import com.opensymphony.xwork2.interceptor.Interceptor;
import com.opensymphony.xwork2.util.OgnlUtil;
import com.opensymphony.xwork2.validator.Validator;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.struts2.util.ObjectFactoryInitializable;
-import org.codehaus.plexus.PlexusContainer;
-
-import javax.servlet.ServletContext;
-import java.util.HashMap;
-import java.util.Map;
/**
* Plexus integartion. You need three optional files: plexus-request.xml, plexus-session.xml, and
diff --git a/core/src/main/java/org/apache/struts2/plexus/PlexusUtils.java b/core/src/main/java/org/apache/struts2/plexus/PlexusUtils.java
index 3ebc96c34..45d3629cb 100644
--- a/core/src/main/java/org/apache/struts2/plexus/PlexusUtils.java
+++ b/core/src/main/java/org/apache/struts2/plexus/PlexusUtils.java
@@ -17,14 +17,14 @@
*/
package org.apache.struts2.plexus;
-import org.codehaus.plexus.PlexusContainer;
-import org.codehaus.plexus.configuration.PlexusConfigurationResourceException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
+import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.io.InputStreamReader;
-import java.io.ByteArrayInputStream;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.codehaus.plexus.PlexusContainer;
+import org.codehaus.plexus.configuration.PlexusConfigurationResourceException;
/**
* Utility methods for dealing with Plexus
diff --git a/core/src/main/java/org/apache/struts2/portlet/PortletApplicationMap.java b/core/src/main/java/org/apache/struts2/portlet/PortletApplicationMap.java
index a09f7738d..34c5223c4 100644
--- a/core/src/main/java/org/apache/struts2/portlet/PortletApplicationMap.java
+++ b/core/src/main/java/org/apache/struts2/portlet/PortletApplicationMap.java
@@ -33,7 +33,9 @@ import javax.portlet.PortletContext;
*/
public class PortletApplicationMap extends AbstractMap implements Serializable {
- private PortletContext context;
+ private static final long serialVersionUID = 2296107511063504414L;
+
+ private PortletContext context;
private Set entries;
diff --git a/core/src/main/java/org/apache/struts2/portlet/context/PortletActionContext.java b/core/src/main/java/org/apache/struts2/portlet/context/PortletActionContext.java
index 8eb8da4db..86870b409 100644
--- a/core/src/main/java/org/apache/struts2/portlet/context/PortletActionContext.java
+++ b/core/src/main/java/org/apache/struts2/portlet/context/PortletActionContext.java
@@ -28,6 +28,7 @@ import javax.portlet.RenderRequest;
import javax.portlet.RenderResponse;
import org.apache.struts2.portlet.PortletActionConstants;
+
import com.opensymphony.xwork2.ActionContext;
diff --git a/core/src/main/java/org/apache/struts2/portlet/context/PreparatorServlet.java b/core/src/main/java/org/apache/struts2/portlet/context/PreparatorServlet.java
index d0c19a6d3..181229de0 100644
--- a/core/src/main/java/org/apache/struts2/portlet/context/PreparatorServlet.java
+++ b/core/src/main/java/org/apache/struts2/portlet/context/PreparatorServlet.java
@@ -27,8 +27,8 @@ import javax.servlet.http.HttpServletResponse;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
import org.apache.struts2.StrutsStatics;
+
import com.opensymphony.xwork2.ActionContext;
/**
diff --git a/core/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr168Dispatcher.java b/core/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr168Dispatcher.java
index 12f770f43..53dac0f7e 100644
--- a/core/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr168Dispatcher.java
+++ b/core/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr168Dispatcher.java
@@ -60,7 +60,6 @@ import com.opensymphony.xwork2.ActionProxy;
import com.opensymphony.xwork2.ActionProxyFactory;
import com.opensymphony.xwork2.ObjectFactory;
import com.opensymphony.xwork2.config.ConfigurationException;
-import com.opensymphony.xwork2.config.ConfigurationManager;
import com.opensymphony.xwork2.util.LocalizedTextUtil;
import com.opensymphony.xwork2.util.OgnlValueStack;
diff --git a/core/src/main/java/org/apache/struts2/portlet/result/PortletResult.java b/core/src/main/java/org/apache/struts2/portlet/result/PortletResult.java
index 29aacfc0d..b316c6e90 100644
--- a/core/src/main/java/org/apache/struts2/portlet/result/PortletResult.java
+++ b/core/src/main/java/org/apache/struts2/portlet/result/PortletResult.java
@@ -34,11 +34,11 @@ import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
import org.apache.struts2.ServletActionContext;
import org.apache.struts2.dispatcher.StrutsResultSupport;
import org.apache.struts2.portlet.PortletActionConstants;
import org.apache.struts2.portlet.context.PortletActionContext;
+
import com.opensymphony.xwork2.ActionInvocation;
/**
diff --git a/core/src/main/java/org/apache/struts2/portlet/result/PortletVelocityResult.java b/core/src/main/java/org/apache/struts2/portlet/result/PortletVelocityResult.java
index 43fc4190f..ef3cab94a 100644
--- a/core/src/main/java/org/apache/struts2/portlet/result/PortletVelocityResult.java
+++ b/core/src/main/java/org/apache/struts2/portlet/result/PortletVelocityResult.java
@@ -17,23 +17,9 @@
*/
package org.apache.struts2.portlet.result;
-import org.apache.struts2.ServletActionContext;
-import org.apache.struts2.StrutsConstants;
-import org.apache.struts2.config.Settings;
-import org.apache.struts2.dispatcher.StrutsResultSupport;
-import org.apache.struts2.portlet.PortletActionConstants;
-import org.apache.struts2.portlet.context.PortletActionContext;
-import org.apache.struts2.views.JspSupportServlet;
-import org.apache.struts2.views.velocity.VelocityManager;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.ActionInvocation;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.velocity.Template;
-import org.apache.velocity.app.VelocityEngine;
-import org.apache.velocity.context.Context;
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
import javax.portlet.ActionResponse;
import javax.portlet.PortletException;
@@ -45,9 +31,23 @@ import javax.servlet.http.HttpServletResponse;
import javax.servlet.jsp.JspFactory;
import javax.servlet.jsp.PageContext;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.io.Writer;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.struts2.ServletActionContext;
+import org.apache.struts2.StrutsConstants;
+import org.apache.struts2.config.Settings;
+import org.apache.struts2.dispatcher.StrutsResultSupport;
+import org.apache.struts2.portlet.PortletActionConstants;
+import org.apache.struts2.portlet.context.PortletActionContext;
+import org.apache.struts2.views.JspSupportServlet;
+import org.apache.struts2.views.velocity.VelocityManager;
+import org.apache.velocity.Template;
+import org.apache.velocity.app.VelocityEngine;
+import org.apache.velocity.context.Context;
+
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.util.OgnlValueStack;
/**
*
diff --git a/core/src/main/java/org/apache/struts2/portlet/util/PortletUrlHelper.java b/core/src/main/java/org/apache/struts2/portlet/util/PortletUrlHelper.java
index f84574180..ee3920ceb 100644
--- a/core/src/main/java/org/apache/struts2/portlet/util/PortletUrlHelper.java
+++ b/core/src/main/java/org/apache/struts2/portlet/util/PortletUrlHelper.java
@@ -17,6 +17,7 @@
*/
package org.apache.struts2.portlet.util;
+import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import java.util.HashMap;
import java.util.Iterator;
@@ -33,6 +34,7 @@ import javax.portlet.WindowState;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.struts2.StrutsException;
import org.apache.struts2.portlet.PortletActionConstants;
import org.apache.struts2.portlet.context.PortletActionContext;
@@ -45,6 +47,8 @@ import org.apache.struts2.portlet.context.PortletActionContext;
*
*/
public class PortletUrlHelper {
+ public static final String ENCODING = "UTF-8";
+
private static final Log LOG = LogFactory.getLog(PortletUrlHelper.class);
/**
@@ -193,15 +197,20 @@ public class PortletUrlHelper {
if(params != null && params.size() > 0) {
sb.append("?");
Iterator it = params.keySet().iterator();
+ try {
while(it.hasNext()) {
String key = (String)it.next();
String val = (String)params.get(key);
- sb.append(URLEncoder.encode(key)).append("=");
- sb.append(URLEncoder.encode(val));
+
+ sb.append(URLEncoder.encode(key, ENCODING)).append("=");
+ sb.append(URLEncoder.encode(val, ENCODING));
if(it.hasNext()) {
sb.append("&");
}
}
+ } catch (UnsupportedEncodingException e) {
+ throw new StrutsException("Encoding "+ENCODING+" not found");
+ }
}
RenderResponse resp = PortletActionContext.getRenderResponse();
RenderRequest req = PortletActionContext.getRenderRequest();
diff --git a/core/src/main/java/org/apache/struts2/quickstart/Configuration.java b/core/src/main/java/org/apache/struts2/quickstart/Configuration.java
index 3227fca24..2ce54cf44 100644
--- a/core/src/main/java/org/apache/struts2/quickstart/Configuration.java
+++ b/core/src/main/java/org/apache/struts2/quickstart/Configuration.java
@@ -17,20 +17,26 @@
*/
package org.apache.struts2.quickstart;
-import com.thoughtworks.xstream.XStream;
-import org.apache.commons.collections.MultiHashMap;
-import org.w3c.dom.Document;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.Element;
-
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.DocumentBuilder;
-import java.io.*;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+
+import org.apache.commons.collections.MultiHashMap;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
+
+import com.thoughtworks.xstream.XStream;
+
/**
* Configuration for the QuickStart program.
*/
diff --git a/core/src/main/java/org/apache/struts2/quickstart/JettyServer.java b/core/src/main/java/org/apache/struts2/quickstart/JettyServer.java
index 507631df2..3f19c84ad 100644
--- a/core/src/main/java/org/apache/struts2/quickstart/JettyServer.java
+++ b/core/src/main/java/org/apache/struts2/quickstart/JettyServer.java
@@ -17,14 +17,14 @@
*/
package org.apache.struts2.quickstart;
+import java.io.File;
+import java.util.List;
+import java.util.Map;
+
import org.mortbay.http.SocketListener;
import org.mortbay.jetty.Server;
import org.mortbay.jetty.servlet.WebApplicationContext;
-import java.util.List;
-import java.util.Map;
-import java.io.File;
-
/**
* To start a Jetty server used by the QuickStart application.
*/
diff --git a/core/src/main/java/org/apache/struts2/quickstart/MultiDirClassLoader.java b/core/src/main/java/org/apache/struts2/quickstart/MultiDirClassLoader.java
index 236f42a05..98f709ed5 100644
--- a/core/src/main/java/org/apache/struts2/quickstart/MultiDirClassLoader.java
+++ b/core/src/main/java/org/apache/struts2/quickstart/MultiDirClassLoader.java
@@ -17,10 +17,10 @@
*/
package org.apache.struts2.quickstart;
-import java.net.URLClassLoader;
-import java.net.URL;
-import java.net.MalformedURLException;
import java.io.File;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLClassLoader;
import java.util.ArrayList;
/**
diff --git a/core/src/main/java/org/apache/struts2/quickstart/MultiDirResource.java b/core/src/main/java/org/apache/struts2/quickstart/MultiDirResource.java
index 1d12313b9..d2c871017 100644
--- a/core/src/main/java/org/apache/struts2/quickstart/MultiDirResource.java
+++ b/core/src/main/java/org/apache/struts2/quickstart/MultiDirResource.java
@@ -17,12 +17,21 @@
*/
package org.apache.struts2.quickstart;
-import org.mortbay.util.Resource;
-
-import java.io.*;
-import java.util.*;
-import java.net.URL;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import org.mortbay.util.Resource;
/**
*/
diff --git a/core/src/main/java/org/apache/struts2/quickstart/MultiWebApplicationContext.java b/core/src/main/java/org/apache/struts2/quickstart/MultiWebApplicationContext.java
index 824cab24a..d262b0ced 100644
--- a/core/src/main/java/org/apache/struts2/quickstart/MultiWebApplicationContext.java
+++ b/core/src/main/java/org/apache/struts2/quickstart/MultiWebApplicationContext.java
@@ -17,18 +17,18 @@
*/
package org.apache.struts2.quickstart;
-import org.mortbay.jetty.servlet.WebApplicationContext;
-import org.mortbay.util.Resource;
-import org.mortbay.util.JarResource;
-import org.mortbay.util.FileResource;
-
-import java.io.IOException;
import java.io.File;
-import java.net.URLClassLoader;
-import java.net.URL;
+import java.io.IOException;
import java.lang.reflect.Constructor;
-import java.util.Map;
+import java.net.URL;
+import java.net.URLClassLoader;
import java.util.List;
+import java.util.Map;
+
+import org.mortbay.jetty.servlet.WebApplicationContext;
+import org.mortbay.util.FileResource;
+import org.mortbay.util.JarResource;
+import org.mortbay.util.Resource;
/**
*/
diff --git a/core/src/main/java/org/apache/struts2/quickstart/QuickStart.java b/core/src/main/java/org/apache/struts2/quickstart/QuickStart.java
index 335b1899a..7196dde19 100644
--- a/core/src/main/java/org/apache/struts2/quickstart/QuickStart.java
+++ b/core/src/main/java/org/apache/struts2/quickstart/QuickStart.java
@@ -17,19 +17,23 @@
*/
package org.apache.struts2.quickstart;
-import org.apache.struts2.util.classloader.CompilingClassLoader;
-import com.thoughtworks.xstream.XStream;
-import com.thoughtworks.xstream.io.xml.DomDriver;
-
import java.io.File;
-import java.io.FileReader;
import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLClassLoader;
-import java.net.MalformedURLException;
-import java.util.*;
-import java.lang.reflect.Method;
-import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.struts2.util.classloader.CompilingClassLoader;
+
+import com.thoughtworks.xstream.XStream;
+import com.thoughtworks.xstream.io.xml.DomDriver;
/**
* The QuickStart main program.
diff --git a/core/src/main/java/org/apache/struts2/sitegraph/SiteGraph.java b/core/src/main/java/org/apache/struts2/sitegraph/SiteGraph.java
index 0c1dd9169..0daf7c871 100644
--- a/core/src/main/java/org/apache/struts2/sitegraph/SiteGraph.java
+++ b/core/src/main/java/org/apache/struts2/sitegraph/SiteGraph.java
@@ -3,12 +3,16 @@
*/
package org.apache.struts2.sitegraph;
-import org.apache.struts2.StrutsException;
-import org.apache.struts2.sitegraph.renderers.DOTRenderer;
+import java.io.ByteArrayOutputStream;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.Writer;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
-import java.io.*;
+import org.apache.struts2.StrutsException;
+import org.apache.struts2.sitegraph.renderers.DOTRenderer;
/**
* // START SNIPPET: javadocs-intro
diff --git a/core/src/main/java/org/apache/struts2/sitegraph/StrutsConfigRetriever.java b/core/src/main/java/org/apache/struts2/sitegraph/StrutsConfigRetriever.java
index a9f73ad16..6035d4d06 100644
--- a/core/src/main/java/org/apache/struts2/sitegraph/StrutsConfigRetriever.java
+++ b/core/src/main/java/org/apache/struts2/sitegraph/StrutsConfigRetriever.java
@@ -3,19 +3,6 @@
*/
package org.apache.struts2.sitegraph;
-import com.opensymphony.xwork2.config.ConfigurationManager;
-import com.opensymphony.xwork2.config.ConfigurationProvider;
-import com.opensymphony.xwork2.config.entities.ActionConfig;
-import com.opensymphony.xwork2.config.entities.ResultConfig;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.struts2.config.StrutsXMLConfigurationProvider;
-import org.apache.struts2.dispatcher.Dispatcher;
-import org.apache.struts2.sitegraph.entities.FreeMarkerView;
-import org.apache.struts2.sitegraph.entities.JspView;
-import org.apache.struts2.sitegraph.entities.VelocityView;
-import org.apache.struts2.sitegraph.entities.View;
-
import java.io.File;
import java.io.IOException;
import java.util.Collections;
@@ -23,6 +10,19 @@ import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Set;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.struts2.config.StrutsXMLConfigurationProvider;
+import org.apache.struts2.sitegraph.entities.FreeMarkerView;
+import org.apache.struts2.sitegraph.entities.JspView;
+import org.apache.struts2.sitegraph.entities.VelocityView;
+import org.apache.struts2.sitegraph.entities.View;
+
+import com.opensymphony.xwork2.config.ConfigurationManager;
+import com.opensymphony.xwork2.config.ConfigurationProvider;
+import com.opensymphony.xwork2.config.entities.ActionConfig;
+import com.opensymphony.xwork2.config.entities.ResultConfig;
+
/**
* Initializes and retrieves XWork config elements
*/
diff --git a/core/src/main/java/org/apache/struts2/sitegraph/entities/FileBasedView.java b/core/src/main/java/org/apache/struts2/sitegraph/entities/FileBasedView.java
index 4894fd5d5..9086d7dd1 100644
--- a/core/src/main/java/org/apache/struts2/sitegraph/entities/FileBasedView.java
+++ b/core/src/main/java/org/apache/struts2/sitegraph/entities/FileBasedView.java
@@ -17,17 +17,18 @@
*/
package org.apache.struts2.sitegraph.entities;
-import com.opensymphony.util.FileUtils;
-import org.apache.struts2.config.Settings;
-import org.apache.struts2.sitegraph.model.Link;
-import org.apache.struts2.StrutsConstants;
-
import java.io.File;
import java.util.Set;
import java.util.TreeSet;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import org.apache.struts2.StrutsConstants;
+import org.apache.struts2.config.Settings;
+import org.apache.struts2.sitegraph.model.Link;
+
+import com.opensymphony.util.FileUtils;
+
/**
*/
public abstract class FileBasedView implements View {
diff --git a/core/src/main/java/org/apache/struts2/sitegraph/model/Graph.java b/core/src/main/java/org/apache/struts2/sitegraph/model/Graph.java
index 69445c54b..cd1eb1637 100644
--- a/core/src/main/java/org/apache/struts2/sitegraph/model/Graph.java
+++ b/core/src/main/java/org/apache/struts2/sitegraph/model/Graph.java
@@ -18,7 +18,11 @@
package org.apache.struts2.sitegraph.model;
import java.io.IOException;
-import java.util.*;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeSet;
/**
*/
diff --git a/core/src/main/java/org/apache/struts2/sitegraph/renderers/DOTRenderer.java b/core/src/main/java/org/apache/struts2/sitegraph/renderers/DOTRenderer.java
index 9ead67c2e..f9d24d465 100644
--- a/core/src/main/java/org/apache/struts2/sitegraph/renderers/DOTRenderer.java
+++ b/core/src/main/java/org/apache/struts2/sitegraph/renderers/DOTRenderer.java
@@ -17,20 +17,33 @@
*/
package org.apache.struts2.sitegraph.renderers;
+import java.io.IOException;
+import java.io.Writer;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeMap;
+
+import org.apache.struts2.StrutsConstants;
import org.apache.struts2.config.Settings;
import org.apache.struts2.sitegraph.StrutsConfigRetriever;
import org.apache.struts2.sitegraph.entities.Target;
import org.apache.struts2.sitegraph.entities.View;
-import org.apache.struts2.sitegraph.model.*;
-import org.apache.struts2.StrutsConstants;
+import org.apache.struts2.sitegraph.model.ActionNode;
+import org.apache.struts2.sitegraph.model.Graph;
+import org.apache.struts2.sitegraph.model.IndentWriter;
+import org.apache.struts2.sitegraph.model.Link;
+import org.apache.struts2.sitegraph.model.SiteGraphNode;
+import org.apache.struts2.sitegraph.model.SubGraph;
+import org.apache.struts2.sitegraph.model.ViewNode;
+
import com.opensymphony.xwork2.ActionChainResult;
import com.opensymphony.xwork2.config.entities.ActionConfig;
import com.opensymphony.xwork2.config.entities.ResultConfig;
-import java.io.IOException;
-import java.io.Writer;
-import java.util.*;
-
/**
* Renders flow diagram to the console at info level
*/
diff --git a/core/src/main/java/org/apache/struts2/sitemesh/FreeMarkerPageFilter.java b/core/src/main/java/org/apache/struts2/sitemesh/FreeMarkerPageFilter.java
index e28a78406..c96218e1d 100644
--- a/core/src/main/java/org/apache/struts2/sitemesh/FreeMarkerPageFilter.java
+++ b/core/src/main/java/org/apache/struts2/sitemesh/FreeMarkerPageFilter.java
@@ -17,23 +17,28 @@
*/
package org.apache.struts2.sitemesh;
-import com.opensymphony.module.sitemesh.Decorator;
-import com.opensymphony.module.sitemesh.Page;
-import com.opensymphony.module.sitemesh.HTMLPage;
-import org.apache.struts2.views.freemarker.FreemarkerManager;
-import com.opensymphony.xwork2.*;
-import freemarker.template.Configuration;
-import freemarker.template.SimpleHash;
-import freemarker.template.Template;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import java.io.IOException;
+import java.util.Locale;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.util.Locale;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.struts2.views.freemarker.FreemarkerManager;
+
+import com.opensymphony.module.sitemesh.Decorator;
+import com.opensymphony.module.sitemesh.HTMLPage;
+import com.opensymphony.module.sitemesh.Page;
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.LocaleProvider;
+
+import freemarker.template.Configuration;
+import freemarker.template.SimpleHash;
+import freemarker.template.Template;
/**
* Applies FreeMarker-based sitemesh decorators.
diff --git a/core/src/main/java/org/apache/struts2/sitemesh/TemplatePageFilter.java b/core/src/main/java/org/apache/struts2/sitemesh/TemplatePageFilter.java
index 81256bcd2..4a56d2078 100644
--- a/core/src/main/java/org/apache/struts2/sitemesh/TemplatePageFilter.java
+++ b/core/src/main/java/org/apache/struts2/sitemesh/TemplatePageFilter.java
@@ -17,24 +17,29 @@
*/
package org.apache.struts2.sitemesh;
-import com.opensymphony.module.sitemesh.Decorator;
-import com.opensymphony.module.sitemesh.Page;
-import com.opensymphony.module.sitemesh.filter.PageFilter;
-import org.apache.struts2.ServletActionContext;
-import org.apache.struts2.dispatcher.Dispatcher;
-import org.apache.struts2.StrutsConstants;
-import org.apache.struts2.config.Settings;
-
-import com.opensymphony.xwork2.*;
-import com.opensymphony.xwork2.interceptor.PreResultListener;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import java.io.IOException;
import javax.servlet.FilterConfig;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
+
+import org.apache.struts2.ServletActionContext;
+import org.apache.struts2.StrutsConstants;
+import org.apache.struts2.config.Settings;
+import org.apache.struts2.dispatcher.Dispatcher;
+
+import com.opensymphony.module.sitemesh.Decorator;
+import com.opensymphony.module.sitemesh.Page;
+import com.opensymphony.module.sitemesh.filter.PageFilter;
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.ActionProxy;
+import com.opensymphony.xwork2.ActionSupport;
+import com.opensymphony.xwork2.Result;
+import com.opensymphony.xwork2.interceptor.PreResultListener;
+import com.opensymphony.xwork2.util.OgnlValueStack;
/**
* An abstract template page filter that sets up the proper contexts for
diff --git a/core/src/main/java/org/apache/struts2/sitemesh/VelocityPageFilter.java b/core/src/main/java/org/apache/struts2/sitemesh/VelocityPageFilter.java
index 411d8e204..0272ba240 100644
--- a/core/src/main/java/org/apache/struts2/sitemesh/VelocityPageFilter.java
+++ b/core/src/main/java/org/apache/struts2/sitemesh/VelocityPageFilter.java
@@ -17,22 +17,24 @@
*/
package org.apache.struts2.sitemesh;
-import com.opensymphony.module.sitemesh.Decorator;
-import com.opensymphony.module.sitemesh.Page;
-import com.opensymphony.module.sitemesh.HTMLPage;
-import org.apache.struts2.views.velocity.VelocityManager;
-import com.opensymphony.xwork2.ActionContext;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.velocity.Template;
-import org.apache.velocity.context.Context;
+import java.io.IOException;
+import java.io.PrintWriter;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.PrintWriter;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.struts2.views.velocity.VelocityManager;
+import org.apache.velocity.Template;
+import org.apache.velocity.context.Context;
+
+import com.opensymphony.module.sitemesh.Decorator;
+import com.opensymphony.module.sitemesh.HTMLPage;
+import com.opensymphony.module.sitemesh.Page;
+import com.opensymphony.xwork2.ActionContext;
/**
diff --git a/core/src/main/java/org/apache/struts2/spring/StrutsSpringObjectFactory.java b/core/src/main/java/org/apache/struts2/spring/StrutsSpringObjectFactory.java
index 6c8b13fe8..45d1e4d30 100644
--- a/core/src/main/java/org/apache/struts2/spring/StrutsSpringObjectFactory.java
+++ b/core/src/main/java/org/apache/struts2/spring/StrutsSpringObjectFactory.java
@@ -17,17 +17,18 @@
*/
package org.apache.struts2.spring;
-import org.apache.struts2.config.Settings;
-import org.apache.struts2.util.ObjectFactoryInitializable;
-import org.apache.struts2.StrutsConstants;
-import com.opensymphony.xwork2.spring.SpringObjectFactory;
+import javax.servlet.ServletContext;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.struts2.StrutsConstants;
+import org.apache.struts2.config.Settings;
+import org.apache.struts2.util.ObjectFactoryInitializable;
import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
import org.springframework.context.ApplicationContext;
import org.springframework.web.context.support.WebApplicationContextUtils;
-import javax.servlet.ServletContext;
+import com.opensymphony.xwork2.spring.SpringObjectFactory;
diff --git a/core/src/main/java/org/apache/struts2/spring/lifecycle/SpringExternalReferenceResolverSetupListener.java b/core/src/main/java/org/apache/struts2/spring/lifecycle/SpringExternalReferenceResolverSetupListener.java
index 9b58850fc..b98688508 100644
--- a/core/src/main/java/org/apache/struts2/spring/lifecycle/SpringExternalReferenceResolverSetupListener.java
+++ b/core/src/main/java/org/apache/struts2/spring/lifecycle/SpringExternalReferenceResolverSetupListener.java
@@ -17,24 +17,23 @@
*/
package org.apache.struts2.spring.lifecycle;
-import com.opensymphony.xwork2.config.Configuration;
-import com.opensymphony.xwork2.config.ExternalReferenceResolver;
-import com.opensymphony.xwork2.config.entities.PackageConfig;
-
-import org.apache.struts2.dispatcher.DispatcherListener;
-import org.apache.struts2.dispatcher.Dispatcher;
-import org.apache.struts2.util.ServletContextAware;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
-import org.springframework.web.context.support.WebApplicationContextUtils;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
import javax.servlet.ServletContext;
import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
+import org.apache.struts2.dispatcher.Dispatcher;
+import org.apache.struts2.dispatcher.DispatcherListener;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.web.context.support.WebApplicationContextUtils;
+
+import com.opensymphony.xwork2.config.Configuration;
+import com.opensymphony.xwork2.config.ExternalReferenceResolver;
+import com.opensymphony.xwork2.config.entities.PackageConfig;
/**
* Setup any {@link com.opensymphony.xwork2.config.ExternalReferenceResolver}s
diff --git a/core/src/main/java/org/apache/struts2/util/AppendIteratorFilter.java b/core/src/main/java/org/apache/struts2/util/AppendIteratorFilter.java
index 645445792..a148e6598 100644
--- a/core/src/main/java/org/apache/struts2/util/AppendIteratorFilter.java
+++ b/core/src/main/java/org/apache/struts2/util/AppendIteratorFilter.java
@@ -17,12 +17,12 @@
*/
package org.apache.struts2.util;
-import com.opensymphony.xwork2.Action;
-
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+import com.opensymphony.xwork2.Action;
+
/**
* A bean that takes several iterators and outputs them in sequence
diff --git a/core/src/main/java/org/apache/struts2/util/AttributeMap.java b/core/src/main/java/org/apache/struts2/util/AttributeMap.java
index 1248b1848..93b04ccdf 100644
--- a/core/src/main/java/org/apache/struts2/util/AttributeMap.java
+++ b/core/src/main/java/org/apache/struts2/util/AttributeMap.java
@@ -17,14 +17,15 @@
*/
package org.apache.struts2.util;
-import org.apache.struts2.ServletActionContext;
-
-import javax.servlet.jsp.PageContext;
import java.util.Collection;
import java.util.Collections;
import java.util.Map;
import java.util.Set;
+import javax.servlet.jsp.PageContext;
+
+import org.apache.struts2.ServletActionContext;
+
/**
* A Map that holds 4 levels of scope.
diff --git a/core/src/main/java/org/apache/struts2/util/InvocationSessionStore.java b/core/src/main/java/org/apache/struts2/util/InvocationSessionStore.java
index 5f1ab64c8..ec85d6eef 100644
--- a/core/src/main/java/org/apache/struts2/util/InvocationSessionStore.java
+++ b/core/src/main/java/org/apache/struts2/util/InvocationSessionStore.java
@@ -17,14 +17,14 @@
*/
package org.apache.struts2.util;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.ActionInvocation;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import java.io.Serializable;
import java.util.HashMap;
import java.util.Map;
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* InvocationSessionStore
diff --git a/core/src/main/java/org/apache/struts2/util/IteratorGenerator.java b/core/src/main/java/org/apache/struts2/util/IteratorGenerator.java
index 9d3deae9c..6bf81d650 100644
--- a/core/src/main/java/org/apache/struts2/util/IteratorGenerator.java
+++ b/core/src/main/java/org/apache/struts2/util/IteratorGenerator.java
@@ -17,8 +17,6 @@
*/
package org.apache.struts2.util;
-import com.opensymphony.xwork2.Action;
-
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -27,6 +25,8 @@ import java.util.StringTokenizer;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import com.opensymphony.xwork2.Action;
+
/**
* A bean that generates an iterator filled with a given object depending on the count,
diff --git a/core/src/main/java/org/apache/struts2/util/MakeIterator.java b/core/src/main/java/org/apache/struts2/util/MakeIterator.java
index 1f0c54d9f..fe59ec284 100644
--- a/core/src/main/java/org/apache/struts2/util/MakeIterator.java
+++ b/core/src/main/java/org/apache/struts2/util/MakeIterator.java
@@ -18,7 +18,12 @@
package org.apache.struts2.util;
import java.lang.reflect.Array;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Enumeration;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
/**
@@ -74,7 +79,6 @@ public class MakeIterator {
} else if (value.getClass().isArray()) {
//need ability to support primitives; therefore, cannot
//use Object[] casting.
- Object a = Array.newInstance(value.getClass().getComponentType(), (Array.getLength(value)));
ArrayList list = new ArrayList(Array.getLength(value));
for (int j = 0; j < Array.getLength(value); j++) {
diff --git a/core/src/main/java/org/apache/struts2/util/MergeIteratorFilter.java b/core/src/main/java/org/apache/struts2/util/MergeIteratorFilter.java
index 62b9efaba..e46ec4685 100644
--- a/core/src/main/java/org/apache/struts2/util/MergeIteratorFilter.java
+++ b/core/src/main/java/org/apache/struts2/util/MergeIteratorFilter.java
@@ -17,12 +17,12 @@
*/
package org.apache.struts2.util;
-import com.opensymphony.xwork2.Action;
-
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+import com.opensymphony.xwork2.Action;
+
/**
* A bean that takes several iterators and outputs the merge of them. Used by
diff --git a/core/src/main/java/org/apache/struts2/util/ResolverSetupServletContextListener.java b/core/src/main/java/org/apache/struts2/util/ResolverSetupServletContextListener.java
index 1f76d80c5..9f26f8651 100644
--- a/core/src/main/java/org/apache/struts2/util/ResolverSetupServletContextListener.java
+++ b/core/src/main/java/org/apache/struts2/util/ResolverSetupServletContextListener.java
@@ -17,8 +17,9 @@
*/
package org.apache.struts2.util;
-import com.opensymphony.xwork2.config.Configuration;
-import com.opensymphony.xwork2.config.entities.PackageConfig;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
import javax.servlet.ServletContext;
import javax.servlet.ServletContextEvent;
@@ -27,9 +28,8 @@ import javax.servlet.ServletContextListener;
import org.apache.struts2.dispatcher.Dispatcher;
import org.apache.struts2.dispatcher.DispatcherListener;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
+import com.opensymphony.xwork2.config.Configuration;
+import com.opensymphony.xwork2.config.entities.PackageConfig;
/**
diff --git a/core/src/main/java/org/apache/struts2/util/SortIteratorFilter.java b/core/src/main/java/org/apache/struts2/util/SortIteratorFilter.java
index e333f89ab..9fdf2c5a7 100644
--- a/core/src/main/java/org/apache/struts2/util/SortIteratorFilter.java
+++ b/core/src/main/java/org/apache/struts2/util/SortIteratorFilter.java
@@ -17,10 +17,15 @@
*/
package org.apache.struts2.util;
-import com.opensymphony.xwork2.Action;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.List;
+
import org.apache.commons.logging.LogFactory;
-import java.util.*;
+import com.opensymphony.xwork2.Action;
/**
diff --git a/core/src/main/java/org/apache/struts2/util/Sorter.java b/core/src/main/java/org/apache/struts2/util/Sorter.java
index dce9c316a..85d08f278 100644
--- a/core/src/main/java/org/apache/struts2/util/Sorter.java
+++ b/core/src/main/java/org/apache/struts2/util/Sorter.java
@@ -17,10 +17,10 @@
*/
package org.apache.struts2.util;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import java.util.Comparator;
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* Sorters. Utility sorters for use with the "sort" tag.
diff --git a/core/src/main/java/org/apache/struts2/util/StrutsTypeConverter.java b/core/src/main/java/org/apache/struts2/util/StrutsTypeConverter.java
index 8e541a6d4..bb16068a5 100644
--- a/core/src/main/java/org/apache/struts2/util/StrutsTypeConverter.java
+++ b/core/src/main/java/org/apache/struts2/util/StrutsTypeConverter.java
@@ -17,10 +17,10 @@
*/
package org.apache.struts2.util;
-import ognl.DefaultTypeConverter;
-
import java.util.Map;
+import ognl.DefaultTypeConverter;
+
/**
*
*
diff --git a/core/src/main/java/org/apache/struts2/util/StrutsUtil.java b/core/src/main/java/org/apache/struts2/util/StrutsUtil.java
index cb40e3195..fcd8bc34d 100644
--- a/core/src/main/java/org/apache/struts2/util/StrutsUtil.java
+++ b/core/src/main/java/org/apache/struts2/util/StrutsUtil.java
@@ -17,25 +17,33 @@
*/
package org.apache.struts2.util;
-import com.opensymphony.util.TextUtils;
-import org.apache.struts2.views.jsp.ui.OgnlTool;
-import org.apache.struts2.views.util.UrlHelper;
-import com.opensymphony.xwork2.ObjectFactory;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
import javax.servlet.RequestDispatcher;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpServletResponseWrapper;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-import java.util.*;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.struts2.views.jsp.ui.OgnlTool;
+import org.apache.struts2.views.util.UrlHelper;
+
+import com.opensymphony.util.TextUtils;
+import com.opensymphony.xwork2.ObjectFactory;
+import com.opensymphony.xwork2.util.OgnlValueStack;
/**
diff --git a/core/src/main/java/org/apache/struts2/util/SubsetIteratorFilter.java b/core/src/main/java/org/apache/struts2/util/SubsetIteratorFilter.java
index 2cd2f94d5..5909dc168 100644
--- a/core/src/main/java/org/apache/struts2/util/SubsetIteratorFilter.java
+++ b/core/src/main/java/org/apache/struts2/util/SubsetIteratorFilter.java
@@ -17,14 +17,14 @@
*/
package org.apache.struts2.util;
-import com.opensymphony.xwork2.Action;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
+import com.opensymphony.xwork2.Action;
/**
diff --git a/core/src/main/java/org/apache/struts2/util/TokenHelper.java b/core/src/main/java/org/apache/struts2/util/TokenHelper.java
index 9a7ff9990..8094bd894 100644
--- a/core/src/main/java/org/apache/struts2/util/TokenHelper.java
+++ b/core/src/main/java/org/apache/struts2/util/TokenHelper.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.util;
-import com.opensymphony.util.GUID;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.util.LocalizedTextUtil;
+import java.util.Map;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import java.util.Map;
+import com.opensymphony.util.GUID;
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.util.LocalizedTextUtil;
/**
* TokenHelper
diff --git a/core/src/main/java/org/apache/struts2/util/URLBean.java b/core/src/main/java/org/apache/struts2/util/URLBean.java
index 0809e945e..db5cd3db4 100644
--- a/core/src/main/java/org/apache/struts2/util/URLBean.java
+++ b/core/src/main/java/org/apache/struts2/util/URLBean.java
@@ -17,12 +17,13 @@
*/
package org.apache.struts2.util;
-import org.apache.struts2.views.util.UrlHelper;
+import java.util.HashMap;
+import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import java.util.HashMap;
-import java.util.Map;
+
+import org.apache.struts2.views.util.UrlHelper;
/**
diff --git a/core/src/main/java/org/apache/struts2/util/VelocityStrutsUtil.java b/core/src/main/java/org/apache/struts2/util/VelocityStrutsUtil.java
index 5408c89af..5a28b093b 100644
--- a/core/src/main/java/org/apache/struts2/util/VelocityStrutsUtil.java
+++ b/core/src/main/java/org/apache/struts2/util/VelocityStrutsUtil.java
@@ -17,17 +17,19 @@
*/
package org.apache.struts2.util;
+import java.io.CharArrayWriter;
+import java.io.IOException;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
import org.apache.struts2.views.velocity.VelocityManager;
-import com.opensymphony.xwork2.util.OgnlValueStack;
import org.apache.velocity.context.Context;
import org.apache.velocity.exception.MethodInvocationException;
import org.apache.velocity.exception.ParseErrorException;
import org.apache.velocity.exception.ResourceNotFoundException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.CharArrayWriter;
-import java.io.IOException;
+import com.opensymphony.xwork2.util.OgnlValueStack;
/**
diff --git a/core/src/main/java/org/apache/struts2/util/classloader/CompilingClassLoader.java b/core/src/main/java/org/apache/struts2/util/classloader/CompilingClassLoader.java
index d461ce89b..a8346e5d8 100644
--- a/core/src/main/java/org/apache/struts2/util/classloader/CompilingClassLoader.java
+++ b/core/src/main/java/org/apache/struts2/util/classloader/CompilingClassLoader.java
@@ -17,15 +17,16 @@
*/
package org.apache.struts2.util.classloader;
+import java.io.File;
+
import org.apache.struts2.util.classloader.compilers.JavaCompiler;
import org.apache.struts2.util.classloader.compilers.eclipse.EclipseJavaCompiler;
import org.apache.struts2.util.classloader.listeners.CompilingListener;
import org.apache.struts2.util.classloader.monitor.FilesystemAlterationMonitor;
import org.apache.struts2.util.classloader.stores.MemoryResourceStore;
import org.apache.struts2.util.classloader.stores.TransactionalResourceStore;
-import com.uwyn.rife.continuations.ClassByteAware;
-import java.io.File;
+import com.uwyn.rife.continuations.ClassByteAware;
/**
*/
diff --git a/core/src/main/java/org/apache/struts2/util/classloader/ReloadingClassLoader.java b/core/src/main/java/org/apache/struts2/util/classloader/ReloadingClassLoader.java
index 4a405890a..3f17829f4 100644
--- a/core/src/main/java/org/apache/struts2/util/classloader/ReloadingClassLoader.java
+++ b/core/src/main/java/org/apache/struts2/util/classloader/ReloadingClassLoader.java
@@ -17,21 +17,23 @@
*/
package org.apache.struts2.util.classloader;
-import org.apache.struts2.util.classloader.listeners.ReloadingListener;
+import java.io.File;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.struts2.util.classloader.listeners.CompilingListener;
+import org.apache.struts2.util.classloader.listeners.ReloadingListener;
import org.apache.struts2.util.classloader.monitor.FilesystemAlterationMonitor;
import org.apache.struts2.util.classloader.readers.FileResourceReader;
import org.apache.struts2.util.classloader.readers.ResourceReader;
import org.apache.struts2.util.classloader.stores.MemoryResourceStore;
import org.apache.struts2.util.classloader.stores.ResourceStore;
import org.apache.struts2.util.classloader.stores.ResourceStoreClassLoader;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import java.io.File;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.*;
/**
*/
diff --git a/core/src/main/java/org/apache/struts2/util/classloader/compilers/eclipse/EclipseJavaCompiler.java b/core/src/main/java/org/apache/struts2/util/classloader/compilers/eclipse/EclipseJavaCompiler.java
index 5c75c5870..c5beed764 100644
--- a/core/src/main/java/org/apache/struts2/util/classloader/compilers/eclipse/EclipseJavaCompiler.java
+++ b/core/src/main/java/org/apache/struts2/util/classloader/compilers/eclipse/EclipseJavaCompiler.java
@@ -17,16 +17,31 @@
*/
package org.apache.struts2.util.classloader.compilers.eclipse;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.HashSet;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+import java.util.StringTokenizer;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.struts2.util.classloader.compilers.JavaCompiler;
import org.apache.struts2.util.classloader.problems.CompilationProblemHandler;
import org.apache.struts2.util.classloader.readers.ResourceReader;
import org.apache.struts2.util.classloader.stores.ResourceStore;
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.eclipse.jdt.core.compiler.IProblem;
-import org.eclipse.jdt.internal.compiler.*;
+import org.eclipse.jdt.internal.compiler.ClassFile;
+import org.eclipse.jdt.internal.compiler.CompilationResult;
import org.eclipse.jdt.internal.compiler.Compiler;
+import org.eclipse.jdt.internal.compiler.DefaultErrorHandlingPolicies;
+import org.eclipse.jdt.internal.compiler.ICompilerRequestor;
+import org.eclipse.jdt.internal.compiler.IErrorHandlingPolicy;
+import org.eclipse.jdt.internal.compiler.IProblemFactory;
import org.eclipse.jdt.internal.compiler.classfmt.ClassFileReader;
import org.eclipse.jdt.internal.compiler.classfmt.ClassFormatException;
import org.eclipse.jdt.internal.compiler.env.ICompilationUnit;
@@ -34,12 +49,6 @@ import org.eclipse.jdt.internal.compiler.env.INameEnvironment;
import org.eclipse.jdt.internal.compiler.env.NameEnvironmentAnswer;
import org.eclipse.jdt.internal.compiler.problem.DefaultProblemFactory;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.*;
-
public final class EclipseJavaCompiler implements JavaCompiler {
private final static Log log = LogFactory.getLog(EclipseJavaCompiler.class);
diff --git a/core/src/main/java/org/apache/struts2/util/classloader/compilers/eclipse/EclipseJavaCompilerSettings.java b/core/src/main/java/org/apache/struts2/util/classloader/compilers/eclipse/EclipseJavaCompilerSettings.java
index a55421a82..1a782b735 100644
--- a/core/src/main/java/org/apache/struts2/util/classloader/compilers/eclipse/EclipseJavaCompilerSettings.java
+++ b/core/src/main/java/org/apache/struts2/util/classloader/compilers/eclipse/EclipseJavaCompilerSettings.java
@@ -17,12 +17,12 @@
*/
package org.apache.struts2.util.classloader.compilers.eclipse;
-import org.apache.struts2.util.classloader.compilers.JavaCompilerSettings;
-import org.eclipse.jdt.internal.compiler.impl.CompilerOptions;
-
import java.util.HashMap;
import java.util.Map;
+import org.apache.struts2.util.classloader.compilers.JavaCompilerSettings;
+import org.eclipse.jdt.internal.compiler.impl.CompilerOptions;
+
public class EclipseJavaCompilerSettings implements JavaCompilerSettings {
private final Map map = new HashMap();
diff --git a/core/src/main/java/org/apache/struts2/util/classloader/listeners/CompilingListener.java b/core/src/main/java/org/apache/struts2/util/classloader/listeners/CompilingListener.java
index 3afea5736..121f78733 100644
--- a/core/src/main/java/org/apache/struts2/util/classloader/listeners/CompilingListener.java
+++ b/core/src/main/java/org/apache/struts2/util/classloader/listeners/CompilingListener.java
@@ -17,22 +17,22 @@
*/
package org.apache.struts2.util.classloader.listeners;
-import org.apache.struts2.util.classloader.ReloadingClassLoader;
-import org.apache.struts2.util.classloader.compilers.JavaCompiler;
-import org.apache.struts2.util.classloader.monitor.FilesystemAlterationListener;
-import org.apache.struts2.util.classloader.problems.CompilationProblem;
-import org.apache.struts2.util.classloader.problems.DefaultCompilationProblemHandler;
-import org.apache.struts2.util.classloader.problems.ConsoleCompilationProblemHandler;
-import org.apache.struts2.util.classloader.readers.ResourceReader;
-import org.apache.struts2.util.classloader.stores.TransactionalResourceStore;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
import java.io.File;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.struts2.util.classloader.ReloadingClassLoader;
+import org.apache.struts2.util.classloader.compilers.JavaCompiler;
+import org.apache.struts2.util.classloader.monitor.FilesystemAlterationListener;
+import org.apache.struts2.util.classloader.problems.CompilationProblem;
+import org.apache.struts2.util.classloader.problems.ConsoleCompilationProblemHandler;
+import org.apache.struts2.util.classloader.problems.DefaultCompilationProblemHandler;
+import org.apache.struts2.util.classloader.readers.ResourceReader;
+import org.apache.struts2.util.classloader.stores.TransactionalResourceStore;
+
public class CompilingListener implements FilesystemAlterationListener {
diff --git a/core/src/main/java/org/apache/struts2/util/classloader/listeners/ReloadingListener.java b/core/src/main/java/org/apache/struts2/util/classloader/listeners/ReloadingListener.java
index 4e7e5bcf6..c687fb3cf 100644
--- a/core/src/main/java/org/apache/struts2/util/classloader/listeners/ReloadingListener.java
+++ b/core/src/main/java/org/apache/struts2/util/classloader/listeners/ReloadingListener.java
@@ -17,18 +17,18 @@
*/
package org.apache.struts2.util.classloader.listeners;
-import org.apache.struts2.util.classloader.monitor.FilesystemAlterationListener;
-import org.apache.struts2.util.classloader.stores.ResourceStore;
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
import java.io.File;
import java.io.FileReader;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.struts2.util.classloader.monitor.FilesystemAlterationListener;
+import org.apache.struts2.util.classloader.stores.ResourceStore;
+
public class ReloadingListener implements FilesystemAlterationListener {
diff --git a/core/src/main/java/org/apache/struts2/util/classloader/monitor/FilesystemAlterationMonitor.java b/core/src/main/java/org/apache/struts2/util/classloader/monitor/FilesystemAlterationMonitor.java
index de970b0c5..0be7f0e5b 100644
--- a/core/src/main/java/org/apache/struts2/util/classloader/monitor/FilesystemAlterationMonitor.java
+++ b/core/src/main/java/org/apache/struts2/util/classloader/monitor/FilesystemAlterationMonitor.java
@@ -17,14 +17,19 @@
*/
package org.apache.struts2.util.classloader.monitor;
-import org.apache.struts2.util.classloader.utils.ThreadUtils;
+import java.io.File;
+import java.io.FileFilter;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+
import org.apache.commons.collections.MultiHashMap;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
-import java.io.File;
-import java.io.FileFilter;
-import java.util.*;
+import org.apache.struts2.util.classloader.utils.ThreadUtils;
/**
*/
diff --git a/core/src/main/java/org/apache/struts2/util/classloader/readers/FileResourceReader.java b/core/src/main/java/org/apache/struts2/util/classloader/readers/FileResourceReader.java
index 72c55ec05..bd76fdeab 100644
--- a/core/src/main/java/org/apache/struts2/util/classloader/readers/FileResourceReader.java
+++ b/core/src/main/java/org/apache/struts2/util/classloader/readers/FileResourceReader.java
@@ -17,10 +17,10 @@
*/
package org.apache.struts2.util.classloader.readers;
-import org.apache.commons.io.FileUtils;
-
import java.io.File;
+import org.apache.commons.io.FileUtils;
+
/**
*/
public final class FileResourceReader implements ResourceReader {
diff --git a/core/src/main/java/org/apache/struts2/util/classloader/stores/FileResourceStore.java b/core/src/main/java/org/apache/struts2/util/classloader/stores/FileResourceStore.java
index 63ccbbf41..45d9d3c64 100644
--- a/core/src/main/java/org/apache/struts2/util/classloader/stores/FileResourceStore.java
+++ b/core/src/main/java/org/apache/struts2/util/classloader/stores/FileResourceStore.java
@@ -17,9 +17,15 @@
*/
package org.apache.struts2.util.classloader.stores;
-import org.apache.commons.io.IOUtils;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
-import java.io.*;
+import org.apache.commons.io.IOUtils;
/**
diff --git a/core/src/main/java/org/apache/struts2/util/classloader/stores/MemoryResourceStore.java b/core/src/main/java/org/apache/struts2/util/classloader/stores/MemoryResourceStore.java
index dcdf23eb3..58a60d5b1 100644
--- a/core/src/main/java/org/apache/struts2/util/classloader/stores/MemoryResourceStore.java
+++ b/core/src/main/java/org/apache/struts2/util/classloader/stores/MemoryResourceStore.java
@@ -17,12 +17,12 @@
*/
package org.apache.struts2.util.classloader.stores;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
import java.util.HashMap;
import java.util.Map;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
/**
*/
diff --git a/core/src/main/java/org/apache/struts2/validators/DWRValidator.java b/core/src/main/java/org/apache/struts2/validators/DWRValidator.java
index b18ca77b6..9c27d8531 100644
--- a/core/src/main/java/org/apache/struts2/validators/DWRValidator.java
+++ b/core/src/main/java/org/apache/struts2/validators/DWRValidator.java
@@ -17,23 +17,30 @@
*/
package org.apache.struts2.validators;
-import org.apache.struts2.dispatcher.ApplicationMap;
-import org.apache.struts2.dispatcher.Dispatcher;
-import org.apache.struts2.dispatcher.RequestMap;
-import org.apache.struts2.dispatcher.SessionMap;
-import com.opensymphony.xwork2.*;
-import com.opensymphony.xwork2.config.Configuration;
-import com.opensymphony.xwork2.config.ConfigurationManager;
-import com.opensymphony.xwork2.config.entities.ActionConfig;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import uk.ltd.getahead.dwr.ExecutionContext;
+import java.util.HashMap;
+import java.util.Map;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import java.util.HashMap;
-import java.util.Map;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.struts2.dispatcher.ApplicationMap;
+import org.apache.struts2.dispatcher.Dispatcher;
+import org.apache.struts2.dispatcher.RequestMap;
+import org.apache.struts2.dispatcher.SessionMap;
+
+import uk.ltd.getahead.dwr.WebContextFactory;
+
+import com.opensymphony.xwork2.Action;
+import com.opensymphony.xwork2.ActionProxy;
+import com.opensymphony.xwork2.DefaultActionInvocation;
+import com.opensymphony.xwork2.DefaultActionProxy;
+import com.opensymphony.xwork2.ValidationAware;
+import com.opensymphony.xwork2.ValidationAwareSupport;
+import com.opensymphony.xwork2.config.Configuration;
+import com.opensymphony.xwork2.config.entities.ActionConfig;
/**
*
@@ -56,9 +63,9 @@ public class DWRValidator {
private static final Log LOG = LogFactory.getLog(DWRValidator.class);
public ValidationAwareSupport doPost(String namespace, String action, Map params) throws Exception {
- HttpServletRequest req = ExecutionContext.get().getHttpServletRequest();
- ServletContext servletContext = ExecutionContext.get().getServletContext();
- HttpServletResponse res = ExecutionContext.get().getHttpServletResponse();
+ HttpServletRequest req = WebContextFactory.get().getHttpServletRequest();
+ ServletContext servletContext = WebContextFactory.get().getServletContext();
+ HttpServletResponse res = WebContextFactory.get().getHttpServletResponse();
Map requestParams = new HashMap(req.getParameterMap());
if (params != null) {
@@ -102,6 +109,8 @@ public class DWRValidator {
}
public static class ValidatorActionInvocation extends DefaultActionInvocation {
+ private static final long serialVersionUID = -7645433725470191275L;
+
protected ValidatorActionInvocation(ActionProxy proxy, Map extraContext) throws Exception {
super(proxy, extraContext, true);
}
@@ -112,6 +121,8 @@ public class DWRValidator {
}
public static class ValidatorActionProxy extends DefaultActionProxy {
+ private static final long serialVersionUID = 5754781916414047963L;
+
protected ValidatorActionProxy(Configuration config, String namespace, String actionName, Map extraContext) throws Exception {
super(config, namespace, actionName, extraContext, false, true);
}
diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java b/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java
index 36c5defeb..3942b458a 100644
--- a/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java
+++ b/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java
@@ -17,14 +17,30 @@
*/
package org.apache.struts2.views.freemarker;
-import com.opensymphony.util.FileManager;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Map;
+import java.util.Properties;
+
+import javax.servlet.GenericServlet;
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.struts2.StrutsConstants;
import org.apache.struts2.config.Settings;
import org.apache.struts2.views.JspSupportServlet;
import org.apache.struts2.views.freemarker.tags.StrutsModels;
import org.apache.struts2.views.util.ContextUtil;
-import org.apache.struts2.StrutsConstants;
+
+import com.opensymphony.util.FileManager;
import com.opensymphony.xwork2.ObjectFactory;
import com.opensymphony.xwork2.util.OgnlValueStack;
+
import freemarker.cache.FileTemplateLoader;
import freemarker.cache.MultiTemplateLoader;
import freemarker.cache.TemplateLoader;
@@ -35,20 +51,11 @@ import freemarker.ext.servlet.HttpRequestHashModel;
import freemarker.ext.servlet.HttpRequestParametersHashModel;
import freemarker.ext.servlet.HttpSessionHashModel;
import freemarker.ext.servlet.ServletContextHashModel;
-import freemarker.template.*;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import javax.servlet.GenericServlet;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Map;
-import java.util.Properties;
+import freemarker.template.ObjectWrapper;
+import freemarker.template.SimpleHash;
+import freemarker.template.TemplateException;
+import freemarker.template.TemplateExceptionHandler;
+import freemarker.template.TemplateModel;
/**
@@ -95,7 +102,6 @@ public class FreemarkerManager {
// coppied from freemarker servlet - since they are private
private static final String ATTR_APPLICATION_MODEL = ".freemarker.Application";
private static final String ATTR_JSP_TAGLIBS_MODEL = ".freemarker.JspTaglibs";
- private static final String ATTR_SESSION_MODEL = ".freemarker.Session";
private static final String ATTR_REQUEST_MODEL = ".freemarker.Request";
private static final String ATTR_REQUEST_PARAMETERS_MODEL = ".freemarker.RequestParameters";
@@ -183,8 +189,6 @@ public class FreemarkerManager {
}
// Create hash model wrapper for session
- TemplateHashModel sessionModel;
-
HttpSession session = request.getSession(false);
if (session != null) {
model.put(KEY_SESSION_MODEL, new HttpSessionHashModel(session, wrapper));
diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerResult.java b/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerResult.java
index 347c1dfed..7d239e6c6 100644
--- a/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerResult.java
+++ b/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerResult.java
@@ -17,21 +17,29 @@
*/
package org.apache.struts2.views.freemarker;
-import org.apache.struts2.ServletActionContext;
-import org.apache.struts2.dispatcher.StrutsResultSupport;
-import org.apache.struts2.views.util.ResourceUtil;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.ActionInvocation;
-import com.opensymphony.xwork2.LocaleProvider;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-import freemarker.template.*;
+import java.io.IOException;
+import java.io.Writer;
+import java.util.Locale;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.Writer;
-import java.util.Locale;
+
+import org.apache.struts2.ServletActionContext;
+import org.apache.struts2.dispatcher.StrutsResultSupport;
+import org.apache.struts2.views.util.ResourceUtil;
+
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.LocaleProvider;
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
+import freemarker.template.Configuration;
+import freemarker.template.ObjectWrapper;
+import freemarker.template.Template;
+import freemarker.template.TemplateException;
+import freemarker.template.TemplateModel;
+import freemarker.template.TemplateModelException;
/**
diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/PortletFreemarkerResult.java b/core/src/main/java/org/apache/struts2/views/freemarker/PortletFreemarkerResult.java
index 82b221179..d0233d1cc 100644
--- a/core/src/main/java/org/apache/struts2/views/freemarker/PortletFreemarkerResult.java
+++ b/core/src/main/java/org/apache/struts2/views/freemarker/PortletFreemarkerResult.java
@@ -33,7 +33,7 @@ import org.apache.struts2.dispatcher.StrutsResultSupport;
import org.apache.struts2.portlet.PortletActionConstants;
import org.apache.struts2.portlet.context.PortletActionContext;
import org.apache.struts2.views.util.ResourceUtil;
-import com.opensymphony.xwork2.ActionContext;
+
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.util.OgnlValueStack;
@@ -125,10 +125,8 @@ public class PortletFreemarkerResult extends StrutsResultSupport {
this.wrapper = getObjectWrapper();
HttpServletRequest req = ServletActionContext.getRequest();
- HttpServletResponse res = ServletActionContext.getResponse();
if (!location.startsWith("/")) {
- ActionContext ctx = invocation.getInvocationContext();
String base = ResourceUtil.getResourceBase(req);
location = base + "/" + location;
}
diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/ScopesHashModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/ScopesHashModel.java
index 1738dd8b7..f7ad37c3e 100644
--- a/core/src/main/java/org/apache/struts2/views/freemarker/ScopesHashModel.java
+++ b/core/src/main/java/org/apache/struts2/views/freemarker/ScopesHashModel.java
@@ -17,16 +17,17 @@
*/
package org.apache.struts2.views.freemarker;
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+
import com.opensymphony.xwork2.util.OgnlValueStack;
+
import freemarker.template.ObjectWrapper;
import freemarker.template.SimpleHash;
import freemarker.template.TemplateModel;
import freemarker.template.TemplateModelException;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-
/**
* Simple Hash model that also searches other scopes.
@@ -40,7 +41,6 @@ public class ScopesHashModel extends SimpleHash {
private static final long serialVersionUID = 5551686380141886764L;
private HttpServletRequest request;
- private ObjectWrapper objectWraper;
private ServletContext servletContext;
private OgnlValueStack stack;
diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/StrutsBeanWrapper.java b/core/src/main/java/org/apache/struts2/views/freemarker/StrutsBeanWrapper.java
index 0e6ca0dd0..1cf4284a4 100644
--- a/core/src/main/java/org/apache/struts2/views/freemarker/StrutsBeanWrapper.java
+++ b/core/src/main/java/org/apache/struts2/views/freemarker/StrutsBeanWrapper.java
@@ -17,14 +17,20 @@
*/
package org.apache.struts2.views.freemarker;
+import java.util.Map;
+import java.util.Set;
+
import freemarker.core.CollectionAndSequence;
import freemarker.ext.beans.BeansWrapper;
import freemarker.ext.beans.MapModel;
import freemarker.ext.util.ModelFactory;
-import freemarker.template.*;
-
-import java.util.Map;
-import java.util.Set;
+import freemarker.template.ObjectWrapper;
+import freemarker.template.SimpleSequence;
+import freemarker.template.TemplateBooleanModel;
+import freemarker.template.TemplateCollectionModel;
+import freemarker.template.TemplateHashModelEx;
+import freemarker.template.TemplateModel;
+import freemarker.template.TemplateModelException;
/**
*
diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/StrutsClassTemplateLoader.java b/core/src/main/java/org/apache/struts2/views/freemarker/StrutsClassTemplateLoader.java
index 9ad687172..404bf022a 100644
--- a/core/src/main/java/org/apache/struts2/views/freemarker/StrutsClassTemplateLoader.java
+++ b/core/src/main/java/org/apache/struts2/views/freemarker/StrutsClassTemplateLoader.java
@@ -17,11 +17,12 @@
*/
package org.apache.struts2.views.freemarker;
-import com.opensymphony.util.ClassLoaderUtil;
-import freemarker.cache.URLTemplateLoader;
-
import java.net.URL;
+import com.opensymphony.util.ClassLoaderUtil;
+
+import freemarker.cache.URLTemplateLoader;
+
/**
*/
public class StrutsClassTemplateLoader extends URLTemplateLoader {
diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/ActionErrorModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/ActionErrorModel.java
index 0d0236672..37ea1ee30 100644
--- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/ActionErrorModel.java
+++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/ActionErrorModel.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.freemarker.tags;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.ActionError;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.ActionError;
+import org.apache.struts2.components.Component;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see ActionError
*/
diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/ActionMessageModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/ActionMessageModel.java
index 92860c44c..7c1fe87e9 100644
--- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/ActionMessageModel.java
+++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/ActionMessageModel.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.freemarker.tags;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.ActionMessage;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.ActionMessage;
+import org.apache.struts2.components.Component;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see ActionMessage
*/
diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/ActionModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/ActionModel.java
index 9b12f62e8..0b5934cbd 100644
--- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/ActionModel.java
+++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/ActionModel.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.freemarker.tags;
-import org.apache.struts2.components.ActionComponent;
-import org.apache.struts2.components.Component;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.ActionComponent;
+import org.apache.struts2.components.Component;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see ActionComponent
*/
diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/AnchorModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/AnchorModel.java
index e4a4ab739..a65916974 100644
--- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/AnchorModel.java
+++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/AnchorModel.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.freemarker.tags;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.Anchor;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Anchor;
+import org.apache.struts2.components.Component;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see Anchor
*/
diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/BeanModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/BeanModel.java
index 246fc3e2f..1c2155752 100644
--- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/BeanModel.java
+++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/BeanModel.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.freemarker.tags;
-import org.apache.struts2.components.Bean;
-import org.apache.struts2.components.Component;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Bean;
+import org.apache.struts2.components.Component;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see Bean
*/
diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/CallbackWriter.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/CallbackWriter.java
index 880bf5ad6..cedd7b6b0 100644
--- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/CallbackWriter.java
+++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/CallbackWriter.java
@@ -17,14 +17,15 @@
*/
package org.apache.struts2.views.freemarker.tags;
-import org.apache.struts2.components.Component;
-import freemarker.template.TemplateModelException;
-import freemarker.template.TransformControl;
-
import java.io.IOException;
import java.io.StringWriter;
import java.io.Writer;
+import org.apache.struts2.components.Component;
+
+import freemarker.template.TemplateModelException;
+import freemarker.template.TransformControl;
+
/**
*/
public class CallbackWriter extends Writer implements TransformControl {
diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/CheckboxListModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/CheckboxListModel.java
index 510b1bfa3..69617a70c 100644
--- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/CheckboxListModel.java
+++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/CheckboxListModel.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.freemarker.tags;
-import org.apache.struts2.components.CheckboxList;
-import org.apache.struts2.components.Component;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.CheckboxList;
+import org.apache.struts2.components.Component;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see CheckboxList
*/
diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/CheckboxModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/CheckboxModel.java
index abb4be8f7..e0769e10b 100644
--- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/CheckboxModel.java
+++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/CheckboxModel.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.freemarker.tags;
-import org.apache.struts2.components.Checkbox;
-import org.apache.struts2.components.Component;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Checkbox;
+import org.apache.struts2.components.Component;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see Checkbox
*/
diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/ComboBoxModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/ComboBoxModel.java
index 92c27479d..b8dfbf95d 100644
--- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/ComboBoxModel.java
+++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/ComboBoxModel.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.freemarker.tags;
-import org.apache.struts2.components.ComboBox;
-import org.apache.struts2.components.Component;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.ComboBox;
+import org.apache.struts2.components.Component;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see ComboBox
*/
diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/ComponentModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/ComponentModel.java
index 14639090c..973ed4c89 100644
--- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/ComponentModel.java
+++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/ComponentModel.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.freemarker.tags;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.GenericUIBean;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.GenericUIBean;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see ComponentModel
*/
diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/DateModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/DateModel.java
index 96c6754d0..d1d0caa80 100644
--- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/DateModel.java
+++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/DateModel.java
@@ -17,12 +17,13 @@
*/
package org.apache.struts2.views.freemarker.tags;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Date;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import com.opensymphony.xwork2.util.OgnlValueStack;
/**
* DateModel
diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/DatePickerModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/DatePickerModel.java
index 09a470223..e85119e76 100644
--- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/DatePickerModel.java
+++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/DatePickerModel.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.freemarker.tags;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.DatePicker;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.DatePicker;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see DatePicker
*/
diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/DivModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/DivModel.java
index 556621593..64ca26293 100644
--- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/DivModel.java
+++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/DivModel.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.freemarker.tags;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.Div;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Div;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see Div
*/
diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/DoubleSelectModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/DoubleSelectModel.java
index c7f407aeb..50be1b6db 100644
--- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/DoubleSelectModel.java
+++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/DoubleSelectModel.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.freemarker.tags;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.DoubleSelect;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.DoubleSelect;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see DoubleSelect
*/
diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/FieldErrorModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/FieldErrorModel.java
index 4059e72fd..9831a710a 100644
--- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/FieldErrorModel.java
+++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/FieldErrorModel.java
@@ -17,12 +17,13 @@
*/
package org.apache.struts2.views.freemarker.tags;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
import org.apache.struts2.components.Component;
import org.apache.struts2.components.FieldError;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import com.opensymphony.xwork2.util.OgnlValueStack;
/**
* @see FieldError
diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/FileModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/FileModel.java
index 6777a0bcd..cff0035ed 100644
--- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/FileModel.java
+++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/FileModel.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.freemarker.tags;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.File;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.File;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see File
*/
diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/FormModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/FormModel.java
index a6f9489a1..9c7ba9797 100644
--- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/FormModel.java
+++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/FormModel.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.freemarker.tags;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.Form;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Form;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see Form
*/
diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/HeadModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/HeadModel.java
index 9e3054936..8be7cbfd8 100644
--- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/HeadModel.java
+++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/HeadModel.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.freemarker.tags;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.Head;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Head;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see Head
*/
diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/HiddenModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/HiddenModel.java
index e03612630..303ec4768 100644
--- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/HiddenModel.java
+++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/HiddenModel.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.freemarker.tags;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.Hidden;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Hidden;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see Hidden
*/
diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/I18nModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/I18nModel.java
index 5fdacd422..bfca2cb09 100644
--- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/I18nModel.java
+++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/I18nModel.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.freemarker.tags;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.I18n;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.I18n;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see I18n
*/
diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/IncludeModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/IncludeModel.java
index 0dade61ab..1743c2bb4 100644
--- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/IncludeModel.java
+++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/IncludeModel.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.freemarker.tags;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.Include;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Include;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see Include
*/
diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/IteratorModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/IteratorModel.java
index b65e66e4c..48b908bd9 100644
--- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/IteratorModel.java
+++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/IteratorModel.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.freemarker.tags;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.IteratorComponent;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.IteratorComponent;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see IteratorComponent
*/
diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/LabelModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/LabelModel.java
index bb0d7667b..af3e2e28e 100644
--- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/LabelModel.java
+++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/LabelModel.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.freemarker.tags;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.Label;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Label;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see Label
*/
diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/OptGroupModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/OptGroupModel.java
index 83c7bfe5e..f46ba4ba6 100644
--- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/OptGroupModel.java
+++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/OptGroupModel.java
@@ -22,6 +22,7 @@ import javax.servlet.http.HttpServletResponse;
import org.apache.struts2.components.Component;
import org.apache.struts2.components.OptGroup;
+
import com.opensymphony.xwork2.util.OgnlValueStack;
/**
diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/OptionTransferSelectModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/OptionTransferSelectModel.java
index bdea9c0c6..3b12fb550 100644
--- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/OptionTransferSelectModel.java
+++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/OptionTransferSelectModel.java
@@ -22,6 +22,7 @@ import javax.servlet.http.HttpServletResponse;
import org.apache.struts2.components.Component;
import org.apache.struts2.components.OptionTransferSelect;
+
import com.opensymphony.xwork2.util.OgnlValueStack;
/**
diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/PanelModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/PanelModel.java
index 3be6f12db..2cf3afe28 100644
--- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/PanelModel.java
+++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/PanelModel.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.freemarker.tags;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.Panel;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Panel;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see Panel
*/
diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/ParamModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/ParamModel.java
index 332761760..604b800e1 100644
--- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/ParamModel.java
+++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/ParamModel.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.freemarker.tags;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.Param;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Param;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see Param
*/
diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/PasswordModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/PasswordModel.java
index 695ff7415..382fcd6ee 100644
--- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/PasswordModel.java
+++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/PasswordModel.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.freemarker.tags;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.Password;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Password;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see Password
*/
diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/PropertyModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/PropertyModel.java
index 2b5aa8a71..e47606d8e 100644
--- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/PropertyModel.java
+++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/PropertyModel.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.freemarker.tags;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.Property;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Property;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see Property
*/
diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/PushModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/PushModel.java
index 8bb873e6d..385b0319d 100644
--- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/PushModel.java
+++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/PushModel.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.freemarker.tags;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.Push;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Push;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see Push
*/
diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/RadioModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/RadioModel.java
index 3aae3417c..22aa2e247 100644
--- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/RadioModel.java
+++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/RadioModel.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.freemarker.tags;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.Radio;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Radio;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see Radio
*/
diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/ResetModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/ResetModel.java
index 8fb8cc6e3..a4eef8142 100644
--- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/ResetModel.java
+++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/ResetModel.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.freemarker.tags;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.Reset;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Reset;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see org.apache.struts2.components.Reset
*/
diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/SelectModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/SelectModel.java
index 920508b79..09fad160c 100644
--- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/SelectModel.java
+++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/SelectModel.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.freemarker.tags;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.Select;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Select;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see Select
*/
diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/SetModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/SetModel.java
index 28833873d..2b61894e0 100644
--- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/SetModel.java
+++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/SetModel.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.freemarker.tags;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.Set;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Set;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see Set
*/
diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/StrutsModels.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/StrutsModels.java
index 0525ce2ee..23e73e460 100644
--- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/StrutsModels.java
+++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/StrutsModels.java
@@ -17,11 +17,11 @@
*/
package org.apache.struts2.views.freemarker.tags;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* Provides @s.tag access for various tags.
*
diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/SubmitModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/SubmitModel.java
index 6edfcf8f4..43f6c0ada 100644
--- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/SubmitModel.java
+++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/SubmitModel.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.freemarker.tags;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.Submit;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Submit;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see Submit
*/
diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/TabbedPanelModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/TabbedPanelModel.java
index 60fe063b7..1d8d26df7 100644
--- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/TabbedPanelModel.java
+++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/TabbedPanelModel.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.freemarker.tags;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.TabbedPanel;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.TabbedPanel;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see TabbedPanel
*/
diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/TagModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/TagModel.java
index 0ab229c04..6e3c39624 100644
--- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/TagModel.java
+++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/TagModel.java
@@ -17,23 +17,25 @@
*/
package org.apache.struts2.views.freemarker.tags;
-import org.apache.struts2.components.Component;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-import freemarker.template.SimpleNumber;
-import freemarker.template.TemplateModelException;
-import freemarker.template.TemplateTransformModel;
-import freemarker.template.SimpleSequence;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.Writer;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.struts2.components.Component;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
+import freemarker.template.SimpleNumber;
+import freemarker.template.SimpleSequence;
+import freemarker.template.TemplateModelException;
+import freemarker.template.TemplateTransformModel;
public abstract class TagModel implements TemplateTransformModel {
private static final Log LOG = LogFactory.getLog(TagModel.class);
diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/TextAreaModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/TextAreaModel.java
index 980b7ca27..3a901cd83 100644
--- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/TextAreaModel.java
+++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/TextAreaModel.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.freemarker.tags;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.TextArea;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.TextArea;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see TextArea
*/
diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/TextFieldModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/TextFieldModel.java
index 85cbf1112..410290bb0 100644
--- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/TextFieldModel.java
+++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/TextFieldModel.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.freemarker.tags;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.TextField;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.TextField;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see TextField
*/
diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/TextModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/TextModel.java
index d26001728..fc7c2097f 100644
--- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/TextModel.java
+++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/TextModel.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.freemarker.tags;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.Text;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Text;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see Text
*/
diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/TokenModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/TokenModel.java
index 0289412ee..3940d6c2d 100644
--- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/TokenModel.java
+++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/TokenModel.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.freemarker.tags;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.Token;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Token;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see Token
*/
diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/TreeModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/TreeModel.java
index d336eedcd..208259e3d 100644
--- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/TreeModel.java
+++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/TreeModel.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.freemarker.tags;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.Tree;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Tree;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* TreeModel
* @see Tree
diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/TreeNodeModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/TreeNodeModel.java
index 8cd64765e..6798fb3ed 100644
--- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/TreeNodeModel.java
+++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/TreeNodeModel.java
@@ -17,12 +17,13 @@
*/
package org.apache.struts2.views.freemarker.tags;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
import org.apache.struts2.components.Component;
import org.apache.struts2.components.TreeNode;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import com.opensymphony.xwork2.util.OgnlValueStack;
/**
* TreeNodeModel
diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/URLModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/URLModel.java
index 0df4b9a18..3a71e97dc 100644
--- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/URLModel.java
+++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/URLModel.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.freemarker.tags;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.URL;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.URL;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see URL
*/
diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/UpDownSelectModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/UpDownSelectModel.java
index e650b0079..bc4ed7f21 100644
--- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/UpDownSelectModel.java
+++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/UpDownSelectModel.java
@@ -22,6 +22,7 @@ import javax.servlet.http.HttpServletResponse;
import org.apache.struts2.components.Component;
import org.apache.struts2.components.UpDownSelect;
+
import com.opensymphony.xwork2.util.OgnlValueStack;
/**
diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/WebTableModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/WebTableModel.java
index ad8f70cb6..80fa50042 100644
--- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/WebTableModel.java
+++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/WebTableModel.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.freemarker.tags;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.table.WebTable;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.table.WebTable;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see WebTable
*/
diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ActionTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ActionTag.java
index 2ca422800..e2db8b950 100644
--- a/core/src/main/java/org/apache/struts2/views/jsp/ActionTag.java
+++ b/core/src/main/java/org/apache/struts2/views/jsp/ActionTag.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.jsp;
-import org.apache.struts2.components.ActionComponent;
-import org.apache.struts2.components.Component;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.ActionComponent;
+import org.apache.struts2.components.Component;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see ActionComponent
*/
diff --git a/core/src/main/java/org/apache/struts2/views/jsp/BeanTag.java b/core/src/main/java/org/apache/struts2/views/jsp/BeanTag.java
index fcf006672..773f1733a 100644
--- a/core/src/main/java/org/apache/struts2/views/jsp/BeanTag.java
+++ b/core/src/main/java/org/apache/struts2/views/jsp/BeanTag.java
@@ -17,15 +17,16 @@
*/
package org.apache.struts2.views.jsp;
-import org.apache.struts2.components.Bean;
-import org.apache.struts2.components.Component;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.struts2.components.Bean;
+import org.apache.struts2.components.Component;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see Bean
diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ComponentTagSupport.java b/core/src/main/java/org/apache/struts2/views/jsp/ComponentTagSupport.java
index 9090833c8..922697b1f 100644
--- a/core/src/main/java/org/apache/struts2/views/jsp/ComponentTagSupport.java
+++ b/core/src/main/java/org/apache/struts2/views/jsp/ComponentTagSupport.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.jsp;
-import org.apache.struts2.components.Component;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.jsp.JspException;
+import org.apache.struts2.components.Component;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
*/
public abstract class ComponentTagSupport extends StrutsBodyTagSupport {
diff --git a/core/src/main/java/org/apache/struts2/views/jsp/DateTag.java b/core/src/main/java/org/apache/struts2/views/jsp/DateTag.java
index e6e59402d..7e6e77233 100644
--- a/core/src/main/java/org/apache/struts2/views/jsp/DateTag.java
+++ b/core/src/main/java/org/apache/struts2/views/jsp/DateTag.java
@@ -22,6 +22,7 @@ import javax.servlet.http.HttpServletResponse;
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Date;
+
import com.opensymphony.xwork2.util.OgnlValueStack;
/**
diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ElseIfTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ElseIfTag.java
index 45f26c9d5..1c6c397b1 100644
--- a/core/src/main/java/org/apache/struts2/views/jsp/ElseIfTag.java
+++ b/core/src/main/java/org/apache/struts2/views/jsp/ElseIfTag.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.jsp;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.ElseIf;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.ElseIf;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see ElseIf
*/
diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ElseTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ElseTag.java
index 817f66e12..f4dc51675 100644
--- a/core/src/main/java/org/apache/struts2/views/jsp/ElseTag.java
+++ b/core/src/main/java/org/apache/struts2/views/jsp/ElseTag.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.jsp;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.Else;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Else;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see Else
diff --git a/core/src/main/java/org/apache/struts2/views/jsp/I18nTag.java b/core/src/main/java/org/apache/struts2/views/jsp/I18nTag.java
index 903798f00..26d2fa6a6 100644
--- a/core/src/main/java/org/apache/struts2/views/jsp/I18nTag.java
+++ b/core/src/main/java/org/apache/struts2/views/jsp/I18nTag.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.jsp;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.I18n;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.I18n;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see I18n
diff --git a/core/src/main/java/org/apache/struts2/views/jsp/IfTag.java b/core/src/main/java/org/apache/struts2/views/jsp/IfTag.java
index 4bb2d380c..6382216f0 100644
--- a/core/src/main/java/org/apache/struts2/views/jsp/IfTag.java
+++ b/core/src/main/java/org/apache/struts2/views/jsp/IfTag.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.jsp;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.If;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.If;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see If
diff --git a/core/src/main/java/org/apache/struts2/views/jsp/IncludeTag.java b/core/src/main/java/org/apache/struts2/views/jsp/IncludeTag.java
index e011d2801..d6820925d 100644
--- a/core/src/main/java/org/apache/struts2/views/jsp/IncludeTag.java
+++ b/core/src/main/java/org/apache/struts2/views/jsp/IncludeTag.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.jsp;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.Include;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Include;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see Include
diff --git a/core/src/main/java/org/apache/struts2/views/jsp/IteratorTag.java b/core/src/main/java/org/apache/struts2/views/jsp/IteratorTag.java
index 7d260fdf8..b9700904c 100644
--- a/core/src/main/java/org/apache/struts2/views/jsp/IteratorTag.java
+++ b/core/src/main/java/org/apache/struts2/views/jsp/IteratorTag.java
@@ -17,14 +17,15 @@
*/
package org.apache.struts2.views.jsp;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.IteratorComponent;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.jsp.JspException;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.IteratorComponent;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see IteratorComponent
*/
diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ParamTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ParamTag.java
index d3c05865f..cc12ffe54 100644
--- a/core/src/main/java/org/apache/struts2/views/jsp/ParamTag.java
+++ b/core/src/main/java/org/apache/struts2/views/jsp/ParamTag.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.jsp;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.Param;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Param;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see Param
*/
diff --git a/core/src/main/java/org/apache/struts2/views/jsp/PropertyTag.java b/core/src/main/java/org/apache/struts2/views/jsp/PropertyTag.java
index 67688f5da..d62cb67fe 100644
--- a/core/src/main/java/org/apache/struts2/views/jsp/PropertyTag.java
+++ b/core/src/main/java/org/apache/struts2/views/jsp/PropertyTag.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.jsp;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.Property;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Property;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see Property
diff --git a/core/src/main/java/org/apache/struts2/views/jsp/PushTag.java b/core/src/main/java/org/apache/struts2/views/jsp/PushTag.java
index d7cb47f45..6f8d9892c 100644
--- a/core/src/main/java/org/apache/struts2/views/jsp/PushTag.java
+++ b/core/src/main/java/org/apache/struts2/views/jsp/PushTag.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.jsp;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.Push;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Push;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see Push
diff --git a/core/src/main/java/org/apache/struts2/views/jsp/SetTag.java b/core/src/main/java/org/apache/struts2/views/jsp/SetTag.java
index 0dac078b0..4f73df24a 100644
--- a/core/src/main/java/org/apache/struts2/views/jsp/SetTag.java
+++ b/core/src/main/java/org/apache/struts2/views/jsp/SetTag.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.jsp;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.Set;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Set;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see Set
diff --git a/core/src/main/java/org/apache/struts2/views/jsp/StrutsBodyTagSupport.java b/core/src/main/java/org/apache/struts2/views/jsp/StrutsBodyTagSupport.java
index cce5557aa..770e796ab 100644
--- a/core/src/main/java/org/apache/struts2/views/jsp/StrutsBodyTagSupport.java
+++ b/core/src/main/java/org/apache/struts2/views/jsp/StrutsBodyTagSupport.java
@@ -17,12 +17,14 @@
*/
package org.apache.struts2.views.jsp;
-import org.apache.struts2.util.FastByteArrayOutputStream;
-import org.apache.struts2.views.util.ContextUtil;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import java.io.PrintWriter;
import javax.servlet.jsp.tagext.BodyTagSupport;
-import java.io.PrintWriter;
+
+import org.apache.struts2.util.FastByteArrayOutputStream;
+import org.apache.struts2.views.util.ContextUtil;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
/**
diff --git a/core/src/main/java/org/apache/struts2/views/jsp/TagUtils.java b/core/src/main/java/org/apache/struts2/views/jsp/TagUtils.java
index a00798168..3e3596f53 100644
--- a/core/src/main/java/org/apache/struts2/views/jsp/TagUtils.java
+++ b/core/src/main/java/org/apache/struts2/views/jsp/TagUtils.java
@@ -17,6 +17,12 @@
*/
package org.apache.struts2.views.jsp;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.jsp.PageContext;
+
import org.apache.struts2.RequestUtils;
import org.apache.struts2.ServletActionContext;
import org.apache.struts2.dispatcher.ApplicationMap;
@@ -27,15 +33,11 @@ import org.apache.struts2.dispatcher.mapper.ActionMapper;
import org.apache.struts2.dispatcher.mapper.ActionMapperFactory;
import org.apache.struts2.dispatcher.mapper.ActionMapping;
import org.apache.struts2.util.AttributeMap;
+
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.util.OgnlValueStack;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.jsp.PageContext;
-import java.util.Map;
-
/**
*/
diff --git a/core/src/main/java/org/apache/struts2/views/jsp/TextTag.java b/core/src/main/java/org/apache/struts2/views/jsp/TextTag.java
index f8e5df338..f1d53702d 100644
--- a/core/src/main/java/org/apache/struts2/views/jsp/TextTag.java
+++ b/core/src/main/java/org/apache/struts2/views/jsp/TextTag.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.jsp;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.Text;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Text;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see Text
diff --git a/core/src/main/java/org/apache/struts2/views/jsp/URLTag.java b/core/src/main/java/org/apache/struts2/views/jsp/URLTag.java
index 53e915fbf..256a6c06b 100644
--- a/core/src/main/java/org/apache/struts2/views/jsp/URLTag.java
+++ b/core/src/main/java/org/apache/struts2/views/jsp/URLTag.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.jsp;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.URL;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.URL;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see URL
diff --git a/core/src/main/java/org/apache/struts2/views/jsp/iterator/AppendIteratorTag.java b/core/src/main/java/org/apache/struts2/views/jsp/iterator/AppendIteratorTag.java
index 754f68ebc..fd455c43c 100644
--- a/core/src/main/java/org/apache/struts2/views/jsp/iterator/AppendIteratorTag.java
+++ b/core/src/main/java/org/apache/struts2/views/jsp/iterator/AppendIteratorTag.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.jsp.iterator;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
import org.apache.struts2.components.AppendIterator;
import org.apache.struts2.components.Component;
import org.apache.struts2.views.jsp.ComponentTagSupport;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import com.opensymphony.xwork2.util.OgnlValueStack;
/**
diff --git a/core/src/main/java/org/apache/struts2/views/jsp/iterator/IteratorGeneratorTag.java b/core/src/main/java/org/apache/struts2/views/jsp/iterator/IteratorGeneratorTag.java
index d1f86c6a9..90e4c921b 100644
--- a/core/src/main/java/org/apache/struts2/views/jsp/iterator/IteratorGeneratorTag.java
+++ b/core/src/main/java/org/apache/struts2/views/jsp/iterator/IteratorGeneratorTag.java
@@ -17,14 +17,13 @@
*/
package org.apache.struts2.views.jsp.iterator;
-import org.apache.struts2.util.IteratorGenerator;
-import org.apache.struts2.util.IteratorGenerator.Converter;
-import org.apache.struts2.views.jsp.StrutsBodyTagSupport;
-
import javax.servlet.jsp.JspException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.struts2.util.IteratorGenerator;
+import org.apache.struts2.util.IteratorGenerator.Converter;
+import org.apache.struts2.views.jsp.StrutsBodyTagSupport;
/**
diff --git a/core/src/main/java/org/apache/struts2/views/jsp/iterator/MergeIteratorTag.java b/core/src/main/java/org/apache/struts2/views/jsp/iterator/MergeIteratorTag.java
index 929f7b2ad..ce384b9e0 100644
--- a/core/src/main/java/org/apache/struts2/views/jsp/iterator/MergeIteratorTag.java
+++ b/core/src/main/java/org/apache/struts2/views/jsp/iterator/MergeIteratorTag.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.jsp.iterator;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
import org.apache.struts2.components.Component;
import org.apache.struts2.components.MergeIterator;
import org.apache.struts2.views.jsp.ComponentTagSupport;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import com.opensymphony.xwork2.util.OgnlValueStack;
/**
diff --git a/core/src/main/java/org/apache/struts2/views/jsp/iterator/SortIteratorTag.java b/core/src/main/java/org/apache/struts2/views/jsp/iterator/SortIteratorTag.java
index a37a972b0..2c7f6e65b 100644
--- a/core/src/main/java/org/apache/struts2/views/jsp/iterator/SortIteratorTag.java
+++ b/core/src/main/java/org/apache/struts2/views/jsp/iterator/SortIteratorTag.java
@@ -17,13 +17,13 @@
*/
package org.apache.struts2.views.jsp.iterator;
-import org.apache.struts2.util.MakeIterator;
-import org.apache.struts2.util.SortIteratorFilter;
-import org.apache.struts2.views.jsp.StrutsBodyTagSupport;
+import java.util.Comparator;
import javax.servlet.jsp.JspException;
-import java.util.Comparator;
+import org.apache.struts2.util.MakeIterator;
+import org.apache.struts2.util.SortIteratorFilter;
+import org.apache.struts2.views.jsp.StrutsBodyTagSupport;
/**
diff --git a/core/src/main/java/org/apache/struts2/views/jsp/iterator/SubsetIteratorTag.java b/core/src/main/java/org/apache/struts2/views/jsp/iterator/SubsetIteratorTag.java
index 6407606de..47a7b5e5f 100644
--- a/core/src/main/java/org/apache/struts2/views/jsp/iterator/SubsetIteratorTag.java
+++ b/core/src/main/java/org/apache/struts2/views/jsp/iterator/SubsetIteratorTag.java
@@ -17,14 +17,13 @@
*/
package org.apache.struts2.views.jsp.iterator;
-import org.apache.struts2.util.SubsetIteratorFilter;
-import org.apache.struts2.util.SubsetIteratorFilter.Decider;
-import org.apache.struts2.views.jsp.StrutsBodyTagSupport;
-
import javax.servlet.jsp.JspException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.struts2.util.SubsetIteratorFilter;
+import org.apache.struts2.util.SubsetIteratorFilter.Decider;
+import org.apache.struts2.views.jsp.StrutsBodyTagSupport;
/**
diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/ActionErrorTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/ActionErrorTag.java
index d5fe30443..673b8a238 100644
--- a/core/src/main/java/org/apache/struts2/views/jsp/ui/ActionErrorTag.java
+++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/ActionErrorTag.java
@@ -22,6 +22,7 @@ import javax.servlet.http.HttpServletResponse;
import org.apache.struts2.components.ActionError;
import org.apache.struts2.components.Component;
+
import com.opensymphony.xwork2.util.OgnlValueStack;
/**
diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/ActionMessageTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/ActionMessageTag.java
index d08fe9ff1..e1b19ab3d 100644
--- a/core/src/main/java/org/apache/struts2/views/jsp/ui/ActionMessageTag.java
+++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/ActionMessageTag.java
@@ -22,6 +22,7 @@ import javax.servlet.http.HttpServletResponse;
import org.apache.struts2.components.ActionMessage;
import org.apache.struts2.components.Component;
+
import com.opensymphony.xwork2.util.OgnlValueStack;
/**
diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/AnchorTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/AnchorTag.java
index 9e97a6192..3115d822e 100644
--- a/core/src/main/java/org/apache/struts2/views/jsp/ui/AnchorTag.java
+++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/AnchorTag.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.jsp.ui;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.Anchor;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Anchor;
+import org.apache.struts2.components.Component;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see Anchor
*/
diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/CheckboxListTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/CheckboxListTag.java
index 5ad2c25d3..42648427e 100644
--- a/core/src/main/java/org/apache/struts2/views/jsp/ui/CheckboxListTag.java
+++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/CheckboxListTag.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.jsp.ui;
-import org.apache.struts2.components.CheckboxList;
-import org.apache.struts2.components.Component;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.CheckboxList;
+import org.apache.struts2.components.Component;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see CheckboxList
diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/CheckboxTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/CheckboxTag.java
index a4a9ae1c8..533bf1474 100644
--- a/core/src/main/java/org/apache/struts2/views/jsp/ui/CheckboxTag.java
+++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/CheckboxTag.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.jsp.ui;
-import org.apache.struts2.components.Checkbox;
-import org.apache.struts2.components.Component;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Checkbox;
+import org.apache.struts2.components.Component;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see Checkbox
diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/ComboBoxTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/ComboBoxTag.java
index 2fc985a28..23144032b 100644
--- a/core/src/main/java/org/apache/struts2/views/jsp/ui/ComboBoxTag.java
+++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/ComboBoxTag.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.jsp.ui;
-import org.apache.struts2.components.ComboBox;
-import org.apache.struts2.components.Component;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.ComboBox;
+import org.apache.struts2.components.Component;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see ComboBox
*/
diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/ComponentTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/ComponentTag.java
index b0fc15047..40c096be3 100644
--- a/core/src/main/java/org/apache/struts2/views/jsp/ui/ComponentTag.java
+++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/ComponentTag.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.jsp.ui;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.GenericUIBean;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.GenericUIBean;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see GenericUIBean
*/
diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/DatePickerTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/DatePickerTag.java
index 48e178ae1..1167d1673 100644
--- a/core/src/main/java/org/apache/struts2/views/jsp/ui/DatePickerTag.java
+++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/DatePickerTag.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.jsp.ui;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.DatePicker;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.DatePicker;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see DatePicker
*/
@@ -64,7 +65,7 @@ public class DatePickerTag extends TextFieldTag {
}
public void setTemplateCssPath(String templateCsspath) {
- this.templateCssPath = templateCssPath;
+ this.templateCssPath = templateCsspath;
}
}
diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/DebugTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/DebugTag.java
index b14c740f4..431a6d38b 100644
--- a/core/src/main/java/org/apache/struts2/views/jsp/ui/DebugTag.java
+++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/DebugTag.java
@@ -1,14 +1,17 @@
package org.apache.struts2.views.jsp.ui;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.Debug;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Debug;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
public class DebugTag extends AbstractUITag {
+ private static final long serialVersionUID = 3487684841317160628L;
+
public Component getBean(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
return new Debug(stack, req, res);
}
diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/DivTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/DivTag.java
index 41bfed5d9..69d2199d6 100644
--- a/core/src/main/java/org/apache/struts2/views/jsp/ui/DivTag.java
+++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/DivTag.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.jsp.ui;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.Div;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Div;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
public class DivTag extends AbstractClosingTag {
private static final long serialVersionUID = 5309231035916461758L;
diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/DoubleSelectTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/DoubleSelectTag.java
index 3e47d2103..8a733f3a5 100644
--- a/core/src/main/java/org/apache/struts2/views/jsp/ui/DoubleSelectTag.java
+++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/DoubleSelectTag.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.jsp.ui;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.DoubleSelect;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.DoubleSelect;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see DoubleSelect
*/
diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/FieldErrorTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/FieldErrorTag.java
index 636d7da42..d58e067c2 100644
--- a/core/src/main/java/org/apache/struts2/views/jsp/ui/FieldErrorTag.java
+++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/FieldErrorTag.java
@@ -22,6 +22,7 @@ import javax.servlet.http.HttpServletResponse;
import org.apache.struts2.components.Component;
import org.apache.struts2.components.FieldError;
+
import com.opensymphony.xwork2.util.OgnlValueStack;
/**
diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/FileTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/FileTag.java
index 9b5f4817c..7ba622ec1 100644
--- a/core/src/main/java/org/apache/struts2/views/jsp/ui/FileTag.java
+++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/FileTag.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.jsp.ui;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.File;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.File;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see File
diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/FormTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/FormTag.java
index 6e9a81e48..2cd560205 100644
--- a/core/src/main/java/org/apache/struts2/views/jsp/ui/FormTag.java
+++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/FormTag.java
@@ -22,6 +22,7 @@ import javax.servlet.http.HttpServletResponse;
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Form;
+
import com.opensymphony.xwork2.util.OgnlValueStack;
diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/HeadTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/HeadTag.java
index d381c85d9..1c4d56220 100644
--- a/core/src/main/java/org/apache/struts2/views/jsp/ui/HeadTag.java
+++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/HeadTag.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.jsp.ui;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.Head;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Head;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see Head
*/
diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/HiddenTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/HiddenTag.java
index 60079961c..55ef03881 100644
--- a/core/src/main/java/org/apache/struts2/views/jsp/ui/HiddenTag.java
+++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/HiddenTag.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.jsp.ui;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.Hidden;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Hidden;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see Hidden
diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/LabelTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/LabelTag.java
index c01d61f08..52bf05934 100644
--- a/core/src/main/java/org/apache/struts2/views/jsp/ui/LabelTag.java
+++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/LabelTag.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.jsp.ui;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.Label;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Label;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see Label
diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/OgnlTool.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/OgnlTool.java
index 5035135b6..f94b412b0 100644
--- a/core/src/main/java/org/apache/struts2/views/jsp/ui/OgnlTool.java
+++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/OgnlTool.java
@@ -17,10 +17,11 @@
*/
package org.apache.struts2.views.jsp.ui;
-import com.opensymphony.xwork2.util.OgnlUtil;
import ognl.Ognl;
import ognl.OgnlException;
+import com.opensymphony.xwork2.util.OgnlUtil;
+
/**
*/
diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/OptGroupTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/OptGroupTag.java
index f01f3810b..cbdb96cde 100644
--- a/core/src/main/java/org/apache/struts2/views/jsp/ui/OptGroupTag.java
+++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/OptGroupTag.java
@@ -23,6 +23,7 @@ import javax.servlet.http.HttpServletResponse;
import org.apache.struts2.components.Component;
import org.apache.struts2.components.OptGroup;
import org.apache.struts2.views.jsp.ComponentTagSupport;
+
import com.opensymphony.xwork2.util.OgnlValueStack;
/**
diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/OptionTransferSelectTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/OptionTransferSelectTag.java
index e42812339..4944f5e7f 100644
--- a/core/src/main/java/org/apache/struts2/views/jsp/ui/OptionTransferSelectTag.java
+++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/OptionTransferSelectTag.java
@@ -22,6 +22,7 @@ import javax.servlet.http.HttpServletResponse;
import org.apache.struts2.components.Component;
import org.apache.struts2.components.OptionTransferSelect;
+
import com.opensymphony.xwork2.util.OgnlValueStack;
/**
diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/PanelTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/PanelTag.java
index c5c85b872..3600cbfe5 100644
--- a/core/src/main/java/org/apache/struts2/views/jsp/ui/PanelTag.java
+++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/PanelTag.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.jsp.ui;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.Panel;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Panel;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see Panel
*/
diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/PasswordTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/PasswordTag.java
index 94a952e95..76d9fb178 100644
--- a/core/src/main/java/org/apache/struts2/views/jsp/ui/PasswordTag.java
+++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/PasswordTag.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.jsp.ui;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.Password;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Password;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see Password
diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/RadioTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/RadioTag.java
index f250a2498..e958ba5da 100644
--- a/core/src/main/java/org/apache/struts2/views/jsp/ui/RadioTag.java
+++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/RadioTag.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.jsp.ui;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.Radio;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Radio;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see Radio
diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/ResetTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/ResetTag.java
index 9f05a0ae9..167681ca2 100644
--- a/core/src/main/java/org/apache/struts2/views/jsp/ui/ResetTag.java
+++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/ResetTag.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.jsp.ui;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.Reset;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Reset;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see org.apache.struts2.components.Reset
*/
diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/SelectTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/SelectTag.java
index 5c53f46e0..fcecc374f 100644
--- a/core/src/main/java/org/apache/struts2/views/jsp/ui/SelectTag.java
+++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/SelectTag.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.jsp.ui;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.Select;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Select;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see Select
diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/SubmitTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/SubmitTag.java
index 11bfbb1d8..bcbe40cbb 100644
--- a/core/src/main/java/org/apache/struts2/views/jsp/ui/SubmitTag.java
+++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/SubmitTag.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.jsp.ui;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.Submit;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Submit;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see Submit
*/
diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/TabbedPanelTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/TabbedPanelTag.java
index d23af42cc..3fe1b980b 100644
--- a/core/src/main/java/org/apache/struts2/views/jsp/ui/TabbedPanelTag.java
+++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/TabbedPanelTag.java
@@ -17,14 +17,16 @@
*/
package org.apache.struts2.views.jsp.ui;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.Panel;
-import org.apache.struts2.components.TabbedPanel;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import java.util.List;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import java.util.List;
+
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Panel;
+import org.apache.struts2.components.TabbedPanel;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
/**
* @see TabbedPanel
diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/TextFieldTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/TextFieldTag.java
index 098704a50..8dda23162 100644
--- a/core/src/main/java/org/apache/struts2/views/jsp/ui/TextFieldTag.java
+++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/TextFieldTag.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.jsp.ui;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.TextField;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.TextField;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see TextField
*/
diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/TextareaTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/TextareaTag.java
index 65d2cebd9..91b0b0a02 100644
--- a/core/src/main/java/org/apache/struts2/views/jsp/ui/TextareaTag.java
+++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/TextareaTag.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.jsp.ui;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.TextArea;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.TextArea;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see TextArea
diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/TokenTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/TokenTag.java
index 5d556a6d9..68a1edd3a 100644
--- a/core/src/main/java/org/apache/struts2/views/jsp/ui/TokenTag.java
+++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/TokenTag.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.jsp.ui;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.Token;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Token;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see Token
diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/TreeNodeTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/TreeNodeTag.java
index 4283324b7..016f32ec4 100644
--- a/core/src/main/java/org/apache/struts2/views/jsp/ui/TreeNodeTag.java
+++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/TreeNodeTag.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.jsp.ui;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.TreeNode;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.TreeNode;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see TreeNode
*/
diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/TreeTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/TreeTag.java
index 1ee5583a1..3333025ba 100644
--- a/core/src/main/java/org/apache/struts2/views/jsp/ui/TreeTag.java
+++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/TreeTag.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.jsp.ui;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.Tree;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Tree;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see Tree
*/
diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/UpDownSelectTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/UpDownSelectTag.java
index 6051cfb3f..d5a55fe72 100644
--- a/core/src/main/java/org/apache/struts2/views/jsp/ui/UpDownSelectTag.java
+++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/UpDownSelectTag.java
@@ -22,6 +22,7 @@ import javax.servlet.http.HttpServletResponse;
import org.apache.struts2.components.Component;
import org.apache.struts2.components.UpDownSelect;
+
import com.opensymphony.xwork2.util.OgnlValueStack;
/**
diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/table/WebTableTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/table/WebTableTag.java
index 07549b34d..01d8d74a4 100644
--- a/core/src/main/java/org/apache/struts2/views/jsp/ui/table/WebTableTag.java
+++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/table/WebTableTag.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.jsp.ui.table;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
import org.apache.struts2.components.Component;
import org.apache.struts2.components.table.WebTable;
import org.apache.struts2.views.jsp.ui.ComponentTag;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import com.opensymphony.xwork2.util.OgnlValueStack;
/**
diff --git a/core/src/main/java/org/apache/struts2/views/tiles/TilesResult.java b/core/src/main/java/org/apache/struts2/views/tiles/TilesResult.java
index 5a62b4ecb..437f67dd4 100644
--- a/core/src/main/java/org/apache/struts2/views/tiles/TilesResult.java
+++ b/core/src/main/java/org/apache/struts2/views/tiles/TilesResult.java
@@ -17,19 +17,26 @@
*/
package org.apache.struts2.views.tiles;
-import org.apache.struts2.ServletActionContext;
-import org.apache.struts2.dispatcher.ServletDispatcherResult;
-import com.opensymphony.xwork2.ActionInvocation;
-import com.opensymphony.xwork2.LocaleProvider;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.tiles.*;
+import java.util.Locale;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import java.util.Locale;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.struts2.ServletActionContext;
+import org.apache.struts2.dispatcher.ServletDispatcherResult;
+import org.apache.tiles.ComponentContext;
+import org.apache.tiles.ComponentDefinition;
+import org.apache.tiles.ComponentDefinitions;
+import org.apache.tiles.Controller;
+import org.apache.tiles.DefinitionsFactory;
+import org.apache.tiles.TilesUtilImpl;
+
+import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.LocaleProvider;
/**
*
diff --git a/core/src/main/java/org/apache/struts2/views/util/ContextUtil.java b/core/src/main/java/org/apache/struts2/views/util/ContextUtil.java
index aab17022b..48480fb19 100644
--- a/core/src/main/java/org/apache/struts2/views/util/ContextUtil.java
+++ b/core/src/main/java/org/apache/struts2/views/util/ContextUtil.java
@@ -17,18 +17,20 @@
*/
package org.apache.struts2.views.util;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-import com.opensymphony.xwork2.ActionInvocation;
-import com.opensymphony.xwork2.ActionContext;
-import org.apache.struts2.views.jsp.ui.OgnlTool;
-import org.apache.struts2.config.Settings;
-import org.apache.struts2.util.StrutsUtil;
-import org.apache.struts2.StrutsConstants;
+import java.util.HashMap;
+import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import java.util.HashMap;
-import java.util.Map;
+
+import org.apache.struts2.StrutsConstants;
+import org.apache.struts2.config.Settings;
+import org.apache.struts2.util.StrutsUtil;
+import org.apache.struts2.views.jsp.ui.OgnlTool;
+
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.util.OgnlValueStack;
/**
* Value Stack's Context related Utilities.
diff --git a/core/src/main/java/org/apache/struts2/views/util/UrlHelper.java b/core/src/main/java/org/apache/struts2/views/util/UrlHelper.java
index 14a40345c..356c23474 100644
--- a/core/src/main/java/org/apache/struts2/views/util/UrlHelper.java
+++ b/core/src/main/java/org/apache/struts2/views/util/UrlHelper.java
@@ -17,18 +17,6 @@
*/
package org.apache.struts2.views.util;
-import org.apache.struts2.ServletActionContext;
-import org.apache.struts2.StrutsConstants;
-import org.apache.struts2.config.Settings;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-import com.opensymphony.xwork2.util.TextParseUtil;
-import com.opensymphony.xwork2.util.XWorkContinuationConfig;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import java.net.URLEncoder;
@@ -37,6 +25,20 @@ import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.Map;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.struts2.ServletActionContext;
+import org.apache.struts2.StrutsConstants;
+import org.apache.struts2.config.Settings;
+
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.TextParseUtil;
+import com.opensymphony.xwork2.util.XWorkContinuationConfig;
+
/**
* UrlHelper
diff --git a/core/src/main/java/org/apache/struts2/views/velocity/StrutsResourceLoader.java b/core/src/main/java/org/apache/struts2/views/velocity/StrutsResourceLoader.java
index 087a78238..59c909927 100644
--- a/core/src/main/java/org/apache/struts2/views/velocity/StrutsResourceLoader.java
+++ b/core/src/main/java/org/apache/struts2/views/velocity/StrutsResourceLoader.java
@@ -17,12 +17,12 @@
*/
package org.apache.struts2.views.velocity;
+import java.io.InputStream;
+
import org.apache.struts2.util.ClassLoaderUtils;
import org.apache.velocity.exception.ResourceNotFoundException;
import org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader;
-import java.io.InputStream;
-
/**
* Loads resource from the Thread's context ClassLoader.
diff --git a/core/src/main/java/org/apache/struts2/views/velocity/StrutsVelocityContext.java b/core/src/main/java/org/apache/struts2/views/velocity/StrutsVelocityContext.java
index b57927fcd..a6017bbd1 100644
--- a/core/src/main/java/org/apache/struts2/views/velocity/StrutsVelocityContext.java
+++ b/core/src/main/java/org/apache/struts2/views/velocity/StrutsVelocityContext.java
@@ -17,14 +17,16 @@
*/
package org.apache.struts2.views.velocity;
-import com.opensymphony.xwork2.util.OgnlValueStack;
import org.apache.velocity.VelocityContext;
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
*/
public class StrutsVelocityContext extends VelocityContext {
+ private static final long serialVersionUID = 8497212428904436963L;
OgnlValueStack stack;
VelocityContext[] chainedContexts;
diff --git a/core/src/main/java/org/apache/struts2/views/velocity/StrutsVelocityServlet.java b/core/src/main/java/org/apache/struts2/views/velocity/StrutsVelocityServlet.java
index 3e41d8d31..7107561fe 100644
--- a/core/src/main/java/org/apache/struts2/views/velocity/StrutsVelocityServlet.java
+++ b/core/src/main/java/org/apache/struts2/views/velocity/StrutsVelocityServlet.java
@@ -17,12 +17,24 @@
*/
package org.apache.struts2.views.velocity;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.io.Writer;
+import java.util.Properties;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.jsp.JspFactory;
+import javax.servlet.jsp.PageContext;
+
import org.apache.struts2.RequestUtils;
import org.apache.struts2.ServletActionContext;
import org.apache.struts2.StrutsConstants;
import org.apache.struts2.config.Settings;
import org.apache.struts2.views.util.ContextUtil;
-import com.opensymphony.xwork2.ActionContext;
import org.apache.velocity.Template;
import org.apache.velocity.context.Context;
import org.apache.velocity.exception.MethodInvocationException;
@@ -31,23 +43,14 @@ import org.apache.velocity.exception.ResourceNotFoundException;
import org.apache.velocity.runtime.RuntimeSingleton;
import org.apache.velocity.servlet.VelocityServlet;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.jsp.JspFactory;
-import javax.servlet.jsp.PageContext;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.io.Writer;
-import java.util.Properties;
+import com.opensymphony.xwork2.ActionContext;
/**
* @deprecated please use {@link org.apache.struts2.dispatcher.VelocityResult} instead of direct access
*/
public class StrutsVelocityServlet extends VelocityServlet {
+ private static final long serialVersionUID = -2078492831396251182L;
private VelocityManager velocityManager;
public StrutsVelocityServlet() {
diff --git a/core/src/main/java/org/apache/struts2/views/velocity/VelocityManager.java b/core/src/main/java/org/apache/struts2/views/velocity/VelocityManager.java
index cc5423f3a..31b7b7ada 100644
--- a/core/src/main/java/org/apache/struts2/views/velocity/VelocityManager.java
+++ b/core/src/main/java/org/apache/struts2/views/velocity/VelocityManager.java
@@ -17,6 +17,23 @@
*/
package org.apache.struts2.views.velocity;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.StringTokenizer;
+
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.struts2.ServletActionContext;
import org.apache.struts2.StrutsConstants;
import org.apache.struts2.StrutsException;
@@ -24,12 +41,48 @@ import org.apache.struts2.config.Settings;
import org.apache.struts2.util.VelocityStrutsUtil;
import org.apache.struts2.views.jsp.ui.OgnlTool;
import org.apache.struts2.views.util.ContextUtil;
-import org.apache.struts2.views.velocity.components.*;
-
-import com.opensymphony.xwork2.ObjectFactory;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.struts2.views.velocity.components.ActionDirective;
+import org.apache.struts2.views.velocity.components.ActionErrorDirective;
+import org.apache.struts2.views.velocity.components.ActionMessageDirective;
+import org.apache.struts2.views.velocity.components.AnchorDirective;
+import org.apache.struts2.views.velocity.components.BeanDirective;
+import org.apache.struts2.views.velocity.components.CheckBoxDirective;
+import org.apache.struts2.views.velocity.components.CheckBoxListDirective;
+import org.apache.struts2.views.velocity.components.ComboBoxDirective;
+import org.apache.struts2.views.velocity.components.ComponentDirective;
+import org.apache.struts2.views.velocity.components.DateDirective;
+import org.apache.struts2.views.velocity.components.DatePickerDirective;
+import org.apache.struts2.views.velocity.components.DivDirective;
+import org.apache.struts2.views.velocity.components.DoubleSelectDirective;
+import org.apache.struts2.views.velocity.components.FieldErrorDirective;
+import org.apache.struts2.views.velocity.components.FileDirective;
+import org.apache.struts2.views.velocity.components.FormDirective;
+import org.apache.struts2.views.velocity.components.HeadDirective;
+import org.apache.struts2.views.velocity.components.HiddenDirective;
+import org.apache.struts2.views.velocity.components.I18nDirective;
+import org.apache.struts2.views.velocity.components.IncludeDirective;
+import org.apache.struts2.views.velocity.components.LabelDirective;
+import org.apache.struts2.views.velocity.components.OptionTransferSelectDirective;
+import org.apache.struts2.views.velocity.components.PanelDirective;
+import org.apache.struts2.views.velocity.components.ParamDirective;
+import org.apache.struts2.views.velocity.components.PasswordDirective;
+import org.apache.struts2.views.velocity.components.PropertyDirective;
+import org.apache.struts2.views.velocity.components.PushDirective;
+import org.apache.struts2.views.velocity.components.RadioDirective;
+import org.apache.struts2.views.velocity.components.ResetDirective;
+import org.apache.struts2.views.velocity.components.SelectDirective;
+import org.apache.struts2.views.velocity.components.SetDirective;
+import org.apache.struts2.views.velocity.components.SubmitDirective;
+import org.apache.struts2.views.velocity.components.TabbedPanelDirective;
+import org.apache.struts2.views.velocity.components.TextAreaDirective;
+import org.apache.struts2.views.velocity.components.TextDirective;
+import org.apache.struts2.views.velocity.components.TextFieldDirective;
+import org.apache.struts2.views.velocity.components.TokenDirective;
+import org.apache.struts2.views.velocity.components.TreeDirective;
+import org.apache.struts2.views.velocity.components.TreeNodeDirective;
+import org.apache.struts2.views.velocity.components.URLDirective;
+import org.apache.struts2.views.velocity.components.UpDownSelectDirective;
+import org.apache.struts2.views.velocity.components.WebTableDirective;
import org.apache.velocity.VelocityContext;
import org.apache.velocity.app.Velocity;
import org.apache.velocity.app.VelocityEngine;
@@ -38,14 +91,8 @@ import org.apache.velocity.tools.view.ToolboxManager;
import org.apache.velocity.tools.view.context.ChainedContext;
import org.apache.velocity.tools.view.servlet.ServletToolboxManager;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.*;
+import com.opensymphony.xwork2.ObjectFactory;
+import com.opensymphony.xwork2.util.OgnlValueStack;
/**
diff --git a/core/src/main/java/org/apache/struts2/views/velocity/components/AbstractDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/AbstractDirective.java
index d4b84f629..ba8e2a424 100644
--- a/core/src/main/java/org/apache/struts2/views/velocity/components/AbstractDirective.java
+++ b/core/src/main/java/org/apache/struts2/views/velocity/components/AbstractDirective.java
@@ -17,9 +17,16 @@
*/
package org.apache.struts2.views.velocity.components;
+import java.io.IOException;
+import java.io.Writer;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
import org.apache.struts2.ServletActionContext;
import org.apache.struts2.components.Component;
-import com.opensymphony.xwork2.util.OgnlValueStack;
import org.apache.velocity.context.InternalContextAdapter;
import org.apache.velocity.exception.MethodInvocationException;
import org.apache.velocity.exception.ParseErrorException;
@@ -27,12 +34,7 @@ import org.apache.velocity.exception.ResourceNotFoundException;
import org.apache.velocity.runtime.directive.Directive;
import org.apache.velocity.runtime.parser.node.Node;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.Writer;
-import java.util.HashMap;
-import java.util.Map;
+import com.opensymphony.xwork2.util.OgnlValueStack;
public abstract class AbstractDirective extends Directive {
public String getName() {
diff --git a/core/src/main/java/org/apache/struts2/views/velocity/components/ActionDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/ActionDirective.java
index e329baef0..cba295fc1 100644
--- a/core/src/main/java/org/apache/struts2/views/velocity/components/ActionDirective.java
+++ b/core/src/main/java/org/apache/struts2/views/velocity/components/ActionDirective.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.velocity.components;
-import org.apache.struts2.components.ActionComponent;
-import org.apache.struts2.components.Component;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.ActionComponent;
+import org.apache.struts2.components.Component;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see ActionComponent
*/
diff --git a/core/src/main/java/org/apache/struts2/views/velocity/components/ActionErrorDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/ActionErrorDirective.java
index 3f3b23b84..2000c9b3c 100644
--- a/core/src/main/java/org/apache/struts2/views/velocity/components/ActionErrorDirective.java
+++ b/core/src/main/java/org/apache/struts2/views/velocity/components/ActionErrorDirective.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.velocity.components;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.ActionError;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.ActionError;
+import org.apache.struts2.components.Component;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see ActionError
*/
diff --git a/core/src/main/java/org/apache/struts2/views/velocity/components/ActionMessageDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/ActionMessageDirective.java
index 2a748f34e..a0703bf8a 100644
--- a/core/src/main/java/org/apache/struts2/views/velocity/components/ActionMessageDirective.java
+++ b/core/src/main/java/org/apache/struts2/views/velocity/components/ActionMessageDirective.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.velocity.components;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.ActionMessage;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.ActionMessage;
+import org.apache.struts2.components.Component;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see ActionMessage
*/
diff --git a/core/src/main/java/org/apache/struts2/views/velocity/components/AnchorDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/AnchorDirective.java
index a1d0b9675..5d51fb8f2 100644
--- a/core/src/main/java/org/apache/struts2/views/velocity/components/AnchorDirective.java
+++ b/core/src/main/java/org/apache/struts2/views/velocity/components/AnchorDirective.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.velocity.components;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.Anchor;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Anchor;
+import org.apache.struts2.components.Component;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see Anchor
*/
diff --git a/core/src/main/java/org/apache/struts2/views/velocity/components/BeanDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/BeanDirective.java
index 10a85333a..b6cfaa341 100644
--- a/core/src/main/java/org/apache/struts2/views/velocity/components/BeanDirective.java
+++ b/core/src/main/java/org/apache/struts2/views/velocity/components/BeanDirective.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.velocity.components;
-import org.apache.struts2.components.Bean;
-import org.apache.struts2.components.Component;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Bean;
+import org.apache.struts2.components.Component;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see Bean
*/
diff --git a/core/src/main/java/org/apache/struts2/views/velocity/components/CheckBoxDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/CheckBoxDirective.java
index 3dac69cb5..38e46dd9e 100644
--- a/core/src/main/java/org/apache/struts2/views/velocity/components/CheckBoxDirective.java
+++ b/core/src/main/java/org/apache/struts2/views/velocity/components/CheckBoxDirective.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.velocity.components;
-import org.apache.struts2.components.Checkbox;
-import org.apache.struts2.components.Component;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Checkbox;
+import org.apache.struts2.components.Component;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see Checkbox
*/
diff --git a/core/src/main/java/org/apache/struts2/views/velocity/components/CheckBoxListDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/CheckBoxListDirective.java
index 53fa77b6a..f514d79ea 100644
--- a/core/src/main/java/org/apache/struts2/views/velocity/components/CheckBoxListDirective.java
+++ b/core/src/main/java/org/apache/struts2/views/velocity/components/CheckBoxListDirective.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.velocity.components;
-import org.apache.struts2.components.CheckboxList;
-import org.apache.struts2.components.Component;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.CheckboxList;
+import org.apache.struts2.components.Component;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see CheckboxList
*/
diff --git a/core/src/main/java/org/apache/struts2/views/velocity/components/ComboBoxDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/ComboBoxDirective.java
index c80e37d21..19eab8e40 100644
--- a/core/src/main/java/org/apache/struts2/views/velocity/components/ComboBoxDirective.java
+++ b/core/src/main/java/org/apache/struts2/views/velocity/components/ComboBoxDirective.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.velocity.components;
-import org.apache.struts2.components.ComboBox;
-import org.apache.struts2.components.Component;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.ComboBox;
+import org.apache.struts2.components.Component;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see ComboBox
*/
diff --git a/core/src/main/java/org/apache/struts2/views/velocity/components/ComponentDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/ComponentDirective.java
index 28c61bda6..3ca49de83 100644
--- a/core/src/main/java/org/apache/struts2/views/velocity/components/ComponentDirective.java
+++ b/core/src/main/java/org/apache/struts2/views/velocity/components/ComponentDirective.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.velocity.components;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.GenericUIBean;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.GenericUIBean;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see GenericUIBean
*/
diff --git a/core/src/main/java/org/apache/struts2/views/velocity/components/DateDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/DateDirective.java
index 73eee28f0..a0d18ba55 100644
--- a/core/src/main/java/org/apache/struts2/views/velocity/components/DateDirective.java
+++ b/core/src/main/java/org/apache/struts2/views/velocity/components/DateDirective.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.velocity.components;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.Date;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Date;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* DateDirective
*/
diff --git a/core/src/main/java/org/apache/struts2/views/velocity/components/DatePickerDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/DatePickerDirective.java
index 6248cee0a..c3ac9cb7a 100644
--- a/core/src/main/java/org/apache/struts2/views/velocity/components/DatePickerDirective.java
+++ b/core/src/main/java/org/apache/struts2/views/velocity/components/DatePickerDirective.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.velocity.components;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.DatePicker;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.DatePicker;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see DatePicker
*/
diff --git a/core/src/main/java/org/apache/struts2/views/velocity/components/DivDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/DivDirective.java
index 42f78d3a5..34bc61708 100644
--- a/core/src/main/java/org/apache/struts2/views/velocity/components/DivDirective.java
+++ b/core/src/main/java/org/apache/struts2/views/velocity/components/DivDirective.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.velocity.components;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.Div;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Div;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see Div
*/
diff --git a/core/src/main/java/org/apache/struts2/views/velocity/components/DoubleSelectDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/DoubleSelectDirective.java
index e4e6a2d9a..c4f2f8f4b 100644
--- a/core/src/main/java/org/apache/struts2/views/velocity/components/DoubleSelectDirective.java
+++ b/core/src/main/java/org/apache/struts2/views/velocity/components/DoubleSelectDirective.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.velocity.components;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.DoubleSelect;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.DoubleSelect;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see DoubleSelect
*/
diff --git a/core/src/main/java/org/apache/struts2/views/velocity/components/FieldErrorDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/FieldErrorDirective.java
index 86e7ee654..ebea4d25e 100644
--- a/core/src/main/java/org/apache/struts2/views/velocity/components/FieldErrorDirective.java
+++ b/core/src/main/java/org/apache/struts2/views/velocity/components/FieldErrorDirective.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.velocity.components;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.FieldError;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.FieldError;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see FieldError
*/
diff --git a/core/src/main/java/org/apache/struts2/views/velocity/components/FileDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/FileDirective.java
index 5474ca93e..d9ac2f922 100644
--- a/core/src/main/java/org/apache/struts2/views/velocity/components/FileDirective.java
+++ b/core/src/main/java/org/apache/struts2/views/velocity/components/FileDirective.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.velocity.components;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.File;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.File;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see File
*/
diff --git a/core/src/main/java/org/apache/struts2/views/velocity/components/FormDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/FormDirective.java
index a8123fabf..c7c954e34 100644
--- a/core/src/main/java/org/apache/struts2/views/velocity/components/FormDirective.java
+++ b/core/src/main/java/org/apache/struts2/views/velocity/components/FormDirective.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.velocity.components;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.Form;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Form;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see Form
*/
diff --git a/core/src/main/java/org/apache/struts2/views/velocity/components/HeadDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/HeadDirective.java
index 2d26142b4..6dd731f64 100644
--- a/core/src/main/java/org/apache/struts2/views/velocity/components/HeadDirective.java
+++ b/core/src/main/java/org/apache/struts2/views/velocity/components/HeadDirective.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.velocity.components;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.Head;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Head;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see Head
*/
diff --git a/core/src/main/java/org/apache/struts2/views/velocity/components/HiddenDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/HiddenDirective.java
index aba80a3e8..11ba0c3cb 100644
--- a/core/src/main/java/org/apache/struts2/views/velocity/components/HiddenDirective.java
+++ b/core/src/main/java/org/apache/struts2/views/velocity/components/HiddenDirective.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.velocity.components;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.Hidden;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Hidden;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see Hidden
*/
diff --git a/core/src/main/java/org/apache/struts2/views/velocity/components/I18nDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/I18nDirective.java
index 19d0b7622..2b9f6d03b 100644
--- a/core/src/main/java/org/apache/struts2/views/velocity/components/I18nDirective.java
+++ b/core/src/main/java/org/apache/struts2/views/velocity/components/I18nDirective.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.velocity.components;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.I18n;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.I18n;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see I18n
*/
diff --git a/core/src/main/java/org/apache/struts2/views/velocity/components/IncludeDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/IncludeDirective.java
index 267be33d0..a3b92ace2 100644
--- a/core/src/main/java/org/apache/struts2/views/velocity/components/IncludeDirective.java
+++ b/core/src/main/java/org/apache/struts2/views/velocity/components/IncludeDirective.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.velocity.components;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.Include;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Include;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see Include
*/
diff --git a/core/src/main/java/org/apache/struts2/views/velocity/components/LabelDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/LabelDirective.java
index a709e2e6b..edd143e96 100644
--- a/core/src/main/java/org/apache/struts2/views/velocity/components/LabelDirective.java
+++ b/core/src/main/java/org/apache/struts2/views/velocity/components/LabelDirective.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.velocity.components;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.Label;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Label;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see Label
*/
diff --git a/core/src/main/java/org/apache/struts2/views/velocity/components/OptGroupDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/OptGroupDirective.java
index 2e23a419b..4a51a967e 100644
--- a/core/src/main/java/org/apache/struts2/views/velocity/components/OptGroupDirective.java
+++ b/core/src/main/java/org/apache/struts2/views/velocity/components/OptGroupDirective.java
@@ -22,6 +22,7 @@ import javax.servlet.http.HttpServletResponse;
import org.apache.struts2.components.Component;
import org.apache.struts2.components.OptGroup;
+
import com.opensymphony.xwork2.util.OgnlValueStack;
diff --git a/core/src/main/java/org/apache/struts2/views/velocity/components/OptionTransferSelectDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/OptionTransferSelectDirective.java
index 44c95f673..b21542d9e 100644
--- a/core/src/main/java/org/apache/struts2/views/velocity/components/OptionTransferSelectDirective.java
+++ b/core/src/main/java/org/apache/struts2/views/velocity/components/OptionTransferSelectDirective.java
@@ -22,6 +22,7 @@ import javax.servlet.http.HttpServletResponse;
import org.apache.struts2.components.Component;
import org.apache.struts2.components.OptionTransferSelect;
+
import com.opensymphony.xwork2.util.OgnlValueStack;
/**
diff --git a/core/src/main/java/org/apache/struts2/views/velocity/components/PanelDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/PanelDirective.java
index 77505fc38..c6170d7dc 100644
--- a/core/src/main/java/org/apache/struts2/views/velocity/components/PanelDirective.java
+++ b/core/src/main/java/org/apache/struts2/views/velocity/components/PanelDirective.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.velocity.components;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.Panel;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Panel;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see Panel
*/
diff --git a/core/src/main/java/org/apache/struts2/views/velocity/components/ParamDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/ParamDirective.java
index e326eb803..abed6c8c3 100644
--- a/core/src/main/java/org/apache/struts2/views/velocity/components/ParamDirective.java
+++ b/core/src/main/java/org/apache/struts2/views/velocity/components/ParamDirective.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.velocity.components;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.Param;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Param;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see Param
*/
diff --git a/core/src/main/java/org/apache/struts2/views/velocity/components/PasswordDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/PasswordDirective.java
index 7ea6a4589..c75557709 100644
--- a/core/src/main/java/org/apache/struts2/views/velocity/components/PasswordDirective.java
+++ b/core/src/main/java/org/apache/struts2/views/velocity/components/PasswordDirective.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.velocity.components;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.Password;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Password;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see Password
*/
diff --git a/core/src/main/java/org/apache/struts2/views/velocity/components/PropertyDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/PropertyDirective.java
index d750b3056..9f7bb6198 100644
--- a/core/src/main/java/org/apache/struts2/views/velocity/components/PropertyDirective.java
+++ b/core/src/main/java/org/apache/struts2/views/velocity/components/PropertyDirective.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.velocity.components;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.Property;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Property;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
*/
public class PropertyDirective extends AbstractDirective {
diff --git a/core/src/main/java/org/apache/struts2/views/velocity/components/PushDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/PushDirective.java
index 03426dd85..8dbf464ba 100644
--- a/core/src/main/java/org/apache/struts2/views/velocity/components/PushDirective.java
+++ b/core/src/main/java/org/apache/struts2/views/velocity/components/PushDirective.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.velocity.components;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.Push;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Push;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see Push
*/
diff --git a/core/src/main/java/org/apache/struts2/views/velocity/components/RadioDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/RadioDirective.java
index 27574d52e..dfc0dc68a 100644
--- a/core/src/main/java/org/apache/struts2/views/velocity/components/RadioDirective.java
+++ b/core/src/main/java/org/apache/struts2/views/velocity/components/RadioDirective.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.velocity.components;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.Radio;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Radio;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see Radio
*/
diff --git a/core/src/main/java/org/apache/struts2/views/velocity/components/ResetDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/ResetDirective.java
index d90f2f6f6..ae6a122a7 100644
--- a/core/src/main/java/org/apache/struts2/views/velocity/components/ResetDirective.java
+++ b/core/src/main/java/org/apache/struts2/views/velocity/components/ResetDirective.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.velocity.components;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.Reset;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Reset;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see org.apache.struts2.components.Reset
*/
diff --git a/core/src/main/java/org/apache/struts2/views/velocity/components/SelectDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/SelectDirective.java
index 2ffa853e7..cb39df148 100644
--- a/core/src/main/java/org/apache/struts2/views/velocity/components/SelectDirective.java
+++ b/core/src/main/java/org/apache/struts2/views/velocity/components/SelectDirective.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.velocity.components;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.Select;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Select;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see Select
*/
diff --git a/core/src/main/java/org/apache/struts2/views/velocity/components/SetDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/SetDirective.java
index a81c05809..c1afc411e 100644
--- a/core/src/main/java/org/apache/struts2/views/velocity/components/SetDirective.java
+++ b/core/src/main/java/org/apache/struts2/views/velocity/components/SetDirective.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.velocity.components;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.Set;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Set;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see Set
*/
diff --git a/core/src/main/java/org/apache/struts2/views/velocity/components/SubmitDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/SubmitDirective.java
index c67c60fba..29e15810d 100644
--- a/core/src/main/java/org/apache/struts2/views/velocity/components/SubmitDirective.java
+++ b/core/src/main/java/org/apache/struts2/views/velocity/components/SubmitDirective.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.velocity.components;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.Submit;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Submit;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see Submit
*/
diff --git a/core/src/main/java/org/apache/struts2/views/velocity/components/TabbedPanelDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/TabbedPanelDirective.java
index ccf93a2ac..08615b47d 100644
--- a/core/src/main/java/org/apache/struts2/views/velocity/components/TabbedPanelDirective.java
+++ b/core/src/main/java/org/apache/struts2/views/velocity/components/TabbedPanelDirective.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.velocity.components;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.TabbedPanel;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.TabbedPanel;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see TabbedPanel
*/
diff --git a/core/src/main/java/org/apache/struts2/views/velocity/components/TextAreaDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/TextAreaDirective.java
index c9e0653b0..df6d4c967 100644
--- a/core/src/main/java/org/apache/struts2/views/velocity/components/TextAreaDirective.java
+++ b/core/src/main/java/org/apache/struts2/views/velocity/components/TextAreaDirective.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.velocity.components;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.TextArea;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.TextArea;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see TextArea
*/
diff --git a/core/src/main/java/org/apache/struts2/views/velocity/components/TextDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/TextDirective.java
index 1774db520..fc07d3563 100644
--- a/core/src/main/java/org/apache/struts2/views/velocity/components/TextDirective.java
+++ b/core/src/main/java/org/apache/struts2/views/velocity/components/TextDirective.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.velocity.components;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.Text;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Text;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see Text
*/
diff --git a/core/src/main/java/org/apache/struts2/views/velocity/components/TextFieldDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/TextFieldDirective.java
index 163b73393..f5e4ea855 100644
--- a/core/src/main/java/org/apache/struts2/views/velocity/components/TextFieldDirective.java
+++ b/core/src/main/java/org/apache/struts2/views/velocity/components/TextFieldDirective.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.velocity.components;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.TextField;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.TextField;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see TextField
*/
diff --git a/core/src/main/java/org/apache/struts2/views/velocity/components/TokenDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/TokenDirective.java
index 5d61fa0d1..35fcf770a 100644
--- a/core/src/main/java/org/apache/struts2/views/velocity/components/TokenDirective.java
+++ b/core/src/main/java/org/apache/struts2/views/velocity/components/TokenDirective.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.velocity.components;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.Token;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Token;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see Token
*/
diff --git a/core/src/main/java/org/apache/struts2/views/velocity/components/TreeDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/TreeDirective.java
index 909236c72..0c290b004 100644
--- a/core/src/main/java/org/apache/struts2/views/velocity/components/TreeDirective.java
+++ b/core/src/main/java/org/apache/struts2/views/velocity/components/TreeDirective.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.velocity.components;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.Tree;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Tree;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* TreeDirective
* @see Tree
diff --git a/core/src/main/java/org/apache/struts2/views/velocity/components/TreeNodeDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/TreeNodeDirective.java
index 03e5b243c..aafa94a87 100644
--- a/core/src/main/java/org/apache/struts2/views/velocity/components/TreeNodeDirective.java
+++ b/core/src/main/java/org/apache/struts2/views/velocity/components/TreeNodeDirective.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.velocity.components;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.TreeNode;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.TreeNode;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* TreeNodeDirective
* @see TreeNode
diff --git a/core/src/main/java/org/apache/struts2/views/velocity/components/URLDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/URLDirective.java
index d17b779a1..ffe4f2def 100644
--- a/core/src/main/java/org/apache/struts2/views/velocity/components/URLDirective.java
+++ b/core/src/main/java/org/apache/struts2/views/velocity/components/URLDirective.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.velocity.components;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.URL;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.URL;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see URL
*/
diff --git a/core/src/main/java/org/apache/struts2/views/velocity/components/UpDownSelectDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/UpDownSelectDirective.java
index c54342efc..ecd5c6580 100644
--- a/core/src/main/java/org/apache/struts2/views/velocity/components/UpDownSelectDirective.java
+++ b/core/src/main/java/org/apache/struts2/views/velocity/components/UpDownSelectDirective.java
@@ -22,6 +22,7 @@ import javax.servlet.http.HttpServletResponse;
import org.apache.struts2.components.Component;
import org.apache.struts2.components.UpDownSelect;
+
import com.opensymphony.xwork2.util.OgnlValueStack;
/**
diff --git a/core/src/main/java/org/apache/struts2/views/velocity/components/WebTableDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/WebTableDirective.java
index 2963e6272..695a13e04 100644
--- a/core/src/main/java/org/apache/struts2/views/velocity/components/WebTableDirective.java
+++ b/core/src/main/java/org/apache/struts2/views/velocity/components/WebTableDirective.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.velocity.components;
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.table.WebTable;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.table.WebTable;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* @see WebTable
*/
diff --git a/core/src/main/java/org/apache/struts2/views/xslt/AbstractAdapterElement.java b/core/src/main/java/org/apache/struts2/views/xslt/AbstractAdapterElement.java
index c75425dfa..e599536fa 100644
--- a/core/src/main/java/org/apache/struts2/views/xslt/AbstractAdapterElement.java
+++ b/core/src/main/java/org/apache/struts2/views/xslt/AbstractAdapterElement.java
@@ -17,10 +17,14 @@
*/
package org.apache.struts2.views.xslt;
-import org.w3c.dom.*;
-
-import java.util.Map;
import java.util.HashMap;
+import java.util.Map;
+
+import org.w3c.dom.Attr;
+import org.w3c.dom.DOMException;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.TypeInfo;
/**
* AbstractAdapterElement extends the abstract Node type and implements
diff --git a/core/src/main/java/org/apache/struts2/views/xslt/AbstractAdapterNode.java b/core/src/main/java/org/apache/struts2/views/xslt/AbstractAdapterNode.java
index 3016a2735..d781e4f5b 100644
--- a/core/src/main/java/org/apache/struts2/views/xslt/AbstractAdapterNode.java
+++ b/core/src/main/java/org/apache/struts2/views/xslt/AbstractAdapterNode.java
@@ -17,14 +17,19 @@
*/
package org.apache.struts2.views.xslt;
-import org.w3c.dom.*;
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.struts2.StrutsException;
-
-import java.util.List;
-import java.util.ArrayList;
-import java.util.LinkedList;
+import org.w3c.dom.DOMException;
+import org.w3c.dom.Document;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.w3c.dom.UserDataHandler;
/**
* AbstractAdapterNode is the base for childAdapters that expose a read-only view
diff --git a/core/src/main/java/org/apache/struts2/views/xslt/AdapterFactory.java b/core/src/main/java/org/apache/struts2/views/xslt/AdapterFactory.java
index d721479e1..43f08d6d4 100644
--- a/core/src/main/java/org/apache/struts2/views/xslt/AdapterFactory.java
+++ b/core/src/main/java/org/apache/struts2/views/xslt/AdapterFactory.java
@@ -17,12 +17,17 @@
*/
package org.apache.struts2.views.xslt;
-import org.apache.struts2.StrutsException;
-import org.w3c.dom.*;
-
-import java.util.Map;
-import java.util.HashMap;
import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.struts2.StrutsException;
+import org.w3c.dom.Attr;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.Text;
/**
* AdapterFactory produces Node adapters for Java object types.
diff --git a/core/src/main/java/org/apache/struts2/views/xslt/ArrayAdapter.java b/core/src/main/java/org/apache/struts2/views/xslt/ArrayAdapter.java
index 7cb2ff285..a434d63a8 100644
--- a/core/src/main/java/org/apache/struts2/views/xslt/ArrayAdapter.java
+++ b/core/src/main/java/org/apache/struts2/views/xslt/ArrayAdapter.java
@@ -17,13 +17,13 @@
*/
package org.apache.struts2.views.xslt;
+import java.util.ArrayList;
+import java.util.List;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.w3c.dom.Node;
-import java.util.ArrayList;
-import java.util.List;
-
/**
*/
diff --git a/core/src/main/java/org/apache/struts2/views/xslt/BeanAdapter.java b/core/src/main/java/org/apache/struts2/views/xslt/BeanAdapter.java
index f70219c6d..822c84d0d 100644
--- a/core/src/main/java/org/apache/struts2/views/xslt/BeanAdapter.java
+++ b/core/src/main/java/org/apache/struts2/views/xslt/BeanAdapter.java
@@ -17,22 +17,22 @@
*/
package org.apache.struts2.views.xslt;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.struts2.StrutsException;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.Node;
-
import java.beans.IntrospectionException;
import java.beans.Introspector;
import java.beans.PropertyDescriptor;
-import java.lang.reflect.Method;
import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.struts2.StrutsException;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
/**
* This class is the most general type of adapter, utilizing reflective introspection to present a DOM view of all of
diff --git a/core/src/main/java/org/apache/struts2/views/xslt/CollectionAdapter.java b/core/src/main/java/org/apache/struts2/views/xslt/CollectionAdapter.java
index 90260461b..4fa7dc843 100644
--- a/core/src/main/java/org/apache/struts2/views/xslt/CollectionAdapter.java
+++ b/core/src/main/java/org/apache/struts2/views/xslt/CollectionAdapter.java
@@ -17,15 +17,14 @@
*/
package org.apache.struts2.views.xslt;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.w3c.dom.Node;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
/**
*/
diff --git a/core/src/main/java/org/apache/struts2/views/xslt/MapAdapter.java b/core/src/main/java/org/apache/struts2/views/xslt/MapAdapter.java
index ea33febef..885cdbcd4 100644
--- a/core/src/main/java/org/apache/struts2/views/xslt/MapAdapter.java
+++ b/core/src/main/java/org/apache/struts2/views/xslt/MapAdapter.java
@@ -17,11 +17,11 @@
*/
package org.apache.struts2.views.xslt;
-import org.w3c.dom.Node;
-
-import java.util.Map;
-import java.util.List;
import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import org.w3c.dom.Node;
/**
* MapAdapter adapters a java.util.Map type to an XML DOM with the following
diff --git a/core/src/main/java/org/apache/struts2/views/xslt/ProxyElementAdapter.java b/core/src/main/java/org/apache/struts2/views/xslt/ProxyElementAdapter.java
index 8cf41eb59..9c6e13fe7 100644
--- a/core/src/main/java/org/apache/struts2/views/xslt/ProxyElementAdapter.java
+++ b/core/src/main/java/org/apache/struts2/views/xslt/ProxyElementAdapter.java
@@ -17,12 +17,17 @@
*/
package org.apache.struts2.views.xslt;
-import org.w3c.dom.*;
+import java.util.ArrayList;
+import java.util.List;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
-import java.util.List;
-import java.util.ArrayList;
+import org.w3c.dom.Attr;
+import org.w3c.dom.DOMException;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.w3c.dom.TypeInfo;
/**
* ProxyElementAdapter is a pass-through adapter for objects which already
diff --git a/core/src/main/java/org/apache/struts2/views/xslt/ProxyNamedNodeMap.java b/core/src/main/java/org/apache/struts2/views/xslt/ProxyNamedNodeMap.java
index ebd3b179c..250a2ae68 100644
--- a/core/src/main/java/org/apache/struts2/views/xslt/ProxyNamedNodeMap.java
+++ b/core/src/main/java/org/apache/struts2/views/xslt/ProxyNamedNodeMap.java
@@ -17,9 +17,9 @@
*/
package org.apache.struts2.views.xslt;
+import org.w3c.dom.DOMException;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
-import org.w3c.dom.DOMException;
/**
* A NamedNodeMap that wraps the Nodes returned in their proxies.
diff --git a/core/src/main/java/org/apache/struts2/views/xslt/ProxyNodeAdapter.java b/core/src/main/java/org/apache/struts2/views/xslt/ProxyNodeAdapter.java
index 09be6894a..cfa6671f8 100644
--- a/core/src/main/java/org/apache/struts2/views/xslt/ProxyNodeAdapter.java
+++ b/core/src/main/java/org/apache/struts2/views/xslt/ProxyNodeAdapter.java
@@ -19,9 +19,9 @@ package org.apache.struts2.views.xslt;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.w3c.dom.Node;
-import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.DOMException;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
/**
* ProxyNodeAdapter is a read-only delegating adapter for objects which already
diff --git a/core/src/main/java/org/apache/struts2/views/xslt/ProxyTextNodeAdapter.java b/core/src/main/java/org/apache/struts2/views/xslt/ProxyTextNodeAdapter.java
index 972589135..769e0d45b 100644
--- a/core/src/main/java/org/apache/struts2/views/xslt/ProxyTextNodeAdapter.java
+++ b/core/src/main/java/org/apache/struts2/views/xslt/ProxyTextNodeAdapter.java
@@ -17,8 +17,8 @@
*/
package org.apache.struts2.views.xslt;
-import org.w3c.dom.Text;
import org.w3c.dom.DOMException;
+import org.w3c.dom.Text;
/**
* ProxyTextNodeAdapter is a pass-through adapter for objects which already
diff --git a/core/src/main/java/org/apache/struts2/views/xslt/ServletURIResolver.java b/core/src/main/java/org/apache/struts2/views/xslt/ServletURIResolver.java
index c6d86c399..c295d4f74 100644
--- a/core/src/main/java/org/apache/struts2/views/xslt/ServletURIResolver.java
+++ b/core/src/main/java/org/apache/struts2/views/xslt/ServletURIResolver.java
@@ -17,15 +17,16 @@
*/
package org.apache.struts2.views.xslt;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import java.io.InputStream;
import javax.servlet.ServletContext;
import javax.xml.transform.Source;
import javax.xml.transform.TransformerException;
import javax.xml.transform.URIResolver;
import javax.xml.transform.stream.StreamSource;
-import java.io.InputStream;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
/**
diff --git a/core/src/main/java/org/apache/struts2/views/xslt/SimpleAdapterDocument.java b/core/src/main/java/org/apache/struts2/views/xslt/SimpleAdapterDocument.java
index 17f25b184..eba77dd46 100644
--- a/core/src/main/java/org/apache/struts2/views/xslt/SimpleAdapterDocument.java
+++ b/core/src/main/java/org/apache/struts2/views/xslt/SimpleAdapterDocument.java
@@ -17,11 +17,25 @@
*/
package org.apache.struts2.views.xslt;
-import org.w3c.dom.*;
-import org.apache.struts2.StrutsException;
-
-import java.util.List;
import java.util.Arrays;
+import java.util.List;
+
+import org.apache.struts2.StrutsException;
+import org.w3c.dom.Attr;
+import org.w3c.dom.CDATASection;
+import org.w3c.dom.Comment;
+import org.w3c.dom.DOMConfiguration;
+import org.w3c.dom.DOMException;
+import org.w3c.dom.DOMImplementation;
+import org.w3c.dom.Document;
+import org.w3c.dom.DocumentFragment;
+import org.w3c.dom.DocumentType;
+import org.w3c.dom.Element;
+import org.w3c.dom.EntityReference;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.w3c.dom.ProcessingInstruction;
+import org.w3c.dom.Text;
/**
* SimpleAdapterDocument adapted a Java object and presents it as
diff --git a/core/src/main/java/org/apache/struts2/views/xslt/SimpleNodeList.java b/core/src/main/java/org/apache/struts2/views/xslt/SimpleNodeList.java
index 66e305088..6c27f3f33 100644
--- a/core/src/main/java/org/apache/struts2/views/xslt/SimpleNodeList.java
+++ b/core/src/main/java/org/apache/struts2/views/xslt/SimpleNodeList.java
@@ -17,12 +17,12 @@
*/
package org.apache.struts2.views.xslt;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.Node;
+import java.util.List;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
-import java.util.List;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
public class SimpleNodeList implements NodeList {
diff --git a/core/src/main/java/org/apache/struts2/views/xslt/StringAdapter.java b/core/src/main/java/org/apache/struts2/views/xslt/StringAdapter.java
index 58fe52167..019e83c1e 100644
--- a/core/src/main/java/org/apache/struts2/views/xslt/StringAdapter.java
+++ b/core/src/main/java/org/apache/struts2/views/xslt/StringAdapter.java
@@ -17,20 +17,20 @@
*/
package org.apache.struts2.views.xslt;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.xml.parsers.ParserConfigurationException;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.struts2.StrutsException;
import org.w3c.dom.Node;
import org.xml.sax.SAXException;
-import java.util.List;
-import java.util.ArrayList;
-import java.io.IOException;
-
import com.opensymphony.util.XMLUtils;
-import javax.xml.parsers.ParserConfigurationException;
-
/**
* StringAdapter adapts a Java String value to a DOM Element with the specified
* property name containing the String's text.
diff --git a/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java b/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java
index 134c8e6b7..c23720595 100644
--- a/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java
+++ b/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java
@@ -17,21 +17,6 @@
*/
package org.apache.struts2.views.xslt;
-import org.apache.struts2.ServletActionContext;
-import org.apache.struts2.config.Settings;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.ActionInvocation;
-import com.opensymphony.xwork2.Result;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-import com.opensymphony.xwork2.util.TextParseUtil;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import javax.servlet.http.HttpServletResponse;
-import javax.xml.transform.*;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-import javax.xml.transform.stream.StreamSource;
import java.io.IOException;
import java.io.PrintWriter;
import java.io.Writer;
@@ -39,6 +24,29 @@ import java.net.URL;
import java.util.HashMap;
import java.util.Map;
+import javax.servlet.http.HttpServletResponse;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Source;
+import javax.xml.transform.Templates;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.URIResolver;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.struts2.ServletActionContext;
+import org.apache.struts2.config.Settings;
+
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.Result;
+import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.TextParseUtil;
+
/**
*
@@ -179,6 +187,7 @@ import java.util.Map;
*/
public class XSLTResult implements Result {
+ private static final long serialVersionUID = 6424691441777176763L;
private static final Log log = LogFactory.getLog(XSLTResult.class);
public static final String DEFAULT_PARAM = "stylesheetLocation";
diff --git a/core/src/test/java/org/apache/struts2/ExecutionCountTestAction.java b/core/src/test/java/org/apache/struts2/ExecutionCountTestAction.java
index 496ba874f..7b4b8f7fb 100644
--- a/core/src/test/java/org/apache/struts2/ExecutionCountTestAction.java
+++ b/core/src/test/java/org/apache/struts2/ExecutionCountTestAction.java
@@ -17,10 +17,11 @@
*/
package org.apache.struts2;
-import com.opensymphony.xwork2.ActionSupport;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import com.opensymphony.xwork2.ActionSupport;
+
/**
* ExecutionCountTestAction
diff --git a/core/src/test/java/org/apache/struts2/RequestUtilsTest.java b/core/src/test/java/org/apache/struts2/RequestUtilsTest.java
index 5b345487e..6ab4480de 100644
--- a/core/src/test/java/org/apache/struts2/RequestUtilsTest.java
+++ b/core/src/test/java/org/apache/struts2/RequestUtilsTest.java
@@ -21,10 +21,10 @@ package org.apache.struts2;
* RequestUtilsTest
*
*/
-import junit.framework.TestCase;
-
import javax.servlet.http.HttpServletRequest;
+import junit.framework.TestCase;
+
import org.easymock.MockControl;
public class RequestUtilsTest extends TestCase {
diff --git a/core/src/test/java/org/apache/struts2/ServletActionContextTest.java b/core/src/test/java/org/apache/struts2/ServletActionContextTest.java
index 6e8cc364d..d3f1b90fc 100644
--- a/core/src/test/java/org/apache/struts2/ServletActionContextTest.java
+++ b/core/src/test/java/org/apache/struts2/ServletActionContextTest.java
@@ -17,16 +17,18 @@
*/
package org.apache.struts2;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import junit.framework.TestCase;
+
import com.mockobjects.servlet.MockHttpServletRequest;
import com.mockobjects.servlet.MockHttpServletResponse;
import com.mockobjects.servlet.MockServletContext;
import com.opensymphony.xwork2.ActionContext;
-import junit.framework.TestCase;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.HashMap;
-import java.util.Map;
/**
diff --git a/core/src/test/java/org/apache/struts2/TestAction.java b/core/src/test/java/org/apache/struts2/TestAction.java
index f1ca56cb3..ac4394397 100644
--- a/core/src/test/java/org/apache/struts2/TestAction.java
+++ b/core/src/test/java/org/apache/struts2/TestAction.java
@@ -17,14 +17,15 @@
*/
package org.apache.struts2;
-import org.apache.struts2.views.jsp.ui.User;
-import com.opensymphony.xwork2.Action;
-import com.opensymphony.xwork2.ActionSupport;
-
import java.util.Collection;
import java.util.List;
import java.util.Map;
+import org.apache.struts2.views.jsp.ui.User;
+
+import com.opensymphony.xwork2.Action;
+import com.opensymphony.xwork2.ActionSupport;
+
/**
*/
diff --git a/core/src/test/java/org/apache/struts2/TestConfigurationProvider.java b/core/src/test/java/org/apache/struts2/TestConfigurationProvider.java
index 70ef6c8a4..f01825244 100644
--- a/core/src/test/java/org/apache/struts2/TestConfigurationProvider.java
+++ b/core/src/test/java/org/apache/struts2/TestConfigurationProvider.java
@@ -17,24 +17,25 @@
*/
package org.apache.struts2;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
import org.apache.struts2.dispatcher.ServletDispatcherResult;
import org.apache.struts2.interceptor.TokenInterceptor;
import org.apache.struts2.interceptor.TokenSessionStoreInterceptor;
+
import com.opensymphony.xwork2.Action;
import com.opensymphony.xwork2.ActionChainResult;
import com.opensymphony.xwork2.config.Configuration;
import com.opensymphony.xwork2.config.ConfigurationProvider;
import com.opensymphony.xwork2.config.entities.ActionConfig;
+import com.opensymphony.xwork2.config.entities.InterceptorMapping;
import com.opensymphony.xwork2.config.entities.PackageConfig;
import com.opensymphony.xwork2.config.entities.ResultConfig;
-import com.opensymphony.xwork2.config.entities.InterceptorMapping;
import com.opensymphony.xwork2.interceptor.ParametersInterceptor;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
/**
* TestConfigurationProvider provides a simple configuration class without the need for xml files, etc. for simple testing.
diff --git a/core/src/test/java/org/apache/struts2/TestResult.java b/core/src/test/java/org/apache/struts2/TestResult.java
index fd55127d4..13455fd61 100644
--- a/core/src/test/java/org/apache/struts2/TestResult.java
+++ b/core/src/test/java/org/apache/struts2/TestResult.java
@@ -17,16 +17,18 @@
*/
package org.apache.struts2;
+import java.util.ArrayList;
+import java.util.List;
+
+import junit.framework.Assert;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.Result;
import com.opensymphony.xwork2.util.OgnlValueStack;
-import junit.framework.Assert;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import java.util.ArrayList;
-import java.util.List;
/**
diff --git a/core/src/test/java/org/apache/struts2/components/ComponentTest.java b/core/src/test/java/org/apache/struts2/components/ComponentTest.java
index 365947cf2..e1ec0f8ee 100644
--- a/core/src/test/java/org/apache/struts2/components/ComponentTest.java
+++ b/core/src/test/java/org/apache/struts2/components/ComponentTest.java
@@ -40,6 +40,7 @@ import org.apache.struts2.views.jsp.iterator.AppendIteratorTag;
import org.apache.struts2.views.jsp.iterator.MergeIteratorTag;
import org.apache.struts2.views.jsp.ui.TextFieldTag;
import org.apache.struts2.views.jsp.ui.UpDownSelectTag;
+
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.util.LocalizedTextUtil;
@@ -435,7 +436,7 @@ public class ComponentTest extends AbstractTagTest {
t.setPageContext(pageContext);
t.setName("textFieldName");
- ResourceBundle bundle = ResourceBundle.getBundle("org.apache.struts2.components.tempo");
+ ResourceBundle bundle = ResourceBundle.getBundle("org.apache.struts2.components.tempo");
LocalizedTextUtil.addDefaultResourceBundle("org.apache.struts2.components.temp");
I18nTag tag = new I18nTag();
diff --git a/core/src/test/java/org/apache/struts2/components/FormButtonTest.java b/core/src/test/java/org/apache/struts2/components/FormButtonTest.java
index 8d690826a..9a84d174e 100644
--- a/core/src/test/java/org/apache/struts2/components/FormButtonTest.java
+++ b/core/src/test/java/org/apache/struts2/components/FormButtonTest.java
@@ -23,8 +23,6 @@ import org.springframework.mock.web.MockHttpServletResponse;
import com.opensymphony.xwork2.util.OgnlValueStack;
-import junit.framework.TestCase;
-
/**
*
* @version $Date$ $Id$
diff --git a/core/src/test/java/org/apache/struts2/components/FormTest.java b/core/src/test/java/org/apache/struts2/components/FormTest.java
index ff1b762ce..f39387e7f 100644
--- a/core/src/test/java/org/apache/struts2/components/FormTest.java
+++ b/core/src/test/java/org/apache/struts2/components/FormTest.java
@@ -17,12 +17,13 @@
*/
package org.apache.struts2.components;
-import org.apache.struts2.views.jsp.AbstractUITagTest;
-import org.apache.struts2.TestAction;
-import com.opensymphony.xwork2.validator.validators.RequiredFieldValidator;
-
import java.util.List;
+import org.apache.struts2.TestAction;
+import org.apache.struts2.views.jsp.AbstractUITagTest;
+
+import com.opensymphony.xwork2.validator.validators.RequiredFieldValidator;
+
/**
* FormTest
*
diff --git a/core/src/test/java/org/apache/struts2/components/PropertyTest.java b/core/src/test/java/org/apache/struts2/components/PropertyTest.java
index d7c7a087d..ae329d443 100644
--- a/core/src/test/java/org/apache/struts2/components/PropertyTest.java
+++ b/core/src/test/java/org/apache/struts2/components/PropertyTest.java
@@ -17,15 +17,16 @@
*/
package org.apache.struts2.components;
-import org.apache.struts2.components.Property;
-import org.apache.struts2.util.StrutsTypeConverter;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-import com.opensymphony.xwork2.util.XWorkConverter;
-import junit.framework.TestCase;
-import ognl.Ognl;
-
import java.io.StringWriter;
import java.util.Map;
+
+import junit.framework.TestCase;
+import ognl.Ognl;
+
+import org.apache.struts2.util.StrutsTypeConverter;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.XWorkConverter;
/**
*
diff --git a/core/src/test/java/org/apache/struts2/components/UIComponentTest.java b/core/src/test/java/org/apache/struts2/components/UIComponentTest.java
index 3669a120d..b30647ebe 100644
--- a/core/src/test/java/org/apache/struts2/components/UIComponentTest.java
+++ b/core/src/test/java/org/apache/struts2/components/UIComponentTest.java
@@ -17,10 +17,30 @@
*/
package org.apache.struts2.components;
-import com.opensymphony.xwork2.ActionContext;
import org.apache.struts2.TestConfigurationProvider;
import org.apache.struts2.views.jsp.AbstractUITagTest;
-import org.apache.struts2.views.jsp.ui.*;
+import org.apache.struts2.views.jsp.ui.ActionErrorTag;
+import org.apache.struts2.views.jsp.ui.ActionMessageTag;
+import org.apache.struts2.views.jsp.ui.AnchorTag;
+import org.apache.struts2.views.jsp.ui.CheckboxTag;
+import org.apache.struts2.views.jsp.ui.ComboBoxTag;
+import org.apache.struts2.views.jsp.ui.DivTag;
+import org.apache.struts2.views.jsp.ui.DoubleSelectTag;
+import org.apache.struts2.views.jsp.ui.FieldErrorTag;
+import org.apache.struts2.views.jsp.ui.FileTag;
+import org.apache.struts2.views.jsp.ui.FormTag;
+import org.apache.struts2.views.jsp.ui.HiddenTag;
+import org.apache.struts2.views.jsp.ui.LabelTag;
+import org.apache.struts2.views.jsp.ui.OptionTransferSelectTag;
+import org.apache.struts2.views.jsp.ui.PasswordTag;
+import org.apache.struts2.views.jsp.ui.RadioTag;
+import org.apache.struts2.views.jsp.ui.SelectTag;
+import org.apache.struts2.views.jsp.ui.SubmitTag;
+import org.apache.struts2.views.jsp.ui.TextFieldTag;
+import org.apache.struts2.views.jsp.ui.TextareaTag;
+import org.apache.struts2.views.jsp.ui.TokenTag;
+
+import com.opensymphony.xwork2.ActionContext;
/**
diff --git a/core/src/test/java/org/apache/struts2/components/template/BaseTemplateEngineTest.java b/core/src/test/java/org/apache/struts2/components/template/BaseTemplateEngineTest.java
index 7d569463c..fb5aed3ed 100644
--- a/core/src/test/java/org/apache/struts2/components/template/BaseTemplateEngineTest.java
+++ b/core/src/test/java/org/apache/struts2/components/template/BaseTemplateEngineTest.java
@@ -21,11 +21,6 @@ import java.io.File;
import java.net.URL;
import java.util.Map;
-import org.apache.struts2.components.template.BaseTemplateEngine;
-import org.apache.struts2.components.template.Template;
-import org.apache.struts2.components.template.TemplateEngine;
-import org.apache.struts2.components.template.TemplateRenderingContext;
-
import junit.framework.TestCase;
/**
diff --git a/core/src/test/java/org/apache/struts2/config/SettingsTest.java b/core/src/test/java/org/apache/struts2/config/SettingsTest.java
index f3dc88236..794d8146f 100644
--- a/core/src/test/java/org/apache/struts2/config/SettingsTest.java
+++ b/core/src/test/java/org/apache/struts2/config/SettingsTest.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.config;
-import org.apache.struts2.StrutsTestCase;
-import org.apache.struts2.StrutsConstants;
-import com.opensymphony.xwork2.util.LocalizedTextUtil;
-
import java.util.Iterator;
import java.util.Locale;
+import org.apache.struts2.StrutsConstants;
+import org.apache.struts2.StrutsTestCase;
+
+import com.opensymphony.xwork2.util.LocalizedTextUtil;
+
/**
* Unit test for {@link SettingsTest}.
diff --git a/core/src/test/java/org/apache/struts2/dispatcher/DispatcherTest.java b/core/src/test/java/org/apache/struts2/dispatcher/DispatcherTest.java
index b4ac07d14..5e490b20a 100644
--- a/core/src/test/java/org/apache/struts2/dispatcher/DispatcherTest.java
+++ b/core/src/test/java/org/apache/struts2/dispatcher/DispatcherTest.java
@@ -22,13 +22,12 @@ import java.util.Locale;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.StrutsConstants;
import org.apache.struts2.StrutsTestCase;
+import org.apache.struts2.config.Settings;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
-import org.apache.struts2.StrutsConstants;
-import org.apache.struts2.config.Settings;
-import org.apache.struts2.dispatcher.Dispatcher;
import com.opensymphony.xwork2.util.LocalizedTextUtil;
/**
diff --git a/core/src/test/java/org/apache/struts2/dispatcher/FilterDispatcherTest.java b/core/src/test/java/org/apache/struts2/dispatcher/FilterDispatcherTest.java
index 1c18ab8e4..61892f9b6 100644
--- a/core/src/test/java/org/apache/struts2/dispatcher/FilterDispatcherTest.java
+++ b/core/src/test/java/org/apache/struts2/dispatcher/FilterDispatcherTest.java
@@ -17,11 +17,14 @@
*/
package org.apache.struts2.dispatcher;
-import com.mockobjects.servlet.MockFilterChain;
-import com.opensymphony.xwork2.ObjectFactory;
-import com.opensymphony.xwork2.config.Configuration;
-import com.opensymphony.xwork2.config.ConfigurationManager;
-import com.opensymphony.xwork2.config.impl.DefaultConfiguration;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import org.apache.struts2.StrutsConstants;
import org.apache.struts2.StrutsTestCase;
@@ -36,14 +39,11 @@ import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
import org.springframework.mock.web.MockServletContext;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
+import com.mockobjects.servlet.MockFilterChain;
+import com.opensymphony.xwork2.ObjectFactory;
+import com.opensymphony.xwork2.config.Configuration;
+import com.opensymphony.xwork2.config.ConfigurationManager;
+import com.opensymphony.xwork2.config.impl.DefaultConfiguration;
/**
* FilterDispatcher TestCase.
diff --git a/core/src/test/java/org/apache/struts2/dispatcher/HttpHeaderResultTest.java b/core/src/test/java/org/apache/struts2/dispatcher/HttpHeaderResultTest.java
index 35b5d7e93..098e5982f 100644
--- a/core/src/test/java/org/apache/struts2/dispatcher/HttpHeaderResultTest.java
+++ b/core/src/test/java/org/apache/struts2/dispatcher/HttpHeaderResultTest.java
@@ -17,19 +17,20 @@
*/
package org.apache.struts2.dispatcher;
-import com.mockobjects.dynamic.C;
-import com.mockobjects.dynamic.Mock;
-import org.apache.struts2.ServletActionContext;
-import org.apache.struts2.StrutsTestCase;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.ActionInvocation;
-import com.opensymphony.xwork2.XWorkTestCase;
-import com.opensymphony.xwork2.util.OgnlUtil;
-
-import javax.servlet.http.HttpServletResponse;
import java.util.HashMap;
import java.util.Map;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.struts2.ServletActionContext;
+import org.apache.struts2.StrutsTestCase;
+
+import com.mockobjects.dynamic.C;
+import com.mockobjects.dynamic.Mock;
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.util.OgnlUtil;
+
/**
* HttpHeaderResultTest
diff --git a/core/src/test/java/org/apache/struts2/dispatcher/PlainTextResultTest.java b/core/src/test/java/org/apache/struts2/dispatcher/PlainTextResultTest.java
index 5ce103c65..1c932c6fd 100644
--- a/core/src/test/java/org/apache/struts2/dispatcher/PlainTextResultTest.java
+++ b/core/src/test/java/org/apache/struts2/dispatcher/PlainTextResultTest.java
@@ -21,17 +21,18 @@ import java.io.InputStream;
import java.io.PrintWriter;
import java.io.StringWriter;
-import com.opensymphony.util.ClassLoaderUtil;
+import junit.framework.TestCase;
+
import org.apache.struts2.StrutsStatics;
import org.apache.struts2.views.jsp.AbstractUITagTest;
import org.apache.struts2.views.jsp.StrutsMockHttpServletResponse;
import org.apache.struts2.views.jsp.StrutsMockServletContext;
+
+import com.opensymphony.util.ClassLoaderUtil;
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.mock.MockActionInvocation;
import com.opensymphony.xwork2.util.OgnlValueStack;
-import junit.framework.TestCase;
-
/**
* Test case for PlainTextResult.
*
diff --git a/core/src/test/java/org/apache/struts2/dispatcher/ServletDispatchedTestAssertInterceptor.java b/core/src/test/java/org/apache/struts2/dispatcher/ServletDispatchedTestAssertInterceptor.java
index 35882b9a0..e5aa35171 100644
--- a/core/src/test/java/org/apache/struts2/dispatcher/ServletDispatchedTestAssertInterceptor.java
+++ b/core/src/test/java/org/apache/struts2/dispatcher/ServletDispatchedTestAssertInterceptor.java
@@ -17,10 +17,12 @@
*/
package org.apache.struts2.dispatcher;
+import junit.framework.Assert;
+
import org.apache.struts2.TestAction;
+
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.interceptor.Interceptor;
-import junit.framework.Assert;
/**
diff --git a/core/src/test/java/org/apache/struts2/dispatcher/ServletDispatcherResultTest.java b/core/src/test/java/org/apache/struts2/dispatcher/ServletDispatcherResultTest.java
index 2ae132213..8e4f59bae 100644
--- a/core/src/test/java/org/apache/struts2/dispatcher/ServletDispatcherResultTest.java
+++ b/core/src/test/java/org/apache/struts2/dispatcher/ServletDispatcherResultTest.java
@@ -17,18 +17,20 @@
*/
package org.apache.struts2.dispatcher;
-import com.mockobjects.dynamic.C;
-import com.mockobjects.dynamic.Mock;
-import org.apache.struts2.ServletActionContext;
-import org.apache.struts2.StrutsStatics;
-import org.apache.struts2.StrutsTestCase;
-import com.opensymphony.xwork2.ActionContext;
-import ognl.Ognl;
-
import javax.servlet.RequestDispatcher;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import ognl.Ognl;
+
+import org.apache.struts2.ServletActionContext;
+import org.apache.struts2.StrutsStatics;
+import org.apache.struts2.StrutsTestCase;
+
+import com.mockobjects.dynamic.C;
+import com.mockobjects.dynamic.Mock;
+import com.opensymphony.xwork2.ActionContext;
+
/**
*
diff --git a/core/src/test/java/org/apache/struts2/dispatcher/ServletRedirectResultTest.java b/core/src/test/java/org/apache/struts2/dispatcher/ServletRedirectResultTest.java
index 58a991b38..5c0376f9a 100644
--- a/core/src/test/java/org/apache/struts2/dispatcher/ServletRedirectResultTest.java
+++ b/core/src/test/java/org/apache/struts2/dispatcher/ServletRedirectResultTest.java
@@ -17,8 +17,12 @@
*/
package org.apache.struts2.dispatcher;
-import com.mockobjects.dynamic.C;
-import com.mockobjects.dynamic.Mock;
+import java.util.HashMap;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import ognl.Ognl;
import org.apache.struts2.ServletActionContext;
import org.apache.struts2.StrutsStatics;
@@ -26,17 +30,14 @@ import org.apache.struts2.StrutsTestCase;
import org.apache.struts2.config.StrutsXMLConfigurationProvider;
import org.springframework.mock.web.MockServletContext;
+import com.mockobjects.dynamic.C;
+import com.mockobjects.dynamic.Mock;
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.config.ConfigurationManager;
import com.opensymphony.xwork2.config.entities.PackageConfig;
import com.opensymphony.xwork2.mock.MockActionInvocation;
import com.opensymphony.xwork2.util.OgnlValueStack;
-import ognl.Ognl;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.HashMap;
/**
diff --git a/core/src/test/java/org/apache/struts2/dispatcher/SessionMapTest.java b/core/src/test/java/org/apache/struts2/dispatcher/SessionMapTest.java
index a8ce8fc26..d8bc04376 100644
--- a/core/src/test/java/org/apache/struts2/dispatcher/SessionMapTest.java
+++ b/core/src/test/java/org/apache/struts2/dispatcher/SessionMapTest.java
@@ -17,16 +17,18 @@
*/
package org.apache.struts2.dispatcher;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+
+import junit.framework.TestCase;
+
import com.mockobjects.constraint.Constraint;
import com.mockobjects.constraint.IsAnything;
import com.mockobjects.constraint.IsEqual;
import com.mockobjects.dynamic.Mock;
-import junit.framework.TestCase;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-import java.util.HashMap;
-import java.util.Map;
/**
diff --git a/core/src/test/java/org/apache/struts2/dispatcher/StreamResultTest.java b/core/src/test/java/org/apache/struts2/dispatcher/StreamResultTest.java
index b71049440..2a8a0d08c 100644
--- a/core/src/test/java/org/apache/struts2/dispatcher/StreamResultTest.java
+++ b/core/src/test/java/org/apache/struts2/dispatcher/StreamResultTest.java
@@ -17,21 +17,23 @@
*/
package org.apache.struts2.dispatcher;
-import com.opensymphony.util.ClassLoaderUtil;
-import org.apache.struts2.ServletActionContext;
-import com.opensymphony.xwork2.Action;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.mock.MockActionInvocation;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-import junit.framework.TestCase;
-import org.springframework.mock.web.MockHttpServletResponse;
-
import java.io.File;
import java.io.FileInputStream;
import java.io.InputStream;
import java.net.URI;
import java.net.URL;
+import junit.framework.TestCase;
+
+import org.apache.struts2.ServletActionContext;
+import org.springframework.mock.web.MockHttpServletResponse;
+
+import com.opensymphony.util.ClassLoaderUtil;
+import com.opensymphony.xwork2.Action;
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.mock.MockActionInvocation;
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* Unit test for {@link StreamResult}.
*
diff --git a/core/src/test/java/org/apache/struts2/dispatcher/StrutsResultSupportTest.java b/core/src/test/java/org/apache/struts2/dispatcher/StrutsResultSupportTest.java
index 45f833e4f..e3fc3a16b 100644
--- a/core/src/test/java/org/apache/struts2/dispatcher/StrutsResultSupportTest.java
+++ b/core/src/test/java/org/apache/struts2/dispatcher/StrutsResultSupportTest.java
@@ -18,23 +18,6 @@
package org.apache.struts2.dispatcher;
import org.apache.struts2.StrutsTestCase;
-/*
- * $Id: StrutsResultSupport.java 394468 2006-04-16 12:16:03Z tmjee $
- *
- * Copyright 2006 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
import org.easymock.EasyMock;
import com.opensymphony.xwork2.ActionInvocation;
diff --git a/core/src/test/java/org/apache/struts2/dispatcher/VelocityResultTest.java b/core/src/test/java/org/apache/struts2/dispatcher/VelocityResultTest.java
index 9b5a5399f..2266fe8dc 100644
--- a/core/src/test/java/org/apache/struts2/dispatcher/VelocityResultTest.java
+++ b/core/src/test/java/org/apache/struts2/dispatcher/VelocityResultTest.java
@@ -17,16 +17,18 @@
*/
package org.apache.struts2.dispatcher;
+import junit.framework.TestCase;
+
+import org.apache.velocity.Template;
+import org.apache.velocity.app.VelocityEngine;
+import org.apache.velocity.exception.ParseErrorException;
+import org.apache.velocity.exception.ResourceNotFoundException;
+
import com.mockobjects.dynamic.Mock;
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.ActionProxy;
import com.opensymphony.xwork2.util.OgnlValueStack;
-import junit.framework.TestCase;
-import org.apache.velocity.Template;
-import org.apache.velocity.app.VelocityEngine;
-import org.apache.velocity.exception.ParseErrorException;
-import org.apache.velocity.exception.ResourceNotFoundException;
/**
diff --git a/core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java b/core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java
index 306c81ad9..3b082dbb0 100644
--- a/core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java
+++ b/core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java
@@ -17,19 +17,19 @@
*/
package org.apache.struts2.dispatcher.mapper;
-import com.mockobjects.servlet.MockHttpServletRequest;
-import com.opensymphony.xwork2.Result;
-import com.opensymphony.xwork2.config.Configuration;
-import com.opensymphony.xwork2.config.entities.PackageConfig;
-import com.opensymphony.xwork2.config.impl.DefaultConfiguration;
+import java.util.HashMap;
+import java.util.Map;
import org.apache.struts2.StrutsConstants;
import org.apache.struts2.StrutsTestCase;
import org.apache.struts2.dispatcher.ServletRedirectResult;
import org.apache.struts2.views.jsp.StrutsMockHttpServletRequest;
-import java.util.HashMap;
-import java.util.Map;
+import com.mockobjects.servlet.MockHttpServletRequest;
+import com.opensymphony.xwork2.Result;
+import com.opensymphony.xwork2.config.Configuration;
+import com.opensymphony.xwork2.config.entities.PackageConfig;
+import com.opensymphony.xwork2.config.impl.DefaultConfiguration;
/**
* DefaultActionMapper test case.
diff --git a/core/src/test/java/org/apache/struts2/dispatcher/mapper/RestfulActionMapperTest.java b/core/src/test/java/org/apache/struts2/dispatcher/mapper/RestfulActionMapperTest.java
index 9e385a02e..6e95c2d82 100644
--- a/core/src/test/java/org/apache/struts2/dispatcher/mapper/RestfulActionMapperTest.java
+++ b/core/src/test/java/org/apache/struts2/dispatcher/mapper/RestfulActionMapperTest.java
@@ -17,11 +17,11 @@
*/
package org.apache.struts2.dispatcher.mapper;
-import junit.framework.TestCase;
-
-import java.util.Map;
import java.util.Collections;
import java.util.HashMap;
+import java.util.Map;
+
+import junit.framework.TestCase;
import org.apache.struts2.views.jsp.StrutsMockHttpServletRequest;
diff --git a/core/src/test/java/org/apache/struts2/impl/MessagesTest.java b/core/src/test/java/org/apache/struts2/impl/MessagesTest.java
index 5d9439f45..d92b5dd74 100644
--- a/core/src/test/java/org/apache/struts2/impl/MessagesTest.java
+++ b/core/src/test/java/org/apache/struts2/impl/MessagesTest.java
@@ -3,6 +3,7 @@
package org.apache.struts2.impl;
import junit.framework.TestCase;
+
import org.apache.struts2.Messages;
public class MessagesTest extends TestCase {
diff --git a/core/src/test/java/org/apache/struts2/impl/RequestContextTest.java b/core/src/test/java/org/apache/struts2/impl/RequestContextTest.java
index 9351255e5..ec8cc9a0e 100644
--- a/core/src/test/java/org/apache/struts2/impl/RequestContextTest.java
+++ b/core/src/test/java/org/apache/struts2/impl/RequestContextTest.java
@@ -2,17 +2,22 @@
package org.apache.struts2.impl;
-import com.opensymphony.xwork2.ActionInvocation;
-import com.opensymphony.xwork2.ActionContext;
-import junit.framework.TestCase;
-import static org.easymock.EasyMock.*;
+import static org.easymock.EasyMock.createMock;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.replay;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.concurrent.Callable;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
-import java.util.Arrays;
-import java.util.List;
-import java.util.HashMap;
-import java.util.concurrent.Callable;
+
+import junit.framework.TestCase;
+
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.ActionInvocation;
public class RequestContextTest extends TestCase {
diff --git a/core/src/test/java/org/apache/struts2/interceptor/CreateSessionInterceptorTest.java b/core/src/test/java/org/apache/struts2/interceptor/CreateSessionInterceptorTest.java
index 1fc59b41b..d8602d538 100644
--- a/core/src/test/java/org/apache/struts2/interceptor/CreateSessionInterceptorTest.java
+++ b/core/src/test/java/org/apache/struts2/interceptor/CreateSessionInterceptorTest.java
@@ -19,12 +19,12 @@ package org.apache.struts2.interceptor;
import javax.servlet.http.HttpServletRequest;
+import org.apache.struts2.ServletActionContext;
+import org.apache.struts2.StrutsTestCase;
import org.jmock.Mock;
import org.jmock.core.constraint.IsEqual;
import org.jmock.core.matcher.InvokeOnceMatcher;
-import org.apache.struts2.ServletActionContext;
-import org.apache.struts2.StrutsTestCase;
import com.opensymphony.xwork2.mock.MockActionInvocation;
/**
diff --git a/core/src/test/java/org/apache/struts2/interceptor/ExecuteAndWaitInterceptorTest.java b/core/src/test/java/org/apache/struts2/interceptor/ExecuteAndWaitInterceptorTest.java
index 8ad448536..19d71de77 100644
--- a/core/src/test/java/org/apache/struts2/interceptor/ExecuteAndWaitInterceptorTest.java
+++ b/core/src/test/java/org/apache/struts2/interceptor/ExecuteAndWaitInterceptorTest.java
@@ -17,7 +17,22 @@
*/
package org.apache.struts2.interceptor;
-import com.opensymphony.xwork2.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpSession;
+
+import org.apache.struts2.ServletActionContext;
+import org.apache.struts2.StrutsTestCase;
+import org.apache.struts2.views.jsp.StrutsMockHttpServletRequest;
+import org.apache.struts2.views.jsp.StrutsMockHttpSession;
+
+import com.opensymphony.xwork2.Action;
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.ActionProxy;
+import com.opensymphony.xwork2.ActionProxyFactory;
import com.opensymphony.xwork2.config.Configuration;
import com.opensymphony.xwork2.config.ConfigurationException;
import com.opensymphony.xwork2.config.ConfigurationProvider;
@@ -27,16 +42,6 @@ import com.opensymphony.xwork2.config.entities.PackageConfig;
import com.opensymphony.xwork2.config.entities.ResultConfig;
import com.opensymphony.xwork2.interceptor.ParametersInterceptor;
import com.opensymphony.xwork2.mock.MockResult;
-import org.apache.struts2.ServletActionContext;
-import org.apache.struts2.StrutsTestCase;
-import org.apache.struts2.views.jsp.StrutsMockHttpServletRequest;
-import org.apache.struts2.views.jsp.StrutsMockHttpSession;
-
-import javax.servlet.http.HttpSession;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
/**
* Test case for ExecuteAndWaitInterceptor.
diff --git a/core/src/test/java/org/apache/struts2/interceptor/FileUploadInterceptorTest.java b/core/src/test/java/org/apache/struts2/interceptor/FileUploadInterceptorTest.java
index 8290a3cd7..afc945a15 100644
--- a/core/src/test/java/org/apache/struts2/interceptor/FileUploadInterceptorTest.java
+++ b/core/src/test/java/org/apache/struts2/interceptor/FileUploadInterceptorTest.java
@@ -17,15 +17,6 @@
*/
package org.apache.struts2.interceptor;
-import com.opensymphony.util.ClassLoaderUtil;
-import org.apache.struts2.ServletActionContext;
-import org.apache.struts2.StrutsTestCase;
-import org.apache.struts2.dispatcher.multipart.MultiPartRequestWrapper;
-import com.opensymphony.xwork2.*;
-import com.opensymphony.xwork2.mock.MockActionInvocation;
-import org.springframework.mock.web.MockHttpServletRequest;
-
-import javax.servlet.http.HttpServletRequest;
import java.io.File;
import java.io.IOException;
import java.net.URI;
@@ -35,6 +26,19 @@ import java.util.List;
import java.util.Locale;
import java.util.Map;
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.struts2.ServletActionContext;
+import org.apache.struts2.StrutsTestCase;
+import org.apache.struts2.dispatcher.multipart.MultiPartRequestWrapper;
+import org.springframework.mock.web.MockHttpServletRequest;
+
+import com.opensymphony.util.ClassLoaderUtil;
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.ActionSupport;
+import com.opensymphony.xwork2.ValidationAwareSupport;
+import com.opensymphony.xwork2.mock.MockActionInvocation;
+
/**
* Test case for FileUploadInterceptor.
diff --git a/core/src/test/java/org/apache/struts2/interceptor/ServletConfigInterceptorTest.java b/core/src/test/java/org/apache/struts2/interceptor/ServletConfigInterceptorTest.java
index 0a294cb56..2127aaad6 100644
--- a/core/src/test/java/org/apache/struts2/interceptor/ServletConfigInterceptorTest.java
+++ b/core/src/test/java/org/apache/struts2/interceptor/ServletConfigInterceptorTest.java
@@ -17,22 +17,24 @@
*/
package org.apache.struts2.interceptor;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
import org.apache.struts2.StrutsStatics;
import org.apache.struts2.StrutsTestCase;
import org.apache.struts2.util.ServletContextAware;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.Action;
-import com.opensymphony.xwork2.mock.MockActionInvocation;
import org.easymock.MockControl;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
import org.springframework.mock.web.MockServletContext;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.HashMap;
-import java.util.Map;
+import com.opensymphony.xwork2.Action;
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.mock.MockActionInvocation;
/**
* Unit test for {@link ServletConfigInterceptor}.
diff --git a/core/src/test/java/org/apache/struts2/interceptor/StrutsConversionErrorInterceptorTest.java b/core/src/test/java/org/apache/struts2/interceptor/StrutsConversionErrorInterceptorTest.java
index 2ce91dea8..41036e1f9 100644
--- a/core/src/test/java/org/apache/struts2/interceptor/StrutsConversionErrorInterceptorTest.java
+++ b/core/src/test/java/org/apache/struts2/interceptor/StrutsConversionErrorInterceptorTest.java
@@ -17,6 +17,11 @@
*/
package org.apache.struts2.interceptor;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.struts2.StrutsTestCase;
+
import com.mockobjects.dynamic.C;
import com.mockobjects.dynamic.Mock;
import com.opensymphony.xwork2.Action;
@@ -24,10 +29,6 @@ import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.ActionSupport;
import com.opensymphony.xwork2.util.OgnlValueStack;
-import org.apache.struts2.StrutsTestCase;
-
-import java.util.HashMap;
-import java.util.Map;
/**
diff --git a/core/src/test/java/org/apache/struts2/interceptor/TokenInterceptorTest.java b/core/src/test/java/org/apache/struts2/interceptor/TokenInterceptorTest.java
index 665a72382..7d28b4a9c 100644
--- a/core/src/test/java/org/apache/struts2/interceptor/TokenInterceptorTest.java
+++ b/core/src/test/java/org/apache/struts2/interceptor/TokenInterceptorTest.java
@@ -17,8 +17,12 @@
*/
package org.apache.struts2.interceptor;
-import com.opensymphony.xwork2.*;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+
import org.apache.struts2.ServletActionContext;
import org.apache.struts2.StrutsTestCase;
import org.apache.struts2.TestConfigurationProvider;
@@ -26,10 +30,11 @@ import org.apache.struts2.util.TokenHelper;
import org.apache.struts2.views.jsp.StrutsMockHttpServletRequest;
import org.apache.struts2.views.jsp.StrutsMockHttpSession;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-import java.util.HashMap;
-import java.util.Map;
+import com.opensymphony.xwork2.Action;
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.ActionProxy;
+import com.opensymphony.xwork2.ActionProxyFactory;
+import com.opensymphony.xwork2.util.OgnlValueStack;
/**
diff --git a/core/src/test/java/org/apache/struts2/interceptor/TokenSessionStoreInterceptorTest.java b/core/src/test/java/org/apache/struts2/interceptor/TokenSessionStoreInterceptorTest.java
index d3c1ff493..b4e3fa83b 100644
--- a/core/src/test/java/org/apache/struts2/interceptor/TokenSessionStoreInterceptorTest.java
+++ b/core/src/test/java/org/apache/struts2/interceptor/TokenSessionStoreInterceptorTest.java
@@ -17,10 +17,11 @@
*/
package org.apache.struts2.interceptor;
-import com.opensymphony.xwork2.ActionProxy;
-import com.opensymphony.xwork2.Action;
import org.apache.struts2.TestConfigurationProvider;
+import com.opensymphony.xwork2.Action;
+import com.opensymphony.xwork2.ActionProxy;
+
/**
* Unit test for {@link TokenSessionStoreInterceptor}.
*
diff --git a/core/src/test/java/org/apache/struts2/portlet/context/PortletActionContextTest.java b/core/src/test/java/org/apache/struts2/portlet/context/PortletActionContextTest.java
index 02f2cbf72..bb15f6849 100644
--- a/core/src/test/java/org/apache/struts2/portlet/context/PortletActionContextTest.java
+++ b/core/src/test/java/org/apache/struts2/portlet/context/PortletActionContextTest.java
@@ -28,10 +28,10 @@ import javax.portlet.RenderResponse;
import junit.textui.TestRunner;
+import org.apache.struts2.portlet.PortletActionConstants;
import org.jmock.Mock;
import org.jmock.MockObjectTestCase;
-import org.apache.struts2.portlet.PortletActionConstants;
import com.opensymphony.xwork2.ActionContext;
/**
diff --git a/core/src/test/java/org/apache/struts2/portlet/context/PreparatorServletTest.java b/core/src/test/java/org/apache/struts2/portlet/context/PreparatorServletTest.java
index bbfa3e44a..eb2af32d9 100644
--- a/core/src/test/java/org/apache/struts2/portlet/context/PreparatorServletTest.java
+++ b/core/src/test/java/org/apache/struts2/portlet/context/PreparatorServletTest.java
@@ -22,12 +22,9 @@ import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.easymock.MockControl;
-
import org.apache.struts2.ServletActionContext;
import org.apache.struts2.StrutsTestCase;
-
-import junit.framework.TestCase;
+import org.easymock.MockControl;
/**
*
diff --git a/core/src/test/java/org/apache/struts2/portlet/context/ServletContextHolderListenerTest.java b/core/src/test/java/org/apache/struts2/portlet/context/ServletContextHolderListenerTest.java
index e0be1903c..2a86fdc01 100644
--- a/core/src/test/java/org/apache/struts2/portlet/context/ServletContextHolderListenerTest.java
+++ b/core/src/test/java/org/apache/struts2/portlet/context/ServletContextHolderListenerTest.java
@@ -20,10 +20,10 @@ package org.apache.struts2.portlet.context;
import javax.servlet.ServletContext;
import javax.servlet.ServletContextEvent;
-import org.easymock.MockControl;
-
import junit.framework.TestCase;
+import org.easymock.MockControl;
+
/**
*/
public class ServletContextHolderListenerTest extends TestCase {
diff --git a/core/src/test/java/org/apache/struts2/portlet/dispatcher/Jsr168DispatcherTest.java b/core/src/test/java/org/apache/struts2/portlet/dispatcher/Jsr168DispatcherTest.java
index 003f70e47..1799551b3 100644
--- a/core/src/test/java/org/apache/struts2/portlet/dispatcher/Jsr168DispatcherTest.java
+++ b/core/src/test/java/org/apache/struts2/portlet/dispatcher/Jsr168DispatcherTest.java
@@ -38,19 +38,17 @@ import javax.servlet.ServletContextEvent;
import junit.textui.TestRunner;
+import org.apache.struts2.portlet.PortletActionConstants;
+import org.apache.struts2.portlet.context.ServletContextHolderListener;
import org.jmock.Mock;
import org.jmock.cglib.MockObjectTestCase;
import org.jmock.core.Constraint;
-import org.apache.struts2.dispatcher.Dispatcher;
-import org.apache.struts2.portlet.PortletActionConstants;
-import org.apache.struts2.portlet.context.ServletContextHolderListener;
import com.opensymphony.xwork2.Action;
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.ActionProxy;
import com.opensymphony.xwork2.ActionProxyFactory;
import com.opensymphony.xwork2.config.Configuration;
-import com.opensymphony.xwork2.config.ConfigurationManager;
import com.opensymphony.xwork2.util.OgnlValueStack;
/**
@@ -114,7 +112,6 @@ public class Jsr168DispatcherTest extends MockObjectTestCase implements PortletA
servletContext.stubs().method(ANYTHING);
ServletContextEvent event = new ServletContextEvent((ServletContext)servletContext.proxy());
new ServletContextHolderListener().contextInitialized(event);
- String actionName = "testAction";
PortletMode mode = PortletMode.VIEW;
Map requestParams = new HashMap();
@@ -152,7 +149,6 @@ public class Jsr168DispatcherTest extends MockObjectTestCase implements PortletA
public void testProcessAction_ok() {
final Mock mockResponse = mock(ActionResponse.class);
- String actionName = "testAction";
PortletMode mode = PortletMode.VIEW;
Map initParams = new HashMap();
initParams.put("viewNamespace", "/view");
@@ -259,7 +255,6 @@ public class Jsr168DispatcherTest extends MockObjectTestCase implements PortletA
public void testModeChangeUsingPortletWidgets() {
final Mock mockResponse = mock(RenderResponse.class);
mockResponse.stubs().method(ANYTHING);
- String actionName = "testAction";
PortletMode mode = PortletMode.EDIT;
Map requestParams = new HashMap();
diff --git a/core/src/test/java/org/apache/struts2/portlet/result/PortletResultTest.java b/core/src/test/java/org/apache/struts2/portlet/result/PortletResultTest.java
index 495e7e351..fb6ca2e96 100644
--- a/core/src/test/java/org/apache/struts2/portlet/result/PortletResultTest.java
+++ b/core/src/test/java/org/apache/struts2/portlet/result/PortletResultTest.java
@@ -31,11 +31,11 @@ import javax.portlet.RenderResponse;
import junit.textui.TestRunner;
+import org.apache.struts2.portlet.PortletActionConstants;
import org.jmock.Mock;
import org.jmock.cglib.MockObjectTestCase;
import org.jmock.core.Constraint;
-import org.apache.struts2.portlet.PortletActionConstants;
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionInvocation;
@@ -208,7 +208,6 @@ public class PortletResultTest extends MockObjectTestCase {
PortletRequestDispatcher rd = (PortletRequestDispatcher)mockRd.proxy();
PortletConfig cfg = (PortletConfig)mockConfig.proxy();
PortletContext ctx = (PortletContext)mockCtx.proxy();
- ActionInvocation inv = (ActionInvocation)mockInvocation.proxy();
Constraint[] params = new Constraint[]{same(req), same(res)};
mockRd.expects(once()).method("include").with(params);
diff --git a/core/src/test/java/org/apache/struts2/portlet/util/PortletUrlHelperTest.java b/core/src/test/java/org/apache/struts2/portlet/util/PortletUrlHelperTest.java
index 53403f84f..00f6701ca 100644
--- a/core/src/test/java/org/apache/struts2/portlet/util/PortletUrlHelperTest.java
+++ b/core/src/test/java/org/apache/struts2/portlet/util/PortletUrlHelperTest.java
@@ -28,9 +28,9 @@ import javax.portlet.WindowState;
import junit.framework.TestCase;
+import org.apache.struts2.portlet.context.PortletActionContext;
import org.easymock.MockControl;
-import org.apache.struts2.portlet.context.PortletActionContext;
import com.opensymphony.xwork2.ActionContext;
/**
diff --git a/core/src/test/java/org/apache/struts2/portlet/util/StrutsUtilTest.java b/core/src/test/java/org/apache/struts2/portlet/util/StrutsUtilTest.java
index 693bd488b..654ae2e83 100644
--- a/core/src/test/java/org/apache/struts2/portlet/util/StrutsUtilTest.java
+++ b/core/src/test/java/org/apache/struts2/portlet/util/StrutsUtilTest.java
@@ -24,18 +24,16 @@ import javax.servlet.RequestDispatcher;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
+import org.apache.struts2.StrutsTestCase;
+import org.apache.struts2.TestAction;
+import org.apache.struts2.util.ListEntry;
+import org.apache.struts2.util.StrutsUtil;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
import org.springframework.mock.web.MockRequestDispatcher;
-import org.apache.struts2.TestAction;
-import org.apache.struts2.StrutsTestCase;
-import org.apache.struts2.util.ListEntry;
-import org.apache.struts2.util.StrutsUtil;
import com.opensymphony.xwork2.util.OgnlValueStack;
-import junit.framework.TestCase;
-
/**
* Test case for StrutsUtil.
*
diff --git a/core/src/test/java/org/apache/struts2/sitegraph/SiteGraphTest.java b/core/src/test/java/org/apache/struts2/sitegraph/SiteGraphTest.java
index b7097a3f3..219fa9c4b 100644
--- a/core/src/test/java/org/apache/struts2/sitegraph/SiteGraphTest.java
+++ b/core/src/test/java/org/apache/struts2/sitegraph/SiteGraphTest.java
@@ -17,17 +17,16 @@
*/
package org.apache.struts2.sitegraph;
-import com.opensymphony.util.ClassLoaderUtil;
-import com.opensymphony.xwork2.config.ConfigurationManager;
-
-import org.apache.struts2.StrutsTestCase;
-import org.apache.struts2.dispatcher.Dispatcher;
-
import java.io.File;
import java.io.InputStream;
import java.io.StringWriter;
import java.net.URL;
+import org.apache.struts2.StrutsTestCase;
+import org.apache.struts2.dispatcher.Dispatcher;
+
+import com.opensymphony.util.ClassLoaderUtil;
+
/**
*/
public class SiteGraphTest extends StrutsTestCase {
diff --git a/core/src/test/java/org/apache/struts2/spring/StrutsSpringObjectFactoryTest.java b/core/src/test/java/org/apache/struts2/spring/StrutsSpringObjectFactoryTest.java
index 1e0c1ac7e..63d1c5c39 100644
--- a/core/src/test/java/org/apache/struts2/spring/StrutsSpringObjectFactoryTest.java
+++ b/core/src/test/java/org/apache/struts2/spring/StrutsSpringObjectFactoryTest.java
@@ -17,18 +17,17 @@
*/
package org.apache.struts2.spring;
+import javax.servlet.ServletContext;
+
import org.apache.struts2.StrutsConstants;
import org.apache.struts2.StrutsTestCase;
import org.apache.struts2.config.Settings;
-import junit.framework.TestCase;
import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
import org.springframework.mock.web.MockServletContext;
import org.springframework.web.context.ConfigurableWebApplicationContext;
import org.springframework.web.context.WebApplicationContext;
import org.springframework.web.context.support.XmlWebApplicationContext;
-import javax.servlet.ServletContext;
-
/**
* Unit test for {@link StrutsSpringObjectFactory}.
*
diff --git a/core/src/test/java/org/apache/struts2/util/InvocationSessionStoreTest.java b/core/src/test/java/org/apache/struts2/util/InvocationSessionStoreTest.java
index 313c58c1c..c5b3a87b0 100644
--- a/core/src/test/java/org/apache/struts2/util/InvocationSessionStoreTest.java
+++ b/core/src/test/java/org/apache/struts2/util/InvocationSessionStoreTest.java
@@ -17,16 +17,17 @@
*/
package org.apache.struts2.util;
-import com.mockobjects.dynamic.Mock;
+import java.util.HashMap;
+import java.util.Map;
+
import org.apache.struts2.StrutsTestCase;
+
+import com.mockobjects.dynamic.Mock;
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.ActionProxy;
import com.opensymphony.xwork2.util.OgnlValueStack;
-import java.util.HashMap;
-import java.util.Map;
-
/**
* InvocationSessionStoreTest
diff --git a/core/src/test/java/org/apache/struts2/util/TokenHelperTest.java b/core/src/test/java/org/apache/struts2/util/TokenHelperTest.java
index 5eb5ee3f6..c9f0d815d 100644
--- a/core/src/test/java/org/apache/struts2/util/TokenHelperTest.java
+++ b/core/src/test/java/org/apache/struts2/util/TokenHelperTest.java
@@ -47,8 +47,6 @@ public class TokenHelperTest extends TestCase {
public void testValidToken() {
String tokenName = "validTokenTest";
- Map params = new HashMap();
-
String token = TokenHelper.setToken(tokenName);
assertEquals(token, session.get(tokenName));
ActionContext.getContext().getParameters().put(TokenHelper.TOKEN_NAME_FIELD, new String[]{tokenName});
diff --git a/core/src/test/java/org/apache/struts2/views/TemplateEngineManagerTest.java b/core/src/test/java/org/apache/struts2/views/TemplateEngineManagerTest.java
index 4fa406e0c..6c87ea20b 100644
--- a/core/src/test/java/org/apache/struts2/views/TemplateEngineManagerTest.java
+++ b/core/src/test/java/org/apache/struts2/views/TemplateEngineManagerTest.java
@@ -17,10 +17,16 @@
*/
package org.apache.struts2.views;
-import org.apache.struts2.components.template.*;
-import org.apache.struts2.config.Settings;
import junit.framework.TestCase;
+import org.apache.struts2.components.template.FreemarkerTemplateEngine;
+import org.apache.struts2.components.template.JspTemplateEngine;
+import org.apache.struts2.components.template.Template;
+import org.apache.struts2.components.template.TemplateEngine;
+import org.apache.struts2.components.template.TemplateEngineManager;
+import org.apache.struts2.components.template.VelocityTemplateEngine;
+import org.apache.struts2.config.Settings;
+
/**
* TemplateEngineManagerTest
*
diff --git a/core/src/test/java/org/apache/struts2/views/freemarker/FreemarkerTest.java b/core/src/test/java/org/apache/struts2/views/freemarker/FreemarkerTest.java
index 2fe9b85c2..db1d39e22 100644
--- a/core/src/test/java/org/apache/struts2/views/freemarker/FreemarkerTest.java
+++ b/core/src/test/java/org/apache/struts2/views/freemarker/FreemarkerTest.java
@@ -17,15 +17,18 @@
*/
package org.apache.struts2.views.freemarker;
-import org.apache.struts2.util.ListEntry;
-import org.apache.struts2.util.StrutsUtil;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-import freemarker.ext.beans.CollectionModel;
-import freemarker.template.ObjectWrapper;
+import java.util.List;
+
import junit.framework.TestCase;
-import java.util.List;
+import org.apache.struts2.util.ListEntry;
+import org.apache.struts2.util.StrutsUtil;
+
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
+import freemarker.ext.beans.CollectionModel;
+import freemarker.template.ObjectWrapper;
/**
diff --git a/core/src/test/java/org/apache/struts2/views/freemarker/TestAction.java b/core/src/test/java/org/apache/struts2/views/freemarker/TestAction.java
index 9ff1e0f13..e3ee49333 100644
--- a/core/src/test/java/org/apache/struts2/views/freemarker/TestAction.java
+++ b/core/src/test/java/org/apache/struts2/views/freemarker/TestAction.java
@@ -17,11 +17,11 @@
*/
package org.apache.struts2.views.freemarker;
-import com.opensymphony.xwork2.ActionSupport;
-
import java.util.ArrayList;
import java.util.List;
+import com.opensymphony.xwork2.ActionSupport;
+
/**
*/
diff --git a/core/src/test/java/org/apache/struts2/views/jsp/AbstractTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/AbstractTagTest.java
index e9d9dd568..fa50283ec 100644
--- a/core/src/test/java/org/apache/struts2/views/jsp/AbstractTagTest.java
+++ b/core/src/test/java/org/apache/struts2/views/jsp/AbstractTagTest.java
@@ -17,24 +17,26 @@
*/
package org.apache.struts2.views.jsp;
+import java.io.File;
+import java.io.StringWriter;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.jsp.JspWriter;
+
import org.apache.struts2.ServletActionContext;
-import org.apache.struts2.TestAction;
import org.apache.struts2.StrutsTestCase;
+import org.apache.struts2.TestAction;
import org.apache.struts2.config.Settings;
import org.apache.struts2.dispatcher.ApplicationMap;
import org.apache.struts2.dispatcher.Dispatcher;
import org.apache.struts2.dispatcher.RequestMap;
import org.apache.struts2.dispatcher.SessionMap;
+
import com.opensymphony.xwork2.Action;
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.util.OgnlValueStack;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.jsp.JspWriter;
-import java.io.File;
-import java.io.StringWriter;
-import java.util.Map;
-
/**
* Base class to extend for unit testing UI Tags.
diff --git a/core/src/test/java/org/apache/struts2/views/jsp/AbstractUITagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/AbstractUITagTest.java
index d8464a6f6..77bda4a5e 100644
--- a/core/src/test/java/org/apache/struts2/views/jsp/AbstractUITagTest.java
+++ b/core/src/test/java/org/apache/struts2/views/jsp/AbstractUITagTest.java
@@ -17,19 +17,26 @@
*/
package org.apache.struts2.views.jsp;
-import org.apache.struts2.ServletActionContext;
-import org.apache.struts2.views.jsp.ui.AbstractUITag;
-import com.opensymphony.xwork2.ActionContext;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
import java.beans.IntrospectionException;
import java.beans.Introspector;
import java.beans.PropertyDescriptor;
import java.io.InputStream;
import java.lang.reflect.InvocationTargetException;
import java.net.URL;
-import java.util.*;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.StringTokenizer;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.struts2.ServletActionContext;
+import org.apache.struts2.views.jsp.ui.AbstractUITag;
+
+import com.opensymphony.xwork2.ActionContext;
/**
diff --git a/core/src/test/java/org/apache/struts2/views/jsp/ActionTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ActionTagTest.java
index 13a3edd3b..d2e1e7190 100644
--- a/core/src/test/java/org/apache/struts2/views/jsp/ActionTagTest.java
+++ b/core/src/test/java/org/apache/struts2/views/jsp/ActionTagTest.java
@@ -17,15 +17,22 @@
*/
package org.apache.struts2.views.jsp;
-import com.opensymphony.xwork2.*;
-import com.opensymphony.xwork2.Action;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-import org.apache.struts2.*;
-import org.apache.struts2.components.ActionComponent;
-
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.PageContext;
+import org.apache.struts2.ServletActionContext;
+import org.apache.struts2.StrutsException;
+import org.apache.struts2.TestAction;
+import org.apache.struts2.TestActionTagResult;
+import org.apache.struts2.TestConfigurationProvider;
+import org.apache.struts2.components.ActionComponent;
+
+import com.opensymphony.xwork2.Action;
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.ActionProxy;
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* Unit test for {@link ActionTag}.
diff --git a/core/src/test/java/org/apache/struts2/views/jsp/AnchorTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/AnchorTagTest.java
index 35a19bf70..d9a5bae00 100644
--- a/core/src/test/java/org/apache/struts2/views/jsp/AnchorTagTest.java
+++ b/core/src/test/java/org/apache/struts2/views/jsp/AnchorTagTest.java
@@ -17,12 +17,13 @@
*/
package org.apache.struts2.views.jsp;
-import org.apache.struts2.views.jsp.ui.AnchorTag;
-import org.apache.struts2.views.jsp.ui.StrutsBodyContent;
+import java.io.StringWriter;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.JspWriter;
-import java.io.StringWriter;
+
+import org.apache.struts2.views.jsp.ui.AnchorTag;
+import org.apache.struts2.views.jsp.ui.StrutsBodyContent;
/**
diff --git a/core/src/test/java/org/apache/struts2/views/jsp/AppendIteratorTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/AppendIteratorTagTest.java
index ef3173eeb..3a25869e5 100644
--- a/core/src/test/java/org/apache/struts2/views/jsp/AppendIteratorTagTest.java
+++ b/core/src/test/java/org/apache/struts2/views/jsp/AppendIteratorTagTest.java
@@ -22,6 +22,7 @@ import java.util.Iterator;
import java.util.List;
import org.apache.struts2.views.jsp.iterator.AppendIteratorTag;
+
import com.opensymphony.xwork2.Action;
import com.opensymphony.xwork2.ActionSupport;
diff --git a/core/src/test/java/org/apache/struts2/views/jsp/ElseIfTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ElseIfTagTest.java
index 196d96de7..fac48c11d 100644
--- a/core/src/test/java/org/apache/struts2/views/jsp/ElseIfTagTest.java
+++ b/core/src/test/java/org/apache/struts2/views/jsp/ElseIfTagTest.java
@@ -19,13 +19,14 @@ package org.apache.struts2.views.jsp;
import javax.servlet.jsp.tagext.TagSupport;
-import com.mockobjects.servlet.MockJspWriter;
-import com.mockobjects.servlet.MockPageContext;
+import junit.framework.TestCase;
+
import org.apache.struts2.ServletActionContext;
import org.apache.struts2.components.If;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-import junit.framework.TestCase;
+import com.mockobjects.servlet.MockJspWriter;
+import com.mockobjects.servlet.MockPageContext;
+import com.opensymphony.xwork2.util.OgnlValueStack;
/**
*
diff --git a/core/src/test/java/org/apache/struts2/views/jsp/ElseTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ElseTagTest.java
index 50f5b2419..fc263c65c 100644
--- a/core/src/test/java/org/apache/struts2/views/jsp/ElseTagTest.java
+++ b/core/src/test/java/org/apache/struts2/views/jsp/ElseTagTest.java
@@ -17,16 +17,16 @@
*/
package org.apache.struts2.views.jsp;
-import com.mockobjects.servlet.MockJspWriter;
-import com.mockobjects.servlet.MockPageContext;
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.tagext.TagSupport;
+
import org.apache.struts2.ServletActionContext;
import org.apache.struts2.StrutsTestCase;
import org.apache.struts2.components.If;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-import junit.framework.TestCase;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.TagSupport;
+import com.mockobjects.servlet.MockJspWriter;
+import com.mockobjects.servlet.MockPageContext;
+import com.opensymphony.xwork2.util.OgnlValueStack;
/**
diff --git a/core/src/test/java/org/apache/struts2/views/jsp/IfTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/IfTagTest.java
index 33fd915de..5cbd225e7 100644
--- a/core/src/test/java/org/apache/struts2/views/jsp/IfTagTest.java
+++ b/core/src/test/java/org/apache/struts2/views/jsp/IfTagTest.java
@@ -17,15 +17,17 @@
*/
package org.apache.struts2.views.jsp;
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.tagext.TagSupport;
+
+import junit.framework.TestCase;
+
+import org.apache.struts2.ServletActionContext;
+
import com.mockobjects.servlet.MockJspWriter;
import com.mockobjects.servlet.MockPageContext;
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.util.OgnlValueStack;
-import org.apache.struts2.ServletActionContext;
-import junit.framework.TestCase;
-
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.TagSupport;
/**
diff --git a/core/src/test/java/org/apache/struts2/views/jsp/IncludeTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/IncludeTagTest.java
index 99f0dada9..17e9a54e5 100644
--- a/core/src/test/java/org/apache/struts2/views/jsp/IncludeTagTest.java
+++ b/core/src/test/java/org/apache/struts2/views/jsp/IncludeTagTest.java
@@ -17,13 +17,13 @@
*/
package org.apache.struts2.views.jsp;
-import com.mockobjects.servlet.MockRequestDispatcher;
+import javax.servlet.RequestDispatcher;
import org.apache.struts2.StrutsException;
import org.apache.struts2.components.Include;
import org.easymock.MockControl;
-import javax.servlet.RequestDispatcher;
+import com.mockobjects.servlet.MockRequestDispatcher;
/**
* Unit test of {@link IncludeTag}.
diff --git a/core/src/test/java/org/apache/struts2/views/jsp/IteratorGeneratorTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/IteratorGeneratorTagTest.java
index c11bac7dd..a61babbaf 100644
--- a/core/src/test/java/org/apache/struts2/views/jsp/IteratorGeneratorTagTest.java
+++ b/core/src/test/java/org/apache/struts2/views/jsp/IteratorGeneratorTagTest.java
@@ -21,6 +21,7 @@ import java.util.Iterator;
import org.apache.struts2.util.IteratorGenerator.Converter;
import org.apache.struts2.views.jsp.iterator.IteratorGeneratorTag;
+
import com.opensymphony.xwork2.Action;
import com.opensymphony.xwork2.ActionSupport;
diff --git a/core/src/test/java/org/apache/struts2/views/jsp/IteratorTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/IteratorTagTest.java
index ae456ff63..cde39494c 100644
--- a/core/src/test/java/org/apache/struts2/views/jsp/IteratorTagTest.java
+++ b/core/src/test/java/org/apache/struts2/views/jsp/IteratorTagTest.java
@@ -17,17 +17,18 @@
*/
package org.apache.struts2.views.jsp;
-import com.mockobjects.servlet.MockBodyContent;
-import com.mockobjects.servlet.MockJspWriter;
-
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.TagSupport;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.tagext.TagSupport;
+
+import com.mockobjects.servlet.MockBodyContent;
+import com.mockobjects.servlet.MockJspWriter;
+
/**
* Test Case for Iterator Tag
diff --git a/core/src/test/java/org/apache/struts2/views/jsp/MergeIteratorTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/MergeIteratorTagTest.java
index 9271a9689..c88bf5d23 100644
--- a/core/src/test/java/org/apache/struts2/views/jsp/MergeIteratorTagTest.java
+++ b/core/src/test/java/org/apache/struts2/views/jsp/MergeIteratorTagTest.java
@@ -22,6 +22,7 @@ import java.util.Iterator;
import java.util.List;
import org.apache.struts2.views.jsp.iterator.MergeIteratorTag;
+
import com.opensymphony.xwork2.Action;
import com.opensymphony.xwork2.ActionSupport;
diff --git a/core/src/test/java/org/apache/struts2/views/jsp/PortletUrlTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/PortletUrlTagTest.java
index 4b21ccf9a..21a82ab7f 100644
--- a/core/src/test/java/org/apache/struts2/views/jsp/PortletUrlTagTest.java
+++ b/core/src/test/java/org/apache/struts2/views/jsp/PortletUrlTagTest.java
@@ -26,7 +26,6 @@ import java.util.Map;
import javax.portlet.PortletMode;
import javax.portlet.PortletRequest;
import javax.portlet.PortletResponse;
-import javax.portlet.PortletSession;
import javax.portlet.PortletURL;
import javax.portlet.RenderRequest;
import javax.portlet.RenderResponse;
@@ -37,19 +36,17 @@ import javax.servlet.jsp.PageContext;
import junit.textui.TestRunner;
-
+import org.apache.struts2.config.Settings;
+import org.apache.struts2.dispatcher.Dispatcher;
+import org.apache.struts2.portlet.PortletActionConstants;
+import org.apache.struts2.portlet.util.PortletUrlHelper;
import org.jmock.Mock;
import org.jmock.cglib.MockObjectTestCase;
import org.jmock.core.Constraint;
import com.mockobjects.servlet.MockJspWriter;
-import org.apache.struts2.portlet.PortletActionConstants;
-import org.apache.struts2.portlet.util.PortletUrlHelper;
-import org.apache.struts2.views.jsp.ParamTag;
-import org.apache.struts2.dispatcher.Dispatcher;
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.util.OgnlValueStack;
-import org.apache.struts2.config.Settings;
/**
*/
@@ -186,9 +183,6 @@ public class PortletUrlTagTest extends MockObjectTestCase {
public void testSetPortletMode() throws Exception {
PortletMode mode = PortletMode.HELP;
- WindowState state = WindowState.NORMAL;
-
- Mock mockSession = mock(PortletSession.class);
mockHttpReq.stubs().method("getQueryString").will(returnValue(""));
diff --git a/core/src/test/java/org/apache/struts2/views/jsp/PropertyTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/PropertyTagTest.java
index b46108ca3..3e03f8ce3 100644
--- a/core/src/test/java/org/apache/struts2/views/jsp/PropertyTagTest.java
+++ b/core/src/test/java/org/apache/struts2/views/jsp/PropertyTagTest.java
@@ -17,17 +17,18 @@
*/
package org.apache.struts2.views.jsp;
+import javax.servlet.jsp.JspException;
+
+import org.apache.struts2.ServletActionContext;
+import org.apache.struts2.StrutsConstants;
+import org.apache.struts2.StrutsTestCase;
+import org.apache.struts2.config.Settings;
+
import com.mockobjects.servlet.MockJspWriter;
import com.mockobjects.servlet.MockPageContext;
-import org.apache.struts2.ServletActionContext;
-import org.apache.struts2.StrutsTestCase;
-import org.apache.struts2.StrutsConstants;
-import org.apache.struts2.config.Settings;
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.util.OgnlValueStack;
-import javax.servlet.jsp.JspException;
-
/**
* PropertyTag test case.
diff --git a/core/src/test/java/org/apache/struts2/views/jsp/SortIteratorTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/SortIteratorTagTest.java
index 1870a05c9..ef89b31fb 100644
--- a/core/src/test/java/org/apache/struts2/views/jsp/SortIteratorTagTest.java
+++ b/core/src/test/java/org/apache/struts2/views/jsp/SortIteratorTagTest.java
@@ -17,10 +17,6 @@
*/
package org.apache.struts2.views.jsp;
-import org.apache.struts2.views.jsp.iterator.SortIteratorTag;
-import com.opensymphony.xwork2.Action;
-import com.opensymphony.xwork2.ActionSupport;
-
import java.util.ArrayList;
import java.util.Comparator;
import java.util.Iterator;
@@ -28,6 +24,11 @@ import java.util.List;
import javax.servlet.jsp.JspException;
+import org.apache.struts2.views.jsp.iterator.SortIteratorTag;
+
+import com.opensymphony.xwork2.Action;
+import com.opensymphony.xwork2.ActionSupport;
+
/**
* Test case to test SortIteratorTag.
*
diff --git a/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockBodyContent.java b/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockBodyContent.java
index 753e9a3ec..9f94c3356 100644
--- a/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockBodyContent.java
+++ b/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockBodyContent.java
@@ -17,12 +17,13 @@
*/
package org.apache.struts2.views.jsp;
-import javax.servlet.jsp.JspWriter;
-import javax.servlet.jsp.tagext.BodyContent;
import java.io.IOException;
import java.io.Reader;
import java.io.Writer;
+import javax.servlet.jsp.JspWriter;
+import javax.servlet.jsp.tagext.BodyContent;
+
/**
* StrutsMockBodyContent
diff --git a/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockHttpServletRequest.java b/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockHttpServletRequest.java
index 2c257553b..56a155c8b 100644
--- a/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockHttpServletRequest.java
+++ b/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockHttpServletRequest.java
@@ -17,12 +17,19 @@
*/
package org.apache.struts2.views.jsp;
-import com.mockobjects.servlet.MockHttpServletRequest;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Vector;
+
+import javax.servlet.RequestDispatcher;
+import javax.servlet.http.HttpSession;
+
import junit.framework.AssertionFailedError;
-import javax.servlet.http.HttpSession;
-import javax.servlet.RequestDispatcher;
-import java.util.*;
+import com.mockobjects.servlet.MockHttpServletRequest;
/**
diff --git a/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockHttpServletResponse.java b/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockHttpServletResponse.java
index c70b4e68d..e7d069a02 100644
--- a/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockHttpServletResponse.java
+++ b/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockHttpServletResponse.java
@@ -17,13 +17,13 @@
*/
package org.apache.struts2.views.jsp;
-import com.mockobjects.servlet.MockHttpServletResponse;
-
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.PrintWriter;
import java.util.Locale;
+import com.mockobjects.servlet.MockHttpServletResponse;
+
/**
* StrutsMockHttpServletResponse
diff --git a/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockHttpSession.java b/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockHttpSession.java
index 3c458b93c..5ba045456 100644
--- a/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockHttpSession.java
+++ b/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockHttpSession.java
@@ -17,11 +17,11 @@
*/
package org.apache.struts2.views.jsp;
-import com.mockobjects.servlet.MockHttpSession;
-
import java.util.Enumeration;
import java.util.Hashtable;
+import com.mockobjects.servlet.MockHttpSession;
+
/**
* StrutsMockHttpSession
diff --git a/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockJspWriter.java b/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockJspWriter.java
index dc61aead4..a8f644c9a 100644
--- a/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockJspWriter.java
+++ b/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockJspWriter.java
@@ -17,10 +17,11 @@
*/
package org.apache.struts2.views.jsp;
-import javax.servlet.jsp.JspWriter;
import java.io.IOException;
import java.io.StringWriter;
+import javax.servlet.jsp.JspWriter;
+
/**
* Unforunately, the MockJspWriter throws a NotImplementedException when any of the Writer methods are invoked and
diff --git a/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockPageContext.java b/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockPageContext.java
index 373a5d959..cfbd71f42 100644
--- a/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockPageContext.java
+++ b/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockPageContext.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.jsp;
-import com.mockobjects.servlet.MockPageContext;
+import java.util.HashMap;
+import java.util.Map;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
-import java.util.HashMap;
-import java.util.Map;
+
+import com.mockobjects.servlet.MockPageContext;
/**
diff --git a/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockServletContext.java b/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockServletContext.java
index 5efc49db7..bf07f5b49 100644
--- a/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockServletContext.java
+++ b/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockServletContext.java
@@ -17,14 +17,19 @@
*/
package org.apache.struts2.views.jsp;
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
import javax.servlet.RequestDispatcher;
import javax.servlet.Servlet;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
-import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.*;
/**
diff --git a/core/src/test/java/org/apache/struts2/views/jsp/SubsetIteratorTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/SubsetIteratorTagTest.java
index 53214e929..1cfd4ae94 100644
--- a/core/src/test/java/org/apache/struts2/views/jsp/SubsetIteratorTagTest.java
+++ b/core/src/test/java/org/apache/struts2/views/jsp/SubsetIteratorTagTest.java
@@ -23,6 +23,7 @@ import java.util.List;
import org.apache.struts2.util.SubsetIteratorFilter.Decider;
import org.apache.struts2.views.jsp.iterator.SubsetIteratorTag;
+
import com.opensymphony.xwork2.Action;
import com.opensymphony.xwork2.ActionSupport;
diff --git a/core/src/test/java/org/apache/struts2/views/jsp/TextTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/TextTagTest.java
index ab64464e3..f474b388f 100644
--- a/core/src/test/java/org/apache/struts2/views/jsp/TextTagTest.java
+++ b/core/src/test/java/org/apache/struts2/views/jsp/TextTagTest.java
@@ -17,30 +17,27 @@
*/
package org.apache.struts2.views.jsp;
-import org.apache.struts2.ServletActionContext;
-import org.apache.struts2.StrutsException;
-import org.apache.struts2.TestAction;
-import org.apache.struts2.components.Text;
-import org.apache.struts2.views.jsp.ui.TestAction1;
-import org.apache.struts2.views.jsp.ui.StrutsBodyContent;
-
-import com.mockobjects.servlet.MockBodyContent;
-import com.mockobjects.servlet.MockJspWriter;
-import com.opensymphony.xwork2.Action;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.BodyTag;
-import javax.servlet.jsp.tagext.Tag;
-import javax.servlet.jsp.tagext.TagSupport;
-
import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Locale;
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.tagext.BodyTag;
+
+import org.apache.struts2.ServletActionContext;
+import org.apache.struts2.StrutsException;
+import org.apache.struts2.TestAction;
+import org.apache.struts2.components.Text;
+import org.apache.struts2.views.jsp.ui.StrutsBodyContent;
+import org.apache.struts2.views.jsp.ui.TestAction1;
+
+import com.mockobjects.servlet.MockJspWriter;
+import com.opensymphony.xwork2.Action;
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* TextTagTest
diff --git a/core/src/test/java/org/apache/struts2/views/jsp/URLTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/URLTagTest.java
index 25451f496..887d55464 100644
--- a/core/src/test/java/org/apache/struts2/views/jsp/URLTagTest.java
+++ b/core/src/test/java/org/apache/struts2/views/jsp/URLTagTest.java
@@ -18,16 +18,11 @@
package org.apache.struts2.views.jsp;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.Map;
import javax.servlet.jsp.JspWriter;
import org.apache.struts2.components.URL;
-import org.springframework.mock.web.MockHttpServletRequest;
-import org.springframework.mock.web.MockHttpServletResponse;
-
-import com.opensymphony.xwork2.util.OgnlValueStack;
/**
* Unit test for {@link URLTag}.
diff --git a/core/src/test/java/org/apache/struts2/views/jsp/ui/ActionErrorTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/ActionErrorTagTest.java
index 576a8712d..1c4dfd238 100644
--- a/core/src/test/java/org/apache/struts2/views/jsp/ui/ActionErrorTagTest.java
+++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/ActionErrorTagTest.java
@@ -23,7 +23,7 @@ import java.util.Collections;
import java.util.List;
import org.apache.struts2.views.jsp.AbstractUITagTest;
-import org.apache.struts2.views.jsp.ui.ActionErrorTag;
+
import com.opensymphony.xwork2.Action;
import com.opensymphony.xwork2.ActionSupport;
diff --git a/core/src/test/java/org/apache/struts2/views/jsp/ui/ActionMessageTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/ActionMessageTagTest.java
index 7128dc4d5..8bfe7ed93 100644
--- a/core/src/test/java/org/apache/struts2/views/jsp/ui/ActionMessageTagTest.java
+++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/ActionMessageTagTest.java
@@ -23,6 +23,7 @@ import java.util.Collections;
import java.util.List;
import org.apache.struts2.views.jsp.AbstractUITagTest;
+
import com.opensymphony.xwork2.Action;
import com.opensymphony.xwork2.ActionSupport;
diff --git a/core/src/test/java/org/apache/struts2/views/jsp/ui/CheckboxListTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/CheckboxListTest.java
index a7ec8eb66..8cb0b8945 100644
--- a/core/src/test/java/org/apache/struts2/views/jsp/ui/CheckboxListTest.java
+++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/CheckboxListTest.java
@@ -17,13 +17,13 @@
*/
package org.apache.struts2.views.jsp.ui;
-import org.apache.struts2.TestAction;
-import org.apache.struts2.views.jsp.AbstractUITagTest;
-
import java.util.ArrayList;
import java.util.Collection;
import java.util.Map;
+import org.apache.struts2.TestAction;
+import org.apache.struts2.views.jsp.AbstractUITagTest;
+
/**
* Test case for CheckboxList.
diff --git a/core/src/test/java/org/apache/struts2/views/jsp/ui/CheckboxTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/CheckboxTest.java
index e6cfd2743..6e6c5e665 100644
--- a/core/src/test/java/org/apache/struts2/views/jsp/ui/CheckboxTest.java
+++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/CheckboxTest.java
@@ -17,11 +17,11 @@
*/
package org.apache.struts2.views.jsp.ui;
+import java.util.Map;
+
import org.apache.struts2.TestAction;
import org.apache.struts2.views.jsp.AbstractUITagTest;
-import java.util.Map;
-
/**
*/
diff --git a/core/src/test/java/org/apache/struts2/views/jsp/ui/ComboBoxTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/ComboBoxTest.java
index e01ce5f54..fc9372027 100644
--- a/core/src/test/java/org/apache/struts2/views/jsp/ui/ComboBoxTest.java
+++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/ComboBoxTest.java
@@ -17,14 +17,14 @@
*/
package org.apache.struts2.views.jsp.ui;
-import org.apache.struts2.TestAction;
-import org.apache.struts2.views.jsp.AbstractUITagTest;
-
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
+import org.apache.struts2.TestAction;
+import org.apache.struts2.views.jsp.AbstractUITagTest;
+
/**
* Test case for ComboBox component.
diff --git a/core/src/test/java/org/apache/struts2/views/jsp/ui/DatePickerTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/DatePickerTagTest.java
index 6361a0950..56daea855 100644
--- a/core/src/test/java/org/apache/struts2/views/jsp/ui/DatePickerTagTest.java
+++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/DatePickerTagTest.java
@@ -17,11 +17,12 @@
*/
package org.apache.struts2.views.jsp.ui;
-import org.apache.struts2.views.jsp.AbstractUITagTest;
-import com.opensymphony.xwork2.ActionContext;
-
import java.util.Locale;
+import org.apache.struts2.views.jsp.AbstractUITagTest;
+
+import com.opensymphony.xwork2.ActionContext;
+
/**
* Unit test for {@link DatePickerTag}.
*
diff --git a/core/src/test/java/org/apache/struts2/views/jsp/ui/DateTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/DateTagTest.java
index 44f6bf177..c980de4b5 100644
--- a/core/src/test/java/org/apache/struts2/views/jsp/ui/DateTagTest.java
+++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/DateTagTest.java
@@ -17,15 +17,16 @@
*/
package org.apache.struts2.views.jsp.ui;
-import org.apache.struts2.views.jsp.AbstractTagTest;
-import org.apache.struts2.views.jsp.DateTag;
-import com.opensymphony.xwork2.ActionContext;
-
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;
+import org.apache.struts2.views.jsp.AbstractTagTest;
+import org.apache.struts2.views.jsp.DateTag;
+
+import com.opensymphony.xwork2.ActionContext;
+
/**
* Unit test for {@link org.apache.struts2.components.Date}.
*
diff --git a/core/src/test/java/org/apache/struts2/views/jsp/ui/DoubleSelectTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/DoubleSelectTest.java
index 6c3205b01..d2920a013 100644
--- a/core/src/test/java/org/apache/struts2/views/jsp/ui/DoubleSelectTest.java
+++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/DoubleSelectTest.java
@@ -17,13 +17,13 @@
*/
package org.apache.struts2.views.jsp.ui;
-import org.apache.struts2.TestAction;
-import org.apache.struts2.views.jsp.AbstractUITagTest;
-
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
+import org.apache.struts2.TestAction;
+import org.apache.struts2.views.jsp.AbstractUITagTest;
+
/**
* Test case for DoubleSelectTag.
*
diff --git a/core/src/test/java/org/apache/struts2/views/jsp/ui/FieldErrorTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/FieldErrorTagTest.java
index 351a226ed..690a49011 100644
--- a/core/src/test/java/org/apache/struts2/views/jsp/ui/FieldErrorTagTest.java
+++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/FieldErrorTagTest.java
@@ -25,6 +25,7 @@ import java.util.Map;
import org.apache.struts2.views.jsp.AbstractUITagTest;
import org.apache.struts2.views.jsp.ParamTag;
+
import com.opensymphony.xwork2.Action;
import com.opensymphony.xwork2.ActionSupport;
diff --git a/core/src/test/java/org/apache/struts2/views/jsp/ui/FileTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/FileTest.java
index a8e0175ad..89d8431fe 100644
--- a/core/src/test/java/org/apache/struts2/views/jsp/ui/FileTest.java
+++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/FileTest.java
@@ -17,11 +17,11 @@
*/
package org.apache.struts2.views.jsp.ui;
+import java.util.Map;
+
import org.apache.struts2.TestAction;
import org.apache.struts2.views.jsp.AbstractUITagTest;
-import java.util.Map;
-
/**
*/
diff --git a/core/src/test/java/org/apache/struts2/views/jsp/ui/FormTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/FormTagTest.java
index ea34774cd..25bc18814 100644
--- a/core/src/test/java/org/apache/struts2/views/jsp/ui/FormTagTest.java
+++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/FormTagTest.java
@@ -17,13 +17,10 @@
*/
package org.apache.struts2.views.jsp.ui;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.ActionSupport;
-import com.opensymphony.xwork2.ObjectFactory;
-import com.opensymphony.xwork2.config.RuntimeConfiguration;
-import com.opensymphony.xwork2.config.entities.ActionConfig;
-import com.opensymphony.xwork2.config.entities.InterceptorMapping;
-import com.opensymphony.xwork2.validator.ValidationInterceptor;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
import org.apache.struts2.StrutsConstants;
import org.apache.struts2.TestAction;
import org.apache.struts2.TestConfigurationProvider;
@@ -32,9 +29,13 @@ import org.apache.struts2.dispatcher.mapper.DefaultActionMapper;
import org.apache.struts2.views.jsp.AbstractUITagTest;
import org.apache.struts2.views.jsp.ActionTag;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.ActionSupport;
+import com.opensymphony.xwork2.ObjectFactory;
+import com.opensymphony.xwork2.config.RuntimeConfiguration;
+import com.opensymphony.xwork2.config.entities.ActionConfig;
+import com.opensymphony.xwork2.config.entities.InterceptorMapping;
+import com.opensymphony.xwork2.validator.ValidationInterceptor;
/**
@@ -43,8 +44,6 @@ import java.util.Map;
public class FormTagTest extends AbstractUITagTest {
public void testFormWithActionAttributeContainingBothActionAndMethod() throws Exception {
- TestAction testAction = (TestAction) action;
-
FormTag tag = new FormTag();
tag.setPageContext(pageContext);
tag.setName("myForm");
@@ -63,8 +62,6 @@ public class FormTagTest extends AbstractUITagTest {
public void testFormWithActionAttributeContainingBothActionAndMethodAndNamespace() throws Exception {
- TestAction testAction = (TestAction) action;
-
FormTag tag = new FormTag();
tag.setPageContext(pageContext);
tag.setName("myForm");
diff --git a/core/src/test/java/org/apache/struts2/views/jsp/ui/HeadTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/HeadTagTest.java
index b1cfd5cf8..fc92f2cdd 100644
--- a/core/src/test/java/org/apache/struts2/views/jsp/ui/HeadTagTest.java
+++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/HeadTagTest.java
@@ -17,8 +17,8 @@
*/
package org.apache.struts2.views.jsp.ui;
-import org.apache.struts2.views.jsp.AbstractUITagTest;
import org.apache.struts2.components.Head;
+import org.apache.struts2.views.jsp.AbstractUITagTest;
/**
* Unit test for {@link HeadTag}.
diff --git a/core/src/test/java/org/apache/struts2/views/jsp/ui/HiddenTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/HiddenTest.java
index a983f9691..f30fec905 100644
--- a/core/src/test/java/org/apache/struts2/views/jsp/ui/HiddenTest.java
+++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/HiddenTest.java
@@ -17,12 +17,12 @@
*/
package org.apache.struts2.views.jsp.ui;
+import java.util.HashMap;
+import java.util.Map;
+
import org.apache.struts2.TestAction;
import org.apache.struts2.views.jsp.AbstractUITagTest;
-import java.util.Map;
-import java.util.HashMap;
-
/**
*/
diff --git a/core/src/test/java/org/apache/struts2/views/jsp/ui/JspTemplateTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/JspTemplateTest.java
index 8b1eff547..c5efac776 100644
--- a/core/src/test/java/org/apache/struts2/views/jsp/ui/JspTemplateTest.java
+++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/JspTemplateTest.java
@@ -17,15 +17,16 @@
*/
package org.apache.struts2.views.jsp.ui;
-import com.mockobjects.dynamic.C;
-import com.mockobjects.dynamic.Mock;
-import org.apache.struts2.TestAction;
-import org.apache.struts2.views.jsp.AbstractUITagTest;
-
import javax.servlet.RequestDispatcher;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.TestAction;
+import org.apache.struts2.views.jsp.AbstractUITagTest;
+
+import com.mockobjects.dynamic.C;
+import com.mockobjects.dynamic.Mock;
+
/**
* JspTemplateTest
*
diff --git a/core/src/test/java/org/apache/struts2/views/jsp/ui/LabelTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/LabelTest.java
index d457b8999..ec4dfdac8 100644
--- a/core/src/test/java/org/apache/struts2/views/jsp/ui/LabelTest.java
+++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/LabelTest.java
@@ -17,12 +17,12 @@
*/
package org.apache.struts2.views.jsp.ui;
+import java.util.HashMap;
+import java.util.Map;
+
import org.apache.struts2.TestAction;
import org.apache.struts2.views.jsp.AbstractUITagTest;
-import java.util.Map;
-import java.util.HashMap;
-
/**
*/
diff --git a/core/src/test/java/org/apache/struts2/views/jsp/ui/MockTag.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/MockTag.java
index 546de805f..89ac0fa12 100644
--- a/core/src/test/java/org/apache/struts2/views/jsp/ui/MockTag.java
+++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/MockTag.java
@@ -17,12 +17,13 @@
*/
package org.apache.struts2.views.jsp.ui;
-import javax.servlet.jsp.tagext.BodyTagSupport;
import java.util.Calendar;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
+import javax.servlet.jsp.tagext.BodyTagSupport;
+
/**
*/
diff --git a/core/src/test/java/org/apache/struts2/views/jsp/ui/RadioTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/RadioTest.java
index baf6c4596..541c8b37f 100644
--- a/core/src/test/java/org/apache/struts2/views/jsp/ui/RadioTest.java
+++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/RadioTest.java
@@ -17,12 +17,12 @@
*/
package org.apache.struts2.views.jsp.ui;
-import org.apache.struts2.TestAction;
-import org.apache.struts2.views.jsp.AbstractUITagTest;
-
import java.util.HashMap;
import java.util.LinkedHashMap;
+import org.apache.struts2.TestAction;
+import org.apache.struts2.views.jsp.AbstractUITagTest;
+
/**
*/
diff --git a/core/src/test/java/org/apache/struts2/views/jsp/ui/ResetTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/ResetTest.java
index 0994526ac..df333e294 100644
--- a/core/src/test/java/org/apache/struts2/views/jsp/ui/ResetTest.java
+++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/ResetTest.java
@@ -17,12 +17,12 @@
*/
package org.apache.struts2.views.jsp.ui;
-import org.apache.struts2.TestAction;
-import org.apache.struts2.views.jsp.AbstractUITagTest;
-
import java.util.HashMap;
import java.util.Map;
+import org.apache.struts2.TestAction;
+import org.apache.struts2.views.jsp.AbstractUITagTest;
+
/**
* Reset Component Test.
*
diff --git a/core/src/test/java/org/apache/struts2/views/jsp/ui/SelectTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/SelectTest.java
index 006048634..a56e15b9b 100644
--- a/core/src/test/java/org/apache/struts2/views/jsp/ui/SelectTest.java
+++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/SelectTest.java
@@ -17,14 +17,14 @@
*/
package org.apache.struts2.views.jsp.ui;
-import org.apache.struts2.TestAction;
-import org.apache.struts2.views.jsp.AbstractUITagTest;
-
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
+import org.apache.struts2.TestAction;
+import org.apache.struts2.views.jsp.AbstractUITagTest;
+
/**
*/
diff --git a/core/src/test/java/org/apache/struts2/views/jsp/ui/StrutsBodyContent.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/StrutsBodyContent.java
index 9e1a0e78f..6a9968fa4 100644
--- a/core/src/test/java/org/apache/struts2/views/jsp/ui/StrutsBodyContent.java
+++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/StrutsBodyContent.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.jsp.ui;
-import javax.servlet.jsp.JspWriter;
-import javax.servlet.jsp.tagext.BodyContent;
import java.io.IOException;
import java.io.Reader;
import java.io.StringReader;
import java.io.Writer;
+import javax.servlet.jsp.JspWriter;
+import javax.servlet.jsp.tagext.BodyContent;
+
/**
* StrutsBodyContent
diff --git a/core/src/test/java/org/apache/struts2/views/jsp/ui/SubmitAjaxTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/SubmitAjaxTest.java
index 1d3ec194b..6cc5c24c0 100644
--- a/core/src/test/java/org/apache/struts2/views/jsp/ui/SubmitAjaxTest.java
+++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/SubmitAjaxTest.java
@@ -18,8 +18,6 @@
package org.apache.struts2.views.jsp.ui;
import org.apache.struts2.views.jsp.AbstractUITagTest;
-import org.apache.struts2.views.jsp.ui.AnchorTest;
-import org.apache.struts2.views.jsp.ui.SubmitTag;
/**
* Test Submit component in "ajax" theme.
diff --git a/core/src/test/java/org/apache/struts2/views/jsp/ui/SubmitTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/SubmitTest.java
index c44be1518..9f32765f1 100644
--- a/core/src/test/java/org/apache/struts2/views/jsp/ui/SubmitTest.java
+++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/SubmitTest.java
@@ -17,12 +17,12 @@
*/
package org.apache.struts2.views.jsp.ui;
+import java.util.HashMap;
+import java.util.Map;
+
import org.apache.struts2.TestAction;
import org.apache.struts2.views.jsp.AbstractUITagTest;
-import java.util.Map;
-import java.util.HashMap;
-
/**
* Unit test for {@link SubmitTag}.
diff --git a/core/src/test/java/org/apache/struts2/views/jsp/ui/TextareaTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/TextareaTest.java
index 7cec6fd07..df79971fb 100644
--- a/core/src/test/java/org/apache/struts2/views/jsp/ui/TextareaTest.java
+++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/TextareaTest.java
@@ -17,11 +17,11 @@
*/
package org.apache.struts2.views.jsp.ui;
+import java.util.Map;
+
import org.apache.struts2.TestAction;
import org.apache.struts2.views.jsp.AbstractUITagTest;
-import java.util.Map;
-
/**
*/
diff --git a/core/src/test/java/org/apache/struts2/views/jsp/ui/TextfieldTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/TextfieldTest.java
index f1c81f8fb..5796b1e36 100644
--- a/core/src/test/java/org/apache/struts2/views/jsp/ui/TextfieldTest.java
+++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/TextfieldTest.java
@@ -17,13 +17,14 @@
*/
package org.apache.struts2.views.jsp.ui;
+import java.util.HashMap;
+import java.util.Map;
+
import org.apache.struts2.TestAction;
import org.apache.struts2.views.freemarker.tags.TextFieldModel;
import org.apache.struts2.views.jsp.AbstractUITagTest;
-import freemarker.template.TransformControl;
-import java.util.HashMap;
-import java.util.Map;
+import freemarker.template.TransformControl;
/**
diff --git a/core/src/test/java/org/apache/struts2/views/jsp/ui/TokenTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/TokenTagTest.java
index eeba8caa5..500519e6e 100644
--- a/core/src/test/java/org/apache/struts2/views/jsp/ui/TokenTagTest.java
+++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/TokenTagTest.java
@@ -17,11 +17,11 @@
*/
package org.apache.struts2.views.jsp.ui;
+import javax.servlet.jsp.JspException;
+
import org.apache.struts2.util.TokenHelper;
import org.apache.struts2.views.jsp.AbstractUITagTest;
-import javax.servlet.jsp.JspException;
-
/**
* TokenTagTest
diff --git a/core/src/test/java/org/apache/struts2/views/jsp/ui/TooltipTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/TooltipTest.java
index 93326a532..0e1b9fff1 100644
--- a/core/src/test/java/org/apache/struts2/views/jsp/ui/TooltipTest.java
+++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/TooltipTest.java
@@ -17,12 +17,13 @@
*/
package org.apache.struts2.views.jsp.ui;
-import com.mockobjects.servlet.MockJspWriter;
import org.apache.struts2.TestConfigurationProvider;
import org.apache.struts2.views.jsp.AbstractUITagTest;
import org.apache.struts2.views.jsp.ParamTag;
import org.apache.struts2.views.jsp.StrutsMockBodyContent;
+import com.mockobjects.servlet.MockJspWriter;
+
/**
* UI components Tooltip test case.
*/
diff --git a/core/src/test/java/org/apache/struts2/views/jsp/ui/UpDownSelectTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/UpDownSelectTagTest.java
index d1ddab301..b3cad78c0 100644
--- a/core/src/test/java/org/apache/struts2/views/jsp/ui/UpDownSelectTagTest.java
+++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/UpDownSelectTagTest.java
@@ -23,6 +23,7 @@ import java.util.List;
import java.util.Map;
import org.apache.struts2.views.jsp.AbstractUITagTest;
+
import com.opensymphony.xwork2.Action;
import com.opensymphony.xwork2.ActionSupport;
diff --git a/core/src/test/java/org/apache/struts2/views/util/ContextUtilTest.java b/core/src/test/java/org/apache/struts2/views/util/ContextUtilTest.java
index b3060c5a3..ea3d94cb8 100755
--- a/core/src/test/java/org/apache/struts2/views/util/ContextUtilTest.java
+++ b/core/src/test/java/org/apache/struts2/views/util/ContextUtilTest.java
@@ -17,11 +17,13 @@
*/
package org.apache.struts2.views.util;
-import org.apache.struts2.config.Settings;
-import org.apache.struts2.StrutsConstants;
-import com.opensymphony.xwork2.util.OgnlValueStack;
import junit.framework.TestCase;
+import org.apache.struts2.StrutsConstants;
+import org.apache.struts2.config.Settings;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
/**
* Test case for ContextUtil
*
diff --git a/core/src/test/java/org/apache/struts2/views/util/ResourceUtilTest.java b/core/src/test/java/org/apache/struts2/views/util/ResourceUtilTest.java
index a0f49fb30..2ee6c0586 100644
--- a/core/src/test/java/org/apache/struts2/views/util/ResourceUtilTest.java
+++ b/core/src/test/java/org/apache/struts2/views/util/ResourceUtilTest.java
@@ -20,11 +20,12 @@ package org.apache.struts2.views.util;
* ResourceUtilTest
*
*/
-import junit.framework.TestCase;
-import org.easymock.MockControl;
-
import javax.servlet.http.HttpServletRequest;
+import junit.framework.TestCase;
+
+import org.easymock.MockControl;
+
public class ResourceUtilTest extends TestCase {
private MockControl control;
diff --git a/core/src/test/java/org/apache/struts2/views/util/UrlHelperTest.java b/core/src/test/java/org/apache/struts2/views/util/UrlHelperTest.java
index 798ca6fbf..979e85418 100644
--- a/core/src/test/java/org/apache/struts2/views/util/UrlHelperTest.java
+++ b/core/src/test/java/org/apache/struts2/views/util/UrlHelperTest.java
@@ -17,19 +17,19 @@
*/
package org.apache.struts2.views.util;
-import com.mockobjects.dynamic.Mock;
-import org.apache.struts2.StrutsTestCase;
-import org.apache.struts2.StrutsConstants;
-import org.apache.struts2.config.Settings;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.TreeMap;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.TreeMap;
-import java.util.HashMap;
+import org.apache.struts2.StrutsConstants;
+import org.apache.struts2.StrutsTestCase;
+import org.apache.struts2.config.Settings;
+
+import com.mockobjects.dynamic.Mock;
/**
diff --git a/core/src/test/java/org/apache/struts2/views/xslt/XSLTResultTest.java b/core/src/test/java/org/apache/struts2/views/xslt/XSLTResultTest.java
index 1994a3b66..4fc99591a 100644
--- a/core/src/test/java/org/apache/struts2/views/xslt/XSLTResultTest.java
+++ b/core/src/test/java/org/apache/struts2/views/xslt/XSLTResultTest.java
@@ -17,21 +17,22 @@
*/
package org.apache.struts2.views.xslt;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.xml.transform.TransformerException;
+
import org.apache.struts2.ServletActionContext;
import org.apache.struts2.StrutsTestCase;
-import com.opensymphony.xwork2.Action;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.mock.MockActionInvocation;
-import com.opensymphony.xwork2.util.OgnlValueStack;
-import junit.framework.TestCase;
import org.springframework.core.io.DefaultResourceLoader;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
import org.springframework.mock.web.MockServletContext;
-import javax.xml.transform.TransformerException;
-import java.util.List;
-import java.util.ArrayList;
+import com.opensymphony.xwork2.Action;
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.mock.MockActionInvocation;
+import com.opensymphony.xwork2.util.OgnlValueStack;
/**
* Unit test for {@link XSLTResult}.