struts-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mr...@apache.org
Subject svn commit: r439747 [6/7] - in /struts/struts2/trunk/core/src: main/java/org/apache/struts2/ main/java/org/apache/struts2/components/ main/java/org/apache/struts2/components/table/ main/java/org/apache/struts2/components/table/renderer/ main/java/org/a...
Date Sun, 03 Sep 2006 09:23:03 GMT
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/SimpleAdapterDocument.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/SimpleAdapterDocument.java?rev=439747&r1=439746&r2=439747&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/SimpleAdapterDocument.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/SimpleAdapterDocument.java Sun Sep  3 02:22:46 2006
@@ -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

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/SimpleNodeList.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/SimpleNodeList.java?rev=439747&r1=439746&r2=439747&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/SimpleNodeList.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/SimpleNodeList.java Sun Sep  3 02:22:46 2006
@@ -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 {
 

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/StringAdapter.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/StringAdapter.java?rev=439747&r1=439746&r2=439747&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/StringAdapter.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/StringAdapter.java Sun Sep  3 02:22:46 2006
@@ -17,19 +17,19 @@
  */
 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

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java?rev=439747&r1=439746&r2=439747&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java Sun Sep  3 02:22:46 2006
@@ -17,27 +17,35 @@
  */
 package org.apache.struts2.views.xslt;
 
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.Writer;
+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;
-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;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Map;
 
 
 /**
@@ -179,6 +187,7 @@
  */
 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";
 

Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/ExecutionCountTestAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/ExecutionCountTestAction.java?rev=439747&r1=439746&r2=439747&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/ExecutionCountTestAction.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/ExecutionCountTestAction.java Sun Sep  3 02:22:46 2006
@@ -17,9 +17,10 @@
  */
 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;
 
 
 /**

Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/RequestUtilsTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/RequestUtilsTest.java?rev=439747&r1=439746&r2=439747&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/RequestUtilsTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/RequestUtilsTest.java Sun Sep  3 02:22:46 2006
@@ -21,9 +21,9 @@
  * <code>RequestUtilsTest</code>
  *
  */
-import junit.framework.TestCase;
-
 import javax.servlet.http.HttpServletRequest;
+
+import junit.framework.TestCase;
 
 import org.easymock.MockControl;
 

Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/ServletActionContextTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/ServletActionContextTest.java?rev=439747&r1=439746&r2=439747&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/ServletActionContextTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/ServletActionContextTest.java Sun Sep  3 02:22:46 2006
@@ -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;
 
 
 /**

Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/TestAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/TestAction.java?rev=439747&r1=439746&r2=439747&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/TestAction.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/TestAction.java Sun Sep  3 02:22:46 2006
@@ -17,13 +17,14 @@
  */
 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;
 
 
 /**

Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/TestConfigurationProvider.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/TestConfigurationProvider.java?rev=439747&r1=439746&r2=439747&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/TestConfigurationProvider.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/TestConfigurationProvider.java Sun Sep  3 02:22:46 2006
@@ -17,23 +17,24 @@
  */
 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;
 
 
 /**

Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/TestResult.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/TestResult.java?rev=439747&r1=439746&r2=439747&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/TestResult.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/TestResult.java Sun Sep  3 02:22:46 2006
@@ -17,16 +17,18 @@
  */
 package org.apache.struts2;
 
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.ActionInvocation;
-import com.opensymphony.xwork2.Result;
-import com.opensymphony.xwork2.util.OgnlValueStack;
+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 java.util.ArrayList;
-import java.util.List;
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.Result;
+import com.opensymphony.xwork2.util.OgnlValueStack;
 
 
 /**

Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/ComponentTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/ComponentTest.java?rev=439747&r1=439746&r2=439747&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/ComponentTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/ComponentTest.java Sun Sep  3 02:22:46 2006
@@ -40,6 +40,7 @@
 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 @@
 		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();

Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/FormButtonTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/FormButtonTest.java?rev=439747&r1=439746&r2=439747&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/FormButtonTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/FormButtonTest.java Sun Sep  3 02:22:46 2006
@@ -23,8 +23,6 @@
 
 import com.opensymphony.xwork2.util.OgnlValueStack;
 
-import junit.framework.TestCase;
-
 /**
  * 
  * @version $Date$ $Id$

Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/FormTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/FormTest.java?rev=439747&r1=439746&r2=439747&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/FormTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/FormTest.java Sun Sep  3 02:22:46 2006
@@ -17,11 +17,12 @@
  */
 package org.apache.struts2.components;
 
-import org.apache.struts2.views.jsp.AbstractUITagTest;
+import java.util.List;
+
 import org.apache.struts2.TestAction;
-import com.opensymphony.xwork2.validator.validators.RequiredFieldValidator;
+import org.apache.struts2.views.jsp.AbstractUITagTest;
 
-import java.util.List;
+import com.opensymphony.xwork2.validator.validators.RequiredFieldValidator;
 
 /**
  * <code>FormTest</code>

Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/PropertyTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/PropertyTest.java?rev=439747&r1=439746&r2=439747&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/PropertyTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/PropertyTest.java Sun Sep  3 02:22:46 2006
@@ -17,15 +17,16 @@
  */
 package org.apache.struts2.components;
 
-import org.apache.struts2.components.Property;
+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;
-import junit.framework.TestCase;
-import ognl.Ognl;
- 
-import java.io.StringWriter;
-import java.util.Map;
  
 /**
  *

Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/UIComponentTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/UIComponentTest.java?rev=439747&r1=439746&r2=439747&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/UIComponentTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/UIComponentTest.java Sun Sep  3 02:22:46 2006
@@ -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;
 
 
 /**

Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/template/BaseTemplateEngineTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/template/BaseTemplateEngineTest.java?rev=439747&r1=439746&r2=439747&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/template/BaseTemplateEngineTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/template/BaseTemplateEngineTest.java Sun Sep  3 02:22:46 2006
@@ -21,11 +21,6 @@
 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;
 
 /**

Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/SettingsTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/SettingsTest.java?rev=439747&r1=439746&r2=439747&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/SettingsTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/SettingsTest.java Sun Sep  3 02:22:46 2006
@@ -17,12 +17,13 @@
  */
 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;
 
 
 /**

Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/DispatcherTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/DispatcherTest.java?rev=439747&r1=439746&r2=439747&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/DispatcherTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/DispatcherTest.java Sun Sep  3 02:22:46 2006
@@ -22,13 +22,12 @@
 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;
 
 /**

Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/FilterDispatcherTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/FilterDispatcherTest.java?rev=439747&r1=439746&r2=439747&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/FilterDispatcherTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/FilterDispatcherTest.java Sun Sep  3 02:22:46 2006
@@ -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.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.

Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/HttpHeaderResultTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/HttpHeaderResultTest.java?rev=439747&r1=439746&r2=439747&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/HttpHeaderResultTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/HttpHeaderResultTest.java Sun Sep  3 02:22:46 2006
@@ -17,18 +17,19 @@
  */
 package org.apache.struts2.dispatcher;
 
-import com.mockobjects.dynamic.C;
-import com.mockobjects.dynamic.Mock;
+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.XWorkTestCase;
 import com.opensymphony.xwork2.util.OgnlUtil;
-
-import javax.servlet.http.HttpServletResponse;
-import java.util.HashMap;
-import java.util.Map;
 
 
 /**

Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/PlainTextResultTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/PlainTextResultTest.java?rev=439747&r1=439746&r2=439747&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/PlainTextResultTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/PlainTextResultTest.java Sun Sep  3 02:22:46 2006
@@ -21,16 +21,17 @@
 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.

Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/ServletDispatchedTestAssertInterceptor.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/ServletDispatchedTestAssertInterceptor.java?rev=439747&r1=439746&r2=439747&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/ServletDispatchedTestAssertInterceptor.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/ServletDispatchedTestAssertInterceptor.java Sun Sep  3 02:22:46 2006
@@ -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;
 
 
 /**

Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/ServletDispatcherResultTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/ServletDispatcherResultTest.java?rev=439747&r1=439746&r2=439747&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/ServletDispatcherResultTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/ServletDispatcherResultTest.java Sun Sep  3 02:22:46 2006
@@ -17,17 +17,19 @@
  */
 package org.apache.struts2.dispatcher;
 
-import com.mockobjects.dynamic.C;
-import com.mockobjects.dynamic.Mock;
+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.opensymphony.xwork2.ActionContext;
-import ognl.Ognl;
 
-import javax.servlet.RequestDispatcher;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import com.mockobjects.dynamic.C;
+import com.mockobjects.dynamic.Mock;
+import com.opensymphony.xwork2.ActionContext;
 
 
 /**

Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/ServletRedirectResultTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/ServletRedirectResultTest.java?rev=439747&r1=439746&r2=439747&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/ServletRedirectResultTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/ServletRedirectResultTest.java Sun Sep  3 02:22:46 2006
@@ -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.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;
 
 
 /**

Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/SessionMapTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/SessionMapTest.java?rev=439747&r1=439746&r2=439747&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/SessionMapTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/SessionMapTest.java Sun Sep  3 02:22:46 2006
@@ -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;
 
 
 /**

Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/StreamResultTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/StreamResultTest.java?rev=439747&r1=439746&r2=439747&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/StreamResultTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/StreamResultTest.java Sun Sep  3 02:22:46 2006
@@ -17,20 +17,22 @@
  */
 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}.

Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/StrutsResultSupportTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/StrutsResultSupportTest.java?rev=439747&r1=439746&r2=439747&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/StrutsResultSupportTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/StrutsResultSupportTest.java Sun Sep  3 02:22:46 2006
@@ -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;

Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/VelocityResultTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/VelocityResultTest.java?rev=439747&r1=439746&r2=439747&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/VelocityResultTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/VelocityResultTest.java Sun Sep  3 02:22:46 2006
@@ -17,16 +17,18 @@
  */
 package org.apache.struts2.dispatcher;
 
