Cleanup take two: fixed a misnaming bug, cleaned imports, fixed a few

deprecations, removed deprecations related to using the method
name in building a url, removed unused variables, general minor cleanup
fixed all core non-generics warnings that Eclipse reports


git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@439747 13f79535-47bb-0310-9956-ffa450edef68

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);
     }

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 <code>StrutsException</code> with no detail message.
      */

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;
 
 /**
  * <!-- START SNIPPET: javadoc -->

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;
+
 /**
  * <!-- START SNIPPET: javadoc -->
  *

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;
+
 /**
  * <!-- START SNIPPET: javadoc -->
  *

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;
+
 /**
  * <!-- START SNIPPET: javadoc -->
  *

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;
 
 /**

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;
 
 /**
  * <!-- START SNIPPET: javadoc -->

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;
+
 /**
  * <!-- START SNIPPET: javadoc -->
  * Renders an HTML input element of type checkbox, populated by the specified property from the OgnlValueStack.

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;
+
 /**
  * <!-- START SNIPPET: javadoc -->
  *

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.

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;
+
 /**
  * <!-- START SNIPPET: javadoc -->
  * The combo box is basically an HTML INPUT of type text and HTML SELECT grouped together to give you a combo box

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.
  * <p/>
@@ -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

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;
+
 /**
  * <!-- START SNIPPET: javadoc -->
  * 

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;
+
 /**
  * <!-- START SNIPPET: javadoc -->
  *

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;
+
 /**
  * <!-- START SNIPPET: javadoc -->
  * <p>Renders an debug tag.</P>

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;
 
 /**
  * <!-- START SNIPPET: javadoc -->

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.
  *

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;
+
 /**
  * <!-- START SNIPPET: javadoc -->
  * Renders two HTML select elements with second one changing displayed values depending on selected entry of first one.

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;
+
 /**
  * <!-- START SNIPPET: javadoc -->
  *

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;
+
 /**
  * <!-- START SNIPPET: javadoc -->
  *

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;
 
 /**
  * <!-- START SNIPPET: javadoc -->

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;
+
 /**
  * <!-- START SNIPPET: javadoc -->
  * Renders an HTML file input element.

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;
 
 /**
  * <!-- START SNIPPET: javadoc -->

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.
  */

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;
+
 /**
  * <!-- START SNIPPET: javadoc -->
  * 

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;
+
 /**
  * <!-- START SNIPPET: javadoc -->
  *

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;
+
 /**
  * <!-- START SNIPPET: javadoc -->
  * Renders an HTML input element of type hidden, populated by the specified property from the OgnlValueStack.

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;
 
 /**
  * <!-- START SNIPPET: javadoc -->
@@ -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;
 

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;
+
 /**
  * <!-- START SNIPPET: javadoc -->
  *

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;
 
 /**
  * <!-- START SNIPPET: javadoc -->

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;
+
 /**
  * <!-- START SNIPPET: javadoc -->
  *

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;
+
 /**
  * <!-- START SNIPPET: javadoc -->
  * Renders an HTML LABEL that will allow you to output label:name combination that has the same format treatment as

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.
  *

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;
 
 /**

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;
 
 /**
  * <!-- START SNIPPET: javadoc -->

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;
+
 /**
  * <!-- START SNIPPET: javadoc -->
  * <p>This tag can be used to parameterize other tags.</p>

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;
+
 /**
  * <!-- START SNIPPET: javadoc -->
  * Render an HTML input tag of type password.</p>

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;
+
 /**
  * <!-- START SNIPPET: javadoc -->
  * 

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;
+
 /**
  * <!-- START SNIPPET: javadoc -->
  * <p>Push value on stack for simplified usage.</p>

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;
+
 /**
  * <!-- START SNIPPET: javadoc -->
  * Render a radio button input field.</p>

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.
  *

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;
+
 /**
  * <!-- START SNIPPET: javadoc -->
  * Render a reset button. The reset tag is used together with the form tag to provide form resetting.

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;
+
 /**
  * <!-- START SNIPPET: javadoc -->
  * 

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;
+
 /**
  * <!-- START SNIPPET: javadoc -->
  * <p>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

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;
+
 /**
  * <!-- START SNIPPET: javadoc -->
  * Render a submit button. The submit tag is used together with the form tag to provide asynchronous form submissions.

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;
 
 /**
  * <!-- START SNIPPET: javadoc -->

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;
+
 /**
  * <!-- START SNIPPET: javadoc -->
  * Render HTML textarea tag.</p>

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;
+
 /**
  * <!-- START SNIPPET: javadoc -->
  * Render an HTML input field of type text</p>

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;
 
 /**
  * <!-- START SNIPPET: javadoc -->

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;
 
 /**
  * <!-- START SNIPPET: javadoc -->

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;
+
 /**
  * <!-- START SNIPPET: javadoc -->
  *

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.

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;
+
 /**
  * <!-- START SNIPPET: javadoc -->
  * 
@@ -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;

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;
 
 
 /**

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;
+
 
 /**
  */

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."

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;
+
 
 /**
  */

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;
+
 
 /**
  */

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.
  */

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.
  */

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.

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
  */

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.
  */

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.
  */

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

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

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
  *

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
  */

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
  *

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
  */

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;

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;
 
 /**
  * <!-- SNIPPET START: description -->

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;
 
 
 /**

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;
 
 /**

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;

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

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;
-
 
 /**
  * <!-- START SNIPPET: description -->

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.

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;
 
 /**
  * <!-- START SNIPPET: description -->

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;
+
 
 /**
  * <!-- START SNIPPET: description -->

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;
+
 
 /**
  * <!-- START SNIPPET: description -->

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.*;
 
 
 /**

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;
+
 /**
  * <!-- START SNIPPET: description -->
  *

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;
+
 /**
  * <!-- START SNIPPET: javadoc -->
  *

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;

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;
 
 
 /**

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;
 
 /**
  * <!-- START SNIPPET: javadoc -->

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

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;
-
 /**
  * <!-- START SNIPPET: javadoc -->
  *

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:
  * <p/>

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.

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;
 
 
 /**

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 {
 

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) {

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 {
 

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;

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) {

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);

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)