This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git.
from 8fc84ec Remove fragment from RequestDispatcher target if
(incorrectly) present
new a3b80b0 Remove trailing whitespace
new 46a7a53 Align checkstyle config with 8.5.x and fix resulting warnings
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
RELEASE-NOTES | 2 +-
java/javax/annotation/Generated.java | 4 +-
java/javax/annotation/PostConstruct.java | 4 +-
java/javax/annotation/PreDestroy.java | 4 +-
java/javax/annotation/Resource.java | 4 +-
java/javax/annotation/Resources.java | 4 +-
java/javax/annotation/security/DeclareRoles.java | 4 +-
java/javax/annotation/security/DenyAll.java | 4 +-
java/javax/annotation/security/PermitAll.java | 4 +-
java/javax/annotation/security/RolesAllowed.java | 4 +-
java/javax/annotation/security/RunAs.java | 4 +-
java/javax/ejb/EJB.java | 4 +-
java/javax/ejb/EJBs.java | 4 +-
java/javax/el/ArrayELResolver.java | 4 +-
java/javax/el/BeanELResolver.java | 12 +-
java/javax/el/CompositeELResolver.java | 10 +-
java/javax/el/ELContext.java | 32 +-
java/javax/el/ELContextEvent.java | 6 +-
java/javax/el/ELContextListener.java | 6 +-
java/javax/el/ELException.java | 12 +-
java/javax/el/ELResolver.java | 18 +-
java/javax/el/Expression.java | 8 +-
java/javax/el/ExpressionFactory.java | 24 +-
java/javax/el/FunctionMapper.java | 6 +-
java/javax/el/ListELResolver.java | 4 +-
java/javax/el/MapELResolver.java | 10 +-
java/javax/el/MethodExpression.java | 10 +-
java/javax/el/MethodInfo.java | 18 +-
java/javax/el/MethodNotFoundException.java | 6 +-
java/javax/el/PropertyNotFoundException.java | 6 +-
java/javax/el/PropertyNotWritableException.java | 6 +-
java/javax/el/ResourceBundleELResolver.java | 18 +-
java/javax/el/Util.java | 4 +-
java/javax/el/ValueExpression.java | 12 +-
java/javax/el/ValueReference.java | 10 +-
java/javax/el/VariableMapper.java | 6 +-
java/javax/persistence/PersistenceContext.java | 4 +-
java/javax/persistence/PersistenceContextType.java | 4 +-
java/javax/persistence/PersistenceContexts.java | 4 +-
java/javax/persistence/PersistenceUnit.java | 4 +-
java/javax/persistence/PersistenceUnits.java | 4 +-
java/javax/servlet/AsyncContext.java | 32 +-
java/javax/servlet/AsyncEvent.java | 10 +-
java/javax/servlet/Filter.java | 4 +-
java/javax/servlet/FilterChain.java | 6 +-
java/javax/servlet/FilterConfig.java | 14 +-
java/javax/servlet/FilterRegistration.java | 14 +-
java/javax/servlet/GenericServlet.java | 22 +-
java/javax/servlet/HttpConstraintElement.java | 18 +-
.../javax/servlet/HttpMethodConstraintElement.java | 4 +-
java/javax/servlet/MultipartConfigElement.java | 16 +-
java/javax/servlet/Registration.java | 14 +-
java/javax/servlet/RequestDispatcher.java | 38 +-
java/javax/servlet/Servlet.java | 54 +-
java/javax/servlet/ServletConfig.java | 8 +-
.../javax/servlet/ServletContainerInitializer.java | 2 +-
java/javax/servlet/ServletContext.java | 42 +-
.../servlet/ServletContextAttributeEvent.java | 2 +-
.../servlet/ServletContextAttributeListener.java | 2 +-
java/javax/servlet/ServletContextEvent.java | 6 +-
java/javax/servlet/ServletContextListener.java | 4 +-
java/javax/servlet/ServletException.java | 10 +-
java/javax/servlet/ServletInputStream.java | 4 +-
java/javax/servlet/ServletOutputStream.java | 32 +-
java/javax/servlet/ServletRegistration.java | 8 +-
java/javax/servlet/ServletRequest.java | 58 +-
.../servlet/ServletRequestAttributeEvent.java | 8 +-
java/javax/servlet/ServletRequestEvent.java | 4 +-
java/javax/servlet/ServletRequestWrapper.java | 28 +-
java/javax/servlet/ServletResponse.java | 32 +-
java/javax/servlet/ServletResponseWrapper.java | 10 +-
java/javax/servlet/ServletSecurityElement.java | 26 +-
java/javax/servlet/SessionCookieConfig.java | 48 +-
java/javax/servlet/SingleThreadModel.java | 2 +-
java/javax/servlet/UnavailableException.java | 12 +-
java/javax/servlet/annotation/HandlesTypes.java | 6 +-
java/javax/servlet/annotation/HttpConstraint.java | 14 +-
.../servlet/annotation/HttpMethodConstraint.java | 16 +-
java/javax/servlet/annotation/MultipartConfig.java | 12 +-
java/javax/servlet/annotation/ServletSecurity.java | 10 +-
java/javax/servlet/annotation/WebFilter.java | 24 +-
java/javax/servlet/annotation/WebInitParam.java | 8 +-
java/javax/servlet/annotation/WebListener.java | 10 +-
java/javax/servlet/annotation/WebServlet.java | 22 +-
.../servlet/descriptor/JspConfigDescriptor.java | 4 +-
.../descriptor/JspPropertyGroupDescriptor.java | 4 +-
.../javax/servlet/descriptor/TaglibDescriptor.java | 4 +-
java/javax/servlet/http/HttpServletRequest.java | 52 +-
.../servlet/http/HttpServletRequestWrapper.java | 6 +-
java/javax/servlet/http/HttpServletResponse.java | 32 +-
.../servlet/http/HttpServletResponseWrapper.java | 10 +-
.../http/HttpSessionActivationListener.java | 8 +-
.../servlet/http/HttpSessionAttributeListener.java | 2 +-
.../servlet/http/HttpSessionBindingEvent.java | 10 +-
.../servlet/http/HttpSessionBindingListener.java | 6 +-
java/javax/servlet/http/HttpSessionEvent.java | 2 +-
java/javax/servlet/http/HttpSessionListener.java | 6 +-
java/javax/servlet/http/HttpUtils.java | 50 +-
java/javax/servlet/http/Part.java | 2 +-
java/javax/servlet/jsp/ErrorData.java | 12 +-
java/javax/servlet/jsp/HttpJspPage.java | 8 +-
java/javax/servlet/jsp/JspApplicationContext.java | 8 +-
java/javax/servlet/jsp/JspContext.java | 66 +-
java/javax/servlet/jsp/JspEngineInfo.java | 6 +-
java/javax/servlet/jsp/JspException.java | 14 +-
java/javax/servlet/jsp/JspFactory.java | 20 +-
java/javax/servlet/jsp/JspPage.java | 4 +-
java/javax/servlet/jsp/JspTagException.java | 6 +-
java/javax/servlet/jsp/JspWriter.java | 58 +-
java/javax/servlet/jsp/PageContext.java | 104 +--
java/javax/servlet/jsp/SkipPageException.java | 8 +-
java/javax/servlet/jsp/el/ELException.java | 10 +-
java/javax/servlet/jsp/el/Expression.java | 18 +-
java/javax/servlet/jsp/el/ExpressionEvaluator.java | 6 +-
java/javax/servlet/jsp/el/FunctionMapper.java | 4 +-
java/javax/servlet/jsp/el/VariableResolver.java | 4 +-
java/javax/servlet/jsp/el/package.html | 12 +-
java/javax/servlet/jsp/resources/jsp_2_1.xsd | 12 +-
java/javax/servlet/jsp/resources/jsp_2_2.xsd | 62 +-
java/javax/servlet/jsp/resources/jspxml.dtd | 2 +-
java/javax/servlet/jsp/resources/jspxml.xsd | 54 +-
.../jsp/resources/web-jsptaglibrary_2_1.xsd | 10 +-
java/javax/servlet/jsp/tagext/BodyContent.java | 12 +-
java/javax/servlet/jsp/tagext/BodyTag.java | 6 +-
java/javax/servlet/jsp/tagext/BodyTagSupport.java | 16 +-
.../servlet/jsp/tagext/DynamicAttributes.java | 16 +-
java/javax/servlet/jsp/tagext/FunctionInfo.java | 4 +-
java/javax/servlet/jsp/tagext/IterationTag.java | 12 +-
java/javax/servlet/jsp/tagext/JspFragment.java | 28 +-
java/javax/servlet/jsp/tagext/JspTag.java | 2 +-
java/javax/servlet/jsp/tagext/PageData.java | 8 +-
java/javax/servlet/jsp/tagext/SimpleTag.java | 86 +--
.../javax/servlet/jsp/tagext/SimpleTagSupport.java | 52 +-
java/javax/servlet/jsp/tagext/Tag.java | 36 +-
java/javax/servlet/jsp/tagext/TagAdapter.java | 18 +-
.../javax/servlet/jsp/tagext/TagAttributeInfo.java | 24 +-
java/javax/servlet/jsp/tagext/TagData.java | 12 +-
java/javax/servlet/jsp/tagext/TagExtraInfo.java | 24 +-
java/javax/servlet/jsp/tagext/TagFileInfo.java | 8 +-
java/javax/servlet/jsp/tagext/TagInfo.java | 24 +-
java/javax/servlet/jsp/tagext/TagLibraryInfo.java | 32 +-
.../servlet/jsp/tagext/TagLibraryValidator.java | 24 +-
java/javax/servlet/jsp/tagext/TagSupport.java | 4 +-
java/javax/servlet/jsp/tagext/TagVariableInfo.java | 12 +-
java/javax/servlet/jsp/tagext/TryCatchFinally.java | 10 +-
.../servlet/jsp/tagext/ValidationMessage.java | 6 +-
java/javax/servlet/jsp/tagext/VariableInfo.java | 10 +-
java/javax/servlet/jsp/tagext/package.html | 4 +-
java/javax/servlet/resources/XMLSchema.dtd | 6 +-
java/javax/servlet/resources/datatypes.dtd | 2 +-
java/javax/servlet/resources/javaee_6.xsd | 500 +++++++--------
.../servlet/resources/javaee_web_services_1_3.xsd | 122 ++--
.../resources/javaee_web_services_client_1_3.xsd | 188 +++---
java/javax/servlet/resources/web-app_2_2.dtd | 2 +-
java/javax/servlet/resources/web-app_2_5.xsd | 36 +-
java/javax/servlet/resources/web-app_3_0.xsd | 64 +-
java/javax/servlet/resources/web-common_3_0.xsd | 246 +++----
java/javax/servlet/resources/web-fragment_3_0.xsd | 64 +-
java/javax/servlet/resources/xml.xsd | 2 +-
java/javax/xml/ws/WebServiceRef.java | 4 +-
java/javax/xml/ws/WebServiceRefs.java | 4 +-
java/org/apache/catalina/Realm.java | 2 +-
java/org/apache/catalina/Valve.java | 10 +-
.../catalina/ant/BaseRedirectorHelperTask.java | 44 +-
java/org/apache/catalina/ant/DeployTask.java | 6 +-
java/org/apache/catalina/ant/FindLeaksTask.java | 4 +-
.../apache/catalina/ant/JKStatusUpdateTask.java | 18 +-
java/org/apache/catalina/ant/JMXGetTask.java | 8 +-
java/org/apache/catalina/ant/JMXQueryTask.java | 14 +-
java/org/apache/catalina/ant/JMXSetTask.java | 12 +-
java/org/apache/catalina/ant/ListTask.java | 4 +-
java/org/apache/catalina/ant/ReloadTask.java | 4 +-
java/org/apache/catalina/ant/ResourcesTask.java | 4 +-
java/org/apache/catalina/ant/ServerinfoTask.java | 4 +-
java/org/apache/catalina/ant/SessionsTask.java | 14 +-
java/org/apache/catalina/ant/StartTask.java | 4 +-
java/org/apache/catalina/ant/StopTask.java | 6 +-
java/org/apache/catalina/ant/UndeployTask.java | 4 +-
java/org/apache/catalina/ant/ValidatorTask.java | 6 +-
java/org/apache/catalina/ant/antlib.xml | 4 +-
java/org/apache/catalina/ant/jmx/Arg.java | 4 +-
.../catalina/ant/jmx/JMXAccessorCondition.java | 20 +-
.../catalina/ant/jmx/JMXAccessorCreateTask.java | 28 +-
.../ant/jmx/JMXAccessorEqualsCondition.java | 14 +-
.../catalina/ant/jmx/JMXAccessorGetTask.java | 22 +-
.../catalina/ant/jmx/JMXAccessorInvokeTask.java | 30 +-
.../catalina/ant/jmx/JMXAccessorQueryTask.java | 30 +-
.../catalina/ant/jmx/JMXAccessorSetTask.java | 32 +-
.../apache/catalina/ant/jmx/JMXAccessorTask.java | 40 +-
.../ant/jmx/JMXAccessorUnregisterTask.java | 12 +-
java/org/apache/catalina/ant/jmx/package.html | 2 +-
java/org/apache/catalina/ant/package.html | 2 +-
.../apache/catalina/authenticator/Constants.java | 4 +-
.../catalina/authenticator/SSLAuthenticator.java | 4 +-
.../catalina/authenticator/SavedRequest.java | 14 +-
.../catalina/authenticator/SingleSignOn.java | 20 +-
.../catalina/authenticator/SingleSignOnEntry.java | 4 +-
.../authenticator/SpnegoAuthenticator.java | 14 +-
.../catalina/authenticator/mbeans-descriptors.xml | 92 +--
.../apache/catalina/connector/RequestFacade.java | 2 +-
.../org/apache/catalina/core/AccessLogAdapter.java | 4 +-
.../catalina/core/ApplicationContextFacade.java | 90 +--
.../catalina/core/ApplicationFilterChain.java | 86 +--
.../catalina/core/ApplicationFilterFactory.java | 40 +-
.../core/ApplicationFilterRegistration.java | 42 +-
.../catalina/core/ApplicationHttpResponse.java | 4 +-
.../core/ApplicationJspConfigDescriptor.java | 4 +-
.../ApplicationJspPropertyGroupDescriptor.java | 54 +-
.../apache/catalina/core/ApplicationRequest.java | 8 +-
.../apache/catalina/core/ApplicationResponse.java | 4 +-
.../core/ApplicationSessionCookieConfig.java | 12 +-
.../catalina/core/ApplicationTaglibDescriptor.java | 6 +-
.../apache/catalina/core/AsyncListenerWrapper.java | 8 +-
java/org/apache/catalina/core/Constants.java | 4 +-
java/org/apache/catalina/core/StandardEngine.java | 18 +-
.../apache/catalina/core/StandardEngineValve.java | 6 +-
.../org/apache/catalina/core/StandardPipeline.java | 26 +-
java/org/apache/catalina/core/StandardServer.java | 62 +-
java/org/apache/catalina/core/StandardService.java | 16 +-
.../catalina/core/StandardThreadExecutor.java | 50 +-
.../catalina/core/StandardWrapperFacade.java | 4 +-
.../core/ThreadLocalLeakPreventionListener.java | 10 +-
.../apache/catalina/core/mbeans-descriptors.xml | 706 ++++++++++-----------
.../catalina/deploy/ApplicationParameter.java | 4 +-
java/org/apache/catalina/deploy/Constants.java | 4 +-
java/org/apache/catalina/deploy/ContextEjb.java | 6 +-
.../apache/catalina/deploy/ContextEnvironment.java | 4 +-
.../org/apache/catalina/deploy/ContextHandler.java | 6 +-
.../apache/catalina/deploy/ContextLocalEjb.java | 6 +-
.../apache/catalina/deploy/ContextResource.java | 10 +-
.../catalina/deploy/ContextResourceEnvRef.java | 6 +-
.../catalina/deploy/ContextResourceLink.java | 4 +-
.../org/apache/catalina/deploy/ContextService.java | 10 +-
.../apache/catalina/deploy/ContextTransaction.java | 10 +-
java/org/apache/catalina/deploy/ErrorPage.java | 4 +-
java/org/apache/catalina/deploy/FilterDef.java | 16 +-
java/org/apache/catalina/deploy/FilterMap.java | 38 +-
java/org/apache/catalina/deploy/Injectable.java | 4 +-
.../apache/catalina/deploy/InjectionTarget.java | 4 +-
java/org/apache/catalina/deploy/LoginConfig.java | 4 +-
.../apache/catalina/deploy/MessageDestination.java | 4 +-
.../catalina/deploy/MessageDestinationRef.java | 6 +-
java/org/apache/catalina/deploy/MultipartDef.java | 18 +-
.../apache/catalina/deploy/NamingResources.java | 58 +-
java/org/apache/catalina/deploy/ResourceBase.java | 6 +-
.../apache/catalina/deploy/SecurityCollection.java | 4 +-
.../apache/catalina/deploy/SecurityConstraint.java | 24 +-
.../apache/catalina/deploy/SecurityRoleRef.java | 4 +-
java/org/apache/catalina/deploy/ServletDef.java | 30 +-
java/org/apache/catalina/deploy/SessionConfig.java | 24 +-
.../apache/catalina/deploy/mbeans-descriptors.xml | 36 +-
.../catalina/filters/AddDefaultCharsetFilter.java | 14 +-
java/org/apache/catalina/filters/Constants.java | 8 +-
.../org/apache/catalina/filters/ExpiresFilter.java | 46 +-
.../apache/catalina/filters/RemoteAddrFilter.java | 10 +-
.../catalina/filters/RequestDumperFilter.java | 44 +-
.../org/apache/catalina/filters/RequestFilter.java | 16 +-
.../apache/catalina/filters/WebdavFixFilter.java | 12 +-
java/org/apache/catalina/ha/CatalinaCluster.java | 34 +-
java/org/apache/catalina/ha/ClusterDeployer.java | 4 +-
java/org/apache/catalina/ha/ClusterListener.java | 12 +-
java/org/apache/catalina/ha/ClusterManager.java | 12 +-
java/org/apache/catalina/ha/ClusterMessage.java | 2 +-
.../org/apache/catalina/ha/ClusterMessageBase.java | 2 +-
java/org/apache/catalina/ha/ClusterRuleSet.java | 158 ++---
java/org/apache/catalina/ha/ClusterSession.java | 4 +-
java/org/apache/catalina/ha/ClusterValve.java | 4 +-
.../ha/authenticator/ClusterSingleSignOn.java | 2 +-
.../apache/catalina/ha/backend/CollectedInfo.java | 8 +-
.../catalina/ha/backend/HeartbeatListener.java | 6 +-
.../catalina/ha/backend/MultiCastSender.java | 8 +-
java/org/apache/catalina/ha/backend/Proxy.java | 4 +-
java/org/apache/catalina/ha/backend/Sender.java | 4 +-
java/org/apache/catalina/ha/backend/TcpSender.java | 16 +-
java/org/apache/catalina/ha/deploy/Constants.java | 4 +-
.../apache/catalina/ha/deploy/FarmWarDeployer.java | 34 +-
.../catalina/ha/deploy/FileChangeListener.java | 4 +-
.../org/apache/catalina/ha/deploy/FileMessage.java | 24 +-
.../catalina/ha/deploy/FileMessageFactory.java | 32 +-
.../apache/catalina/ha/deploy/UndeployMessage.java | 2 +-
java/org/apache/catalina/ha/deploy/WarWatcher.java | 8 +-
.../apache/catalina/ha/jmx/ClusterJmxHelper.java | 26 +-
.../ha/session/ClusterSessionListener.java | 2 +-
java/org/apache/catalina/ha/session/Constants.java | 4 +-
.../catalina/ha/session/JvmRouteBinderValve.java | 8 +-
.../session/JvmRouteSessionIDBinderListener.java | 12 +-
.../catalina/ha/session/SerializablePrincipal.java | 18 +-
.../catalina/ha/session/SessionMessageImpl.java | 8 +-
java/org/apache/catalina/ha/tcp/Constants.java | 4 +-
.../apache/catalina/ha/tcp/ReplicationValve.java | 78 +--
.../apache/catalina/ha/tcp/SendMessageData.java | 6 +-
.../apache/catalina/ha/tcp/SimpleTcpCluster.java | 110 ++--
.../apache/catalina/ha/util/IDynamicProperty.java | 12 +-
java/org/apache/catalina/loader/Constants.java | 4 +-
.../apache/catalina/loader/JdbcLeakPrevention.java | 6 +-
.../catalina/loader/ParallelWebappClassLoader.java | 4 +-
java/org/apache/catalina/loader/ResourceEntry.java | 4 +-
.../catalina/loader/StandardClassLoader.java | 4 +-
.../catalina/loader/StandardClassLoaderMBean.java | 4 +-
.../apache/catalina/loader/WebappClassLoader.java | 2 +-
.../apache/catalina/loader/mbeans-descriptors.xml | 10 +-
java/org/apache/catalina/manager/Constants.java | 18 +-
.../apache/catalina/manager/DummyProxySession.java | 6 +-
.../apache/catalina/manager/JMXProxyServlet.java | 10 +-
java/org/apache/catalina/manager/JspHelper.java | 4 +-
.../catalina/manager/StatusManagerServlet.java | 14 +-
.../apache/catalina/manager/host/Constants.java | 4 +-
.../manager/host/HTMLHostManagerServlet.java | 26 +-
.../catalina/manager/host/HostManagerServlet.java | 56 +-
.../manager/util/BaseSessionComparator.java | 6 +-
.../apache/catalina/manager/util/SessionUtils.java | 100 ++-
.../org/apache/catalina/mbeans/ClassNameMBean.java | 4 +-
.../org/apache/catalina/mbeans/ConnectorMBean.java | 8 +-
java/org/apache/catalina/mbeans/Constants.java | 4 +-
.../org/apache/catalina/mbeans/ContainerMBean.java | 58 +-
.../catalina/mbeans/ContextEnvironmentMBean.java | 14 +-
java/org/apache/catalina/mbeans/ContextMBean.java | 86 +--
.../catalina/mbeans/ContextResourceLinkMBean.java | 34 +-
.../catalina/mbeans/ContextResourceMBean.java | 34 +-
.../mbeans/GlobalResourcesLifecycleListener.java | 4 +-
java/org/apache/catalina/mbeans/GroupMBean.java | 4 +-
java/org/apache/catalina/mbeans/MBeanFactory.java | 126 ++--
java/org/apache/catalina/mbeans/MBeanUtils.java | 168 ++---
.../catalina/mbeans/MemoryUserDatabaseMBean.java | 4 +-
.../catalina/mbeans/NamingResourcesMBean.java | 72 +--
java/org/apache/catalina/mbeans/RoleMBean.java | 4 +-
java/org/apache/catalina/mbeans/ServiceMBean.java | 80 +--
java/org/apache/catalina/mbeans/UserMBean.java | 4 +-
.../apache/catalina/mbeans/mbeans-descriptors.xml | 6 +-
java/org/apache/catalina/realm/CombinedRealm.java | 28 +-
java/org/apache/catalina/realm/Constants.java | 6 +-
.../apache/catalina/realm/GenericPrincipal.java | 22 +-
.../apache/catalina/realm/JAASCallbackHandler.java | 16 +-
.../catalina/realm/JAASMemoryLoginModule.java | 8 +-
java/org/apache/catalina/realm/LockOutRealm.java | 42 +-
java/org/apache/catalina/realm/MemoryRuleSet.java | 4 +-
.../apache/catalina/realm/UserDatabaseRealm.java | 10 +-
.../apache/catalina/realm/mbeans-descriptors.xml | 90 +--
java/org/apache/catalina/session/Constants.java | 4 +-
java/org/apache/catalina/session/FileStore.java | 8 +-
java/org/apache/catalina/session/JDBCStore.java | 28 +-
java/org/apache/catalina/session/ManagerBase.java | 84 +--
.../apache/catalina/session/PersistentManager.java | 6 +-
.../catalina/session/PersistentManagerBase.java | 70 +-
.../apache/catalina/session/StandardManager.java | 6 +-
.../catalina/session/StandardSessionFacade.java | 4 +-
java/org/apache/catalina/session/StoreBase.java | 18 +-
.../session/TooManyActiveSessionsException.java | 6 +-
.../apache/catalina/session/mbeans-descriptors.xml | 64 +-
.../catalina/ssi/ByteArrayServletOutputStream.java | 4 +-
.../apache/catalina/ssi/ExpressionParseTree.java | 4 +-
.../apache/catalina/ssi/ExpressionTokenizer.java | 2 +-
java/org/apache/catalina/ssi/SSICommand.java | 4 +-
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 | 4 +-
.../apache/catalina/ssi/SSIExternalResolver.java | 8 +-
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/SSIProcessor.java | 14 +-
java/org/apache/catalina/ssi/SSIServlet.java | 26 +-
.../catalina/ssi/SSIServletExternalResolver.java | 8 +-
.../apache/catalina/ssi/SSIServletRequestUtil.java | 2 +-
java/org/apache/catalina/ssi/SSISet.java | 2 +-
.../catalina/ssi/SSIStopProcessingException.java | 2 +-
java/org/apache/catalina/startup/Bootstrap.java | 2 +-
.../catalina/startup/CatalinaProperties.java | 10 +-
.../catalina/startup/ClassLoaderFactory.java | 18 +-
.../catalina/startup/ConnectorCreateRule.java | 20 +-
.../apache/catalina/startup/ContextRuleSet.java | 4 +-
.../startup/CopyParentClassLoaderRule.java | 4 +-
.../apache/catalina/startup/DigesterFactory.java | 22 +-
java/org/apache/catalina/startup/Embedded.java | 20 +-
java/org/apache/catalina/startup/EngineConfig.java | 4 +-
.../org/apache/catalina/startup/EngineRuleSet.java | 2 +-
java/org/apache/catalina/startup/ExpandWar.java | 30 +-
.../apache/catalina/startup/HomesUserDatabase.java | 4 +-
java/org/apache/catalina/startup/HostRuleSet.java | 4 +-
.../catalina/startup/LifecycleListenerRule.java | 10 +-
.../org/apache/catalina/startup/NamingRuleSet.java | 4 +-
java/org/apache/catalina/startup/RealmRuleSet.java | 4 +-
.../catalina/startup/SetAllPropertiesRule.java | 14 +-
.../catalina/startup/SetContextPropertiesRule.java | 12 +-
.../apache/catalina/startup/SetNextNamingRule.java | 20 +-
java/org/apache/catalina/startup/TldConfig.java | 52 +-
java/org/apache/catalina/startup/TldRuleSet.java | 26 +-
java/org/apache/catalina/startup/Tool.java | 6 +-
java/org/apache/catalina/startup/UserConfig.java | 8 +-
java/org/apache/catalina/startup/UserDatabase.java | 4 +-
java/org/apache/catalina/startup/WebRuleSet.java | 96 +--
.../apache/catalina/startup/XmlErrorHandler.java | 10 +-
.../apache/catalina/startup/mbeans-descriptors.xml | 26 +-
.../apache/catalina/tribes/ChannelException.java | 38 +-
.../apache/catalina/tribes/ChannelInterceptor.java | 32 +-
.../apache/catalina/tribes/ChannelListener.java | 18 +-
.../org/apache/catalina/tribes/ChannelMessage.java | 22 +-
.../apache/catalina/tribes/ChannelReceiver.java | 20 +-
java/org/apache/catalina/tribes/ChannelSender.java | 12 +-
java/org/apache/catalina/tribes/Constants.java | 4 +-
java/org/apache/catalina/tribes/ErrorHandler.java | 12 +-
java/org/apache/catalina/tribes/Heartbeat.java | 6 +-
.../org/apache/catalina/tribes/ManagedChannel.java | 10 +-
.../apache/catalina/tribes/MembershipListener.java | 6 +-
.../apache/catalina/tribes/MembershipService.java | 42 +-
.../apache/catalina/tribes/MessageListener.java | 22 +-
java/org/apache/catalina/tribes/UniqueId.java | 16 +-
.../catalina/tribes/group/AbsoluteOrder.java | 26 +-
.../catalina/tribes/group/ChannelCoordinator.java | 42 +-
.../tribes/group/ChannelInterceptorBase.java | 8 +-
.../catalina/tribes/group/ExtendedRpcCallback.java | 14 +-
.../apache/catalina/tribes/group/GroupChannel.java | 2 +-
.../catalina/tribes/group/InterceptorPayload.java | 6 +-
.../org/apache/catalina/tribes/group/Response.java | 6 +-
.../apache/catalina/tribes/group/RpcCallback.java | 12 +-
.../apache/catalina/tribes/group/RpcChannel.java | 62 +-
.../apache/catalina/tribes/group/RpcMessage.java | 12 +-
.../interceptors/DomainFilterInterceptor.java | 6 +-
.../interceptors/FragmentationInterceptor.java | 48 +-
.../tribes/group/interceptors/GzipInterceptor.java | 10 +-
.../interceptors/MessageDispatch15Interceptor.java | 10 +-
.../interceptors/MessageDispatchInterceptor.java | 32 +-
.../group/interceptors/NonBlockingCoordinator.java | 176 ++---
.../group/interceptors/OrderInterceptor.java | 68 +-
.../group/interceptors/SimpleCoordinator.java | 10 +-
.../interceptors/StaticMembershipInterceptor.java | 6 +-
.../group/interceptors/TcpPingInterceptor.java | 34 +-
.../group/interceptors/ThroughputInterceptor.java | 12 +-
java/org/apache/catalina/tribes/io/BufferPool.java | 4 +-
.../org/apache/catalina/tribes/io/ChannelData.java | 54 +-
.../tribes/io/DirectByteArrayOutputStream.java | 10 +-
.../apache/catalina/tribes/io/ListenCallback.java | 8 +-
.../catalina/tribes/io/ReplicationStream.java | 22 +-
.../org/apache/catalina/tribes/io/XByteBuffer.java | 84 +--
.../catalina/tribes/membership/Constants.java | 4 +-
.../catalina/tribes/membership/McastService.java | 20 +-
.../tribes/membership/McastServiceImpl.java | 52 +-
.../catalina/tribes/membership/Membership.java | 38 +-
.../catalina/tribes/membership/StaticMember.java | 16 +-
java/org/apache/catalina/tribes/package.html | 4 +-
.../tribes/tipis/AbstractReplicatedMap.java | 2 +-
.../catalina/tribes/tipis/LazyReplicatedMap.java | 32 +-
.../catalina/tribes/tipis/ReplicatedMap.java | 4 +-
.../catalina/tribes/tipis/ReplicatedMapEntry.java | 34 +-
.../apache/catalina/tribes/tipis/Streamable.java | 12 +-
.../catalina/tribes/transport/AbstractRxTask.java | 14 +-
.../catalina/tribes/transport/Constants.java | 6 +-
.../catalina/tribes/transport/DataSender.java | 8 +-
.../tribes/transport/MultiPointSender.java | 4 +-
.../catalina/tribes/transport/PooledSender.java | 20 +-
.../catalina/tribes/transport/ReceiverBase.java | 6 +-
.../tribes/transport/ReplicationTransmitter.java | 22 +-
.../catalina/tribes/transport/RxTaskPool.java | 18 +-
.../catalina/tribes/transport/SenderState.java | 34 +-
.../catalina/tribes/transport/bio/BioReceiver.java | 8 +-
.../tribes/transport/bio/BioReplicationTask.java | 22 +-
.../tribes/transport/bio/MultipointBioSender.java | 2 +-
.../tribes/transport/bio/PooledMultiSender.java | 4 +-
.../tribes/transport/bio/util/LinkObject.java | 6 +-
.../bio/util/SingleRemoveSynchronizedAddLock.java | 16 +-
.../catalina/tribes/transport/nio/NioSender.java | 4 +-
.../tribes/transport/nio/PooledParallelSender.java | 4 +-
java/org/apache/catalina/tribes/util/Arrays.java | 40 +-
.../catalina/tribes/util/ExecutorFactory.java | 6 +-
java/org/apache/catalina/tribes/util/Logs.java | 6 +-
.../apache/catalina/tribes/util/StringManager.java | 4 +-
.../catalina/tribes/util/TcclThreadFactory.java | 12 +-
.../apache/catalina/tribes/util/UUIDGenerator.java | 14 +-
java/org/apache/catalina/users/AbstractGroup.java | 6 +-
java/org/apache/catalina/users/AbstractRole.java | 4 +-
java/org/apache/catalina/users/AbstractUser.java | 4 +-
java/org/apache/catalina/users/Constants.java | 4 +-
java/org/apache/catalina/users/MemoryGroup.java | 4 +-
java/org/apache/catalina/users/MemoryRole.java | 4 +-
java/org/apache/catalina/users/MemoryUser.java | 4 +-
.../apache/catalina/users/MemoryUserDatabase.java | 4 +-
.../catalina/users/MemoryUserDatabaseFactory.java | 4 +-
java/org/apache/catalina/util/Base64.java | 56 +-
java/org/apache/catalina/util/CharsetMapper.java | 10 +-
java/org/apache/catalina/util/ContextName.java | 48 +-
.../catalina/util/CustomObjectInputStream.java | 4 +-
java/org/apache/catalina/util/DOMWriter.java | 10 +-
java/org/apache/catalina/util/DateTool.java | 6 +-
java/org/apache/catalina/util/Enumerator.java | 6 +-
java/org/apache/catalina/util/Extension.java | 8 +-
.../apache/catalina/util/ExtensionValidator.java | 68 +-
java/org/apache/catalina/util/IOTools.java | 20 +-
java/org/apache/catalina/util/InstanceSupport.java | 6 +-
.../apache/catalina/util/LifecycleMBeanBase.java | 68 +-
.../org/apache/catalina/util/LifecycleSupport.java | 8 +-
java/org/apache/catalina/util/MIME2Java.java | 4 +-
.../org/apache/catalina/util/ManifestResource.java | 40 +-
java/org/apache/catalina/util/RequestUtil.java | 18 +-
java/org/apache/catalina/util/ResourceSet.java | 4 +-
java/org/apache/catalina/util/SchemaResolver.java | 4 +-
java/org/apache/catalina/util/ServerInfo.java | 4 +-
java/org/apache/catalina/util/Strftime.java | 14 +-
java/org/apache/catalina/util/StringParser.java | 4 +-
java/org/apache/catalina/util/TomcatCSS.java | 4 +-
java/org/apache/catalina/util/XMLWriter.java | 4 +-
.../apache/catalina/valves/PersistentValve.java | 8 +-
java/org/apache/catalina/websocket/Constants.java | 4 +-
.../apache/catalina/websocket/MessageInbound.java | 4 +-
.../apache/catalina/websocket/StreamInbound.java | 8 +-
java/org/apache/catalina/websocket/WsFrame.java | 4 +-
.../websocket/WsHttpServletRequestWrapper.java | 4 +-
.../apache/catalina/websocket/WsInputStream.java | 4 +-
java/org/apache/catalina/websocket/WsOutbound.java | 28 +-
java/org/apache/coyote/ActionCode.java | 16 +-
java/org/apache/coyote/ActionHook.java | 4 +-
java/org/apache/coyote/Adapter.java | 6 +-
java/org/apache/coyote/AsyncContextCallback.java | 2 +-
java/org/apache/coyote/Constants.java | 2 +-
java/org/apache/coyote/InputBuffer.java | 4 +-
java/org/apache/coyote/OutputBuffer.java | 4 +-
java/org/apache/coyote/Request.java | 72 +--
java/org/apache/coyote/RequestInfo.java | 6 +-
.../org/apache/coyote/ajp/AbstractAjpProtocol.java | 6 +-
java/org/apache/coyote/ajp/AjpAprProtocol.java | 6 +-
java/org/apache/coyote/ajp/AjpMessage.java | 74 +--
java/org/apache/coyote/ajp/AjpNioProtocol.java | 12 +-
java/org/apache/coyote/ajp/AjpProtocol.java | 12 +-
java/org/apache/coyote/ajp/Constants.java | 8 +-
.../coyote/http11/AbstractHttp11JsseProtocol.java | 16 +-
.../apache/coyote/http11/AbstractInputBuffer.java | 18 +-
.../apache/coyote/http11/AbstractOutputBuffer.java | 74 +--
java/org/apache/coyote/http11/Constants.java | 28 +-
.../apache/coyote/http11/Http11AprProtocol.java | 14 +-
.../apache/coyote/http11/Http11NioProtocol.java | 2 +-
java/org/apache/coyote/http11/Http11Processor.java | 22 +-
java/org/apache/coyote/http11/Http11Protocol.java | 14 +-
java/org/apache/coyote/http11/InputFilter.java | 8 +-
.../coyote/http11/LocalStrings_ja.properties | 2 +-
java/org/apache/coyote/http11/OutputFilter.java | 12 +-
.../coyote/http11/filters/BufferedInputFilter.java | 2 +-
.../coyote/http11/filters/ChunkedInputFilter.java | 70 +-
.../coyote/http11/filters/ChunkedOutputFilter.java | 10 +-
.../http11/filters/FlushableGZIPOutputStream.java | 2 +-
.../coyote/http11/filters/GzipOutputFilter.java | 10 +-
.../coyote/http11/filters/IdentityInputFilter.java | 14 +-
.../http11/filters/IdentityOutputFilter.java | 10 +-
.../http11/filters/SavedRequestInputFilter.java | 12 +-
.../coyote/http11/filters/VoidInputFilter.java | 14 +-
.../coyote/http11/filters/VoidOutputFilter.java | 12 +-
.../coyote/http11/upgrade/UpgradeInbound.java | 2 +-
.../coyote/http11/upgrade/UpgradeOutbound.java | 2 +-
.../http11/upgrade/servlet31/WebConnection.java | 2 +-
java/org/apache/el/ExpressionFactoryImpl.java | 8 +-
java/org/apache/el/MethodExpressionImpl.java | 60 +-
java/org/apache/el/MethodExpressionLiteral.java | 4 +-
java/org/apache/el/ValueExpressionImpl.java | 40 +-
java/org/apache/el/ValueExpressionLiteral.java | 4 +-
java/org/apache/el/lang/EvaluationContext.java | 4 +-
java/org/apache/el/lang/FunctionMapperFactory.java | 4 +-
java/org/apache/el/lang/FunctionMapperImpl.java | 16 +-
java/org/apache/el/lang/VariableMapperFactory.java | 4 +-
java/org/apache/el/lang/VariableMapperImpl.java | 4 +-
java/org/apache/el/parser/ArithmeticNode.java | 4 +-
java/org/apache/el/parser/AstDotSuffix.java | 2 +-
java/org/apache/el/parser/AstIdentifier.java | 2 +-
java/org/apache/el/parser/AstMethodParameters.java | 2 +-
java/org/apache/el/parser/AstValue.java | 30 +-
java/org/apache/el/parser/BooleanNode.java | 4 +-
.../org/apache/el/parser/ELParserTokenManager.java | 30 +-
java/org/apache/el/parser/Node.java | 12 +-
java/org/apache/el/parser/NodeVisitor.java | 4 +-
java/org/apache/el/parser/SimpleNode.java | 6 +-
java/org/apache/el/util/MessageFactory.java | 4 +-
java/org/apache/el/util/ReflectionUtil.java | 36 +-
java/org/apache/el/util/Validation.java | 14 +-
java/org/apache/jasper/Constants.java | 72 +--
java/org/apache/jasper/EmbeddedServletOptions.java | 210 +++---
java/org/apache/jasper/JasperException.java | 8 +-
java/org/apache/jasper/compiler/AntCompiler.java | 74 +--
.../apache/jasper/compiler/AttributeParser.java | 26 +-
.../org/apache/jasper/compiler/BeanRepository.java | 14 +-
java/org/apache/jasper/compiler/Compiler.java | 24 +-
.../jasper/compiler/DefaultErrorHandler.java | 24 +-
java/org/apache/jasper/compiler/Dumper.java | 16 +-
.../apache/jasper/compiler/ELFunctionMapper.java | 18 +-
java/org/apache/jasper/compiler/ELNode.java | 6 +-
.../apache/jasper/compiler/ErrorDispatcher.java | 40 +-
java/org/apache/jasper/compiler/ErrorHandler.java | 6 +-
.../jasper/compiler/ImplicitTagLibraryInfo.java | 18 +-
java/org/apache/jasper/compiler/JarResource.java | 20 +-
.../apache/jasper/compiler/JarScannerFactory.java | 6 +-
.../org/apache/jasper/compiler/JarURLResource.java | 16 +-
java/org/apache/jasper/compiler/JasperTagInfo.java | 6 +-
java/org/apache/jasper/compiler/JspConfig.java | 22 +-
.../apache/jasper/compiler/JspDocumentParser.java | 10 +-
java/org/apache/jasper/compiler/Localizer.java | 20 +-
java/org/apache/jasper/compiler/Mark.java | 20 +-
java/org/apache/jasper/compiler/Node.java | 66 +-
java/org/apache/jasper/compiler/PageDataImpl.java | 20 +-
java/org/apache/jasper/compiler/Parser.java | 74 +--
.../apache/jasper/compiler/ScriptingVariabler.java | 8 +-
java/org/apache/jasper/compiler/ServletWriter.java | 10 +-
java/org/apache/jasper/compiler/SmapGenerator.java | 6 +-
java/org/apache/jasper/compiler/SmapStratum.java | 10 +-
java/org/apache/jasper/compiler/TagConstants.java | 4 +-
.../apache/jasper/compiler/TagLibraryInfoImpl.java | 26 +-
.../apache/jasper/compiler/TagPluginManager.java | 4 +-
java/org/apache/jasper/compiler/TextOptimizer.java | 8 +-
java/org/apache/jasper/compiler/TldLocation.java | 22 +-
java/org/apache/jasper/compiler/WebXml.java | 16 +-
.../jasper/compiler/tagplugin/TagPlugin.java | 4 +-
.../compiler/tagplugin/TagPluginContext.java | 4 +-
java/org/apache/jasper/el/ELContextImpl.java | 6 +-
java/org/apache/jasper/el/ELContextWrapper.java | 8 +-
java/org/apache/jasper/el/ELResolverImpl.java | 4 +-
.../apache/jasper/el/ExpressionEvaluatorImpl.java | 6 +-
java/org/apache/jasper/el/ExpressionImpl.java | 6 +-
java/org/apache/jasper/el/FunctionMapperImpl.java | 6 +-
java/org/apache/jasper/el/JspELException.java | 4 +-
java/org/apache/jasper/el/JspMethodExpression.java | 4 +-
.../jasper/el/JspMethodNotFoundException.java | 4 +-
.../jasper/el/JspPropertyNotFoundException.java | 4 +-
.../jasper/el/JspPropertyNotWritableException.java | 4 +-
java/org/apache/jasper/el/JspValueExpression.java | 6 +-
.../org/apache/jasper/el/VariableResolverImpl.java | 6 +-
.../jasper/resources/LocalStrings.properties | 26 +-
.../jasper/resources/LocalStrings_es.properties | 16 +-
.../jasper/resources/LocalStrings_fr.properties | 14 +-
.../org/apache/jasper/runtime/BodyContentImpl.java | 108 ++--
java/org/apache/jasper/runtime/ExceptionUtils.java | 8 +-
java/org/apache/jasper/runtime/HttpJspBase.java | 22 +-
.../jasper/runtime/InstanceManagerFactory.java | 6 +-
.../apache/jasper/runtime/JspContextWrapper.java | 12 +-
java/org/apache/jasper/runtime/JspFactoryImpl.java | 10 +-
.../apache/jasper/runtime/JspFragmentHelper.java | 20 +-
.../apache/jasper/runtime/JspRuntimeLibrary.java | 92 +--
.../apache/jasper/runtime/JspSourceDependent.java | 4 +-
java/org/apache/jasper/runtime/JspWriterImpl.java | 140 ++--
.../org/apache/jasper/runtime/PageContextImpl.java | 20 +-
.../jasper/runtime/PerThreadTagHandlerPool.java | 8 +-
.../jasper/runtime/ProtectedFunctionMapper.java | 14 +-
.../runtime/ServletResponseWrapperInclude.java | 6 +-
java/org/apache/jasper/runtime/TagHandlerPool.java | 10 +-
java/org/apache/jasper/security/SecurityUtil.java | 12 +-
java/org/apache/jasper/servlet/JasperLoader.java | 56 +-
.../apache/jasper/servlet/JspCServletContext.java | 8 +-
java/org/apache/jasper/tagplugins/jstl/Util.java | 86 +--
.../apache/jasper/tagplugins/jstl/core/Catch.java | 36 +-
.../apache/jasper/tagplugins/jstl/core/Choose.java | 10 +-
.../jasper/tagplugins/jstl/core/ForEach.java | 84 +--
.../jasper/tagplugins/jstl/core/ForTokens.java | 32 +-
.../org/apache/jasper/tagplugins/jstl/core/If.java | 6 +-
.../apache/jasper/tagplugins/jstl/core/Import.java | 140 ++--
.../jasper/tagplugins/jstl/core/Otherwise.java | 8 +-
.../apache/jasper/tagplugins/jstl/core/Out.java | 22 +-
.../apache/jasper/tagplugins/jstl/core/Param.java | 18 +-
.../jasper/tagplugins/jstl/core/Redirect.java | 28 +-
.../apache/jasper/tagplugins/jstl/core/Remove.java | 14 +-
.../apache/jasper/tagplugins/jstl/core/Set.java | 52 +-
.../apache/jasper/tagplugins/jstl/core/Url.java | 32 +-
.../apache/jasper/tagplugins/jstl/core/When.java | 10 +-
java/org/apache/jasper/util/Enumerator.java | 6 +-
.../apache/jasper/util/UniqueAttributesImpl.java | 2 +-
java/org/apache/jasper/xmlparser/ASCIIReader.java | 8 +-
java/org/apache/jasper/xmlparser/EncodingMap.java | 62 +-
java/org/apache/jasper/xmlparser/ParserUtils.java | 12 +-
java/org/apache/jasper/xmlparser/SymbolTable.java | 4 +-
java/org/apache/jasper/xmlparser/TreeNode.java | 12 +-
java/org/apache/jasper/xmlparser/UCSReader.java | 22 +-
java/org/apache/jasper/xmlparser/UTF8Reader.java | 56 +-
java/org/apache/jasper/xmlparser/XMLChar.java | 18 +-
.../jasper/xmlparser/XMLEncodingDetector.java | 82 +--
java/org/apache/jasper/xmlparser/XMLString.java | 14 +-
.../apache/jasper/xmlparser/XMLStringBuffer.java | 40 +-
java/org/apache/juli/AsyncFileHandler.java | 14 +-
java/org/apache/juli/FileHandler.java | 8 +-
java/org/apache/juli/JdkLoggerFormatter.java | 38 +-
java/org/apache/juli/VerbatimFormatter.java | 6 +-
java/org/apache/juli/logging/DirectJDKLog.java | 86 +--
java/org/apache/juli/logging/Log.java | 6 +-
.../juli/logging/LogConfigurationException.java | 6 +-
java/org/apache/juli/logging/package.html | 10 +-
java/org/apache/naming/Constants.java | 6 +-
.../org/apache/naming/ContextAccessController.java | 20 +-
java/org/apache/naming/ContextBindings.java | 50 +-
java/org/apache/naming/JndiPermission.java | 6 +-
java/org/apache/naming/NameParserImpl.java | 12 +-
java/org/apache/naming/NamingContext.java | 330 +++++-----
.../naming/NamingContextBindingsEnumeration.java | 16 +-
.../apache/naming/NamingContextEnumeration.java | 8 +-
java/org/apache/naming/NamingEntry.java | 8 +-
java/org/apache/naming/factory/BeanFactory.java | 48 +-
.../naming/factory/DataSourceLinkFactory.java | 34 +-
java/org/apache/naming/factory/EjbFactory.java | 34 +-
.../apache/naming/factory/MailSessionFactory.java | 8 +-
java/org/apache/naming/factory/OpenEjbFactory.java | 12 +-
.../apache/naming/factory/ResourceEnvFactory.java | 16 +-
.../org/apache/naming/factory/ResourceFactory.java | 22 +-
.../org/apache/naming/factory/SendMailFactory.java | 8 +-
.../apache/naming/factory/TransactionFactory.java | 22 +-
.../naming/factory/webservices/ServiceProxy.java | 10 +-
.../factory/webservices/ServiceRefFactory.java | 12 +-
.../apache/naming/java/javaURLContextFactory.java | 14 +-
.../apache/naming/resources/BaseDirContext.java | 564 ++++++++--------
java/org/apache/naming/resources/CacheEntry.java | 12 +-
java/org/apache/naming/resources/Constants.java | 8 +-
.../resources/DirContextURLStreamHandler.java | 120 ++--
.../DirContextURLStreamHandlerFactory.java | 22 +-
.../resources/ImmutableNameNotFoundException.java | 10 +-
.../apache/naming/resources/ProxyDirContext.java | 554 ++++++++--------
.../resources/RecyclableNamingEnumeration.java | 8 +-
java/org/apache/naming/resources/Resource.java | 68 +-
.../org/apache/naming/resources/ResourceCache.java | 28 +-
.../org/apache/naming/resources/WARDirContext.java | 336 +++++-----
java/org/apache/naming/resources/jndi/Handler.java | 8 +-
java/org/apache/naming/resources/package.html | 2 +-
.../apache/tomcat/dbcp/dbcp/ConnectionFactory.java | 4 +-
.../dbcp/dbcp/DataSourceConnectionFactory.java | 4 +-
.../org/apache/tomcat/dbcp/dbcp/DbcpException.java | 6 +-
.../dbcp/dbcp/DelegatingPreparedStatement.java | 10 +-
.../tomcat/dbcp/dbcp/DriverConnectionFactory.java | 4 +-
.../dbcp/dbcp/DriverManagerConnectionFactory.java | 10 +-
.../tomcat/dbcp/dbcp/SQLNestedException.java | 6 +-
.../dbcp/dbcp/cpdsadapter/ConnectionImpl.java | 18 +-
.../tomcat/dbcp/dbcp/datasources/PoolKey.java | 10 +-
.../dbcp/datasources/PooledConnectionAndInfo.java | 14 +-
.../dbcp/datasources/PooledConnectionManager.java | 20 +-
.../datasources/SharedPoolDataSourceFactory.java | 8 +-
.../tomcat/dbcp/dbcp/datasources/UserPassKey.java | 30 +-
java/org/apache/tomcat/util/buf/C2BConverter.java | 8 +-
java/org/apache/tomcat/util/buf/UEncoder.java | 4 +-
.../digester/AbstractObjectCreationFactory.java | 6 +-
.../apache/tomcat/util/digester/ArrayStack.java | 10 +-
.../tomcat/util/digester/CallMethodRule.java | 102 +--
.../apache/tomcat/util/digester/CallParamRule.java | 64 +-
.../tomcat/util/digester/FactoryCreateRule.java | 40 +-
.../tomcat/util/digester/NodeCreateRule.java | 98 +--
.../tomcat/util/digester/ObjectCreateRule.java | 16 +-
.../util/digester/ObjectCreationFactory.java | 6 +-
.../tomcat/util/digester/ObjectParamRule.java | 6 +-
.../util/digester/ParserFeatureSetterFactory.java | 12 +-
.../tomcat/util/digester/PathCallParamRule.java | 22 +-
java/org/apache/tomcat/util/digester/Rule.java | 42 +-
java/org/apache/tomcat/util/digester/RuleSet.java | 6 +-
.../apache/tomcat/util/digester/RuleSetBase.java | 6 +-
java/org/apache/tomcat/util/digester/Rules.java | 6 +-
.../org/apache/tomcat/util/digester/RulesBase.java | 10 +-
.../apache/tomcat/util/digester/SetNextRule.java | 34 +-
.../tomcat/util/digester/SetPropertiesRule.java | 88 +--
.../tomcat/util/digester/SetPropertyRule.java | 18 +-
.../apache/tomcat/util/digester/SetRootRule.java | 32 +-
.../apache/tomcat/util/digester/SetTopRule.java | 34 +-
.../util/digester/WithDefaultsRulesWrapper.java | 50 +-
java/org/apache/tomcat/util/digester/package.html | 132 ++--
.../org/apache/tomcat/util/http/CookieSupport.java | 2 +-
java/org/apache/tomcat/util/http/Cookies.java | 4 +-
.../tomcat/util/http/FastHttpDateFormat.java | 2 +-
.../org/apache/tomcat/util/http/mapper/Mapper.java | 8 +-
.../apache/tomcat/util/modeler/AttributeInfo.java | 8 +-
.../tomcat/util/modeler/BaseAttributeFilter.java | 4 +-
.../apache/tomcat/util/modeler/BaseModelMBean.java | 48 +-
.../util/modeler/BaseNotificationBroadcaster.java | 4 +-
.../tomcat/util/modeler/ConstructorInfo.java | 6 +-
.../apache/tomcat/util/modeler/FeatureInfo.java | 10 +-
.../util/modeler/FixedNotificationFilter.java | 4 +-
.../tomcat/util/modeler/NotificationInfo.java | 4 +-
.../apache/tomcat/util/modeler/OperationInfo.java | 10 +-
.../apache/tomcat/util/modeler/ParameterInfo.java | 4 +-
java/org/apache/tomcat/util/modeler/Registry.java | 176 ++---
.../apache/tomcat/util/modeler/RegistryMBean.java | 64 +-
.../modules/MbeansDescriptorsDOMSource.java | 4 +-
.../modules/MbeansDescriptorsDigesterSource.java | 36 +-
.../MbeansDescriptorsIntrospectionSource.java | 24 +-
.../tomcat/util/modeler/modules/MbeansSource.java | 48 +-
.../util/modeler/modules/MbeansSourceMBean.java | 28 +-
.../tomcat/util/modeler/modules/ModelerSource.java | 16 +-
.../tomcat/util/modeler/modules/package.html | 10 +-
java/org/apache/tomcat/util/modeler/package.html | 2 +-
.../tomcat/util/net/NioBlockingSelector.java | 2 +-
java/org/apache/tomcat/util/net/SSLUtil.java | 4 +-
java/org/apache/tomcat/util/net/SocketWrapper.java | 2 +-
.../apache/tomcat/util/security/MD5Encoder.java | 4 +-
.../websocket/server/LocalStrings.properties | 2 +-
modules/jdbc-pool/doc/jdbc-pool.xml | 8 +-
.../org/apache/tomcat/jdbc/pool/DataSource.java | 2 +-
res/checkstyle/checkstyle.xml | 26 +-
.../apache/catalina/filters/TestExpiresFilter.java | 144 ++---
.../catalina/loader/TestWebappClassLoader.java | 2 +-
test/org/apache/catalina/realm/TestRealmBase.java | 2 +-
test/org/apache/jasper/compiler/TestELParser.java | 2 +-
.../jasper/runtime/TestJspContextWrapper.java | 2 +-
test/org/apache/juli/TestDateFormatCache.java | 12 +-
test/org/apache/tomcat/unittest/TesterContext.java | 4 +-
test/org/apache/tomcat/util/net/localhost-cert.pem | 10 +-
test/org/apache/tomcat/websocket/TestUtil.java | 2 +-
.../websocket/pojo/TestEncodingDecoding.java | 2 +-
test/webapp-3.0-fragments/WEB-INF/web.xml | 2 +-
test/webapp-3.0/WEB-INF/tags/bug58178.tag | 2 +-
webapps/docs/config/ajp.xml | 2 +-
webapps/docs/config/filter.xml | 10 +-
webapps/docs/config/http.xml | 14 +-
webapps/docs/config/realm.xml | 8 +-
webapps/docs/introduction.xml | 42 +-
webapps/docs/jasper-howto.xml | 6 +-
webapps/docs/jndi-resources-howto.xml | 2 +-
webapps/docs/monitoring.xml | 6 +-
.../classes/websocket/echo/EchoEndpoint.java | 4 +-
webapps/examples/WEB-INF/web.xml | 2 +-
webapps/examples/websocket-deprecated/index.html | 2 +-
webapps/examples/websocket/drawboard.xhtml | 2 +-
807 files changed, 9239 insertions(+), 9275 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