-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;
+
+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;
 
 
 /**

Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java?rev=439747&r1=439746&r2=439747&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java Sun Sep  3 02:22:46 2006
@@ -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.

Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/mapper/RestfulActionMapperTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/mapper/RestfulActionMapperTest.java?rev=439747&r1=439746&r2=439747&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/mapper/RestfulActionMapperTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/mapper/RestfulActionMapperTest.java Sun Sep  3 02:22:46 2006
@@ -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;
 

Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/impl/MessagesTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/impl/MessagesTest.java?rev=439747&r1=439746&r2=439747&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/impl/MessagesTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/impl/MessagesTest.java Sun Sep  3 02:22:46 2006
@@ -3,6 +3,7 @@
 package org.apache.struts2.impl;
 
 import junit.framework.TestCase;
+
 import org.apache.struts2.Messages;
 
 public class MessagesTest extends TestCase {

Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/impl/RequestContextTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/impl/RequestContextTest.java?rev=439747&r1=439746&r2=439747&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/impl/RequestContextTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/impl/RequestContextTest.java Sun Sep  3 02:22:46 2006
@@ -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 javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
 import java.util.Arrays;
-import java.util.List;
 import java.util.HashMap;
+import java.util.List;
 import java.util.concurrent.Callable;
+
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+
+import junit.framework.TestCase;
+
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.ActionInvocation;
 
 public class RequestContextTest extends TestCase {
 

Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/CreateSessionInterceptorTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/CreateSessionInterceptorTest.java?rev=439747&r1=439746&r2=439747&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/CreateSessionInterceptorTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/CreateSessionInterceptorTest.java Sun Sep  3 02:22:46 2006
@@ -19,12 +19,12 @@
 
 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;
 
 /**

Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/ExecuteAndWaitInterceptorTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/ExecuteAndWaitInterceptorTest.java?rev=439747&r1=439746&r2=439747&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/ExecuteAndWaitInterceptorTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/ExecuteAndWaitInterceptorTest.java Sun Sep  3 02:22:46 2006
@@ -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.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.

Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/FileUploadInterceptorTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/FileUploadInterceptorTest.java?rev=439747&r1=439746&r2=439747&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/FileUploadInterceptorTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/FileUploadInterceptorTest.java Sun Sep  3 02:22:46 2006
@@ -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;
@@ -34,6 +25,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;
 
 
 /**

Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/ServletConfigInterceptorTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/ServletConfigInterceptorTest.java?rev=439747&r1=439746&r2=439747&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/ServletConfigInterceptorTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/ServletConfigInterceptorTest.java Sun Sep  3 02:22:46 2006
@@ -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}.

Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/StrutsConversionErrorInterceptorTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/StrutsConversionErrorInterceptorTest.java?rev=439747&r1=439746&r2=439747&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/StrutsConversionErrorInterceptorTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/StrutsConversionErrorInterceptorTest.java Sun Sep  3 02:22:46 2006
@@ -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.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;
 
 
 /**

Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/TokenInterceptorTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/TokenInterceptorTest.java?rev=439747&r1=439746&r2=439747&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/TokenInterceptorTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/TokenInterceptorTest.java Sun Sep  3 02:22:46 2006
@@ -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.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;
 
 
 /**

Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/TokenSessionStoreInterceptorTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/TokenSessionStoreInterceptorTest.java?rev=439747&r1=439746&r2=439747&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/TokenSessionStoreInterceptorTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/TokenSessionStoreInterceptorTest.java Sun Sep  3 02:22:46 2006
@@ -17,9 +17,10 @@
  */
 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}.

Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/portlet/context/PortletActionContextTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/portlet/context/PortletActionContextTest.java?rev=439747&r1=439746&r2=439747&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/portlet/context/PortletActionContextTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/portlet/context/PortletActionContextTest.java Sun Sep  3 02:22:46 2006
@@ -28,10 +28,10 @@
 
 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;
 
 /**

Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/portlet/context/PreparatorServletTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/portlet/context/PreparatorServletTest.java?rev=439747&r1=439746&r2=439747&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/portlet/context/PreparatorServletTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/portlet/context/PreparatorServletTest.java Sun Sep  3 02:22:46 2006
@@ -22,12 +22,9 @@
 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;
 
 /**
  * 

Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/portlet/context/ServletContextHolderListenerTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/portlet/context/ServletContextHolderListenerTest.java?rev=439747&r1=439746&r2=439747&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/portlet/context/ServletContextHolderListenerTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/portlet/context/ServletContextHolderListenerTest.java Sun Sep  3 02:22:46 2006
@@ -20,9 +20,9 @@
 import javax.servlet.ServletContext;
 import javax.servlet.ServletContextEvent;
 
-import org.easymock.MockControl;
-
 import junit.framework.TestCase;
+
+import org.easymock.MockControl;
 
 /**
  */

Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/portlet/dispatcher/Jsr168DispatcherTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/portlet/dispatcher/Jsr168DispatcherTest.java?rev=439747&r1=439746&r2=439747&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/portlet/dispatcher/Jsr168DispatcherTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/portlet/dispatcher/Jsr168DispatcherTest.java Sun Sep  3 02:22:46 2006
@@ -38,19 +38,17 @@
 
 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 @@
         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 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 void testModeChangeUsingPortletWidgets() {
         final Mock mockResponse = mock(RenderResponse.class);
         mockResponse.stubs().method(ANYTHING);
-        String actionName = "testAction";
         PortletMode mode = PortletMode.EDIT;
 
         Map requestParams = new HashMap();

Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/portlet/result/PortletResultTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/portlet/result/PortletResultTest.java?rev=439747&r1=439746&r2=439747&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/portlet/result/PortletResultTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/portlet/result/PortletResultTest.java Sun Sep  3 02:22:46 2006
@@ -31,11 +31,11 @@
 
 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 @@
         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);

Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/portlet/util/PortletUrlHelperTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/portlet/util/PortletUrlHelperTest.java?rev=439747&r1=439746&r2=439747&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/portlet/util/PortletUrlHelperTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/portlet/util/PortletUrlHelperTest.java Sun Sep  3 02:22:46 2006
@@ -28,9 +28,9 @@
 
 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;
 
 /**

Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/portlet/util/StrutsUtilTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/portlet/util/StrutsUtilTest.java?rev=439747&r1=439746&r2=439747&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/portlet/util/StrutsUtilTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/portlet/util/StrutsUtilTest.java Sun Sep  3 02:22:46 2006
@@ -24,17 +24,15 @@
 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.

Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/sitegraph/SiteGraphTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/sitegraph/SiteGraphTest.java?rev=439747&r1=439746&r2=439747&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/sitegraph/SiteGraphTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/sitegraph/SiteGraphTest.java Sun Sep  3 02:22:46 2006
@@ -17,16 +17,15 @@
  */
 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;
 
 /**
  */

Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/spring/StrutsSpringObjectFactoryTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/spring/StrutsSpringObjectFactoryTest.java?rev=439747&r1=439746&r2=439747&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/spring/StrutsSpringObjectFactoryTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/spring/StrutsSpringObjectFactoryTest.java Sun Sep  3 02:22:46 2006
@@ -17,17 +17,16 @@
  */
 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}.

Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/util/InvocationSessionStoreTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/util/InvocationSessionStoreTest.java?rev=439747&r1=439746&r2=439747&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/util/InvocationSessionStoreTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/util/InvocationSessionStoreTest.java Sun Sep  3 02:22:46 2006
@@ -17,15 +17,16 @@
  */
 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;
 
 
 /**

Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/util/TokenHelperTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/util/TokenHelperTest.java?rev=439747&r1=439746&r2=439747&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/util/TokenHelperTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/util/TokenHelperTest.java Sun Sep  3 02:22:46 2006
@@ -47,8 +47,6 @@
 
     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});

Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/TemplateEngineManagerTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/TemplateEngineManagerTest.java?rev=439747&r1=439746&r2=439747&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/TemplateEngineManagerTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/TemplateEngineManagerTest.java Sun Sep  3 02:22:46 2006
@@ -17,9 +17,15 @@
  */
 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

Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/freemarker/FreemarkerTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/freemarker/FreemarkerTest.java?rev=439747&r1=439746&r2=439747&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/freemarker/FreemarkerTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/freemarker/FreemarkerTest.java Sun Sep  3 02:22:46 2006
@@ -17,15 +17,18 @@
  */
 package org.apache.struts2.views.freemarker;
 
