[tomcat8] 05/05: Merge tag 'upstream/8.0.0_RC1'
Emmanuel Bourg
ebourg-guest at alioth.debian.org
Thu Sep 12 14:33:32 UTC 2013
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository tomcat8.
commit cc1f3171fe16d0e6fd02907cd96ee0c1e4c2e480
Merge: aab7a9d 7d12c66
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Thu Sep 12 16:31:27 2013 +0200
Merge tag 'upstream/8.0.0_RC1'
Upstream version 8.0.0~RC1
.gitignore | 4 +-
BUILDING.txt | 20 +-
KEYS | 65 +
LICENSE | 7 +
NOTICE | 11 +-
RELEASE-NOTES | 94 +-
RUNNING.txt | 10 +-
STATUS.txt | 57 -
SVN-MERGE.txt | 54 +
TOMCAT-NEXT.txt | 212 +
bin/catalina.bat | 2 +-
bin/catalina.sh | 66 +-
bin/configtest.bat | 2 +-
bin/configtest.sh | 2 +-
bin/cpappend.bat | 2 +-
bin/daemon.sh | 19 +-
bin/digest.bat | 2 +-
bin/digest.sh | 2 +-
bin/service.bat | 2 +-
bin/setclasspath.bat | 2 +-
bin/setclasspath.sh | 2 +-
bin/shutdown.bat | 2 +-
bin/shutdown.sh | 2 +-
bin/startup.bat | 2 +-
bin/startup.sh | 2 +-
bin/tool-wrapper.bat | 2 +-
bin/tool-wrapper.sh | 2 +-
bin/version.bat | 2 +-
bin/version.sh | 2 +-
build.properties.default | 55 +-
build.xml | 423 +-
conf/catalina.policy | 2 +-
conf/catalina.properties | 31 +-
conf/context.xml | 4 +-
conf/server.xml | 2 +-
conf/web.xml | 9 +-
java/javax/annotation/Generated.java | 8 +-
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 | 76 +-
java/javax/el/BeanELResolver.java | 279 +-
java/javax/el/BeanNameELResolver.java | 166 +
java/javax/el/BeanNameResolver.java | 69 +
java/javax/el/CompositeELResolver.java | 105 +-
java/javax/el/ELClass.java | 33 +
java/javax/el/ELContext.java | 221 +-
java/javax/el/ELContextEvent.java | 6 +-
java/javax/el/ELContextListener.java | 6 +-
java/javax/el/ELException.java | 28 +-
java/javax/el/ELManager.java | 90 +
java/javax/el/ELProcessor.java | 221 +
java/javax/el/ELResolver.java | 118 +-
java/javax/el/EvaluationListener.java | 54 +
java/javax/el/Expression.java | 10 +-
java/javax/el/ExpressionFactory.java | 91 +-
java/javax/el/FunctionMapper.java | 20 +-
java/javax/el/ImportHandler.java | 189 +
java/javax/el/LambdaExpression.java | 94 +
java/javax/el/ListELResolver.java | 70 +-
java/javax/el/LocalStrings.properties | 24 +
java/javax/el/MapELResolver.java | 49 +-
java/javax/el/MethodExpression.java | 52 +-
java/javax/el/MethodInfo.java | 28 +-
java/javax/el/MethodNotFoundException.java | 29 +-
java/javax/el/PropertyNotFoundException.java | 28 +-
java/javax/el/PropertyNotWritableException.java | 29 +-
java/javax/el/ResourceBundleELResolver.java | 54 +-
java/javax/el/StandardELContext.java | 209 +
java/javax/el/StaticFieldELResolver.java | 216 +
java/javax/el/TypeConverter.java | 62 +
java/javax/el/Util.java | 358 +
java/javax/el/ValueExpression.java | 73 +-
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 | 42 +-
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 | 24 +-
java/javax/servlet/HttpConstraintElement.java | 18 +-
.../javax/servlet/HttpMethodConstraintElement.java | 4 +-
java/javax/servlet/MultipartConfigElement.java | 16 +-
java/javax/servlet/ReadListener.java | 52 +
java/javax/servlet/Registration.java | 16 +-
java/javax/servlet/RequestDispatcher.java | 178 +-
java/javax/servlet/Servlet.java | 56 +-
java/javax/servlet/ServletConfig.java | 8 +-
.../javax/servlet/ServletContainerInitializer.java | 2 +-
java/javax/servlet/ServletContext.java | 75 +-
.../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 | 39 +-
java/javax/servlet/ServletOutputStream.java | 62 +-
java/javax/servlet/ServletRegistration.java | 12 +-
java/javax/servlet/ServletRequest.java | 95 +-
.../servlet/ServletRequestAttributeEvent.java | 8 +-
java/javax/servlet/ServletRequestEvent.java | 4 +-
java/javax/servlet/ServletRequestWrapper.java | 41 +-
java/javax/servlet/ServletResponse.java | 37 +-
java/javax/servlet/ServletResponseWrapper.java | 23 +-
java/javax/servlet/ServletSecurityElement.java | 50 +-
java/javax/servlet/SessionCookieConfig.java | 50 +-
java/javax/servlet/SingleThreadModel.java | 2 +-
java/javax/servlet/UnavailableException.java | 12 +-
java/javax/servlet/WriteListener.java | 45 +
java/javax/servlet/annotation/HandlesTypes.java | 9 +-
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 | 13 +-
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/Cookie.java | 5 +-
java/javax/servlet/http/HttpServlet.java | 29 +-
java/javax/servlet/http/HttpServletRequest.java | 84 +-
.../servlet/http/HttpServletRequestWrapper.java | 35 +-
java/javax/servlet/http/HttpServletResponse.java | 32 +-
.../servlet/http/HttpServletResponseWrapper.java | 10 +-
java/javax/servlet/http/HttpSession.java | 28 +-
.../http/HttpSessionActivationListener.java | 8 +-
.../servlet/http/HttpSessionAttributeListener.java | 2 +-
.../servlet/http/HttpSessionBindingEvent.java | 10 +-
.../servlet/http/HttpSessionBindingListener.java | 6 +-
java/javax/servlet/http/HttpSessionContext.java | 2 -
java/javax/servlet/http/HttpSessionEvent.java | 2 +-
java/javax/servlet/http/HttpSessionIdListener.java | 41 +
java/javax/servlet/http/HttpSessionListener.java | 6 +-
java/javax/servlet/http/HttpUpgradeHandler.java | 42 +
java/javax/servlet/http/HttpUtils.java | 56 +-
java/javax/servlet/http/Part.java | 11 +-
java/javax/servlet/http/WebConnection.java | 47 +
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 +-
.../servlet/jsp/el/ImplicitObjectELResolver.java | 32 +-
.../servlet/jsp/el/ScopedAttributeELResolver.java | 27 +-
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 | 73 -
java/javax/servlet/jsp/resources/jsp_2_2.xsd | 406 --
java/javax/servlet/jsp/resources/jspxml.dtd | 2 +-
java/javax/servlet/jsp/resources/jspxml.xsd | 54 +-
.../jsp/resources/web-jsptaglibrary_2_1.xsd | 229 -
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 | 20 +-
.../javax/servlet/jsp/tagext/TagAttributeInfo.java | 24 +-
java/javax/servlet/jsp/tagext/TagData.java | 16 +-
java/javax/servlet/jsp/tagext/TagExtraInfo.java | 24 +-
java/javax/servlet/jsp/tagext/TagFileInfo.java | 8 +-
java/javax/servlet/jsp/tagext/TagInfo.java | 58 +-
java/javax/servlet/jsp/tagext/TagLibraryInfo.java | 36 +-
.../servlet/jsp/tagext/TagLibraryValidator.java | 24 +-
java/javax/servlet/jsp/tagext/TagSupport.java | 6 +-
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 | 8 +-
java/javax/servlet/resources/datatypes.dtd | 4 +-
java/javax/servlet/resources/javaee_6.xsd | 504 +-
java/javax/servlet/resources/javaee_7.xsd | 3105 ++++++++
.../servlet/resources/javaee_web_services_1_3.xsd | 126 +-
.../servlet/resources/javaee_web_services_1_4.xsd | 579 ++
.../resources/javaee_web_services_client_1_3.xsd | 192 +-
.../resources/javaee_web_services_client_1_4.xsd | 744 ++
java/javax/servlet/{jsp => }/resources/jsp_2_0.xsd | 0
java/javax/servlet/resources/jsp_2_1.xsd | 73 +
java/javax/servlet/resources/jsp_2_2.xsd | 406 ++
java/javax/servlet/resources/jsp_2_3.xsd | 396 +
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 | 68 +-
java/javax/servlet/resources/web-app_3_1.xsd | 333 +
java/javax/servlet/resources/web-common_3_0.xsd | 250 +-
java/javax/servlet/resources/web-common_3_1.xsd | 1481 ++++
java/javax/servlet/resources/web-fragment_3_0.xsd | 68 +-
java/javax/servlet/resources/web-fragment_3_1.xsd | 347 +
.../{jsp => }/resources/web-jsptaglibrary_1_1.dtd | 0
.../{jsp => }/resources/web-jsptaglibrary_1_2.dtd | 0
.../{jsp => }/resources/web-jsptaglibrary_2_0.xsd | 0
.../servlet/resources/web-jsptaglibrary_2_1.xsd | 229 +
java/javax/servlet/resources/xml.xsd | 2 +-
java/javax/websocket/ClientEndpoint.java | 34 +
java/javax/websocket/ClientEndpointConfig.java | 138 +
java/javax/websocket/CloseReason.java | 122 +
java/javax/websocket/ContainerProvider.java | 60 +
java/javax/websocket/DecodeException.java | 56 +
java/javax/websocket/Decoder.java | 53 +
.../websocket/DefaultClientEndpointConfig.java | 80 +
java/javax/websocket/DeploymentException.java | 30 +
java/javax/websocket/EncodeException.java | 38 +
java/javax/websocket/Encoder.java | 51 +
java/javax/websocket/Endpoint.java | 47 +
java/javax/websocket/EndpointConfig.java | 29 +
java/javax/websocket/Extension.java | 29 +
java/javax/websocket/HandshakeResponse.java | 30 +
java/javax/websocket/MessageHandler.java | 42 +
java/javax/websocket/OnClose.java | 27 +
java/javax/websocket/OnError.java | 27 +
java/javax/websocket/OnMessage.java | 28 +
java/javax/websocket/OnOpen.java | 27 +
java/javax/websocket/PongMessage.java | 30 +
java/javax/websocket/RemoteEndpoint.java | 173 +
java/javax/websocket/SendHandler.java | 22 +
java/javax/websocket/SendResult.java | 39 +
java/javax/websocket/Session.java | 129 +
java/javax/websocket/SessionException.java | 35 +
java/javax/websocket/WebSocketContainer.java | 118 +
.../server/DefaultServerEndpointConfig.java | 95 +
java/javax/websocket/server/HandshakeRequest.java | 51 +
java/javax/websocket/server/PathParam.java | 33 +
.../websocket/server/ServerApplicationConfig.java | 51 +
java/javax/websocket/server/ServerContainer.java | 30 +
java/javax/websocket/server/ServerEndpoint.java | 44 +
.../websocket/server/ServerEndpointConfig.java | 208 +
java/javax/xml/ws/WebServiceRef.java | 4 +-
java/javax/xml/ws/WebServiceRefs.java | 4 +-
java/org/apache/catalina/Authenticator.java | 27 +-
java/org/apache/catalina/CatalinaFactory.java | 58 -
java/org/apache/catalina/Cluster.java | 26 +-
java/org/apache/catalina/Contained.java | 2 +-
java/org/apache/catalina/Container.java | 121 +-
java/org/apache/catalina/ContainerEvent.java | 22 +-
java/org/apache/catalina/ContainerListener.java | 2 +-
java/org/apache/catalina/ContainerServlet.java | 2 +-
java/org/apache/catalina/Context.java | 183 +-
java/org/apache/catalina/Engine.java | 2 +-
java/org/apache/catalina/Globals.java | 41 +-
java/org/apache/catalina/Group.java | 2 +-
java/org/apache/catalina/Host.java | 45 +-
java/org/apache/catalina/InstanceEvent.java | 64 +-
java/org/apache/catalina/InstanceListener.java | 2 +-
java/org/apache/catalina/JmxEnabled.java | 49 +
java/org/apache/catalina/Lifecycle.java | 2 +-
java/org/apache/catalina/LifecycleEvent.java | 6 +-
java/org/apache/catalina/LifecycleException.java | 2 +-
java/org/apache/catalina/LifecycleListener.java | 2 +-
java/org/apache/catalina/Loader.java | 35 +-
java/org/apache/catalina/Manager.java | 41 +-
java/org/apache/catalina/Pipeline.java | 2 +-
java/org/apache/catalina/Realm.java | 14 +-
java/org/apache/catalina/Role.java | 2 +-
java/org/apache/catalina/Server.java | 48 +-
java/org/apache/catalina/Service.java | 22 +-
java/org/apache/catalina/Session.java | 24 +-
java/org/apache/catalina/SessionEvent.java | 8 +-
java/org/apache/catalina/SessionListener.java | 2 +-
java/org/apache/catalina/Store.java | 12 +-
java/org/apache/catalina/StoreManager.java | 38 +
java/org/apache/catalina/TomcatPrincipal.java | 50 +
java/org/apache/catalina/User.java | 2 +-
java/org/apache/catalina/UserDatabase.java | 2 +-
java/org/apache/catalina/Valve.java | 19 +-
java/org/apache/catalina/WebResource.java | 142 +
java/org/apache/catalina/WebResourceRoot.java | 337 +
java/org/apache/catalina/WebResourceSet.java | 93 +
java/org/apache/catalina/Wrapper.java | 2 +-
.../catalina/ant/AbstractCatalinaCommandTask.java | 8 +-
.../apache/catalina/ant/AbstractCatalinaTask.java | 16 +-
.../catalina/ant/BaseRedirectorHelperTask.java | 48 +-
java/org/apache/catalina/ant/DeployTask.java | 8 +-
java/org/apache/catalina/ant/FindLeaksTask.java | 4 +-
.../apache/catalina/ant/JKStatusUpdateTask.java | 20 +-
java/org/apache/catalina/ant/JMXGetTask.java | 10 +-
java/org/apache/catalina/ant/JMXQueryTask.java | 16 +-
java/org/apache/catalina/ant/JMXSetTask.java | 14 +-
java/org/apache/catalina/ant/ListTask.java | 6 +-
java/org/apache/catalina/ant/ReloadTask.java | 6 +-
java/org/apache/catalina/ant/ResourcesTask.java | 6 +-
java/org/apache/catalina/ant/ServerinfoTask.java | 6 +-
java/org/apache/catalina/ant/SessionsTask.java | 16 +-
java/org/apache/catalina/ant/StartTask.java | 6 +-
java/org/apache/catalina/ant/StopTask.java | 8 +-
java/org/apache/catalina/ant/UndeployTask.java | 6 +-
java/org/apache/catalina/ant/ValidatorTask.java | 12 +-
java/org/apache/catalina/ant/antlib.xml | 8 +-
java/org/apache/catalina/ant/catalina.tasks | 10 +-
java/org/apache/catalina/ant/jmx/Arg.java | 27 +-
.../catalina/ant/jmx/JMXAccessorCondition.java | 37 +-
.../catalina/ant/jmx/JMXAccessorCreateTask.java | 52 +-
.../ant/jmx/JMXAccessorEqualsCondition.java | 32 +-
.../catalina/ant/jmx/JMXAccessorGetTask.java | 43 +-
.../catalina/ant/jmx/JMXAccessorInvokeTask.java | 53 +-
.../catalina/ant/jmx/JMXAccessorQueryTask.java | 51 +-
.../catalina/ant/jmx/JMXAccessorSetTask.java | 51 +-
.../apache/catalina/ant/jmx/JMXAccessorTask.java | 64 +-
.../ant/jmx/JMXAccessorUnregisterTask.java | 33 +-
java/org/apache/catalina/ant/jmx/package.html | 2 +-
java/org/apache/catalina/ant/package.html | 2 +-
.../catalina/authenticator/AuthenticatorBase.java | 183 +-
.../catalina/authenticator/BasicAuthenticator.java | 254 +-
.../apache/catalina/authenticator/Constants.java | 31 +-
.../authenticator/DigestAuthenticator.java | 119 +-
.../catalina/authenticator/FormAuthenticator.java | 127 +-
.../catalina/authenticator/LocalStrings.properties | 7 -
.../authenticator/LocalStrings_es.properties | 6 -
.../authenticator/LocalStrings_fr.properties | 6 +-
.../authenticator/LocalStrings_ja.properties | 6 +-
.../authenticator/NonLoginAuthenticator.java | 42 +-
.../catalina/authenticator/SSLAuthenticator.java | 62 +-
.../catalina/authenticator/SavedRequest.java | 25 +-
.../catalina/authenticator/SingleSignOn.java | 129 +-
.../catalina/authenticator/SingleSignOnEntry.java | 6 +-
.../authenticator/SpnegoAuthenticator.java | 44 +-
.../catalina/authenticator/mbeans-descriptors.xml | 92 +-
.../org/apache/catalina/authenticator/package.html | 2 +-
.../catalina/connector/ClientAbortException.java | 84 +-
java/org/apache/catalina/connector/Connector.java | 104 +-
.../apache/catalina/connector/CoyoteAdapter.java | 237 +-
.../catalina/connector/CoyoteInputStream.java | 17 +
.../catalina/connector/CoyoteOutputStream.java | 74 +-
.../apache/catalina/connector/CoyotePrincipal.java | 4 +-
.../org/apache/catalina/connector/InputBuffer.java | 49 +-
.../catalina/connector/LocalStrings.properties | 68 +-
.../catalina/connector/LocalStrings_es.properties | 17 +-
.../catalina/connector/LocalStrings_fr.properties | 16 -
.../catalina/connector/LocalStrings_ja.properties | 16 -
.../apache/catalina/connector/MapperListener.java | 497 --
.../apache/catalina/connector/OutputBuffer.java | 66 +-
java/org/apache/catalina/connector/Request.java | 391 +-
.../apache/catalina/connector/RequestFacade.java | 40 +-
java/org/apache/catalina/connector/Response.java | 156 +-
.../apache/catalina/connector/ResponseFacade.java | 15 +-
.../catalina/connector/mbeans-descriptors.xml | 21 +-
.../org/apache/catalina/core/AccessLogAdapter.java | 4 +-
.../apache/catalina/core/ApplicationContext.java | 315 +-
.../catalina/core/ApplicationContextFacade.java | 124 +-
.../catalina/core/ApplicationDispatcher.java | 112 +-
.../catalina/core/ApplicationFilterChain.java | 100 +-
.../catalina/core/ApplicationFilterConfig.java | 24 +-
.../catalina/core/ApplicationFilterFactory.java | 80 +-
.../core/ApplicationFilterRegistration.java | 58 +-
.../catalina/core/ApplicationHttpRequest.java | 84 +-
.../catalina/core/ApplicationHttpResponse.java | 71 +-
.../core/ApplicationJspConfigDescriptor.java | 46 -
.../ApplicationJspPropertyGroupDescriptor.java | 167 -
java/org/apache/catalina/core/ApplicationPart.java | 21 +-
.../apache/catalina/core/ApplicationRequest.java | 13 +-
.../apache/catalina/core/ApplicationResponse.java | 53 +-
.../core/ApplicationServletRegistration.java | 46 +-
.../core/ApplicationSessionCookieConfig.java | 39 +-
.../catalina/core/ApplicationTaglibDescriptor.java | 78 -
.../apache/catalina/core/AprLifecycleListener.java | 7 +-
.../org/apache/catalina/core/AsyncContextImpl.java | 75 +-
.../apache/catalina/core/AsyncListenerWrapper.java | 12 +-
java/org/apache/catalina/core/Constants.java | 6 +-
java/org/apache/catalina/core/ContainerBase.java | 550 +-
.../catalina/core/DefaultInstanceManager.java | 25 +-
.../core/JreMemoryLeakPreventionListener.java | 74 +-
.../apache/catalina/core/LocalStrings.properties | 100 +-
.../catalina/core/LocalStrings_es.properties | 97 +-
.../catalina/core/LocalStrings_fr.properties | 78 -
.../catalina/core/LocalStrings_ja.properties | 81 -
.../catalina/core/NamingContextListener.java | 131 +-
java/org/apache/catalina/core/StandardContext.java | 1439 ++--
.../apache/catalina/core/StandardContextValve.java | 30 +-
java/org/apache/catalina/core/StandardEngine.java | 94 +-
.../apache/catalina/core/StandardEngineValve.java | 38 +-
java/org/apache/catalina/core/StandardHost.java | 157 +-
.../apache/catalina/core/StandardHostValve.java | 92 +-
.../org/apache/catalina/core/StandardPipeline.java | 49 +-
java/org/apache/catalina/core/StandardServer.java | 157 +-
java/org/apache/catalina/core/StandardService.java | 121 +-
.../catalina/core/StandardThreadExecutor.java | 50 +-
java/org/apache/catalina/core/StandardWrapper.java | 269 +-
.../catalina/core/StandardWrapperFacade.java | 8 +-
.../apache/catalina/core/StandardWrapperValve.java | 83 +-
.../core/ThreadLocalLeakPreventionListener.java | 10 +-
.../apache/catalina/core/mbeans-descriptors.xml | 738 +-
.../catalina/deploy/ApplicationListener.java | 43 -
.../catalina/deploy/ApplicationParameter.java | 124 -
java/org/apache/catalina/deploy/Constants.java | 4 +-
java/org/apache/catalina/deploy/ContextEjb.java | 162 -
.../apache/catalina/deploy/ContextEnvironment.java | 129 -
.../org/apache/catalina/deploy/ContextHandler.java | 208 -
.../apache/catalina/deploy/ContextLocalEjb.java | 160 -
.../apache/catalina/deploy/ContextResource.java | 182 -
.../catalina/deploy/ContextResourceEnvRef.java | 97 -
.../catalina/deploy/ContextResourceLink.java | 122 -
.../org/apache/catalina/deploy/ContextService.java | 356 -
.../apache/catalina/deploy/ContextTransaction.java | 111 -
java/org/apache/catalina/deploy/ErrorPage.java | 182 -
java/org/apache/catalina/deploy/FilterDef.java | 214 -
java/org/apache/catalina/deploy/FilterMap.java | 226 -
java/org/apache/catalina/deploy/Injectable.java | 25 -
.../apache/catalina/deploy/InjectionTarget.java | 52 -
.../apache/catalina/deploy/JspPropertyGroup.java | 101 -
.../apache/catalina/deploy/LocalStrings.properties | 37 +-
java/org/apache/catalina/deploy/LoginConfig.java | 225 -
.../apache/catalina/deploy/MessageDestination.java | 159 -
.../catalina/deploy/MessageDestinationRef.java | 133 -
java/org/apache/catalina/deploy/MultipartDef.java | 138 -
.../apache/catalina/deploy/NamingResources.java | 1246 ----
.../catalina/deploy/NamingResourcesImpl.java | 1253 ++++
java/org/apache/catalina/deploy/ResourceBase.java | 212 -
.../apache/catalina/deploy/SecurityCollection.java | 427 --
.../apache/catalina/deploy/SecurityConstraint.java | 549 --
.../apache/catalina/deploy/SecurityRoleRef.java | 89 -
java/org/apache/catalina/deploy/ServletDef.java | 293 -
java/org/apache/catalina/deploy/SessionConfig.java | 105 -
java/org/apache/catalina/deploy/WebXml.java | 2414 -------
.../apache/catalina/deploy/mbeans-descriptors.xml | 93 +-
.../catalina/filters/AddDefaultCharsetFilter.java | 14 +-
java/org/apache/catalina/filters/Constants.java | 10 +-
java/org/apache/catalina/filters/CorsFilter.java | 33 +-
.../catalina/filters/CsrfPreventionFilter.java | 4 +-
.../org/apache/catalina/filters/ExpiresFilter.java | 87 +-
java/org/apache/catalina/filters/FilterBase.java | 14 +-
.../apache/catalina/filters/RemoteAddrFilter.java | 10 +-
.../apache/catalina/filters/RemoteHostFilter.java | 1 +
.../apache/catalina/filters/RemoteIpFilter.java | 202 +-
.../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 | 55 +-
java/org/apache/catalina/ha/ClusterDeployer.java | 11 +-
java/org/apache/catalina/ha/ClusterListener.java | 14 +-
java/org/apache/catalina/ha/ClusterManager.java | 12 +-
java/org/apache/catalina/ha/ClusterMessage.java | 3 +-
.../org/apache/catalina/ha/ClusterMessageBase.java | 15 +-
java/org/apache/catalina/ha/ClusterRuleSet.java | 117 +-
java/org/apache/catalina/ha/ClusterSession.java | 4 +-
java/org/apache/catalina/ha/ClusterValve.java | 6 +-
.../ha/authenticator/ClusterSingleSignOn.java | 68 +-
.../authenticator/ClusterSingleSignOnListener.java | 43 +-
.../ha/authenticator/SingleSignOnMessage.java | 20 +-
.../apache/catalina/ha/backend/CollectedInfo.java | 8 +-
.../catalina/ha/backend/HeartbeatListener.java | 31 +-
.../catalina/ha/backend/MultiCastSender.java | 17 +-
java/org/apache/catalina/ha/backend/Proxy.java | 7 +-
java/org/apache/catalina/ha/backend/Sender.java | 4 +-
java/org/apache/catalina/ha/backend/TcpSender.java | 20 +-
.../catalina/ha/context/ReplicatedContext.java | 67 +-
java/org/apache/catalina/ha/deploy/Constants.java | 4 +-
.../apache/catalina/ha/deploy/FarmWarDeployer.java | 111 +-
.../catalina/ha/deploy/FileChangeListener.java | 4 +-
.../org/apache/catalina/ha/deploy/FileMessage.java | 44 +-
.../catalina/ha/deploy/FileMessageFactory.java | 44 +-
.../catalina/ha/deploy/LocalStrings.properties | 1 -
.../apache/catalina/ha/deploy/UndeployMessage.java | 59 +-
java/org/apache/catalina/ha/deploy/WarWatcher.java | 49 +-
.../apache/catalina/ha/jmx/ClusterJmxHelper.java | 134 -
.../apache/catalina/ha/session/BackupManager.java | 65 +-
.../catalina/ha/session/ClusterManagerBase.java | 23 +-
.../ha/session/ClusterSessionListener.java | 21 +-
java/org/apache/catalina/ha/session/Constants.java | 4 +-
.../apache/catalina/ha/session/DeltaManager.java | 292 +-
.../apache/catalina/ha/session/DeltaRequest.java | 63 +-
.../apache/catalina/ha/session/DeltaSession.java | 58 +-
.../catalina/ha/session/JvmRouteBinderValve.java | 139 +-
.../session/JvmRouteSessionIDBinderListener.java | 182 -
.../catalina/ha/session/LocalStrings.properties | 11 -
.../catalina/ha/session/LocalStrings_es.properties | 11 -
.../catalina/ha/session/SerializablePrincipal.java | 65 +-
.../catalina/ha/session/SessionIDMessage.java | 134 -
.../apache/catalina/ha/session/SessionMessage.java | 12 +-
.../catalina/ha/session/SessionMessageImpl.java | 42 +-
.../catalina/ha/session/mbeans-descriptors.xml | 50 +-
java/org/apache/catalina/ha/tcp/Constants.java | 6 +-
.../apache/catalina/ha/tcp/LocalStrings.properties | 11 +-
.../catalina/ha/tcp/LocalStrings_es.properties | 11 +-
.../apache/catalina/ha/tcp/ReplicationValve.java | 178 +-
.../apache/catalina/ha/tcp/SendMessageData.java | 26 +-
.../apache/catalina/ha/tcp/SimpleTcpCluster.java | 292 +-
.../apache/catalina/ha/tcp/mbeans-descriptors.xml | 24 -
.../apache/catalina/ha/util/IDynamicProperty.java | 58 -
java/org/apache/catalina/loader/Constants.java | 4 +-
.../apache/catalina/loader/JdbcLeakPrevention.java | 10 +-
.../apache/catalina/loader/LocalStrings.properties | 32 +-
.../catalina/loader/LocalStrings_es.properties | 30 -
.../catalina/loader/LocalStrings_fr.properties | 24 +-
.../catalina/loader/LocalStrings_ja.properties | 24 +-
java/org/apache/catalina/loader/ResourceEntry.java | 6 +-
.../catalina/loader/StandardClassLoader.java | 47 -
.../catalina/loader/StandardClassLoaderMBean.java | 33 -
.../catalina/loader/VirtualWebappLoader.java | 195 -
.../apache/catalina/loader/WebappClassLoader.java | 699 +-
java/org/apache/catalina/loader/WebappLoader.java | 474 +-
.../apache/catalina/loader/mbeans-descriptors.xml | 61 +-
java/org/apache/catalina/manager/Constants.java | 18 +-
.../apache/catalina/manager/DummyProxySession.java | 17 +-
.../catalina/manager/HTMLManagerServlet.java | 145 +-
.../apache/catalina/manager/JMXProxyServlet.java | 10 +-
java/org/apache/catalina/manager/JspHelper.java | 7 +-
.../catalina/manager/LocalStrings.properties | 17 +-
.../catalina/manager/LocalStrings_de.properties | 12 -
.../catalina/manager/LocalStrings_es.properties | 11 -
.../catalina/manager/LocalStrings_fr.properties | 12 -
.../catalina/manager/LocalStrings_ja.properties | 12 -
.../apache/catalina/manager/ManagerServlet.java | 259 +-
.../catalina/manager/StatusManagerServlet.java | 24 +-
.../apache/catalina/manager/StatusTransformer.java | 77 +-
.../apache/catalina/manager/host/Constants.java | 4 +-
.../manager/host/HTMLHostManagerServlet.java | 33 +-
.../catalina/manager/host/HostManagerServlet.java | 73 +-
.../manager/util/BaseSessionComparator.java | 6 +-
.../catalina/manager/util/ReverseComparator.java | 8 +-
.../apache/catalina/manager/util/SessionUtils.java | 88 +-
java/org/apache/catalina/mapper/Constants.java | 26 +
.../apache/catalina/mapper/LocalStrings.properties | 24 +
java/org/apache/catalina/mapper/Mapper.java | 1503 ++++
.../org/apache/catalina/mapper/MapperListener.java | 493 ++
java/org/apache/catalina/mapper/MappingData.java | 58 +
.../apache/catalina/mapper/mbeans-descriptors.xml | 37 +
.../org/apache/catalina/mbeans/ClassNameMBean.java | 6 +-
.../org/apache/catalina/mbeans/ConnectorMBean.java | 10 +-
java/org/apache/catalina/mbeans/Constants.java | 4 +-
.../org/apache/catalina/mbeans/ContainerMBean.java | 106 +-
.../catalina/mbeans/ContextEnvironmentMBean.java | 24 +-
java/org/apache/catalina/mbeans/ContextMBean.java | 96 +-
.../catalina/mbeans/ContextResourceLinkMBean.java | 44 +-
.../catalina/mbeans/ContextResourceMBean.java | 43 +-
.../mbeans/GlobalResourcesLifecycleListener.java | 8 +-
java/org/apache/catalina/mbeans/GroupMBean.java | 15 +-
.../mbeans/JmxRemoteLifecycleListener.java | 42 +-
.../apache/catalina/mbeans/LocalStrings.properties | 2 +
java/org/apache/catalina/mbeans/MBeanFactory.java | 347 +-
java/org/apache/catalina/mbeans/MBeanUtils.java | 1193 +--
.../catalina/mbeans/MemoryUserDatabaseMBean.java | 22 +-
.../catalina/mbeans/NamingResourcesMBean.java | 112 +-
java/org/apache/catalina/mbeans/RoleMBean.java | 10 +-
java/org/apache/catalina/mbeans/ServiceMBean.java | 80 +-
java/org/apache/catalina/mbeans/UserMBean.java | 14 +-
.../apache/catalina/mbeans/mbeans-descriptors.xml | 42 +-
java/org/apache/catalina/realm/CombinedRealm.java | 72 +-
java/org/apache/catalina/realm/Constants.java | 8 +-
.../org/apache/catalina/realm/DataSourceRealm.java | 74 +-
.../apache/catalina/realm/GenericPrincipal.java | 65 +-
.../apache/catalina/realm/JAASCallbackHandler.java | 60 +-
.../catalina/realm/JAASMemoryLoginModule.java | 16 +-
java/org/apache/catalina/realm/JAASRealm.java | 74 +-
java/org/apache/catalina/realm/JDBCRealm.java | 84 +-
java/org/apache/catalina/realm/JNDIRealm.java | 90 +-
.../apache/catalina/realm/LocalStrings.properties | 24 +-
.../catalina/realm/LocalStrings_es.properties | 24 +-
.../catalina/realm/LocalStrings_fr.properties | 9 +-
.../catalina/realm/LocalStrings_ja.properties | 10 +-
java/org/apache/catalina/realm/LockOutRealm.java | 58 +-
java/org/apache/catalina/realm/MemoryRealm.java | 52 +-
java/org/apache/catalina/realm/MemoryRuleSet.java | 8 +-
java/org/apache/catalina/realm/RealmBase.java | 180 +-
.../apache/catalina/realm/UserDatabaseRealm.java | 35 +-
.../apache/catalina/realm/mbeans-descriptors.xml | 90 +-
java/org/apache/catalina/realm/package.html | 2 +-
.../catalina/security/SecurityClassLoad.java | 3 +-
.../apache/catalina/security/SecurityConfig.java | 15 +-
.../apache/catalina/security/SecurityListener.java | 2 +-
.../org/apache/catalina/security/SecurityUtil.java | 4 +-
java/org/apache/catalina/servlets/CGIServlet.java | 37 +-
.../apache/catalina/servlets/DefaultServlet.java | 638 +-
.../catalina/servlets/LocalStrings.properties | 4 -
.../catalina/servlets/LocalStrings_es.properties | 4 -
.../catalina/servlets/LocalStrings_fr.properties | 4 -
.../catalina/servlets/LocalStrings_ja.properties | 4 -
.../apache/catalina/servlets/WebdavServlet.java | 467 +-
java/org/apache/catalina/session/Constants.java | 4 +-
java/org/apache/catalina/session/FileStore.java | 59 +-
java/org/apache/catalina/session/JDBCStore.java | 103 +-
.../catalina/session/LocalStrings.properties | 13 +-
.../catalina/session/LocalStrings_es.properties | 11 -
.../catalina/session/LocalStrings_fr.properties | 11 -
.../catalina/session/LocalStrings_ja.properties | 11 -
java/org/apache/catalina/session/ManagerBase.java | 266 +-
.../apache/catalina/session/PersistentManager.java | 31 +-
.../catalina/session/PersistentManagerBase.java | 105 +-
.../apache/catalina/session/StandardManager.java | 44 +-
.../apache/catalina/session/StandardSession.java | 214 +-
.../catalina/session/StandardSessionFacade.java | 22 +-
java/org/apache/catalina/session/StoreBase.java | 53 +-
.../session/TooManyActiveSessionsException.java | 17 +-
.../apache/catalina/session/mbeans-descriptors.xml | 66 +-
.../catalina/ssi/ByteArrayServletOutputStream.java | 30 +-
.../apache/catalina/ssi/ExpressionParseTree.java | 12 +-
.../apache/catalina/ssi/ExpressionTokenizer.java | 23 +-
.../catalina/ssi/ResponseIncludeWrapper.java | 47 +-
java/org/apache/catalina/ssi/SSICommand.java | 6 +-
java/org/apache/catalina/ssi/SSIConditional.java | 4 +-
.../apache/catalina/ssi/SSIConditionalState.java | 4 +-
java/org/apache/catalina/ssi/SSIConfig.java | 4 +-
java/org/apache/catalina/ssi/SSIEcho.java | 4 +-
java/org/apache/catalina/ssi/SSIExec.java | 8 +-
.../apache/catalina/ssi/SSIExternalResolver.java | 10 +-
java/org/apache/catalina/ssi/SSIFilter.java | 30 +-
java/org/apache/catalina/ssi/SSIFlastmod.java | 4 +-
java/org/apache/catalina/ssi/SSIFsize.java | 4 +-
java/org/apache/catalina/ssi/SSIInclude.java | 4 +-
java/org/apache/catalina/ssi/SSIMediator.java | 22 +-
java/org/apache/catalina/ssi/SSIPrintenv.java | 4 +-
java/org/apache/catalina/ssi/SSIProcessor.java | 26 +-
java/org/apache/catalina/ssi/SSIServlet.java | 28 +-
.../catalina/ssi/SSIServletExternalResolver.java | 30 +-
.../apache/catalina/ssi/SSIServletRequestUtil.java | 2 +-
java/org/apache/catalina/ssi/SSISet.java | 4 +-
.../catalina/ssi/SSIStopProcessingException.java | 4 +-
java/org/apache/catalina/startup/Bootstrap.java | 179 +-
java/org/apache/catalina/startup/Catalina.java | 109 +-
.../catalina/startup/CatalinaProperties.java | 59 +-
.../catalina/startup/ClassLoaderFactory.java | 51 +-
.../catalina/startup/ConnectorCreateRule.java | 20 +-
java/org/apache/catalina/startup/Constants.java | 161 +-
.../org/apache/catalina/startup/ContextConfig.java | 1116 ++-
.../apache/catalina/startup/ContextRuleSet.java | 66 +-
.../startup/CopyParentClassLoaderRule.java | 6 +-
.../apache/catalina/startup/DigesterFactory.java | 221 -
java/org/apache/catalina/startup/Embedded.java | 940 ---
java/org/apache/catalina/startup/EngineConfig.java | 6 +-
.../org/apache/catalina/startup/EngineRuleSet.java | 11 +-
java/org/apache/catalina/startup/ExpandWar.java | 59 +-
.../org/apache/catalina/startup/FailedContext.java | 129 +-
.../apache/catalina/startup/HomesUserDatabase.java | 8 +-
java/org/apache/catalina/startup/HostConfig.java | 593 +-
java/org/apache/catalina/startup/HostRuleSet.java | 13 +-
.../catalina/startup/LifecycleListenerRule.java | 14 +-
.../catalina/startup/LocalStrings.properties | 18 +-
.../catalina/startup/LocalStrings_es.properties | 17 -
.../catalina/startup/LocalStrings_fr.properties | 8 -
.../catalina/startup/LocalStrings_ja.properties | 11 -
.../org/apache/catalina/startup/NamingRuleSet.java | 41 +-
.../catalina/startup/PasswdUserDatabase.java | 8 +-
java/org/apache/catalina/startup/RealmRuleSet.java | 13 +-
.../catalina/startup/SetAllPropertiesRule.java | 16 +-
.../catalina/startup/SetContextPropertiesRule.java | 12 +-
.../apache/catalina/startup/SetNextNamingRule.java | 30 +-
java/org/apache/catalina/startup/TldConfig.java | 162 +-
java/org/apache/catalina/startup/TldRuleSet.java | 35 +-
java/org/apache/catalina/startup/Tomcat.java | 443 +-
java/org/apache/catalina/startup/Tool.java | 15 +-
java/org/apache/catalina/startup/UserConfig.java | 12 +-
java/org/apache/catalina/startup/UserDatabase.java | 6 +-
.../apache/catalina/startup/WebAnnotationSet.java | 172 +-
java/org/apache/catalina/startup/WebRuleSet.java | 1340 ----
.../catalina/startup/WebappServiceLoader.java | 171 +
.../apache/catalina/startup/XmlErrorHandler.java | 77 -
.../apache/catalina/startup/mbeans-descriptors.xml | 30 +-
.../catalina/storeconfig/CatalinaClusterSF.java | 96 +
.../org/apache/catalina/storeconfig/ChannelSF.java | 78 +
.../apache/catalina/storeconfig/ConnectorSF.java | 83 +
.../storeconfig/ConnectorStoreAppender.java | 300 +
.../org/apache/catalina/storeconfig/Constants.java | 24 +
.../storeconfig/GlobalNamingResourcesSF.java | 76 +
.../apache/catalina/storeconfig/IStoreConfig.java | 132 +
.../apache/catalina/storeconfig/IStoreFactory.java | 34 +
.../catalina/storeconfig/InstanceListenerSF.java | 59 +
.../apache/catalina/storeconfig/InterceptorSF.java | 83 +
java/org/apache/catalina/storeconfig/LoaderSF.java | 84 +
.../catalina/storeconfig/LocalStrings.properties | 17 +
.../org/apache/catalina/storeconfig/ManagerSF.java | 81 +
.../catalina/storeconfig/NamingResourcesSF.java | 107 +
.../catalina/storeconfig/PersistentManagerSF.java | 56 +
java/org/apache/catalina/storeconfig/RealmSF.java | 86 +
java/org/apache/catalina/storeconfig/SenderSF.java | 55 +
.../catalina/storeconfig/StandardContextSF.java | 376 +
.../catalina/storeconfig/StandardEngineSF.java | 97 +
.../catalina/storeconfig/StandardHostSF.java | 108 +
.../catalina/storeconfig/StandardServerSF.java | 104 +
.../catalina/storeconfig/StandardServiceSF.java | 73 +
.../apache/catalina/storeconfig/StoreAppender.java | 387 +
.../apache/catalina/storeconfig/StoreConfig.java | 366 +
.../storeconfig/StoreConfigLifecycleListener.java | 156 +
.../catalina/storeconfig/StoreContextAppender.java | 181 +
.../catalina/storeconfig/StoreDescription.java | 371 +
.../catalina/storeconfig/StoreFactoryBase.java | 198 +
.../catalina/storeconfig/StoreFactoryRule.java | 124 +
.../catalina/storeconfig/StoreFileMover.java | 208 +
.../apache/catalina/storeconfig/StoreLoader.java | 280 +
.../apache/catalina/storeconfig/StoreRegistry.java | 208 +
.../catalina/storeconfig/WatchedResourceSF.java | 54 +
.../catalina/storeconfig/WebResourceRootSF.java | 85 +
.../catalina/storeconfig/WrapperLifecycleSF.java | 54 +
.../catalina/storeconfig/WrapperListenerSF.java | 54 +
.../catalina/storeconfig/mbeans-descriptors.xml | 94 +
.../catalina/storeconfig/server-registry.xml | 418 ++
.../apache/catalina/tribes/ChannelException.java | 46 +-
.../apache/catalina/tribes/ChannelInterceptor.java | 34 +-
.../apache/catalina/tribes/ChannelListener.java | 18 +-
.../org/apache/catalina/tribes/ChannelMessage.java | 22 +-
.../apache/catalina/tribes/ChannelReceiver.java | 22 +-
java/org/apache/catalina/tribes/ChannelSender.java | 14 +-
java/org/apache/catalina/tribes/Constants.java | 34 -
java/org/apache/catalina/tribes/ErrorHandler.java | 12 +-
java/org/apache/catalina/tribes/Heartbeat.java | 6 +-
.../org/apache/catalina/tribes/ManagedChannel.java | 12 +-
java/org/apache/catalina/tribes/Member.java | 31 +-
.../apache/catalina/tribes/MembershipListener.java | 8 +-
.../apache/catalina/tribes/MembershipService.java | 45 +-
.../apache/catalina/tribes/MessageListener.java | 25 +-
java/org/apache/catalina/tribes/UniqueId.java | 19 +-
.../catalina/tribes/group/AbsoluteOrder.java | 26 +-
.../catalina/tribes/group/ChannelCoordinator.java | 69 +-
.../tribes/group/ChannelInterceptorBase.java | 14 +-
.../catalina/tribes/group/ExtendedRpcCallback.java | 14 +-
.../apache/catalina/tribes/group/GroupChannel.java | 23 +-
.../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 | 106 +-
.../apache/catalina/tribes/group/RpcMessage.java | 12 +-
.../interceptors/DomainFilterInterceptor.java | 13 +-
.../interceptors/FragmentationInterceptor.java | 64 +-
.../tribes/group/interceptors/GzipInterceptor.java | 14 +-
.../interceptors/MessageDispatch15Interceptor.java | 12 +-
.../interceptors/MessageDispatchInterceptor.java | 36 +-
.../group/interceptors/NonBlockingCoordinator.java | 310 +-
.../group/interceptors/OrderInterceptor.java | 80 +-
.../group/interceptors/SimpleCoordinator.java | 12 +-
.../interceptors/StaticMembershipInterceptor.java | 8 +-
.../group/interceptors/TcpFailureDetector.java | 104 +-
.../group/interceptors/TcpPingInterceptor.java | 46 +-
.../group/interceptors/ThroughputInterceptor.java | 22 +-
.../interceptors/TwoPhaseCommitInterceptor.java | 14 +-
java/org/apache/catalina/tribes/io/BufferPool.java | 37 +-
.../catalina/tribes/io/BufferPool15Impl.java | 5 +-
.../org/apache/catalina/tribes/io/ChannelData.java | 62 +-
.../tribes/io/DirectByteArrayOutputStream.java | 12 +-
.../apache/catalina/tribes/io/ListenCallback.java | 10 +-
.../apache/catalina/tribes/io/ObjectReader.java | 4 +-
.../catalina/tribes/io/ReplicationStream.java | 29 +-
.../org/apache/catalina/tribes/io/XByteBuffer.java | 107 +-
.../catalina/tribes/membership/Constants.java | 6 +-
.../tribes/membership/LocalStrings.properties | 6 +-
.../tribes/membership/LocalStrings_es.properties | 15 -
.../catalina/tribes/membership/McastService.java | 161 +-
.../tribes/membership/McastServiceImpl.java | 110 +-
.../catalina/tribes/membership/MemberImpl.java | 47 +-
.../catalina/tribes/membership/Membership.java | 110 +-
.../catalina/tribes/membership/StaticMember.java | 16 +-
.../tribes/membership/mbeans-descriptors.xml | 5 -
java/org/apache/catalina/tribes/package.html | 4 +-
.../tribes/tipis/AbstractReplicatedMap.java | 501 +-
.../catalina/tribes/tipis/LazyReplicatedMap.java | 112 +-
.../catalina/tribes/tipis/ReplicatedMap.java | 26 +-
.../catalina/tribes/tipis/ReplicatedMapEntry.java | 34 +-
.../apache/catalina/tribes/tipis/Streamable.java | 64 -
.../catalina/tribes/transport/AbstractRxTask.java | 16 +-
.../catalina/tribes/transport/AbstractSender.java | 8 -
.../catalina/tribes/transport/Constants.java | 8 +-
.../catalina/tribes/transport/DataSender.java | 8 +-
.../tribes/transport/LocalStrings.properties | 24 +-
.../tribes/transport/LocalStrings_es.properties | 15 -
.../tribes/transport/MultiPointSender.java | 6 +-
.../catalina/tribes/transport/PooledSender.java | 33 +-
.../catalina/tribes/transport/ReceiverBase.java | 79 +-
.../tribes/transport/ReplicationTransmitter.java | 50 +-
.../catalina/tribes/transport/RxTaskPool.java | 26 +-
.../catalina/tribes/transport/SenderState.java | 37 +-
.../catalina/tribes/transport/bio/BioReceiver.java | 10 +-
.../tribes/transport/bio/BioReplicationTask.java | 26 +-
.../catalina/tribes/transport/bio/BioSender.java | 56 +-
.../tribes/transport/bio/MultipointBioSender.java | 14 +-
.../tribes/transport/bio/PooledMultiSender.java | 4 +-
.../tribes/transport/bio/util/FastQueue.java | 130 +-
.../tribes/transport/bio/util/LinkObject.java | 16 +-
.../bio/util/SingleRemoveSynchronizedAddLock.java | 16 +-
.../catalina/tribes/transport/nio/NioReceiver.java | 52 +-
.../tribes/transport/nio/NioReplicationTask.java | 8 +-
.../catalina/tribes/transport/nio/NioSender.java | 114 +-
.../tribes/transport/nio/ParallelNioSender.java | 9 +-
.../tribes/transport/nio/PooledParallelSender.java | 4 +-
java/org/apache/catalina/tribes/util/Arrays.java | 62 +-
.../catalina/tribes/util/ExecutorFactory.java | 15 +-
java/org/apache/catalina/tribes/util/Logs.java | 6 +-
.../apache/catalina/tribes/util/StringManager.java | 23 +-
.../catalina/tribes/util/TcclThreadFactory.java | 12 +-
.../apache/catalina/tribes/util/UUIDGenerator.java | 18 +-
java/org/apache/catalina/users/AbstractGroup.java | 8 +-
java/org/apache/catalina/users/AbstractRole.java | 6 +-
java/org/apache/catalina/users/AbstractUser.java | 6 +-
java/org/apache/catalina/users/Constants.java | 6 +-
.../apache/catalina/users/LocalStrings.properties | 1 -
.../catalina/users/LocalStrings_es.properties | 1 -
.../catalina/users/LocalStrings_fr.properties | 1 -
.../catalina/users/LocalStrings_ja.properties | 1 -
java/org/apache/catalina/users/MemoryGroup.java | 12 +-
java/org/apache/catalina/users/MemoryRole.java | 8 +-
java/org/apache/catalina/users/MemoryUser.java | 12 +-
.../apache/catalina/users/MemoryUserDatabase.java | 40 +-
.../catalina/users/MemoryUserDatabaseFactory.java | 6 +-
java/org/apache/catalina/util/Base64.java | 259 -
java/org/apache/catalina/util/CharsetMapper.java | 12 +-
.../apache/catalina/util/ConcurrentDateFormat.java | 75 +
.../catalina/util/ConcurrentMessageDigest.java | 5 +-
java/org/apache/catalina/util/ContextName.java | 42 +-
.../catalina/util/CustomObjectInputStream.java | 8 +-
java/org/apache/catalina/util/DOMWriter.java | 502 +-
java/org/apache/catalina/util/DateTool.java | 120 -
java/org/apache/catalina/util/Enumerator.java | 179 -
java/org/apache/catalina/util/Extension.java | 10 +-
.../apache/catalina/util/ExtensionValidator.java | 152 +-
java/org/apache/catalina/util/IOTools.java | 20 +-
java/org/apache/catalina/util/InstanceSupport.java | 10 +-
java/org/apache/catalina/util/Introspection.java | 10 +-
java/org/apache/catalina/util/LifecycleBase.java | 76 +-
.../apache/catalina/util/LifecycleMBeanBase.java | 87 +-
.../org/apache/catalina/util/LifecycleSupport.java | 12 +-
.../apache/catalina/util/LocalStrings.properties | 5 +-
java/org/apache/catalina/util/MD5Encoder.java | 34 +-
java/org/apache/catalina/util/MIME2Java.java | 21 +-
.../org/apache/catalina/util/ManifestResource.java | 60 +-
java/org/apache/catalina/util/ParameterMap.java | 6 +-
java/org/apache/catalina/util/RequestUtil.java | 193 +-
java/org/apache/catalina/util/ResourceSet.java | 6 +-
java/org/apache/catalina/util/SchemaResolver.java | 128 -
java/org/apache/catalina/util/ServerInfo.java | 37 +-
.../apache/catalina/util/SessionIdGenerator.java | 35 +-
java/org/apache/catalina/util/Strftime.java | 28 +-
java/org/apache/catalina/util/StringParser.java | 135 +-
java/org/apache/catalina/util/TomcatCSS.java | 4 +-
java/org/apache/catalina/util/URLEncoder.java | 10 +-
java/org/apache/catalina/util/XMLWriter.java | 35 +-
.../org/apache/catalina/valves/AccessLogValve.java | 243 +-
.../valves/CometConnectionManagerValve.java | 20 +-
.../valves/CrawlerSessionManagerValve.java | 4 +-
.../apache/catalina/valves/ErrorReportValve.java | 26 +-
.../catalina/valves/ExtendedAccessLogValve.java | 74 +-
.../apache/catalina/valves/JDBCAccessLogValve.java | 12 +-
.../apache/catalina/valves/LocalStrings.properties | 5 -
.../catalina/valves/LocalStrings_es.properties | 5 -
.../catalina/valves/LocalStrings_fr.properties | 4 -
.../catalina/valves/LocalStrings_ja.properties | 5 -
.../apache/catalina/valves/PersistentValve.java | 38 +-
.../apache/catalina/valves/RemoteAddrValve.java | 34 +-
.../apache/catalina/valves/RemoteHostValve.java | 34 +-
java/org/apache/catalina/valves/RemoteIpValve.java | 17 +-
.../apache/catalina/valves/RequestFilterValve.java | 25 +-
java/org/apache/catalina/valves/SSLValve.java | 5 +-
.../org/apache/catalina/valves/SemaphoreValve.java | 21 +-
.../catalina/valves/StuckThreadDetectionValve.java | 21 +-
java/org/apache/catalina/valves/ValveBase.java | 31 +-
.../apache/catalina/valves/mbeans-descriptors.xml | 50 -
.../apache/catalina/valves/rewrite/Resolver.java | 36 +
.../catalina/valves/rewrite/ResolverImpl.java | 175 +
.../catalina/valves/rewrite/RewriteCond.java | 262 +
.../apache/catalina/valves/rewrite/RewriteMap.java | 24 +
.../catalina/valves/rewrite/RewriteRule.java | 532 ++
.../catalina/valves/rewrite/RewriteValve.java | 758 ++
.../catalina/valves/rewrite/Substitution.java | 239 +
.../catalina/valves/rewrite/mbeans-descriptors.xml | 37 +
.../webresources/AbstractFileResourceSet.java | 125 +
.../catalina/webresources/AbstractResource.java | 134 +
.../catalina/webresources/AbstractResourceSet.java | 99 +
java/org/apache/catalina/webresources/Cache.java | 221 +
.../catalina/webresources/CachedResource.java | 240 +
.../apache/catalina/webresources/Constants.java | 22 +
.../catalina/webresources/DirResourceSet.java | 241 +
.../catalina/webresources/EmptyResource.java | 139 +
.../apache/catalina/webresources/FileResource.java | 179 +
.../catalina/webresources/FileResourceSet.java | 176 +
.../apache/catalina/webresources/JarResource.java | 222 +
.../catalina/webresources/JarResourceRoot.java | 133 +
.../catalina/webresources/JarResourceSet.java | 276 +
.../catalina/webresources/LocalStrings.properties | 37 +
.../apache/catalina/webresources/StandardRoot.java | 512 ++
.../catalina/webresources/VirtualResource.java | 45 +
java/org/apache/catalina/websocket/Constants.java | 121 -
.../catalina/websocket/LocalStrings.properties | 31 -
.../apache/catalina/websocket/MessageInbound.java | 182 -
.../apache/catalina/websocket/StreamInbound.java | 326 -
.../catalina/websocket/WebSocketServlet.java | 248 -
java/org/apache/catalina/websocket/WsFrame.java | 226 -
.../websocket/WsHttpServletRequestWrapper.java | 404 --
.../apache/catalina/websocket/WsInputStream.java | 157 -
java/org/apache/catalina/websocket/WsOutbound.java | 451 --
java/org/apache/coyote/AbstractProcessor.java | 34 +-
java/org/apache/coyote/AbstractProtocol.java | 217 +-
java/org/apache/coyote/ActionCode.java | 36 +-
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/AsyncStateMachine.java | 171 +-
java/org/apache/coyote/Constants.java | 2 +-
java/org/apache/coyote/InputBuffer.java | 4 +-
java/org/apache/coyote/LocalStrings.properties | 10 +
java/org/apache/coyote/OutputBuffer.java | 4 +-
java/org/apache/coyote/Processor.java | 8 +-
java/org/apache/coyote/ProtocolHandler.java | 18 +
java/org/apache/coyote/Request.java | 218 +-
java/org/apache/coyote/RequestGroupInfo.java | 2 +-
java/org/apache/coyote/RequestInfo.java | 16 +-
java/org/apache/coyote/Response.java | 155 +-
.../apache/coyote/ajp/AbstractAjpProcessor.java | 40 +-
.../org/apache/coyote/ajp/AbstractAjpProtocol.java | 16 +-
java/org/apache/coyote/ajp/AjpAprProcessor.java | 22 +-
java/org/apache/coyote/ajp/AjpAprProtocol.java | 17 +-
java/org/apache/coyote/ajp/AjpMessage.java | 80 +-
java/org/apache/coyote/ajp/AjpNioProcessor.java | 47 +-
java/org/apache/coyote/ajp/AjpNioProtocol.java | 33 +-
java/org/apache/coyote/ajp/AjpProcessor.java | 30 +-
java/org/apache/coyote/ajp/AjpProtocol.java | 24 +-
java/org/apache/coyote/ajp/Constants.java | 298 +-
java/org/apache/coyote/ajp/LocalStrings.properties | 10 +-
.../apache/coyote/ajp/LocalStrings_es.properties | 9 -
.../coyote/http11/AbstractHttp11JsseProtocol.java | 21 +-
.../coyote/http11/AbstractHttp11Processor.java | 209 +-
.../coyote/http11/AbstractHttp11Protocol.java | 43 +-
.../apache/coyote/http11/AbstractInputBuffer.java | 70 +-
.../apache/coyote/http11/AbstractOutputBuffer.java | 297 +-
java/org/apache/coyote/http11/Constants.java | 37 +-
.../apache/coyote/http11/Http11AprProcessor.java | 165 +-
.../apache/coyote/http11/Http11AprProtocol.java | 80 +-
.../apache/coyote/http11/Http11NioProcessor.java | 144 +-
.../apache/coyote/http11/Http11NioProtocol.java | 49 +-
java/org/apache/coyote/http11/Http11Processor.java | 138 +-
java/org/apache/coyote/http11/Http11Protocol.java | 57 +-
java/org/apache/coyote/http11/InputFilter.java | 12 +-
.../coyote/http11/InternalAprInputBuffer.java | 157 +-
.../coyote/http11/InternalAprOutputBuffer.java | 295 +-
.../apache/coyote/http11/InternalInputBuffer.java | 52 +-
.../coyote/http11/InternalNioInputBuffer.java | 117 +-
.../coyote/http11/InternalNioOutputBuffer.java | 218 +-
.../apache/coyote/http11/InternalOutputBuffer.java | 106 +-
.../apache/coyote/http11/LocalStrings.properties | 18 +-
.../coyote/http11/LocalStrings_es.properties | 11 -
.../coyote/http11/LocalStrings_fr.properties | 8 -
.../coyote/http11/LocalStrings_ja.properties | 8 -
java/org/apache/coyote/http11/NpnHandler.java | 58 +
java/org/apache/coyote/http11/OutputFilter.java | 12 +-
.../coyote/http11/filters/BufferedInputFilter.java | 15 +-
.../coyote/http11/filters/ChunkedInputFilter.java | 97 +-
.../coyote/http11/filters/ChunkedOutputFilter.java | 15 +-
.../http11/filters/FlushableGZIPOutputStream.java | 157 -
.../coyote/http11/filters/GzipOutputFilter.java | 22 +-
.../coyote/http11/filters/IdentityInputFilter.java | 54 +-
.../http11/filters/IdentityOutputFilter.java | 10 +-
.../http11/filters/SavedRequestInputFilter.java | 20 +-
.../coyote/http11/filters/VoidInputFilter.java | 49 +-
.../coyote/http11/filters/VoidOutputFilter.java | 12 +-
.../coyote/http11/upgrade/AbstractProcessor.java | 176 +
.../http11/upgrade/AbstractServletInputStream.java | 189 +
.../upgrade/AbstractServletOutputStream.java | 170 +
.../apache/coyote/http11/upgrade/AprProcessor.java | 43 +
.../http11/upgrade/AprServletInputStream.java | 114 +
.../http11/upgrade/AprServletOutputStream.java | 162 +
.../apache/coyote/http11/upgrade/BioProcessor.java | 43 +
.../http11/upgrade/BioServletInputStream.java | 50 +
.../http11/upgrade/BioServletOutputStream.java | 50 +
.../coyote/http11/upgrade/LocalStrings.properties | 16 +-
.../apache/coyote/http11/upgrade/NioProcessor.java | 43 +
.../http11/upgrade/NioServletInputStream.java | 140 +
.../http11/upgrade/NioServletOutputStream.java | 138 +
.../coyote/http11/upgrade/UpgradeAprProcessor.java | 107 -
.../coyote/http11/upgrade/UpgradeBioProcessor.java | 83 -
.../coyote/http11/upgrade/UpgradeInbound.java | 44 -
.../coyote/http11/upgrade/UpgradeNioProcessor.java | 231 -
.../coyote/http11/upgrade/UpgradeOutbound.java | 48 -
.../coyote/http11/upgrade/UpgradeProcessor.java | 142 -
java/org/apache/coyote/spdy/SpdyAprNpnHandler.java | 112 +
java/org/apache/coyote/spdy/SpdyProcessor.java | 590 ++
java/org/apache/coyote/spdy/SpdyProxyProtocol.java | 142 +
java/org/apache/el/ExpressionFactoryImpl.java | 18 +-
java/org/apache/el/Messages.properties | 25 +-
java/org/apache/el/Messages_es.properties | 7 -
java/org/apache/el/MethodExpressionImpl.java | 81 +-
java/org/apache/el/MethodExpressionLiteral.java | 19 +-
java/org/apache/el/ValueExpressionImpl.java | 63 +-
java/org/apache/el/ValueExpressionLiteral.java | 23 +-
java/org/apache/el/lang/ELSupport.java | 102 +-
java/org/apache/el/lang/EvaluationContext.java | 93 +-
java/org/apache/el/lang/ExpressionBuilder.java | 32 +-
java/org/apache/el/lang/FunctionMapperFactory.java | 20 +-
java/org/apache/el/lang/FunctionMapperImpl.java | 46 +-
java/org/apache/el/lang/VariableMapperFactory.java | 4 +-
java/org/apache/el/lang/VariableMapperImpl.java | 16 +-
java/org/apache/el/parser/ArithmeticNode.java | 8 +-
java/org/apache/el/parser/AstAnd.java | 6 +-
java/org/apache/el/parser/AstAssign.java | 50 +
java/org/apache/el/parser/AstChoice.java | 4 +-
java/org/apache/el/parser/AstConcatenation.java | 45 +
java/org/apache/el/parser/AstDotSuffix.java | 4 +-
java/org/apache/el/parser/AstFunction.java | 72 +-
java/org/apache/el/parser/AstIdentifier.java | 37 +-
java/org/apache/el/parser/AstLambdaExpression.java | 182 +
java/org/apache/el/parser/AstLambdaParameters.java | 43 +
java/org/apache/el/parser/AstListData.java | 50 +
java/org/apache/el/parser/AstMapData.java | 56 +
java/org/apache/el/parser/AstMapEntry.java | 26 +
java/org/apache/el/parser/AstMethodParameters.java | 24 +-
java/org/apache/el/parser/AstNot.java | 4 +-
java/org/apache/el/parser/AstOr.java | 6 +-
java/org/apache/el/parser/AstSemicolon.java | 49 +
java/org/apache/el/parser/AstSetData.java | 51 +
java/org/apache/el/parser/AstValue.java | 71 +-
java/org/apache/el/parser/BooleanNode.java | 8 +-
java/org/apache/el/parser/ELParser.java | 1578 +++-
java/org/apache/el/parser/ELParser.jjt | 174 +-
java/org/apache/el/parser/ELParserConstants.java | 117 +-
.../org/apache/el/parser/ELParserTokenManager.java | 1253 +++-
.../apache/el/parser/ELParserTreeConstants.java | 78 +-
java/org/apache/el/parser/Node.java | 14 +-
java/org/apache/el/parser/NodeVisitor.java | 6 +-
java/org/apache/el/parser/SimpleCharStream.java | 1 +
java/org/apache/el/parser/SimpleNode.java | 14 +-
java/org/apache/el/parser/Token.java | 1 +
java/org/apache/el/stream/Optional.java | 76 +
java/org/apache/el/stream/Stream.java | 522 ++
.../org/apache/el/stream/StreamELResolverImpl.java | 108 +
java/org/apache/el/util/ConcurrentCache.java | 4 +-
java/org/apache/el/util/MessageFactory.java | 6 +-
java/org/apache/el/util/ReflectionUtil.java | 40 +-
java/org/apache/el/util/Validation.java | 14 +-
java/org/apache/jasper/Constants.java | 103 +-
java/org/apache/jasper/EmbeddedServletOptions.java | 212 +-
java/org/apache/jasper/JasperException.java | 8 +-
java/org/apache/jasper/JspC.java | 85 +-
java/org/apache/jasper/JspCompilationContext.java | 322 +-
java/org/apache/jasper/Options.java | 38 +-
java/org/apache/jasper/compiler/AntCompiler.java | 97 +-
.../apache/jasper/compiler/AttributeParser.java | 30 +-
.../org/apache/jasper/compiler/BeanRepository.java | 22 +-
java/org/apache/jasper/compiler/Collector.java | 4 +-
java/org/apache/jasper/compiler/Compiler.java | 24 +-
.../jasper/compiler/DefaultErrorHandler.java | 24 +-
java/org/apache/jasper/compiler/Dumper.java | 220 -
.../apache/jasper/compiler/ELFunctionMapper.java | 40 +-
java/org/apache/jasper/compiler/ELNode.java | 24 +-
java/org/apache/jasper/compiler/ELParser.java | 41 +-
.../apache/jasper/compiler/ErrorDispatcher.java | 253 +-
java/org/apache/jasper/compiler/ErrorHandler.java | 6 +-
java/org/apache/jasper/compiler/Generator.java | 114 +-
.../jasper/compiler/ImplicitTagLibraryInfo.java | 28 +-
java/org/apache/jasper/compiler/JDTCompiler.java | 99 +-
java/org/apache/jasper/compiler/JarResource.java | 20 +-
.../apache/jasper/compiler/JarScannerFactory.java | 6 +-
.../org/apache/jasper/compiler/JarURLResource.java | 20 +-
java/org/apache/jasper/compiler/JasperTagInfo.java | 8 +-
.../apache/jasper/compiler/JavacErrorDetail.java | 57 +-
java/org/apache/jasper/compiler/JspConfig.java | 298 +-
.../apache/jasper/compiler/JspDocumentParser.java | 94 +-
java/org/apache/jasper/compiler/JspReader.java | 78 +-
.../apache/jasper/compiler/JspRuntimeContext.java | 44 +-
java/org/apache/jasper/compiler/JspUtil.java | 71 +-
java/org/apache/jasper/compiler/Localizer.java | 28 +-
java/org/apache/jasper/compiler/Mark.java | 82 +-
java/org/apache/jasper/compiler/Node.java | 162 +-
java/org/apache/jasper/compiler/PageDataImpl.java | 46 +-
java/org/apache/jasper/compiler/PageInfo.java | 95 +-
java/org/apache/jasper/compiler/Parser.java | 167 +-
.../apache/jasper/compiler/ParserController.java | 47 +-
.../apache/jasper/compiler/ScriptingVariabler.java | 20 +-
java/org/apache/jasper/compiler/ServletWriter.java | 16 +-
java/org/apache/jasper/compiler/SmapGenerator.java | 10 +-
java/org/apache/jasper/compiler/SmapStratum.java | 26 +-
java/org/apache/jasper/compiler/SmapUtil.java | 41 +-
java/org/apache/jasper/compiler/TagConstants.java | 4 +-
.../apache/jasper/compiler/TagFileProcessor.java | 42 +-
.../apache/jasper/compiler/TagLibraryInfoImpl.java | 54 +-
.../apache/jasper/compiler/TagPluginManager.java | 83 +-
java/org/apache/jasper/compiler/TextOptimizer.java | 14 +-
java/org/apache/jasper/compiler/TldLocation.java | 26 +-
.../apache/jasper/compiler/TldLocationsCache.java | 196 +-
java/org/apache/jasper/compiler/Validator.java | 62 +-
java/org/apache/jasper/compiler/WebXml.java | 121 -
.../jasper/compiler/tagplugin/TagPlugin.java | 4 +-
.../compiler/tagplugin/TagPluginContext.java | 4 +-
java/org/apache/jasper/el/ELContextImpl.java | 28 +-
java/org/apache/jasper/el/ELContextWrapper.java | 10 +-
java/org/apache/jasper/el/ELResolverImpl.java | 41 +-
.../apache/jasper/el/ExpressionEvaluatorImpl.java | 18 +-
java/org/apache/jasper/el/ExpressionImpl.java | 16 +-
java/org/apache/jasper/el/FunctionMapperImpl.java | 6 +-
java/org/apache/jasper/el/JasperELResolver.java | 24 +-
java/org/apache/jasper/el/JspELException.java | 4 +-
java/org/apache/jasper/el/JspMethodExpression.java | 14 +-
.../jasper/el/JspMethodNotFoundException.java | 4 +-
.../jasper/el/JspPropertyNotFoundException.java | 4 +-
.../jasper/el/JspPropertyNotWritableException.java | 4 +-
java/org/apache/jasper/el/JspValueExpression.java | 23 +-
.../org/apache/jasper/el/VariableResolverImpl.java | 6 +-
.../jasper/resources/LocalStrings.properties | 134 +-
.../jasper/resources/LocalStrings_es.properties | 122 +-
.../jasper/resources/LocalStrings_fr.properties | 109 +-
.../jasper/resources/LocalStrings_ja.properties | 108 +-
.../org/apache/jasper/runtime/BodyContentImpl.java | 114 +-
java/org/apache/jasper/runtime/HttpJspBase.java | 22 +-
.../jasper/runtime/InstanceManagerFactory.java | 8 +-
.../jasper/runtime/JspApplicationContextImpl.java | 7 +-
.../apache/jasper/runtime/JspContextWrapper.java | 39 +-
java/org/apache/jasper/runtime/JspFactoryImpl.java | 66 +-
.../apache/jasper/runtime/JspFragmentHelper.java | 33 +-
.../apache/jasper/runtime/JspRuntimeLibrary.java | 118 +-
.../apache/jasper/runtime/JspSourceDependent.java | 4 +-
java/org/apache/jasper/runtime/JspWriterImpl.java | 151 +-
.../org/apache/jasper/runtime/PageContextImpl.java | 61 +-
.../jasper/runtime/PerThreadTagHandlerPool.java | 143 -
.../jasper/runtime/ProtectedFunctionMapper.java | 17 +-
.../runtime/ServletResponseWrapperInclude.java | 10 +-
java/org/apache/jasper/runtime/TagHandlerPool.java | 10 +-
.../apache/jasper/security/SecurityClassLoad.java | 42 +-
java/org/apache/jasper/security/SecurityUtil.java | 12 +-
.../apache/jasper/servlet/JasperInitializer.java | 42 +
java/org/apache/jasper/servlet/JasperLoader.java | 62 +-
.../apache/jasper/servlet/JspCServletContext.java | 171 +-
java/org/apache/jasper/servlet/JspServlet.java | 31 +-
.../apache/jasper/servlet/JspServletWrapper.java | 40 +-
java/org/apache/jasper/tagplugins/jstl/Util.java | 113 +-
.../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 | 127 -
java/org/apache/jasper/util/ExceptionUtils.java | 8 +-
.../org/apache/jasper/util/FastRemovalDequeue.java | 2 +-
.../apache/jasper/util/UniqueAttributesImpl.java | 4 +-
java/org/apache/jasper/xmlparser/ASCIIReader.java | 14 +-
java/org/apache/jasper/xmlparser/EncodingMap.java | 188 +-
java/org/apache/jasper/xmlparser/ParserUtils.java | 12 +-
java/org/apache/jasper/xmlparser/SymbolTable.java | 134 +-
java/org/apache/jasper/xmlparser/TreeNode.java | 30 +-
java/org/apache/jasper/xmlparser/UCSReader.java | 32 +-
java/org/apache/jasper/xmlparser/UTF8Reader.java | 64 +-
java/org/apache/jasper/xmlparser/XMLChar.java | 206 +-
.../jasper/xmlparser/XMLEncodingDetector.java | 173 +-
java/org/apache/jasper/xmlparser/XMLString.java | 16 +-
.../apache/jasper/xmlparser/XMLStringBuffer.java | 44 +-
java/org/apache/juli/AsyncFileHandler.java | 77 +-
java/org/apache/juli/ClassLoaderLogManager.java | 132 +-
java/org/apache/juli/DateFormatCache.java | 6 +-
java/org/apache/juli/FileHandler.java | 50 +-
java/org/apache/juli/JdkLoggerFormatter.java | 44 +-
java/org/apache/juli/OneLineFormatter.java | 4 +-
java/org/apache/juli/VerbatimFormatter.java | 6 +-
java/org/apache/juli/logging/DirectJDKLog.java | 86 +-
java/org/apache/juli/logging/Log.java | 8 +-
.../juli/logging/LogConfigurationException.java | 34 +-
java/org/apache/juli/logging/LogFactory.java | 208 +-
java/org/apache/juli/logging/package.html | 10 +-
java/org/apache/naming/Constants.java | 6 +-
.../org/apache/naming/ContextAccessController.java | 30 +-
java/org/apache/naming/ContextBindings.java | 134 +-
java/org/apache/naming/EjbRef.java | 18 +-
java/org/apache/naming/HandlerRef.java | 12 +-
java/org/apache/naming/JndiPermission.java | 8 +-
java/org/apache/naming/LocalStrings_es.properties | 2 +-
java/org/apache/naming/NameParserImpl.java | 14 +-
java/org/apache/naming/NamingContext.java | 359 +-
.../naming/NamingContextBindingsEnumeration.java | 22 +-
.../apache/naming/NamingContextEnumeration.java | 12 +-
java/org/apache/naming/NamingEntry.java | 29 +-
java/org/apache/naming/ResourceEnvRef.java | 45 +-
java/org/apache/naming/ResourceLinkRef.java | 45 +-
java/org/apache/naming/ResourceRef.java | 22 +-
java/org/apache/naming/SelectorContext.java | 9 +-
java/org/apache/naming/ServiceRef.java | 19 +-
java/org/apache/naming/StringManager.java | 26 +-
java/org/apache/naming/TransactionRef.java | 12 +-
java/org/apache/naming/factory/BeanFactory.java | 48 +-
java/org/apache/naming/factory/Constants.java | 26 +-
.../naming/factory/DataSourceLinkFactory.java | 34 +-
java/org/apache/naming/factory/EjbFactory.java | 72 +-
.../apache/naming/factory/MailSessionFactory.java | 10 +-
java/org/apache/naming/factory/OpenEjbFactory.java | 14 +-
.../apache/naming/factory/ResourceEnvFactory.java | 18 +-
.../org/apache/naming/factory/ResourceFactory.java | 24 +-
.../apache/naming/factory/ResourceLinkFactory.java | 18 +-
.../org/apache/naming/factory/SendMailFactory.java | 8 +-
.../apache/naming/factory/TransactionFactory.java | 24 +-
.../naming/factory/webservices/ServiceProxy.java | 19 +-
.../factory/webservices/ServiceRefFactory.java | 48 +-
.../apache/naming/java/javaURLContextFactory.java | 16 +-
.../apache/naming/resources/BaseDirContext.java | 1678 -----
java/org/apache/naming/resources/CacheEntry.java | 69 -
java/org/apache/naming/resources/Constants.java | 32 -
.../naming/resources/DirContextURLConnection.java | 458 --
.../resources/DirContextURLStreamHandler.java | 268 -
.../DirContextURLStreamHandlerFactory.java | 81 -
.../apache/naming/resources/FileDirContext.java | 1079 ---
.../resources/ImmutableNameNotFoundException.java | 52 -
.../naming/resources/LocalStrings.properties | 45 -
.../naming/resources/LocalStrings_es.properties | 44 -
.../naming/resources/LocalStrings_fr.properties | 35 -
.../naming/resources/LocalStrings_ja.properties | 36 -
.../apache/naming/resources/ProxyDirContext.java | 1716 -----
.../resources/RecyclableNamingEnumeration.java | 118 -
java/org/apache/naming/resources/Resource.java | 113 -
.../naming/resources/ResourceAttributes.java | 985 ---
.../org/apache/naming/resources/ResourceCache.java | 440 --
.../apache/naming/resources/VirtualDirContext.java | 308 -
.../org/apache/naming/resources/WARDirContext.java | 954 ---
java/org/apache/naming/resources/jndi/Handler.java | 32 -
java/org/apache/naming/resources/package.html | 31 -
java/org/apache/tomcat/InstanceManager.java | 6 +-
java/org/apache/tomcat/JarScanFilter.java | 31 +
java/org/apache/tomcat/JarScanType.java | 23 +
java/org/apache/tomcat/JarScanner.java | 15 +-
java/org/apache/tomcat/JarScannerCallback.java | 35 +-
java/org/apache/tomcat/buildutil/CheckEol.java | 4 +-
java/org/apache/tomcat/buildutil/Txt2Html.java | 2 +-
java/org/apache/tomcat/jni/Buffer.java | 91 +
java/org/apache/tomcat/jni/Directory.java | 2 +-
java/org/apache/tomcat/jni/Error.java | 6 +-
java/org/apache/tomcat/jni/File.java | 2 +-
java/org/apache/tomcat/jni/Library.java | 4 +-
java/org/apache/tomcat/jni/Poll.java | 20 +-
java/org/apache/tomcat/jni/SSL.java | 9 +-
java/org/apache/tomcat/jni/SSLContext.java | 9 +-
java/org/apache/tomcat/jni/SSLExt.java | 159 +
java/org/apache/tomcat/jni/SSLSocket.java | 2 +-
java/org/apache/tomcat/jni/Thread.java | 33 +
java/org/apache/tomcat/jni/socket/AprSocket.java | 922 +++
.../apache/tomcat/jni/socket/AprSocketContext.java | 1347 ++++
java/org/apache/tomcat/jni/socket/HostInfo.java | 84 +
java/org/apache/tomcat/spdy/CompressDeflater6.java | 178 +
java/org/apache/tomcat/spdy/NetSupportOpenSSL.java | 208 +
java/org/apache/tomcat/spdy/NetSupportSocket.java | 171 +
java/org/apache/tomcat/spdy/SpdyConnection.java | 681 ++
java/org/apache/tomcat/spdy/SpdyContext.java | 216 +
java/org/apache/tomcat/spdy/SpdyFrame.java | 354 +
java/org/apache/tomcat/spdy/SpdyStream.java | 308 +
java/org/apache/tomcat/util/Diagnostics.java | 721 ++
java/org/apache/tomcat/util/DomUtil.java | 274 -
.../org/apache/tomcat/util/IntrospectionUtils.java | 552 +-
.../org/apache/tomcat/util/LocalStrings.properties | 31 +
java/org/apache/tomcat/util/MutableInteger.java | 33 -
java/org/apache/tomcat/util/bcel/Constants.java | 436 +-
.../tomcat/util/bcel/classfile/AccessFlags.java | 2 +-
.../util/bcel/classfile/AnnotationDefault.java | 27 +-
.../bcel/classfile/AnnotationElementValue.java | 16 -
.../util/bcel/classfile/AnnotationEntry.java | 28 +-
.../tomcat/util/bcel/classfile/Annotations.java | 27 +-
.../util/bcel/classfile/ArrayElementValue.java | 29 -
.../tomcat/util/bcel/classfile/Attribute.java | 48 +-
.../util/bcel/classfile/AttributeReader.java | 57 -
.../util/bcel/classfile/ClassElementValue.java | 10 -
.../util/bcel/classfile/ClassFormatException.java | 8 +-
.../tomcat/util/bcel/classfile/ClassParser.java | 134 +-
.../apache/tomcat/util/bcel/classfile/Code.java | 116 +-
.../tomcat/util/bcel/classfile/CodeException.java | 128 -
.../tomcat/util/bcel/classfile/Constant.java | 26 +-
.../tomcat/util/bcel/classfile/ConstantCP.java | 16 +-
.../tomcat/util/bcel/classfile/ConstantClass.java | 19 +-
.../tomcat/util/bcel/classfile/ConstantDouble.java | 21 +-
.../util/bcel/classfile/ConstantFieldref.java | 4 +-
.../tomcat/util/bcel/classfile/ConstantFloat.java | 23 +-
.../util/bcel/classfile/ConstantInteger.java | 21 +-
.../bcel/classfile/ConstantInterfaceMethodref.java | 4 +-
.../util/bcel/classfile/ConstantInvokeDynamic.java | 51 +-
.../tomcat/util/bcel/classfile/ConstantLong.java | 21 +-
.../util/bcel/classfile/ConstantMethodHandle.java | 49 +-
.../util/bcel/classfile/ConstantMethodType.java | 35 +-
.../util/bcel/classfile/ConstantMethodref.java | 4 +-
.../util/bcel/classfile/ConstantNameAndType.java | 18 +-
.../tomcat/util/bcel/classfile/ConstantPool.java | 29 +-
.../tomcat/util/bcel/classfile/ConstantString.java | 19 +-
.../tomcat/util/bcel/classfile/ConstantUtf8.java | 65 +-
.../tomcat/util/bcel/classfile/ConstantValue.java | 68 +-
.../tomcat/util/bcel/classfile/Deprecated.java | 30 +-
.../tomcat/util/bcel/classfile/ElementValue.java | 11 +-
.../util/bcel/classfile/ElementValuePair.java | 10 +-
.../util/bcel/classfile/EnclosingMethod.java | 13 +-
.../util/bcel/classfile/EnumElementValue.java | 18 +-
.../tomcat/util/bcel/classfile/ExceptionTable.java | 43 +-
.../apache/tomcat/util/bcel/classfile/Field.java | 131 -
.../tomcat/util/bcel/classfile/FieldOrMethod.java | 57 +-
.../tomcat/util/bcel/classfile/InnerClass.java | 133 -
.../tomcat/util/bcel/classfile/InnerClasses.java | 60 +-
.../tomcat/util/bcel/classfile/JavaClass.java | 126 +-
.../tomcat/util/bcel/classfile/LineNumber.java | 92 -
.../util/bcel/classfile/LineNumberTable.java | 75 +-
.../tomcat/util/bcel/classfile/LocalVariable.java | 142 -
.../util/bcel/classfile/LocalVariableTable.java | 85 +-
.../bcel/classfile/LocalVariableTypeTable.java | 67 +-
.../apache/tomcat/util/bcel/classfile/Method.java | 175 -
.../tomcat/util/bcel/classfile/PMGClass.java | 62 +-
.../bcel/classfile/ParameterAnnotationEntry.java | 4 +-
.../util/bcel/classfile/ParameterAnnotations.java | 12 +-
.../classfile/RuntimeInvisibleAnnotations.java | 17 +-
.../RuntimeInvisibleParameterAnnotations.java | 17 +-
.../bcel/classfile/RuntimeVisibleAnnotations.java | 17 +-
.../RuntimeVisibleParameterAnnotations.java | 17 +-
.../tomcat/util/bcel/classfile/Signature.java | 48 +-
.../util/bcel/classfile/SimpleElementValue.java | 33 -
.../tomcat/util/bcel/classfile/SourceFile.java | 55 +-
.../tomcat/util/bcel/classfile/StackMap.java | 40 +-
.../tomcat/util/bcel/classfile/StackMapEntry.java | 91 +-
.../tomcat/util/bcel/classfile/StackMapTable.java | 40 +-
.../util/bcel/classfile/StackMapTableEntry.java | 143 +-
.../tomcat/util/bcel/classfile/StackMapType.java | 81 +-
.../tomcat/util/bcel/classfile/Synthetic.java | 34 +-
.../apache/tomcat/util/bcel/classfile/Unknown.java | 42 +-
.../apache/tomcat/util/bcel/classfile/Utility.java | 720 +-
java/org/apache/tomcat/util/bcel/package.html | 4 +-
.../tomcat/util/bcel/util/BCELComparator.java | 8 +-
.../apache/tomcat/util/bcel/util/ByteSequence.java | 58 -
java/org/apache/tomcat/util/buf/Ascii.java | 157 +-
java/org/apache/tomcat/util/buf/B2CConverter.java | 25 +-
java/org/apache/tomcat/util/buf/ByteChunk.java | 205 +-
java/org/apache/tomcat/util/buf/C2BConverter.java | 17 +-
java/org/apache/tomcat/util/buf/CharChunk.java | 154 +-
java/org/apache/tomcat/util/buf/HexUtils.java | 9 -
.../apache/tomcat/util/buf/LocalStrings.properties | 4 +
java/org/apache/tomcat/util/buf/MessageBytes.java | 174 +-
java/org/apache/tomcat/util/buf/StringCache.java | 35 +-
java/org/apache/tomcat/util/buf/UDecoder.java | 180 +-
java/org/apache/tomcat/util/buf/UEncoder.java | 31 +-
java/org/apache/tomcat/util/buf/Utf8Decoder.java | 3 +-
.../apache/tomcat/util/codec/binary/Base64.java | 2 +-
.../tomcat/util/codec/binary/BaseNCodec.java | 9 +-
.../tomcat/util/codec/binary/StringUtils.java | 9 +-
.../tomcat/util/collections/ConcurrentCache.java | 4 +-
.../collections/ManagedConcurrentWeakHashMap.java | 272 +
.../tomcat/util/collections/SynchronizedQueue.java | 103 +
.../tomcat/util/collections/SynchronizedStack.java | 99 +
.../apache/tomcat/util/descriptor/Constants.java | 24 +
.../tomcat/util/descriptor/DigesterFactory.java | 113 +
.../tomcat/util/descriptor/LocalResolver.java | 127 +
.../tomcat/util/descriptor/LocalStrings.properties | 17 +
.../util/descriptor/LocalStrings_es.properties | 17 +
.../tomcat/util/descriptor/XmlErrorHandler.java | 75 +
.../tomcat/util/descriptor/XmlIdentifiers.java | 85 +
.../util/descriptor/web/ApplicationListener.java | 43 +
.../util/descriptor/web/ApplicationParameter.java | 124 +
.../tomcat/util/descriptor/web/Constants.java | 26 +
.../tomcat/util/descriptor/web/ContextEjb.java | 163 +
.../util/descriptor/web/ContextEnvironment.java | 130 +
.../tomcat/util/descriptor/web/ContextHandler.java | 210 +
.../util/descriptor/web/ContextLocalEjb.java | 161 +
.../util/descriptor/web/ContextResource.java | 183 +
.../util/descriptor/web/ContextResourceEnvRef.java | 98 +
.../util/descriptor/web/ContextResourceLink.java | 123 +
.../tomcat/util/descriptor/web/ContextService.java | 356 +
.../util/descriptor/web/ContextTransaction.java | 89 +
.../tomcat/util/descriptor/web/ErrorPage.java | 178 +
.../tomcat/util/descriptor/web/FilterDef.java | 211 +
.../tomcat/util/descriptor/web/FilterMap.java | 222 +
.../descriptor/web/FragmentJarScannerCallback.java | 154 +
.../tomcat/util/descriptor/web/Injectable.java | 25 +
.../util/descriptor/web/InjectionTarget.java | 57 +
.../descriptor/web/JspConfigDescriptorImpl.java | 46 +
.../util/descriptor/web/JspPropertyGroup.java | 103 +
.../web/JspPropertyGroupDescriptorImpl.java | 163 +
.../util/descriptor/web/LocalStrings.properties | 64 +
.../util/descriptor/web/LocalStrings_es.properties | 21 +
.../tomcat/util/descriptor/web/LoginConfig.java | 221 +
.../util/descriptor/web/MessageDestination.java | 160 +
.../util/descriptor/web/MessageDestinationRef.java | 134 +
.../tomcat/util/descriptor/web/MultipartDef.java | 138 +
.../util/descriptor/web/NamingResources.java | 40 +
.../tomcat/util/descriptor/web/ResourceBase.java | 212 +
.../util/descriptor/web/SecurityCollection.java | 412 ++
.../util/descriptor/web/SecurityConstraint.java | 787 ++
.../util/descriptor/web/SecurityRoleRef.java | 92 +
.../tomcat/util/descriptor/web/ServletDef.java | 275 +
.../tomcat/util/descriptor/web/SessionConfig.java | 105 +
.../util/descriptor/web/TaglibDescriptorImpl.java | 78 +
.../tomcat/util/descriptor/web/WebRuleSet.java | 1354 ++++
.../apache/tomcat/util/descriptor/web/WebXml.java | 2234 ++++++
.../tomcat/util/descriptor/web/WebXmlParser.java | 163 +
.../util/descriptor/web/mbeans-descriptors.xml | 110 +
.../util/descriptor/web}/package.html | 0
.../digester/AbstractObjectCreationFactory.java | 6 +-
.../apache/tomcat/util/digester/ArrayStack.java | 10 +-
.../tomcat/util/digester/CallMethodRule.java | 201 +-
.../apache/tomcat/util/digester/CallParamRule.java | 96 +-
java/org/apache/tomcat/util/digester/Digester.java | 1084 +--
.../tomcat/util/digester/FactoryCreateRule.java | 267 +-
.../apache/tomcat/util/digester/GenericParser.java | 86 -
.../tomcat/util/digester/NodeCreateRule.java | 440 --
.../tomcat/util/digester/ObjectCreateRule.java | 44 +-
.../util/digester/ObjectCreationFactory.java | 6 +-
.../tomcat/util/digester/ObjectParamRule.java | 126 -
.../util/digester/ParserFeatureSetterFactory.java | 73 -
.../tomcat/util/digester/PathCallParamRule.java | 95 -
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 | 21 +-
.../apache/tomcat/util/digester/SetNextRule.java | 86 +-
.../tomcat/util/digester/SetPropertiesRule.java | 201 +-
.../tomcat/util/digester/SetPropertyRule.java | 163 -
.../apache/tomcat/util/digester/SetRootRule.java | 225 -
.../apache/tomcat/util/digester/SetTopRule.java | 225 -
.../util/digester/WithDefaultsRulesWrapper.java | 167 -
.../apache/tomcat/util/digester/XercesParser.java | 189 -
java/org/apache/tomcat/util/digester/package.html | 165 +-
java/org/apache/tomcat/util/http/ContentType.java | 99 -
.../org/apache/tomcat/util/http/CookieSupport.java | 15 +
java/org/apache/tomcat/util/http/Cookies.java | 17 +-
.../tomcat/util/http/FastHttpDateFormat.java | 28 +-
java/org/apache/tomcat/util/http/HttpMessages.java | 10 +-
java/org/apache/tomcat/util/http/MimeHeaders.java | 37 +-
java/org/apache/tomcat/util/http/Parameters.java | 46 +-
java/org/apache/tomcat/util/http/ServerCookie.java | 20 -
.../http/fileupload/ByteArrayOutputStream.java | 42 +-
.../http/fileupload/DeferredFileOutputStream.java | 10 +-
.../util/http/fileupload/FileCleaningTracker.java | 200 -
.../util/http/fileupload/FileDeleteStrategy.java | 136 -
.../tomcat/util/http/fileupload/FileItem.java | 2 +-
.../util/http/fileupload/FileItemFactory.java | 2 +-
.../util/http/fileupload/FileItemIterator.java | 2 +-
.../util/http/fileupload/FileItemStream.java | 2 +-
.../tomcat/util/http/fileupload/FileUpload.java | 2 +-
.../util/http/fileupload/FileUploadBase.java | 16 +-
.../tomcat/util/http/fileupload/FileUtils.java | 8 +-
.../tomcat/util/http/fileupload/IOUtils.java | 8 +-
.../http/fileupload/InvalidFileNameException.java | 2 +-
.../util/http/fileupload/MultipartStream.java | 2 +-
.../util/http/fileupload/ParameterParser.java | 12 +-
.../util/http/fileupload/ProgressListener.java | 2 +-
.../util/http/fileupload/RequestContext.java | 2 +-
.../http/fileupload/ThresholdingOutputStream.java | 6 +-
.../util/http/fileupload/disk/DiskFileItem.java | 16 +-
.../http/fileupload/disk/DiskFileItemFactory.java | 54 +-
.../http/fileupload/servlet/ServletFileUpload.java | 2 +-
.../fileupload/servlet/ServletRequestContext.java | 2 +-
.../util/http/fileupload/util/Closeable.java | 2 +-
.../http/fileupload/util/FileItemHeadersImpl.java | 6 +-
.../http/fileupload/util/LimitedInputStream.java | 2 +-
.../tomcat/util/http/fileupload/util/Streams.java | 4 +-
.../http/fileupload/util/mime/MimeUtility.java | 3 +-
.../util/http/mapper/LocalStrings.properties | 16 -
.../org/apache/tomcat/util/http/mapper/Mapper.java | 1526 ----
.../tomcat/util/http/mapper/MappingData.java | 55 -
.../apache/tomcat/util/http/parser/HttpParser.java | 8 +-
.../tomcat/util/http/parser/MediaTypeCache.java | 2 +-
java/org/apache/tomcat/util/log/CaptureLog.java | 5 +-
.../apache/tomcat/util/log/SystemLogHandler.java | 10 +-
.../org/apache/tomcat/util/log/UserDataHelper.java | 18 +-
.../apache/tomcat/util/modeler/AttributeInfo.java | 8 +-
.../tomcat/util/modeler/BaseAttributeFilter.java | 8 +-
.../apache/tomcat/util/modeler/BaseModelMBean.java | 313 +-
.../util/modeler/BaseNotificationBroadcaster.java | 49 +-
.../tomcat/util/modeler/ConstructorInfo.java | 53 -
.../apache/tomcat/util/modeler/FeatureInfo.java | 19 +-
.../util/modeler/FixedNotificationFilter.java | 97 -
.../apache/tomcat/util/modeler/ManagedBean.java | 274 +-
.../tomcat/util/modeler/NotificationInfo.java | 46 +-
.../apache/tomcat/util/modeler/OperationInfo.java | 43 +-
.../apache/tomcat/util/modeler/ParameterInfo.java | 6 +-
java/org/apache/tomcat/util/modeler/Registry.java | 344 +-
.../apache/tomcat/util/modeler/RegistryMBean.java | 72 +-
.../modules/MbeansDescriptorsDOMSource.java | 303 -
.../modules/MbeansDescriptorsDigesterSource.java | 112 +-
.../MbeansDescriptorsIntrospectionSource.java | 83 +-
.../modules/MbeansDescriptorsSerSource.java | 106 -
.../tomcat/util/modeler/modules/MbeansSource.java | 375 -
.../util/modeler/modules/MbeansSourceMBean.java | 62 -
.../tomcat/util/modeler/modules/ModelerSource.java | 71 +-
.../tomcat/util/modeler/modules/package.html | 10 +-
java/org/apache/tomcat/util/modeler/package.html | 2 +-
.../apache/tomcat/util/net/AbstractEndpoint.java | 10 +-
java/org/apache/tomcat/util/net/AprEndpoint.java | 1366 ++--
java/org/apache/tomcat/util/net/JIoEndpoint.java | 22 +-
.../tomcat/util/net/NioBlockingSelector.java | 54 +-
java/org/apache/tomcat/util/net/NioChannel.java | 20 +-
java/org/apache/tomcat/util/net/NioEndpoint.java | 658 +-
.../apache/tomcat/util/net/NioSelectorPool.java | 40 +-
.../apache/tomcat/util/net/SSLSessionManager.java | 2 +-
java/org/apache/tomcat/util/net/SSLUtil.java | 5 +-
.../apache/tomcat/util/net/SecureNioChannel.java | 5 +-
java/org/apache/tomcat/util/net/SocketStatus.java | 2 +-
java/org/apache/tomcat/util/net/SocketWrapper.java | 63 +-
java/org/apache/tomcat/util/net/URL.java | 96 +-
.../tomcat/util/net/jsse/JSSESocketFactory.java | 16 +-
.../apache/tomcat/util/net/jsse/JSSESupport.java | 2 +-
.../tomcat/util/net/res/LocalStrings.properties | 32 +-
.../tomcat/util/net/res/LocalStrings_es.properties | 10 -
.../tomcat/util/net/res/LocalStrings_fr.properties | 5 +-
.../tomcat/util/net/res/LocalStrings_ja.properties | 6 +-
java/org/apache/tomcat/util/res/StringManager.java | 6 +-
java/org/apache/tomcat/util/scan/Constants.java | 4 +-
java/org/apache/tomcat/util/scan/FileUrlJar.java | 2 +-
.../tomcat/util/scan/LocalStrings.properties | 9 +-
.../tomcat/util/scan/StandardJarScanFilter.java | 249 +
.../tomcat/util/scan/StandardJarScanner.java | 237 +-
java/org/apache/tomcat/util/scan/UrlJar.java | 2 +-
.../tomcat/util/threads/ThreadPoolExecutor.java | 1 -
.../tomcat/websocket/AsyncChannelWrapper.java | 47 +
.../websocket/AsyncChannelWrapperNonSecure.java | 112 +
.../websocket/AsyncChannelWrapperSecure.java | 555 ++
.../apache/tomcat/websocket/BackgroundProcess.java | 26 +
.../tomcat/websocket/BackgroundProcessManager.java | 128 +
java/org/apache/tomcat/websocket/Constants.java | 67 +
java/org/apache/tomcat/websocket/DecoderEntry.java | 39 +
.../tomcat/websocket/LocalStrings.properties | 93 +
.../tomcat/websocket/MessageHandlerResult.java | 42 +
.../tomcat/websocket/MessageHandlerResultType.java | 23 +
.../websocket/ReadBufferOverflowException.java | 34 +
.../websocket/SendHandlerToCompletionHandler.java | 42 +
java/org/apache/tomcat/websocket/Util.java | 474 ++
.../tomcat/websocket/WrappedMessageHandler.java | 25 +
.../tomcat/websocket/WsContainerProvider.java | 28 +
java/org/apache/tomcat/websocket/WsFrameBase.java | 675 ++
.../org/apache/tomcat/websocket/WsFrameClient.java | 126 +
.../tomcat/websocket/WsHandshakeResponse.java | 47 +
.../org/apache/tomcat/websocket/WsIOException.java | 41 +
.../org/apache/tomcat/websocket/WsPongMessage.java | 39 +
.../tomcat/websocket/WsRemoteEndpointAsync.java | 79 +
.../tomcat/websocket/WsRemoteEndpointBase.java | 64 +
.../tomcat/websocket/WsRemoteEndpointBasic.java | 76 +
.../tomcat/websocket/WsRemoteEndpointImplBase.java | 957 +++
.../websocket/WsRemoteEndpointImplClient.java | 56 +
java/org/apache/tomcat/websocket/WsSession.java | 616 ++
.../tomcat/websocket/WsWebSocketContainer.java | 796 ++
.../apache/tomcat/websocket/pojo/Constants.java | 30 +
.../tomcat/websocket/pojo/LocalStrings.properties | 39 +
.../tomcat/websocket/pojo/PojoEndpointBase.java | 157 +
.../tomcat/websocket/pojo/PojoEndpointClient.java | 46 +
.../tomcat/websocket/pojo/PojoEndpointServer.java | 71 +
.../websocket/pojo/PojoMessageHandlerBase.java | 102 +
.../pojo/PojoMessageHandlerPartialBase.java | 77 +
.../pojo/PojoMessageHandlerPartialBinary.java | 36 +
.../pojo/PojoMessageHandlerPartialText.java | 35 +
.../pojo/PojoMessageHandlerWholeBase.java | 94 +
.../pojo/PojoMessageHandlerWholeBinary.java | 122 +
.../pojo/PojoMessageHandlerWholePong.java | 48 +
.../pojo/PojoMessageHandlerWholeText.java | 127 +
.../tomcat/websocket/pojo/PojoMethodMapping.java | 606 ++
.../tomcat/websocket/pojo/PojoPathParam.java | 47 +
.../apache/tomcat/websocket/pojo/package-info.java | 21 +
.../apache/tomcat/websocket/server/Constants.java | 41 +
.../server/DefaultServerEndpointConfigurator.java | 81 +
.../websocket/server/LocalStrings.properties | 34 +
.../tomcat/websocket/server/UriTemplate.java | 159 +
.../apache/tomcat/websocket/server/WsFilter.java | 273 +
.../tomcat/websocket/server/WsFrameServer.java | 66 +
.../websocket/server/WsHandshakeRequest.java | 143 +
.../websocket/server/WsHttpUpgradeHandler.java | 243 +
.../apache/tomcat/websocket/server/WsListener.java | 40 +
.../tomcat/websocket/server/WsMappingResult.java | 44 +
.../server/WsRemoteEndpointImplServer.java | 163 +
java/org/apache/tomcat/websocket/server/WsSci.java | 139 +
.../tomcat/websocket/server/WsServerContainer.java | 430 ++
.../tomcat/websocket/server/WsSessionListener.java | 42 +
.../tomcat/websocket/server/WsWriteTimeout.java | 129 +
.../tomcat/websocket/server/package-info.java | 21 +
modules/bayeux/.classpath | 9 +
modules/bayeux/.project | 17 +
modules/bayeux/build.xml | 230 +
.../java/org/apache/cometd/bayeux/Bayeux.java | 242 +
.../java/org/apache/cometd/bayeux/Channel.java | 103 +
.../java/org/apache/cometd/bayeux/Client.java | 91 +
.../java/org/apache/cometd/bayeux/DataFilter.java | 38 +
.../java/org/apache/cometd/bayeux/Listener.java | 45 +
.../java/org/apache/cometd/bayeux/Message.java | 68 +
.../org/apache/cometd/bayeux/SecurityPolicy.java | 28 +
.../org/apache/tomcat/bayeux/BayeuxException.java | 39 +
.../org/apache/tomcat/bayeux/BayeuxRequest.java | 54 +
.../org/apache/tomcat/bayeux/BayeuxServlet.java | 236 +
.../java/org/apache/tomcat/bayeux/ChannelImpl.java | 189 +
.../java/org/apache/tomcat/bayeux/ClientImpl.java | 279 +
.../java/org/apache/tomcat/bayeux/HttpError.java | 60 +
.../java/org/apache/tomcat/bayeux/MessageImpl.java | 80 +
.../java/org/apache/tomcat/bayeux/RequestBase.java | 259 +
.../org/apache/tomcat/bayeux/RequestFactory.java | 48 +
.../org/apache/tomcat/bayeux/TomcatBayeux.java | 176 +
.../tomcat/bayeux/request/MetaConnectRequest.java | 125 +
.../bayeux/request/MetaDisconnectRequest.java | 105 +
.../bayeux/request/MetaHandshakeRequest.java | 116 +
.../bayeux/request/MetaSubscribeRequest.java | 130 +
.../bayeux/request/MetaUnsubscribeRequest.java | 130 +
.../tomcat/bayeux/request/PublishRequest.java | 142 +
.../cometd/bayeux/samples/BayeuxStockTicker.java | 232 +
.../cometd/bayeux/samples/EchoChatClient.java | 118 +
modules/bayeux/webapps/cometd/WEB-INF/web.xml | 53 +
.../cometd/examples/simplechat/cometdchat.htm | 130 +
.../webapps/cometd/examples/simplechat/ticker.html | 143 +
modules/bayeux/webapps/cometd/index.html | 22 +
modules/jdbc-pool/build.properties.default | 4 +-
modules/jdbc-pool/doc/package.xsl | 2 +-
modules/jdbc-pool/pom.xml | 4 +-
.../jdbc/naming/GenericNamingResourcesFactory.java | 5 +-
.../apache/tomcat/jdbc/pool/ConnectionPool.java | 10 +-
.../org/apache/tomcat/jdbc/pool/DataSource.java | 2 +-
.../apache/tomcat/jdbc/pool/DataSourceProxy.java | 17 +-
.../jdbc/pool/DisposableConnectionFacade.java | 5 +-
.../apache/tomcat/jdbc/pool/FairBlockingQueue.java | 32 +-
.../jdbc/pool/MultiLockFairBlockingQueue.java | 34 +-
.../apache/tomcat/jdbc/pool/PoolProperties.java | 9 +-
.../apache/tomcat/jdbc/pool/PooledConnection.java | 3 +-
.../apache/tomcat/jdbc/pool/ProxyConnection.java | 5 +-
.../jdbc/pool/interceptor/SlowQueryReport.java | 8 +-
.../jdbc/pool/interceptor/SlowQueryReportJmx.java | 4 +-
.../jdbc/pool/interceptor/StatementCache.java | 5 +-
.../interceptor/StatementDecoratorInterceptor.java | 2 +-
.../jdbc/pool/interceptor/StatementFinalizer.java | 4 +-
.../tomcat/jdbc/pool/jmx/ConnectionPool.java | 3 +-
.../java/org/apache/tomcat/jdbc/bugs/Bug51582.java | 173 +-
.../jdbc/pool/interceptor/TestInterceptor.java | 7 +-
.../tomcat/jdbc/test/AlternateUsernameTest.java | 6 +-
.../tomcat/jdbc/test/CheckOutThreadTest.java | 11 -
.../apache/tomcat/jdbc/test/ConnectCountTest.java | 11 -
.../apache/tomcat/jdbc/test/CreateTestTable.java | 8 +-
.../apache/tomcat/jdbc/test/DefaultTestCase.java | 12 +-
.../org/apache/tomcat/jdbc/test/FairnessTest.java | 11 -
.../apache/tomcat/jdbc/test/JmxPasswordTest.java | 2 +-
.../tomcat/jdbc/test/SimplePOJOAsyncExample.java | 45 +-
.../apache/tomcat/jdbc/test/SimplePOJOExample.java | 27 +-
.../apache/tomcat/jdbc/test/TestAsyncQueue.java | 6 +-
.../tomcat/jdbc/test/TestStatementCache.java | 3 +
.../apache/tomcat/jdbc/test/driver/Connection.java | 23 +-
.../org/apache/tomcat/jdbc/test/driver/Driver.java | 8 +-
.../apache/tomcat/jdbc/test/driver/ResultSet.java | 13 +-
.../apache/tomcat/jdbc/test/driver/Statement.java | 22 +-
modules/tomcat-lite/.classpath | 25 +
modules/tomcat-lite/.project | 17 +
modules/tomcat-lite/build.xml | 325 +
modules/tomcat-lite/ivy.xml | 32 +
.../apache/coyote/lite/LiteProtocolHandler.java | 426 ++
.../org/apache/tomcat/lite/http/BaseMapper.java | 1112 +++
.../apache/tomcat/lite/http/CompressFilter.java | 225 +
.../org/apache/tomcat/lite/http/ContentType.java | 96 +
.../tomcat/lite/http/DefaultHttpConnector.java | 23 +
.../org/apache/tomcat/lite/http/Dispatcher.java | 199 +
.../apache/tomcat/lite/http/Http11Connection.java | 1459 ++++
.../org/apache/tomcat/lite/http/HttpChannel.java | 830 +++
.../org/apache/tomcat/lite/http/HttpClient.java | 22 +
.../tomcat/lite/http/HttpConnectionPool.java | 399 ++
.../org/apache/tomcat/lite/http/HttpConnector.java | 514 ++
.../org/apache/tomcat/lite/http/HttpMessage.java | 508 ++
.../org/apache/tomcat/lite/http/HttpRequest.java | 1019 +++
.../org/apache/tomcat/lite/http/HttpResponse.java | 581 ++
.../org/apache/tomcat/lite/http/HttpServer.java | 35 +
.../org/apache/tomcat/lite/http/HttpWriter.java | 313 +
.../org/apache/tomcat/lite/http/MappingData.java | 69 +
.../java/org/apache/tomcat/lite/http/MultiMap.java | 357 +
.../org/apache/tomcat/lite/http/ServerCookie.java | 819 +++
.../apache/tomcat/lite/http/SpdyConnection.java | 820 +++
.../java/org/apache/tomcat/lite/http/package.html | 0
.../java/org/apache/tomcat/lite/io/BBucket.java | 41 +
.../java/org/apache/tomcat/lite/io/BBuffer.java | 1204 ++++
.../apache/tomcat/lite/io/BufferedIOReader.java | 380 +
.../java/org/apache/tomcat/lite/io/CBucket.java | 508 ++
.../java/org/apache/tomcat/lite/io/CBuffer.java | 387 +
.../org/apache/tomcat/lite/io/DumpChannel.java | 120 +
.../apache/tomcat/lite/io/FastHttpDateFormat.java | 231 +
.../org/apache/tomcat/lite/io/FileConnector.java | 27 +
.../apache/tomcat/lite/io/FileConnectorJavaIo.java | 49 +
.../org/apache/tomcat/lite/io/FutureCallbacks.java | 171 +
.../java/org/apache/tomcat/lite/io/Hex.java | 249 +
.../java/org/apache/tomcat/lite/io/IOBuffer.java | 698 ++
.../java/org/apache/tomcat/lite/io/IOChannel.java | 371 +
.../org/apache/tomcat/lite/io/IOConnector.java | 66 +
.../org/apache/tomcat/lite/io/IOInputStream.java | 71 +
.../org/apache/tomcat/lite/io/IOOutputStream.java | 204 +
.../java/org/apache/tomcat/lite/io/IOReader.java | 236 +
.../java/org/apache/tomcat/lite/io/IOWriter.java | 212 +
.../apache/tomcat/lite/io/MemoryIOConnector.java | 88 +
.../java/org/apache/tomcat/lite/io/NioChannel.java | 198 +
.../java/org/apache/tomcat/lite/io/NioThread.java | 1154 +++
.../org/apache/tomcat/lite/io/SocketConnector.java | 132 +
.../org/apache/tomcat/lite/io/SocketIOChannel.java | 271 +
.../org/apache/tomcat/lite/io/SslProvider.java | 24 +
.../org/apache/tomcat/lite/io/UrlEncoding.java | 215 +
.../apache/tomcat/lite/io/WrappedException.java | 40 +
.../tomcat/lite/io/jsse/JsseSslProvider.java | 466 ++
.../org/apache/tomcat/lite/io/jsse/SslChannel.java | 636 ++
.../java/org/apache/tomcat/lite/io/package.html | 7 +
.../org/apache/tomcat/lite/proxy/CopyCallback.java | 57 +
.../apache/tomcat/lite/proxy/HttpProxyService.java | 368 +
.../tomcat/lite/proxy/ProxyFlushedCallback.java | 25 +
.../org/apache/tomcat/lite/proxy/SocksServer.java | 448 ++
.../tomcat/lite/proxy/StaticContentService.java | 129 +
.../org/apache/tomcat/lite/service/IOStatus.java | 56 +
.../org/apache/tomcat/lite/service/LogConfig.java | 65 +
.../tomcat/lite/util/FastHttpDateFormat.java | 231 +
.../org/apache/tomcat/lite/util/LocaleParser.java | 394 +
.../java/org/apache/tomcat/lite/util/MimeMap.java | 195 +
.../java/org/apache/tomcat/lite/util/Range.java | 160 +
.../org/apache/tomcat/lite/util/URLEncoder.java | 227 +
.../java/org/apache/tomcat/lite/util/UrlUtils.java | 84 +
modules/tomcat-lite/pom.xml | 118 +
.../test/org/apache/coyote/lite/ServletTests.java | 98 +
.../test/org/apache/coyote/lite/Tomcat.java | 911 +++
.../apache/coyote/lite/TomcatLiteCoyoteTest.java | 42 +
.../apache/coyote/lite/TomcatStandaloneMain.java | 59 +
.../test/org/apache/tomcat/lite/TestMain.java | 313 +
.../org/apache/tomcat/lite/http/ClientTest.java | 60 +
.../tomcat/lite/http/CompressFilterTest.java | 82 +
.../apache/tomcat/lite/http/DispatcherTest.java | 46 +
.../tomcat/lite/http/HttpChannelInMemoryTest.java | 384 +
.../apache/tomcat/lite/http/HttpChannelTest.java | 128 +
.../org/apache/tomcat/lite/http/HttpsTest.java | 74 +
.../org/apache/tomcat/lite/http/LiveHttp1Test.java | 152 +
.../org/apache/tomcat/lite/http/MultiMapTest.java | 54 +
.../test/org/apache/tomcat/lite/http/SpdyTest.java | 165 +
.../org/apache/tomcat/lite/http/genrsa_512.cert | 15 +
.../org/apache/tomcat/lite/http/genrsa_512.der | Bin 0 -> 345 bytes
.../tomcat/lite/http/services/EchoCallback.java | 61 +
.../tomcat/lite/http/services/SleepCallback.java | 85 +
.../test/org/apache/tomcat/lite/http/spdyreq0 | Bin 0 -> 425 bytes
.../test/org/apache/tomcat/lite/http/spdyreq0.bin | Bin 0 -> 425 bytes
.../org/apache/tomcat/lite/http/spdyreqCompressed | Bin 0 -> 277 bytes
.../apache/tomcat/lite/http/spdyreqCompressed.bin | Bin 0 -> 277 bytes
.../org/apache/tomcat/lite/io/BBufferTest.java | 159 +
.../org/apache/tomcat/lite/io/CBufferTest.java | 32 +
.../test/org/apache/tomcat/lite/io/OneTest.java | 27 +
.../test/org/apache/tomcat/lite/io/SocksTest.java | 58 +
.../org/apache/tomcat/lite/io/UEncoderTest.java | 44 +
.../test/org/apache/tomcat/lite/io/test.properties | 33 +
.../org/apache/tomcat/lite/load/LiveHttp5Test.java | 38 +
.../tomcat/lite/load/LiveHttpThreadedTest.java | 292 +
.../org/apache/tomcat/lite/load/MicroTest.java | 50 +
.../org/apache/tomcat/lite/load/ThreadRunner.java | 64 +
.../tomcat/lite/proxy/LiveProxyHttp1Test.java | 33 +
.../org/apache/tomcat/lite/proxy/ProxyTest.java | 120 +
.../apache/tomcat/lite/proxy/SmallProxyTest.java | 109 +
.../org/apache/tomcat/lite/util/UEncoderTest.java | 51 +
.../apache/tomcat/test/watchdog/AntProperties.java | 75 +
.../tomcat/test/watchdog/CookieController.java | 636 ++
.../apache/tomcat/test/watchdog/DynamicObject.java | 385 +
.../apache/tomcat/test/watchdog/HttpCookie.java | 290 +
.../apache/tomcat/test/watchdog/RfcDateParser.java | 103 +
.../tomcat/test/watchdog/WatchdogClient.java | 213 +
.../tomcat/test/watchdog/WatchdogHttpClient.java | 411 ++
.../tomcat/test/watchdog/WatchdogTestCase.java | 93 +
.../tomcat/test/watchdog/WatchdogTestImpl.java | 1172 +++
res/INSTALLLICENSE | 7 +
.../sub => res/META-INF/default}/.gitignore | 0
res/META-INF/el-api.jar.manifest | 4 +-
.../javax.servlet.ServletContainerInitializer | 1 +
res/META-INF/jasper.jar/web-fragment.xml | 26 +
res/META-INF/jsp-api.jar.license | 544 --
res/META-INF/jsp-api.jar.manifest | 4 +-
res/META-INF/jsp-api.jar.notice | 9 -
res/META-INF/servlet-api.jar.license | 6 +
res/META-INF/servlet-api.jar.manifest | 4 +-
res/META-INF/servlet-api.jar.notice | 10 +-
.../javax.servlet.ServletContainerInitializer | 1 +
.../services/javax.websocket.ContainerProvider | 1 +
.../javax.websocket.server.ServerContainerProvider | 1 +
...socket.server.ServerEndpointConfig.Configurator | 1 +
res/META-INF/tomcat-websocket.jar/web-fragment.xml | 26 +
res/META-INF/websocket-api.jar.manifest | 11 +
res/checkstyle/checkstyle.xml | 10 +-
res/checkstyle/javax-import-control.xml | 4 +
res/checkstyle/org-import-control.xml | 38 +-
res/findbugs/filter-false-positives.xml | 292 +-
res/findbugs/filter-post-7.0.x-fixes.xml | 49 -
res/ide-support/eclipse/eclipse.classpath | 2 +-
res/ide-support/eclipse/eclipse.project | 2 +-
.../eclipse/java-compiler-errors-warnings.txt | 55 +-
res/ide-support/eclipse/start-tomcat.launch | 6 +-
res/ide-support/eclipse/stop-tomcat.launch | 6 +-
res/ide-support/netbeans/README.txt | 143 +
.../netbeans/nb-tomcat-build.properties | 50 +
.../netbeans/nb-tomcat-project.properties | 33 +
res/ide-support/netbeans/nb-tomcat.xml | 149 +
res/ide-support/netbeans/project.xml | 197 +
res/maven/README.txt | 2 +-
res/maven/mvn-pub.xml | 12 +-
res/maven/mvn.properties.default | 2 +-
res/maven/tomcat-catalina.pom | 6 +
res/maven/tomcat-coyote.pom | 12 +
res/maven/tomcat-dbcp.pom | 8 +
res/maven/tomcat-jni.pom | 32 +
res/maven/tomcat-jsp-api.pom | 14 +-
res/maven/tomcat-servlet-api.pom | 23 +-
res/maven/tomcat-spdy.pom | 52 +
res/maven/tomcat-websocket-api.pom | 32 +
res/maven/tomcat-websocket.pom | 52 +
res/rat/rat-excludes.txt | 14 +-
res/tomcat.nsi | 2 +-
.../javax.servlet.ServletContainerInitializer | 2 +
test/deployment/broken.war | Bin 0 -> 1507 bytes
test/deployment/context.war | Bin 0 -> 565 bytes
test/deployment/context.xml | 17 +
test/deployment/contextCopyXMLFalse.war | Bin 0 -> 733 bytes
test/deployment/contextCopyXMLTrue.war | Bin 0 -> 732 bytes
test/deployment/contextUnpackWARFalse.war | Bin 0 -> 583 bytes
test/deployment/contextUnpackWARTrue.war | Bin 0 -> 582 bytes
test/deployment/dirContext/META-INF/context.xml | 17 +
test/deployment/dirContext/index.html | 22 +
test/deployment/dirNoContext/index.html | 22 +
test/deployment/noContext.war | Bin 0 -> 240 bytes
test/javax/el/TestArrayELResolver.java | 376 +
test/javax/el/TestBeanELResolver.java | 2 +-
.../el/TestBeanELResolverVarargsInvocation.java | 9 +-
test/javax/el/TestBeanNameELResolver.java | 616 ++
test/javax/el/TestCompositeELResolver.java | 9 +-
test/javax/el/TestELContext.java | 175 +
test/javax/el/TestELProcessor.java | 65 +
test/javax/el/TestELResolver.java | 130 +
test/javax/el/TestEvaluationListener.java | 134 +
test/javax/el/TestImportHandler.java | 166 +
test/javax/el/TestListELResolver.java | 388 +
test/javax/el/TestMapELResolver.java | 318 +
test/javax/el/TestResourceBundleELResolver.java | 265 +-
test/javax/el/TestStaticFieldELResolver.java | 490 ++
test/javax/el/TesterBean.java | 35 +
test/javax/el/TesterBeanNameResolver.java | 83 +
test/javax/el/TesterClass.java | 47 +
test/javax/el/TesterELContext.java | 45 +
test/javax/el/TesterELResolverOne.java | 29 +
test/javax/el/TesterELResolverTwo.java | 29 +
test/javax/el/TesterEvaluationListener.java | 80 +
test/javax/servlet/http/TestHttpServlet.java | 3 +-
test/javax/servlet/jsp/TestPageContext.java | 2 +-
.../servlet/resources/TestSchemaValidation.java | 103 +
.../authenticator/TestBasicAuthParser.java | 562 ++
.../authenticator/TestDigestAuthenticator.java | 19 +-
.../authenticator/TestFormAuthenticator.java | 76 +-
.../TestNonLoginAndBasicAuthenticator.java | 95 +-
.../TestSSOnonLoginAndBasicAuthenticator.java | 29 +-
.../TestSSOnonLoginAndDigestAuthenticator.java | 26 +-
.../TesterDigestAuthenticatorPerformance.java | 16 +-
.../catalina/connector/TestCoyoteAdapter.java | 95 +
.../catalina/connector/TestCoyoteOutputStream.java | 219 +
.../apache/catalina/connector/TestInputBuffer.java | 4 +-
.../catalina/connector/TestMaxConnections.java | 2 +-
.../org/apache/catalina/connector/TestRequest.java | 20 +-
.../apache/catalina/connector/TestResponse.java | 38 +-
.../connector/TestResponsePerformance.java | 2 +-
.../apache/catalina/connector/TestSendFile.java | 152 +
.../catalina/connector/TesterMockRequest.java | 39 -
.../apache/catalina/connector/TesterRequest.java | 48 +
.../apache/catalina/connector/TesterResponse.java | 40 +
.../catalina/core/TestApplicationContext.java | 38 +-
.../catalina/core/TestApplicationFilterConfig.java | 2 +-
.../core/TestApplicationSessionCookieConfig.java | 2 +-
.../apache/catalina/core/TestAsyncContextImpl.java | 179 +-
.../catalina/core/TestDefaultInstanceManager.java | 2 +-
.../catalina/core/TestNamingContextListener.java | 4 +-
.../apache/catalina/core/TestStandardContext.java | 106 +-
.../catalina/core/TestStandardContextAliases.java | 8 +-
.../core/TestStandardContextResources.java | 10 +-
.../catalina/core/TestStandardContextValve.java | 2 +-
.../catalina/core/TestStandardHostValve.java | 2 +-
.../apache/catalina/core/TestStandardWrapper.java | 109 +-
.../catalina/core/TestSwallowAbortedUploads.java | 14 +-
test/org/apache/catalina/core/TesterContext.java | 226 +-
test/org/apache/catalina/deploy/TestFilterDef.java | 45 -
.../catalina/deploy/TestSecurityConstraint.java | 209 -
.../org/apache/catalina/deploy/TestServletDef.java | 45 -
test/org/apache/catalina/deploy/TestWebXml.java | 266 -
.../apache/catalina/deploy/TestWebXmlOrdering.java | 700 --
.../catalina/filters/TestAddCharSetFilter.java | 6 +-
.../apache/catalina/filters/TestCorsFilter.java | 14 +-
.../catalina/filters/TestCsrfPreventionFilter.java | 2 +-
.../filters/TestCsrfPreventionFilter2.java | 2 +-
.../apache/catalina/filters/TestExpiresFilter.java | 4 +-
.../catalina/filters/TestRemoteIpFilter.java | 8 +-
.../catalina/filters/TesterHttpServletRequest.java | 25 +-
.../filters/TesterHttpServletResponse.java | 6 +-
.../catalina/filters/TesterServletContext.java | 19 +-
.../ha/session/TestSerializablePrincipal.java | 2 +-
.../apache/catalina/loader/TestVirtualContext.java | 96 +-
.../catalina/loader/TestVirtualWebappLoader.java | 33 +-
.../loader/TestWebappClassLoaderMemoryLeak.java | 2 +-
test/org/apache/catalina/mapper/TestMapper.java | 232 +
.../catalina/mapper/TestMapperContextRoot.java | 79 +
.../catalina/mapper/TestMapperWelcomeFiles.java | 94 +
.../apache/catalina/mbeans/TestRegistration.java | 12 +-
.../catalina/nonblocking/TestNonBlockingAPI.java | 577 ++
test/org/apache/catalina/realm/TestRealmBase.java | 737 ++
.../catalina/realm/TesterServletSecurity01.java | 35 +
.../catalina/servlets/TestDefaultServlet.java | 4 +
.../catalina/servlets/TestWebdavServlet.java | 4 +
test/org/apache/catalina/session/Benchmarks.java | 2 +-
.../catalina/ssi/TestExpressionParseTree.java | 191 +
.../org/apache/catalina/startup/BytesStreamer.java | 43 +
.../startup/DuplicateMappingParamFilter.java | 2 +-
.../startup/DuplicateMappingParamServlet.java | 2 +-
.../apache/catalina/startup/LoggingBaseTest.java | 2 +-
.../catalina/startup/NoMappingParamServlet.java | 2 +-
test/org/apache/catalina/startup/ParamFilter.java | 2 +-
test/org/apache/catalina/startup/ParamServlet.java | 2 +-
.../apache/catalina/startup/SimpleHttpClient.java | 13 +-
.../apache/catalina/startup/TestContextConfig.java | 25 +-
.../startup/TestContextConfigAnnotation.java | 22 +-
.../startup/TestHostConfigAutomaticDeployment.java | 1816 +++++
test/org/apache/catalina/startup/TestListener.java | 8 +-
test/org/apache/catalina/startup/TestTomcat.java | 66 +-
.../apache/catalina/startup/TestWebRuleSet.java | 161 -
.../apache/catalina/startup/TesterMapRealm.java | 65 +
.../TesterServletContainerInitializer1.java | 38 +
.../TesterServletContainerInitializer2.java | 38 +
.../apache/catalina/startup/TomcatBaseTest.java | 93 +-
.../catalina/startup/web-1lifecyclecallback.xml | 8 +-
test/org/apache/catalina/startup/web-1ordering.xml | 8 +-
.../catalina/startup/web-2lifecyclecallback.xml | 8 +-
test/org/apache/catalina/startup/web-2ordering.xml | 8 +-
.../apache/catalina/startup/web-fragment-1name.xml | 8 +-
.../catalina/startup/web-fragment-1ordering.xml | 8 +-
.../apache/catalina/startup/web-fragment-2name.xml | 8 +-
.../catalina/startup/web-fragment-2ordering.xml | 8 +-
.../apache/catalina/tribes/TesterMulticast.java | 134 +
.../catalina/tribes/demos/ChannelCreator.java | 4 +-
.../catalina/tribes/demos/IntrospectionUtils.java | 3 +-
test/org/apache/catalina/tribes/demos/MapDemo.java | 16 +-
.../group/TestGroupChannelMemberArrival.java | 2 +-
.../tribes/group/TestGroupChannelOptionFlag.java | 8 +-
.../group/TestGroupChannelSenderConnections.java | 5 +-
.../tribes/group/TestGroupChannelStartStop.java | 27 +-
.../interceptors/TestDomainFilterInterceptor.java | 2 +-
.../group/interceptors/TestOrderInterceptor.java | 4 +-
.../group/interceptors/TestTcpFailureDetector.java | 14 +-
.../membership/TestMemberImplSerialization.java | 16 +-
.../apache/catalina/tribes/test/NioSenderTest.java | 2 +-
.../tribes/test/transport/SocketReceive.java | 73 +-
.../catalina/tribes/test/transport/SocketSend.java | 46 +-
.../tribes/test/transport/SocketTribesReceive.java | 89 +-
.../test/transport/SocketValidateReceive.java | 75 +-
test/org/apache/catalina/util/TestRequestUtil.java | 88 -
.../catalina/util/TesterBase64Performance.java | 72 -
test/org/apache/catalina/valves/Benchmarks.java | 6 +-
.../apache/catalina/valves/TestRemoteIpValve.java | 6 +-
.../catalina/valves/TesterAccessLogValve.java | 2 +-
.../webresources/AbstractTestResourceSet.java | 354 +
.../webresources/AbstractTestResourceSetMount.java | 70 +
.../catalina/webresources/TestDirResourceSet.java | 46 +
.../webresources/TestDirResourceSetInternal.java | 36 +
.../webresources/TestDirResourceSetMount.java | 46 +
.../webresources/TestDirResourceSetVirtual.java | 63 +
.../catalina/webresources/TestFileResourceSet.java | 63 +
.../webresources/TestFileResourceSetVirtual.java | 30 +
.../catalina/webresources/TestJarResourceSet.java | 45 +
.../webresources/TestJarResourceSetInternal.java | 45 +
.../webresources/TestJarResourceSetMount.java | 45 +
.../webresources/TesterWebResourceRoot.java | 159 +
.../apache/catalina/websocket/TestWebSocket.java | 436 --
.../coyote/http11/TestAbstractHttp11Processor.java | 19 +-
.../filters/TestFlushableGZIPOutputStream.java | 161 -
.../apache/coyote/http11/filters/bug52121-part1 | 1749 -----
.../apache/coyote/http11/filters/bug52121-part2 | 2723 -------
.../apache/coyote/http11/upgrade/TestUpgrade.java | 276 +
test/org/apache/el/TestELEvaluation.java | 4 +-
test/org/apache/el/TestELInJsp.java | 31 +-
test/org/apache/el/TestMethodExpressionImpl.java | 6 +-
test/org/apache/el/TestValueExpressionImpl.java | 20 +-
test/org/apache/el/lang/TestELArithmetic.java | 56 +-
test/org/apache/el/lang/TestELSupport.java | 114 +-
.../apache/el/lang/TesterVariableMapperImpl.java | 55 +
test/org/apache/el/parser/TestAstAnd.java | 53 +
test/org/apache/el/parser/TestAstAssign.java | 83 +
test/org/apache/el/parser/TestAstChoice.java | 32 +
.../org/apache/el/parser/TestAstConcatenation.java | 122 +
test/org/apache/el/parser/TestAstIdentifier.java | 46 +
.../apache/el/parser/TestAstLambdaExpression.java | 226 +
test/org/apache/el/parser/TestAstListData.java | 87 +
test/org/apache/el/parser/TestAstMapData.java | 90 +
test/org/apache/el/parser/TestAstNot.java | 46 +
test/org/apache/el/parser/TestAstOr.java | 53 +
test/org/apache/el/parser/TestAstSemicolon.java | 66 +
test/org/apache/el/parser/TestAstSetData.java | 84 +
test/org/apache/el/parser/TestELParser.java | 6 +-
test/org/apache/el/parser/TesterBeanB.java | 30 +
.../apache/el/stream/TestCollectionOperations.java | 779 ++
test/org/apache/jasper/TestJspC.java | 130 +
test/org/apache/jasper/compiler/Dumper.java | 220 +
.../jasper/compiler/TestAttributeParser.java | 4 +-
test/org/apache/jasper/compiler/TestCompiler.java | 48 +-
.../jasper/compiler/TestELInterpreterFactory.java | 2 +-
test/org/apache/jasper/compiler/TestGenerator.java | 21 +-
test/org/apache/jasper/compiler/TestJspConfig.java | 38 +
.../jasper/compiler/TestJspDocumentParser.java | 8 +-
test/org/apache/jasper/compiler/TestJspReader.java | 2 +-
test/org/apache/jasper/compiler/TestParser.java | 48 +-
.../compiler/TestParserNoStrictWhitespace.java | 10 +-
.../jasper/compiler/TestScriptingVariabler.java | 6 +-
.../jasper/compiler/TestTagPluginManager.java | 2 +-
test/org/apache/jasper/compiler/TestValidator.java | 52 +-
.../org/apache/jasper/el/TestJasperELResolver.java | 11 +-
.../apache/jasper/runtime/TestJspWriterImpl.java | 4 +-
.../apache/jasper/runtime/TestPageContextImpl.java | 2 +-
.../jasper/servlet/TestJspCServletContext.java | 124 +
.../tagplugins/jstl/core/AbstractTestTag.java | 59 +
.../jasper/tagplugins/jstl/core/TestForEach.java | 57 +
.../jasper/tagplugins/jstl/core/TestOut.java | 58 +
.../jasper/tagplugins/jstl/core/TestSet.java | 54 +
.../apache/jasper/util/TestFastRemovalDequeue.java | 16 +-
.../TestDirContextURLStreamHandlerFactory.java | 82 -
.../apache/naming/resources/TestNamingContext.java | 180 +-
.../naming/resources/TestProxyDirContext.java | 65 -
.../apache/naming/resources/TestWarDirContext.java | 6 +-
.../tomcat/unittest/TesterLeakingServlet1.java | 2 +-
.../tomcat/unittest/TesterThreadScopedHolder.java | 2 +-
.../apache/tomcat/util/buf/TestB2CConverter.java | 7 -
test/org/apache/tomcat/util/buf/TestByteChunk.java | 13 -
test/org/apache/tomcat/util/buf/TestUDecoder.java | 87 +
test/org/apache/tomcat/util/buf/TestUtf8.java | 7 +-
.../util/collections/TestSynchronizedQueue.java | 117 +
.../util/collections/TestSynchronizedStack.java | 119 +
.../TesterPerformanceSynchronizedQueue.java | 107 +
.../TesterPerformanceSynchronizedStack.java | 107 +
.../tomcat/util/descriptor/TestLocalResolver.java | 125 +
.../tomcat/util/descriptor/web/TestFilterDef.java | 45 +
.../web/TestJspConfigDescriptorImpl.java | 51 +
.../util/descriptor/web/TestJspPropertyGroup.java | 35 +
.../web/TestJspPropertyGroupDescriptorImpl.java | 50 +
.../descriptor/web/TestSecurityConstraint.java | 458 ++
.../tomcat/util/descriptor/web/TestServletDef.java | 45 +
.../tomcat/util/descriptor/web/TestWebRuleSet.java | 160 +
.../tomcat/util/descriptor/web/TestWebXml.java | 251 +
.../util/descriptor/web/TestWebXmlOrdering.java | 699 ++
test/org/apache/tomcat/util/http/TestBug49158.java | 2 +-
.../util/http/TestCookiesDefaultSysProps.java | 2 +-
.../util/http/TestCookiesStrictSysProps.java | 2 +-
.../util/http/TesterParametersPerformance.java | 9 +-
.../apache/tomcat/util/http/mapper/TestMapper.java | 199 -
.../util/http/mapper/TestMapperContextRoot.java | 79 -
.../util/http/mapper/TestMapperWelcomeFiles.java | 94 -
test/org/apache/tomcat/util/net/TestCustomSsl.java | 10 +-
test/org/apache/tomcat/util/net/TestSsl.java | 28 +-
test/org/apache/tomcat/util/net/TesterSupport.java | 12 +-
test/org/apache/tomcat/websocket/TestUtil.java | 279 +
.../tomcat/websocket/TestWebSocketFrameClient.java | 88 +
test/org/apache/tomcat/websocket/TestWsFrame.java | 49 +
.../tomcat/websocket/TestWsPingPongMessages.java | 100 +
.../tomcat/websocket/TestWsRemoteEndpoint.java | 138 +
.../org/apache/tomcat/websocket/TestWsSession.java | 107 +
.../tomcat/websocket/TestWsSubprotocols.java | 121 +
.../tomcat/websocket/TestWsWebSocketContainer.java | 873 +++
.../apache/tomcat/websocket/TesterEchoServer.java | 152 +
.../tomcat/websocket/TesterFirehoseServer.java | 101 +
.../tomcat/websocket/TesterMessageCountClient.java | 224 +
.../tomcat/websocket/TesterWsClientAutobahn.java | 188 +
.../websocket/pojo/TestEncodingDecoding.java | 466 ++
.../websocket/pojo/TestPojoEndpointBase.java | 153 +
.../websocket/pojo/TestPojoMethodMapping.java | 152 +
.../apache/tomcat/websocket/pojo/TesterUtil.java | 74 +
.../tomcat/websocket/server/TestUriTemplate.java | 154 +
.../websocket/server/TestWsServerContainer.java | 178 +
test/webapp-2.2/WEB-INF/tags11.tld | 36 +
test/webapp-2.2/WEB-INF/tags12.tld | 36 +
test/webapp-2.2/WEB-INF/tags20.tld | 37 +
test/webapp-2.2/WEB-INF/tags21.tld | 37 +
test/webapp-2.2/WEB-INF/web.xml | 32 +
test/webapp-2.2/el-as-literal.jsp | 22 +
test/webapp-2.2/tld-versions.jsp | 29 +
test/webapp-2.3/WEB-INF/tags12.tld | 2 +-
test/webapp-2.3/WEB-INF/tags20.tld | 8 +-
test/webapp-2.3/WEB-INF/tags21.tld | 2 +-
test/webapp-2.4/WEB-INF/tags20.tld | 8 +-
test/webapp-2.4/WEB-INF/tags21.tld | 2 +-
test/webapp-2.4/WEB-INF/web.xml | 6 +-
test/webapp-2.5/WEB-INF/tags20.tld | 8 +-
test/webapp-2.5/WEB-INF/tags21.tld | 2 +-
.../webapp-3.0-fragments/WEB-INF/lib/resources.jar | Bin 19244 -> 0 bytes
.../src/main/webapp2/rsrc/resourceF.properties | 17 -
test/webapp-3.0/WEB-INF/tags20.tld | 8 +-
test/webapp-3.0/WEB-INF/tags21.tld | 2 +-
test/webapp-3.0/WEB-INF/web.xml | 117 +-
test/webapp-3.0/el-misc.jsp | 40 -
test/webapp-3.1/WEB-INF/tags11.tld | 37 +
test/webapp-3.1/WEB-INF/tags12.tld | 37 +
test/webapp-3.1/WEB-INF/tags20.tld | 37 +
test/webapp-3.1/WEB-INF/tags21.tld | 37 +
test/webapp-3.1/WEB-INF/web.xml | 36 +
test/webapp-3.1/el-as-literal.jsp | 21 +
test/webapp-3.1/tld-versions.jsp | 29 +
.../WEB-INF/lib/resources.jar | Bin 16055 -> 16055 bytes
.../WEB-INF/web.xml | 0
.../'singlequote2.jsp | 0
.../WEB-INF/classes/#Bug51584.txt | 0
.../classes/META-INF/resources/resourceG.jsp | 0
test/webapp-fragments/WEB-INF/lib/resources.jar | Bin 0 -> 20061 bytes
.../WEB-INF/lib/resources2.jar | Bin 17002 -> 17002 bytes
.../WEB-INF/web.xml | 0
.../bug51396.jsp | 0
.../folder/resourceC.jsp | 0
.../folder/resourceE.jsp | 0
.../resourceA.jsp | 0
.../warDirContext.jsp | 0
.../WEB-INF/web.xml | 0
.../WEB-INF/web.xml | 0
.../protected.jsp | 0
.../unprotected.jsp | 0
.../target/classes/META-INF/C.tld | 0
.../META-INF/resources/rsrc/resourceE.properties | 0
.../target/classes/rsrc/resourceC.properties | 0
.../src/main/lib/META-INF/B.tld | 0
.../src/main/lib/rsrc/resourceD.properties | 0
.../src/main/misc/resourceI.properties | 0
.../src/main/webapp/WEB-INF/A.tld | 0
.../WEB-INF/classes/rsrc/resourceA.properties | 0
.../src/main/webapp/WEB-INF/lib/rsrc.jar | Bin 1936 -> 1936 bytes
.../src/main/webapp/WEB-INF/web.xml | 0
.../main/webapp/classpathGetResourceAsStream.jsp | 0
.../classpathGetResourceUrlThenGetStream.jsp | 0
.../src/main/webapp/classpathGetResources.jsp | 0
.../src/main/webapp/contextGetRealPath.jsp | 0
.../src/main/webapp/contextGetResource.jsp | 0
.../src/main/webapp/contextGetResourcePaths.jsp | 0
.../src/main/webapp/rsrc/resourceF.properties | 0
.../src/main/webapp/testTlds.jsp | 0
.../src/main/webapp2/WEB-INF/D.tld | 0
.../WEB-INF/classes/rsrc/resourceG.properties | 0
.../WEB-INF/classes/rsrc2/resourceK.properties | 0
.../src/main/webapp2/rsrc/resourceF.properties | 17 +
.../src/main/webapp2/rsrc/resourceH.properties | 0
.../src/main/webapp2/rsrc2/resourceJ.properties | 0
.../target/classes/rsrc/resourceB.properties | 0
test/{webapp-3.0 => webapp}/WEB-INF/bug53545.tld | 0
test/{webapp-3.0 => webapp}/WEB-INF/bugs.tld | 0
.../META-INF/org.apache.jasper/tagPlugins.xml | 0
.../WEB-INF/jsp/bug53574.jsp | 0
.../WEB-INF/tags/bug42390.tag | 0
.../WEB-INF/tags/bug48668.tagx | 0
.../WEB-INF/tags/bug49297.tag | 0
test/webapp/WEB-INF/tags/bug54012.tag | 20 +
test/webapp/WEB-INF/tags/bug55198.tagx | 23 +
.../WEB-INF/tags/echo-deferred.tag | 0
.../WEB-INF/tags/echo-double.tag | 0
.../WEB-INF/tags/echo-long.tag | 0
.../WEB-INF/tags/echo-noel.tag | 0
test/{webapp-3.0 => webapp}/WEB-INF/tags/echo.tag | 0
.../WEB-INF/tags/implicit.tld | 0
test/{webapp-3.0 => webapp}/WEB-INF/test.tld | 0
test/webapp/WEB-INF/web.xml | 145 +
test/{webapp-3.0 => webapp}/annotations.jsp | 0
test/{webapp-3.0 => webapp}/bug36923.jsp | 0
test/{webapp-3.0 => webapp}/bug42390.jsp | 0
test/{webapp-3.0 => webapp}/bug42565.jsp | 0
test/{webapp-3.0 => webapp}/bug44994.jsp | 0
test/{webapp-3.0 => webapp}/bug45nnn/bug45015a.jsp | 0
test/{webapp-3.0 => webapp}/bug45nnn/bug45015b.jsp | 0
test/{webapp-3.0 => webapp}/bug45nnn/bug45015c.jsp | 0
test/{webapp-3.0 => webapp}/bug45nnn/bug45427.jsp | 0
test/{webapp-3.0 => webapp}/bug45nnn/bug45451.jspf | 0
test/{webapp-3.0 => webapp}/bug45nnn/bug45451a.jsp | 0
test/{webapp-3.0 => webapp}/bug45nnn/bug45451b.jsp | 0
test/{webapp-3.0 => webapp}/bug45nnn/bug45451c.jsp | 0
.../{webapp-3.0 => webapp}/bug45nnn/bug45451d.jspx | 0
test/{webapp-3.0 => webapp}/bug45nnn/bug45451e.jsp | 0
test/{webapp-3.0 => webapp}/bug45nnn/bug45511.jsp | 0
test/{webapp-3.0 => webapp}/bug46381.jsp | 0
test/{webapp-3.0 => webapp}/bug46596.jsp | 0
test/{webapp-3.0 => webapp}/bug47331.jsp | 0
test/{webapp-3.0 => webapp}/bug47413.jsp | 0
test/{webapp-3.0 => webapp}/bug47977.jspx | 0
test/{webapp-3.0 => webapp}/bug48nnn/bug48112.jsp | 0
test/{webapp-3.0 => webapp}/bug48nnn/bug48616.jsp | 0
test/{webapp-3.0 => webapp}/bug48nnn/bug48616b.jsp | 0
test/{webapp-3.0 => webapp}/bug48nnn/bug48627.jsp | 0
test/{webapp-3.0 => webapp}/bug48nnn/bug48668a.jsp | 0
test/{webapp-3.0 => webapp}/bug48nnn/bug48668b.jsp | 0
.../bug48nnn/bug48701-TVI-NFA.jsp | 0
.../bug48nnn/bug48701-TVI-NG.jsp | 0
.../bug48nnn/bug48701-UseBean.jsp | 0
.../bug48nnn/bug48701-VI.jsp | 0
.../bug48nnn/bug48701-fail.jsp | 0
test/{webapp-3.0 => webapp}/bug48nnn/bug48827.jspx | 0
test/{webapp-3.0 => webapp}/bug49nnn/bug49196.jsp | 0
.../bug49nnn/bug49297DuplicateAttr.jsp | 0
.../bug49nnn/bug49297MultipleImport1.jsp | 0
.../bug49nnn/bug49297MultipleImport2.jsp | 0
.../bug49nnn/bug49297MultiplePageEncoding1.jsp | 0
.../bug49nnn/bug49297MultiplePageEncoding2.jsp | 0
.../bug49nnn/bug49297MultiplePageEncoding3.jsp | 0
.../bug49nnn/bug49297MultiplePageEncoding4.jsp | 0
.../bug49nnn/bug49297NoSpace.jsp | 0
.../bug49nnn/bug49297Tag.jsp | 0
test/{webapp-3.0 => webapp}/bug49nnn/bug49555.jsp | 0
test/{webapp-3.0 => webapp}/bug49nnn/bug49726a.jsp | 0
test/{webapp-3.0 => webapp}/bug49nnn/bug49726b.jsp | 0
test/{webapp-3.0 => webapp}/bug49nnn/bug49799.jsp | 0
test/{webapp-3.0 => webapp}/bug53257/foo bar.jsp | 0
test/{webapp-3.0 => webapp}/bug53257/foo bar.txt | 0
.../bug53257/foo bar/foobar.jsp | 0
.../bug53257/foo bar/foobar.txt | 0
test/{webapp-3.0 => webapp}/bug53257/foo#bar.jsp | 0
test/{webapp-3.0 => webapp}/bug53257/foo#bar.txt | 0
test/{webapp-3.0 => webapp}/bug53257/foo%bar.jsp | 0
test/{webapp-3.0 => webapp}/bug53257/foo%bar.txt | 0
test/{webapp-3.0 => webapp}/bug53257/foo&bar.jsp | 0
test/{webapp-3.0 => webapp}/bug53257/foo&bar.txt | 0
test/{webapp-3.0 => webapp}/bug53257/foo+bar.jsp | 0
test/{webapp-3.0 => webapp}/bug53257/foo+bar.txt | 0
test/{webapp-3.0 => webapp}/bug53257/foo;bar.jsp | 0
test/{webapp-3.0 => webapp}/bug53257/foo;bar.txt | 0
test/{webapp-3.0 => webapp}/bug53257/index.jsp | 0
test/{webapp-3.0 => webapp}/bug5nnnn/bug50408.jsp | 0
test/{webapp-3.0 => webapp}/bug5nnnn/bug51544.jsp | 0
test/{webapp-3.0 => webapp}/bug5nnnn/bug52335.jsp | 0
test/{webapp-3.0 => webapp}/bug5nnnn/bug53465.jsp | 0
test/{webapp-3.0 => webapp}/bug5nnnn/bug53467].jsp | 0
test/{webapp-3.0 => webapp}/bug5nnnn/bug53545.html | 0
test/{webapp-3.0 => webapp}/bug5nnnn/bug53545.jsp | 0
test/{webapp-3.0 => webapp}/bug5nnnn/bug53986.jsp | 0
test/webapp/bug5nnnn/bug54011.jsp | 25 +
test/webapp/bug5nnnn/bug54012.jsp | 24 +
test/webapp/bug5nnnn/bug54144.jsp | 35 +
test/{webapp-3.0 => webapp}/bug5nnnn/bug54241a.jsp | 0
test/{webapp-3.0 => webapp}/bug5nnnn/bug54241b.jsp | 0
test/webapp/bug5nnnn/bug54242.jsp | 29 +
test/webapp/bug5nnnn/bug54338.jsp | 35 +
.../{webapp-3.0 => webapp}/bug5nnnn/bug54801a.jspx | 0
.../{webapp-3.0 => webapp}/bug5nnnn/bug54801b.jspx | 0
.../{webapp-3.0 => webapp}/bug5nnnn/bug54821a.jspx | 0
.../{webapp-3.0 => webapp}/bug5nnnn/bug54821b.jspx | 0
test/webapp/bug5nnnn/bug54888.jsp | 27 +
test/webapp/bug5nnnn/bug55198.jsp | 24 +
test/webapp/bug5nnnn/bug55262-coda.jspf | 17 +
test/webapp/bug5nnnn/bug55262-prelude.jspf | 17 +
test/webapp/bug5nnnn/bug55262.jsp | 17 +
test/{webapp-3.0 => webapp}/echo-params.jsp | 0
test/{webapp-3.0 => webapp}/el-method.jsp | 0
test/webapp/el-misc.jsp | 42 +
test/{webapp-3.0 => webapp}/index.html | 0
test/{webapp-3.0 => webapp}/script-expr.jsp | 0
.../{webapp-3.0 => webapp}/welcome-files/index.jsp | 0
.../welcome-files/sub/.gitignore | 0
test/webresources/dir1-internal.jar | Bin 0 -> 960 bytes
test/webresources/dir1.jar | Bin 0 -> 778 bytes
.../dir1/d1/d1-f1.txt} | 0
.../dir1/d2/d2-f1.txt} | 0
.../#Bug51584.txt => webresources/dir1/f1.txt} | 0
.../#Bug51584.txt => webresources/dir1/f2.txt} | 0
webapps/ROOT/WEB-INF/web.xml | 9 +-
webapps/docs/WEB-INF/web.xml | 8 +-
webapps/docs/aio.xml | 4 +
webapps/docs/appdev/build.xml.txt | 2 +-
webapps/docs/appdev/deployment.xml | 2 +-
webapps/docs/appdev/introduction.xml | 8 +-
webapps/docs/architecture/project.xml | 4 +-
webapps/docs/building.xml | 15 +-
webapps/docs/changelog.xml | 7578 +-------------------
webapps/docs/class-loader-howto.xml | 11 +-
webapps/docs/cluster-howto.xml | 11 +-
webapps/docs/config/ajp.xml | 5 +-
webapps/docs/config/automatic-deployment.xml | 543 ++
webapps/docs/config/cluster-interceptor.xml | 2 +-
webapps/docs/config/cluster-listener.xml | 8 -
webapps/docs/config/cluster-manager.xml | 7 +
webapps/docs/config/context.xml | 112 -
webapps/docs/config/filter.xml | 10 +-
webapps/docs/config/host.xml | 171 +-
webapps/docs/config/http.xml | 19 +-
webapps/docs/config/jar-scan-filter.xml | 149 +
webapps/docs/config/jar-scanner.xml | 19 +-
webapps/docs/config/listeners.xml | 29 +-
webapps/docs/config/loader.xml | 37 -
webapps/docs/config/project.xml | 5 +-
webapps/docs/config/resources.xml | 129 +-
webapps/docs/config/systemprops.xml | 26 +-
webapps/docs/config/valve.xml | 11 +-
webapps/docs/deployer-howto.xml | 2 +-
webapps/docs/funcspecs/fs-jndi-realm.xml | 2 +-
webapps/docs/index.xml | 33 +-
webapps/docs/jasper-howto.xml | 10 +-
webapps/docs/jndi-datasource-examples-howto.xml | 2 +-
webapps/docs/jndi-resources-howto.xml | 4 +-
webapps/docs/logging.xml | 67 +-
webapps/docs/manager-howto.xml | 26 +-
webapps/docs/monitoring.xml | 6 +-
webapps/docs/project.xml | 9 +-
webapps/docs/rewrite.xml | 736 ++
webapps/docs/security-howto.xml | 3 +-
webapps/docs/setup.xml | 4 +-
webapps/docs/tomcat-docs.xsl | 6 +-
webapps/docs/web-socket-howto.xml | 66 +-
webapps/docs/websocketapi/index.html | 34 +
.../examples/WEB-INF/classes/CookieExample.java | 2 +-
.../WEB-INF/classes/RequestHeaderExample.java | 2 +-
.../WEB-INF/classes/RequestInfoExample.java | 2 +-
.../WEB-INF/classes/RequestParamExample.java | 2 +-
.../examples/WEB-INF/classes/SessionExample.java | 2 +-
.../WEB-INF/classes/async/AsyncStockServlet.java | 9 +-
.../WEB-INF/classes/async/Stockticker.java | 8 +-
webapps/examples/WEB-INF/classes/cal/Entries.java | 4 +-
webapps/examples/WEB-INF/classes/cal/Entry.java | 2 +-
.../examples/WEB-INF/classes/cal/JspCalendar.java | 2 +-
.../examples/WEB-INF/classes/cal/TableBean.java | 6 +-
.../examples/WEB-INF/classes/chat/ChatServlet.java | 6 +-
.../compressionFilters/CompressionFilter.java | 10 +-
.../CompressionResponseStream.java | 36 +-
.../CompressionServletResponseWrapper.java | 17 +-
.../WEB-INF/classes/dates/JspCalendar.java | 2 +-
.../examples/WEB-INF/classes/examples/FooTag.java | 2 +-
.../WEB-INF/classes/jsp2/examples/BookBean.java | 6 +-
.../jsp2/examples/simpletag/EchoAttributesTag.java | 4 +-
.../jsp2/examples/simpletag/ShuffleSimpleTag.java | 2 +-
.../WEB-INF/classes/listeners/SessionListener.java | 2 +-
.../WEB-INF/classes/num/NumberGuessBean.java | 2 +-
.../WEB-INF/classes/sessions/DummyCart.java | 2 +-
.../classes/websocket/chat/ChatAnnotation.java | 92 +
.../websocket/chat/ChatWebSocketServlet.java | 103 -
.../classes/websocket/echo/EchoAnnotation.java | 70 +
.../classes/websocket/echo/EchoEndpoint.java | 56 +
.../classes/websocket/echo/EchoMessage.java | 86 -
.../WEB-INF/classes/websocket/echo/EchoStream.java | 70 -
.../classes/websocket/echo/WsConfigListener.java | 48 +
.../WEB-INF/classes/websocket/snake/Location.java | 8 +-
.../WEB-INF/classes/websocket/snake/Snake.java | 40 +-
.../classes/websocket/snake/SnakeAnnotation.java | 113 +
.../classes/websocket/snake/SnakeTimer.java | 107 +
.../websocket/snake/SnakeWebSocketServlet.java | 213 -
webapps/examples/WEB-INF/jsp/applet/Clock2.java | 12 +-
webapps/examples/WEB-INF/web.xml | 79 +-
webapps/examples/jsp/plugin/applet/Clock2.java | 12 +-
webapps/examples/jsp/security/protected/index.jsp | 9 +-
webapps/examples/websocket/echo.html | 14 +-
webapps/host-manager/WEB-INF/web.xml | 9 +-
webapps/manager/WEB-INF/jsp/connectorCiphers.jsp | 92 +
webapps/manager/WEB-INF/web.xml | 9 +-
2344 files changed, 140230 insertions(+), 88483 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tomcat8.git
More information about the pkg-java-commits
mailing list