This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git.
from 45b3f9b Polish. Spacing. new 3dabb92 fix typo new a877a97 fix typo new 0ab842e fix typo new 87e7de4 fix typo new f809fb9 add JASPIC 1.1 Javadoc new 31cb355 Remove unused i18n messages (re3moval of translations to follow) new 91fece3 Fix typo new 402cbb3 fix typo new ae9741a fix typo new 89d573a Fix typo new 0263a83 fix typo (an ssl) new ad7563b fix typo new 3795213 fix typo(an sql) new 50b4075 Fix typo new 11fec6f Fix typo new 2b8f0b6 Add link to newly added JASPIC docs new c8ecb01 Update changelog for PR from KangZhiDong new d5a6da8 Remove translated entries for keys that have been removed The 18 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 +- .../servlet/http/LocalStrings_zh_CN.properties | 3 ++- 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 +- .../catalina/ant/jmx/JMXAccessorGetTask.java | 2 +- .../catalina/ant/jmx/JMXAccessorSetTask.java | 2 +- .../ant/jmx/JMXAccessorUnregisterTask.java | 2 +- java/org/apache/catalina/ant/jmx/package.html | 4 +-- .../authenticator/LocalStrings_zh_CN.properties | 1 + .../catalina/connector/LocalStrings.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 | 4 ++- java/org/apache/catalina/connector/Request.java | 2 +- .../apache/catalina/core/LocalStrings.properties | 2 -- .../catalina/core/LocalStrings_es.properties | 3 --- .../catalina/core/LocalStrings_fr.properties | 2 -- .../catalina/core/LocalStrings_ja.properties | 2 -- .../catalina/core/LocalStrings_ko.properties | 2 -- .../catalina/core/LocalStrings_zh_CN.properties | 10 ++++++-- .../catalina/deploy/LocalStrings_zh_CN.properties | 1 + java/org/apache/catalina/filters/CorsFilter.java | 2 +- .../catalina/filters/LocalStrings.properties | 4 +-- .../catalina/filters/LocalStrings_fr.properties | 2 ++ .../catalina/filters/LocalStrings_ko.properties | 2 ++ .../catalina/filters/LocalStrings_zh_CN.properties | 1 + .../ha/deploy/LocalStrings_zh_CN.properties | 2 ++ .../apache/catalina/ha/session/BackupManager.java | 2 +- .../ha/session/LocalStrings_zh_CN.properties | 3 +++ .../catalina/ha/tcp/LocalStrings_zh_CN.properties | 1 + .../apache/catalina/loader/LocalStrings.properties | 9 ------- .../catalina/loader/LocalStrings_de.properties | 1 - .../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_zh_CN.properties | 6 +---- .../catalina/manager/LocalStrings.properties | 1 - .../catalina/manager/LocalStrings_fr.properties | 1 - .../catalina/manager/LocalStrings_ja.properties | 1 - .../catalina/manager/LocalStrings_ko.properties | 1 - .../catalina/manager/LocalStrings_ru.properties | 3 --- .../catalina/manager/LocalStrings_zh_CN.properties | 1 - .../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 - .../LocalStrings_zh_CN.properties | 2 +- java/org/apache/catalina/realm/JDBCRealm.java | 6 ++--- .../apache/catalina/realm/LocalStrings.properties | 4 +-- .../catalina/realm/LocalStrings_de.properties | 1 - .../catalina/realm/LocalStrings_es.properties | 1 - .../catalina/realm/LocalStrings_fr.properties | 3 +-- .../catalina/realm/LocalStrings_ja.properties | 2 -- .../catalina/realm/LocalStrings_ko.properties | 3 +-- .../catalina/servlet4preview/http/PushBuilder.java | 4 +-- .../catalina/session/LocalStrings_zh_CN.properties | 1 + .../catalina/ssi/ResponseIncludeWrapper.java | 2 +- .../catalina/startup/CertificateCreateRule.java | 2 +- .../catalina/startup/LocalStrings.properties | 6 ----- .../catalina/startup/LocalStrings_es.properties | 4 --- .../catalina/startup/LocalStrings_fr.properties | 6 ----- .../catalina/startup/LocalStrings_ja.properties | 6 ----- .../catalina/startup/LocalStrings_ko.properties | 6 ----- .../catalina/startup/LocalStrings_zh_CN.properties | 29 +++++++++++++++++++++- .../tribes/group/LocalStrings_zh_CN.properties | 1 + .../interceptors/LocalStrings_zh_CN.properties | 1 + .../membership/LocalStrings_zh_CN.properties | 1 + .../tribes/transport/LocalStrings_es.properties | 9 ------- .../tribes/transport/LocalStrings_zh_CN.properties | 1 + .../transport/bio/LocalStrings_zh_CN.properties | 2 ++ .../transport/nio/LocalStrings_zh_CN.properties | 3 ++- .../catalina/util/LocalStrings_zh_CN.properties | 2 ++ .../catalina/util/SessionIdGeneratorBase.java | 2 +- .../catalina/valves/LocalStrings_fr.properties | 2 ++ .../catalina/valves/LocalStrings_ja.properties | 2 +- .../catalina/valves/LocalStrings_ko.properties | 2 ++ .../catalina/valves/LocalStrings_zh_CN.properties | 19 ++++++++++++++ .../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 | 4 +-- .../apache/coyote/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 | 3 --- .../apache/coyote/ajp/LocalStrings_fr.properties | 2 -- .../apache/coyote/ajp/LocalStrings_ja.properties | 2 -- .../apache/coyote/ajp/LocalStrings_ko.properties | 2 -- .../coyote/ajp/LocalStrings_zh_CN.properties | 1 - .../apache/coyote/http11/LocalStrings.properties | 3 --- .../coyote/http11/LocalStrings_de.properties | 1 - .../coyote/http11/LocalStrings_es.properties | 3 --- .../coyote/http11/LocalStrings_fr.properties | 5 ++-- .../coyote/http11/LocalStrings_ja.properties | 3 --- .../coyote/http11/LocalStrings_ko.properties | 5 ++-- .../coyote/http11/LocalStrings_zh_CN.properties | 3 ++- .../apache/coyote/http2/LocalStrings.properties | 7 ------ .../apache/coyote/http2/LocalStrings_es.properties | 1 - .../apache/coyote/http2/LocalStrings_fr.properties | 8 +----- .../apache/coyote/http2/LocalStrings_ja.properties | 7 ------ .../apache/coyote/http2/LocalStrings_ko.properties | 8 +----- .../coyote/http2/LocalStrings_zh_CN.properties | 19 +++++++++++--- .../apache/jasper/compiler/ELFunctionMapper.java | 2 +- java/org/apache/jasper/compiler/JspConfig.java | 2 +- .../compiler/tagplugin/TagPluginContext.java | 4 +-- .../jasper/resources/LocalStrings.properties | 2 -- .../jasper/resources/LocalStrings_de.properties | 1 - .../jasper/resources/LocalStrings_es.properties | 2 -- .../jasper/resources/LocalStrings_fr.properties | 2 -- .../jasper/resources/LocalStrings_ja.properties | 2 -- .../jasper/resources/LocalStrings_ko.properties | 2 -- .../jasper/resources/LocalStrings_zh_CN.properties | 21 +++++++++++++--- .../naming/factory/LocalStrings_zh_CN.properties | 2 ++ .../org/apache/tomcat/dbcp/dbcp2/Jdbc41Bridge.java | 4 +-- .../apache/tomcat/dbcp/dbcp2/SQLExceptionList.java | 2 +- 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_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/compat/LocalStrings_zh_CN.properties | 2 ++ .../util/descriptor/tagplugin/TagPluginParser.java | 2 +- .../tomcat/util/descriptor/tld/TldParser.java | 2 +- .../descriptor/web/LocalStrings_zh_CN.properties | 3 +++ java/org/apache/tomcat/util/digester/package.html | 4 +-- .../tomcat/util/http/FastHttpDateFormat.java | 4 +-- .../tomcat/util/http/LocalStrings_zh_CN.properties | 3 ++- java/org/apache/tomcat/util/http/parser/Host.java | 4 +-- .../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 | 3 --- .../tomcat/util/net/LocalStrings_es.properties | 2 -- .../tomcat/util/net/LocalStrings_fr.properties | 3 --- .../tomcat/util/net/LocalStrings_ja.properties | 3 --- .../tomcat/util/net/LocalStrings_ko.properties | 3 --- .../tomcat/util/net/LocalStrings_zh_CN.properties | 4 +++ 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 ---- .../util/net/jsse/LocalStrings_de.properties | 2 -- .../util/net/jsse/LocalStrings_es.properties | 2 -- .../util/net/jsse/LocalStrings_fr.properties | 5 ---- .../util/net/jsse/LocalStrings_ja.properties | 5 ---- .../util/net/jsse/LocalStrings_ko.properties | 5 ---- .../util/net/jsse/LocalStrings_zh_CN.properties | 6 ++--- .../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 --- .../tomcat/websocket/LocalStrings.properties | 1 - .../tomcat/websocket/LocalStrings_fr.properties | 1 - .../tomcat/websocket/LocalStrings_ja.properties | 1 - .../tomcat/websocket/LocalStrings_ko.properties | 1 - .../tomcat/websocket/LocalStrings_zh_CN.properties | 4 +++ .../websocket/pojo/LocalStrings_zh_CN.properties | 3 +++ .../websocket/server/LocalStrings.properties | 3 --- .../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_zh_CN.properties | 2 +- .../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 +- .../docs/architecture/startup/serverStartup.txt | 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/{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, 282 insertions(+), 417 deletions(-) copy java/org/apache/catalina/{ha/authenticator => mbeans}/LocalStrings_zh_CN.properties (89%) 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