From e1f180d4645fa78b7e4b1449ecc8a8880f0101ea Mon Sep 17 00:00:00 2001 From: markt Date: Sun, 22 Aug 2010 15:34:34 +0000 Subject: [PATCH] Code clean-up. No functional change. Extend Checkstyle checks to import order. Use Eclipse tooling to fix current code base. git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@987920 13f79535-47bb-0310-9956-ffa450edef68 --- checkstyle.xml | 2 -- java/javax/servlet/ServletRequest.java | 1 + java/javax/servlet/ServletResponse.java | 1 + java/javax/servlet/jsp/PageContext.java | 2 -- java/org/apache/catalina/Container.java | 3 ++- java/org/apache/catalina/Context.java | 5 ++--- java/org/apache/catalina/InstanceEvent.java | 1 + java/org/apache/catalina/Valve.java | 1 + .../apache/catalina/ant/AbstractCatalinaTask.java | 1 + .../catalina/ant/BaseRedirectorHelperTask.java | 1 + .../catalina/authenticator/AuthenticatorBase.java | 2 +- .../authenticator/DigestAuthenticator.java | 1 - .../catalina/authenticator/SSLAuthenticator.java | 2 +- .../catalina/authenticator/SingleSignOn.java | 2 +- java/org/apache/catalina/comet/CometProcessor.java | 2 +- java/org/apache/catalina/connector/Connector.java | 2 +- .../apache/catalina/connector/CoyoteAdapter.java | 2 +- .../org/apache/catalina/connector/InputBuffer.java | 2 +- .../apache/catalina/connector/MapperListener.java | 2 -- .../apache/catalina/connector/OutputBuffer.java | 2 +- java/org/apache/catalina/connector/Request.java | 4 ++-- .../apache/catalina/connector/RequestFacade.java | 4 +--- java/org/apache/catalina/connector/Response.java | 2 +- .../apache/catalina/connector/ResponseFacade.java | 2 +- .../apache/catalina/core/ApplicationContext.java | 4 ++-- .../catalina/core/ApplicationFilterConfig.java | 2 +- .../catalina/core/ApplicationHttpRequest.java | 2 +- .../ApplicationJspPropertyGroupDescriptor.java | 1 + .../apache/catalina/core/AprLifecycleListener.java | 4 ++-- java/org/apache/catalina/core/ContainerBase.java | 2 +- java/org/apache/catalina/core/JasperListener.java | 2 +- .../catalina/core/NamingContextListener.java | 2 +- .../apache/catalina/core/StandardContextValve.java | 2 +- .../apache/catalina/core/StandardEngineValve.java | 2 +- .../apache/catalina/core/StandardHostValve.java | 2 +- java/org/apache/catalina/core/StandardServer.java | 4 ++-- java/org/apache/catalina/core/StandardService.java | 8 +++++--- java/org/apache/catalina/core/StandardWrapper.java | 5 ++--- .../apache/catalina/core/StandardWrapperValve.java | 2 +- .../org/apache/catalina/deploy/ContextHandler.java | 2 +- .../org/apache/catalina/deploy/ContextService.java | 2 +- java/org/apache/catalina/deploy/ErrorPage.java | 3 ++- java/org/apache/catalina/deploy/FilterDef.java | 2 +- java/org/apache/catalina/deploy/FilterMap.java | 3 ++- java/org/apache/catalina/deploy/LoginConfig.java | 3 ++- .../apache/catalina/deploy/NamingResources.java | 2 +- java/org/apache/catalina/deploy/ResourceBase.java | 4 ++-- .../apache/catalina/deploy/SecurityCollection.java | 4 ++-- java/org/apache/catalina/deploy/ServletDef.java | 2 +- java/org/apache/catalina/deploy/WebXml.java | 2 +- .../org/apache/catalina/filters/ExpiresFilter.java | 1 + java/org/apache/catalina/ha/ClusterDeployer.java | 3 ++- java/org/apache/catalina/ha/ClusterManager.java | 3 ++- java/org/apache/catalina/ha/ClusterMessage.java | 1 + java/org/apache/catalina/ha/ClusterSession.java | 3 ++- .../ha/authenticator/ClusterSingleSignOn.java | 2 +- .../authenticator/ClusterSingleSignOnListener.java | 4 ++-- .../apache/catalina/ha/backend/CollectedInfo.java | 7 ++++--- .../catalina/ha/backend/MultiCastSender.java | 12 +++++------ java/org/apache/catalina/ha/backend/TcpSender.java | 6 +++--- .../catalina/ha/context/ReplicatedContext.java | 23 +++++++++++----------- .../apache/catalina/ha/deploy/FarmWarDeployer.java | 4 ++-- .../org/apache/catalina/ha/deploy/FileMessage.java | 2 +- .../catalina/ha/deploy/FileMessageFactory.java | 4 ++-- .../apache/catalina/ha/deploy/UndeployMessage.java | 3 ++- java/org/apache/catalina/ha/deploy/WarWatcher.java | 2 +- .../apache/catalina/ha/session/BackupManager.java | 3 +-- .../catalina/ha/session/ClusterManagerBase.java | 12 +++++------ .../apache/catalina/ha/session/DeltaManager.java | 2 +- .../apache/catalina/ha/session/DeltaRequest.java | 6 +++--- .../apache/catalina/ha/session/DeltaSession.java | 13 ++++++------ .../session/JvmRouteSessionIDBinderListener.java | 2 +- .../catalina/ha/session/SerializablePrincipal.java | 2 -- .../apache/catalina/ha/tcp/ReplicationValve.java | 15 +++++++------- .../apache/catalina/ha/tcp/SimpleTcpCluster.java | 14 ++++++------- .../apache/catalina/loader/WebappClassLoader.java | 4 ++-- java/org/apache/catalina/loader/WebappLoader.java | 2 +- .../apache/catalina/manager/JMXProxyServlet.java | 7 ++++--- .../apache/catalina/manager/ManagerServlet.java | 2 +- .../catalina/manager/StatusManagerServlet.java | 2 +- .../catalina/manager/host/HostManagerServlet.java | 4 ++-- .../mbeans/GlobalResourcesLifecycleListener.java | 2 ++ .../mbeans/JmxRemoteLifecycleListener.java | 2 +- .../catalina/mbeans/ServerLifecycleListener.java | 1 + java/org/apache/catalina/realm/CombinedRealm.java | 1 - .../org/apache/catalina/realm/DataSourceRealm.java | 2 +- .../apache/catalina/realm/JAASCallbackHandler.java | 1 + java/org/apache/catalina/realm/JNDIRealm.java | 11 ++++++----- java/org/apache/catalina/realm/MemoryRealm.java | 3 ++- java/org/apache/catalina/realm/RealmBase.java | 4 ++-- .../apache/catalina/security/SecurityConfig.java | 1 + .../apache/catalina/servlets/DefaultServlet.java | 2 +- java/org/apache/catalina/session/JDBCStore.java | 16 +++++++-------- java/org/apache/catalina/session/ManagerBase.java | 6 +++--- .../catalina/session/PersistentManagerBase.java | 3 +-- .../apache/catalina/session/StandardManager.java | 5 +++-- .../apache/catalina/session/StandardSession.java | 5 ++--- .../catalina/ssi/ByteArrayServletOutputStream.java | 1 + java/org/apache/catalina/ssi/SSIExec.java | 1 + java/org/apache/catalina/ssi/SSIFlastmod.java | 1 + java/org/apache/catalina/ssi/SSIMediator.java | 1 + java/org/apache/catalina/ssi/SSIProcessor.java | 1 + java/org/apache/catalina/ssi/SSIServlet.java | 1 + .../catalina/ssi/SSIServletExternalResolver.java | 1 + .../apache/catalina/ssi/SSIServletRequestUtil.java | 1 + .../catalina/startup/ClusterRuleSetFactory.java | 7 +++---- .../catalina/startup/ConnectorCreateRule.java | 13 ++++++------ .../org/apache/catalina/startup/ContextConfig.java | 20 +++++++++---------- .../startup/CopyParentClassLoaderRule.java | 1 + java/org/apache/catalina/startup/Embedded.java | 2 +- java/org/apache/catalina/startup/ExpandWar.java | 6 +++--- .../apache/catalina/startup/HomesUserDatabase.java | 2 +- java/org/apache/catalina/startup/HostConfig.java | 2 +- .../catalina/startup/PasswdUserDatabase.java | 2 +- .../catalina/startup/SetAllPropertiesRule.java | 4 ++-- .../catalina/startup/SetContextPropertiesRule.java | 3 +-- java/org/apache/catalina/startup/TldConfig.java | 2 +- java/org/apache/catalina/tribes/ByteMessage.java | 4 ++-- .../org/apache/catalina/tribes/ChannelMessage.java | 1 + java/org/apache/catalina/tribes/ChannelSender.java | 2 ++ java/org/apache/catalina/tribes/UniqueId.java | 3 ++- .../catalina/tribes/group/AbsoluteOrder.java | 5 +++-- .../catalina/tribes/group/ChannelCoordinator.java | 11 +++++------ .../apache/catalina/tribes/group/GroupChannel.java | 10 +++++----- .../apache/catalina/tribes/group/RpcMessage.java | 5 +++-- .../interceptors/DomainFilterInterceptor.java | 3 ++- .../interceptors/MessageDispatch15Interceptor.java | 2 +- .../interceptors/MessageDispatchInterceptor.java | 2 +- .../group/interceptors/OrderInterceptor.java | 4 ++-- .../interceptors/StaticMembershipInterceptor.java | 9 +++++---- .../interceptors/TwoPhaseCommitInterceptor.java | 6 +++--- .../org/apache/catalina/tribes/io/ChannelData.java | 4 ++-- .../catalina/tribes/membership/Membership.java | 2 +- .../catalina/tribes/membership/StaticMember.java | 1 + .../tribes/tipis/AbstractReplicatedMap.java | 2 +- .../catalina/tribes/tipis/LazyReplicatedMap.java | 3 +-- .../tribes/transport/MultiPointSender.java | 2 +- .../catalina/tribes/transport/PooledSender.java | 1 + .../tribes/transport/ReplicationTransmitter.java | 2 +- .../catalina/tribes/transport/SenderState.java | 3 ++- .../catalina/tribes/transport/bio/BioReceiver.java | 3 +-- .../tribes/transport/bio/BioReplicationTask.java | 13 ++++++------ .../tribes/transport/bio/MultipointBioSender.java | 4 ++-- .../tribes/transport/bio/PooledMultiSender.java | 8 ++++---- .../catalina/tribes/transport/nio/NioReceiver.java | 11 +++++------ .../tribes/transport/nio/NioReplicationTask.java | 19 +++++++++--------- .../catalina/tribes/transport/nio/NioSender.java | 5 ++--- .../tribes/transport/nio/ParallelNioSender.java | 8 ++++---- java/org/apache/catalina/tribes/util/Arrays.java | 4 ++-- java/org/apache/catalina/users/AbstractUser.java | 1 + .../apache/catalina/users/MemoryUserDatabase.java | 5 +++-- .../catalina/util/CustomObjectInputStream.java | 2 +- java/org/apache/catalina/util/Enumerator.java | 2 +- java/org/apache/catalina/util/IOTools.java | 2 +- java/org/apache/catalina/util/InstanceSupport.java | 1 + .../org/apache/catalina/util/ManifestResource.java | 4 ++-- java/org/apache/catalina/util/SchemaResolver.java | 2 +- java/org/apache/catalina/util/Strftime.java | 2 +- .../org/apache/catalina/valves/AccessLogValve.java | 2 +- .../apache/catalina/valves/RemoteAddrValve.java | 2 ++ .../apache/catalina/valves/RemoteHostValve.java | 2 ++ java/org/apache/catalina/valves/ValveBase.java | 2 +- java/org/apache/coyote/Processor.java | 2 +- java/org/apache/coyote/Request.java | 5 ++--- java/org/apache/coyote/ajp/AjpAprProcessor.java | 4 ++-- java/org/apache/coyote/ajp/AjpAprProtocol.java | 2 +- java/org/apache/coyote/ajp/AjpProcessor.java | 2 +- java/org/apache/coyote/ajp/AjpProtocol.java | 4 ++-- .../apache/coyote/http11/Http11AprProcessor.java | 8 ++++---- .../apache/coyote/http11/Http11AprProtocol.java | 2 +- .../apache/coyote/http11/Http11NioProcessor.java | 4 ++-- .../apache/coyote/http11/Http11NioProtocol.java | 2 +- java/org/apache/coyote/http11/Http11Processor.java | 2 +- java/org/apache/coyote/http11/Http11Protocol.java | 4 ++-- java/org/apache/coyote/http11/InputFilter.java | 3 +-- .../coyote/http11/InternalAprInputBuffer.java | 7 +++---- .../coyote/http11/InternalAprOutputBuffer.java | 7 +++---- java/org/apache/coyote/http11/OutputFilter.java | 3 +-- .../coyote/http11/filters/BufferedInputFilter.java | 3 ++- .../coyote/http11/filters/ChunkedInputFilter.java | 5 ++--- .../coyote/http11/filters/ChunkedOutputFilter.java | 5 ++--- .../coyote/http11/filters/GzipOutputFilter.java | 3 +-- .../coyote/http11/filters/IdentityInputFilter.java | 3 +-- .../http11/filters/IdentityOutputFilter.java | 3 +-- .../coyote/http11/filters/VoidInputFilter.java | 3 +-- .../coyote/http11/filters/VoidOutputFilter.java | 3 +-- java/org/apache/el/ValueExpressionLiteral.java | 5 ++--- java/org/apache/el/parser/ELParser.java | 1 + .../org/apache/el/parser/ELParserTokenManager.java | 2 -- java/org/apache/jasper/EmbeddedServletOptions.java | 4 ++-- java/org/apache/jasper/JspC.java | 3 +-- java/org/apache/jasper/compiler/Dumper.java | 2 +- java/org/apache/jasper/compiler/ELNode.java | 1 + java/org/apache/jasper/compiler/Generator.java | 2 +- .../apache/jasper/compiler/JspDocumentParser.java | 1 - java/org/apache/jasper/compiler/Mark.java | 5 +++-- java/org/apache/jasper/compiler/Node.java | 2 +- java/org/apache/jasper/compiler/PageDataImpl.java | 6 ++++-- java/org/apache/jasper/compiler/PageInfo.java | 6 +++--- java/org/apache/jasper/compiler/SmapGenerator.java | 2 +- java/org/apache/jasper/compiler/SmapStratum.java | 2 +- .../apache/jasper/compiler/TagFileProcessor.java | 4 ++-- .../apache/jasper/compiler/TagPluginManager.java | 4 ++-- .../apache/jasper/compiler/TldLocationsCache.java | 2 +- .../jasper/runtime/ProtectedFunctionMapper.java | 7 ++++--- .../apache/jasper/servlet/JspCServletContext.java | 2 +- java/org/apache/jasper/servlet/JspServlet.java | 1 - java/org/apache/jasper/tagplugins/jstl/Util.java | 4 ++-- java/org/apache/jasper/util/Enumerator.java | 2 +- java/org/apache/jasper/xmlparser/ASCIIReader.java | 3 ++- java/org/apache/jasper/xmlparser/TreeNode.java | 2 +- java/org/apache/jasper/xmlparser/UCSReader.java | 2 +- java/org/apache/jasper/xmlparser/UTF8Reader.java | 3 ++- .../jasper/xmlparser/XMLEncodingDetector.java | 2 +- java/org/apache/naming/ContextBindings.java | 3 ++- java/org/apache/naming/NameParserImpl.java | 4 ++-- java/org/apache/naming/NamingContext.java | 17 ++++++++-------- java/org/apache/naming/NamingService.java | 10 +++++----- java/org/apache/naming/SelectorContext.java | 5 +++++ java/org/apache/naming/factory/BeanFactory.java | 18 ++++++++--------- java/org/apache/naming/factory/EjbFactory.java | 6 ++++-- .../apache/naming/factory/MailSessionFactory.java | 3 ++- java/org/apache/naming/factory/OpenEjbFactory.java | 9 +++++---- .../apache/naming/factory/ResourceEnvFactory.java | 6 ++++-- .../org/apache/naming/factory/ResourceFactory.java | 6 ++++-- .../org/apache/naming/factory/SendMailFactory.java | 7 ++++--- .../apache/naming/factory/TransactionFactory.java | 6 ++++-- .../factory/webservices/ServiceRefFactory.java | 14 ++++++------- .../apache/naming/java/javaURLContextFactory.java | 10 ++++++---- .../apache/naming/resources/BaseDirContext.java | 7 +++++++ .../apache/naming/resources/FileDirContext.java | 5 +++++ .../apache/naming/resources/ProxyDirContext.java | 7 +++++++ java/org/apache/naming/resources/Resource.java | 2 +- .../org/apache/naming/resources/WARDirContext.java | 6 ++++++ java/org/apache/tomcat/buildutil/Txt2Html.java | 1 + .../util/bcel/classfile/AnnotationDefault.java | 1 + .../util/bcel/classfile/ClassElementValue.java | 1 + .../apache/tomcat/util/bcel/classfile/Code.java | 1 + .../tomcat/util/bcel/classfile/Constant.java | 1 + .../util/bcel/classfile/ConstantFieldref.java | 1 + .../bcel/classfile/ConstantInterfaceMethodref.java | 1 + .../util/bcel/classfile/ConstantMethodref.java | 1 + .../tomcat/util/bcel/classfile/ConstantPool.java | 1 + .../tomcat/util/bcel/classfile/Deprecated.java | 1 + .../util/bcel/classfile/ElementValuePair.java | 1 + .../util/bcel/classfile/EnumElementValue.java | 1 + .../tomcat/util/bcel/classfile/ExceptionTable.java | 1 + .../apache/tomcat/util/bcel/classfile/Field.java | 1 + .../tomcat/util/bcel/classfile/InnerClasses.java | 1 + .../tomcat/util/bcel/classfile/JavaClass.java | 1 + .../util/bcel/classfile/LineNumberTable.java | 1 + .../util/bcel/classfile/LocalVariableTable.java | 1 + .../bcel/classfile/LocalVariableTypeTable.java | 2 +- .../apache/tomcat/util/bcel/classfile/Method.java | 1 + .../bcel/classfile/ParameterAnnotationEntry.java | 1 + .../classfile/RuntimeInvisibleAnnotations.java | 1 + .../RuntimeInvisibleParameterAnnotations.java | 1 + .../bcel/classfile/RuntimeVisibleAnnotations.java | 1 + .../RuntimeVisibleParameterAnnotations.java | 1 + .../util/bcel/classfile/SimpleElementValue.java | 1 + .../tomcat/util/bcel/classfile/StackMap.java | 1 + .../tomcat/util/bcel/classfile/StackMapTable.java | 1 + .../tomcat/util/bcel/classfile/Synthetic.java | 1 + .../apache/tomcat/util/bcel/classfile/Unknown.java | 1 + java/org/apache/tomcat/util/buf/MessageBytes.java | 2 +- java/org/apache/tomcat/util/buf/StringCache.java | 2 +- .../util/http/fileupload/FileUploadBase.java | 2 -- .../util/http/fileupload/RequestContext.java | 2 +- .../util/http/fileupload/disk/DiskFileItem.java | 2 +- .../fileupload/servlet/ServletRequestContext.java | 3 ++- .../org/apache/tomcat/util/http/mapper/Mapper.java | 8 ++++---- .../apache/tomcat/util/modeler/ManagedBean.java | 2 +- .../modules/MbeansDescriptorsDigesterSource.java | 4 ++-- .../tomcat/util/net/NioBlockingSelector.java | 2 +- java/org/apache/tomcat/util/net/NioChannel.java | 6 +++--- .../apache/tomcat/util/net/SecureNioChannel.java | 4 +++- .../catalina/connector/TestKeepAliveCount.java | 2 +- .../org/apache/catalina/connector/TestRequest.java | 4 ++-- .../apache/catalina/connector/TestResponse.java | 2 +- .../catalina/core/TestNamingContextListener.java | 2 +- .../apache/catalina/core/TestStandardContext.java | 2 +- .../apache/catalina/filters/TestExpiresFilter.java | 2 +- .../catalina/filters/TestRemoteIpFilter.java | 4 ++-- .../ha/session/TestSerializablePrincipal.java | 4 ++-- test/org/apache/catalina/startup/ParamFilter.java | 2 +- .../apache/catalina/startup/TomcatBaseTest.java | 7 +++---- .../catalina/tribes/demos/ChannelCreator.java | 16 +++++++-------- .../apache/catalina/tribes/demos/EchoRpcTest.java | 6 +++--- .../org/apache/catalina/tribes/demos/LoadTest.java | 2 +- test/org/apache/catalina/tribes/demos/MapDemo.java | 14 ++++++------- .../tribes/demos/MembersWithProperties.java | 13 ++++++------ .../apache/catalina/tribes/test/NioSenderTest.java | 11 ++++++----- .../catalina/tribes/test/TribesTestSuite.java | 12 +++++------ .../tribes/test/channel/TestChannelOptionFlag.java | 2 +- .../tribes/test/channel/TestChannelStartStop.java | 3 ++- .../tribes/test/channel/TestDataIntegrity.java | 5 +++-- .../tribes/test/channel/TestMulticastPackages.java | 11 ++++++----- .../test/channel/TestRemoteProcessException.java | 7 ++++--- .../tribes/test/channel/TestUdpPackages.java | 11 ++++++----- .../interceptors/TestNonBlockingCoordinator.java | 7 ++++--- .../test/interceptors/TestOrderInterceptor.java | 23 +++++++++++----------- .../tribes/test/io/TestSenderConnections.java | 11 ++++++----- .../catalina/tribes/test/io/TestSerialization.java | 3 ++- .../tribes/test/membership/TestDomainFilter.java | 3 ++- .../tribes/test/membership/TestMemberArrival.java | 3 ++- .../test/membership/TestMemberSerialization.java | 4 +++- .../test/membership/TestTcpFailureDetector.java | 3 ++- .../tribes/test/transport/SocketNioSend.java | 15 +++++++------- .../test/transport/SocketNioValidateSend.java | 15 +++++++------- .../tribes/test/transport/SocketReceive.java | 4 ++-- .../catalina/tribes/test/transport/SocketSend.java | 9 +++++---- .../tribes/test/transport/SocketTribesReceive.java | 5 +++-- .../test/transport/SocketValidateReceive.java | 4 ++-- test/org/apache/el/TestMethodExpressionImpl.java | 4 ++-- test/org/apache/el/TestValueExpressionImpl.java | 4 ++-- test/org/apache/el/parser/TestELParser.java | 4 ++-- .../jasper/compiler/TestAttributeParser.java | 4 ++-- .../apache/tomcat/util/http/CookiesBaseTest.java | 2 +- .../tomcat/util/http/TestCookiesAllowEquals.java | 2 +- .../tomcat/util/http/TestCookiesAllowHttpSeps.java | 2 +- .../util/http/TestCookiesDisallowEquals.java | 2 +- .../docs/appdev/sample/src/mypackage/Hello.java | 1 + webapps/docs/changelog.xml | 3 +++ .../examples/WEB-INF/classes/chat/ChatServlet.java | 6 +++--- .../compressionFilters/CompressionFilter.java | 1 + .../CompressionResponseStream.java | 1 + .../CompressionServletResponseWrapper.java | 1 + .../WEB-INF/classes/filters/ExampleFilter.java | 1 + .../filters/SetCharacterEncodingFilter.java | 1 + .../jsp2/examples/simpletag/EchoAttributesTag.java | 7 ++++--- .../jsp2/examples/simpletag/FindBookSimpleTag.java | 1 + .../examples/simpletag/HelloWorldSimpleTag.java | 3 ++- .../jsp2/examples/simpletag/RepeatSimpleTag.java | 3 ++- .../jsp2/examples/simpletag/ShuffleSimpleTag.java | 3 ++- .../jsp2/examples/simpletag/TileSimpleTag.java | 3 ++- .../WEB-INF/classes/validators/DebugValidator.java | 3 ++- 336 files changed, 731 insertions(+), 596 deletions(-) diff --git a/checkstyle.xml b/checkstyle.xml index 3ae5d7bc7..754b8b495 100644 --- a/checkstyle.xml +++ b/checkstyle.xml @@ -34,14 +34,12 @@ -