+import java.util.List;
+
+import junit.framework.TestCase;
+
 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 junit.framework.TestCase;
-
-import java.util.List;
 
 
 /**

Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/freemarker/TestAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/freemarker/TestAction.java?rev=439747&r1=439746&r2=439747&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/freemarker/TestAction.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/freemarker/TestAction.java Sun Sep  3 02:22:46 2006
@@ -17,10 +17,10 @@
  */
 package org.apache.struts2.views.freemarker;
 
-import com.opensymphony.xwork2.ActionSupport;
-
 import java.util.ArrayList;
 import java.util.List;
+
+import com.opensymphony.xwork2.ActionSupport;
 
 
 /**

Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/AbstractTagTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/AbstractTagTest.java?rev=439747&r1=439746&r2=439747&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/AbstractTagTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/AbstractTagTest.java Sun Sep  3 02:22:46 2006
@@ -17,23 +17,25 @@
  */
 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;
 
 
 /**

Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/AbstractUITagTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/AbstractUITagTest.java?rev=439747&r1=439746&r2=439747&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/AbstractUITagTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/AbstractUITagTest.java Sun Sep  3 02:22:46 2006
@@ -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;
 
 
 /**

Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ActionTagTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ActionTagTest.java?rev=439747&r1=439746&r2=439747&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ActionTagTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ActionTagTest.java Sun Sep  3 02:22:46 2006
@@ -17,14 +17,21 @@
  */
 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;
 
 
 /**

Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/AnchorTagTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/AnchorTagTest.java?rev=439747&r1=439746&r2=439747&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/AnchorTagTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/AnchorTagTest.java Sun Sep  3 02:22:46 2006
@@ -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;
 
 
 /**

Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/AppendIteratorTagTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/AppendIteratorTagTest.java?rev=439747&r1=439746&r2=439747&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/AppendIteratorTagTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/AppendIteratorTagTest.java Sun Sep  3 02:22:46 2006
@@ -22,6 +22,7 @@
 import java.util.List;
 
 import org.apache.struts2.views.jsp.iterator.AppendIteratorTag;
+
 import com.opensymphony.xwork2.Action;
 import com.opensymphony.xwork2.ActionSupport;
 

Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ElseIfTagTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ElseIfTagTest.java?rev=439747&r1=439746&r2=439747&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ElseIfTagTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ElseIfTagTest.java Sun Sep  3 02:22:46 2006
@@ -19,13 +19,14 @@
 
 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;
 
 /**
  * 

Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ElseTagTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ElseTagTest.java?rev=439747&r1=439746&r2=439747&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ElseTagTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ElseTagTest.java Sun Sep  3 02:22:46 2006
@@ -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;
 
 
 /**

Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/IfTagTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/IfTagTest.java?rev=439747&r1=439746&r2=439747&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/IfTagTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/IfTagTest.java Sun Sep  3 02:22:46 2006
@@ -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;
 
 
 /**

Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/IncludeTagTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/IncludeTagTest.java?rev=439747&r1=439746&r2=439747&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/IncludeTagTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/IncludeTagTest.java Sun Sep  3 02:22:46 2006
@@ -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}.

Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/IteratorGeneratorTagTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/IteratorGeneratorTagTest.java?rev=439747&r1=439746&r2=439747&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/IteratorGeneratorTagTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/IteratorGeneratorTagTest.java Sun Sep  3 02:22:46 2006
@@ -21,6 +21,7 @@
 
 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;
 

Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/IteratorTagTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/IteratorTagTest.java?rev=439747&r1=439746&r2=439747&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/IteratorTagTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/IteratorTagTest.java Sun Sep  3 02:22:46 2006
@@ -17,16 +17,17 @@
  */
 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;
 
 
 /**

Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/MergeIteratorTagTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/MergeIteratorTagTest.java?rev=439747&r1=439746&r2=439747&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/MergeIteratorTagTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/MergeIteratorTagTest.java Sun Sep  3 02:22:46 2006
@@ -22,6 +22,7 @@
 import java.util.List;
 
 import org.apache.struts2.views.jsp.iterator.MergeIteratorTag;
+
 import com.opensymphony.xwork2.Action;
 import com.opensymphony.xwork2.ActionSupport;
 

Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/PortletUrlTagTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/PortletUrlTagTest.java?rev=439747&r1=439746&r2=439747&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/PortletUrlTagTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/PortletUrlTagTest.java Sun Sep  3 02:22:46 2006
@@ -26,7 +26,6 @@
 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 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 void testSetPortletMode() throws Exception  {
 	    
 	    PortletMode mode = PortletMode.HELP;
-	    WindowState state = WindowState.NORMAL;
-	    
-	    Mock mockSession = mock(PortletSession.class);
 	    
 		mockHttpReq.stubs().method("getQueryString").will(returnValue(""));
 

Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/PropertyTagTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/PropertyTagTest.java?rev=439747&r1=439746&r2=439747&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/PropertyTagTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/PropertyTagTest.java Sun Sep  3 02:22:46 2006
@@ -17,16 +17,17 @@
  */
 package org.apache.struts2.views.jsp;
 
