From d079d96e89dfab8c5b620dab37f572c9dd142a90 Mon Sep 17 00:00:00 2001 From: markt Date: Tue, 24 Oct 2006 03:17:11 +0000 Subject: [PATCH] Correct props. git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@467222 13f79535-47bb-0310-9956-ffa450edef68 --- java/javax/servlet/http/LocalStrings_es.properties | 2 +- java/javax/servlet/resources/XMLSchema.dtd | 2 +- java/javax/servlet/resources/datatypes.dtd | 2 +- java/org/apache/AnnotationProcessor.java | 2 +- java/org/apache/catalina/Authenticator.java | 2 +- java/org/apache/catalina/Cluster.java | 2 +- java/org/apache/catalina/Contained.java | 2 +- java/org/apache/catalina/Container.java | 2 +- java/org/apache/catalina/ContainerEvent.java | 2 +- java/org/apache/catalina/ContainerListener.java | 2 +- java/org/apache/catalina/ContainerServlet.java | 2 +- java/org/apache/catalina/Context.java | 2 +- java/org/apache/catalina/Engine.java | 2 +- java/org/apache/catalina/Globals.java | 2 +- java/org/apache/catalina/Group.java | 2 +- java/org/apache/catalina/Host.java | 2 +- java/org/apache/catalina/InstanceEvent.java | 2 +- java/org/apache/catalina/InstanceListener.java | 2 +- java/org/apache/catalina/Lifecycle.java | 2 +- java/org/apache/catalina/LifecycleEvent.java | 2 +- java/org/apache/catalina/LifecycleException.java | 2 +- java/org/apache/catalina/LifecycleListener.java | 2 +- java/org/apache/catalina/Loader.java | 2 +- java/org/apache/catalina/Manager.java | 2 +- java/org/apache/catalina/Pipeline.java | 2 +- java/org/apache/catalina/Realm.java | 2 +- java/org/apache/catalina/Role.java | 2 +- java/org/apache/catalina/Server.java | 2 +- java/org/apache/catalina/ServerFactory.java | 2 +- java/org/apache/catalina/Service.java | 2 +- java/org/apache/catalina/Session.java | 2 +- java/org/apache/catalina/SessionEvent.java | 2 +- java/org/apache/catalina/SessionListener.java | 2 +- java/org/apache/catalina/Store.java | 2 +- java/org/apache/catalina/User.java | 2 +- java/org/apache/catalina/UserDatabase.java | 2 +- java/org/apache/catalina/Valve.java | 2 +- java/org/apache/catalina/Wrapper.java | 2 +- .../apache/catalina/ant/AbstractCatalinaTask.java | 2 +- .../catalina/ant/BaseRedirectorHelperTask.java | 2 +- java/org/apache/catalina/ant/DeployTask.java | 2 +- java/org/apache/catalina/ant/InstallTask.java | 2 +- .../apache/catalina/ant/JKStatusUpdateTask.java | 2 +- java/org/apache/catalina/ant/JMXGetTask.java | 2 +- java/org/apache/catalina/ant/JMXQueryTask.java | 2 +- java/org/apache/catalina/ant/JMXSetTask.java | 2 +- java/org/apache/catalina/ant/ListTask.java | 2 +- java/org/apache/catalina/ant/ReloadTask.java | 2 +- java/org/apache/catalina/ant/RemoveTask.java | 2 +- java/org/apache/catalina/ant/ResourcesTask.java | 2 +- java/org/apache/catalina/ant/RolesTask.java | 2 +- java/org/apache/catalina/ant/ServerinfoTask.java | 2 +- java/org/apache/catalina/ant/SessionsTask.java | 2 +- java/org/apache/catalina/ant/StartTask.java | 2 +- java/org/apache/catalina/ant/StopTask.java | 2 +- java/org/apache/catalina/ant/UndeployTask.java | 2 +- java/org/apache/catalina/ant/ValidatorTask.java | 2 +- java/org/apache/catalina/ant/catalina.tasks | 46 +- java/org/apache/catalina/ant/jmx/Arg.java | 2 +- .../catalina/ant/jmx/JMXAccessorCondition.java | 2 +- .../catalina/ant/jmx/JMXAccessorCreateTask.java | 2 +- .../ant/jmx/JMXAccessorEqualsCondition.java | 2 +- .../catalina/ant/jmx/JMXAccessorGetTask.java | 2 +- .../catalina/ant/jmx/JMXAccessorInvokeTask.java | 2 +- .../catalina/ant/jmx/JMXAccessorQueryTask.java | 2 +- .../catalina/ant/jmx/JMXAccessorSetTask.java | 2 +- .../apache/catalina/ant/jmx/JMXAccessorTask.java | 2 +- .../ant/jmx/JMXAccessorUnregisterTask.java | 2 +- java/org/apache/catalina/ant/jmx/jmxaccessor.tasks | 16 +- .../catalina/authenticator/AuthenticatorBase.java | 2 +- .../catalina/authenticator/BasicAuthenticator.java | 2 +- .../authenticator/DigestAuthenticator.java | 2 +- .../catalina/authenticator/FormAuthenticator.java | 2 +- .../authenticator/NonLoginAuthenticator.java | 2 +- .../catalina/authenticator/SSLAuthenticator.java | 2 +- .../catalina/authenticator/SavedRequest.java | 2 +- .../catalina/authenticator/SingleSignOn.java | 2 +- .../catalina/authenticator/SingleSignOnEntry.java | 2 +- .../catalina/connector/ClientAbortException.java | 2 +- java/org/apache/catalina/connector/Connector.java | 2 +- .../apache/catalina/connector/CoyoteAdapter.java | 2 +- .../apache/catalina/connector/CoyotePrincipal.java | 2 +- java/org/apache/catalina/connector/Request.java | 2 +- .../apache/catalina/connector/RequestFacade.java | 2 +- java/org/apache/catalina/connector/Response.java | 2 +- .../apache/catalina/connector/ResponseFacade.java | 2 +- .../apache/catalina/core/ApplicationContext.java | 2 +- .../catalina/core/ApplicationContextFacade.java | 2 +- .../catalina/core/ApplicationDispatcher.java | 2 +- .../catalina/core/ApplicationFilterChain.java | 2 +- .../catalina/core/ApplicationFilterConfig.java | 2 +- .../catalina/core/ApplicationHttpRequest.java | 2 +- .../catalina/core/ApplicationHttpResponse.java | 2 +- .../apache/catalina/core/ApplicationRequest.java | 2 +- .../apache/catalina/core/ApplicationResponse.java | 2 +- .../apache/catalina/core/AprLifecycleListener.java | 2 +- java/org/apache/catalina/core/DummyRequest.java | 2 +- java/org/apache/catalina/core/DummyResponse.java | 2 +- java/org/apache/catalina/core/JasperListener.java | 2 +- .../catalina/core/NamingContextListener.java | 2 +- java/org/apache/catalina/core/StandardContext.java | 2 +- .../apache/catalina/core/StandardContextValve.java | 2 +- java/org/apache/catalina/core/StandardEngine.java | 2 +- .../apache/catalina/core/StandardEngineValve.java | 2 +- java/org/apache/catalina/core/StandardHost.java | 2 +- .../apache/catalina/core/StandardHostValve.java | 2 +- java/org/apache/catalina/core/StandardServer.java | 2 +- java/org/apache/catalina/core/StandardWrapper.java | 2 +- .../catalina/core/StandardWrapperFacade.java | 2 +- .../apache/catalina/core/StandardWrapperValve.java | 2 +- .../catalina/deploy/ApplicationParameter.java | 2 +- java/org/apache/catalina/deploy/ContextEjb.java | 2 +- .../apache/catalina/deploy/ContextEnvironment.java | 2 +- .../apache/catalina/deploy/ContextLocalEjb.java | 2 +- .../apache/catalina/deploy/ContextResource.java | 2 +- .../catalina/deploy/ContextResourceEnvRef.java | 2 +- .../catalina/deploy/ContextResourceLink.java | 2 +- .../org/apache/catalina/deploy/ContextService.java | 2 +- .../apache/catalina/deploy/ContextTransaction.java | 2 +- java/org/apache/catalina/deploy/ErrorPage.java | 2 +- java/org/apache/catalina/deploy/FilterDef.java | 2 +- java/org/apache/catalina/deploy/FilterMap.java | 2 +- java/org/apache/catalina/deploy/LoginConfig.java | 2 +- .../apache/catalina/deploy/MessageDestination.java | 2 +- .../catalina/deploy/MessageDestinationRef.java | 2 +- .../apache/catalina/deploy/NamingResources.java | 2 +- java/org/apache/catalina/deploy/ResourceBase.java | 2 +- .../apache/catalina/deploy/SecurityCollection.java | 2 +- .../apache/catalina/deploy/SecurityConstraint.java | 2 +- java/org/apache/catalina/ha/CatalinaCluster.java | 260 +- java/org/apache/catalina/ha/ClusterDeployer.java | 242 +- java/org/apache/catalina/ha/ClusterListener.java | 228 +- java/org/apache/catalina/ha/ClusterManager.java | 224 +- java/org/apache/catalina/ha/ClusterMessage.java | 68 +- java/org/apache/catalina/ha/ClusterRuleSet.java | 390 +-- java/org/apache/catalina/ha/ClusterSession.java | 80 +- java/org/apache/catalina/ha/ClusterValve.java | 80 +- java/org/apache/catalina/ha/Constants.java | 62 +- .../catalina/ha/context/ReplicatedContext.java | 250 +- .../apache/catalina/ha/deploy/FarmWarDeployer.java | 1494 +++++----- .../catalina/ha/deploy/FileChangeListener.java | 48 +- .../org/apache/catalina/ha/deploy/FileMessage.java | 226 +- .../catalina/ha/deploy/FileMessageFactory.java | 622 ++-- .../apache/catalina/ha/deploy/UndeployMessage.java | 228 +- java/org/apache/catalina/ha/deploy/WarWatcher.java | 476 +-- .../apache/catalina/ha/session/BackupManager.java | 564 ++-- .../catalina/ha/session/ClusterManagerBase.java | 148 +- .../ha/session/ClusterSessionListener.java | 216 +- java/org/apache/catalina/ha/session/Constants.java | 64 +- .../apache/catalina/ha/session/DeltaManager.java | 3040 ++++++++++---------- .../apache/catalina/ha/session/DeltaRequest.java | 774 ++--- .../apache/catalina/ha/session/DeltaSession.java | 1504 +++++----- .../catalina/ha/session/JvmRouteBinderValve.java | 1088 +++---- .../session/JvmRouteSessionIDBinderListener.java | 334 +-- .../catalina/ha/session/ReplicatedSession.java | 572 ++-- .../catalina/ha/session/SerializablePrincipal.java | 386 +-- .../catalina/ha/session/SessionIDMessage.java | 258 +- .../apache/catalina/ha/session/SessionMessage.java | 208 +- .../catalina/ha/session/SessionMessageImpl.java | 316 +- .../ha/session/SimpleTcpReplicationManager.java | 1370 ++++----- java/org/apache/catalina/ha/tcp/Constants.java | 66 +- .../apache/catalina/ha/tcp/ReplicationValve.java | 1316 ++++----- .../apache/catalina/ha/tcp/SendMessageData.java | 2 +- .../apache/catalina/ha/tcp/SimpleTcpCluster.java | 1912 ++++++------ .../apache/catalina/ha/util/IDynamicProperty.java | 116 +- java/org/apache/catalina/loader/Reloader.java | 2 +- java/org/apache/catalina/loader/ResourceEntry.java | 2 +- .../catalina/loader/StandardClassLoader.java | 2 +- .../catalina/loader/StandardClassLoaderMBean.java | 2 +- .../apache/catalina/loader/WebappClassLoader.java | 2 +- java/org/apache/catalina/loader/WebappLoader.java | 2 +- .../catalina/manager/HTMLManagerServlet.java | 2 +- .../apache/catalina/manager/ManagerServlet.java | 2 +- .../catalina/manager/StatusManagerServlet.java | 2 +- .../apache/catalina/manager/StatusTransformer.java | 2 +- .../manager/host/HTMLHostManagerServlet.java | 2 +- .../catalina/manager/host/HostManagerServlet.java | 2 +- .../org/apache/catalina/mbeans/ClassNameMBean.java | 2 +- .../org/apache/catalina/mbeans/ConnectorMBean.java | 2 +- .../catalina/mbeans/ContextEnvironmentMBean.java | 2 +- .../catalina/mbeans/ContextResourceLinkMBean.java | 2 +- .../catalina/mbeans/ContextResourceMBean.java | 2 +- .../catalina/mbeans/DefaultContextMBean.java | 2 +- .../mbeans/GlobalResourcesLifecycleListener.java | 2 +- java/org/apache/catalina/mbeans/GroupMBean.java | 2 +- java/org/apache/catalina/mbeans/MBeanFactory.java | 2 +- java/org/apache/catalina/mbeans/MBeanUtils.java | 2 +- .../catalina/mbeans/MemoryUserDatabaseMBean.java | 2 +- .../catalina/mbeans/NamingResourcesMBean.java | 2 +- java/org/apache/catalina/mbeans/RoleMBean.java | 2 +- .../catalina/mbeans/ServerLifecycleListener.java | 2 +- .../catalina/mbeans/StandardContextMBean.java | 2 +- .../catalina/mbeans/StandardEngineMBean.java | 2 +- .../apache/catalina/mbeans/StandardHostMBean.java | 2 +- .../catalina/mbeans/StandardServerMBean.java | 2 +- .../catalina/mbeans/StandardServiceMBean.java | 2 +- java/org/apache/catalina/mbeans/UserMBean.java | 2 +- java/org/apache/catalina/realm/Constants.java | 2 +- .../org/apache/catalina/realm/DataSourceRealm.java | 2 +- .../apache/catalina/realm/GenericPrincipal.java | 2 +- .../apache/catalina/realm/JAASCallbackHandler.java | 2 +- .../catalina/realm/JAASMemoryLoginModule.java | 2 +- java/org/apache/catalina/realm/JAASRealm.java | 2 +- java/org/apache/catalina/realm/JDBCRealm.java | 2 +- java/org/apache/catalina/realm/JNDIRealm.java | 2 +- .../apache/catalina/realm/LocalStrings.properties | 2 +- .../catalina/realm/LocalStrings_es.properties | 2 +- .../catalina/realm/LocalStrings_fr.properties | 2 +- .../catalina/realm/LocalStrings_ja.properties | 2 +- java/org/apache/catalina/realm/MemoryRealm.java | 2 +- java/org/apache/catalina/realm/MemoryRuleSet.java | 2 +- java/org/apache/catalina/realm/RealmBase.java | 2 +- .../apache/catalina/realm/UserDatabaseRealm.java | 2 +- .../catalina/security/SecurityClassLoad.java | 2 +- java/org/apache/catalina/servlets/CGIServlet.java | 6 +- .../apache/catalina/servlets/DefaultServlet.java | 2 +- .../catalina/servlets/InvokerHttpRequest.java | 2 +- .../apache/catalina/servlets/InvokerServlet.java | 2 +- .../apache/catalina/servlets/WebdavServlet.java | 2 +- java/org/apache/catalina/session/FileStore.java | 2 +- java/org/apache/catalina/session/JDBCStore.java | 2 +- java/org/apache/catalina/session/ManagerBase.java | 2 +- .../apache/catalina/session/PersistentManager.java | 2 +- .../catalina/session/PersistentManagerBase.java | 2 +- .../apache/catalina/session/StandardManager.java | 2 +- .../apache/catalina/session/StandardSession.java | 2 +- .../catalina/session/StandardSessionFacade.java | 2 +- java/org/apache/catalina/session/StoreBase.java | 2 +- .../catalina/ssi/ByteArrayServletOutputStream.java | 2 +- .../apache/catalina/ssi/ExpressionParseTree.java | 2 +- .../apache/catalina/ssi/ExpressionTokenizer.java | 2 +- .../catalina/ssi/ResponseIncludeWrapper.java | 2 +- java/org/apache/catalina/ssi/SSICommand.java | 2 +- java/org/apache/catalina/ssi/SSIConditional.java | 2 +- .../apache/catalina/ssi/SSIConditionalState.java | 2 +- java/org/apache/catalina/ssi/SSIConfig.java | 2 +- java/org/apache/catalina/ssi/SSIEcho.java | 2 +- java/org/apache/catalina/ssi/SSIExec.java | 2 +- .../apache/catalina/ssi/SSIExternalResolver.java | 2 +- java/org/apache/catalina/ssi/SSIFilter.java | 2 +- java/org/apache/catalina/ssi/SSIFlastmod.java | 2 +- java/org/apache/catalina/ssi/SSIFsize.java | 2 +- java/org/apache/catalina/ssi/SSIInclude.java | 2 +- java/org/apache/catalina/ssi/SSIMediator.java | 2 +- java/org/apache/catalina/ssi/SSIPrintenv.java | 2 +- java/org/apache/catalina/ssi/SSIProcessor.java | 2 +- java/org/apache/catalina/ssi/SSIServlet.java | 2 +- .../catalina/ssi/SSIServletExternalResolver.java | 2 +- java/org/apache/catalina/ssi/SSISet.java | 2 +- .../catalina/ssi/SSIStopProcessingException.java | 2 +- java/org/apache/catalina/startup/Bootstrap.java | 2 +- java/org/apache/catalina/startup/Catalina.java | 2 +- .../catalina/startup/CatalinaProperties.java | 2 +- .../catalina/startup/ClassLoaderFactory.java | 2 +- .../catalina/startup/ClusterRuleSetFactory.java | 2 +- .../catalina/startup/ConnectorCreateRule.java | 2 +- java/org/apache/catalina/startup/Constants.java | 2 +- .../org/apache/catalina/startup/ContextConfig.java | 2 +- .../apache/catalina/startup/ContextRuleSet.java | 2 +- .../startup/CopyParentClassLoaderRule.java | 2 +- java/org/apache/catalina/startup/Embedded.java | 2 +- java/org/apache/catalina/startup/EngineConfig.java | 2 +- .../org/apache/catalina/startup/EngineRuleSet.java | 2 +- java/org/apache/catalina/startup/ExpandWar.java | 2 +- .../apache/catalina/startup/HomesUserDatabase.java | 2 +- java/org/apache/catalina/startup/HostConfig.java | 2 +- java/org/apache/catalina/startup/HostRuleSet.java | 2 +- .../org/apache/catalina/startup/NamingRuleSet.java | 2 +- .../catalina/startup/PasswdUserDatabase.java | 2 +- .../apache/catalina/startup/SetNextNamingRule.java | 2 +- java/org/apache/catalina/startup/TldRuleSet.java | 2 +- java/org/apache/catalina/startup/Tool.java | 2 +- java/org/apache/catalina/startup/UserConfig.java | 2 +- java/org/apache/catalina/startup/UserDatabase.java | 2 +- .../apache/catalina/startup/WebAnnotationSet.java | 2 +- java/org/apache/catalina/startup/WebRuleSet.java | 2 +- java/org/apache/catalina/tribes/ByteMessage.java | 204 +- java/org/apache/catalina/tribes/Channel.java | 694 ++--- .../apache/catalina/tribes/ChannelException.java | 324 +-- .../apache/catalina/tribes/ChannelInterceptor.java | 360 +-- .../apache/catalina/tribes/ChannelListener.java | 136 +- .../org/apache/catalina/tribes/ChannelMessage.java | 218 +- .../apache/catalina/tribes/ChannelReceiver.java | 150 +- java/org/apache/catalina/tribes/ChannelSender.java | 138 +- java/org/apache/catalina/tribes/Constants.java | 64 +- java/org/apache/catalina/tribes/ErrorHandler.java | 90 +- java/org/apache/catalina/tribes/Heartbeat.java | 66 +- .../org/apache/catalina/tribes/ManagedChannel.java | 156 +- java/org/apache/catalina/tribes/Member.java | 238 +- .../apache/catalina/tribes/MembershipListener.java | 88 +- .../apache/catalina/tribes/MembershipService.java | 270 +- .../apache/catalina/tribes/MessageListener.java | 86 +- java/org/apache/catalina/tribes/UniqueId.java | 142 +- .../catalina/tribes/group/ChannelCoordinator.java | 636 ++-- .../tribes/group/ChannelInterceptorBase.java | 344 +-- .../apache/catalina/tribes/group/GroupChannel.java | 1334 ++++----- .../catalina/tribes/group/InterceptorPayload.java | 68 +- .../org/apache/catalina/tribes/group/Response.java | 106 +- .../apache/catalina/tribes/group/RpcCallback.java | 90 +- .../apache/catalina/tribes/group/RpcChannel.java | 522 ++-- .../apache/catalina/tribes/group/RpcMessage.java | 234 +- .../interceptors/DomainFilterInterceptor.java | 204 +- .../interceptors/FragmentationInterceptor.java | 482 ++-- .../tribes/group/interceptors/GzipInterceptor.java | 200 +- .../interceptors/MessageDispatch15Interceptor.java | 222 +- .../interceptors/MessageDispatchInterceptor.java | 404 +-- .../group/interceptors/NonBlockingCoordinator.java | 1678 +++++------ .../group/interceptors/OrderInterceptor.java | 598 ++-- .../group/interceptors/TcpFailureDetector.java | 576 ++-- .../group/interceptors/ThroughputInterceptor.java | 240 +- .../interceptors/TwoPhaseCommitInterceptor.java | 296 +- java/org/apache/catalina/tribes/io/BufferPool.java | 188 +- .../catalina/tribes/io/BufferPool14Impl.java | 140 +- .../catalina/tribes/io/BufferPool15Impl.java | 126 +- .../catalina/tribes/membership/Constants.java | 80 +- .../catalina/tribes/membership/McastService.java | 1104 +++---- .../tribes/membership/McastServiceImpl.java | 798 ++--- .../catalina/tribes/membership/MemberImpl.java | 1194 ++++---- .../catalina/tribes/membership/Membership.java | 650 ++--- .../catalina/tribes/membership/StaticMember.java | 158 +- .../tribes/tipis/AbstractReplicatedMap.java | 2734 +++++++++--------- .../catalina/tribes/tipis/LazyReplicatedMap.java | 368 +-- .../catalina/tribes/tipis/ReplicatedMap.java | 234 +- .../catalina/tribes/tipis/ReplicatedMapEntry.java | 246 +- .../apache/catalina/tribes/tipis/Streamable.java | 120 +- .../catalina/tribes/transport/Constants.java | 86 +- .../catalina/tribes/transport/DataSender.java | 92 +- .../tribes/transport/MultiPointSender.java | 76 +- .../catalina/tribes/transport/PooledSender.java | 394 +-- .../tribes/transport/ReplicationTransmitter.java | 2 +- .../catalina/tribes/transport/SenderState.java | 230 +- .../catalina/tribes/transport/ThreadPool.java | 330 +-- .../catalina/tribes/transport/WorkerThread.java | 178 +- .../tribes/transport/bio/BioReplicationThread.java | 362 +-- .../catalina/tribes/transport/bio/BioSender.java | 2 +- .../tribes/transport/bio/util/FastQueue.java | 788 ++--- .../tribes/transport/bio/util/LinkObject.java | 216 +- .../bio/util/SingleRemoveSynchronizedAddLock.java | 508 ++-- .../catalina/tribes/transport/nio/NioReceiver.java | 766 ++--- .../tribes/transport/nio/NioReplicationThread.java | 622 ++-- .../catalina/tribes/transport/nio/NioSender.java | 666 ++--- .../tribes/transport/nio/ParallelNioSender.java | 576 ++-- .../tribes/transport/nio/PooledParallelSender.java | 168 +- java/org/apache/catalina/tribes/util/Arrays.java | 440 +-- java/org/apache/catalina/tribes/util/Logs.java | 58 +- .../apache/catalina/tribes/util/StringManager.java | 506 ++-- .../apache/catalina/tribes/util/UUIDGenerator.java | 152 +- java/org/apache/catalina/users/AbstractGroup.java | 2 +- java/org/apache/catalina/users/AbstractRole.java | 2 +- java/org/apache/catalina/users/AbstractUser.java | 2 +- java/org/apache/catalina/users/Constants.java | 2 +- java/org/apache/catalina/users/MemoryGroup.java | 2 +- java/org/apache/catalina/users/MemoryRole.java | 2 +- java/org/apache/catalina/users/MemoryUser.java | 2 +- .../apache/catalina/users/MemoryUserDatabase.java | 2 +- .../catalina/users/MemoryUserDatabaseFactory.java | 2 +- java/org/apache/catalina/util/Base64.java | 2 +- java/org/apache/catalina/util/CharsetMapper.java | 2 +- .../catalina/util/CustomObjectInputStream.java | 2 +- .../catalina/util/DefaultAnnotationProcessor.java | 2 +- java/org/apache/catalina/util/Enumerator.java | 2 +- java/org/apache/catalina/util/Extension.java | 2 +- .../apache/catalina/util/ExtensionValidator.java | 2 +- java/org/apache/catalina/util/InstanceSupport.java | 2 +- .../org/apache/catalina/util/LifecycleSupport.java | 2 +- java/org/apache/catalina/util/MD5Encoder.java | 2 +- java/org/apache/catalina/util/MIME2Java.java | 2 +- .../org/apache/catalina/util/ManifestResource.java | 2 +- java/org/apache/catalina/util/ParameterMap.java | 2 +- java/org/apache/catalina/util/RequestUtil.java | 2 +- java/org/apache/catalina/util/ResourceSet.java | 2 +- java/org/apache/catalina/util/ServerInfo.java | 2 +- java/org/apache/catalina/util/Strftime.java | 2 +- java/org/apache/catalina/util/StringParser.java | 2 +- java/org/apache/catalina/util/URL.java | 2 +- .../org/apache/catalina/valves/AccessLogValve.java | 2 +- .../valves/CometConnectionManagerValve.java | 2 +- .../apache/catalina/valves/ErrorReportValve.java | 2 +- .../catalina/valves/ExtendedAccessLogValve.java | 2 +- .../catalina/valves/FastCommonAccessLogValve.java | 2 +- .../apache/catalina/valves/PersistentValve.java | 2 +- .../apache/catalina/valves/RemoteAddrValve.java | 2 +- .../apache/catalina/valves/RemoteHostValve.java | 2 +- .../apache/catalina/valves/RequestDumperValve.java | 2 +- .../apache/catalina/valves/RequestFilterValve.java | 2 +- .../org/apache/catalina/valves/SemaphoreValve.java | 2 +- java/org/apache/catalina/valves/ValveBase.java | 2 +- java/org/apache/coyote/ajp/LocalStrings.properties | 2 +- .../apache/coyote/http11/LocalStrings.properties | 2 +- .../coyote/http11/LocalStrings_es.properties | 2 +- .../coyote/http11/LocalStrings_fr.properties | 2 +- .../coyote/http11/LocalStrings_ja.properties | 2 +- java/org/apache/el/ExpressionFactoryImpl.java | 2 +- java/org/apache/el/MethodExpressionImpl.java | 2 +- java/org/apache/el/ValueExpressionImpl.java | 2 +- java/org/apache/el/lang/ELArithmetic.java | 2 +- java/org/apache/el/lang/ELSupport.java | 2 +- java/org/apache/el/lang/ExpressionBuilder.java | 2 +- java/org/apache/el/lang/FunctionMapperFactory.java | 2 +- java/org/apache/el/lang/FunctionMapperImpl.java | 2 +- java/org/apache/el/parser/ArithmeticNode.java | 2 +- java/org/apache/el/parser/AstAnd.java | 2 +- java/org/apache/el/parser/AstBracketSuffix.java | 2 +- java/org/apache/el/parser/AstChoice.java | 2 +- .../apache/el/parser/AstCompositeExpression.java | 2 +- .../apache/el/parser/AstDeferredExpression.java | 2 +- java/org/apache/el/parser/AstDiv.java | 2 +- java/org/apache/el/parser/AstDotSuffix.java | 2 +- .../org/apache/el/parser/AstDynamicExpression.java | 2 +- java/org/apache/el/parser/AstEmpty.java | 2 +- java/org/apache/el/parser/AstEqual.java | 2 +- java/org/apache/el/parser/AstFalse.java | 2 +- java/org/apache/el/parser/AstFloatingPoint.java | 2 +- java/org/apache/el/parser/AstFunction.java | 2 +- java/org/apache/el/parser/AstGreaterThan.java | 2 +- java/org/apache/el/parser/AstGreaterThanEqual.java | 2 +- java/org/apache/el/parser/AstIdentifier.java | 2 +- java/org/apache/el/parser/AstInteger.java | 2 +- java/org/apache/el/parser/AstLessThan.java | 2 +- java/org/apache/el/parser/AstLessThanEqual.java | 2 +- .../org/apache/el/parser/AstLiteralExpression.java | 2 +- java/org/apache/el/parser/AstMinus.java | 2 +- java/org/apache/el/parser/AstMod.java | 2 +- java/org/apache/el/parser/AstMult.java | 2 +- java/org/apache/el/parser/AstNegative.java | 2 +- java/org/apache/el/parser/AstNot.java | 2 +- java/org/apache/el/parser/AstNotEqual.java | 2 +- java/org/apache/el/parser/AstNull.java | 2 +- java/org/apache/el/parser/AstOr.java | 2 +- java/org/apache/el/parser/AstPlus.java | 2 +- java/org/apache/el/parser/AstString.java | 2 +- java/org/apache/el/parser/AstTrue.java | 2 +- java/org/apache/el/parser/AstValue.java | 2 +- java/org/apache/el/parser/BooleanNode.java | 2 +- java/org/apache/el/parser/ELParser.jjt | 942 +++--- java/org/apache/el/parser/Node.java | 2 +- java/org/apache/el/parser/NodeVisitor.java | 2 +- java/org/apache/el/parser/SimpleNode.java | 2 +- java/org/apache/el/util/MessageFactory.java | 2 +- java/org/apache/el/util/ReflectionUtil.java | 2 +- .../apache/jasper/compiler/JspRuntimeContext.java | 2 +- .../jasper/resources/LocalStrings.properties | 2 +- .../jasper/resources/LocalStrings_es.properties | 2 +- .../jasper/resources/LocalStrings_fr.properties | 2 +- .../jasper/resources/LocalStrings_ja.properties | 2 +- .../apache/jasper/runtime/AnnotationHelper.java | 2 +- java/org/apache/jasper/util/Enumerator.java | 2 +- java/org/apache/jasper/xmlparser/ASCIIReader.java | 2 +- java/org/apache/jasper/xmlparser/EncodingMap.java | 2 +- java/org/apache/jasper/xmlparser/ParserUtils.java | 2 +- java/org/apache/jasper/xmlparser/SymbolTable.java | 2 +- java/org/apache/jasper/xmlparser/TreeNode.java | 2 +- java/org/apache/jasper/xmlparser/UCSReader.java | 2 +- java/org/apache/jasper/xmlparser/UTF8Reader.java | 2 +- java/org/apache/jasper/xmlparser/XMLChar.java | 2 +- java/org/apache/jasper/xmlparser/XMLString.java | 2 +- .../apache/jasper/xmlparser/XMLStringBuffer.java | 2 +- java/org/apache/jk/config/BaseJkConfig.java | 2 +- java/org/apache/juli/FileHandler.java | 2 +- java/org/apache/juli/logging/Log.java | 2 +- .../juli/logging/LogConfigurationException.java | 2 +- java/org/apache/juli/logging/LogFactory.java | 2 +- .../org/apache/naming/ContextAccessController.java | 2 +- java/org/apache/naming/ContextBindings.java | 2 +- java/org/apache/naming/EjbRef.java | 2 +- java/org/apache/naming/JndiPermission.java | 2 +- java/org/apache/naming/LocalStrings_es.properties | 2 +- java/org/apache/naming/NameParserImpl.java | 2 +- java/org/apache/naming/NamingContext.java | 2 +- .../naming/NamingContextBindingsEnumeration.java | 2 +- .../apache/naming/NamingContextEnumeration.java | 2 +- java/org/apache/naming/NamingEntry.java | 2 +- java/org/apache/naming/NamingService.java | 2 +- java/org/apache/naming/NamingServiceMBean.java | 2 +- java/org/apache/naming/ResourceEnvRef.java | 2 +- java/org/apache/naming/ResourceLinkRef.java | 2 +- java/org/apache/naming/ResourceRef.java | 2 +- java/org/apache/naming/SelectorContext.java | 2 +- java/org/apache/naming/TransactionRef.java | 2 +- java/org/apache/naming/factory/EjbFactory.java | 2 +- .../apache/naming/factory/MailSessionFactory.java | 2 +- java/org/apache/naming/factory/OpenEjbFactory.java | 2 +- .../apache/naming/factory/ResourceEnvFactory.java | 2 +- .../org/apache/naming/factory/ResourceFactory.java | 2 +- .../apache/naming/factory/ResourceLinkFactory.java | 2 +- .../apache/naming/factory/TransactionFactory.java | 2 +- .../apache/naming/java/javaURLContextFactory.java | 2 +- .../apache/naming/resources/BaseDirContext.java | 2 +- java/org/apache/naming/resources/CacheEntry.java | 2 +- .../naming/resources/DirContextURLConnection.java | 2 +- .../resources/DirContextURLStreamHandler.java | 2 +- .../DirContextURLStreamHandlerFactory.java | 2 +- .../apache/naming/resources/FileDirContext.java | 2 +- .../resources/ImmutableNameNotFoundException.java | 2 +- .../apache/naming/resources/ProxyDirContext.java | 2 +- .../resources/RecyclableNamingEnumeration.java | 2 +- java/org/apache/naming/resources/Resource.java | 2 +- .../naming/resources/ResourceAttributes.java | 2 +- .../org/apache/naming/resources/ResourceCache.java | 2 +- .../org/apache/naming/resources/WARDirContext.java | 2 +- java/org/apache/naming/resources/jndi/Handler.java | 2 +- java/org/apache/tomcat/jni/Address.java | 2 +- java/org/apache/tomcat/jni/BIOCallback.java | 2 +- java/org/apache/tomcat/jni/Directory.java | 2 +- java/org/apache/tomcat/jni/Error.java | 2 +- java/org/apache/tomcat/jni/File.java | 2 +- java/org/apache/tomcat/jni/FileInfo.java | 2 +- java/org/apache/tomcat/jni/Global.java | 2 +- java/org/apache/tomcat/jni/Library.java | 2 +- java/org/apache/tomcat/jni/Local.java | 2 +- java/org/apache/tomcat/jni/Lock.java | 2 +- java/org/apache/tomcat/jni/Mmap.java | 2 +- java/org/apache/tomcat/jni/Multicast.java | 2 +- java/org/apache/tomcat/jni/OS.java | 2 +- java/org/apache/tomcat/jni/PasswordCallback.java | 2 +- java/org/apache/tomcat/jni/Poll.java | 2 +- java/org/apache/tomcat/jni/Pool.java | 2 +- java/org/apache/tomcat/jni/PoolCallback.java | 2 +- java/org/apache/tomcat/jni/Proc.java | 2 +- java/org/apache/tomcat/jni/ProcErrorCallback.java | 2 +- java/org/apache/tomcat/jni/Procattr.java | 2 +- java/org/apache/tomcat/jni/Registry.java | 2 +- java/org/apache/tomcat/jni/SSL.java | 2 +- java/org/apache/tomcat/jni/SSLContext.java | 2 +- java/org/apache/tomcat/jni/SSLSocket.java | 2 +- java/org/apache/tomcat/jni/Shm.java | 2 +- java/org/apache/tomcat/jni/Sockaddr.java | 2 +- java/org/apache/tomcat/jni/Socket.java | 2 +- java/org/apache/tomcat/jni/Status.java | 2 +- java/org/apache/tomcat/jni/Stdlib.java | 2 +- java/org/apache/tomcat/jni/Time.java | 2 +- java/org/apache/tomcat/jni/User.java | 2 +- java/org/apache/tomcat/util/buf/Base64.java | 2 +- .../digester/AbstractObjectCreationFactory.java | 2 +- .../tomcat/util/digester/AbstractRulesImpl.java | 2 +- .../apache/tomcat/util/digester/ArrayStack.java | 2 +- .../tomcat/util/digester/CallMethodRule.java | 2 +- .../apache/tomcat/util/digester/CallParamRule.java | 2 +- java/org/apache/tomcat/util/digester/Digester.java | 2 +- .../tomcat/util/digester/FactoryCreateRule.java | 2 +- .../apache/tomcat/util/digester/GenericParser.java | 2 +- .../tomcat/util/digester/NodeCreateRule.java | 2 +- .../tomcat/util/digester/ObjectCreateRule.java | 2 +- .../util/digester/ObjectCreationFactory.java | 2 +- .../tomcat/util/digester/ObjectParamRule.java | 2 +- .../util/digester/ParserFeatureSetterFactory.java | 2 +- .../tomcat/util/digester/PathCallParamRule.java | 2 +- java/org/apache/tomcat/util/digester/Rule.java | 2 +- java/org/apache/tomcat/util/digester/RuleSet.java | 2 +- .../apache/tomcat/util/digester/RuleSetBase.java | 2 +- java/org/apache/tomcat/util/digester/Rules.java | 2 +- .../org/apache/tomcat/util/digester/RulesBase.java | 2 +- .../apache/tomcat/util/digester/SetNextRule.java | 2 +- .../tomcat/util/digester/SetPropertiesRule.java | 2 +- .../tomcat/util/digester/SetPropertyRule.java | 2 +- .../apache/tomcat/util/digester/SetRootRule.java | 2 +- .../apache/tomcat/util/digester/SetTopRule.java | 2 +- .../util/digester/WithDefaultsRulesWrapper.java | 2 +- .../apache/tomcat/util/digester/XercesParser.java | 2 +- java/org/apache/tomcat/util/http/BaseRequest.java | 2 +- .../util/http/fileupload/DefaultFileItem.java | 2 +- .../http/fileupload/DefaultFileItemFactory.java | 2 +- .../http/fileupload/DeferredFileOutputStream.java | 2 +- .../util/http/fileupload/DiskFileUpload.java | 2 +- .../tomcat/util/http/fileupload/FileItem.java | 2 +- .../util/http/fileupload/FileItemFactory.java | 2 +- .../tomcat/util/http/fileupload/FileUpload.java | 2 +- .../util/http/fileupload/FileUploadBase.java | 2 +- .../util/http/fileupload/FileUploadException.java | 2 +- .../util/http/fileupload/MultipartStream.java | 2 +- .../http/fileupload/ThresholdingOutputStream.java | 2 +- .../tomcat/util/http/fileupload/package.html | 2 +- .../tomcat/util/modeler/BaseAttributeFilter.java | 2 +- .../apache/tomcat/util/modeler/FeatureInfo.java | 2 +- .../apache/tomcat/util/modeler/ManagedBean.java | 2 +- .../tomcat/util/modeler/NotificationInfo.java | 2 +- .../apache/tomcat/util/modeler/ParameterInfo.java | 2 +- .../tomcat/util/modeler/mbeans-descriptors.dtd | 2 +- java/org/apache/tomcat/util/net/NioChannel.java | 354 +-- java/org/apache/tomcat/util/net/URL.java | 2 +- java/org/apache/tomcat/util/res/StringManager.java | 2 +- 581 files changed, 24275 insertions(+), 24275 deletions(-) diff --git a/java/javax/servlet/http/LocalStrings_es.properties b/java/javax/servlet/http/LocalStrings_es.properties index 0fe2cac4a..85cda003f 100644 --- a/java/javax/servlet/http/LocalStrings_es.properties +++ b/java/javax/servlet/http/LocalStrings_es.properties @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -# $Id: LocalStrings_es.properties 267129 2004-03-18 16:40:35Z jfarcand $ +# $Id$ # # Default localized string information # Localized para Locale es_ES diff --git a/java/javax/servlet/resources/XMLSchema.dtd b/java/javax/servlet/resources/XMLSchema.dtd index 0a758a751..7969fe143 100644 --- a/java/javax/servlet/resources/XMLSchema.dtd +++ b/java/javax/servlet/resources/XMLSchema.dtd @@ -1,7 +1,7 @@ - + diff --git a/java/javax/servlet/resources/datatypes.dtd b/java/javax/servlet/resources/datatypes.dtd index f0ca8d200..13e89208d 100644 --- a/java/javax/servlet/resources/datatypes.dtd +++ b/java/javax/servlet/resources/datatypes.dtd @@ -16,7 +16,7 @@ --> + Overview of the org.apache.commons.fileupload component diff --git a/java/org/apache/tomcat/util/modeler/BaseAttributeFilter.java b/java/org/apache/tomcat/util/modeler/BaseAttributeFilter.java index b9eca5cae..a142c083a 100644 --- a/java/org/apache/tomcat/util/modeler/BaseAttributeFilter.java +++ b/java/org/apache/tomcat/util/modeler/BaseAttributeFilter.java @@ -33,7 +33,7 @@ import javax.management.NotificationFilter; * supplied by the application.

