This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository tomcat8.
commit 83956b4729a1a730d0f1c9b90334952481dd0ca7 Merge: 2b006ee 01e8f38 Author: Emmanuel Bourg <[email protected]> Date: Tue Oct 1 00:07:37 2013 +0200 Merge tag 'upstream/8.0.0_RC3' Upstream version 8.0.0~RC3 SVN-MERGE.txt | 5 +- TOMCAT-NEXT.txt | 1 + bin/catalina.bat | 6 +- bin/catalina.sh | 19 +- build.properties.default | 28 +- build.xml | 40 +- conf/catalina.policy | 8 +- conf/catalina.properties | 7 +- conf/context.xml | 12 + conf/logging.properties | 36 +- java/javax/annotation/Generated.java | 8 +- .../{Resources.java => ManagedBean.java} | 10 +- java/javax/annotation/PostConstruct.java | 6 +- java/javax/annotation/PreDestroy.java | 6 +- .../annotation/{Resources.java => Priority.java} | 10 +- java/javax/annotation/Resource.java | 16 +- java/javax/annotation/Resources.java | 6 +- java/javax/annotation/security/DeclareRoles.java | 6 +- java/javax/annotation/security/DenyAll.java | 8 +- java/javax/annotation/security/PermitAll.java | 6 +- java/javax/annotation/security/RolesAllowed.java | 6 +- java/javax/annotation/security/RunAs.java | 6 +- .../DataSourceDefinition.java} | 29 +- .../DataSourceDefinitions.java} | 12 +- java/javax/el/BeanELResolver.java | 10 +- java/javax/el/LocalStrings.properties | 5 +- java/javax/el/StandardELContext.java | 5 +- java/javax/el/Util.java | 459 ++++++++++-- java/javax/servlet/ServletContext.java | 4 +- java/javax/servlet/http/HttpServletRequest.java | 3 +- java/javax/servlet/http/WebConnection.java | 4 - java/javax/websocket/ClientEndpointConfig.java | 16 +- java/javax/websocket/ContainerProvider.java | 1 + .../websocket/DefaultClientEndpointConfig.java | 4 +- .../server/DefaultServerEndpointConfig.java | 4 +- .../websocket/server/ServerEndpointConfig.java | 19 +- java/org/apache/catalina/Context.java | 37 +- java/org/apache/catalina/WebResourceRoot.java | 20 +- .../authenticator/SpnegoAuthenticator.java | 5 +- java/org/apache/catalina/connector/Connector.java | 8 +- .../apache/catalina/connector/CoyoteAdapter.java | 33 +- .../catalina/connector/CoyoteInputStream.java | 38 +- .../org/apache/catalina/connector/InputBuffer.java | 19 +- .../catalina/connector/LocalStrings.properties | 1 + java/org/apache/catalina/connector/Request.java | 25 +- .../apache/catalina/core/ApplicationContext.java | 5 +- .../catalina/core/ApplicationContextFacade.java | 32 +- .../apache/catalina/core/AprLifecycleListener.java | 6 +- .../org/apache/catalina/core/AsyncContextImpl.java | 1 + .../catalina/core/DefaultInstanceManager.java | 55 +- java/org/apache/catalina/core/StandardContext.java | 93 +-- .../apache/catalina/deploy/mbeans-descriptors.xml | 4 +- .../catalina/filters/CsrfPreventionFilter.java | 1 + .../apache/catalina/ha/session/DeltaManager.java | 203 ++++-- .../apache/catalina/ha/session/DeltaSession.java | 67 +- .../apache/catalina/loader/WebappClassLoader.java | 102 +-- java/org/apache/catalina/loader/WebappLoader.java | 52 +- .../apache/catalina/loader/mbeans-descriptors.xml | 17 - .../catalina/manager/HTMLManagerServlet.java | 10 +- .../apache/catalina/manager/ManagerServlet.java | 23 +- .../manager/host/HTMLHostManagerServlet.java | 8 +- .../catalina/manager/host/HostManagerServlet.java | 22 +- java/org/apache/catalina/mbeans/MBeanFactory.java | 15 +- java/org/apache/catalina/realm/JAASRealm.java | 3 +- java/org/apache/catalina/realm/JNDIRealm.java | 54 +- .../apache/catalina/realm/LocalStrings.properties | 3 +- java/org/apache/catalina/realm/RealmBase.java | 3 +- .../catalina/security/SecurityClassLoad.java | 6 +- .../apache/catalina/servlets/DefaultServlet.java | 27 +- java/org/apache/catalina/session/FileStore.java | 36 +- java/org/apache/catalina/session/JDBCStore.java | 5 +- .../apache/catalina/session/StandardSession.java | 26 +- .../apache/catalina/session/mbeans-descriptors.xml | 14 +- .../org/apache/catalina/startup/ContextConfig.java | 16 +- .../org/apache/catalina/startup/FailedContext.java | 10 - .../catalina/startup/LocalStrings.properties | 18 +- .../catalina/startup/LocalStrings_es.properties | 18 +- .../catalina/startup/LocalStrings_fr.properties | 6 +- .../catalina/startup/LocalStrings_ja.properties | 6 +- java/org/apache/catalina/startup/TldConfig.java | 548 -------------- java/org/apache/catalina/startup/TldRuleSet.java | 183 ----- java/org/apache/catalina/startup/Tomcat.java | 83 ++- .../apache/catalina/startup/WebAnnotationSet.java | 5 +- .../catalina/startup/WebappServiceLoader.java | 33 +- .../catalina/storeconfig/server-registry.xml | 1 - .../catalina/tribes/group/ChannelCoordinator.java | 26 +- .../apache/catalina/tribes/group/GroupChannel.java | 83 +-- .../interceptors/MessageDispatch15Interceptor.java | 3 +- .../interceptors/MessageDispatchInterceptor.java | 40 +- .../interceptors/TwoPhaseCommitInterceptor.java | 1 + .../tribes/membership/McastServiceImpl.java | 17 +- .../catalina/tribes/membership/Membership.java | 3 +- .../tribes/tipis/AbstractReplicatedMap.java | 3 + .../tribes/transport/bio/MultipointBioSender.java | 3 +- .../tribes/transport/nio/ParallelNioSender.java | 56 +- .../catalina/tribes/util/TcclThreadFactory.java | 9 +- .../valves/CometConnectionManagerValve.java | 50 +- .../apache/catalina/valves/ErrorReportValve.java | 30 +- ...rResource.java => AbstractArchiveResource.java} | 54 +- ...rceSet.java => AbstractArchiveResourceSet.java} | 189 ++--- .../webresources/AbstractFileResourceSet.java | 5 +- .../catalina/webresources/AbstractResourceSet.java | 26 +- java/org/apache/catalina/webresources/Cache.java | 26 +- .../catalina/webresources/DirResourceSet.java | 16 +- .../apache/catalina/webresources/FileResource.java | 4 +- .../catalina/webresources/FileResourceSet.java | 14 +- .../apache/catalina/webresources/JarResource.java | 176 +---- .../catalina/webresources/JarResourceSet.java | 209 +----- .../catalina/webresources/JarWarResource.java | 89 +++ .../catalina/webresources/JarWarResourceSet.java | 110 +++ .../catalina/webresources/LocalStrings.properties | 3 +- .../apache/catalina/webresources/StandardRoot.java | 111 ++- .../TomcatURLStreamHandlerFactory.java | 119 ++++ .../catalina/webresources/WarURLConnection.java | 36 +- .../catalina/webresources/WarURLStreamHandler.java | 34 +- java/org/apache/coyote/AbstractProcessor.java | 32 +- java/org/apache/coyote/AbstractProtocol.java | 19 +- java/org/apache/coyote/ActionCode.java | 20 +- java/org/apache/coyote/ByteBufferHolder.java | 64 ++ java/org/apache/coyote/Request.java | 10 +- java/org/apache/coyote/Response.java | 15 + .../apache/coyote/ajp/AbstractAjpProcessor.java | 753 ++++++++++++++++++-- .../org/apache/coyote/ajp/AbstractAjpProtocol.java | 2 +- java/org/apache/coyote/ajp/AjpAprProcessor.java | 452 ++++-------- java/org/apache/coyote/ajp/AjpAprProtocol.java | 4 +- java/org/apache/coyote/ajp/AjpNioProcessor.java | 361 ++-------- java/org/apache/coyote/ajp/AjpNioProtocol.java | 4 +- java/org/apache/coyote/ajp/AjpProcessor.java | 313 +------- java/org/apache/coyote/ajp/AjpProtocol.java | 4 +- java/org/apache/coyote/ajp/LocalStrings.properties | 4 +- .../coyote/http11/AbstractHttp11Processor.java | 72 +- .../coyote/http11/AbstractHttp11Protocol.java | 13 +- .../apache/coyote/http11/AbstractInputBuffer.java | 35 +- .../apache/coyote/http11/AbstractOutputBuffer.java | 54 +- .../apache/coyote/http11/Http11AprProcessor.java | 78 +- .../apache/coyote/http11/Http11AprProtocol.java | 14 +- .../apache/coyote/http11/Http11NioProcessor.java | 116 ++- .../apache/coyote/http11/Http11NioProtocol.java | 4 +- java/org/apache/coyote/http11/Http11Processor.java | 98 ++- java/org/apache/coyote/http11/Http11Protocol.java | 4 +- .../coyote/http11/InternalAprInputBuffer.java | 79 +- .../coyote/http11/InternalAprOutputBuffer.java | 20 +- .../apache/coyote/http11/InternalInputBuffer.java | 6 +- .../coyote/http11/InternalNioInputBuffer.java | 39 +- .../coyote/http11/InternalNioOutputBuffer.java | 39 +- .../apache/coyote/http11/InternalOutputBuffer.java | 2 +- .../apache/coyote/http11/LocalStrings.properties | 2 + java/org/apache/coyote/http11/NpnHandler.java | 2 +- .../coyote/http11/filters/ChunkedInputFilter.java | 30 +- .../coyote/http11/filters/VoidInputFilter.java | 6 +- .../coyote/http11/upgrade/LocalStrings.properties | 2 - java/org/apache/coyote/spdy/SpdyAprNpnHandler.java | 4 +- java/org/apache/coyote/spdy/SpdyProcessor.java | 14 +- java/org/apache/coyote/spdy/SpdyProxyProtocol.java | 4 +- java/org/apache/el/lang/EvaluationContext.java | 5 +- java/org/apache/el/lang/FunctionMapperImpl.java | 1 + java/org/apache/el/lang/VariableMapperImpl.java | 1 + java/org/apache/el/parser/AstFunction.java | 15 +- java/org/apache/el/parser/AstValue.java | 7 +- java/org/apache/el/util/ReflectionUtil.java | 98 ++- java/org/apache/jasper/JspC.java | 38 +- java/org/apache/jasper/JspCompilationContext.java | 2 +- java/org/apache/jasper/compiler/JspUtil.java | 27 +- .../apache/jasper/compiler/TagLibraryInfoImpl.java | 20 +- java/org/apache/jasper/compiler/TldLocation.java | 1 + .../apache/jasper/compiler/TldLocationsCache.java | 427 +---------- java/org/apache/jasper/el/ELContextImpl.java | 4 + java/org/apache/jasper/el/ELContextWrapper.java | 5 +- .../apache/jasper/el/ExpressionEvaluatorImpl.java | 6 +- .../jasper/resources/LocalStrings.properties | 6 +- .../apache/jasper/runtime/JspRuntimeLibrary.java | 21 - .../apache/jasper/servlet/JasperInitializer.java | 28 + .../apache/jasper/servlet/JspCServletContext.java | 12 +- java/org/apache/jasper/servlet/TldScanner.java | 318 +++++++++ java/org/apache/juli/ClassLoaderLogManager.java | 27 +- java/org/apache/juli/FileHandler.java | 7 +- java/org/apache/juli/JdkLoggerFormatter.java | 9 +- java/org/apache/juli/OneLineFormatter.java | 81 ++- .../naming/factory/webservices/ServiceProxy.java | 3 +- .../factory/webservices/ServiceRefFactory.java | 3 + java/org/apache/tomcat/util/Diagnostics.java | 26 +- java/org/apache/tomcat/util/buf/Utf8Encoder.java | 235 ++++++ .../collections/ManagedConcurrentWeakHashMap.java | 1 + .../tomcat/util/descriptor/LocalResolver.java | 5 +- .../org/apache/tomcat/util/descriptor/tld/Tag.java | 130 ++++ .../apache/tomcat/util/descriptor/tld/TagFile.java | 79 ++ .../tomcat/util/descriptor/tld/TaglibXml.java | 136 ++++ .../tomcat/util/descriptor/tld/TldParser.java | 65 ++ .../util/descriptor/tld/TldResourcePath.java | 130 ++++ .../tomcat/util/descriptor/tld/TldRuleSet.java | 359 ++++++++++ .../tld/Validator.java} | 34 +- .../tomcat/util/descriptor/tld/package-info.java | 22 +- java/org/apache/tomcat/util/http/HttpMessages.java | 64 +- .../util/http/fileupload/MultipartStream.java | 4 +- .../apache/tomcat/util/http/parser/HttpParser.java | 8 +- .../apache/tomcat/util/net/AbstractEndpoint.java | 44 +- java/org/apache/tomcat/util/net/AprEndpoint.java | 113 +-- .../util/net/DefaultServerSocketFactory.java | 2 +- .../WsListener.java => util/net/DispatchType.java} | 30 +- java/org/apache/tomcat/util/net/JIoEndpoint.java | 29 +- java/org/apache/tomcat/util/net/NioEndpoint.java | 60 +- .../apache/tomcat/util/net/SSLImplementation.java | 4 +- java/org/apache/tomcat/util/net/SocketWrapper.java | 66 +- .../tomcat/util/net/jsse/JSSEImplementation.java | 4 +- .../tomcat/util/net/jsse/JSSESocketFactory.java | 6 +- .../tomcat/util/net/res/LocalStrings.properties | 9 + java/org/apache/tomcat/util/res/StringManager.java | 54 +- java/org/apache/tomcat/util/scan/FileUrlJar.java | 4 +- .../{FileUrlJar.java => FileUrlNestedJar.java} | 94 ++- java/org/apache/tomcat/util/scan/JarFactory.java | 6 +- .../tomcat/util/scan/StandardJarScanFilter.java | 3 +- .../tomcat/websocket/AsyncChannelWrapper.java | 10 +- .../websocket/AsyncChannelWrapperNonSecure.java | 8 +- .../websocket/AsyncChannelWrapperSecure.java | 12 +- .../tomcat/websocket/FutureToSendHandler.java | 109 +++ .../tomcat/websocket/LocalStrings.properties | 10 +- java/org/apache/tomcat/websocket/Util.java | 2 + java/org/apache/tomcat/websocket/WsFrameBase.java | 46 +- .../tomcat/websocket/WsRemoteEndpointImplBase.java | 113 +-- java/org/apache/tomcat/websocket/WsSession.java | 33 +- .../tomcat/websocket/WsWebSocketContainer.java | 29 +- .../tomcat/websocket/pojo/PojoEndpointClient.java | 2 +- .../tomcat/websocket/pojo/PojoEndpointServer.java | 1 + .../websocket/server/LocalStrings.properties | 4 +- .../server/{WsFilter.java => UpgradeUtil.java} | 95 +-- .../tomcat/websocket/server/UriTemplate.java | 23 +- .../{WsListener.java => WsContextListener.java} | 25 +- .../apache/tomcat/websocket/server/WsFilter.java | 198 +---- .../websocket/server/WsHttpUpgradeHandler.java | 2 +- .../server/WsRemoteEndpointImplServer.java | 10 +- java/org/apache/tomcat/websocket/server/WsSci.java | 10 +- .../tomcat/websocket/server/WsServerContainer.java | 24 +- modules/jdbc-pool/doc/jdbc-pool.xml | 182 ++--- .../apache/tomcat/jdbc/pool/ConnectionPool.java | 16 +- .../apache/tomcat/jdbc/pool/DataSourceFactory.java | 17 +- .../apache/tomcat/jdbc/pool/DataSourceProxy.java | 34 + .../apache/tomcat/jdbc/pool/PoolConfiguration.java | 25 + .../apache/tomcat/jdbc/pool/PoolProperties.java | 36 +- .../apache/tomcat/jdbc/pool/PooledConnection.java | 6 + .../jdbc/pool/interceptor/StatementCache.java | 4 + .../tomcat/jdbc/pool/jmx/ConnectionPool.java | 26 + .../apache/tomcat/jdbc/pool/mbeans-descriptors.xml | 117 +++ .../apache/tomcat/jdbc/test/DefaultTestCase.java | 4 +- .../jdbc/test/TestValidationQueryTimeout.java | 266 +++++++ res/checkstyle/javax-import-control.xml | 7 +- res/findbugs/filter-false-positives.xml | 27 +- .../eclipse/java-compiler-errors-warnings.txt | 2 +- .../netbeans/nb-tomcat-build.properties | 2 +- res/ide-support/netbeans/project.xml | 2 +- test/javax/el/TestBeanELResolver.java | 446 +++++++++++- test/javax/el/TestCompositeELResolver.java | 4 +- test/javax/el/TestStaticFieldELResolver.java | 2 +- test/javax/el/{TesterBean.java => TestUtil.java} | 26 +- test/javax/el/TesterBean.java | 10 +- .../authenticator/TestFormAuthenticator.java | 4 +- .../catalina/connector/TestCoyoteAdapter.java | 9 +- .../catalina/connector/TestMaxConnections.java | 55 +- .../apache/catalina/core/TestStandardContext.java | 14 +- .../catalina/core/TestStandardContextAliases.java | 4 +- .../core/TestStandardContextResources.java | 1 + test/org/apache/catalina/core/TesterContext.java | 20 - .../catalina/filters/TestCsrfPreventionFilter.java | 1 + .../apache/catalina/loader/TestVirtualContext.java | 45 +- .../catalina/loader/TestVirtualWebappLoader.java | 4 +- .../loader/TestWebappClassLoaderMemoryLeak.java | 15 +- .../catalina/nonblocking/TestNonBlockingAPI.java | 487 +++++++++---- .../nonblocking/TesterAjpNonBlockingClient.java | 103 +++ .../catalina/servlets/TestDefaultServlet.java | 4 +- .../catalina/servlets/TestWebdavServlet.java | 4 +- test/org/apache/catalina/startup/TestTomcat.java | 47 +- .../catalina/startup/TestWebappServiceLoader.java | 176 +++++ .../org/apache/catalina/startup/service-config.txt | 20 + .../catalina/valves/TesterAccessLogValve.java | 4 + .../webresources/AbstractTestResourceSet.java | 4 + .../webresources/AbstractTestResourceSetMount.java | 5 + .../catalina/webresources/TestDirResourceSet.java | 13 +- .../webresources/TestDirResourceSetInternal.java | 4 +- .../webresources/TestDirResourceSetMount.java | 4 +- .../webresources/TestDirResourceSetVirtual.java | 20 +- .../catalina/webresources/TestFileResourceSet.java | 29 +- .../catalina/webresources/TestJarResourceSet.java | 11 +- .../webresources/TestJarResourceSetInternal.java | 11 +- .../webresources/TestJarResourceSetMount.java | 2 +- .../catalina/webresources/TestStandardRoot.java | 80 +++ ...eSetInternal.java => TestWarURLConnection.java} | 41 +- .../webresources/TesterWebResourceRoot.java | 8 +- test/org/apache/coyote/ajp/SimpleAjpClient.java | 41 +- .../coyote/ajp/TestAbstractAjpProcessor.java | 170 ++++- test/org/apache/coyote/ajp/TesterAjpMessage.java | 62 ++ .../coyote/http11/TestAbstractHttp11Processor.java | 59 +- .../http11/filters/TestChunkedInputFilter.java | 73 +- .../org/apache/el/parser/TestAstFunction.java | 46 +- test/org/apache/el/util/TestReflectionUtil.java | 2 +- test/org/apache/jasper/compiler/TestGenerator.java | 4 +- .../jasper/servlet/TestJspCServletContext.java | 16 +- .../servlet/TestTldScanner.java} | 37 +- .../tagplugins/jstl/core/AbstractTestTag.java | 8 +- .../tomcat/util/descriptor/tld/TestTldParser.java | 173 +++++ .../tomcat/util/http/parser/TestMediaType.java | 19 + test/org/apache/tomcat/util/net/TestCustomSsl.java | 4 +- test/org/apache/tomcat/util/net/TestSsl.java | 8 +- .../util/net/jsse/TesterBug50640SslImpl.java | 2 +- test/org/apache/tomcat/websocket/TestUtil.java | 5 + .../tomcat/websocket/TestWebSocketFrameClient.java | 7 +- .../tomcat/websocket/TestWsPingPongMessages.java | 2 +- .../tomcat/websocket/TestWsRemoteEndpoint.java | 1 + .../tomcat/websocket/TestWsSubprotocols.java | 4 +- .../tomcat/websocket/TestWsWebSocketContainer.java | 26 +- .../tomcat/websocket/TesterBlockWebSocketSCI.java | 46 ++ .../apache/tomcat/websocket/TesterEchoServer.java | 4 +- .../tomcat/websocket/TesterFirehoseServer.java | 9 +- .../tomcat/websocket/TesterMessageCountClient.java | 6 +- .../websocket/pojo/TestEncodingDecoding.java | 45 +- .../websocket/pojo/TestPojoEndpointBase.java | 2 + .../apache/tomcat/websocket/pojo/TesterUtil.java | 4 +- .../tomcat/websocket/server/TestUriTemplate.java | 63 +- .../websocket/server/TestWsServerContainer.java | 2 +- .../jsp/chat/login.jsp => test/tld/listener.tld | 34 +- .../jsp/chat/login.jsp => test/tld/tags11.tld | 40 +- .../jsp/chat/login.jsp => test/tld/tags12.tld | 40 +- test/tld/tags20.tld | 37 + test/tld/tags21.tld | 37 + test/tld/test.tld | 93 +++ test/webresources/war-url-connection.war | Bin 0 -> 882 bytes webapps/ROOT/index.jsp | 92 +-- webapps/docs/aio.xml | 36 +- webapps/docs/appdev/deployment.xml | 8 +- webapps/docs/appdev/index.xml | 2 +- webapps/docs/appdev/installation.xml | 4 +- webapps/docs/appdev/introduction.xml | 10 +- webapps/docs/appdev/processes.xml | 118 ++- webapps/docs/appdev/source.xml | 28 +- webapps/docs/apr.xml | 54 +- webapps/docs/architecture/startup.xml | 2 +- webapps/docs/building.xml | 42 +- webapps/docs/cgi-howto.xml | 4 +- webapps/docs/changelog.xml | 49 ++ webapps/docs/class-loader-howto.xml | 6 +- webapps/docs/cluster-howto.xml | 351 +++++---- webapps/docs/config/ajp.xml | 95 ++- webapps/docs/config/cluster-channel.xml | 24 + webapps/docs/config/cluster-interceptor.xml | 24 +- webapps/docs/config/cluster-membership.xml | 2 +- webapps/docs/config/cluster-sender.xml | 2 +- webapps/docs/config/cluster.xml | 30 +- webapps/docs/config/context.xml | 193 ++--- webapps/docs/config/engine.xml | 38 +- webapps/docs/config/filter.xml | 597 ++++++++-------- webapps/docs/config/globalresources.xml | 72 +- webapps/docs/config/host.xml | 90 +-- webapps/docs/config/http.xml | 122 +++- webapps/docs/config/listeners.xml | 60 +- webapps/docs/config/loader.xml | 6 +- webapps/docs/config/manager.xml | 12 +- webapps/docs/config/realm.xml | 6 +- webapps/docs/config/resources.xml | 6 +- webapps/docs/config/systemprops.xml | 26 +- webapps/docs/config/valve.xml | 49 +- webapps/docs/connectors.xml | 3 +- webapps/docs/default-servlet.xml | 292 ++++---- webapps/docs/deployer-howto.xml | 3 +- webapps/docs/funcspecs/fs-admin-objects.xml | 14 +- webapps/docs/funcspecs/fs-admin-opers.xml | 12 +- webapps/docs/funcspecs/fs-default.xml | 8 +- webapps/docs/funcspecs/mbean-names.xml | 604 ++++++++-------- webapps/docs/html-manager-howto.xml | 153 ++-- webapps/docs/images/docs-stylesheet.css | 269 +++++++ webapps/docs/images/tomcat.png | Bin 0 -> 8410 bytes webapps/docs/jasper-howto.xml | 111 ++- webapps/docs/jndi-datasource-examples-howto.xml | 231 +++--- webapps/docs/jndi-resources-howto.xml | 256 +++---- webapps/docs/logging.xml | 76 +- webapps/docs/manager-howto.xml | 648 +++++++---------- webapps/docs/maven-jars.xml | 14 +- webapps/docs/mbeans-descriptor-howto.xml | 16 +- webapps/docs/monitoring.xml | 581 ++++++++------- webapps/docs/proxy-howto.xml | 62 +- webapps/docs/realm-howto.xml | 225 +++--- webapps/docs/rewrite.xml | 179 +++-- webapps/docs/security-howto.xml | 4 +- webapps/docs/security-manager-howto.xml | 36 +- webapps/docs/setup.xml | 44 +- webapps/docs/ssi-howto.xml | 37 +- webapps/docs/ssl-howto.xml | 197 +++-- webapps/docs/tomcat-docs.xsl | 682 +++++++----------- webapps/docs/tribes/introduction.xml | 66 +- webapps/docs/virtual-hosting-howto.xml | 34 +- webapps/docs/web-socket-howto.xml | 4 +- webapps/docs/windows-auth-howto.xml | 4 +- webapps/docs/windows-service-howto.xml | 158 ++-- .../examples/WEB-INF/classes/SessionExample.java | 4 +- .../WEB-INF/classes/nonblocking/ByteCounter.java | 142 ++++ .../WEB-INF/classes/nonblocking/NumberWriter.java | 148 ++++ .../classes/websocket/echo/WsConfigListener.java | 4 +- webapps/examples/WEB-INF/web.xml | 30 +- webapps/examples/jsp/cal/cal1.jsp | 1 + webapps/examples/jsp/cal/cal2.jsp | 1 + webapps/examples/jsp/index.html | 57 -- webapps/examples/jsp/jsp2/el/functions.jsp | 1 + webapps/examples/jsp/jsp2/el/implicit-objects.jsp | 1 + webapps/examples/{jsp => servlets}/chat/index.jsp | 0 webapps/examples/{jsp => servlets}/chat/login.jsp | 0 webapps/examples/{jsp => servlets}/chat/post.jsp | 0 webapps/examples/servlets/index.html | 79 +- .../nonblocking/bytecounter.html} | 36 +- 405 files changed, 13143 insertions(+), 9325 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tomcat8.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