-import com.mockobjects.servlet.MockJspWriter;
-import com.mockobjects.servlet.MockPageContext;
+import javax.servlet.jsp.JspException;
+
 import org.apache.struts2.ServletActionContext;
-import org.apache.struts2.StrutsTestCase;
 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 com.opensymphony.xwork2.ActionContext;
 import com.opensymphony.xwork2.util.OgnlValueStack;
-
-import javax.servlet.jsp.JspException;
 
 
 /**

Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/SortIteratorTagTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/SortIteratorTagTest.java?rev=439747&r1=439746&r2=439747&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/SortIteratorTagTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/SortIteratorTagTest.java Sun Sep  3 02:22:46 2006
@@ -17,16 +17,17 @@
  */
 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;
 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.

Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockBodyContent.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockBodyContent.java?rev=439747&r1=439746&r2=439747&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockBodyContent.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockBodyContent.java Sun Sep  3 02:22:46 2006
@@ -17,11 +17,12 @@
  */
 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;
 
 
 /**

Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockHttpServletRequest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockHttpServletRequest.java?rev=439747&r1=439746&r2=439747&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockHttpServletRequest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockHttpServletRequest.java Sun Sep  3 02:22:46 2006
@@ -17,12 +17,19 @@
  */
 package org.apache.struts2.views.jsp;
 
-import com.mockobjects.servlet.MockHttpServletRequest;
-import junit.framework.AssertionFailedError;
+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.http.HttpSession;
 import javax.servlet.RequestDispatcher;
-import java.util.*;
+import javax.servlet.http.HttpSession;
+
+import junit.framework.AssertionFailedError;
+
+import com.mockobjects.servlet.MockHttpServletRequest;
 
 
 /**

Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockHttpServletResponse.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockHttpServletResponse.java?rev=439747&r1=439746&r2=439747&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockHttpServletResponse.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockHttpServletResponse.java Sun Sep  3 02:22:46 2006
@@ -17,12 +17,12 @@
  */
 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;
 
 
 /**

Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockHttpSession.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockHttpSession.java?rev=439747&r1=439746&r2=439747&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockHttpSession.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockHttpSession.java Sun Sep  3 02:22:46 2006
@@ -17,10 +17,10 @@
  */
 package org.apache.struts2.views.jsp;
 
-import com.mockobjects.servlet.MockHttpSession;
-
 import java.util.Enumeration;
 import java.util.Hashtable;
+
+import com.mockobjects.servlet.MockHttpSession;
 
 
 /**



Mime
View raw message