This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git.
from 4d8ce2c Polish. Spacing. new a6a17a9 fix typo new 27f4698 remove unnecessary code new 98683a7 fix typo new 06ea9f7 fix typo new 9aa0220 fix typo new 744a5cc fix typo,add doc new 2b94ec8 add JASPIC 1.1 Javadoc new 0bb11f5 Remove all unused terms carefully for clean,for example “org.apache.jasper.servlet.TldScanner.webxmlSkip、webxmlFailPathDoesNotExist、webxmlSkip” are joined by other String new 9b7d425 Fix typo new de52b16 fix typo new 7b1ec47 fix typo new 91fc5fc Fix typo new bee83ad Fix typo new 28788f0 fix typo (an ssl) new 57f9a86 fix typo new cad93e8 fix typo(an sql) new 3900982 Fix typo new 692ae29 Fix typo new ea41568 Add link to newly added JASPIC docs new 30f1471 Update changelog for PR from KangZhiDong The 20 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: build.xml | 21 +++++++++++++++++++++ conf/server.xml | 4 ++-- java/javax/servlet/http/HttpServletRequest.java | 2 +- java/javax/servlet/http/PushBuilder.java | 4 ++-- java/javax/servlet/resources/web-app_2_5.xsd | 2 +- java/javax/servlet/resources/web-common_3_0.xsd | 2 +- java/javax/servlet/resources/web-common_3_1.xsd | 2 +- java/javax/servlet/resources/web-common_4_0.xsd | 2 +- .../apache/catalina/ant/jmx/JMXAccessorGetTask.java | 2 +- .../apache/catalina/ant/jmx/JMXAccessorSetTask.java | 2 +- .../catalina/ant/jmx/JMXAccessorUnregisterTask.java | 2 +- java/org/apache/catalina/ant/jmx/package.html | 4 ++-- .../catalina/connector/LocalStrings.properties | 1 - .../catalina/connector/LocalStrings_cs.properties | 1 - .../catalina/connector/LocalStrings_de.properties | 1 - .../catalina/connector/LocalStrings_es.properties | 1 - .../catalina/connector/LocalStrings_fr.properties | 1 - .../catalina/connector/LocalStrings_ja.properties | 1 - .../catalina/connector/LocalStrings_ko.properties | 1 - .../catalina/connector/LocalStrings_ru.properties | 1 - .../connector/LocalStrings_zh_CN.properties | 1 - java/org/apache/catalina/connector/Request.java | 2 +- .../core/JreMemoryLeakPreventionListener.java | 2 +- .../apache/catalina/core/LocalStrings.properties | 4 ---- .../apache/catalina/core/LocalStrings_cs.properties | 1 - .../apache/catalina/core/LocalStrings_de.properties | 1 - .../apache/catalina/core/LocalStrings_es.properties | 4 ---- .../apache/catalina/core/LocalStrings_fr.properties | 4 ---- .../apache/catalina/core/LocalStrings_ja.properties | 4 ---- .../apache/catalina/core/LocalStrings_ko.properties | 4 ---- .../catalina/core/LocalStrings_zh_CN.properties | 2 -- java/org/apache/catalina/filters/CorsFilter.java | 2 +- .../apache/catalina/filters/LocalStrings.properties | 4 ++-- .../apache/catalina/ha/session/BackupManager.java | 2 +- .../apache/catalina/loader/LocalStrings.properties | 9 --------- .../catalina/loader/LocalStrings_cs.properties | 2 -- .../catalina/loader/LocalStrings_de.properties | 3 +-- .../catalina/loader/LocalStrings_es.properties | 8 -------- .../catalina/loader/LocalStrings_fr.properties | 9 --------- .../catalina/loader/LocalStrings_ja.properties | 9 --------- .../catalina/loader/LocalStrings_ko.properties | 9 --------- .../catalina/loader/LocalStrings_pt_BR.properties | 1 - .../catalina/loader/LocalStrings_zh_CN.properties | 5 ----- .../apache/catalina/manager/LocalStrings.properties | 2 -- .../catalina/manager/LocalStrings_de.properties | 1 - .../catalina/manager/LocalStrings_es.properties | 1 - .../catalina/manager/LocalStrings_fr.properties | 3 --- .../catalina/manager/LocalStrings_ja.properties | 1 - .../catalina/manager/LocalStrings_ko.properties | 1 - .../catalina/manager/LocalStrings_ru.properties | 2 -- .../catalina/manager/LocalStrings_zh_CN.properties | 3 --- .../catalina/manager/host/LocalStrings.properties | 1 - .../manager/host/LocalStrings_fr.properties | 1 - .../manager/host/LocalStrings_ja.properties | 1 - .../manager/host/LocalStrings_ko.properties | 1 - .../manager/host/LocalStrings_ru.properties | 1 - .../manager/host/LocalStrings_zh_CN.properties | 1 - java/org/apache/catalina/realm/JDBCRealm.java | 6 +++--- .../apache/catalina/realm/LocalStrings.properties | 4 +--- .../catalina/realm/LocalStrings_cs.properties | 1 - .../catalina/realm/LocalStrings_de.properties | 1 - .../catalina/realm/LocalStrings_es.properties | 1 - .../catalina/realm/LocalStrings_fr.properties | 2 -- .../catalina/realm/LocalStrings_ja.properties | 2 -- .../catalina/realm/LocalStrings_ko.properties | 2 -- .../apache/catalina/session/LocalStrings.properties | 7 ------- .../catalina/session/LocalStrings_de.properties | 1 - .../catalina/session/LocalStrings_es.properties | 5 ----- .../catalina/session/LocalStrings_fr.properties | 7 ------- .../catalina/session/LocalStrings_ja.properties | 7 ------- .../catalina/session/LocalStrings_ko.properties | 7 ------- .../catalina/session/LocalStrings_zh_CN.properties | 2 -- .../apache/catalina/ssi/ResponseIncludeWrapper.java | 2 +- .../catalina/startup/CertificateCreateRule.java | 2 +- java/org/apache/catalina/startup/ContextConfig.java | 1 - .../apache/catalina/startup/LocalStrings.properties | 6 ------ .../catalina/startup/LocalStrings_es.properties | 3 --- .../catalina/startup/LocalStrings_fr.properties | 5 ----- .../catalina/startup/LocalStrings_ja.properties | 6 ------ .../catalina/startup/LocalStrings_ko.properties | 6 ------ .../catalina/startup/LocalStrings_zh_CN.properties | 1 - .../catalina/util/SessionIdGeneratorBase.java | 2 +- .../apache/catalina/valves/rewrite/RewriteRule.java | 4 ++-- .../catalina/webresources/LocalStrings.properties | 2 -- .../webresources/LocalStrings_es.properties | 2 -- .../webresources/LocalStrings_fr.properties | 2 -- .../webresources/LocalStrings_ja.properties | 2 -- .../webresources/LocalStrings_ko.properties | 2 -- .../webresources/LocalStrings_zh_CN.properties | 2 -- java/org/apache/coyote/ajp/Constants.java | 2 +- java/org/apache/coyote/ajp/LocalStrings.properties | 2 -- .../apache/coyote/ajp/LocalStrings_es.properties | 2 -- .../apache/coyote/ajp/LocalStrings_fr.properties | 2 -- .../apache/coyote/ajp/LocalStrings_ja.properties | 2 -- .../apache/coyote/ajp/LocalStrings_ko.properties | 2 -- .../apache/coyote/ajp/LocalStrings_zh_CN.properties | 1 - .../apache/coyote/http11/LocalStrings.properties | 3 --- .../apache/coyote/http11/LocalStrings_cs.properties | 2 -- .../apache/coyote/http11/LocalStrings_de.properties | 3 +-- .../apache/coyote/http11/LocalStrings_es.properties | 2 -- .../apache/coyote/http11/LocalStrings_fr.properties | 3 --- .../apache/coyote/http11/LocalStrings_ja.properties | 3 --- .../apache/coyote/http11/LocalStrings_ko.properties | 3 --- .../coyote/http11/LocalStrings_pt_BR.properties | 2 -- .../coyote/http11/LocalStrings_zh_CN.properties | 3 +-- .../org/apache/coyote/http2/LocalStrings.properties | 8 -------- .../apache/coyote/http2/LocalStrings_cs.properties | 2 -- .../apache/coyote/http2/LocalStrings_es.properties | 1 - .../apache/coyote/http2/LocalStrings_fr.properties | 8 -------- .../apache/coyote/http2/LocalStrings_ja.properties | 8 -------- .../apache/coyote/http2/LocalStrings_ko.properties | 8 -------- .../coyote/http2/LocalStrings_zh_CN.properties | 3 --- .../apache/jasper/compiler/ELFunctionMapper.java | 2 +- java/org/apache/jasper/compiler/JspConfig.java | 2 +- .../jasper/compiler/tagplugin/TagPluginContext.java | 4 ++-- .../apache/jasper/resources/LocalStrings.properties | 4 ---- .../jasper/resources/LocalStrings_es.properties | 4 +--- .../jasper/resources/LocalStrings_fr.properties | 4 ---- .../jasper/resources/LocalStrings_ja.properties | 4 ---- .../jasper/resources/LocalStrings_ko.properties | 4 ---- .../jasper/resources/LocalStrings_zh_CN.properties | 4 ---- java/org/apache/tomcat/dbcp/dbcp2/Jdbc41Bridge.java | 4 ++-- .../apache/tomcat/dbcp/dbcp2/SQLExceptionList.java | 2 +- .../dbcp2/managed/LocalXAConnectionFactory.java | 4 ++-- java/org/apache/tomcat/jni/SSL.java | 6 +++--- java/org/apache/tomcat/jni/SSLConf.java | 2 +- java/org/apache/tomcat/jni/SSLContext.java | 6 +++--- java/org/apache/tomcat/jni/SSLSocket.java | 6 +++--- .../apache/tomcat/util/buf/LocalStrings.properties | 1 - .../tomcat/util/buf/LocalStrings_de.properties | 16 ---------------- .../tomcat/util/buf/LocalStrings_es.properties | 2 -- .../tomcat/util/buf/LocalStrings_fr.properties | 1 - .../tomcat/util/buf/LocalStrings_ja.properties | 1 - .../tomcat/util/buf/LocalStrings_ko.properties | 1 - .../tomcat/util/buf/LocalStrings_zh_CN.properties | 1 - .../util/descriptor/tagplugin/TagPluginParser.java | 2 +- .../tomcat/util/descriptor/tld/TldParser.java | 2 +- java/org/apache/tomcat/util/digester/package.html | 4 ++-- .../apache/tomcat/util/http/FastHttpDateFormat.java | 4 ++-- java/org/apache/tomcat/util/http/parser/Host.java | 4 ++-- .../tomcat/util/http/parser/LocalStrings.properties | 1 - .../util/http/parser/LocalStrings_fr.properties | 1 - .../util/http/parser/LocalStrings_ja.properties | 1 - .../util/http/parser/LocalStrings_ko.properties | 1 - .../apache/tomcat/util/http/parser/MediaType.java | 2 +- java/org/apache/tomcat/util/modeler/Registry.java | 2 +- .../apache/tomcat/util/modeler/RegistryMBean.java | 2 +- java/org/apache/tomcat/util/modeler/package.html | 2 +- .../apache/tomcat/util/net/LocalStrings.properties | 6 ------ .../tomcat/util/net/LocalStrings_cs.properties | 1 - .../tomcat/util/net/LocalStrings_de.properties | 1 - .../tomcat/util/net/LocalStrings_es.properties | 1 - .../tomcat/util/net/LocalStrings_fr.properties | 6 ------ .../tomcat/util/net/LocalStrings_ja.properties | 6 ------ .../tomcat/util/net/LocalStrings_ko.properties | 6 ------ .../tomcat/util/net/LocalStrings_ru.properties | 1 - .../tomcat/util/net/LocalStrings_zh_CN.properties | 1 - java/org/apache/tomcat/util/net/Nio2Channel.java | 2 +- java/org/apache/tomcat/util/net/NioChannel.java | 2 +- java/org/apache/tomcat/util/net/SSLHostConfig.java | 2 +- .../apache/tomcat/util/net/SecureNio2Channel.java | 2 +- .../apache/tomcat/util/net/SecureNioChannel.java | 2 +- .../tomcat/util/net/jsse/LocalStrings.properties | 5 ----- .../tomcat/util/net/jsse/LocalStrings_cs.properties | 1 - .../tomcat/util/net/jsse/LocalStrings_de.properties | 2 -- .../tomcat/util/net/jsse/LocalStrings_es.properties | 2 -- .../tomcat/util/net/jsse/LocalStrings_fr.properties | 5 ----- .../tomcat/util/net/jsse/LocalStrings_ja.properties | 5 ----- .../tomcat/util/net/jsse/LocalStrings_ko.properties | 5 ----- .../util/net/jsse/LocalStrings_zh_CN.properties | 3 --- .../tomcat/util/net/openssl/LocalStrings.properties | 5 ----- .../util/net/openssl/LocalStrings_de.properties | 3 --- .../util/net/openssl/LocalStrings_es.properties | 2 -- .../util/net/openssl/LocalStrings_fr.properties | 5 ----- .../util/net/openssl/LocalStrings_ja.properties | 5 ----- .../util/net/openssl/LocalStrings_ko.properties | 5 ----- .../util/net/openssl/LocalStrings_zh_CN.properties | 3 --- .../apache/tomcat/websocket/LocalStrings.properties | 1 - .../tomcat/websocket/LocalStrings_fr.properties | 2 -- .../tomcat/websocket/LocalStrings_ja.properties | 2 -- .../tomcat/websocket/LocalStrings_ko.properties | 2 -- .../tomcat/websocket/server/LocalStrings.properties | 3 --- .../websocket/server/LocalStrings_cs.properties | 2 -- .../websocket/server/LocalStrings_de.properties | 1 - .../websocket/server/LocalStrings_es.properties | 1 - .../websocket/server/LocalStrings_fr.properties | 3 --- .../websocket/server/LocalStrings_ja.properties | 3 --- .../websocket/server/LocalStrings_ko.properties | 3 --- .../websocket/server/LocalStrings_pt_BR.properties | 16 ---------------- .../websocket/server/LocalStrings_zh_CN.properties | 1 - .../apache/tomcat/websocket/server/UpgradeUtil.java | 2 +- modules/jdbc-pool/doc/jdbc-pool.xml | 2 +- .../apache/tomcat/jdbc/pool/PoolConfiguration.java | 4 ++-- .../org/apache/tomcat/jdbc/pool/TrapException.java | 2 +- .../apache/tomcat/jdbc/pool/mbeans-descriptors.xml | 4 ++-- .../catalina/valves/rewrite/TestRewriteValve.java | 2 +- .../TestWsWebSocketContainerWithProxy.java | 2 +- webapps/docs/architecture/startup/serverStartup.txt | 2 +- webapps/docs/cdi.xml | 2 +- webapps/docs/changelog.xml | 10 +++++++++- webapps/docs/config/ajp.xml | 2 +- webapps/docs/config/cluster-valve.xml | 2 +- webapps/docs/config/http.xml | 2 +- webapps/docs/connectors.xml | 2 +- webapps/docs/funcspecs/index.xml | 2 +- webapps/docs/index.xml | 3 ++- webapps/docs/{elapi => jaspicapi}/index.html | 6 +++--- webapps/docs/mbeans-descriptors-howto.xml | 2 +- webapps/docs/project.xml | 1 + webapps/docs/rewrite.xml | 6 +++--- webapps/docs/ssl-howto.xml | 12 ++++++------ 211 files changed, 132 insertions(+), 537 deletions(-) delete mode 100644 java/org/apache/tomcat/util/buf/LocalStrings_de.properties delete mode 100644 java/org/apache/tomcat/websocket/server/LocalStrings_pt_BR.properties copy webapps/docs/{elapi => jaspicapi}/index.html (90%) --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org