[Bug 66409] New: Loading Resources with Blanks in Path Fails
https://bz.apache.org/bugzilla/show_bug.cgi?id=66409 Bug ID: 66409 Summary: Loading Resources with Blanks in Path Fails Product: Tomcat 9 Version: 9.0.70 Hardware: All OS: All Status: NEW Severity: major Priority: P2 Component: Catalina Assignee: dev@tomcat.apache.org Reporter: michael-christoph.ratzenbo...@cgm.com Target Milestone: - Since Tomcat 9.0.70, the following problem occurs. When loading resources (e.g. a font from a jar file) an URISyntaxException is thrown, if the URI is not valid. However, this also includes URLs which contain blanks, meaning that loading resources that contain a blank, the resource cannot be loaded since the determined URL is null. E.g. Tomcat 7.0.69 was able to load the following resource: "MS Sans Serif.ttf", whereas Tomcat 7.0.70 is not able to load it anymore, with the following debug message: 04-Jan-2023 09:56:22.921 FEIN [http-nio-7000-exec-12] org.apache.catalina.webresources.AbstractArchiveResource.getURL Unable to determine a URL for the resource [jar:file:/C:/iheroot/ihe-main-4.2.x/client-web/module/target/ihe.module/WEB-INF/lib/ihe-jasperreports-fonts-4.5.1.jar!/net/sf/jasperreports/fonts/mssansserif/MS Sans Serif.ttf] java.net.URISyntaxException: Illegal character in opaque part at index 108: jar:file:/C:/module/WEB-INF/lib/ihe-jasperreports-fonts-4.5.1.jar!/net/sf/jasperreports/fonts/mssansserif/MS Sans Serif.ttf at java.net.URI$Parser.fail(URI.java:2847) at java.net.URI$Parser.checkChars(URI.java:3020) at java.net.URI$Parser.parse(URI.java:3057) at java.net.URI.(URI.java:588) at org.apache.catalina.webresources.AbstractArchiveResource.getURL(AbstractArchiveResource.java:144) at org.apache.catalina.webresources.CachedResource.getURL(CachedResource.java:348) at org.apache.catalina.loader.WebappClassLoaderBase.findResource(WebappClassLoaderBase.java:956) at org.apache.catalina.loader.WebappClassLoaderBase.getResource(WebappClassLoaderBase.java:1078) Some investigation on our side showed that org.apache.cataline.webresources.AbstractArchiveResource#getURL() has changed from version 7.0.69 to 7.0.70. Instead of using the java.net.URL directly, java.net.URI(url).toURL() is used now. The problem is, that the URL is not encoded properly. The hardware and OS should not influence this bug. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 66409] Loading Resources with Blanks in Path Fails
https://bz.apache.org/bugzilla/show_bug.cgi?id=66409 Remy Maucherat changed: What|Removed |Added Resolution|--- |DUPLICATE Status|NEW |RESOLVED --- Comment #1 from Remy Maucherat --- *** This bug has been marked as a duplicate of bug 66388 *** -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 66388] Classpath resource having a name containing a space can't be read anymore by ClassLoader.getResources(String name)
https://bz.apache.org/bugzilla/show_bug.cgi?id=66388 Remy Maucherat changed: What|Removed |Added CC||michael-christoph.ratzenboe ||c...@cgm.com --- Comment #7 from Remy Maucherat --- *** Bug 66409 has been marked as a duplicate of this bug. *** -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1906376 - in /tomcat/site/trunk: docs/lists.html xdocs/lists.xml
Author: markt Date: Wed Jan 4 09:57:14 2023 New Revision: 1906376 URL: http://svn.apache.org/viewvc?rev=1906376&view=rev Log: Remove Nabble (no longer a mail archive), http->https where possible, mod_mbox has been replaced by Pony mail, gmane.org is unresponsive and fix typos. Modified: tomcat/site/trunk/docs/lists.html tomcat/site/trunk/xdocs/lists.xml Modified: tomcat/site/trunk/docs/lists.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/lists.html?rev=1906376&r1=1906375&r2=1906376&view=diff == --- tomcat/site/trunk/docs/lists.html (original) +++ tomcat/site/trunk/docs/lists.html Wed Jan 4 09:57:14 2023 @@ -22,7 +22,7 @@ message being marked as spam: taglibs-user User support and discussion for - http://tomcat.apache.org/taglibs/";>Apache Taglibs + https://tomcat.apache.org/taglibs/";>Apache Taglibs tomcat-announce Low volume announcements including all releases and security @@ -39,17 +39,12 @@ message being marked as spam: The Developer list is for people interested in helping with the development and debugging of the server. -Formatted archives are available in several places including http://mail-archives.apache.org/mod_mbox/";>the Apache Mail -Archives, http://marc.info/"; rel="nofollow">MARC, -http://www.nabble.com/"; rel="nofollow">Nabble, and -http://tomcat.markmail.org/"; rel="nofollow">MarkMail. The raw mbox -files are also http://tomcat.apache.org/mail/";>available. +Formatted archives are available in several places including https://lists.apache.org/list.html?us...@tomcat.apache.org";>the Apache Mail +Archives, https://marc.info/"; rel="nofollow">MARC, and +https://tomcat.markmail.org/"; rel="nofollow">MarkMail. The raw mbox +files are also available. -You can also use the mail-to-news -nntp://news.gmane.org/"; rel="nofollow">gateway offered by -http://news.gmane.org/index.php?match=gmane.comp.apache"; rel="nofollow">GMANE to access most of the lists with a news reader. - tomcat-users The list listed here is the only place that configuration @@ -73,12 +68,12 @@ Tomcat questions to Eric or Rick themsel post a question. If you do not subscribe first, your post will be automatically rejected. When asking questions on the list, please state your exact Tomcat version - (which is three numbers, 10.1.zz, 10.0.yy, 9.0.xx, 8.5.ww, 8.0.vv, or 7.0.uu), your operating + (which is three numbers, 11.0.zz, 10.1.yy, 9.0.xx or 8.5.ww), your operating system, and essential bits of your configuration. Note, that Tomcat Documentation is provided on this site and is searchable - (see links and search box at the left). Add "Tomcat 10.0", "Tomcat 9.0", - or "Tomcat 8.5" to your query to refine your results. The + (see links and search box at the left). Add "Tomcat 11.0", "Tomcat 10.1", + "Tomcat 9.0", or "Tomcat 8.5" to your query to refine your results. The tomcat-users mailing list archives (links are below) are also searchable. The https://cwiki.apache.org/confluence/display/TOMCAT/FAQ";>FAQ and @@ -145,18 +140,16 @@ Tomcat questions to Eric or Rick themsel Archives: -at the ASF with http://mail-archives.apache.org/mod_mbox/tomcat-users/";>mod_mbox -or with https://lists.apache.org/list.html?us...@tomcat.apache.org";>Pony Mail, +at the ASF with https://lists.apache.org/list.html?us...@tomcat.apache.org";>Pony Mail, or searchable archives at https://marc.info/?l=tomcat-user"; rel="nofollow">MARC, -https://markmail.org/list/org.apache.tomcat.user/"; rel="nofollow">MarkMail, -http://tomcat.10.x6.nabble.com/Tomcat-User-f1968778.html"; rel="nofollow">Nabble -and https://www.mail-archive.com/users@tomcat.apache.org/"; rel="nofollow">Mail Archive +https://markmail.org/list/org.apache.tomcat.user/"; rel="nofollow">MarkMail and +https://www.mail-archive.com/users@tomcat.apache.org/"; rel="nofollow">Mail Archive RSS: - at http://tomcat.markmail.org/atom/+list:org%2Eapache%2Etomcat%2Eusers"; rel="nofollow">MarkMail + at https://tomcat.markmail.org/atom/+list:org%2Eapache%2Etomcat%2Eusers"; rel="nofollow">MarkMail @@ -202,15 +195,15 @@ other project announcements. Archives: -at the ASF with http://mail-archives.apache.org/mod_mbox/tomcat-announce/";>mod_mbox -or with https://lists.apache.org/list.html?annou...@tomcat.apache.org";>Pony Mail, +at the ASF with https://lists.apache.org/list.html?annou...@tomcat.apache.org";>Pony Mail, +or searchable archives at at https://markmail.org/list/org.apache.tomcat.announce/"; rel="nofollow">MarkMail and -at http://www.mail-archive.com/announce@tomcat.apache.org/"; rel="nofollow">Mail Archive +at https://www.mail-archive.com/announce@tomcat.apache.org/"; rel="nofollow">Mail Archive RSS: - at http://tomcat.markmail.org/atom/+list:org%2Eapache%2Etomcat%2Eannounce"; rel=
svn commit: r1906377 - in /tomcat/site/trunk: docs/lists.html xdocs/lists.xml
Author: markt Date: Wed Jan 4 09:58:44 2023 New Revision: 1906377 URL: http://svn.apache.org/viewvc?rev=1906377&view=rev Log: More typos Modified: tomcat/site/trunk/docs/lists.html tomcat/site/trunk/xdocs/lists.xml Modified: tomcat/site/trunk/docs/lists.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/lists.html?rev=1906377&r1=1906376&r2=1906377&view=diff == --- tomcat/site/trunk/docs/lists.html (original) +++ tomcat/site/trunk/docs/lists.html Wed Jan 4 09:58:44 2023 @@ -197,8 +197,8 @@ other project announcements. at the ASF with https://lists.apache.org/list.html?annou...@tomcat.apache.org";>Pony Mail, or searchable archives at -at https://markmail.org/list/org.apache.tomcat.announce/"; rel="nofollow">MarkMail and -at https://www.mail-archive.com/announce@tomcat.apache.org/"; rel="nofollow">Mail Archive +https://markmail.org/list/org.apache.tomcat.announce/"; rel="nofollow">MarkMail and +https://www.mail-archive.com/announce@tomcat.apache.org/"; rel="nofollow">Mail Archive Modified: tomcat/site/trunk/xdocs/lists.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/lists.xml?rev=1906377&r1=1906376&r2=1906377&view=diff == --- tomcat/site/trunk/xdocs/lists.xml (original) +++ tomcat/site/trunk/xdocs/lists.xml Wed Jan 4 09:58:44 2023 @@ -212,8 +212,8 @@ other project announcements. at the ASF with https://lists.apache.org/list.html?annou...@tomcat.apache.org";>Pony Mail, or searchable archives at -at https://markmail.org/list/org.apache.tomcat.announce/"; rel="nofollow">MarkMail and -at https://www.mail-archive.com/announce@tomcat.apache.org/"; rel="nofollow">Mail Archive +https://markmail.org/list/org.apache.tomcat.announce/"; rel="nofollow">MarkMail and +https://www.mail-archive.com/announce@tomcat.apache.org/"; rel="nofollow">Mail Archive - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1906378 - in /tomcat/site/trunk: docs/ xdocs/stylesheets/
Author: markt Date: Wed Jan 4 10:00:49 2023 New Revision: 1906378 URL: http://svn.apache.org/viewvc?rev=1906378&view=rev Log: Happy New Year 2023 Modified: tomcat/site/trunk/docs/bugreport.html tomcat/site/trunk/docs/ci.html tomcat/site/trunk/docs/conference.html tomcat/site/trunk/docs/contact.html tomcat/site/trunk/docs/download-10.html tomcat/site/trunk/docs/download-11.html tomcat/site/trunk/docs/download-80.html tomcat/site/trunk/docs/download-90.html tomcat/site/trunk/docs/download-connectors.html tomcat/site/trunk/docs/download-migration.html tomcat/site/trunk/docs/download-native.html tomcat/site/trunk/docs/download-taglibs.html tomcat/site/trunk/docs/findhelp.html tomcat/site/trunk/docs/getinvolved.html tomcat/site/trunk/docs/heritage.html tomcat/site/trunk/docs/index.html tomcat/site/trunk/docs/irc.html tomcat/site/trunk/docs/legal.html tomcat/site/trunk/docs/lists.html tomcat/site/trunk/docs/maven-plugin.html tomcat/site/trunk/docs/migration-10.1.html tomcat/site/trunk/docs/migration-10.html tomcat/site/trunk/docs/migration-11.0.html tomcat/site/trunk/docs/migration-6.html tomcat/site/trunk/docs/migration-7.html tomcat/site/trunk/docs/migration-8.html tomcat/site/trunk/docs/migration-85.html tomcat/site/trunk/docs/migration-9.html tomcat/site/trunk/docs/migration.html tomcat/site/trunk/docs/oldnews-2010.html tomcat/site/trunk/docs/oldnews-2011.html tomcat/site/trunk/docs/oldnews-2012.html tomcat/site/trunk/docs/oldnews-2013.html tomcat/site/trunk/docs/oldnews-2014.html tomcat/site/trunk/docs/oldnews-2015.html tomcat/site/trunk/docs/oldnews-2016.html tomcat/site/trunk/docs/oldnews-2017.html tomcat/site/trunk/docs/oldnews-2018.html tomcat/site/trunk/docs/oldnews-2019.html tomcat/site/trunk/docs/oldnews-2020.html tomcat/site/trunk/docs/oldnews-2021.html tomcat/site/trunk/docs/oldnews.html tomcat/site/trunk/docs/presentations.html tomcat/site/trunk/docs/resources.html tomcat/site/trunk/docs/security-10.html tomcat/site/trunk/docs/security-11.html tomcat/site/trunk/docs/security-3.html tomcat/site/trunk/docs/security-4.html tomcat/site/trunk/docs/security-5.html tomcat/site/trunk/docs/security-6.html tomcat/site/trunk/docs/security-7.html tomcat/site/trunk/docs/security-8.html tomcat/site/trunk/docs/security-9.html tomcat/site/trunk/docs/security-impact.html tomcat/site/trunk/docs/security-jk.html tomcat/site/trunk/docs/security-native.html tomcat/site/trunk/docs/security-taglibs.html tomcat/site/trunk/docs/security.html tomcat/site/trunk/docs/source.html tomcat/site/trunk/docs/taglibs.html tomcat/site/trunk/docs/tomcat-10.0-eol.html tomcat/site/trunk/docs/tomcat-55-eol.html tomcat/site/trunk/docs/tomcat-60-eol.html tomcat/site/trunk/docs/tomcat-70-eol.html tomcat/site/trunk/docs/tomcat-80-eol.html tomcat/site/trunk/docs/tomcat-85-eol.html tomcat/site/trunk/docs/tools.html tomcat/site/trunk/docs/whichversion.html tomcat/site/trunk/docs/whoweare.html tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl Modified: tomcat/site/trunk/docs/bugreport.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/bugreport.html?rev=1906378&r1=1906377&r2=1906378&view=diff == --- tomcat/site/trunk/docs/bugreport.html (original) +++ tomcat/site/trunk/docs/bugreport.html Wed Jan 4 10:00:49 2023 @@ -450,7 +450,7 @@ See Security Rep -Copyright © 1999-2022, The Apache Software Foundation +Copyright © 1999-2023, The Apache Software Foundation Apache Tomcat, Tomcat, Apache, the Apache feather, and the Apache Tomcat project logo are either registered trademarks or trademarks of the Apache Modified: tomcat/site/trunk/docs/ci.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/ci.html?rev=1906378&r1=1906377&r2=1906378&view=diff == --- tomcat/site/trunk/docs/ci.html (original) +++ tomcat/site/trunk/docs/ci.html Wed Jan 4 10:00:49 2023 @@ -311,7 +311,7 @@ for not-yet-released versions of Apache -Copyright © 1999-2022, The Apache Software Foundation +Copyright © 1999-2023, The Apache Software Foundation Apache Tomcat, Tomcat, Apache, the Apache feather, and the Apache Tomcat project logo are either registered trademarks or trademarks of the Apache Modified: tomcat/site/trunk/docs/conference.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/conference.html?rev=1906378&r1=1906377&r2=1906378&view=diff == --- tomcat/site/trunk/docs/conference.html (original) +++ tomcat/site/trunk/docs/conference.html Wed Jan 4 10:00:49 2023 @@ -52,7 +52,7
[tomcat] branch main updated: Remove unused i18n string
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new d2ce09197a Remove unused i18n string
d2ce09197a is described below
commit d2ce09197a5e56c02cb9f35bf55977f49e3110f0
Author: Mark Thomas
AuthorDate: Wed Jan 4 13:29:16 2023 +
Remove unused i18n string
---
java/org/apache/coyote/LocalStrings_fr.properties| 1 -
java/org/apache/coyote/LocalStrings_ja.properties| 1 -
java/org/apache/coyote/LocalStrings_ko.properties| 1 -
java/org/apache/coyote/LocalStrings_zh_CN.properties | 1 -
4 files changed, 4 deletions(-)
diff --git a/java/org/apache/coyote/LocalStrings_fr.properties
b/java/org/apache/coyote/LocalStrings_fr.properties
index b40dadda84..73186e386b 100644
--- a/java/org/apache/coyote/LocalStrings_fr.properties
+++ b/java/org/apache/coyote/LocalStrings_fr.properties
@@ -65,6 +65,5 @@ request.readListenerSet=L'écouteur des lectures non
bloquantes a déjà été d
response.encoding.invalid=L''encodage [{0}] n''est pas reconnu par le JRE
response.noTrailers.notSupported=Un fournisseur d'en-tête de fin ne peut pas
être mis sur cette réponse, soit le protocole ne supporte pas ces en-têtes,
soit le protocole requiert que le fournisseur soit fourni avant le début de
l'envoi de la réponse
response.notAsync=Il n'est possible de passer en mode d'entrée-sorties non
bloquantes que lors de traitements asynchrones ou après mise à niveau depuis
HTTP
-response.notNonBlocking=Il n'est pas permis d'appeler isReady() quand la
réponse n'a pas été mise en mode non-bloquant
response.nullWriteListener=L'écouteur passé à setWriteListener() ne peut pas
être null
response.writeListenerSet=La cible de notifications d''écriture ("write
listener") non-bloquante a déjà été définie
diff --git a/java/org/apache/coyote/LocalStrings_ja.properties
b/java/org/apache/coyote/LocalStrings_ja.properties
index b36faf88bb..946df80c0e 100644
--- a/java/org/apache/coyote/LocalStrings_ja.properties
+++ b/java/org/apache/coyote/LocalStrings_ja.properties
@@ -65,6 +65,5 @@ request.readListenerSet=ノンブロッキングリードリスナーは既に
response.encoding.invalid=JRE は文字エンコーディング [{0}] を認識しません。
response.noTrailers.notSupported=このレスポンスにtrailer フィールドサプライヤを設定することはできません。
下位のプロトコルがtrailer フィールドをサポートしていないか、またはプロトコルが、レスポンスがコミットされる前にサプライヤが設定されている必要があります。
response.notAsync=非同期処理、あるいは、HTTP アップグレード処理の途中でのみノンブロッキング IO へ切り替えることができます
-response.notNonBlocking=ノンブロッキングモードにしなかったレスポンスの isReady() を呼び出すことはできません。
response.nullWriteListener=setWriteListener() には null を指定できません。
response.writeListenerSet=ノンブロッキング書き込みリスナーが設定済みです
diff --git a/java/org/apache/coyote/LocalStrings_ko.properties
b/java/org/apache/coyote/LocalStrings_ko.properties
index 68470301d2..b57ade3185 100644
--- a/java/org/apache/coyote/LocalStrings_ko.properties
+++ b/java/org/apache/coyote/LocalStrings_ko.properties
@@ -65,6 +65,5 @@ request.readListenerSet=Non-blocking 읽기 리스너가 이미 설정되어 있
response.encoding.invalid=인코딩 [{0}]은(는) JRE에 의해 인식되지 않습니다.
response.noTrailers.notSupported=이 응답을 위해, Trailer fields supplier가 설정될 수
없습니다. 기반 프로토콜이 trailer field들을 지원하지 않거나, 또는 프로토콜이 해당 응답이 커밋되기 전에 Trailer fields
supplier가 설정되기를 요구합니다.
response.notAsync=오직 비동기 처리 중 또는 HTTP 업그레이드 처리 중일 때에만, non-blocking IO로 전환하려는
것이 유효합니다.
-response.notNonBlocking=응답이 non-blocking 모드 내에 있지 않을 때, isReady()를 호출하는 것은
유효하지 않습니다.
response.nullWriteListener=setWriteListener()에 전달되는 리스너가 널이이서는 안됩니다.
response.writeListenerSet=Non-blocking 쓰기 리스너가 이미 설정되었습니다.
diff --git a/java/org/apache/coyote/LocalStrings_zh_CN.properties
b/java/org/apache/coyote/LocalStrings_zh_CN.properties
index ddcff70091..a5c07b33b7 100644
--- a/java/org/apache/coyote/LocalStrings_zh_CN.properties
+++ b/java/org/apache/coyote/LocalStrings_zh_CN.properties
@@ -65,6 +65,5 @@ request.readListenerSet=已设置非阻塞读取侦听器
response.encoding.invalid=JRE无法识别编码[{0}]
response.noTrailers.notSupported=不能为此响应设置拖车字段供应商。底层协议不支持尾部字段，或者协议要求在提交响应之前设置供应商
response.notAsync=只有在异步处理或HTTP升级处理中切换到非阻塞IO才有效
-response.notNonBlocking=当响应尚未进入非阻塞模式时，调用 isReady() 无效
response.nullWriteListener=传递给setWriteListener（）的侦听器不能为空
response.writeListenerSet=非阻塞的写入监听器已经被设置.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated (d2ce09197a -> ceb0a2e418)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
from d2ce09197a Remove unused i18n string
new 3472575c89 Improvements to Portuguese translations. Contributed by
Guilherme Custódio.
new ceb0a2e418 Improvements to Japanese translations. Contributed by
Shirayuking.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
java/jakarta/servlet/http/LocalStrings_ja.properties | 2 +-
.../authenticator/LocalStrings_ja.properties | 4 ++--
.../authenticator/jaspic/LocalStrings_ja.properties | 2 +-
.../catalina/connector/LocalStrings_ja.properties| 6 +++---
.../apache/catalina/core/LocalStrings_ja.properties | 8
.../catalina/deploy/LocalStrings_ja.properties | 2 +-
.../catalina/filters/LocalStrings_ja.properties | 6 +++---
.../catalina/ha/deploy/LocalStrings_ja.properties| 4 ++--
.../catalina/ha/session/LocalStrings_ja.properties | 6 +++---
.../catalina/ha/tcp/LocalStrings_ja.properties | 10 +-
.../catalina/loader/LocalStrings_ja.properties | 4 ++--
.../catalina/manager/LocalStrings_ja.properties | 4 ++--
.../catalina/manager/LocalStrings_pt.properties} | 2 +-
.../apache/catalina/realm/LocalStrings_ja.properties | 2 +-
.../catalina/servlets/LocalStrings_ja.properties | 4 ++--
.../catalina/session/LocalStrings_ja.properties | 2 +-
.../catalina/startup/LocalStrings_ja.properties | 20 ++--
.../group/interceptors/LocalStrings_ja.properties| 12 ++--
.../tribes/membership/LocalStrings_ja.properties | 2 +-
.../membership/cloud/LocalStrings_ja.properties | 2 +-
.../catalina/tribes/tipis/LocalStrings_ja.properties | 10 +-
.../tribes/transport/nio/LocalStrings_ja.properties | 4 ++--
.../catalina/tribes/util/LocalStrings_ja.properties | 2 +-
.../catalina/valves/LocalStrings_ja.properties | 14 +++---
.../catalina/webresources/LocalStrings_ja.properties | 10 +-
java/org/apache/coyote/LocalStrings_ja.properties| 2 +-
.../apache/coyote/http11/LocalStrings_ja.properties | 2 +-
.../apache/coyote/http2/LocalStrings_ja.properties | 18 +-
.../jasper/resources/LocalStrings_ja.properties | 6 +++---
.../jasper/resources/LocalStrings_pt.properties} | 2 +-
.../tomcat/util/net/LocalStrings_ja.properties | 16
.../tomcat/util/net/jsse/LocalStrings_ja.properties | 2 +-
.../tomcat/util/scan/LocalStrings_ja.properties | 2 +-
.../tomcat/websocket/LocalStrings_ja.properties | 8
.../tomcat/websocket/pojo/LocalStrings_ja.properties | 2 +-
webapps/docs/changelog.xml | 8
36 files changed, 110 insertions(+), 102 deletions(-)
copy java/{jakarta/servlet/jsp/LocalStrings.properties =>
org/apache/catalina/manager/LocalStrings_pt.properties} (94%)
copy java/{jakarta/servlet/jsp/LocalStrings.properties =>
org/apache/jasper/resources/LocalStrings_pt.properties} (95%)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/02: Improvements to Portuguese translations. Contributed by Guilherme Custódio.
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 3472575c89ca053e9c0243391587c27fd9669bea Author: Mark Thomas AuthorDate: Wed Jan 4 14:55:08 2023 + Improvements to Portuguese translations. Contributed by Guilherme Custódio. --- .../apache/catalina/manager/LocalStrings_pt.properties | 16 .../apache/jasper/resources/LocalStrings_pt.properties | 16 webapps/docs/changelog.xml | 4 3 files changed, 36 insertions(+) diff --git a/java/org/apache/catalina/manager/LocalStrings_pt.properties b/java/org/apache/catalina/manager/LocalStrings_pt.properties new file mode 100644 index 00..89a1a28ce3 --- /dev/null +++ b/java/org/apache/catalina/manager/LocalStrings_pt.properties @@ -0,0 +1,16 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +htmlManagerServlet.serverIPAddress=Endereço IP diff --git a/java/org/apache/jasper/resources/LocalStrings_pt.properties b/java/org/apache/jasper/resources/LocalStrings_pt.properties new file mode 100644 index 00..6cf3e8c138 --- /dev/null +++ b/java/org/apache/jasper/resources/LocalStrings_pt.properties @@ -0,0 +1,16 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +jsp.error.outputfolder=Sem pasta destino diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 3bb40c0352..4b68ca8e00 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -179,6 +179,10 @@ Update the internal fork of Apache Commons DBCP to f131286 (2023-01-03, 2.10.0-SNAPSHOT). (markt) + +Improvements to Portuguese translations. Contributed by Guilherme +Custódio. (markt) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/02: Improvements to Japanese translations. Contributed by Shirayuking.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit ceb0a2e418b20997972591dd8bd20c899bf8484f
Author: Mark Thomas
AuthorDate: Wed Jan 4 14:59:45 2023 +
Improvements to Japanese translations. Contributed by Shirayuking.
---
java/jakarta/servlet/http/LocalStrings_ja.properties | 2 +-
.../authenticator/LocalStrings_ja.properties | 4 ++--
.../authenticator/jaspic/LocalStrings_ja.properties | 2 +-
.../catalina/connector/LocalStrings_ja.properties| 6 +++---
.../apache/catalina/core/LocalStrings_ja.properties | 8
.../catalina/deploy/LocalStrings_ja.properties | 2 +-
.../catalina/filters/LocalStrings_ja.properties | 6 +++---
.../catalina/ha/deploy/LocalStrings_ja.properties| 4 ++--
.../catalina/ha/session/LocalStrings_ja.properties | 6 +++---
.../catalina/ha/tcp/LocalStrings_ja.properties | 10 +-
.../catalina/loader/LocalStrings_ja.properties | 4 ++--
.../catalina/manager/LocalStrings_ja.properties | 4 ++--
.../apache/catalina/realm/LocalStrings_ja.properties | 2 +-
.../catalina/servlets/LocalStrings_ja.properties | 4 ++--
.../catalina/session/LocalStrings_ja.properties | 2 +-
.../catalina/startup/LocalStrings_ja.properties | 20 ++--
.../group/interceptors/LocalStrings_ja.properties| 12 ++--
.../tribes/membership/LocalStrings_ja.properties | 2 +-
.../membership/cloud/LocalStrings_ja.properties | 2 +-
.../catalina/tribes/tipis/LocalStrings_ja.properties | 10 +-
.../tribes/transport/nio/LocalStrings_ja.properties | 4 ++--
.../catalina/tribes/util/LocalStrings_ja.properties | 2 +-
.../catalina/valves/LocalStrings_ja.properties | 14 +++---
.../catalina/webresources/LocalStrings_ja.properties | 10 +-
java/org/apache/coyote/LocalStrings_ja.properties| 2 +-
.../apache/coyote/http11/LocalStrings_ja.properties | 2 +-
.../apache/coyote/http2/LocalStrings_ja.properties | 18 +-
.../jasper/resources/LocalStrings_ja.properties | 6 +++---
.../tomcat/util/net/LocalStrings_ja.properties | 16
.../tomcat/util/net/jsse/LocalStrings_ja.properties | 2 +-
.../tomcat/util/scan/LocalStrings_ja.properties | 2 +-
.../tomcat/websocket/LocalStrings_ja.properties | 8
.../tomcat/websocket/pojo/LocalStrings_ja.properties | 2 +-
webapps/docs/changelog.xml | 4
34 files changed, 104 insertions(+), 100 deletions(-)
diff --git a/java/jakarta/servlet/http/LocalStrings_ja.properties
b/java/jakarta/servlet/http/LocalStrings_ja.properties
index aa775fb72c..03e93f5d44 100644
--- a/java/jakarta/servlet/http/LocalStrings_ja.properties
+++ b/java/jakarta/servlet/http/LocalStrings_ja.properties
@@ -25,7 +25,7 @@ err.state.commit=レスポンスがコミットされた後は許可されませ
http.method_delete_not_supported=HTTPのDELETEメソッドは、このURLではサポートされていません。
http.method_get_not_supported=HTTPのGETメソッドは、このURLではサポートされていません。
-http.method_not_implemented=メソッド [{0}] はRFC
2068には定義されておらず、サーブレットAPIではサポートされません。
+http.method_not_implemented=メソッド [{0}] はRFC 2068には定義されておらず、サーブレットAPIではサポートされません
http.method_post_not_supported=HTTPのPOSTメソッドは、このURLではサポートされていません。
http.method_put_not_supported=HTTPのPUTメソッドは、このURLではサポートされていません。
http.non_http=リクエストが HTTP リクエストではない、あるいはレスポンスが HTTP レスポンスではありません。
diff --git a/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
b/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
index 2201a85644..0943dd2af3 100644
--- a/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
@@ -62,11 +62,11 @@ singleSignOn.debug.sessionLogout=SSOはSSOセッション[{0}]とアプリケー
singleSignOn.debug.sessionTimeout=SSOはSSOセッション[{0}]とアプリケーションセッション[{1}]のタイムアウトを処理しています
singleSignOn.debug.update=SSOはSSOセッション [{0}] を認証タイプ [{1}] に更新します
singleSignOn.sessionExpire.contextNotFound=Context が見つからないため、SSO はセッション [{0}]
を破棄できません
-singleSignOn.sessionExpire.engineNull=Engine がNullだったため、SSOはセッション[{0}]を破棄できません。
+singleSignOn.sessionExpire.engineNull=Engine が Null だったため、SSO はセッション [{0}]
を破棄できません
singleSignOn.sessionExpire.hostNotFound=ホストが見つからないため SSO セッション [{0}] を破棄できません
singleSignOn.sessionExpire.managerError=セッションを検索するときにマネージャが例外をスローしたため、SSOはセッション
[{0}] を破棄できません
singleSignOn.sessionExpire.managerNotFound=マネージャが見つからなかったため、SSO はセッション [{0}]
を破棄できません
-singleSignOn.sessionExpire.sessionNotFound=セッションが見つからないため、SSOはセッション[{0}]を破棄できません。
+singleSignOn.sessionExpire.sessionNotFound=セッションが見つからないため、SSO はセッション [{0}]
を破棄できません
spnegoAuthenticator.authHeaderNoToken=クライアントから受信した Negoiate 認証ヘッダにはトークンがありません。
spnegoAuthenticator.authHeaderNotNego=クライアントから受信した認証ヘッダーは Negotiate から始まっていません。
diff --git
a/java/org/apache/catalina/authenticator/jaspic/LocalStrings_ja.properties
b/java/org
[tomcat] branch 10.1.x updated (7349b1ce4a -> 5040194f94)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
from 7349b1ce4a Happy New Year 2023
new 53a6da4b2e Improvements to Portuguese translations.
new 5040194f94 Improvements to Japanese translations. Contributed by
Shirayuking.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
java/jakarta/servlet/http/LocalStrings_ja.properties | 2 +-
.../authenticator/LocalStrings_ja.properties | 4 ++--
.../authenticator/jaspic/LocalStrings_ja.properties | 2 +-
.../catalina/connector/LocalStrings_ja.properties| 6 +++---
.../apache/catalina/core/LocalStrings_ja.properties | 8
.../catalina/deploy/LocalStrings_ja.properties | 2 +-
.../catalina/filters/LocalStrings_ja.properties | 6 +++---
.../catalina/ha/deploy/LocalStrings_ja.properties| 4 ++--
.../catalina/ha/session/LocalStrings_ja.properties | 6 +++---
.../catalina/ha/tcp/LocalStrings_ja.properties | 10 +-
.../catalina/loader/LocalStrings_ja.properties | 4 ++--
.../catalina/manager/LocalStrings_ja.properties | 4 ++--
.../catalina/manager/LocalStrings_pt.properties} | 2 +-
.../apache/catalina/realm/LocalStrings_ja.properties | 2 +-
.../catalina/servlets/LocalStrings_ja.properties | 4 ++--
.../catalina/session/LocalStrings_ja.properties | 2 +-
.../catalina/startup/LocalStrings_ja.properties | 20 ++--
.../group/interceptors/LocalStrings_ja.properties| 12 ++--
.../tribes/membership/LocalStrings_ja.properties | 2 +-
.../membership/cloud/LocalStrings_ja.properties | 2 +-
.../catalina/tribes/tipis/LocalStrings_ja.properties | 10 +-
.../tribes/transport/nio/LocalStrings_ja.properties | 4 ++--
.../catalina/tribes/util/LocalStrings_ja.properties | 2 +-
.../catalina/valves/LocalStrings_ja.properties | 14 +++---
.../catalina/webresources/LocalStrings_ja.properties | 10 +-
java/org/apache/coyote/LocalStrings_ja.properties| 2 +-
.../apache/coyote/http11/LocalStrings_ja.properties | 2 +-
.../apache/coyote/http2/LocalStrings_ja.properties | 18 +-
.../jasper/resources/LocalStrings_ja.properties | 6 +++---
.../jasper/resources/LocalStrings_pt.properties} | 2 +-
.../tomcat/util/net/LocalStrings_ja.properties | 16
.../tomcat/util/net/jsse/LocalStrings_ja.properties | 2 +-
.../tomcat/util/scan/LocalStrings_ja.properties | 2 +-
.../tomcat/websocket/LocalStrings_ja.properties | 8
.../tomcat/websocket/pojo/LocalStrings_ja.properties | 2 +-
webapps/docs/changelog.xml | 12
36 files changed, 114 insertions(+), 102 deletions(-)
copy java/{jakarta/servlet/jsp/LocalStrings.properties =>
org/apache/catalina/manager/LocalStrings_pt.properties} (94%)
copy java/{jakarta/servlet/jsp/LocalStrings.properties =>
org/apache/jasper/resources/LocalStrings_pt.properties} (95%)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/02: Improvements to Portuguese translations.
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 53a6da4b2e470324707b986888940981fef36de7 Author: Mark Thomas AuthorDate: Wed Jan 4 15:03:57 2023 + Improvements to Portuguese translations. Contributed by Guilherme Custódio. --- .../apache/catalina/manager/LocalStrings_pt.properties | 16 .../apache/jasper/resources/LocalStrings_pt.properties | 16 webapps/docs/changelog.xml | 8 3 files changed, 40 insertions(+) diff --git a/java/org/apache/catalina/manager/LocalStrings_pt.properties b/java/org/apache/catalina/manager/LocalStrings_pt.properties new file mode 100644 index 00..89a1a28ce3 --- /dev/null +++ b/java/org/apache/catalina/manager/LocalStrings_pt.properties @@ -0,0 +1,16 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +htmlManagerServlet.serverIPAddress=Endereço IP diff --git a/java/org/apache/jasper/resources/LocalStrings_pt.properties b/java/org/apache/jasper/resources/LocalStrings_pt.properties new file mode 100644 index 00..6cf3e8c138 --- /dev/null +++ b/java/org/apache/jasper/resources/LocalStrings_pt.properties @@ -0,0 +1,16 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +jsp.error.outputfolder=Sem pasta destino diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index d7d2d4ff22..4f6b9e9663 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -138,6 +138,14 @@ + + + +Improvements to Portuguese translations. Contributed by Guilherme +Custódio. (markt) + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/02: Improvements to Japanese translations. Contributed by Shirayuking.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 5040194f94f001a06ef1d94d690c471e485b32c2
Author: Mark Thomas
AuthorDate: Wed Jan 4 15:04:24 2023 +
Improvements to Japanese translations. Contributed by Shirayuking.
---
java/jakarta/servlet/http/LocalStrings_ja.properties | 2 +-
.../authenticator/LocalStrings_ja.properties | 4 ++--
.../authenticator/jaspic/LocalStrings_ja.properties | 2 +-
.../catalina/connector/LocalStrings_ja.properties| 6 +++---
.../apache/catalina/core/LocalStrings_ja.properties | 8
.../catalina/deploy/LocalStrings_ja.properties | 2 +-
.../catalina/filters/LocalStrings_ja.properties | 6 +++---
.../catalina/ha/deploy/LocalStrings_ja.properties| 4 ++--
.../catalina/ha/session/LocalStrings_ja.properties | 6 +++---
.../catalina/ha/tcp/LocalStrings_ja.properties | 10 +-
.../catalina/loader/LocalStrings_ja.properties | 4 ++--
.../catalina/manager/LocalStrings_ja.properties | 4 ++--
.../apache/catalina/realm/LocalStrings_ja.properties | 2 +-
.../catalina/servlets/LocalStrings_ja.properties | 4 ++--
.../catalina/session/LocalStrings_ja.properties | 2 +-
.../catalina/startup/LocalStrings_ja.properties | 20 ++--
.../group/interceptors/LocalStrings_ja.properties| 12 ++--
.../tribes/membership/LocalStrings_ja.properties | 2 +-
.../membership/cloud/LocalStrings_ja.properties | 2 +-
.../catalina/tribes/tipis/LocalStrings_ja.properties | 10 +-
.../tribes/transport/nio/LocalStrings_ja.properties | 4 ++--
.../catalina/tribes/util/LocalStrings_ja.properties | 2 +-
.../catalina/valves/LocalStrings_ja.properties | 14 +++---
.../catalina/webresources/LocalStrings_ja.properties | 10 +-
java/org/apache/coyote/LocalStrings_ja.properties| 2 +-
.../apache/coyote/http11/LocalStrings_ja.properties | 2 +-
.../apache/coyote/http2/LocalStrings_ja.properties | 18 +-
.../jasper/resources/LocalStrings_ja.properties | 6 +++---
.../tomcat/util/net/LocalStrings_ja.properties | 16
.../tomcat/util/net/jsse/LocalStrings_ja.properties | 2 +-
.../tomcat/util/scan/LocalStrings_ja.properties | 2 +-
.../tomcat/websocket/LocalStrings_ja.properties | 8
.../tomcat/websocket/pojo/LocalStrings_ja.properties | 2 +-
webapps/docs/changelog.xml | 4
34 files changed, 104 insertions(+), 100 deletions(-)
diff --git a/java/jakarta/servlet/http/LocalStrings_ja.properties
b/java/jakarta/servlet/http/LocalStrings_ja.properties
index aa775fb72c..03e93f5d44 100644
--- a/java/jakarta/servlet/http/LocalStrings_ja.properties
+++ b/java/jakarta/servlet/http/LocalStrings_ja.properties
@@ -25,7 +25,7 @@ err.state.commit=レスポンスがコミットされた後は許可されませ
http.method_delete_not_supported=HTTPのDELETEメソッドは、このURLではサポートされていません。
http.method_get_not_supported=HTTPのGETメソッドは、このURLではサポートされていません。
-http.method_not_implemented=メソッド [{0}] はRFC
2068には定義されておらず、サーブレットAPIではサポートされません。
+http.method_not_implemented=メソッド [{0}] はRFC 2068には定義されておらず、サーブレットAPIではサポートされません
http.method_post_not_supported=HTTPのPOSTメソッドは、このURLではサポートされていません。
http.method_put_not_supported=HTTPのPUTメソッドは、このURLではサポートされていません。
http.non_http=リクエストが HTTP リクエストではない、あるいはレスポンスが HTTP レスポンスではありません。
diff --git a/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
b/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
index 2201a85644..0943dd2af3 100644
--- a/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
@@ -62,11 +62,11 @@ singleSignOn.debug.sessionLogout=SSOはSSOセッション[{0}]とアプリケー
singleSignOn.debug.sessionTimeout=SSOはSSOセッション[{0}]とアプリケーションセッション[{1}]のタイムアウトを処理しています
singleSignOn.debug.update=SSOはSSOセッション [{0}] を認証タイプ [{1}] に更新します
singleSignOn.sessionExpire.contextNotFound=Context が見つからないため、SSO はセッション [{0}]
を破棄できません
-singleSignOn.sessionExpire.engineNull=Engine がNullだったため、SSOはセッション[{0}]を破棄できません。
+singleSignOn.sessionExpire.engineNull=Engine が Null だったため、SSO はセッション [{0}]
を破棄できません
singleSignOn.sessionExpire.hostNotFound=ホストが見つからないため SSO セッション [{0}] を破棄できません
singleSignOn.sessionExpire.managerError=セッションを検索するときにマネージャが例外をスローしたため、SSOはセッション
[{0}] を破棄できません
singleSignOn.sessionExpire.managerNotFound=マネージャが見つからなかったため、SSO はセッション [{0}]
を破棄できません
-singleSignOn.sessionExpire.sessionNotFound=セッションが見つからないため、SSOはセッション[{0}]を破棄できません。
+singleSignOn.sessionExpire.sessionNotFound=セッションが見つからないため、SSO はセッション [{0}]
を破棄できません
spnegoAuthenticator.authHeaderNoToken=クライアントから受信した Negoiate 認証ヘッダにはトークンがありません。
spnegoAuthenticator.authHeaderNotNego=クライアントから受信した認証ヘッダーは Negotiate から始まっていません。
diff --git
a/java/org/apache/catalina/authenticator/jaspic/LocalStrings_ja.properties
b/java/o
[tomcat] branch 10.1.x updated: Move to correct version
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/10.1.x by this push: new 6b29007f9f Move to correct version 6b29007f9f is described below commit 6b29007f9f87333ea723baeb9131400ae6f94542 Author: Mark Thomas AuthorDate: Wed Jan 4 15:05:44 2023 + Move to correct version --- webapps/docs/changelog.xml | 32 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index f213f81827..e7d0a871f3 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -140,6 +140,22 @@ + +Update the internal fork of Apache Commons BCEL to 2ee2bff (2023-01-03, +6.7.1-SNAPSHOT). (markt) + + +Update the internal fork of Apache Commons Codec to 3eafd6c (2023-01-03, +1.16-SNAPSHOT). (markt) + + +Update the internal fork of Apache Commons FileUpload to 34eb241 +(2023-01-03, 2.0-SNAPSHOT). (markt) + + +Update the internal fork of Apache Commons DBCP to f131286 (2023-01-03, +2.10.0-SNAPSHOT). (markt) + Improvements to Japanese translations. Contributed by Shirayuking. (markt) @@ -158,22 +174,6 @@ Update the packaged version of the Apache Tomcat Migration Tool for Jakarta EE to 1.0.6. (markt) - -Update the internal fork of Apache Commons BCEL to 2ee2bff (2023-01-03, -6.7.1-SNAPSHOT). (markt) - - -Update the internal fork of Apache Commons Codec to 3eafd6c (2023-01-03, -1.16-SNAPSHOT). (markt) - - -Update the internal fork of Apache Commons FileUpload to 34eb241 -(2023-01-03, 2.0-SNAPSHOT). (markt) - - -Update the internal fork of Apache Commons DBCP to f131286 (2023-01-03, -2.10.0-SNAPSHOT). (markt) - - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.1.x updated: Export only required in main branch
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new f44c096bdb Export only required in main branch
f44c096bdb is described below
commit f44c096bdbf67da6d12033aebde3664ef2d5d8e3
Author: Mark Thomas
AuthorDate: Wed Jan 4 15:07:51 2023 +
Export only required in main branch
---
.../apache/tomcat/buildutil/translate/Export.java | 56 --
1 file changed, 56 deletions(-)
diff --git a/java/org/apache/tomcat/buildutil/translate/Export.java
b/java/org/apache/tomcat/buildutil/translate/Export.java
deleted file mode 100644
index 9c137490e6..00
--- a/java/org/apache/tomcat/buildutil/translate/Export.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.tomcat.buildutil.translate;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-
-/**
- * Generates a single properties file per language for import into a
translation
- * tool.
- */
-public class Export {
-
-private static final Map translations = new HashMap<>();
-
-public static void main(String... args) throws IOException {
-File root = new File(".");
-for (String dir : Constants.SEARCH_DIRS) {
-File directory = new File(dir);
-Utils.processDirectory(root, directory, translations);
-}
-
-outputTranslations();
-}
-
-
-private static void outputTranslations() {
-
-File storageDir = new File(Constants.STORAGE_DIR);
-if (!storageDir.exists()) {
-storageDir.mkdirs();
-}
-
-for (Map.Entry translationEntry :
translations.entrySet()) {
- Utils.export(translationEntry.getKey(),
translationEntry.getValue(), storageDir);
-}
-}
-}
-
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated (ff9b09a4d1 -> 36388d3683)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
from ff9b09a4d1 Happy New Year 2023
new 38fff6da09 Improvements to Japanese translations. Contributed by
Shirayuking.
new 36388d3683 Improvements to Portuguese translations.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
java/javax/servlet/http/LocalStrings_ja.properties | 2 +-
.../authenticator/LocalStrings_ja.properties | 4 ++--
.../authenticator/jaspic/LocalStrings_ja.properties | 2 +-
.../catalina/connector/LocalStrings_ja.properties| 6 +++---
.../apache/catalina/core/LocalStrings_ja.properties | 8
.../catalina/deploy/LocalStrings_ja.properties | 2 +-
.../catalina/filters/LocalStrings_ja.properties | 6 +++---
.../catalina/ha/deploy/LocalStrings_ja.properties| 4 ++--
.../catalina/ha/session/LocalStrings_ja.properties | 6 +++---
.../catalina/ha/tcp/LocalStrings_ja.properties | 10 +-
.../catalina/loader/LocalStrings_ja.properties | 4 ++--
.../catalina/manager/LocalStrings_ja.properties | 4 ++--
.../LocalStrings_pt.properties} | 1 +
.../apache/catalina/realm/LocalStrings_ja.properties | 2 +-
.../catalina/servlets/LocalStrings_ja.properties | 4 ++--
.../catalina/session/LocalStrings_ja.properties | 2 +-
.../catalina/startup/LocalStrings_ja.properties | 20 ++--
.../group/interceptors/LocalStrings_ja.properties| 12 ++--
.../tribes/membership/LocalStrings_ja.properties | 2 +-
.../membership/cloud/LocalStrings_ja.properties | 2 +-
.../catalina/tribes/tipis/LocalStrings_ja.properties | 10 +-
.../tribes/transport/nio/LocalStrings_ja.properties | 4 ++--
.../catalina/tribes/util/LocalStrings_ja.properties | 2 +-
.../catalina/valves/LocalStrings_ja.properties | 14 +++---
.../catalina/webresources/LocalStrings_ja.properties | 10 +-
java/org/apache/coyote/LocalStrings_ja.properties| 2 +-
.../apache/coyote/http11/LocalStrings_ja.properties | 2 +-
.../apache/coyote/http2/LocalStrings_ja.properties | 18 +-
.../jasper/resources/LocalStrings_ja.properties | 6 +++---
.../resources/LocalStrings_pt.properties}| 1 +
.../tomcat/util/net/LocalStrings_ja.properties | 16
.../tomcat/util/net/jsse/LocalStrings_ja.properties | 2 +-
.../tomcat/util/scan/LocalStrings_ja.properties | 2 +-
.../tomcat/websocket/LocalStrings_ja.properties | 8
.../tomcat/websocket/pojo/LocalStrings_ja.properties | 2 +-
webapps/docs/changelog.xml | 8
36 files changed, 110 insertions(+), 100 deletions(-)
copy java/org/apache/catalina/{core/RestrictedListeners.properties =>
manager/LocalStrings_pt.properties} (94%)
copy java/org/apache/{catalina/core/RestrictedListeners.properties =>
jasper/resources/LocalStrings_pt.properties} (95%)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/02: Improvements to Portuguese translations.
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 36388d36838c928eeb7b5114069e7da544dcfab8 Author: Mark Thomas AuthorDate: Wed Jan 4 15:20:19 2023 + Improvements to Portuguese translations. Contributed by Guilherme Custódio. --- .../apache/catalina/manager/LocalStrings_pt.properties | 16 .../apache/jasper/resources/LocalStrings_pt.properties | 16 webapps/docs/changelog.xml | 4 3 files changed, 36 insertions(+) diff --git a/java/org/apache/catalina/manager/LocalStrings_pt.properties b/java/org/apache/catalina/manager/LocalStrings_pt.properties new file mode 100644 index 00..89a1a28ce3 --- /dev/null +++ b/java/org/apache/catalina/manager/LocalStrings_pt.properties @@ -0,0 +1,16 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +htmlManagerServlet.serverIPAddress=Endereço IP diff --git a/java/org/apache/jasper/resources/LocalStrings_pt.properties b/java/org/apache/jasper/resources/LocalStrings_pt.properties new file mode 100644 index 00..6cf3e8c138 --- /dev/null +++ b/java/org/apache/jasper/resources/LocalStrings_pt.properties @@ -0,0 +1,16 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +jsp.error.outputfolder=Sem pasta destino diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index d35ba0212a..882ad27eaf 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -160,6 +160,10 @@ Improvements to Japanese translations. Contributed by Shirayuking. (markt) + +Improvements to Portuguese translations. Contributed by Guilherme +Custódio. (markt) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/02: Improvements to Japanese translations. Contributed by Shirayuking.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 38fff6da09ef57117ff4bfbfab06d9a6e5743949
Author: Mark Thomas
AuthorDate: Wed Jan 4 15:19:45 2023 +
Improvements to Japanese translations. Contributed by Shirayuking.
---
java/javax/servlet/http/LocalStrings_ja.properties | 2 +-
.../authenticator/LocalStrings_ja.properties | 4 ++--
.../authenticator/jaspic/LocalStrings_ja.properties | 2 +-
.../catalina/connector/LocalStrings_ja.properties| 6 +++---
.../apache/catalina/core/LocalStrings_ja.properties | 8
.../catalina/deploy/LocalStrings_ja.properties | 2 +-
.../catalina/filters/LocalStrings_ja.properties | 6 +++---
.../catalina/ha/deploy/LocalStrings_ja.properties| 4 ++--
.../catalina/ha/session/LocalStrings_ja.properties | 6 +++---
.../catalina/ha/tcp/LocalStrings_ja.properties | 10 +-
.../catalina/loader/LocalStrings_ja.properties | 4 ++--
.../catalina/manager/LocalStrings_ja.properties | 4 ++--
.../apache/catalina/realm/LocalStrings_ja.properties | 2 +-
.../catalina/servlets/LocalStrings_ja.properties | 4 ++--
.../catalina/session/LocalStrings_ja.properties | 2 +-
.../catalina/startup/LocalStrings_ja.properties | 20 ++--
.../group/interceptors/LocalStrings_ja.properties| 12 ++--
.../tribes/membership/LocalStrings_ja.properties | 2 +-
.../membership/cloud/LocalStrings_ja.properties | 2 +-
.../catalina/tribes/tipis/LocalStrings_ja.properties | 10 +-
.../tribes/transport/nio/LocalStrings_ja.properties | 4 ++--
.../catalina/tribes/util/LocalStrings_ja.properties | 2 +-
.../catalina/valves/LocalStrings_ja.properties | 14 +++---
.../catalina/webresources/LocalStrings_ja.properties | 10 +-
java/org/apache/coyote/LocalStrings_ja.properties| 2 +-
.../apache/coyote/http11/LocalStrings_ja.properties | 2 +-
.../apache/coyote/http2/LocalStrings_ja.properties | 18 +-
.../jasper/resources/LocalStrings_ja.properties | 6 +++---
.../tomcat/util/net/LocalStrings_ja.properties | 16
.../tomcat/util/net/jsse/LocalStrings_ja.properties | 2 +-
.../tomcat/util/scan/LocalStrings_ja.properties | 2 +-
.../tomcat/websocket/LocalStrings_ja.properties | 8
.../tomcat/websocket/pojo/LocalStrings_ja.properties | 2 +-
webapps/docs/changelog.xml | 4
34 files changed, 104 insertions(+), 100 deletions(-)
diff --git a/java/javax/servlet/http/LocalStrings_ja.properties
b/java/javax/servlet/http/LocalStrings_ja.properties
index 3fb602322f..ae99c6906d 100644
--- a/java/javax/servlet/http/LocalStrings_ja.properties
+++ b/java/javax/servlet/http/LocalStrings_ja.properties
@@ -22,7 +22,7 @@ err.state.commit=レスポンスがコミットされた後は許可されませ
http.method_delete_not_supported=HTTPのDELETEメソッドは、このURLではサポートされていません。
http.method_get_not_supported=HTTPのGETメソッドは、このURLではサポートされていません。
-http.method_not_implemented=メソッド [{0}] はRFC
2068には定義されておらず、サーブレットAPIではサポートされません。
+http.method_not_implemented=メソッド [{0}] はRFC 2068には定義されておらず、サーブレットAPIではサポートされません
http.method_post_not_supported=HTTPのPOSTメソッドは、このURLではサポートされていません。
http.method_put_not_supported=HTTPのPUTメソッドは、このURLではサポートされていません。
http.non_http=リクエストが HTTP リクエストではない、あるいはレスポンスが HTTP レスポンスではありません。
diff --git a/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
b/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
index 2201a85644..0943dd2af3 100644
--- a/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
@@ -62,11 +62,11 @@ singleSignOn.debug.sessionLogout=SSOはSSOセッション[{0}]とアプリケー
singleSignOn.debug.sessionTimeout=SSOはSSOセッション[{0}]とアプリケーションセッション[{1}]のタイムアウトを処理しています
singleSignOn.debug.update=SSOはSSOセッション [{0}] を認証タイプ [{1}] に更新します
singleSignOn.sessionExpire.contextNotFound=Context が見つからないため、SSO はセッション [{0}]
を破棄できません
-singleSignOn.sessionExpire.engineNull=Engine がNullだったため、SSOはセッション[{0}]を破棄できません。
+singleSignOn.sessionExpire.engineNull=Engine が Null だったため、SSO はセッション [{0}]
を破棄できません
singleSignOn.sessionExpire.hostNotFound=ホストが見つからないため SSO セッション [{0}] を破棄できません
singleSignOn.sessionExpire.managerError=セッションを検索するときにマネージャが例外をスローしたため、SSOはセッション
[{0}] を破棄できません
singleSignOn.sessionExpire.managerNotFound=マネージャが見つからなかったため、SSO はセッション [{0}]
を破棄できません
-singleSignOn.sessionExpire.sessionNotFound=セッションが見つからないため、SSOはセッション[{0}]を破棄できません。
+singleSignOn.sessionExpire.sessionNotFound=セッションが見つからないため、SSO はセッション [{0}]
を破棄できません
spnegoAuthenticator.authHeaderNoToken=クライアントから受信した Negoiate 認証ヘッダにはトークンがありません。
spnegoAuthenticator.authHeaderNotNego=クライアントから受信した認証ヘッダーは Negotiate から始まっていません。
diff --git
a/java/org/apache/catalina/authenticator/jaspic/LocalStrings_ja.properties
b/java/org/apache
[tomcat] branch 10.1.x updated: Exclude keys that are different between 10.1.x and 9.0.x
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 255f083e9b Exclude keys that are different between 10.1.x and 9.0.x
255f083e9b is described below
commit 255f083e9b79ea493718b5725753bebda79cedaf
Author: Mark Thomas
AuthorDate: Wed Jan 4 15:22:21 2023 +
Exclude keys that are different between 10.1.x and 9.0.x
---
java/org/apache/tomcat/buildutil/translate/BackportEnglish.java | 8
1 file changed, 8 insertions(+)
diff --git a/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java
b/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java
index ec88b909da..d93885e203 100644
--- a/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java
+++ b/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java
@@ -38,6 +38,14 @@ public class BackportEnglish extends BackportBase {
keysToExclude.add("java.org.apache.jasper.resources.zzz.jspc.webfrg.header");
keysToExclude.add("java.org.apache.jasper.resources.zzz.jspc.webxml.header");
+// Exclude keys known to be different between 10.1.x and 9.0.x
+keysToExclude.add("java.javax.el.zzz.importHandler.invalidClass");
+keysToExclude.add("java.javax.el.zzz.staticFieldELResolver.notFound");
+
keysToExclude.add("java.org.apache.catalina.connector.zzz.coyoteConnector.notAsciiSuperset");
+
keysToExclude.add("java.org.apache.catalina.loader.zzz.webappClassLoader.addExportsJavaIo");
+
keysToExclude.add("java.org.apache.catalina.loader.zzz.webappClassLoader.addExportsRmi");
+
keysToExclude.add("java.org.apache.catalina.loader.zzz.webappClassLoader.addExportsThreadLocal");
+
BackportEnglish backport = new BackportEnglish(args);
backport.execute();
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated (32e98d6224 -> e78a8f1fce)
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 32e98d6224 Happy New Year 2023
new b8c515e580 Improvements to Japanese translations. Contributed by
Shirayuking.
new e78a8f1fce Improvements to Portuguese translations.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
java/javax/servlet/http/LocalStrings_ja.properties | 2 +-
.../authenticator/LocalStrings_ja.properties | 4 ++--
.../authenticator/jaspic/LocalStrings_ja.properties | 2 +-
.../catalina/connector/LocalStrings_ja.properties| 6 +++---
.../apache/catalina/core/LocalStrings_ja.properties | 8
.../catalina/deploy/LocalStrings_ja.properties | 2 +-
.../catalina/filters/LocalStrings_ja.properties | 6 +++---
.../catalina/ha/deploy/LocalStrings_ja.properties| 4 ++--
.../catalina/ha/session/LocalStrings_ja.properties | 6 +++---
.../catalina/ha/tcp/LocalStrings_ja.properties | 10 +-
.../catalina/loader/LocalStrings_ja.properties | 4 ++--
.../catalina/manager/LocalStrings_ja.properties | 4 ++--
.../LocalStrings_pt.properties} | 2 +-
.../apache/catalina/realm/LocalStrings_ja.properties | 2 +-
.../catalina/servlets/LocalStrings_ja.properties | 4 ++--
.../catalina/session/LocalStrings_ja.properties | 2 +-
.../catalina/startup/LocalStrings_ja.properties | 20 ++--
.../group/interceptors/LocalStrings_ja.properties| 12 ++--
.../tribes/membership/LocalStrings_ja.properties | 2 +-
.../catalina/tribes/tipis/LocalStrings_ja.properties | 10 +-
.../tribes/transport/nio/LocalStrings_ja.properties | 4 ++--
.../catalina/tribes/util/LocalStrings_ja.properties | 2 +-
.../catalina/valves/LocalStrings_ja.properties | 14 +++---
.../catalina/webresources/LocalStrings_ja.properties | 10 +-
.../apache/coyote/http11/LocalStrings_ja.properties | 2 +-
.../apache/coyote/http2/LocalStrings_ja.properties | 16
.../jasper/resources/LocalStrings_ja.properties | 6 +++---
.../jasper/resources/LocalStrings_pt.properties | 2 +-
.../tomcat/util/net/LocalStrings_ja.properties | 16
.../tomcat/util/net/jsse/LocalStrings_ja.properties | 2 +-
.../tomcat/util/scan/LocalStrings_ja.properties | 2 +-
.../tomcat/websocket/LocalStrings_ja.properties | 8
.../tomcat/websocket/pojo/LocalStrings_ja.properties | 2 +-
webapps/docs/changelog.xml | 8
34 files changed, 107 insertions(+), 99 deletions(-)
copy java/org/apache/catalina/{core/RestrictedFilters.properties =>
manager/LocalStrings_pt.properties} (94%)
copy
res/META-INF/tomcat-websocket.jar/services/javax.servlet.ServletContainerInitializer
=> java/org/apache/jasper/resources/LocalStrings_pt.properties (95%)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/02: Improvements to Portuguese translations.
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit e78a8f1fcea15040b2faee43ed45a1d432fbe781 Author: Mark Thomas AuthorDate: Wed Jan 4 15:26:39 2023 + Improvements to Portuguese translations. Contributed by Guilherme Custódio. --- .../apache/catalina/manager/LocalStrings_pt.properties | 16 .../apache/jasper/resources/LocalStrings_pt.properties | 16 webapps/docs/changelog.xml | 4 3 files changed, 36 insertions(+) diff --git a/java/org/apache/catalina/manager/LocalStrings_pt.properties b/java/org/apache/catalina/manager/LocalStrings_pt.properties new file mode 100644 index 00..89a1a28ce3 --- /dev/null +++ b/java/org/apache/catalina/manager/LocalStrings_pt.properties @@ -0,0 +1,16 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +htmlManagerServlet.serverIPAddress=Endereço IP diff --git a/java/org/apache/jasper/resources/LocalStrings_pt.properties b/java/org/apache/jasper/resources/LocalStrings_pt.properties new file mode 100644 index 00..6cf3e8c138 --- /dev/null +++ b/java/org/apache/jasper/resources/LocalStrings_pt.properties @@ -0,0 +1,16 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +jsp.error.outputfolder=Sem pasta destino diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 0c568f49cf..f755cdaaf4 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -192,6 +192,10 @@ Improvements to Japanese translations. Contributed by Shirayuking. (markt) + +Improvements to Portuguese translations. Contributed by Guilherme +Custódio. (markt) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/02: Improvements to Japanese translations. Contributed by Shirayuking.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit b8c515e580097f76928da56ea0b4eb5c0a57abc4
Author: Mark Thomas
AuthorDate: Wed Jan 4 15:26:06 2023 +
Improvements to Japanese translations. Contributed by Shirayuking.
---
java/javax/servlet/http/LocalStrings_ja.properties | 2 +-
.../authenticator/LocalStrings_ja.properties | 4 ++--
.../authenticator/jaspic/LocalStrings_ja.properties | 2 +-
.../catalina/connector/LocalStrings_ja.properties| 6 +++---
.../apache/catalina/core/LocalStrings_ja.properties | 8
.../catalina/deploy/LocalStrings_ja.properties | 2 +-
.../catalina/filters/LocalStrings_ja.properties | 6 +++---
.../catalina/ha/deploy/LocalStrings_ja.properties| 4 ++--
.../catalina/ha/session/LocalStrings_ja.properties | 6 +++---
.../catalina/ha/tcp/LocalStrings_ja.properties | 10 +-
.../catalina/loader/LocalStrings_ja.properties | 4 ++--
.../catalina/manager/LocalStrings_ja.properties | 4 ++--
.../apache/catalina/realm/LocalStrings_ja.properties | 2 +-
.../catalina/servlets/LocalStrings_ja.properties | 4 ++--
.../catalina/session/LocalStrings_ja.properties | 2 +-
.../catalina/startup/LocalStrings_ja.properties | 20 ++--
.../group/interceptors/LocalStrings_ja.properties| 12 ++--
.../tribes/membership/LocalStrings_ja.properties | 2 +-
.../catalina/tribes/tipis/LocalStrings_ja.properties | 10 +-
.../tribes/transport/nio/LocalStrings_ja.properties | 4 ++--
.../catalina/tribes/util/LocalStrings_ja.properties | 2 +-
.../catalina/valves/LocalStrings_ja.properties | 14 +++---
.../catalina/webresources/LocalStrings_ja.properties | 10 +-
.../apache/coyote/http11/LocalStrings_ja.properties | 2 +-
.../apache/coyote/http2/LocalStrings_ja.properties | 16
.../jasper/resources/LocalStrings_ja.properties | 6 +++---
.../tomcat/util/net/LocalStrings_ja.properties | 16
.../tomcat/util/net/jsse/LocalStrings_ja.properties | 2 +-
.../tomcat/util/scan/LocalStrings_ja.properties | 2 +-
.../tomcat/websocket/LocalStrings_ja.properties | 8
.../tomcat/websocket/pojo/LocalStrings_ja.properties | 2 +-
webapps/docs/changelog.xml | 4
32 files changed, 101 insertions(+), 97 deletions(-)
diff --git a/java/javax/servlet/http/LocalStrings_ja.properties
b/java/javax/servlet/http/LocalStrings_ja.properties
index 3fb602322f..ae99c6906d 100644
--- a/java/javax/servlet/http/LocalStrings_ja.properties
+++ b/java/javax/servlet/http/LocalStrings_ja.properties
@@ -22,7 +22,7 @@ err.state.commit=レスポンスがコミットされた後は許可されませ
http.method_delete_not_supported=HTTPのDELETEメソッドは、このURLではサポートされていません。
http.method_get_not_supported=HTTPのGETメソッドは、このURLではサポートされていません。
-http.method_not_implemented=メソッド [{0}] はRFC
2068には定義されておらず、サーブレットAPIではサポートされません。
+http.method_not_implemented=メソッド [{0}] はRFC 2068には定義されておらず、サーブレットAPIではサポートされません
http.method_post_not_supported=HTTPのPOSTメソッドは、このURLではサポートされていません。
http.method_put_not_supported=HTTPのPUTメソッドは、このURLではサポートされていません。
http.non_http=リクエストが HTTP リクエストではない、あるいはレスポンスが HTTP レスポンスではありません。
diff --git a/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
b/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
index 2201a85644..0943dd2af3 100644
--- a/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
@@ -62,11 +62,11 @@ singleSignOn.debug.sessionLogout=SSOはSSOセッション[{0}]とアプリケー
singleSignOn.debug.sessionTimeout=SSOはSSOセッション[{0}]とアプリケーションセッション[{1}]のタイムアウトを処理しています
singleSignOn.debug.update=SSOはSSOセッション [{0}] を認証タイプ [{1}] に更新します
singleSignOn.sessionExpire.contextNotFound=Context が見つからないため、SSO はセッション [{0}]
を破棄できません
-singleSignOn.sessionExpire.engineNull=Engine がNullだったため、SSOはセッション[{0}]を破棄できません。
+singleSignOn.sessionExpire.engineNull=Engine が Null だったため、SSO はセッション [{0}]
を破棄できません
singleSignOn.sessionExpire.hostNotFound=ホストが見つからないため SSO セッション [{0}] を破棄できません
singleSignOn.sessionExpire.managerError=セッションを検索するときにマネージャが例外をスローしたため、SSOはセッション
[{0}] を破棄できません
singleSignOn.sessionExpire.managerNotFound=マネージャが見つからなかったため、SSO はセッション [{0}]
を破棄できません
-singleSignOn.sessionExpire.sessionNotFound=セッションが見つからないため、SSOはセッション[{0}]を破棄できません。
+singleSignOn.sessionExpire.sessionNotFound=セッションが見つからないため、SSO はセッション [{0}]
を破棄できません
spnegoAuthenticator.authHeaderNoToken=クライアントから受信した Negoiate 認証ヘッダにはトークンがありません。
spnegoAuthenticator.authHeaderNotNego=クライアントから受信した認証ヘッダーは Negotiate から始まっていません。
diff --git
a/java/org/apache/catalina/authenticator/jaspic/LocalStrings_ja.properties
b/java/org/apache/catalina/authenticator/jaspic/LocalStrings_ja.properties
index eb946b85df..76b9155735 100644
--- a/java/org/apache/catalina/au
[tomcat] branch 9.0.x updated: Exclude a further key that is different between 9.0.x and 8.5.x
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 0d92ae1e13 Exclude a further key that is different between 9.0.x and
8.5.x
0d92ae1e13 is described below
commit 0d92ae1e13bc4be850fa1a8e3158561273c942fd
Author: Mark Thomas
AuthorDate: Wed Jan 4 15:28:30 2023 +
Exclude a further key that is different between 9.0.x and 8.5.x
---
java/org/apache/tomcat/buildutil/translate/BackportEnglish.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java
b/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java
index d013badc75..8fd8b61a3e 100644
--- a/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java
+++ b/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java
@@ -42,6 +42,7 @@ public class BackportEnglish extends BackportBase {
keysToExclude.add("java.org.apache.catalina.manager.zzz.htmlManagerServlet.deployPath");
keysToExclude.add("java.org.apache.catalina.startup.zzz.catalina.stopServer.connectException");
keysToExclude.add("java.org.apache.jasper.resources.zzz.jspc.usage");
+
keysToExclude.add("java.org.apache.tomcat.dbcp.dbcp2.zzz.connectionFactory.lifetimeExceeded");
BackportEnglish backport = new BackportEnglish(args);
backport.execute();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated: Fix NPE warnings
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new eb9a3edbce Fix NPE warnings
eb9a3edbce is described below
commit eb9a3edbce9e7f15026c32d97bf5602e1273532e
Author: Mark Thomas
AuthorDate: Wed Jan 4 15:37:59 2023 +
Fix NPE warnings
desc cannot be null here (based on review of calling methods)
---
java/org/apache/catalina/storeconfig/ConnectorStoreAppender.java | 8
java/org/apache/catalina/storeconfig/StoreAppender.java | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/java/org/apache/catalina/storeconfig/ConnectorStoreAppender.java
b/java/org/apache/catalina/storeconfig/ConnectorStoreAppender.java
index 6de623bf6c..825fde4987 100644
--- a/java/org/apache/catalina/storeconfig/ConnectorStoreAppender.java
+++ b/java/org/apache/catalina/storeconfig/ConnectorStoreAppender.java
@@ -63,7 +63,7 @@ public class ConnectorStoreAppender extends StoreAppender {
throws Exception {
// Render a className attribute if requested
-if (include && desc != null && !desc.isStandard()) {
+if (include && !desc.isStandard()) {
writer.print(" className=\"");
writer.print(bean.getClass().getName());
writer.print("\"");
@@ -105,11 +105,11 @@ public class ConnectorStoreAppender extends StoreAppender
{
*
* @param bean The connector
* @return List of Connector property names
- * @throws IntrospectionException Error intropecting connector
+ * @throws IntrospectionException Error introspecting connector
*/
protected List getPropertyKeys(Connector bean)
throws IntrospectionException {
-ArrayList propertyKeys = new ArrayList<>();
+List propertyKeys = new ArrayList<>();
// Acquire the list of properties for this bean
ProtocolHandler protocolHandler = bean.getProtocolHandler();
// Acquire the list of properties for this bean
@@ -300,4 +300,4 @@ public class ConnectorStoreAppender extends StoreAppender {
return jkHomeBase;
}
-}
\ No newline at end of file
+}
diff --git a/java/org/apache/catalina/storeconfig/StoreAppender.java
b/java/org/apache/catalina/storeconfig/StoreAppender.java
index 175cfb1f96..bdb6b23e86 100644
--- a/java/org/apache/catalina/storeconfig/StoreAppender.java
+++ b/java/org/apache/catalina/storeconfig/StoreAppender.java
@@ -216,7 +216,7 @@ public class StoreAppender {
throws Exception {
// Render a className attribute if requested
-if (include && desc != null && !desc.isStandard()) {
+if (include && !desc.isStandard()) {
writer.print(" className=\"");
writer.print(bean.getClass().getName());
writer.print("\"");
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated: Align with 9.0.x
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 6adfd66c77 Align with 9.0.x
6adfd66c77 is described below
commit 6adfd66c77e338674044e4580dd63a2f3499d908
Author: Mark Thomas
AuthorDate: Wed Jan 4 15:38:16 2023 +
Align with 9.0.x
---
java/org/apache/catalina/servlets/DefaultServlet.java | 2 +-
java/org/apache/catalina/session/JDBCStore.java | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/servlets/DefaultServlet.java
b/java/org/apache/catalina/servlets/DefaultServlet.java
index 6490c00833..498bac896e 100644
--- a/java/org/apache/catalina/servlets/DefaultServlet.java
+++ b/java/org/apache/catalina/servlets/DefaultServlet.java
@@ -253,7 +253,7 @@ public class DefaultServlet extends HttpServlet {
/**
* If a file has a BOM, should that be used in preference to fileEncoding?
- * Will default to {@code BomConfig.TRUE} in {@link #init()}.
+ * Will default to {@link BomConfig#TRUE} in {@link #init()}.
*/
private BomConfig useBomIfPresent = null;
diff --git a/java/org/apache/catalina/session/JDBCStore.java
b/java/org/apache/catalina/session/JDBCStore.java
index 1e5f615fa7..e0779095c5 100644
--- a/java/org/apache/catalina/session/JDBCStore.java
+++ b/java/org/apache/catalina/session/JDBCStore.java
@@ -30,6 +30,7 @@ import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.ArrayList;
+import java.util.List;
import java.util.Properties;
import javax.naming.Context;
@@ -526,7 +527,7 @@ public class JDBCStore extends StoreBase {
preparedKeysSql.setLong(2,
System.currentTimeMillis());
}
try (ResultSet rst = preparedKeysSql.executeQuery()) {
-ArrayList tmpkeys = new ArrayList<>();
+List tmpkeys = new ArrayList<>();
if (rst != null) {
while (rst.next()) {
tmpkeys.add(rst.getString(1));
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Update servlet spec version
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 8761e48e23 Update servlet spec version
8761e48e23 is described below
commit 8761e48e23855462a3cddcc5ecc16aa6c34d0f5a
Author: Mark Thomas
AuthorDate: Wed Jan 4 15:56:12 2023 +
Update servlet spec version
---
java/org/apache/catalina/connector/CoyoteAdapter.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/connector/CoyoteAdapter.java
b/java/org/apache/catalina/connector/CoyoteAdapter.java
index 2d421430fd..0fd2a482ff 100644
--- a/java/org/apache/catalina/connector/CoyoteAdapter.java
+++ b/java/org/apache/catalina/connector/CoyoteAdapter.java
@@ -68,7 +68,7 @@ public class CoyoteAdapter implements Adapter {
// -- Constants
-private static final String POWERED_BY = "Servlet/6.0 JSP/4.0 " +
+private static final String POWERED_BY = "Servlet/6.1 JSP/4.0 " +
"(" + ServerInfo.getServerInfo() + " Java/" +
System.getProperty("java.vm.vendor") + "/" +
System.getProperty("java.runtime.version") + ")";
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] markt-asf commented on pull request #572: 66370-Fix for Boolean System property lookup with Security Manager enabled
markt-asf commented on PR #572: URL: https://github.com/apache/tomcat/pull/572#issuecomment-1371172938 The PR will not be applied. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] markt-asf closed pull request #572: 66370-Fix for Boolean System property lookup with Security Manager enabled
markt-asf closed pull request #572: 66370-Fix for Boolean System property lookup with Security Manager enabled URL: https://github.com/apache/tomcat/pull/572 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
