Author: jmitchell
Date: Mon Oct 9 17:02:56 2006
New Revision: 454565
URL: http://svn.apache.org/viewvc?view=rev&rev=454565
Log:
WW-1453
Simple cleanup items
- remove duplicate and/or unused imports
- change static access to class, not instance
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Bean.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Component.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Date.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Debug.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/IteratorComponent.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Push.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Set.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Text.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/StrutsXmlConfigurationProvider.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ServletRedirectResult.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/SessionMap.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/VelocityResult.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/TokenSessionStoreInterceptor.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr168Dispatcher.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/result/PortletVelocityResult.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/InvocationSessionStore.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/Sorter.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerResult.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/CheckboxListModel.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/StrutsModels.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/StrutsBodyTagSupport.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/TagUtils.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/util/ContextUtil.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/VelocityManager.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/StringAdapter.java
struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/ServletActionRedirectResultTest.java
struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/ServletRedirectResultTest.java
struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/SessionMapTest.java
struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/StrutsResultSupportTest.java
struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/VelocityResultTest.java
struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java
struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/TokenInterceptorTest.java
struts/struts2/trunk/core/src/test/java/org/apache/struts2/portlet/util/StrutsUtilTest.java
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ActionTagTest.java
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ElseIfTagTest.java
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ElseTagTest.java
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/TextTagTest.java
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/MockTag.java
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/util/ContextUtilTest.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Bean.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Bean.java?view=diff&rev=454565&r1=454564&r2=454565
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Bean.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Bean.java
Mon Oct 9 17:02:56 2006
@@ -26,7 +26,6 @@
import com.opensymphony.xwork2.ObjectFactory;
import com.opensymphony.xwork2.util.OgnlUtil;
import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.util.ValueStack;
/**
* <!-- START SNIPPET: javadoc -->
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Component.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Component.java?view=diff&rev=454565&r1=454564&r2=454565
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Component.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Component.java
Mon Oct 9 17:02:56 2006
@@ -39,7 +39,6 @@
import com.opensymphony.xwork2.util.ValueStack;
import com.opensymphony.xwork2.util.TextParseUtil;
-import com.opensymphony.xwork2.util.ValueStack;
/**
* Base class to extend for UI components.
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Date.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Date.java?view=diff&rev=454565&r1=454564&r2=454565
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Date.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Date.java
Mon Oct 9 17:02:56 2006
@@ -31,7 +31,6 @@
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.TextProvider;
import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.util.ValueStack;
/**
* <!-- START SNIPPET: javadoc -->
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Debug.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Debug.java?view=diff&rev=454565&r1=454564&r2=454565
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Debug.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Debug.java
Mon Oct 9 17:02:56 2006
@@ -13,7 +13,6 @@
import com.opensymphony.xwork2.util.OgnlUtil;
import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.util.ValueStack;
/**
* <!-- START SNIPPET: javadoc -->
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/IteratorComponent.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/IteratorComponent.java?view=diff&rev=454565&r1=454564&r2=454565
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/IteratorComponent.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/IteratorComponent.java
Mon Oct 9 17:02:56 2006
@@ -24,7 +24,6 @@
import org.apache.struts2.views.jsp.IteratorStatus;
import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.util.ValueStack;
/**
* <!-- START SNIPPET: javadoc -->
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Push.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Push.java?view=diff&rev=454565&r1=454564&r2=454565
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Push.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Push.java
Mon Oct 9 17:02:56 2006
@@ -20,7 +20,6 @@
import java.io.Writer;
import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.util.ValueStack;
/**
* <!-- START SNIPPET: javadoc -->
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Set.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Set.java?view=diff&rev=454565&r1=454564&r2=454565
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Set.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Set.java
Mon Oct 9 17:02:56 2006
@@ -20,7 +20,6 @@
import java.io.Writer;
import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.util.ValueStack;
/**
* <!-- START SNIPPET: javadoc -->
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Text.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Text.java?view=diff&rev=454565&r1=454564&r2=454565
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Text.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Text.java
Mon Oct 9 17:02:56 2006
@@ -30,7 +30,6 @@
import com.opensymphony.xwork2.util.TextUtils;
import com.opensymphony.xwork2.util.ValueStack;
import com.opensymphony.xwork2.TextProvider;
-import com.opensymphony.xwork2.util.ValueStack;
/**
* <!-- START SNIPPET: javadoc -->
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/StrutsXmlConfigurationProvider.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/StrutsXmlConfigurationProvider.java?view=diff&rev=454565&r1=454564&r2=454565
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/StrutsXmlConfigurationProvider.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/StrutsXmlConfigurationProvider.java
Mon Oct 9 17:02:56 2006
@@ -4,10 +4,7 @@
package org.apache.struts2.config;
import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
import java.io.IOException;
-import java.io.InputStream;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.ArrayList;
@@ -18,7 +15,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.struts2.StrutsException;
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.config.providers.XmlConfigurationProvider;
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java?view=diff&rev=454565&r1=454564&r2=454565
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java
Mon Oct 9 17:02:56 2006
@@ -51,7 +51,6 @@
import com.opensymphony.xwork2.util.ClassLoaderUtil;
import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.XWorkException;
/**
* Master filter for Struts that handles four distinct
@@ -221,7 +220,7 @@
mapper = ActionMapperFactory.getMapper();
mapping = mapper.getMapping(request, du.getConfigurationManager());
} catch (Exception ex) {
- du.sendError(request, response, servletContext,
response.SC_INTERNAL_SERVER_ERROR, ex);
+ du.sendError(request, response, servletContext,
HttpServletResponse.SC_INTERNAL_SERVER_ERROR, ex);
ActionContextCleanUp.cleanUp(req);
return;
}
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ServletRedirectResult.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ServletRedirectResult.java?view=diff&rev=454565&r1=454564&r2=454565
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ServletRedirectResult.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ServletRedirectResult.java
Mon Oct 9 17:02:56 2006
@@ -24,7 +24,6 @@
import org.apache.commons.logging.LogFactory;
import org.apache.struts2.ServletActionContext;
import org.apache.struts2.dispatcher.mapper.ActionMapperFactory;
-import org.springframework.beans.factory.config.SetFactoryBean;
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionInvocation;
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/SessionMap.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/SessionMap.java?view=diff&rev=454565&r1=454564&r2=454565
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/SessionMap.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/SessionMap.java
Mon Oct 9 17:02:56 2006
@@ -19,11 +19,9 @@
import java.io.Serializable;
import java.util.AbstractMap;
-import java.util.Arrays;
import java.util.Collections;
import java.util.Enumeration;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.Map;
import java.util.Set;
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/VelocityResult.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/VelocityResult.java?view=diff&rev=454565&r1=454564&r2=454565
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/VelocityResult.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/VelocityResult.java
Mon Oct 9 17:02:56 2006
@@ -41,7 +41,6 @@
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.util.ValueStack;
/**
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/TokenSessionStoreInterceptor.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/TokenSessionStoreInterceptor.java?view=diff&rev=454565&r1=454564&r2=454565
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/TokenSessionStoreInterceptor.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/TokenSessionStoreInterceptor.java
Mon Oct 9 17:02:56 2006
@@ -29,7 +29,6 @@
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.Result;
import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.util.ValueStack;
/**
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr168Dispatcher.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr168Dispatcher.java?view=diff&rev=454565&r1=454564&r2=454565
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr168Dispatcher.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr168Dispatcher.java
Mon Oct 9 17:02:56 2006
@@ -61,7 +61,6 @@
import com.opensymphony.xwork2.ActionProxyFactory;
import com.opensymphony.xwork2.ObjectFactory;
import com.opensymphony.xwork2.config.ConfigurationException;
-import com.opensymphony.xwork2.config.Configuration;
import com.opensymphony.xwork2.util.LocalizedTextUtil;
/**
@@ -169,8 +168,6 @@
private Dispatcher dispatcherUtils;
- private boolean devMode = false;
-
/**
* Initialize the portlet with the init parameters from
<tt>portlet.xml</tt>
*/
@@ -212,7 +209,6 @@
}
if
("true".equalsIgnoreCase(Settings.get(StrutsConstants.STRUTS_DEVMODE))) {
- devMode = true;
Settings.set(StrutsConstants.STRUTS_I18N_RELOAD, "true");
Settings.set(StrutsConstants.STRUTS_CONFIGURATION_XML_RELOAD,
"true");
}
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/result/PortletVelocityResult.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/result/PortletVelocityResult.java?view=diff&rev=454565&r1=454564&r2=454565
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/result/PortletVelocityResult.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/result/PortletVelocityResult.java
Mon Oct 9 17:02:56 2006
@@ -48,7 +48,6 @@
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.util.ValueStack;
/**
* <!-- START SNIPPET: description -->
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/InvocationSessionStore.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/InvocationSessionStore.java?view=diff&rev=454565&r1=454564&r2=454565
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/InvocationSessionStore.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/InvocationSessionStore.java
Mon Oct 9 17:02:56 2006
@@ -24,7 +24,6 @@
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.util.ValueStack;
/**
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/Sorter.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/Sorter.java?view=diff&rev=454565&r1=454564&r2=454565
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/Sorter.java
(original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/Sorter.java
Mon Oct 9 17:02:56 2006
@@ -20,7 +20,6 @@
import java.util.Comparator;
import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.util.ValueStack;
import com.opensymphony.xwork2.util.ValueStackFactory;
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java?view=diff&rev=454565&r1=454564&r2=454565
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java
Mon Oct 9 17:02:56 2006
@@ -40,7 +40,6 @@
import com.opensymphony.xwork2.util.FileManager;
import com.opensymphony.xwork2.util.ValueStack;
import com.opensymphony.xwork2.ObjectFactory;
-import com.opensymphony.xwork2.util.ValueStack;
import freemarker.cache.FileTemplateLoader;
import freemarker.cache.MultiTemplateLoader;
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerResult.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerResult.java?view=diff&rev=454565&r1=454564&r2=454565
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerResult.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerResult.java
Mon Oct 9 17:02:56 2006
@@ -33,7 +33,6 @@
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.LocaleProvider;
import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.util.ValueStack;
import freemarker.template.Configuration;
import freemarker.template.ObjectWrapper;
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/CheckboxListModel.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/CheckboxListModel.java?view=diff&rev=454565&r1=454564&r2=454565
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/CheckboxListModel.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/CheckboxListModel.java
Mon Oct 9 17:02:56 2006
@@ -24,7 +24,6 @@
import org.apache.struts2.components.Component;
import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.util.ValueStack;
/**
* @see CheckboxList
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/StrutsModels.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/StrutsModels.java?view=diff&rev=454565&r1=454564&r2=454565
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/StrutsModels.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/StrutsModels.java
Mon Oct 9 17:02:56 2006
@@ -21,7 +21,6 @@
import javax.servlet.http.HttpServletResponse;
import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.util.ValueStack;
/**
* Provides @s.tag access for various tags.
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/StrutsBodyTagSupport.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/StrutsBodyTagSupport.java?view=diff&rev=454565&r1=454564&r2=454565
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/StrutsBodyTagSupport.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/StrutsBodyTagSupport.java
Mon Oct 9 17:02:56 2006
@@ -25,7 +25,6 @@
import org.apache.struts2.views.util.ContextUtil;
import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.util.ValueStack;
/**
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/TagUtils.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/TagUtils.java?view=diff&rev=454565&r1=454564&r2=454565
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/TagUtils.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/TagUtils.java
Mon Oct 9 17:02:56 2006
@@ -37,7 +37,6 @@
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.util.ValueStack;
import com.opensymphony.xwork2.util.ValueStackFactory;
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/util/ContextUtil.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/util/ContextUtil.java?view=diff&rev=454565&r1=454564&r2=454565
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/util/ContextUtil.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/util/ContextUtil.java
Mon Oct 9 17:02:56 2006
@@ -31,7 +31,6 @@
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.util.ValueStack;
/**
* Value Stack's Context related Utilities.
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/VelocityManager.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/VelocityManager.java?view=diff&rev=454565&r1=454564&r2=454565
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/VelocityManager.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/VelocityManager.java
Mon Oct 9 17:02:56 2006
@@ -93,7 +93,6 @@
import com.opensymphony.xwork2.ObjectFactory;
import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.util.ValueStack;
/**
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?view=diff&rev=454565&r1=454564&r2=454565
==============================================================================
---
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
Mon Oct 9 17:02:56 2006
@@ -17,19 +17,16 @@
*/
package org.apache.struts2.views.xslt;
-import java.io.IOException;
import java.io.StringReader;
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.InputSource;
-import org.xml.sax.SAXException;
import com.opensymphony.xwork2.util.DomHelper;
Modified:
struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/ServletActionRedirectResultTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/ServletActionRedirectResultTest.java?view=diff&rev=454565&r1=454564&r2=454565
==============================================================================
---
struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/ServletActionRedirectResultTest.java
(original)
+++
struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/ServletActionRedirectResultTest.java
Mon Oct 9 17:02:56 2006
@@ -33,7 +33,6 @@
import com.opensymphony.xwork2.config.entities.ActionConfig;
import com.opensymphony.xwork2.config.entities.ResultConfig;
import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.util.ValueStack;
/**
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?view=diff&rev=454565&r1=454564&r2=454565
==============================================================================
---
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
Mon Oct 9 17:02:56 2006
@@ -37,7 +37,6 @@
import com.opensymphony.xwork2.config.ConfigurationManager;
import com.opensymphony.xwork2.config.entities.PackageConfig;
import com.opensymphony.xwork2.mock.MockActionInvocation;
-import com.opensymphony.xwork2.util.ValueStack;
import com.opensymphony.xwork2.util.ValueStackFactory;
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?view=diff&rev=454565&r1=454564&r2=454565
==============================================================================
---
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
Mon Oct 9 17:02:56 2006
@@ -18,7 +18,6 @@
package org.apache.struts2.dispatcher;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Collections;
import java.util.Enumeration;
import java.util.HashMap;
@@ -33,7 +32,6 @@
import com.mockobjects.constraint.Constraint;
import com.mockobjects.constraint.IsAnything;
import com.mockobjects.constraint.IsEqual;
-import com.mockobjects.dynamic.ConstraintMatcher;
import com.mockobjects.dynamic.Mock;
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?view=diff&rev=454565&r1=454564&r2=454565
==============================================================================
---
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
Mon Oct 9 17:02:56 2006
@@ -23,7 +23,6 @@
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.ActionSupport;
import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.util.ValueStack;
import com.opensymphony.xwork2.util.ValueStackFactory;
/**
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?view=diff&rev=454565&r1=454564&r2=454565
==============================================================================
---
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
Mon Oct 9 17:02:56 2006
@@ -29,7 +29,6 @@
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.ActionProxy;
import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.util.ValueStack;
import com.opensymphony.xwork2.util.ValueStackFactory;
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?view=diff&rev=454565&r1=454564&r2=454565
==============================================================================
---
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
Mon Oct 9 17:02:56 2006
@@ -25,7 +25,6 @@
import org.apache.struts2.dispatcher.ServletRedirectResult;
import org.apache.struts2.views.jsp.StrutsMockHttpServletRequest;
-import com.mockobjects.dynamic.Mock;
import com.mockobjects.servlet.MockHttpServletRequest;
import com.opensymphony.xwork2.Result;
import com.opensymphony.xwork2.config.Configuration;
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?view=diff&rev=454565&r1=454564&r2=454565
==============================================================================
---
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
Mon Oct 9 17:02:56 2006
@@ -35,7 +35,6 @@
import com.opensymphony.xwork2.ActionProxy;
import com.opensymphony.xwork2.ActionProxyFactory;
import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.util.ValueStack;
import com.opensymphony.xwork2.util.ValueStackFactory;
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?view=diff&rev=454565&r1=454564&r2=454565
==============================================================================
---
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
Mon Oct 9 17:02:56 2006
@@ -33,7 +33,6 @@
import org.springframework.mock.web.MockRequestDispatcher;
import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.util.ValueStack;
import com.opensymphony.xwork2.util.ValueStackFactory;
/**
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?view=diff&rev=454565&r1=454564&r2=454565
==============================================================================
---
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
Mon Oct 9 17:02:56 2006
@@ -32,7 +32,6 @@
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.ActionProxy;
import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.util.ValueStack;
import com.opensymphony.xwork2.util.ValueStackFactory;
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?view=diff&rev=454565&r1=454564&r2=454565
==============================================================================
---
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
Mon Oct 9 17:02:56 2006
@@ -27,7 +27,6 @@
import com.mockobjects.servlet.MockJspWriter;
import com.mockobjects.servlet.MockPageContext;
import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.util.ValueStack;
import com.opensymphony.xwork2.util.ValueStackFactory;
/**
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?view=diff&rev=454565&r1=454564&r2=454565
==============================================================================
---
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
Mon Oct 9 17:02:56 2006
@@ -27,7 +27,6 @@
import com.mockobjects.servlet.MockJspWriter;
import com.mockobjects.servlet.MockPageContext;
import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.util.ValueStack;
import com.opensymphony.xwork2.util.ValueStackFactory;
Modified:
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/TextTagTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/TextTagTest.java?view=diff&rev=454565&r1=454564&r2=454565
==============================================================================
---
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/TextTagTest.java
(original)
+++
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/TextTagTest.java
Mon Oct 9 17:02:56 2006
@@ -37,7 +37,6 @@
import com.opensymphony.xwork2.Action;
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.util.ValueStack;
import com.opensymphony.xwork2.util.ValueStackFactory;
Modified:
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/MockTag.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/MockTag.java?view=diff&rev=454565&r1=454564&r2=454565
==============================================================================
---
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/MockTag.java
(original)
+++
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/MockTag.java
Mon Oct 9 17:02:56 2006
@@ -95,7 +95,7 @@
}
public Map getParameters() {
- return this.params;
+ return MockTag.params;
}
public void setString(String s) {
@@ -107,7 +107,7 @@
}
public void addParameter(String key, Object value) {
- this.params.put(key, value);
+ MockTag.params.put(key, value);
}
/**
Modified:
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/util/ContextUtilTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/util/ContextUtilTest.java?view=diff&rev=454565&r1=454564&r2=454565
==============================================================================
---
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/util/ContextUtilTest.java
(original)
+++
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/util/ContextUtilTest.java
Mon Oct 9 17:02:56 2006
@@ -23,7 +23,6 @@
import org.apache.struts2.config.Settings;
import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.util.ValueStack;
import com.opensymphony.xwork2.util.ValueStackFactory;
/**
