Author: markt
Date: Wed Aug 4 22:29:39 2010
New Revision: 982422
URL: http://svn.apache.org/viewvc?rev=982422&view=rev
Log:
Remove redundant imports
(Bugzilla was down)
Modified:
tomcat/trunk/checkstyle.xml
tomcat/trunk/java/javax/persistence/PersistenceUnits.java
tomcat/trunk/java/javax/servlet/jsp/JspFactory.java
tomcat/trunk/java/javax/servlet/jsp/tagext/TagLibraryInfo.java
tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOnEntry.java
tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/SimpleCoordinator.java
tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java
tomcat/trunk/java/org/apache/catalina/valves/SSLValve.java
tomcat/trunk/java/org/apache/naming/resources/DirContextURLConnection.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Attribute.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/FieldOrMethod.java
tomcat/trunk/test/org/apache/catalina/core/TestStandardContextAliases.java
tomcat/trunk/test/org/apache/catalina/deploy/TestWebXmlOrdering.java
tomcat/trunk/test/org/apache/catalina/valves/TestRemoteIpValve.java
tomcat/trunk/test/org/apache/el/TestELEvaluation.java
tomcat/trunk/test/org/apache/naming/resources/TestProxyDirContext.java
tomcat/trunk/test/org/apache/tomcat/util/http/TestCookies.java
Modified: tomcat/trunk/checkstyle.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/checkstyle.xml?rev=982422&r1=982421&r2=982422&view=diff
==============================================================================
--- tomcat/trunk/checkstyle.xml (original)
+++ tomcat/trunk/checkstyle.xml Wed Aug 4 22:29:39 2010
@@ -31,8 +31,18 @@
<module name="IllegalInstantiation"/>
<!-- Imports -->
- <module name="IllegalImport"/>
<module name="AvoidStarImport"/>
+ <module name="AvoidStaticImport"/>
+ <module name="IllegalImport"/>
+ <!-- Will trigger ~600 errors
+ <module name="ImportOrder">
+ <property name="groups" value="java,javax,async,jsp2,junit,org,util"/>
+ <property name="ordered" value="true"/>
+ <property name="separated" value="true"/>
+ <property name="option" value="above"/>
+ </module>
+ -->
+ <module name="RedundantImport"/>
<!--
Do not use - does not take account of imports required for Javadocs
<module name="UnusedImports"/>
Modified: tomcat/trunk/java/javax/persistence/PersistenceUnits.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/persistence/PersistenceUnits.java?rev=982422&r1=982421&r2=982422&view=diff
==============================================================================
--- tomcat/trunk/java/javax/persistence/PersistenceUnits.java (original)
+++ tomcat/trunk/java/javax/persistence/PersistenceUnits.java Wed Aug 4
22:29:39 2010
@@ -22,7 +22,6 @@ import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.persistence.PersistenceUnit;
@Target({ElementType.TYPE})
@Retention(RetentionPolicy.RUNTIME)
Modified: tomcat/trunk/java/javax/servlet/jsp/JspFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/JspFactory.java?rev=982422&r1=982421&r2=982422&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/jsp/JspFactory.java (original)
+++ tomcat/trunk/java/javax/servlet/jsp/JspFactory.java Wed Aug 4 22:29:39 2010
@@ -20,7 +20,6 @@ import javax.servlet.Servlet;
import javax.servlet.ServletContext;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
-import javax.servlet.jsp.PageContext;
/**
* <p>
Modified: tomcat/trunk/java/javax/servlet/jsp/tagext/TagLibraryInfo.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/tagext/TagLibraryInfo.java?rev=982422&r1=982421&r2=982422&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/jsp/tagext/TagLibraryInfo.java (original)
+++ tomcat/trunk/java/javax/servlet/jsp/tagext/TagLibraryInfo.java Wed Aug 4
22:29:39 2010
@@ -16,8 +16,6 @@
*/
package javax.servlet.jsp.tagext;
-import javax.servlet.jsp.tagext.TagInfo;
-import javax.servlet.jsp.tagext.TagFileInfo;
/**
* Translation-time information associated with a taglib directive, and its
Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOnEntry.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOnEntry.java?rev=982422&r1=982421&r2=982422&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOnEntry.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOnEntry.java
Wed Aug 4 22:29:39 2010
@@ -19,7 +19,6 @@ package org.apache.catalina.authenticato
import java.security.Principal;
import org.apache.catalina.Session;
-import org.apache.catalina.authenticator.Constants;
/**
* A class that represents entries in the cache of authenticated users.
Modified: tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java?rev=982422&r1=982421&r2=982422&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java Wed
Aug 4 22:29:39 2010
@@ -19,18 +19,18 @@
package org.apache.catalina.core;
+import java.io.IOException;
+import java.io.InputStream;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
-import java.util.Map;
-import java.util.Properties;
import java.security.AccessController;
import java.security.PrivilegedAction;
-import java.security.PrivilegedExceptionAction;
import java.security.PrivilegedActionException;
-import java.io.InputStream;
-import java.io.IOException;
+import java.security.PrivilegedExceptionAction;
+import java.util.Map;
+import java.util.Properties;
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
@@ -40,16 +40,15 @@ import javax.naming.Context;
import javax.naming.NamingException;
import javax.persistence.PersistenceContext;
import javax.persistence.PersistenceUnit;
-import javax.xml.ws.WebServiceRef;
import javax.servlet.Filter;
import javax.servlet.Servlet;
+import javax.xml.ws.WebServiceRef;
-import org.apache.catalina.security.SecurityUtil;
import org.apache.catalina.ContainerServlet;
import org.apache.catalina.Globals;
-import org.apache.catalina.core.Constants;
-import org.apache.tomcat.util.res.StringManager;
+import org.apache.catalina.security.SecurityUtil;
import org.apache.tomcat.InstanceManager;
+import org.apache.tomcat.util.res.StringManager;
/**
* @version $Id$
Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java?rev=982422&r1=982421&r2=982422&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
Wed Aug 4 22:29:39 2010
@@ -27,18 +27,17 @@ import org.apache.catalina.Host;
import org.apache.catalina.LifecycleException;
import org.apache.catalina.Manager;
import org.apache.catalina.Session;
+import org.apache.catalina.connector.Request;
+import org.apache.catalina.connector.Response;
import org.apache.catalina.ha.CatalinaCluster;
import org.apache.catalina.ha.ClusterManager;
import org.apache.catalina.ha.ClusterMessage;
import org.apache.catalina.ha.ClusterValve;
-import org.apache.catalina.ha.session.DeltaSession;
-import org.apache.catalina.connector.Request;
-import org.apache.catalina.connector.Response;
import org.apache.catalina.session.ManagerBase;
import org.apache.catalina.session.PersistentManager;
import org.apache.catalina.util.LifecycleBase;
-import org.apache.tomcat.util.res.StringManager;
import org.apache.catalina.valves.ValveBase;
+import org.apache.tomcat.util.res.StringManager;
/**
* Valve to handle Tomcat jvmRoute takeover using mod_jk module after node
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/SimpleCoordinator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/SimpleCoordinator.java?rev=982422&r1=982421&r2=982422&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/SimpleCoordinator.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/SimpleCoordinator.java
Wed Aug 4 22:29:39 2010
@@ -15,9 +15,8 @@
*/
package org.apache.catalina.tribes.group.interceptors;
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
-
import java.util.Arrays;
+import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.catalina.tribes.ChannelException;
@@ -79,7 +78,7 @@ public class SimpleCoordinator extends C
stableCount++;
}
try {
- MILLISECONDS.sleep(250);
+ TimeUnit.MILLISECONDS.sleep(250);
} catch (final InterruptedException e) {
Thread.currentThread().interrupt();
}
Modified: tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java?rev=982422&r1=982421&r2=982422&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java Wed Aug 4
22:29:39 2010
@@ -28,14 +28,11 @@ import java.util.regex.PatternSyntaxExce
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
-import org.apache.tomcat.util.res.StringManager;
import org.apache.catalina.connector.Request;
import org.apache.catalina.connector.Response;
-import org.apache.catalina.valves.Constants;
-import org.apache.catalina.valves.RequestFilterValve;
-import org.apache.catalina.valves.ValveBase;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
+import org.apache.tomcat.util.res.StringManager;
/**
* <p>
Modified: tomcat/trunk/java/org/apache/catalina/valves/SSLValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/SSLValve.java?rev=982422&r1=982421&r2=982422&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/valves/SSLValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/valves/SSLValve.java Wed Aug 4
22:29:39 2010
@@ -17,15 +17,13 @@
package org.apache.catalina.valves;
-import java.io.IOException;
import java.io.ByteArrayInputStream;
-
+import java.io.IOException;
import java.security.cert.CertificateFactory;
import java.security.cert.X509Certificate;
import javax.servlet.ServletException;
-import org.apache.catalina.valves.ValveBase;
import org.apache.catalina.connector.Request;
import org.apache.catalina.connector.Response;
Modified:
tomcat/trunk/java/org/apache/naming/resources/DirContextURLConnection.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/resources/DirContextURLConnection.java?rev=982422&r1=982421&r2=982422&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/resources/DirContextURLConnection.java
(original)
+++ tomcat/trunk/java/org/apache/naming/resources/DirContextURLConnection.java
Wed Aug 4 22:29:39 2010
@@ -17,11 +17,11 @@
package org.apache.naming.resources;
-import java.net.URL;
-import java.net.URLConnection;
+import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
-import java.io.FileNotFoundException;
+import java.net.URL;
+import java.net.URLConnection;
import java.security.Permission;
import java.util.ArrayList;
import java.util.Collections;
@@ -31,15 +31,15 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Vector;
-import javax.naming.NamingException;
-import javax.naming.NamingEnumeration;
+
import javax.naming.NameClassPair;
-import javax.naming.directory.DirContext;
+import javax.naming.NamingEnumeration;
+import javax.naming.NamingException;
import javax.naming.directory.Attribute;
import javax.naming.directory.Attributes;
+import javax.naming.directory.DirContext;
+
import org.apache.naming.JndiPermission;
-import org.apache.naming.resources.Resource;
-import org.apache.naming.resources.ResourceAttributes;
import org.apache.tomcat.util.http.FastHttpDateFormat;
/**
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Attribute.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Attribute.java?rev=982422&r1=982421&r2=982422&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Attribute.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Attribute.java Wed
Aug 4 22:29:39 2010
@@ -23,8 +23,8 @@ import java.io.IOException;
import java.io.Serializable;
import java.util.HashMap;
import java.util.Map;
+
import org.apache.tomcat.util.bcel.Constants;
-import org.apache.tomcat.util.bcel.classfile.ConstantUtf8;
/**
* Abstract super class for <em>Attribute</em> objects. Currently the
Modified:
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/FieldOrMethod.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/FieldOrMethod.java?rev=982422&r1=982421&r2=982422&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/FieldOrMethod.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/FieldOrMethod.java
Wed Aug 4 22:29:39 2010
@@ -19,8 +19,8 @@ package org.apache.tomcat.util.bcel.clas
import java.io.DataInputStream;
import java.io.IOException;
+
import org.apache.tomcat.util.bcel.Constants;
-import org.apache.tomcat.util.bcel.classfile.Attribute;
/**
* Abstract super class for fields and methods.
Modified:
tomcat/trunk/test/org/apache/catalina/core/TestStandardContextAliases.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestStandardContextAliases.java?rev=982422&r1=982421&r2=982422&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/core/TestStandardContextAliases.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/core/TestStandardContextAliases.java
Wed Aug 4 22:29:39 2010
@@ -28,7 +28,6 @@ import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.catalina.core.StandardContext;
import org.apache.catalina.startup.Tomcat;
import org.apache.catalina.startup.TomcatBaseTest;
import org.apache.tomcat.util.buf.ByteChunk;
Modified: tomcat/trunk/test/org/apache/catalina/deploy/TestWebXmlOrdering.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/deploy/TestWebXmlOrdering.java?rev=982422&r1=982421&r2=982422&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/deploy/TestWebXmlOrdering.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/deploy/TestWebXmlOrdering.java Wed
Aug 4 22:29:39 2010
@@ -23,8 +23,6 @@ import java.util.Iterator;
import java.util.Map;
import java.util.Set;
-import org.apache.catalina.deploy.WebXml;
-
import junit.framework.TestCase;
/**
Modified: tomcat/trunk/test/org/apache/catalina/valves/TestRemoteIpValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/valves/TestRemoteIpValve.java?rev=982422&r1=982421&r2=982422&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/valves/TestRemoteIpValve.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/valves/TestRemoteIpValve.java Wed Aug
4 22:29:39 2010
@@ -28,7 +28,6 @@ import junit.framework.TestCase;
import org.apache.catalina.connector.Request;
import org.apache.catalina.connector.Response;
-import org.apache.catalina.valves.ValveBase;
/**
* {...@link RemoteIpValve} Tests
Modified: tomcat/trunk/test/org/apache/el/TestELEvaluation.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/el/TestELEvaluation.java?rev=982422&r1=982421&r2=982422&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/el/TestELEvaluation.java (original)
+++ tomcat/trunk/test/org/apache/el/TestELEvaluation.java Wed Aug 4 22:29:39
2010
@@ -22,16 +22,15 @@ import java.lang.reflect.Method;
import java.util.Date;
import javax.el.ELException;
-import javax.el.ValueExpression;
import javax.el.FunctionMapper;
+import javax.el.ValueExpression;
+
+import junit.framework.TestCase;
-import org.apache.el.ExpressionFactoryImpl;
import org.apache.el.lang.ELSupport;
import org.apache.jasper.compiler.TestAttributeParser;
import org.apache.jasper.el.ELContextImpl;
-import junit.framework.TestCase;
-
/**
* Tests the EL engine directly. Similar tests may be found in
* {...@link TestAttributeParser} and {...@link TestELInJsp}.
Modified: tomcat/trunk/test/org/apache/naming/resources/TestProxyDirContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/naming/resources/TestProxyDirContext.java?rev=982422&r1=982421&r2=982422&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/naming/resources/TestProxyDirContext.java
(original)
+++ tomcat/trunk/test/org/apache/naming/resources/TestProxyDirContext.java Wed
Aug 4 22:29:39 2010
@@ -21,7 +21,6 @@ import javax.naming.NameNotFoundExceptio
import org.apache.catalina.core.StandardContext;
import org.apache.catalina.startup.Tomcat;
import org.apache.catalina.startup.TomcatBaseTest;
-import org.apache.naming.resources.ProxyDirContext;
/**
* Unit test for the {...@link ProxyDirContext}.
Modified: tomcat/trunk/test/org/apache/tomcat/util/http/TestCookies.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/http/TestCookies.java?rev=982422&r1=982421&r2=982422&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/util/http/TestCookies.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/util/http/TestCookies.java Wed Aug 4
22:29:39 2010
@@ -17,16 +17,11 @@
package org.apache.tomcat.util.http;
-import org.apache.tomcat.util.http.Cookies;
-import org.apache.tomcat.util.http.ServerCookie;
-
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
import junit.textui.TestRunner;
-import java.lang.Exception;
-
public class TestCookies extends TestCase {
public static void main( String args[] ) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