* * @author Craig R. McClanahan - * @version $Revision: 155428 $ $Date: 2005-02-26 14:12:25 +0100 (sam., 26 févr. 2005) $ + * @version $Revision$ $Date$ */ public class BaseAttributeFilter implements NotificationFilter { diff --git a/java/org/apache/tomcat/util/modeler/FeatureInfo.java b/java/org/apache/tomcat/util/modeler/FeatureInfo.java index 7dedc87ca..e979da9a6 100644 --- a/java/org/apache/tomcat/util/modeler/FeatureInfo.java +++ b/java/org/apache/tomcat/util/modeler/FeatureInfo.java @@ -31,7 +31,7 @@ import javax.management.MBeanFeatureInfo; * ModelMBean beans exposed for management.

* * @author Craig R. McClanahan - * @version $Revision: 155428 $ $Date: 2005-02-26 14:12:25 +0100 (sam., 26 févr. 2005) $ + * @version $Revision$ $Date$ */ public class FeatureInfo implements Serializable { diff --git a/java/org/apache/tomcat/util/modeler/ManagedBean.java b/java/org/apache/tomcat/util/modeler/ManagedBean.java index 9d7c55b3e..04a6daac1 100644 --- a/java/org/apache/tomcat/util/modeler/ManagedBean.java +++ b/java/org/apache/tomcat/util/modeler/ManagedBean.java @@ -43,7 +43,7 @@ import javax.management.ServiceNotFoundException; * descriptor.

* * @author Craig R. McClanahan - * @version $Revision: 383268 $ $Date: 2006-03-05 03:02:01 +0100 (dim., 05 mars 2006) $ + * @version $Revision$ $Date$ */ public class ManagedBean implements java.io.Serializable diff --git a/java/org/apache/tomcat/util/modeler/NotificationInfo.java b/java/org/apache/tomcat/util/modeler/NotificationInfo.java index c685896bf..f924d7e14 100644 --- a/java/org/apache/tomcat/util/modeler/NotificationInfo.java +++ b/java/org/apache/tomcat/util/modeler/NotificationInfo.java @@ -29,7 +29,7 @@ import javax.management.MBeanNotificationInfo; * descriptor.

* * @author Craig R. McClanahan - * @version $Revision: 155428 $ $Date: 2005-02-26 14:12:25 +0100 (sam., 26 févr. 2005) $ + * @version $Revision$ $Date$ */ public class NotificationInfo extends FeatureInfo implements Serializable { diff --git a/java/org/apache/tomcat/util/modeler/ParameterInfo.java b/java/org/apache/tomcat/util/modeler/ParameterInfo.java index 003d14173..3771e982d 100644 --- a/java/org/apache/tomcat/util/modeler/ParameterInfo.java +++ b/java/org/apache/tomcat/util/modeler/ParameterInfo.java @@ -29,7 +29,7 @@ import javax.management.MBeanParameterInfo; * descriptor.

* * @author Craig R. McClanahan - * @version $Revision: 155428 $ $Date: 2005-02-26 14:12:25 +0100 (sam., 26 févr. 2005) $ + * @version $Revision$ $Date$ */ public class ParameterInfo extends FeatureInfo implements Serializable { diff --git a/java/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd b/java/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd index f2d9c61b6..8a6a85290 100644 --- a/java/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd +++ b/java/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd @@ -11,7 +11,7 @@ "-//Apache Software Foundation//DTD Model MBeans Configuration File" "http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd"> - $Id: mbeans-descriptors.dtd 155428 2005-02-26 13:12:25Z dirkv $ + $Id$ --> diff --git a/java/org/apache/tomcat/util/net/NioChannel.java b/java/org/apache/tomcat/util/net/NioChannel.java index 33b008ff0..2cff92b2e 100644 --- a/java/org/apache/tomcat/util/net/NioChannel.java +++ b/java/org/apache/tomcat/util/net/NioChannel.java @@ -1,177 +1,177 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You 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. - */ - - -package org.apache.tomcat.util.net; - -import java.io.IOException; -import java.nio.ByteBuffer; -import java.nio.channels.ByteChannel; -import java.nio.channels.SocketChannel; - -import org.apache.tomcat.util.net.NioEndpoint.Poller; -import org.apache.tomcat.util.net.SecureNioChannel.ApplicationBufferHandler; -import java.nio.channels.Selector; - -/** - * - * Base class for a SocketChannel wrapper used by the endpoint. - * This way, logic for a SSL socket channel remains the same as for - * a non SSL, making sure we don't need to code for any exception cases. - * - * @author Filip Hanik - * @version 1.0 - */ -public class NioChannel implements ByteChannel{ - - protected static ByteBuffer emptyBuf = ByteBuffer.allocate(0); - - protected SocketChannel sc = null; - - protected ApplicationBufferHandler bufHandler; - - protected Poller poller; - - public NioChannel(SocketChannel channel, ApplicationBufferHandler bufHandler) throws IOException { - this.sc = channel; - this.bufHandler = bufHandler; - } - - public void reset() throws IOException { - bufHandler.getReadBuffer().clear(); - bufHandler.getWriteBuffer().clear(); - } - - /** - * returns true if the network buffer has - * been flushed out and is empty - * @return boolean - */ - public boolean flush(Selector s) throws IOException { - return true; //no network buffer in the regular channel - } - - - /** - * Closes this channel. - * - * @throws IOException If an I/O error occurs - * @todo Implement this java.nio.channels.Channel method - */ - public void close() throws IOException { - getIOChannel().socket().close(); - sc.close(); - } - - public void close(boolean force) throws IOException { - if (isOpen() || force ) close(); - } - /** - * Tells whether or not this channel is open. - * - * @return true if, and only if, this channel is open - * @todo Implement this java.nio.channels.Channel method - */ - public boolean isOpen() { - return sc.isOpen(); - } - - /** - * Writes a sequence of bytes to this channel from the given buffer. - * - * @param src The buffer from which bytes are to be retrieved - * @return The number of bytes written, possibly zero - * @throws IOException If some other I/O error occurs - * @todo Implement this java.nio.channels.WritableByteChannel method - */ - public int write(ByteBuffer src) throws IOException { - return sc.write(src); - } - - /** - * Reads a sequence of bytes from this channel into the given buffer. - * - * @param dst The buffer into which bytes are to be transferred - * @return The number of bytes read, possibly zero, or -1 if the channel has reached end-of-stream - * @throws IOException If some other I/O error occurs - * @todo Implement this java.nio.channels.ReadableByteChannel method - */ - public int read(ByteBuffer dst) throws IOException { - return sc.read(dst); - } - - - /** - * getBufHandler - * - * @return ApplicationBufferHandler - * @todo Implement this org.apache.tomcat.util.net.SecureNioChannel method - */ - public ApplicationBufferHandler getBufHandler() { - return bufHandler; - } - - public Poller getPoller() { - return poller; - } - /** - * getIOChannel - * - * @return SocketChannel - * @todo Implement this org.apache.tomcat.util.net.SecureNioChannel method - */ - public SocketChannel getIOChannel() { - return sc; - } - - /** - * isClosing - * - * @return boolean - * @todo Implement this org.apache.tomcat.util.net.SecureNioChannel method - */ - public boolean isClosing() { - return false; - } - - /** - * isInitHandshakeComplete - * - * @return boolean - * @todo Implement this org.apache.tomcat.util.net.SecureNioChannel method - */ - public boolean isInitHandshakeComplete() { - return true; - } - - public int handshake(boolean read, boolean write) throws IOException { - return 0; - } - - public void setPoller(Poller poller) { - this.poller = poller; - } - - public void setIOChannel(SocketChannel IOChannel) { - this.sc = IOChannel; - } - - public String toString() { - return super.toString()+":"+this.sc.toString(); - } - -} +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You 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. + */ + + +package org.apache.tomcat.util.net; + +import java.io.IOException; +import java.nio.ByteBuffer; +import java.nio.channels.ByteChannel; +import java.nio.channels.SocketChannel; + +import org.apache.tomcat.util.net.NioEndpoint.Poller; +import org.apache.tomcat.util.net.SecureNioChannel.ApplicationBufferHandler; +import java.nio.channels.Selector; + +/** + * + * Base class for a SocketChannel wrapper used by the endpoint. + * This way, logic for a SSL socket channel remains the same as for + * a non SSL, making sure we don't need to code for any exception cases. + * + * @author Filip Hanik + * @version 1.0 + */ +public class NioChannel implements ByteChannel{ + + protected static ByteBuffer emptyBuf = ByteBuffer.allocate(0); + + protected SocketChannel sc = null; + + protected ApplicationBufferHandler bufHandler; + + protected Poller poller; + + public NioChannel(SocketChannel channel, ApplicationBufferHandler bufHandler) throws IOException { + this.sc = channel; + this.bufHandler = bufHandler; + } + + public void reset() throws IOException { + bufHandler.getReadBuffer().clear(); + bufHandler.getWriteBuffer().clear(); + } + + /** + * returns true if the network buffer has + * been flushed out and is empty + * @return boolean + */ + public boolean flush(Selector s) throws IOException { + return true; //no network buffer in the regular channel + } + + + /** + * Closes this channel. + * + * @throws IOException If an I/O error occurs + * @todo Implement this java.nio.channels.Channel method + */ + public void close() throws IOException { + getIOChannel().socket().close(); + sc.close(); + } + + public void close(boolean force) throws IOException { + if (isOpen() || force ) close(); + } + /** + * Tells whether or not this channel is open. + * + * @return true if, and only if, this channel is open + * @todo Implement this java.nio.channels.Channel method + */ + public boolean isOpen() { + return sc.isOpen(); + } + + /** + * Writes a sequence of bytes to this channel from the given buffer. + * + * @param src The buffer from which bytes are to be retrieved + * @return The number of bytes written, possibly zero + * @throws IOException If some other I/O error occurs + * @todo Implement this java.nio.channels.WritableByteChannel method + */ + public int write(ByteBuffer src) throws IOException { + return sc.write(src); + } + + /** + * Reads a sequence of bytes from this channel into the given buffer. + * + * @param dst The buffer into which bytes are to be transferred + * @return The number of bytes read, possibly zero, or -1 if the channel has reached end-of-stream + * @throws IOException If some other I/O error occurs + * @todo Implement this java.nio.channels.ReadableByteChannel method + */ + public int read(ByteBuffer dst) throws IOException { + return sc.read(dst); + } + + + /** + * getBufHandler + * + * @return ApplicationBufferHandler + * @todo Implement this org.apache.tomcat.util.net.SecureNioChannel method + */ + public ApplicationBufferHandler getBufHandler() { + return bufHandler; + } + + public Poller getPoller() { + return poller; + } + /** + * getIOChannel + * + * @return SocketChannel + * @todo Implement this org.apache.tomcat.util.net.SecureNioChannel method + */ + public SocketChannel getIOChannel() { + return sc; + } + + /** + * isClosing + * + * @return boolean + * @todo Implement this org.apache.tomcat.util.net.SecureNioChannel method + */ + public boolean isClosing() { + return false; + } + + /** + * isInitHandshakeComplete + * + * @return boolean + * @todo Implement this org.apache.tomcat.util.net.SecureNioChannel method + */ + public boolean isInitHandshakeComplete() { + return true; + } + + public int handshake(boolean read, boolean write) throws IOException { + return 0; + } + + public void setPoller(Poller poller) { + this.poller = poller; + } + + public void setIOChannel(SocketChannel IOChannel) { + this.sc = IOChannel; + } + + public String toString() { + return super.toString()+":"+this.sc.toString(); + } + +} diff --git a/java/org/apache/tomcat/util/net/URL.java b/java/org/apache/tomcat/util/net/URL.java index e264d6343..3521f6eb7 100644 --- a/java/org/apache/tomcat/util/net/URL.java +++ b/java/org/apache/tomcat/util/net/URL.java @@ -41,7 +41,7 @@ import java.net.MalformedURLException; * package someplace.

* * @author Craig R. McClanahan - * @version $Revision: 299472 $ $Date: 2004-06-20 02:08:15 +0200 (dim., 20 juin 2004) $ + * @version $Revision$ $Date$ */ public final class URL implements Serializable { diff --git a/java/org/apache/tomcat/util/res/StringManager.java b/java/org/apache/tomcat/util/res/StringManager.java index dba3ea2a0..593980ef1 100644 --- a/java/org/apache/tomcat/util/res/StringManager.java +++ b/java/org/apache/tomcat/util/res/StringManager.java @@ -42,7 +42,7 @@ import java.util.ResourceBundle; *

Please see the documentation for java.util.ResourceBundle for * more information. * - * @version $Revision: 299753 $ $Date: 2004-08-29 19:14:42 +0200 (dim., 29 août 2004) $ + * @version $Revision$ $Date$ * * @author James Duncan Davidson [duncan@eng.sun.com] * @author James Todd [gonzo@eng.sun.com] -- 2.11.0