[tomcat] 02/02: Remove unnecessary delimiters

2019-08-15 Thread markt
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 7c6398962fdff0d5a41d46bed238d9bb3f01bb8b
Author: Mark Thomas 
AuthorDate: Thu Aug 15 22:56:42 2019 +0100

Remove unnecessary delimiters
---
 java/org/apache/catalina/valves/LocalStrings_ja.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/valves/LocalStrings_ja.properties 
b/java/org/apache/catalina/valves/LocalStrings_ja.properties
index 99b184d..77b1b79 100644
--- a/java/org/apache/catalina/valves/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/valves/LocalStrings_ja.properties
@@ -125,7 +125,7 @@ http.511.reason=Network Authentication Required
 jdbcAccessLogValve.close=データベースのクローズに失敗しました。
 jdbcAccessLogValve.exception=アクセスエントリの挿入を実行中の例外です
 
-remoteCidrValve.invalid="[{0}]" に不正な値が指定されました。詳細は前のメッセージを参照してください。
+remoteCidrValve.invalid=[{0}] に不正な値が指定されました。詳細は前のメッセージを参照してください。
 remoteCidrValve.noRemoteIp=クライアントの IP アドレスを取得できません。リクエストを拒否します。
 
 remoteIpValve.invalidPortHeader=HTTP ヘッダー [{1}] に不正なポート番号 [{0}] が指定されました。


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat] 01/02: Remove use of single quote to replace values

2019-08-15 Thread markt
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 ecc0790c5e229a63c5e79d6d96ef86cd48b0fee7
Author: Mark Thomas 
AuthorDate: Thu Aug 15 22:41:12 2019 +0100

Remove use of single quote to replace values
---
 java/javax/el/LocalStrings_de.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/javax/el/LocalStrings_de.properties 
b/java/javax/el/LocalStrings_de.properties
index 0147116..402e9b5 100644
--- a/java/javax/el/LocalStrings_de.properties
+++ b/java/javax/el/LocalStrings_de.properties
@@ -16,7 +16,7 @@
 elProcessor.defineFunctionInvalidClass=Die Klasse [{0}] ist nicht öffentlich
 elProcessor.defineFunctionInvalidMethod=Die Methode [{0}] der Klasse [{1}] ist 
nicht public static
 
-expressionFactory.cannotFind=Kann die ExpressionFactory mit dem Typ ''[{0}]'' 
nicht finden
+expressionFactory.cannotFind=Kann die ExpressionFactory mit dem Typ [{0}] 
nicht finden
 
 importHandler.classNotFound=Die Klasse [{0}] konnte nicht importiert werden, 
da sie nicht gefunden werden konnte
 importHandler.invalidClassNameForStatic=Ungültige Klasse [{0}] für angegebenen 
static import [{1}]


-
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 (f4536ca -> 7c63989)

2019-08-15 Thread markt
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 f4536ca  Fix typo for prefect
 new ecc0790  Remove use of single quote to replace values
 new 7c63989  Remove unnecessary delimiters

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/el/LocalStrings_de.properties   | 2 +-
 java/org/apache/catalina/valves/LocalStrings_ja.properties | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat] 02/02: Remove unnecessary delimiters

2019-08-15 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit e25e690eccd9270a130f1f1f38f2f0f8fe1d4355
Author: Mark Thomas 
AuthorDate: Thu Aug 15 22:56:19 2019 +0100

Remove unnecessary delimiters
---
 java/org/apache/catalina/valves/LocalStrings_ja.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/valves/LocalStrings_ja.properties 
b/java/org/apache/catalina/valves/LocalStrings_ja.properties
index c6dbcb9..dee349d 100644
--- a/java/org/apache/catalina/valves/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/valves/LocalStrings_ja.properties
@@ -127,7 +127,7 @@ http.511.reason=Network Authentication Required
 jdbcAccessLogValve.close=データベースのクローズに失敗しました。
 jdbcAccessLogValve.exception=アクセスエントリの挿入を実行中の例外です
 
-remoteCidrValve.invalid="[{0}]" に不正な値が指定されました。詳細は前のメッセージを参照してください。
+remoteCidrValve.invalid=[{0}] に不正な値が指定されました。詳細は前のメッセージを参照してください。
 remoteCidrValve.noRemoteIp=クライアントの IP アドレスを取得できません。リクエストを拒否します。
 
 remoteIpValve.invalidPortHeader=HTTP ヘッダー [{1}] に不正なポート番号 [{0}] が指定されました。


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat] 01/02: Remove use of single quote to delimit replaced values

2019-08-15 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit a91d27e2df69bee3511853e96c10ad23828fa2f1
Author: Mark Thomas 
AuthorDate: Thu Aug 15 22:40:52 2019 +0100

Remove use of single quote to delimit replaced values
---
 java/javax/el/LocalStrings_de.properties| 2 +-
 java/org/apache/jasper/resources/LocalStrings_de.properties | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/java/javax/el/LocalStrings_de.properties 
b/java/javax/el/LocalStrings_de.properties
index 0147116..402e9b5 100644
--- a/java/javax/el/LocalStrings_de.properties
+++ b/java/javax/el/LocalStrings_de.properties
@@ -16,7 +16,7 @@
 elProcessor.defineFunctionInvalidClass=Die Klasse [{0}] ist nicht öffentlich
 elProcessor.defineFunctionInvalidMethod=Die Methode [{0}] der Klasse [{1}] ist 
nicht public static
 
-expressionFactory.cannotFind=Kann die ExpressionFactory mit dem Typ ''[{0}]'' 
nicht finden
+expressionFactory.cannotFind=Kann die ExpressionFactory mit dem Typ [{0}] 
nicht finden
 
 importHandler.classNotFound=Die Klasse [{0}] konnte nicht importiert werden, 
da sie nicht gefunden werden konnte
 importHandler.invalidClassNameForStatic=Ungültige Klasse [{0}] für angegebenen 
static import [{1}]
diff --git a/java/org/apache/jasper/resources/LocalStrings_de.properties 
b/java/org/apache/jasper/resources/LocalStrings_de.properties
index 33aca1c..b005318 100644
--- a/java/org/apache/jasper/resources/LocalStrings_de.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_de.properties
@@ -15,7 +15,7 @@
 
 jasper.error.emptybodycontent.nonempty=Nach der TLD muss [{0}] leer sein, ist 
es aber nicht
 
-jsp.error.URLMustStartWithSlash=Der Pfad ''[{0}]'' muss mit ''/'' beginnen
+jsp.error.URLMustStartWithSlash=Der Pfad [{0}] muss mit ''/'' beginnen
 jsp.error.action.isnottagfile=[{0}] Action kann nur in Tag-Dateien benutzt 
werden
 jsp.error.attribute.deferredmix=Kann nicht ${} und #{} gleichzeitig als EL 
Ausdrücke in demselben Attribut Wert verwenden
 jsp.error.attribute.duplicate=Qualifizierte Attributnamen müssen innerhalb 
eines Elements eindeutig sein


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat] branch master updated (a3fa39d -> e25e690)

2019-08-15 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git.


from a3fa39d  Merge pull request #190 from KangZhiDong/master
 new a91d27e  Remove use of single quote to delimit replaced values
 new e25e690  Remove unnecessary delimiters

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/el/LocalStrings_de.properties| 2 +-
 java/org/apache/catalina/valves/LocalStrings_ja.properties  | 2 +-
 java/org/apache/jasper/resources/LocalStrings_de.properties | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat] branch 7.0.x updated: Fix comment typo

2019-08-15 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/7.0.x by this push:
 new bf4b911  Fix comment typo
bf4b911 is described below

commit bf4b9118f601d1db4aed2f4ea26be0da3a0d9cdd
Author: Mark Thomas 
AuthorDate: Thu Aug 15 21:35:28 2019 +0100

Fix comment typo
---
 java/org/apache/coyote/http11/AbstractHttp11Processor.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/coyote/http11/AbstractHttp11Processor.java 
b/java/org/apache/coyote/http11/AbstractHttp11Processor.java
index 1bd0adb..bc149d3 100644
--- a/java/org/apache/coyote/http11/AbstractHttp11Processor.java
+++ b/java/org/apache/coyote/http11/AbstractHttp11Processor.java
@@ -751,7 +751,7 @@ public abstract class AbstractHttp11Processor extends 
AbstractProcessor {
 // Create and add buffered input filter
 getInputBuffer().addFilter(new BufferedInputFilter());
 
-// Create and add the chunked filters.
+// Create and add the gzip filters.
 //getInputBuffer().addFilter(new GzipInputFilter());
 getOutputBuffer().addFilter(new GzipOutputFilter());
 


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



buildbot success in on tomcat-trunk

2019-08-15 Thread buildbot
The Buildbot has detected a restored build on builder tomcat-trunk while 
building tomcat. Full details are available at:
https://ci.apache.org/builders/tomcat-trunk/builds/4558

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: asf946_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' 
triggered this build
Build Source Stamp: [branch master] 42971a30719a557c6c82624b7b55226b393f4bd9
Blamelist: Mark Thomas 

Build succeeded!

Sincerely,
 -The Buildbot




-
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 typo for prefect

2019-08-15 Thread markt
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 f4536ca  Fix typo for prefect
f4536ca is described below

commit f4536cab9204181c5c6dad311ac505d9bf536e28
Author: 康智冬 
AuthorDate: Wed Aug 14 22:02:53 2019 +0800

Fix typo for prefect

Fix typo for prefect
---
 java/org/apache/coyote/http11/Http11Processor.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/coyote/http11/Http11Processor.java 
b/java/org/apache/coyote/http11/Http11Processor.java
index a5cedaf..6072602 100644
--- a/java/org/apache/coyote/http11/Http11Processor.java
+++ b/java/org/apache/coyote/http11/Http11Processor.java
@@ -254,7 +254,7 @@ public class Http11Processor extends AbstractProcessor {
 // Create and add buffered input filter
 inputBuffer.addFilter(new BufferedInputFilter());
 
-// Create and add the chunked filters.
+// Create and add the gzip filters.
 //inputBuffer.addFilter(new GzipInputFilter());
 outputBuffer.addFilter(new GzipOutputFilter());
 


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[GitHub] [tomcat] markt-asf merged pull request #190: Fix typo for prefect

2019-08-15 Thread GitBox
markt-asf merged pull request #190: Fix typo for prefect
URL: https://github.com/apache/tomcat/pull/190
 
 
   


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.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat] branch master updated: Fix typo for prefect

2019-08-15 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/master by this push:
 new d66610f  Fix typo for prefect
 new a3fa39d  Merge pull request #190 from KangZhiDong/master
d66610f is described below

commit d66610fb32f68b01fcd14af38b3604dbe8668132
Author: 康智冬 
AuthorDate: Wed Aug 14 22:02:53 2019 +0800

Fix typo for prefect

Fix typo for prefect
---
 java/org/apache/coyote/http11/Http11Processor.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/coyote/http11/Http11Processor.java 
b/java/org/apache/coyote/http11/Http11Processor.java
index 1ba4625..a176206 100644
--- a/java/org/apache/coyote/http11/Http11Processor.java
+++ b/java/org/apache/coyote/http11/Http11Processor.java
@@ -176,7 +176,7 @@ public class Http11Processor extends AbstractProcessor {
 // Create and add buffered input filter
 inputBuffer.addFilter(new BufferedInputFilter());
 
-// Create and add the chunked filters.
+// Create and add the gzip filters.
 //inputBuffer.addFilter(new GzipInputFilter());
 outputBuffer.addFilter(new GzipOutputFilter());
 


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Re: [VOTE] Release Apache Tomcat 8.5.45

2019-08-15 Thread Mark Thomas
On 14/08/2019 23:48, Mark Thomas wrote:
> The proposed Apache Tomcat 8.5.45 release is now available for voting.
> 
> The major changes compared to the 8.5.43 release are:
> 
> - Expand the HTTP/2 excessive overhead protection to cover various forms
>   of abusive client behaviour and close the connection if any such
>   behaviour is detected.
> 
> - Security improvements to the Windows installer including a change in
>   the default user from Local System to Local Service.
> 
> - Improve handling of invalid requests so that 400 responses are
>   returned to the client rather than 500 responses.
> 
> Along with lots of other bug fixes and improvements.
> 
> For full details, see the changelog:
> https://ci.apache.org/projects/tomcat/tomcat85/docs/changelog.html
> 
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.5.45/
> 
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1228/
> 
> The tag is:
> https://github.com/apache/tomcat/tree/8.5.45
> 46d444a14cdac3e7e1f011a02cbdac9e5a80631c
> 
> The proposed 8.5.45 release is:
> [ ] Broken - do not release
> [X] Stable - go ahead and release as 8.5.45

Tested NIO, NIO2 and APR/Native (1.2.23) on Linux MacOS and Windows.

All tests passed.

Mark

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Re: [VOTE] Release Apache Tomcat 9.0.24

2019-08-15 Thread Mark Thomas
On 14/08/2019 22:45, Mark Thomas wrote:



> The proposed 9.0.24 release is:
> [ ] Broken - do not release
> [X] Stable - go ahead and release as 9.0.24

Tested NIO, NIO2 and APR/Native (1.2.23) on Linux MacOS and Windows.

All tests passed.

Mark

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat] branch 7.0.x updated (73b16c1 -> d206509)

2019-08-15 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a change to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git.


from 73b16c1  Drop use of filesonly
 new 229c6bf  Update for migration to git
 new 1abfc3c  Align root web application with 8.5.x
 new d206509  Update source code links to point to Git

The 3 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:
 CONTRIBUTING.md  |  49 +--
 build.properties.default |   3 +++
 build.xml|   1 +
 webapps/ROOT/WEB-INF/web.xml |   3 +--
 webapps/ROOT/bg-nav-item.png | Bin 1392 -> 0 bytes
 webapps/ROOT/index.jsp   |  25 +++---
 webapps/docs/changelog.xml   |   8 +++
 7 files changed, 45 insertions(+), 44 deletions(-)
 delete mode 100644 webapps/ROOT/bg-nav-item.png


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat] 01/03: Update for migration to git

2019-08-15 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 229c6bf6ab37df7bb3bb98a8a6e36b24cbbc062b
Author: Mark Thomas 
AuthorDate: Thu Aug 15 20:40:07 2019 +0100

Update for migration to git
---
 CONTRIBUTING.md | 49 +++--
 1 file changed, 19 insertions(+), 30 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 28b5ef5..58ea4f9 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,7 +1,7 @@
 # Contributing to Apache Tomcat
 
 Firstly, thanks for your interest in contributing! I hope that this will be a
-pleasant first experience for you, and that you will return to continue
+pleasant experience for you, and that you will return to continue
 contributing.
 
 Please visit our [Get Involved 
page](https://tomcat.apache.org/getinvolved.html)
@@ -38,12 +38,12 @@ the issues marked 'Beginner', link below. Please note that 
the Beginner keyword
 is pretty new to the project, so if there aren't any issues in the filter feel
 free to ask on the [dev list](https://tomcat.apache.org/lists.html#tomcat-dev).
 
-* [Beginner 
issues](https://bz.apache.org/bugzilla/buglist.cgi?bug_status=NEW_status=ASSIGNED_status=REOPENED_status=NEEDINFO=Beginner_type=allwords_id=160824=Tomcat%207=Tomcat%208=Tomcat%209_format=advanced)
 -
+* [Beginner 
issues](https://bz.apache.org/bugzilla/buglist.cgi?bug_status=NEW_status=ASSIGNED_status=REOPENED_status=NEEDINFO=Beginner_type=allwords_id=160824=Tomcat%207=Tomcat%208.5=Tomcat%209_format=advanced)
 -
 issues which should only require a few lines of code, and a test or two to
 resolve.
 
 The list above shows all bugs that are marked 'Beginner' and are open in the
-currently supported Tomcat versions (7, 8, and 9).
+currently supported Tomcat versions (7, 8.5, and 9).
 
 If you prefer C over Java, you may also take a look at the tomcat-native and
 Tomcat Connectors products in Bugzilla.
@@ -53,15 +53,12 @@ Tomcat Connectors products in Bugzilla.
 Excited yet? This section will guide you through providing a patch to the
 committers of the project for review and acceptance.
 
-# Chose Your Method of Submission
+# Choose Your Method of Submission
 
 You can provide a patch in one of the following ways (in order of preference):
 
+* GitHub Pull Request
 * Patch attachment to the Bugzilla issue
-* Github Pull Request
-> **Note:** Github is a mirror of the SVN repository that Tomcat is stored in
-and therefore it can't be merged outright. Your contribution will be converted
-into an SVN patch and committed with a mention of your name for credit.
 * Email the patch to the developer list. This is not preferred, but if no bug
 is associated with the patch, or you would like a developer review, an email
 may be appropriate.
@@ -73,51 +70,43 @@ source code.
 
 ## Download The Source Distribution
 
-This method works if you want to submit a patch (like you would do for SVN), 
but
+This method works if you want to submit a patch via email, but
 the difference in using the sources distribution and a VCS is that you have to
 manually generate the patch file by using diff. If this is what you want, you
 can download the sources from the "Source Code Distributions" section of the
 Download Page. There is one such page for every major Tomcat version:
+
 - [Tomcat 9](https://tomcat.apache.org/download-90.cgi)
 - [Tomcat 8](https://tomcat.apache.org/download-80.cgi)
 - [Tomcat 7](https://tomcat.apache.org/download-70.cgi)
 
-## SVN
+# Manual Patch Generation
 
 If you have chosen to attach a patch to the Bugzilla issue (or email
-one), then you'll need to checkout the SVN version. Instructions for new
-committers to learn how to do this are found
-[here](https://www.apache.org/dev/contributors.html#svnbasics). However, in the
-interest of a fast ramp up, the short version is below. Note that the root of
-the SVN repository is
-[tomcat/trunk](http://svn.apache.org/repos/asf/tomcat/trunk),
-but you can clone specific versions too, such as
-[tc8.5.x](http://svn.apache.org/repos/asf/tomcat/tc8.5.x/trunk/) or even tags (
-[TOMCAT_8_5_15](http://svn.apache.org/repos/asf/tomcat/tc8.5.x/tags/TOMCAT_8_5_15/)).
+one), then you'll need to download the sources as noted above, make your
+desired changes and then manually generate your patch using diff (other
+other tool).
 
-```
-$ svn co http://svn.apache.org/repos/asf/tomcat/trunk/
-```
+# GitHub
 
-# Github
-
-For Github, it's almost the same. Chose the major version that you want (for
-now they're in different repositories), fork the repository, and then clone
-your fork to do that work.
+To submit a GitHub Pull Request you'll need to fork the
+[repository](https://github.com/apache/tomcat), clone your fork to do the work:
 
 ```
 $ git clone https://github.com/$USERNAME/tomcat.git
 ```
 
+and then push your changes, and submit a Pull Request via the GitHub 

[tomcat] 02/03: Align root web application with 8.5.x

2019-08-15 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 1abfc3cb9190a5119249fbc6116e2e9b7e040cca
Author: Mark Thomas 
AuthorDate: Thu Aug 15 20:46:16 2019 +0100

Align root web application with 8.5.x
---
 webapps/ROOT/WEB-INF/web.xml |   3 +--
 webapps/ROOT/bg-nav-item.png | Bin 1392 -> 0 bytes
 webapps/ROOT/index.jsp   |  23 ---
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/webapps/ROOT/WEB-INF/web.xml b/webapps/ROOT/WEB-INF/web.xml
index f2bd243..a3505e7 100644
--- a/webapps/ROOT/WEB-INF/web.xml
+++ b/webapps/ROOT/WEB-INF/web.xml
@@ -1,4 +1,4 @@
-
+
 
-
 http://java.sun.com/xml/ns/javaee;
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
   xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
diff --git a/webapps/ROOT/bg-nav-item.png b/webapps/ROOT/bg-nav-item.png
deleted file mode 100644
index ece86a1..000
Binary files a/webapps/ROOT/bg-nav-item.png and /dev/null differ
diff --git a/webapps/ROOT/index.jsp b/webapps/ROOT/index.jsp
index d1b6637..6de0008 100644
--- a/webapps/ROOT/index.jsp
+++ b/webapps/ROOT/index.jsp
@@ -14,8 +14,7 @@ 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.
 --%>
-
-<%@ page session="false" %>
+<%@ page session="false" pageEncoding="UTF-8" contentType="text/html; 
charset=UTF-8" %>
 <%
 java.text.SimpleDateFormat sdf = new java.text.SimpleDateFormat("");
 request.setAttribute("year", sdf.format(new java.util.Date()));
@@ -23,8 +22,10 @@ request.setAttribute("tomcatUrl", 
"https://tomcat.apache.org/;);
 request.setAttribute("tomcatDocUrl", "/docs/");
 request.setAttribute("tomcatExamplesUrl", "/examples/");
 %>
+
 
 
+
 <%=request.getServletContext().getServerInfo() %>
 
 
@@ -54,9 +55,9 @@ request.setAttribute("tomcatExamplesUrl", "/examples/");
 
 
 Recommended Reading:
-Security Considerations 
HOW-TO
-Manager Application HOW-TO
-Clustering/Session Replication 
HOW-TO
+Security Considerations 
How-To
+Manager Application How-To
+Clustering/Session Replication 
How-To
 
 
 
@@ -106,7 +107,7 @@ request.setAttribute("tomcatExamplesUrl", "/examples/");
 For security, access to the manager webapp is restricted.
 Users are defined in:
 $CATALINA_HOME/conf/tomcat-users.xml
-In Tomcat 7.0 access to the manager application is 
split between
+In Tomcat @VERSION_MAJOR_MINOR@ access to the 
manager application is split between
different users.  Read more...
 
 Release 
Notes
@@ -118,16 +119,16 @@ request.setAttribute("tomcatExamplesUrl", "/examples/");
 
 
 Documentation
-Tomcat 7.0 
Documentation
-Tomcat 7.0 
Configuration
+Tomcat 
@VERSION_MAJOR_MINOR@ Documentation
+Tomcat 
@VERSION_MAJOR_MINOR@ Configuration
 https://wiki.apache.org/tomcat/FrontPage;>Tomcat Wiki
 Find additional important configuration information 
in:
 $CATALINA_HOME/RUNNING.txt
 Developers may be interested in:
 
-https://tomcat.apache.org/bugreport.html;>Tomcat 7.0 Bug Database
-Tomcat 
7.0 JavaDocs
-https://svn.apache.org/repos/asf/tomcat/tc7.0.x/;>Tomcat 7.0 SVN 
Repository
+https://tomcat.apache.org/bugreport.html;>Tomcat @VERSION_MAJOR_MINOR@ 
Bug Database
+Tomcat 
@VERSION_MAJOR_MINOR@ JavaDocs
+https://svn.apache.org/repos/asf/tomcat/tc@VERSION_MAJOR_MINOR@.x/;>Tomcat
 @VERSION_MAJOR_MINOR@ SVN Repository
 
 
 


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat] 03/03: Update source code links to point to Git

2019-08-15 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit d206509dabe5ea9f40aae1f0448716fd42470456
Author: Mark Thomas 
AuthorDate: Thu Aug 15 21:01:20 2019 +0100

Update source code links to point to Git
---
 build.properties.default   | 3 +++
 build.xml  | 1 +
 webapps/ROOT/index.jsp | 4 ++--
 webapps/docs/changelog.xml | 8 
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index bfe74e2..66ab7f5 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -29,6 +29,9 @@ version.build=97
 version.patch=0
 version.suffix=-dev
 
+# - Source control flags -
+git.branch=7.0.x
+
 # - Build control flags -
 # Note enabling validation uses Checkstyle which is LGPL licensed
 execute.validate=false
diff --git a/build.xml b/build.xml
index ffc0d6e..2f3c724 100644
--- a/build.xml
+++ b/build.xml
@@ -237,6 +237,7 @@
 
 
 
+
   
 
   
diff --git a/webapps/ROOT/index.jsp b/webapps/ROOT/index.jsp
index 6de0008..1d3d46d 100644
--- a/webapps/ROOT/index.jsp
+++ b/webapps/ROOT/index.jsp
@@ -128,7 +128,7 @@ request.setAttribute("tomcatExamplesUrl", "/examples/");
 
 https://tomcat.apache.org/bugreport.html;>Tomcat @VERSION_MAJOR_MINOR@ 
Bug Database
 Tomcat 
@VERSION_MAJOR_MINOR@ JavaDocs
-https://svn.apache.org/repos/asf/tomcat/tc@VERSION_MAJOR_MINOR@.x/;>Tomcat
 @VERSION_MAJOR_MINOR@ SVN Repository
+https://github.com/apache/tomcat/tree/@GIT_BRANCH@;>Tomcat 
@VERSION_MAJOR_MINOR@ Git Repository at GitHub
 
 
 
@@ -183,7 +183,7 @@ request.setAttribute("tomcatExamplesUrl", "/examples/");
 Get Involved
 
 Overview
-SVN 
Repositories
+Source 
Repositories
 Mailing 
Lists
 https://wiki.apache.org/tomcat/FrontPage;>Wiki
 
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index ec80f54..56895d5 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -112,6 +112,14 @@
   
 
   
+  
+
+  
+Correct the source code links on the index page for the ROOT web
+application to point to Git rather than Subversion. (markt)
+  
+
+  
   
 
   


-
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: Update source code links to point to Git

2019-08-15 Thread markt
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 abe9d37  Update source code links to point to Git
abe9d37 is described below

commit abe9d37bec0fd100a48bb41800c7ecf3cd7d
Author: Mark Thomas 
AuthorDate: Thu Aug 15 21:01:20 2019 +0100

Update source code links to point to Git
---
 build.properties.default   | 3 +++
 build.xml  | 1 +
 webapps/ROOT/index.jsp | 4 ++--
 webapps/docs/changelog.xml | 8 
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index 563b0db..792b621 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -29,6 +29,9 @@ version.build=46
 version.patch=0
 version.suffix=-dev
 
+# - Source control flags -
+git.branch=8.5.x
+
 # - Build control flags -
 # Note enabling validation uses Checkstyle which is LGPL licensed
 execute.validate=false
diff --git a/build.xml b/build.xml
index aeeb2b0..c2aff57 100644
--- a/build.xml
+++ b/build.xml
@@ -245,6 +245,7 @@
 
 
 
+
   
 
   
diff --git a/webapps/ROOT/index.jsp b/webapps/ROOT/index.jsp
index 6de0008..1d3d46d 100644
--- a/webapps/ROOT/index.jsp
+++ b/webapps/ROOT/index.jsp
@@ -128,7 +128,7 @@ request.setAttribute("tomcatExamplesUrl", "/examples/");
 
 https://tomcat.apache.org/bugreport.html;>Tomcat @VERSION_MAJOR_MINOR@ 
Bug Database
 Tomcat 
@VERSION_MAJOR_MINOR@ JavaDocs
-https://svn.apache.org/repos/asf/tomcat/tc@VERSION_MAJOR_MINOR@.x/;>Tomcat
 @VERSION_MAJOR_MINOR@ SVN Repository
+https://github.com/apache/tomcat/tree/@GIT_BRANCH@;>Tomcat 
@VERSION_MAJOR_MINOR@ Git Repository at GitHub
 
 
 
@@ -183,7 +183,7 @@ request.setAttribute("tomcatExamplesUrl", "/examples/");
 Get Involved
 
 Overview
-SVN 
Repositories
+Source 
Repositories
 Mailing 
Lists
 https://wiki.apache.org/tomcat/FrontPage;>Wiki
 
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 96e92c2..290374d 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -45,6 +45,14 @@
   issues do not "pop up" wrt. others).
 -->
 
+  
+
+  
+Correct the source code links on the index page for the ROOT web
+application to point to Git rather than Subversion. (markt)
+  
+
+  
   
 
   


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat] branch master updated: Update source code links to point to Git

2019-08-15 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/master by this push:
 new 42971a3  Update source code links to point to Git
42971a3 is described below

commit 42971a30719a557c6c82624b7b55226b393f4bd9
Author: Mark Thomas 
AuthorDate: Thu Aug 15 21:01:20 2019 +0100

Update source code links to point to Git
---
 build.properties.default   | 3 +++
 build.xml  | 1 +
 webapps/ROOT/index.jsp | 4 ++--
 webapps/docs/changelog.xml | 8 
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index 25e83c3..ec173fd 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -29,6 +29,9 @@ version.build=25
 version.patch=0
 version.suffix=-dev
 
+# - Source control flags -
+git.branch=master
+
 # - Build control flags -
 # Note enabling validation uses Checkstyle which is LGPL licensed
 ant.version.required=1.9.8
diff --git a/build.xml b/build.xml
index e44fbd9..6690daa 100644
--- a/build.xml
+++ b/build.xml
@@ -239,6 +239,7 @@
 
 
 
+
   
 
   
diff --git a/webapps/ROOT/index.jsp b/webapps/ROOT/index.jsp
index 6de0008..1d3d46d 100644
--- a/webapps/ROOT/index.jsp
+++ b/webapps/ROOT/index.jsp
@@ -128,7 +128,7 @@ request.setAttribute("tomcatExamplesUrl", "/examples/");
 
 https://tomcat.apache.org/bugreport.html;>Tomcat @VERSION_MAJOR_MINOR@ 
Bug Database
 Tomcat 
@VERSION_MAJOR_MINOR@ JavaDocs
-https://svn.apache.org/repos/asf/tomcat/tc@VERSION_MAJOR_MINOR@.x/;>Tomcat
 @VERSION_MAJOR_MINOR@ SVN Repository
+https://github.com/apache/tomcat/tree/@GIT_BRANCH@;>Tomcat 
@VERSION_MAJOR_MINOR@ Git Repository at GitHub
 
 
 
@@ -183,7 +183,7 @@ request.setAttribute("tomcatExamplesUrl", "/examples/");
 Get Involved
 
 Overview
-SVN 
Repositories
+Source 
Repositories
 Mailing 
Lists
 https://wiki.apache.org/tomcat/FrontPage;>Wiki
 
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index d6474dc..de1bcc3 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -45,6 +45,14 @@
   issues do not "pop up" wrt. others).
 -->
 
+  
+
+  
+Correct the source code links on the index page for the ROOT web
+application to point to Git rather than Subversion. (markt)
+  
+
+  
   
 
   


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Re: [VOTE] Release Apache Tomcat 9.0.24

2019-08-15 Thread Igal Sapir
On Wed, Aug 14, 2019 at 2:45 PM Mark Thomas  wrote:

>
> The proposed 9.0.24 release is:
> [ ] Broken - do not release
> [X] Stable - go ahead and release as 9.0.24
>

All unit tests passed successfully on Windows 10 and Ubuntu 18.04

Best,

Igal


>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>


Re: [VOTE] Release Apache Tomcat 8.5.45

2019-08-15 Thread Igal Sapir
On Wed, Aug 14, 2019 at 3:48 PM Mark Thomas  wrote:

>
> The tag is:
> https://github.com/apache/tomcat/tree/8.5.45
> 46d444a14cdac3e7e1f011a02cbdac9e5a80631c
>
> The proposed 8.5.45 release is:
> [ ] Broken - do not release
> [X] Stable - go ahead and release as 8.5.45
>

All unit tests passed successfully on Windows 10 and Ubuntu 18.04

Best,

Igal



>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>


buildbot failure in on tomcat-trunk

2019-08-15 Thread buildbot
The Buildbot has detected a new failure on builder tomcat-trunk while building 
tomcat. Full details are available at:
https://ci.apache.org/builders/tomcat-trunk/builds/4557

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: asf946_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' 
triggered this build
Build Source Stamp: [branch master] 0e75e6e717de8e9816403fc9862ed60ef1f69903
Blamelist: Mark Thomas 

BUILD FAILED: failed compile_1

Sincerely,
 -The Buildbot




-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat] branch 7.0.x updated (1066162 -> 73b16c1)

2019-08-15 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a change to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git.


from 1066162  Additions and corrections to the Russian i18n messages
 new ca12b93  Add XML Namespace to the project element of all POM files
 new c9553f9  Reformat to simplify checking against other versions
 new f11ed2b  Include German translations in standard distribution.
 new e6dcf67  Add Korean translations to the standard Tomcat distribution.
 new 5a0140a  Add simplified Chinese translations
 new 73b16c1  Drop use of filesonly

The 6 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  |  53 +++-
 java/javax/el/LocalStrings_de.properties   |  16 ++
 java/javax/el/LocalStrings_ko.properties   |  28 ++
 java/javax/el/LocalStrings_zh_CN.properties|  27 ++
 java/javax/servlet/LocalStrings_de.properties  |  20 ++
 java/javax/servlet/LocalStrings_ko.properties  |  23 ++
 java/javax/servlet/LocalStrings_zh_CN.properties   |  22 ++
 java/javax/servlet/http/LocalStrings_de.properties |  16 ++
 java/javax/servlet/http/LocalStrings_ko.properties |  26 ++
 .../servlet/http/LocalStrings_zh_CN.properties |  23 ++
 .../authenticator/LocalStrings_de.properties   |  21 ++
 .../authenticator/LocalStrings_ko.properties   |  70 +
 .../authenticator/LocalStrings_zh_CN.properties|  42 +++
 .../catalina/connector/LocalStrings_de.properties  |  25 ++
 .../catalina/connector/LocalStrings_ko.properties  |  74 ++
 .../connector/LocalStrings_zh_CN.properties|  36 +++
 .../catalina/core/LocalStrings_de.properties   |  57 
 .../catalina/core/LocalStrings_ko.properties   | 239 +
 .../catalina/core/LocalStrings_zh_CN.properties|  99 +++
 .../catalina/deploy/LocalStrings_de.properties |  17 ++
 .../catalina/deploy/LocalStrings_ko.properties |  25 ++
 .../catalina/deploy/LocalStrings_zh_CN.properties  |  20 ++
 .../catalina/filters/LocalStrings_de.properties|  32 +++
 .../catalina/filters/LocalStrings_ko.properties|  65 +
 .../catalina/filters/LocalStrings_zh_CN.properties |  35 +++
 .../catalina/ha/deploy/LocalStrings_de.properties  |  23 ++
 .../catalina/ha/deploy/LocalStrings_ko.properties  |  52 
 .../ha/deploy/LocalStrings_zh_CN.properties|  30 +++
 .../catalina/ha/session/LocalStrings_de.properties |  25 ++
 .../catalina/ha/session/LocalStrings_ko.properties |  84 ++
 .../ha/session/LocalStrings_zh_CN.properties   |  41 +++
 .../catalina/ha/tcp/LocalStrings_de.properties |  17 ++
 .../catalina/ha/tcp/LocalStrings_ko.properties |  30 +++
 .../catalina/ha/tcp/LocalStrings_zh_CN.properties  |  17 ++
 .../catalina/loader/LocalStrings_de.properties |  18 ++
 .../catalina/loader/LocalStrings_ko.properties |  60 +
 .../catalina/loader/LocalStrings_zh_CN.properties  |  29 ++
 .../catalina/manager/LocalStrings_ko.properties| 155 +++
 .../catalina/manager/LocalStrings_zh_CN.properties | 154 +++
 .../manager/host/LocalStrings_de.properties|  36 +++
 .../manager/host/LocalStrings_ko.properties|  84 ++
 .../manager/host/LocalStrings_zh_CN.properties |  84 ++
 .../catalina/mbeans/LocalStrings_ko.properties |  21 ++
 .../catalina/realm/LocalStrings_de.properties  |  51 
 .../catalina/realm/LocalStrings_ko.properties  |  94 +++
 .../catalina/realm/LocalStrings_zh_CN.properties   |  48 
 .../catalina/security/LocalStrings_de.properties   |  16 ++
 .../catalina/security/LocalStrings_ko.properties   |  22 ++
 .../security/LocalStrings_zh_CN.properties |  16 ++
 .../catalina/servlets/LocalStrings_de.properties   |  20 ++
 .../catalina/servlets/LocalStrings_ko.properties   |  53 
 .../servlets/LocalStrings_zh_CN.properties |  30 +++
 .../catalina/session/LocalStrings_de.properties|  28 ++
 .../catalina/session/LocalStrings_ko.properties|  79 ++
 .../catalina/session/LocalStrings_zh_CN.properties |  42 +++
 .../catalina/startup/LocalStrings_de.properties|  46 
 .../catalina/startup/LocalStrings_ko.properties| 154 +++
 .../catalina/startup/LocalStrings_zh_CN.properties |  70 +
 .../tribes/transport/LocalStrings_ko.properties|  16 ++
 .../tribes/transport/LocalStrings_zh_CN.properties |  16 ++
 .../tribes/util/LocalStrings_ko.properties |  16 ++
 .../catalina/users/LocalStrings_de.properties  |  16 ++
 .../catalina/users/LocalStrings_ko.properties  |  25 ++
 .../catalina/users/LocalStrings_zh_CN.properties   |  21 ++
 .../catalina/util/LocalStrings_de.properties   |  29 ++
 

[tomcat] 02/06: Reformat to simplify checking against other versions

2019-08-15 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit c9553f943d19cf39f2fedc6f3a56cf8071fa8a0c
Author: Mark Thomas 
AuthorDate: Thu Aug 15 16:47:47 2019 +0100

Reformat to simplify checking against other versions
---
 res/maven/tomcat-servlet-api.pom | 15 ++-
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/res/maven/tomcat-servlet-api.pom b/res/maven/tomcat-servlet-api.pom
index dee1554..0cd8a25 100644
--- a/res/maven/tomcat-servlet-api.pom
+++ b/res/maven/tomcat-servlet-api.pom
@@ -38,11 +38,16 @@
   repo
   
 The Apache License, version 2.0 applies to all files apart from
-javaee_5.xsd, javaee_web_services_1_2.xsd,
-javaee_web_services_client_1_2.xsd, javaee_6.xsd,
-javaee_web_services_1_3.xsd, javaee_web_services_client_1_3.xsd,
-web-app_3_0.xsd, web-common_3_0.xsd, web-fragment_3_0.xsd to which the
-CDDL version 1.0 applies.
+javaee_5.xsd,
+javaee_6.xsd,
+javaee_web_services_1_2.xsd,
+javaee_web_services_client_1_2.xsd,
+javaee_web_services_1_3.xsd,
+javaee_web_services_client_1_3.xsd,
+web-app_3_0.xsd,
+web-common_3_0.xsd,
+web-fragment_3_0.xsd,
+to which the CDDL version 1.0 applies.
   
 
   


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat] 06/06: Drop use of filesonly

2019-08-15 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 73b16c1a80c2172185095e68d3a526e218aae0d7
Author: Mark Thomas 
AuthorDate: Thu Aug 15 19:44:29 2019 +0100

Drop use of filesonly

This aligns 7.0.x with later versions where it was dropped as it caused
issues for some applications when scanning JARs
---
 build.xml | 23 +--
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/build.xml b/build.xml
index 37f0b11..ffc0d6e 100644
--- a/build.xml
+++ b/build.xml
@@ -841,7 +841,7 @@
 fullpath="META-INF/LICENSE" />
 
 
+  manifest="${tomcat.manifests}/default.manifest">
   
 
   
@@ -851,7 +851,7 @@
 fullpath="META-INF/LICENSE" />
 
 
+  manifest="${tomcat.manifests}/default.manifest">
   
 
   
@@ -861,7 +861,7 @@
 fullpath="META-INF/LICENSE" />
 
 
+  manifest="${tomcat.manifests}/default.manifest">
   
 
   
@@ -1737,8 +1737,7 @@
  inheritAll="false" target="compile" />
 
 
+ manifest="${tomcat.manifests}/default.manifest">
   
 
 
@@ -1770,8 +1769,7 @@
 
 
 
+ manifest="${tomcat.manifests}/default.manifest">
   
 
 
@@ -1880,8 +1878,7 @@
   description="Embedded packaging for those extras that can use it">
 
 
+ manifest="${tomcat.manifests}/default.manifest">
   
 
 
@@ -1902,8 +1899,7 @@
 
 
 
+ manifest="${tomcat.manifests}/default.manifest">
   
 
 
@@ -2157,8 +2153,7 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
 
 
 
-
+

   
   
@@ -3265,7 +3260,7 @@ Read the Building page on the Apache Tomcat documentation 
site for details on ho
 
 
-  
+  
 
   
   


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat] 01/06: Add XML Namespace to the project element of all POM files

2019-08-15 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit ca12b933c4628c4d377be894b6ae8ee567d965ab
Author: Mark Thomas 
AuthorDate: Thu Aug 15 16:40:26 2019 +0100

Add XML Namespace to the project element of all POM files
---
 res/maven/tomcat-annotations-api.pom  | 7 +--
 res/maven/tomcat-api.pom  | 5 -
 res/maven/tomcat-catalina-ant.pom | 5 -
 res/maven/tomcat-catalina-ha.pom  | 5 -
 res/maven/tomcat-catalina-jmx-remote.pom  | 6 --
 res/maven/tomcat-catalina-ws.pom  | 6 --
 res/maven/tomcat-catalina.pom | 5 -
 res/maven/tomcat-coyote.pom   | 5 -
 res/maven/tomcat-dbcp.pom | 5 -
 res/maven/tomcat-el-api.pom   | 5 -
 res/maven/tomcat-embed-core.pom   | 5 -
 res/maven/tomcat-embed-el.pom | 5 -
 res/maven/tomcat-embed-jasper.pom | 5 -
 res/maven/tomcat-embed-logging-juli.pom   | 6 --
 res/maven/tomcat-embed-logging-log4j.pom  | 6 --
 res/maven/tomcat-extras-juli-adapters.pom | 6 --
 res/maven/tomcat-extras-juli.pom  | 6 --
 res/maven/tomcat-i18n-es.pom  | 5 -
 res/maven/tomcat-i18n-fr.pom  | 5 -
 res/maven/tomcat-i18n-ja.pom  | 5 -
 res/maven/tomcat-i18n-ru.pom  | 5 -
 res/maven/tomcat-jasper-el.pom| 5 -
 res/maven/tomcat-jasper.pom   | 5 -
 res/maven/tomcat-jdbc.pom | 5 -
 res/maven/tomcat-jsp-api.pom  | 5 -
 res/maven/tomcat-juli.pom | 5 -
 res/maven/tomcat-servlet-api.pom  | 5 -
 res/maven/tomcat-tribes.pom   | 5 -
 res/maven/tomcat-util.pom | 5 -
 res/maven/tomcat-websocket-api.pom| 5 -
 res/maven/tomcat.pom  | 5 -
 res/maven/tomcat7-embed-websocket.pom | 6 --
 res/maven/tomcat7-websocket.pom   | 6 --
 33 files changed, 133 insertions(+), 42 deletions(-)

diff --git a/res/maven/tomcat-annotations-api.pom 
b/res/maven/tomcat-annotations-api.pom
index b941005..79d0ab4 100644
--- a/res/maven/tomcat-annotations-api.pom
+++ b/res/maven/tomcat-annotations-api.pom
@@ -15,7 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-
+http://maven.apache.org/POM/4.0.0;
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+  http://maven.apache.org/xsd/maven-4.0.0.xsd;>
   4.0.0
   org.apache.tomcat
   tomcat-annotations-api
@@ -29,4 +32,4 @@
   repo
 
   
-
\ No newline at end of file
+
diff --git a/res/maven/tomcat-api.pom b/res/maven/tomcat-api.pom
index 1e95efe..66774f4 100644
--- a/res/maven/tomcat-api.pom
+++ b/res/maven/tomcat-api.pom
@@ -15,7 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-
+http://maven.apache.org/POM/4.0.0;
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+  http://maven.apache.org/xsd/maven-4.0.0.xsd;>
   4.0.0
   org.apache.tomcat
   tomcat-api
diff --git a/res/maven/tomcat-catalina-ant.pom 
b/res/maven/tomcat-catalina-ant.pom
index 80630c9..1393812 100644
--- a/res/maven/tomcat-catalina-ant.pom
+++ b/res/maven/tomcat-catalina-ant.pom
@@ -15,7 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-
+http://maven.apache.org/POM/4.0.0;
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+  http://maven.apache.org/xsd/maven-4.0.0.xsd;>
   4.0.0
   org.apache.tomcat
   tomcat-catalina-ant
diff --git a/res/maven/tomcat-catalina-ha.pom b/res/maven/tomcat-catalina-ha.pom
index 226575e..ed9dcb1 100644
--- a/res/maven/tomcat-catalina-ha.pom
+++ b/res/maven/tomcat-catalina-ha.pom
@@ -15,7 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-
+http://maven.apache.org/POM/4.0.0;
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+  http://maven.apache.org/xsd/maven-4.0.0.xsd;>
   4.0.0
   org.apache.tomcat
   tomcat-catalina-ha
diff --git a/res/maven/tomcat-catalina-jmx-remote.pom 
b/res/maven/tomcat-catalina-jmx-remote.pom
index 3a7dc8e..4de6e0b 100644
--- a/res/maven/tomcat-catalina-jmx-remote.pom
+++ b/res/maven/tomcat-catalina-jmx-remote.pom
@@ -15,8 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-
-  4.0.0
+http://maven.apache.org/POM/4.0.0;
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+  

[tomcat] 05/06: Add simplified Chinese translations

2019-08-15 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 5a0140ac44b1e05dbf2720e666b25be3ac395c96
Author: Mark Thomas 
AuthorDate: Thu Aug 15 19:39:48 2019 +0100

Add simplified Chinese translations
---
 build.xml  |  10 ++
 java/javax/el/LocalStrings_zh_CN.properties|  27 
 java/javax/servlet/LocalStrings_zh_CN.properties   |  22 +++
 .../servlet/http/LocalStrings_zh_CN.properties |  23 +++
 .../authenticator/LocalStrings_zh_CN.properties|  42 ++
 .../connector/LocalStrings_zh_CN.properties|  36 +
 .../catalina/core/LocalStrings_zh_CN.properties|  99 +
 .../catalina/deploy/LocalStrings_zh_CN.properties  |  20 +++
 .../catalina/filters/LocalStrings_zh_CN.properties |  35 +
 .../ha/deploy/LocalStrings_zh_CN.properties|  30 
 .../ha/session/LocalStrings_zh_CN.properties   |  41 ++
 .../catalina/ha/tcp/LocalStrings_zh_CN.properties  |  17 +++
 .../catalina/loader/LocalStrings_zh_CN.properties  |  29 
 .../catalina/manager/LocalStrings_zh_CN.properties | 154 +
 .../manager/host/LocalStrings_zh_CN.properties |  84 +++
 .../catalina/realm/LocalStrings_zh_CN.properties   |  48 +++
 .../security/LocalStrings_zh_CN.properties |  16 +++
 .../servlets/LocalStrings_zh_CN.properties |  30 
 .../catalina/session/LocalStrings_zh_CN.properties |  42 ++
 .../catalina/startup/LocalStrings_zh_CN.properties |  70 ++
 .../tribes/transport/LocalStrings_zh_CN.properties |  16 +++
 .../catalina/users/LocalStrings_zh_CN.properties   |  21 +++
 .../catalina/util/LocalStrings_zh_CN.properties|  29 
 .../catalina/valves/LocalStrings_zh_CN.properties  |  60 
 .../apache/coyote/LocalStrings_zh_CN.properties|  25 
 .../coyote/ajp/LocalStrings_zh_CN.properties   |  20 +++
 .../coyote/http11/LocalStrings_zh_CN.properties|  26 
 .../http11/filters/LocalStrings_zh_CN.properties   |  24 
 .../http11/upgrade/LocalStrings_zh_CN.properties   |  18 +++
 .../jasper/resources/LocalStrings_zh_CN.properties | 132 ++
 .../apache/naming/LocalStrings_zh_CN.properties|  21 +++
 .../naming/factory/LocalStrings_zh_CN.properties   |  18 +++
 .../tomcat/util/LocalStrings_zh_CN.properties  |  23 +++
 .../tomcat/util/buf/LocalStrings_zh_CN.properties  |  17 +++
 .../tomcat/util/http/LocalStrings_zh_CN.properties |  23 +++
 .../util/http/parser/LocalStrings_zh_CN.properties |  25 
 .../tomcat/util/scan/LocalStrings_zh_CN.properties |  21 +++
 .../tomcat/websocket/LocalStrings_zh_CN.properties |  56 
 .../websocket/pojo/LocalStrings_zh_CN.properties   |  25 
 .../websocket/server/LocalStrings_zh_CN.properties |  25 
 res/maven/mvn-pub.xml  |   1 +
 res/maven/tomcat-i18n-zh-CN.pom|  35 +
 webapps/docs/changelog.xml |   4 +
 .../WEB-INF/classes/LocalStrings_zh_CN.properties  |  38 +
 44 files changed, 1578 insertions(+)

diff --git a/build.xml b/build.xml
index 8d8b507..37f0b11 100644
--- a/build.xml
+++ b/build.xml
@@ -890,6 +890,16 @@
   
 
+
+  
+
+  
+  
+  
+
 
   
 
diff --git a/java/javax/el/LocalStrings_zh_CN.properties 
b/java/javax/el/LocalStrings_zh_CN.properties
new file mode 100644
index 000..1803a07
--- /dev/null
+++ b/java/javax/el/LocalStrings_zh_CN.properties
@@ -0,0 +1,27 @@
+# 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.
+
+expressionFactory.cannotCreate=无法创建类型为[{0}]的表达式工厂
+expressionFactory.readFailed=无法读取[{0}]
+
+objectNotAssignable=无法将类型为[{0}]的对象添加到[{1}]类型的对象数组中
+propertyNotFound=类型[{0}]上找不到属性[{1}]
+propertyNotReadable=属性[{1}]在类型[{0}]上不可读
+propertyNotWritable=属性[{1}]在类型[{0}]上不可写
+propertyReadError=在类型[{0}]上读取[{1}]时出错
+propertyWriteError=在类型[{0}]上写入[{1}]时出错
+
+util.method.ambiguous=无法找到明确的方法:{0}.{1}({2})
+util.method.notfound=找不到方法:{0}.{1}({2})
diff --git a/java/javax/servlet/LocalStrings_zh_CN.properties 
b/java/javax/servlet/LocalStrings_zh_CN.properties
new file mode 100644
index 000..7fc4358

[tomcat] 03/03: Align with other versions to minimise diff

2019-08-15 Thread markt
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 001430441e5c6da17a9701ce14ce44ea3402fafe
Author: Mark Thomas 
AuthorDate: Thu Aug 15 19:36:47 2019 +0100

Align with other versions to minimise diff
---
 res/maven/mvn-pub.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/res/maven/mvn-pub.xml b/res/maven/mvn-pub.xml
index ef99aea..aea7b47 100644
--- a/res/maven/mvn-pub.xml
+++ b/res/maven/mvn-pub.xml
@@ -304,6 +304,7 @@
 
 
 
+
 
 

[tomcat] 03/06: Include German translations in standard distribution.

2019-08-15 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit f11ed2bcc4cd9549b2eb8013167abf784d3a2468
Author: Mark Thomas 
AuthorDate: Thu Aug 15 19:34:01 2019 +0100

Include German translations in standard distribution.
---
 build.xml  | 10 +++
 java/javax/el/LocalStrings_de.properties   | 16 +
 java/javax/servlet/LocalStrings_de.properties  | 20 ++
 java/javax/servlet/http/LocalStrings_de.properties | 16 +
 .../authenticator/LocalStrings_de.properties   | 21 ++
 .../catalina/connector/LocalStrings_de.properties  | 25 
 .../catalina/core/LocalStrings_de.properties   | 57 +
 .../catalina/deploy/LocalStrings_de.properties | 17 +
 .../catalina/filters/LocalStrings_de.properties| 32 ++
 .../catalina/ha/deploy/LocalStrings_de.properties  | 23 +++
 .../catalina/ha/session/LocalStrings_de.properties | 25 
 .../catalina/ha/tcp/LocalStrings_de.properties | 17 +
 .../catalina/loader/LocalStrings_de.properties | 18 ++
 .../manager/host/LocalStrings_de.properties| 36 +++
 .../catalina/realm/LocalStrings_de.properties  | 51 +++
 .../catalina/security/LocalStrings_de.properties   | 16 +
 .../catalina/servlets/LocalStrings_de.properties   | 20 ++
 .../catalina/session/LocalStrings_de.properties| 28 
 .../catalina/startup/LocalStrings_de.properties| 46 ++
 .../catalina/users/LocalStrings_de.properties  | 16 +
 .../catalina/util/LocalStrings_de.properties   | 29 +
 .../catalina/valves/LocalStrings_de.properties | 47 ++
 java/org/apache/coyote/LocalStrings_de.properties  | 23 +++
 .../apache/coyote/ajp/LocalStrings_de.properties   | 16 +
 .../coyote/http11/LocalStrings_de.properties   | 20 ++
 .../http11/filters/LocalStrings_de.properties  | 18 ++
 .../http11/upgrade/LocalStrings_de.properties  | 17 +
 .../jasper/resources/LocalStrings_de.properties| 74 ++
 java/org/apache/naming/LocalStrings_de.properties  | 20 ++
 .../factory/webservices/LocalStrings_de.properties | 16 +
 .../apache/tomcat/util/LocalStrings_de.properties  | 18 ++
 .../tomcat/util/buf/LocalStrings_de.properties | 16 +
 .../tomcat/util/http/LocalStrings_de.properties| 21 ++
 .../util/http/parser/LocalStrings_de.properties| 20 ++
 .../tomcat/util/scan/LocalStrings_de.properties| 16 +
 .../tomcat/websocket/LocalStrings_de.properties| 35 ++
 .../websocket/pojo/LocalStrings_de.properties  | 22 +++
 .../websocket/server/LocalStrings_de.properties| 22 +++
 res/maven/mvn-pub.xml  |  1 +
 res/maven/tomcat-i18n-de.pom   | 35 ++
 webapps/docs/changelog.xml |  5 ++
 .../WEB-INF/classes/LocalStrings_de.properties | 28 
 42 files changed, 1029 insertions(+)

diff --git a/build.xml b/build.xml
index 179e60d..0c910e8 100644
--- a/build.xml
+++ b/build.xml
@@ -830,6 +830,16 @@
   filesId="files.tomcat-dbcp" />
 
 
+
+  
+
+  
+  
+  
+
 
   
diff --git a/java/javax/el/LocalStrings_de.properties 
b/java/javax/el/LocalStrings_de.properties
new file mode 100644
index 000..9e1c397
--- /dev/null
+++ b/java/javax/el/LocalStrings_de.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.
+
+expressionFactory.cannotFind=Kann die ExpressionFactory mit dem Typ ''[{0}]'' 
nicht finden
diff --git a/java/javax/servlet/LocalStrings_de.properties 
b/java/javax/servlet/LocalStrings_de.properties
new file mode 100644
index 000..e91efd3
--- /dev/null
+++ b/java/javax/servlet/LocalStrings_de.properties
@@ -0,0 +1,20 @@
+# 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

[tomcat] 02/03: Remove files not included in 8.5.x distribution

2019-08-15 Thread markt
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 08fd153c72947370f27e10f35d6a1361412a7d21
Author: Mark Thomas 
AuthorDate: Thu Aug 15 16:47:16 2019 +0100

Remove files not included in 8.5.x distribution
---
 res/maven/tomcat-servlet-api.pom | 4 
 1 file changed, 4 deletions(-)

diff --git a/res/maven/tomcat-servlet-api.pom b/res/maven/tomcat-servlet-api.pom
index 456cbfc..ca8bbaf 100644
--- a/res/maven/tomcat-servlet-api.pom
+++ b/res/maven/tomcat-servlet-api.pom
@@ -41,7 +41,6 @@
 javaee_5.xsd,
 javaee_6.xsd,
 javaee_7.xsd,
-javaee_8.xsd,
 javaee_web_services_1_2.xsd,
 javaee_web_services_client_1_2.xsd,
 javaee_web_services_1_3.xsd,
@@ -56,9 +55,6 @@
 web-app_3_1.xsd,
 web-common_3_1.xsd,
 web-fragment_3_1.xsd,
-web-app_4_0.xsd,
-web-common_4_0.xsd and
-web-fragment_4_0.xsd
 to which the CDDL version 1.0 applies.
   
 


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat] branch master updated: Tweak format to simplify diffs against 8.5.x to make it easier to check

2019-08-15 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/master by this push:
 new 0e75e6e  Tweak format to simplify diffs against 8.5.x to make it 
easier to check
0e75e6e is described below

commit 0e75e6e717de8e9816403fc9862ed60ef1f69903
Author: Mark Thomas 
AuthorDate: Thu Aug 15 16:46:52 2019 +0100

Tweak format to simplify diffs against 8.5.x to make it easier to check
---
 res/maven/tomcat-servlet-api.pom | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/res/maven/tomcat-servlet-api.pom b/res/maven/tomcat-servlet-api.pom
index 456cbfc..076a423 100644
--- a/res/maven/tomcat-servlet-api.pom
+++ b/res/maven/tomcat-servlet-api.pom
@@ -57,8 +57,8 @@
 web-common_3_1.xsd,
 web-fragment_3_1.xsd,
 web-app_4_0.xsd,
-web-common_4_0.xsd and
-web-fragment_4_0.xsd
+web-common_4_0.xsd,
+web-fragment_4_0.xsd,
 to which the CDDL version 1.0 applies.
   
 


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat] 01/03: Add XML Namespace to the project element of all POM files

2019-08-15 Thread markt
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 f5cb99f10a6f17b21314c54bf7623892381b4666
Author: Mark Thomas 
AuthorDate: Thu Aug 15 16:39:23 2019 +0100

Add XML Namespace to the project element of all POM files
---
 res/maven/tomcat-annotations-api.pom | 7 +--
 res/maven/tomcat-api.pom | 5 -
 res/maven/tomcat-catalina-ant.pom| 5 -
 res/maven/tomcat-catalina-ha.pom | 5 -
 res/maven/tomcat-catalina-jmx-remote.pom | 6 --
 res/maven/tomcat-catalina-ws.pom | 6 --
 res/maven/tomcat-catalina.pom| 5 -
 res/maven/tomcat-coyote.pom  | 5 -
 res/maven/tomcat-dbcp.pom| 5 -
 res/maven/tomcat-el-api.pom  | 5 -
 res/maven/tomcat-embed-core.pom  | 5 -
 res/maven/tomcat-embed-el.pom| 5 -
 res/maven/tomcat-embed-jasper.pom| 5 -
 res/maven/tomcat-embed-websocket.pom | 5 -
 res/maven/tomcat-i18n-es.pom | 5 -
 res/maven/tomcat-i18n-fr.pom | 5 -
 res/maven/tomcat-i18n-ja.pom | 5 -
 res/maven/tomcat-i18n-ru.pom | 5 -
 res/maven/tomcat-jasper-el.pom   | 5 -
 res/maven/tomcat-jasper.pom  | 5 -
 res/maven/tomcat-jaspic-api.pom  | 5 -
 res/maven/tomcat-jdbc.pom| 5 -
 res/maven/tomcat-jni.pom | 5 -
 res/maven/tomcat-jsp-api.pom | 5 -
 res/maven/tomcat-juli.pom| 5 -
 res/maven/tomcat-servlet-api.pom | 5 -
 res/maven/tomcat-storeconfig.pom | 5 -
 res/maven/tomcat-tribes.pom  | 5 -
 res/maven/tomcat-util-scan.pom   | 5 -
 res/maven/tomcat-util.pom| 5 -
 res/maven/tomcat-websocket-api.pom   | 5 -
 res/maven/tomcat-websocket.pom   | 5 -
 res/maven/tomcat.pom | 5 -
 33 files changed, 133 insertions(+), 36 deletions(-)

diff --git a/res/maven/tomcat-annotations-api.pom 
b/res/maven/tomcat-annotations-api.pom
index b941005..79d0ab4 100644
--- a/res/maven/tomcat-annotations-api.pom
+++ b/res/maven/tomcat-annotations-api.pom
@@ -15,7 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-
+http://maven.apache.org/POM/4.0.0;
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+  http://maven.apache.org/xsd/maven-4.0.0.xsd;>
   4.0.0
   org.apache.tomcat
   tomcat-annotations-api
@@ -29,4 +32,4 @@
   repo
 
   
-
\ No newline at end of file
+
diff --git a/res/maven/tomcat-api.pom b/res/maven/tomcat-api.pom
index 1e95efe..66774f4 100644
--- a/res/maven/tomcat-api.pom
+++ b/res/maven/tomcat-api.pom
@@ -15,7 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-
+http://maven.apache.org/POM/4.0.0;
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+  http://maven.apache.org/xsd/maven-4.0.0.xsd;>
   4.0.0
   org.apache.tomcat
   tomcat-api
diff --git a/res/maven/tomcat-catalina-ant.pom 
b/res/maven/tomcat-catalina-ant.pom
index ad0a256..d192418 100644
--- a/res/maven/tomcat-catalina-ant.pom
+++ b/res/maven/tomcat-catalina-ant.pom
@@ -15,7 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-
+http://maven.apache.org/POM/4.0.0;
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+  http://maven.apache.org/xsd/maven-4.0.0.xsd;>
   4.0.0
   org.apache.tomcat
   tomcat-catalina-ant
diff --git a/res/maven/tomcat-catalina-ha.pom b/res/maven/tomcat-catalina-ha.pom
index cbfe15b..c9052d0 100644
--- a/res/maven/tomcat-catalina-ha.pom
+++ b/res/maven/tomcat-catalina-ha.pom
@@ -15,7 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-
+http://maven.apache.org/POM/4.0.0;
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+  http://maven.apache.org/xsd/maven-4.0.0.xsd;>
   4.0.0
   org.apache.tomcat
   tomcat-catalina-ha
diff --git a/res/maven/tomcat-catalina-jmx-remote.pom 
b/res/maven/tomcat-catalina-jmx-remote.pom
index d03594e..26afadb 100644
--- a/res/maven/tomcat-catalina-jmx-remote.pom
+++ b/res/maven/tomcat-catalina-jmx-remote.pom
@@ -15,8 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-
-  4.0.0
+http://maven.apache.org/POM/4.0.0;
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+  

[tomcat] branch 8.5.x updated (57e0b2d -> 0014304)

2019-08-15 Thread markt
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 57e0b2d  Copy utility classes to back-port translations
 new f5cb99f  Add XML Namespace to the project element of all POM files
 new 08fd153  Remove files not included in 8.5.x distribution
 new 0014304  Align with other versions to minimise diff

The 3 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:
 res/maven/mvn-pub.xml| 1 +
 res/maven/tomcat-annotations-api.pom | 7 +--
 res/maven/tomcat-api.pom | 5 -
 res/maven/tomcat-catalina-ant.pom| 5 -
 res/maven/tomcat-catalina-ha.pom | 5 -
 res/maven/tomcat-catalina-jmx-remote.pom | 6 --
 res/maven/tomcat-catalina-ws.pom | 6 --
 res/maven/tomcat-catalina.pom| 5 -
 res/maven/tomcat-coyote.pom  | 5 -
 res/maven/tomcat-dbcp.pom| 5 -
 res/maven/tomcat-el-api.pom  | 5 -
 res/maven/tomcat-embed-core.pom  | 5 -
 res/maven/tomcat-embed-el.pom| 5 -
 res/maven/tomcat-embed-jasper.pom| 5 -
 res/maven/tomcat-embed-websocket.pom | 5 -
 res/maven/tomcat-i18n-es.pom | 5 -
 res/maven/tomcat-i18n-fr.pom | 5 -
 res/maven/tomcat-i18n-ja.pom | 5 -
 res/maven/tomcat-i18n-ru.pom | 5 -
 res/maven/tomcat-jasper-el.pom   | 5 -
 res/maven/tomcat-jasper.pom  | 5 -
 res/maven/tomcat-jaspic-api.pom  | 5 -
 res/maven/tomcat-jdbc.pom| 5 -
 res/maven/tomcat-jni.pom | 5 -
 res/maven/tomcat-jsp-api.pom | 5 -
 res/maven/tomcat-juli.pom| 5 -
 res/maven/tomcat-servlet-api.pom | 9 -
 res/maven/tomcat-storeconfig.pom | 5 -
 res/maven/tomcat-tribes.pom  | 5 -
 res/maven/tomcat-util-scan.pom   | 5 -
 res/maven/tomcat-util.pom| 5 -
 res/maven/tomcat-websocket-api.pom   | 5 -
 res/maven/tomcat-websocket.pom   | 5 -
 res/maven/tomcat.pom | 5 -
 34 files changed, 134 insertions(+), 40 deletions(-)


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat] 01/05: Remove duplicated file

2019-08-15 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 929e3fe72f7cc6f75d35b7140053b9366e2fa913
Author: Mark Thomas 
AuthorDate: Thu Aug 15 16:14:25 2019 +0100

Remove duplicated file
---
 .../WEB-INF/classes/LocalStrings_en.properties | 48 --
 1 file changed, 48 deletions(-)

diff --git a/webapps/examples/WEB-INF/classes/LocalStrings_en.properties 
b/webapps/examples/WEB-INF/classes/LocalStrings_en.properties
deleted file mode 100644
index 2791a66..000
--- a/webapps/examples/WEB-INF/classes/LocalStrings_en.properties
+++ /dev/null
@@ -1,48 +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.
-
-cookies.cookies=Your browser is sending the following cookies:
-cookies.make-cookie=Create a cookie to send to your browser
-cookies.name=Name:
-cookies.no-cookies=Your browser isn't sending any cookies
-cookies.set=You just sent the following cookie to your browser:
-cookies.title=Cookies Example
-cookies.value=Value:
-
-helloworld.title=Hello World!
-
-requestheader.title=Request Header Example
-
-requestinfo.label.method=Method:
-requestinfo.label.pathinfo=Path Info:
-requestinfo.label.protocol=Protocol:
-requestinfo.label.remoteaddr=Remote Address:
-requestinfo.label.requesturi=Request URI:
-requestinfo.title=Request Information Example
-
-requestparams.firstname=First Name:
-requestparams.lastname=Last Name:
-requestparams.no-params=No Parameters, Please enter some
-requestparams.params-in-req=Parameters in this request:
-requestparams.title=Request Parameters Example
-
-sessions.adddata=Add data to your session
-sessions.created=Created:
-sessions.data=The following data is in your session:
-sessions.dataname=Name of Session Attribute:
-sessions.datavalue=Value of Session Attribute:
-sessions.id=Session ID:
-sessions.lastaccessed=Last Accessed:
-sessions.title=Sessions Example


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat] 05/05: Additions and corrections to the Russian i18n messages

2019-08-15 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 1066162b5b997e52f468cd11927141d009ea9438
Author: Mark Thomas 
AuthorDate: Thu Aug 15 16:19:19 2019 +0100

Additions and corrections to the Russian i18n messages
---
 .../catalina/core/LocalStrings_ru.properties   | 19 +++
 .../catalina/ha/deploy/LocalStrings_ru.properties  | 18 ++
 .../catalina/loader/LocalStrings_ru.properties | 16 
 .../catalina/manager/LocalStrings_ru.properties|  2 +-
 .../catalina/realm/LocalStrings_ru.properties  | 18 ++
 .../catalina/startup/LocalStrings_ru.properties| 22 ++
 .../catalina/util/LocalStrings_ru.properties   | 16 
 .../catalina/valves/LocalStrings_ru.properties | 21 +
 .../coyote/http11/LocalStrings_ru.properties   | 16 
 .../jasper/resources/LocalStrings_ru.properties| 22 ++
 .../apache/tomcat/util/LocalStrings_ru.properties  | 16 
 .../tomcat/util/http/LocalStrings_ru.properties| 16 
 .../tomcat/websocket/LocalStrings_ru.properties| 20 
 webapps/docs/changelog.xml |  4 
 .../WEB-INF/classes/LocalStrings_ru.properties | 16 
 15 files changed, 241 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/core/LocalStrings_ru.properties 
b/java/org/apache/catalina/core/LocalStrings_ru.properties
new file mode 100644
index 000..14414b4
--- /dev/null
+++ b/java/org/apache/catalina/core/LocalStrings_ru.properties
@@ -0,0 +1,19 @@
+# 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.
+
+applicationContext.addListener.iae.cnfe=Невозможно создать экземпляр типа [{0}]
+applicationContext.setAttribute.namenull=Имя не может быть пустым
+
+standardWrapper.isUnavailable=Сервлет [{0}] временно недоступен
diff --git a/java/org/apache/catalina/ha/deploy/LocalStrings_ru.properties 
b/java/org/apache/catalina/ha/deploy/LocalStrings_ru.properties
new file mode 100644
index 000..113715a
--- /dev/null
+++ b/java/org/apache/catalina/ha/deploy/LocalStrings_ru.properties
@@ -0,0 +1,18 @@
+# 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.
+
+farmWarDeployer.modInstall=Установка веб приложения [{0}] из [{1}]
+
+warWatcher.checkingWar=Проверяем WAR файл [{}]
diff --git a/java/org/apache/catalina/loader/LocalStrings_ru.properties 
b/java/org/apache/catalina/loader/LocalStrings_ru.properties
new file mode 100644
index 000..a851ce0
--- /dev/null
+++ b/java/org/apache/catalina/loader/LocalStrings_ru.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 

[tomcat] branch 7.0.x updated (05806e7 -> 1066162)

2019-08-15 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a change to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git.


from 05806e7  Back-port corrections and improvements to English i18n 
messages
 new 929e3fe  Remove duplicated file
 new 5b51c2a  Back-port additions and corrections to the Spanish i18n 
messages
 new d5ec642  Back-port additions and improvements to the French i18n 
messages
 new 95b1f16  Additions and improvements to the Japanese messages
 new 1066162  Additions and corrections to the Russian i18n messages

The 5 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:
 .../http => el}/LocalStrings_fr.properties |  20 +-
 java/javax/el/LocalStrings_ja.properties   |  28 +++
 java/javax/servlet/LocalStrings_es.properties  |   2 +-
 java/javax/servlet/LocalStrings_fr.properties  |   6 +-
 java/javax/servlet/LocalStrings_ja.properties  |   6 +-
 java/javax/servlet/http/LocalStrings_es.properties |   5 +-
 java/javax/servlet/http/LocalStrings_fr.properties |  15 +-
 java/javax/servlet/http/LocalStrings_ja.properties |   7 +-
 .../catalina/connector/LocalStrings_es.properties  |   4 +
 .../catalina/connector/LocalStrings_fr.properties  |  43 +++-
 .../catalina/connector/LocalStrings_ja.properties  |  28 +++
 .../catalina/core/LocalStrings_es.properties   | 148 ++--
 .../catalina/core/LocalStrings_fr.properties   | 250 -
 .../catalina/core/LocalStrings_ja.properties   | 242 +++-
 .../catalina/core/LocalStrings_ru.properties}  |  10 +-
 .../catalina/deploy}/LocalStrings_es.properties|  11 +-
 .../catalina/deploy/LocalStrings_fr.properties |  25 +++
 .../catalina/deploy/LocalStrings_ja.properties |  25 +++
 .../catalina/ha/deploy/LocalStrings_es.properties  |  29 +++
 .../catalina/ha/deploy/LocalStrings_fr.properties  |  52 +
 .../catalina/ha/deploy/LocalStrings_ja.properties  |  52 +
 .../catalina/ha/deploy/LocalStrings_ru.properties} |   5 +-
 .../catalina/ha/session/LocalStrings_es.properties |  46 ++--
 .../catalina/ha/session/LocalStrings_fr.properties |  84 +++
 .../catalina/ha/session/LocalStrings_ja.properties |  84 +++
 .../catalina/ha/tcp/LocalStrings_es.properties |  20 +-
 .../catalina/ha/tcp/LocalStrings_fr.properties |  30 +++
 .../catalina/ha/tcp/LocalStrings_ja.properties |  30 +++
 .../catalina/loader/LocalStrings_es.properties |  18 +-
 .../catalina/loader/LocalStrings_fr.properties |  47 +++-
 .../catalina/loader/LocalStrings_ja.properties |  47 +++-
 .../loader/LocalStrings_ru.properties} |   1 +
 .../catalina/manager/LocalStrings_es.properties|  71 +++---
 .../catalina/manager/LocalStrings_fr.properties| 137 ---
 .../catalina/manager/LocalStrings_ja.properties| 120 --
 .../catalina/manager/LocalStrings_ru.properties|   2 +-
 .../manager/host/LocalStrings_es.properties|  36 +--
 .../manager/host/LocalStrings_fr.properties|  84 +++
 .../manager/host/LocalStrings_ja.properties|  84 +++
 .../mbeans}/LocalStrings_es.properties |   2 +-
 .../catalina/mbeans/LocalStrings_fr.properties |  11 +-
 .../catalina/mbeans/LocalStrings_ja.properties |  21 ++
 .../catalina/realm/LocalStrings_es.properties  |  79 +++
 .../catalina/realm/LocalStrings_fr.properties  | 105 ++---
 .../catalina/realm/LocalStrings_ja.properties  |  83 +--
 .../catalina/realm/LocalStrings_ru.properties} |   9 +-
 .../catalina/security/LocalStrings_fr.properties   |   8 +-
 .../catalina/security/LocalStrings_ja.properties   |   6 +
 .../catalina/servlets/LocalStrings_ja.properties   |   1 +
 .../catalina/session/LocalStrings_es.properties|  52 +++--
 .../catalina/session/LocalStrings_fr.properties|  68 +++---
 .../catalina/session/LocalStrings_ja.properties|  62 +++--
 .../catalina/startup/LocalStrings_es.properties|  89 
 .../catalina/startup/LocalStrings_fr.properties| 156 ++---
 .../catalina/startup/LocalStrings_ja.properties| 151 ++---
 .../catalina/startup/LocalStrings_ru.properties}   |   9 +-
 .../tribes/transport}/LocalStrings_fr.properties   |   1 +
 .../tribes/transport}/LocalStrings_ja.properties   |   1 +
 .../tribes/util}/LocalStrings_fr.properties|   1 +
 .../util}/LocalStrings_ja.properties   |   2 +-
 .../catalina/users/LocalStrings_es.properties  |   7 +-
 .../catalina/users/LocalStrings_fr.properties  |  13 +-
 .../catalina/users/LocalStrings_ja.properties  |  13 +-
 .../catalina/util/LocalStrings_es.properties   |  17 +-
 .../catalina/util/LocalStrings_fr.properties   |  39 +++-
 

[tomcat] 02/05: Back-port additions and corrections to the Spanish i18n messages

2019-08-15 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 5b51c2addc7808c0d1c524c1a84eee41a65ae037
Author: Mark Thomas 
AuthorDate: Thu Aug 15 16:16:39 2019 +0100

Back-port additions and corrections to the Spanish i18n messages
---
 java/javax/servlet/LocalStrings_es.properties  |   2 +-
 java/javax/servlet/http/LocalStrings_es.properties |   5 +-
 .../catalina/connector/LocalStrings_es.properties  |   4 +
 .../catalina/core/LocalStrings_es.properties   | 148 +++--
 .../catalina/deploy}/LocalStrings_es.properties|  11 +-
 .../catalina/ha/deploy/LocalStrings_es.properties  |  29 
 .../catalina/ha/session/LocalStrings_es.properties |  46 ---
 .../catalina/ha/tcp/LocalStrings_es.properties |  20 +--
 .../catalina/loader/LocalStrings_es.properties |  18 +--
 .../catalina/manager/LocalStrings_es.properties|  71 +-
 .../manager/host/LocalStrings_es.properties|  36 ++---
 .../mbeans}/LocalStrings_es.properties |   2 +-
 .../catalina/realm/LocalStrings_es.properties  |  79 +--
 .../catalina/session/LocalStrings_es.properties|  52 
 .../catalina/startup/LocalStrings_es.properties|  89 +++--
 .../catalina/users/LocalStrings_es.properties  |   7 +-
 .../catalina/util/LocalStrings_es.properties   |  17 ++-
 .../catalina/valves/LocalStrings_es.properties |  29 +++-
 java/org/apache/coyote/LocalStrings_es.properties  |   7 +
 .../apache/coyote/ajp/LocalStrings_es.properties   |   4 +-
 .../coyote/http11/LocalStrings_es.properties   |   7 +-
 .../http11/filters}/LocalStrings_es.properties |  11 +-
 .../http11/upgrade}/LocalStrings_es.properties |   3 +-
 .../jasper/resources/LocalStrings_es.properties|   2 +-
 .../{threads/res => }/LocalStrings_es.properties   |   5 +-
 .../tomcat/util/buf/LocalStrings_es.properties |   2 +
 .../util/compat}/LocalStrings_es.properties|   2 +-
 .../tomcat/util/http/LocalStrings_es.properties|  23 
 .../util/http/parser}/LocalStrings_es.properties   |  13 +-
 .../tomcat/util/scan}/LocalStrings_es.properties   |  12 +-
 .../util/threads/res/LocalStrings_es.properties|   2 +-
 .../tomcat/websocket/LocalStrings_es.properties|  44 ++
 .../websocket/server}/LocalStrings_es.properties   |  10 +-
 webapps/docs/changelog.xml |   4 +
 .../WEB-INF/classes/LocalStrings_es.properties |   2 +-
 35 files changed, 493 insertions(+), 325 deletions(-)

diff --git a/java/javax/servlet/LocalStrings_es.properties 
b/java/javax/servlet/LocalStrings_es.properties
index 604e94c..e5348f5 100644
--- a/java/javax/servlet/LocalStrings_es.properties
+++ b/java/javax/servlet/LocalStrings_es.properties
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-err.not_iso8859_1=No es un carácter ISO 8859-1: {0}
+err.not_iso8859_1=No es un carácter ISO 8859-1: [{0}]
 
 httpConstraintElement.invalidRolesDeny=No se pueden especificar Roles al 
utilizar DENY (DENEGAR)
 
diff --git a/java/javax/servlet/http/LocalStrings_es.properties 
b/java/javax/servlet/http/LocalStrings_es.properties
index 089e7d1..b673735 100644
--- a/java/javax/servlet/http/LocalStrings_es.properties
+++ b/java/javax/servlet/http/LocalStrings_es.properties
@@ -14,12 +14,13 @@
 # limitations under the License.
 
 err.cookie_name_blank=El nombre del Cookie no puede ser nulo o de longitud cero
-err.cookie_name_is_token=El nombre de Cookie {0} es una palabra reservada
+err.cookie_name_is_token=El nombre de Cookie [{0}] es una palabra reservada
 err.io.negativelength=Longitud Negativa en el metodo write
+err.io.nullArray=Se pasó un valor Null para el arreglo byte en el método de 
escritura
 err.io.short_read=Lectura Corta
 
 http.method_delete_not_supported=El Metodo HTTP DELETE no es soportado por 
esta URL
 http.method_get_not_supported=El Metodo HTTP GET no está soportado por esta URL
-http.method_not_implemented=El Metodo {0} no esta implementado por este 
servlet para esta URI
+http.method_not_implemented=El Metodo [{0}] no esta implementado por este 
servlet para esta URI
 http.method_post_not_supported=El Metodo HTTP POST no está soportado por esta 
URL
 http.method_put_not_supported=El Metodo HTTP PUT no está soportado por esta URL
diff --git a/java/org/apache/catalina/connector/LocalStrings_es.properties 
b/java/org/apache/catalina/connector/LocalStrings_es.properties
index 872cc69..8983ec1 100644
--- a/java/org/apache/catalina/connector/LocalStrings_es.properties
+++ b/java/org/apache/catalina/connector/LocalStrings_es.properties
@@ -22,6 +22,7 @@ coyoteAdapter.parsePathParam=No puedo analizar los parámetros 
de ruta mediante
 
 coyoteConnector.MapperRegistration=Mapeador de registro: {0}
 coyoteConnector.cannotRegisterProtocol=No puedo registrar MBean para el 

[tomcat] 01/03: Back-port latest French updates

2019-08-15 Thread markt
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 00f963255e320c8d169d28d1cfb1ad39ac723b25
Author: Mark Thomas 
AuthorDate: Thu Aug 15 15:15:01 2019 +0100

Back-port latest French updates
---
 java/org/apache/catalina/core/LocalStrings_fr.properties   | 1 +
 java/org/apache/naming/factory/LocalStrings_fr.properties  | 4 
 java/org/apache/tomcat/util/buf/LocalStrings_fr.properties | 3 +++
 java/org/apache/tomcat/util/net/jsse/LocalStrings_fr.properties| 2 ++
 java/org/apache/tomcat/util/net/openssl/LocalStrings_fr.properties | 1 +
 5 files changed, 11 insertions(+)

diff --git a/java/org/apache/catalina/core/LocalStrings_fr.properties 
b/java/org/apache/catalina/core/LocalStrings_fr.properties
index 9939ec7..dd4e98d 100644
--- a/java/org/apache/catalina/core/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/core/LocalStrings_fr.properties
@@ -92,6 +92,7 @@ aprListener.tooLateForSSLRandomSeed=setSSLRandomSeed 
impossible: SSL a déjà é
 aprListener.wrongFIPSMode=Valuer inattendue de l''option FIPSMode de 
AprLifecycleListener: [{0}]
 
 asyncContextImpl.asyncDispachError=Erreur lors d'un dispatch asynchrone
+asyncContextImpl.asyncRunnableError=Erreur lors du traitement asynchrone du 
Runnable via AsyncContext.start()
 asyncContextImpl.dispatchingStarted=Une opération de dispatch asynchrone a 
déjà été appelée, plusieurs dispatch au cours d'un même cycle asynchrone n'est 
pas autorisé
 asyncContextImpl.noAsyncDispatcher=Le Servlet dispatcher retourné par le 
ServletContext ne supporte pas de dispatch asynchrone
 asyncContextImpl.onCompleteError=L''appel à onComplete() a échoué pour 
l''écouteur de type [{0}]
diff --git a/java/org/apache/naming/factory/LocalStrings_fr.properties 
b/java/org/apache/naming/factory/LocalStrings_fr.properties
index 18cc08f..e427e8b 100644
--- a/java/org/apache/naming/factory/LocalStrings_fr.properties
+++ b/java/org/apache/naming/factory/LocalStrings_fr.properties
@@ -15,6 +15,10 @@
 
 dataSourceLinkFactory.badWrapper=Pas un enrobeur pour le type [{0}]
 
+factoryBase.factoryClassError=Impossible de charger la classe de la fabrique 
de ressources
+factoryBase.factoryCreationError=Impossible de créer l'instance de la fabrique 
de ressources
+factoryBase.instanceCreationError=Impossible de créer l'instance de la 
ressource
+
 lookupFactory.circularReference=Trouvé une référence circulaire avec [{0}]
 lookupFactory.createFailed=Echec de création de l'instance de la classe de 
fabrique de recherche JNDI
 lookupFactory.loadFailed=Echec de chargement de la classe de fabrique de 
recherche JNDI
diff --git a/java/org/apache/tomcat/util/buf/LocalStrings_fr.properties 
b/java/org/apache/tomcat/util/buf/LocalStrings_fr.properties
index 5f13d1a..245d5fe 100644
--- a/java/org/apache/tomcat/util/buf/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/util/buf/LocalStrings_fr.properties
@@ -13,6 +13,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+asn1Parser.lengthInvalid=Une longueur d''octets invalide [{0}] a été rapportée 
alors que la longueur de données en entrée est de [{1}] octets
+asn1Parser.tagMismatch=La valeur [{0}] était attendue mais la valeur [{1}] a 
été rencontrée
+
 b2cConverter.unknownEncoding=L''encodage de caractères [{0}] n''est pas 
supporté
 
 byteBufferUtils.cleaner=Impossible d'utiliser le nettoyeur de ByteBuffers 
directs, une fuite de mémoire peut se produire
diff --git a/java/org/apache/tomcat/util/net/jsse/LocalStrings_fr.properties 
b/java/org/apache/tomcat/util/net/jsse/LocalStrings_fr.properties
index 14ce0ce..36dae5f 100644
--- a/java/org/apache/tomcat/util/net/jsse/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/util/net/jsse/LocalStrings_fr.properties
@@ -35,3 +35,5 @@ jsseUtil.noCrlSupport=Le truststoreProvider [{0}] ne supporte 
pas d''option de c
 jsseUtil.noVerificationDepth=Le truststoreProvider [{0}] ne supporte pas 
l''option de configuration certificateVerificationDepth
 jsseUtil.trustedCertNotChecked=Les dates de validité du certificat de 
confiance dont l''alias est [{0}] n''ont pas été vérifiées car sont type est 
inconnu
 jsseUtil.trustedCertNotValid=Le certificat de confiance avec l''alias [{0}] et 
le DN [{1}] n''est pas valide à cause de [{2}], les certificats signés par ce 
certificat de confiance SERONT acceptés
+
+pemFile.noMultiPrimes=Le certificat PKCS#1 est dans un format mutli-prime et 
Java ne fournit pas d'API pour construire une clé privée RSA à partir de ce 
format
diff --git a/java/org/apache/tomcat/util/net/openssl/LocalStrings_fr.properties 
b/java/org/apache/tomcat/util/net/openssl/LocalStrings_fr.properties
index b9238be..ecdf34a 100644
--- a/java/org/apache/tomcat/util/net/openssl/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/util/net/openssl/LocalStrings_fr.properties
@@ -51,6 

[tomcat] 03/03: Copy utility classes to back-port translations

2019-08-15 Thread markt
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 57e0b2dc0eeb50e47049b7667fc297f52b895283
Author: Mark Thomas 
AuthorDate: Thu Aug 15 16:07:07 2019 +0100

Copy utility classes to back-port translations
---
 .../tomcat/buildutil/translate/BackportBase.java   | 65 +
 .../buildutil/translate/BackportEnglish.java   | 51 +
 .../buildutil/translate/BackportTranslations.java  | 66 ++
 3 files changed, 182 insertions(+)

diff --git a/java/org/apache/tomcat/buildutil/translate/BackportBase.java 
b/java/org/apache/tomcat/buildutil/translate/BackportBase.java
new file mode 100644
index 000..1a4830f
--- /dev/null
+++ b/java/org/apache/tomcat/buildutil/translate/BackportBase.java
@@ -0,0 +1,65 @@
+/*
+* 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;
+
+/**
+ * Base class providing common implementation for back-port utilities.
+ */
+public abstract class BackportBase {
+
+protected final Map sourceTranslations = new 
HashMap<>();
+protected final Map targetTranslations = new 
HashMap<>();
+protected final File targetRoot;
+protected final Properties sourceEnglish;
+protected final Properties targetEnglish;
+protected final File storageDir;
+
+protected BackportBase(String... args) throws IOException {
+if (args.length != 1) {
+throw new IllegalArgumentException("Missing back-port target");
+}
+targetRoot = new File(args[0]);
+
+if (!targetRoot.isDirectory()) {
+throw new IllegalArgumentException("Back-port target not a 
directory");
+}
+
+File sourceRoot = new File(".");
+for (String dir : Constants.SEARCH_DIRS) {
+File directory = new File(dir);
+Utils.processDirectory(sourceRoot, directory, sourceTranslations);
+}
+
+for (String dir : Constants.SEARCH_DIRS) {
+File directory = new File(targetRoot, dir);
+Utils.processDirectory(targetRoot, directory, targetTranslations);
+}
+
+sourceEnglish = sourceTranslations.get("");
+targetEnglish = targetTranslations.get("");
+
+storageDir = new File(targetRoot, Constants.STORAGE_DIR);
+}
+
+protected abstract void execute() throws IOException;
+}
diff --git a/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java 
b/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java
new file mode 100644
index 000..c6f9608
--- /dev/null
+++ b/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java
@@ -0,0 +1,51 @@
+/*
+* 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.IOException;
+
+/**
+ * Generates a set of English property files to back-port updates to a previous
+ * version. Where a key exists in the source and target versions the value is
+ * copied from the source to the target, overwriting the value in the target.
+ * The expectation is that the changes will be manually reviewed before
+ * committing them.
+ */
+public class BackportEnglish extends BackportBase {
+
+public static void main(String... args) throws IOException {
+

[tomcat] branch 8.5.x updated (be0d580 -> 57e0b2d)

2019-08-15 Thread markt
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 be0d580  Add Simplified Chinese translations
 new 00f9632  Back-port latest French updates
 new 7de4b29  Back-port additional simplified Chinese translations
 new 57e0b2d  Copy utility classes to back-port translations

The 3 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:
 .../connector/LocalStrings_zh_CN.properties|  2 +
 .../catalina/core/LocalStrings_fr.properties   |  1 +
 .../catalina/core/LocalStrings_zh_CN.properties|  6 ++
 .../ha/deploy/LocalStrings_zh_CN.properties|  2 +
 .../ha/session/LocalStrings_zh_CN.properties   |  5 ++
 .../catalina/manager/LocalStrings_zh_CN.properties | 99 ++
 .../manager/host/LocalStrings_zh_CN.properties | 38 -
 .../catalina/mapper/LocalStrings_zh_CN.properties  |  1 +
 .../catalina/realm/LocalStrings_zh_CN.properties   |  1 +
 .../servlets/LocalStrings_zh_CN.properties |  2 +
 .../catalina/session/LocalStrings_zh_CN.properties |  3 +
 .../catalina/startup/LocalStrings_zh_CN.properties |  5 +-
 .../tribes/group/LocalStrings_zh_CN.properties |  1 +
 .../interceptors/LocalStrings_zh_CN.properties |  2 +
 .../membership/LocalStrings_zh_CN.properties   |  3 +
 .../tribes/tipis/LocalStrings_zh_CN.properties |  1 +
 .../transport/nio/LocalStrings_zh_CN.properties|  4 +
 .../tribes/util/LocalStrings_zh_CN.properties  |  1 +
 .../catalina/users/LocalStrings_zh_CN.properties   |  1 +
 .../webresources/LocalStrings_zh_CN.properties |  1 +
 .../coyote/http11/LocalStrings_zh_CN.properties|  2 +-
 .../coyote/http2/LocalStrings_zh_CN.properties |  5 ++
 .../jasper/resources/LocalStrings_zh_CN.properties |  4 +
 .../naming/factory/LocalStrings_fr.properties  |  4 +
 .../naming/factory/LocalStrings_zh_CN.properties   |  2 +
 .../tomcat/buildutil/translate/BackportBase.java   | 65 ++
 .../buildutil/translate/BackportEnglish.java   | 51 +++
 .../buildutil/translate/BackportTranslations.java  | 66 +++
 .../tomcat/util/buf/LocalStrings_fr.properties |  3 +
 .../tomcat/util/buf/LocalStrings_zh_CN.properties  |  1 +
 .../tomcat/util/http/LocalStrings_zh_CN.properties |  1 +
 .../tomcat/util/net/LocalStrings_zh_CN.properties  |  5 +-
 .../util/net/jsse/LocalStrings_fr.properties   |  2 +
 .../util/net/openssl/LocalStrings_fr.properties|  1 +
 .../tomcat/websocket/LocalStrings_zh_CN.properties |  1 +
 35 files changed, 386 insertions(+), 6 deletions(-)
 create mode 100644 java/org/apache/tomcat/buildutil/translate/BackportBase.java
 create mode 100644 
java/org/apache/tomcat/buildutil/translate/BackportEnglish.java
 create mode 100644 
java/org/apache/tomcat/buildutil/translate/BackportTranslations.java


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat] 02/03: Back-port additional simplified Chinese translations

2019-08-15 Thread markt
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 7de4b297c383966d977862c1afc8ba47bbc8
Author: Mark Thomas 
AuthorDate: Thu Aug 15 15:15:21 2019 +0100

Back-port additional simplified Chinese translations
---
 .../connector/LocalStrings_zh_CN.properties|  2 +
 .../catalina/core/LocalStrings_zh_CN.properties|  6 ++
 .../ha/deploy/LocalStrings_zh_CN.properties|  2 +
 .../ha/session/LocalStrings_zh_CN.properties   |  5 ++
 .../catalina/manager/LocalStrings_zh_CN.properties | 99 ++
 .../manager/host/LocalStrings_zh_CN.properties | 38 -
 .../catalina/mapper/LocalStrings_zh_CN.properties  |  1 +
 .../catalina/realm/LocalStrings_zh_CN.properties   |  1 +
 .../servlets/LocalStrings_zh_CN.properties |  2 +
 .../catalina/session/LocalStrings_zh_CN.properties |  3 +
 .../catalina/startup/LocalStrings_zh_CN.properties |  5 +-
 .../tribes/group/LocalStrings_zh_CN.properties |  1 +
 .../interceptors/LocalStrings_zh_CN.properties |  2 +
 .../membership/LocalStrings_zh_CN.properties   |  3 +
 .../tribes/tipis/LocalStrings_zh_CN.properties |  1 +
 .../transport/nio/LocalStrings_zh_CN.properties|  4 +
 .../tribes/util/LocalStrings_zh_CN.properties  |  1 +
 .../catalina/users/LocalStrings_zh_CN.properties   |  1 +
 .../webresources/LocalStrings_zh_CN.properties |  1 +
 .../coyote/http11/LocalStrings_zh_CN.properties|  2 +-
 .../coyote/http2/LocalStrings_zh_CN.properties |  5 ++
 .../jasper/resources/LocalStrings_zh_CN.properties |  4 +
 .../naming/factory/LocalStrings_zh_CN.properties   |  2 +
 .../tomcat/util/buf/LocalStrings_zh_CN.properties  |  1 +
 .../tomcat/util/http/LocalStrings_zh_CN.properties |  1 +
 .../tomcat/util/net/LocalStrings_zh_CN.properties  |  5 +-
 .../tomcat/websocket/LocalStrings_zh_CN.properties |  1 +
 27 files changed, 193 insertions(+), 6 deletions(-)

diff --git a/java/org/apache/catalina/connector/LocalStrings_zh_CN.properties 
b/java/org/apache/catalina/connector/LocalStrings_zh_CN.properties
index b6c2c69..fbd1f02 100644
--- a/java/org/apache/catalina/connector/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/connector/LocalStrings_zh_CN.properties
@@ -19,6 +19,7 @@ coyoteAdapter.parsePathParam=无法使用编码[{0}]解析地址参数,url中
 
 coyoteConnector.invalidEncoding=编码 [{0}] 不能被 JRE 识别,Connector 将继续使用 [{1}]
 coyoteConnector.invalidPort=连接器不能启动,因为指定的端口 [{0}]无效
+coyoteConnector.parseBodyMethodNoTrace=方法TRACE禁止包含实体(详情查看RFC 2616 章节 9.6)
 coyoteConnector.protocolHandlerInstantiationFailed=协议处理程序实例化失败
 coyoteConnector.protocolHandlerPauseFailed=协议处理程序暂停失败
 coyoteConnector.protocolHandlerStopFailed=协议处理程序.停止失败
@@ -26,6 +27,7 @@ coyoteConnector.protocolHandlerStopFailed=协议处理程序.停止失败
 coyoteInputStream.nbNotready=在非阻塞模式下,只有之前的读数据完成,并且isReady()方法返回true,你才可以使用 
ServletInputStream 读取数据
 
 coyoteRequest.changeSessionId=无法更改 session ID。 没有与此请求关联的 session。
+coyoteRequest.chunkedPostTooLarge=由于请求参数数据太大,导致参数不能解析。因为当前请求是块状请求,后续也不会处理。如果应用程序需要接收大的POST请求,可以使用连接器的maxPostSize解决它。
 coyoteRequest.filterAsyncSupportUnknown=无法确定是否有任何过滤器不支持异步处理
 coyoteRequest.gssLifetimeFail=为用户主体 [{0}] 获取剩余生命期失败
 coyoteRequest.noMultipartConfig=由于没有提供multi-part配置,无法处理parts
diff --git a/java/org/apache/catalina/core/LocalStrings_zh_CN.properties 
b/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
index f4fa870..401d11e 100644
--- a/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
@@ -51,9 +51,11 @@ filterChain.filter=Filter 执行抛出一个异常
 naming.addEnvEntry=添加环境条目 [{0}]
 naming.addResourceEnvRef=添加资源环境引用 [{0}]
 naming.invalidEnvEntryType=环境条目[{0}]没有一个有效哦的类型
+naming.jmxRegistrationFailed=注册到JMX失败:[{0}]
 naming.namingContextCreationFailed=创建上下文名称失败
 naming.wsdlFailed=未找到 wsdl 文件:[{0}]
 
+standardContext.applicationListener=配置应用程序监听器[{0}]错误
 standardContext.backgroundProcess.resources=异常处理资源[{0}] 后台进程
 standardContext.cookieProcessor.null=不允许将上下文的CookieProcessor 设置为null
 standardContext.errorPage.required=ErrorPage不能为null
@@ -68,19 +70,23 @@ standardContext.listenerStart=异常将上下文初始化事件发送到类的
 standardContext.loginConfig.errorPage=表单错误页[{0}]必须以"/"开始
 standardContext.loginConfig.errorWarning=警告:Servlet 2.4中,表单错误页[{0}]必须以"/"开始
 standardContext.loginConfig.loginPage=表单登录页面 [{0}] 必须以''/''开头
+standardContext.manager=配置类为[{0}]的管理器
 standardContext.managerFail=会话管理器无法启动
 standardContext.namingResource.init.fail=未能初始化新的命名资源
 standardContext.notStarted=名为[{0}]的上下文还没有被启动
 standardContext.parameter.duplicate=重复的上下文初始化参数[{0}]
 standardContext.predestroy.duplicate=类 [{0}] 的 @PreDestroy 方法定义重复
+standardContext.resourcesInit=初始化静态变量错误
 standardContext.resourcesStart=启动静态资源出错
 standardContext.resourcesStop=停止静态资源时出错
 standardContext.securityConstraint.mixHttpMethod=在相同的web资源集合中不允许混用: 
 和 
 standardContext.securityConstraint.pattern=安全约束中的 [{0}] 无效
 

[tomcat] 01/02: Back-port import code so bulk updates can be imported from 8.5.x

2019-08-15 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 8a74ed9e3561a0a33bf7e848a38dde1d64c67bbe
Author: Mark Thomas 
AuthorDate: Thu Aug 15 15:59:43 2019 +0100

Back-port import code so bulk updates can be imported from 8.5.x
---
 .../tomcat/buildutil/translate/Constants.java  |  29 
 .../apache/tomcat/buildutil/translate/Import.java  | 135 
 .../apache/tomcat/buildutil/translate/Utils.java   | 180 +
 3 files changed, 344 insertions(+)

diff --git a/java/org/apache/tomcat/buildutil/translate/Constants.java 
b/java/org/apache/tomcat/buildutil/translate/Constants.java
new file mode 100644
index 000..403daa6
--- /dev/null
+++ b/java/org/apache/tomcat/buildutil/translate/Constants.java
@@ -0,0 +1,29 @@
+/*
+* 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;
+
+public class Constants {
+
+public static final String L10N_PREFIX = "LocalStrings";
+public static final String L10N_SUFFIX = ".properties";
+
+public static final String[] SEARCH_DIRS = new String[] { "java", 
"webapps" };
+
+public static final String STORAGE_DIR = ".settings/translations";
+
+public static final String END_PACKAGE_MARKER = ".zzz.";
+}
diff --git a/java/org/apache/tomcat/buildutil/translate/Import.java 
b/java/org/apache/tomcat/buildutil/translate/Import.java
new file mode 100644
index 000..61ee9b1
--- /dev/null
+++ b/java/org/apache/tomcat/buildutil/translate/Import.java
@@ -0,0 +1,135 @@
+/*
+* 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.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+import java.util.Arrays;
+import java.util.Properties;
+
+public class Import {
+
+private static final String LINE_SEP = 
System.getProperty("line.separator");
+
+
+public static void main(String... args) throws IOException {
+File root = new File(Constants.STORAGE_DIR);
+
+for (File f : root.listFiles()) {
+// Not robust but good enough
+if (f.isFile() && f.getName().startsWith(Constants.L10N_PREFIX)) {
+processFile(f);
+}
+}
+}
+
+
+@SuppressWarnings("null")
+private static void processFile(File f) throws IOException {
+String language = Utils.getLanguage(f.getName());
+
+// Unlike the master branch, don't skip the original so we can import
+// updates to the English translations
+Properties props = Utils.load(f);
+Object[] objKeys = props.keySet().toArray();
+Arrays.sort(objKeys);
+
+String currentPkg = null;
+Writer w = null;
+String currentGroup = "zzz";
+
+for (Object objKey : objKeys) {
+String key = (String) objKey;
+CompositeKey cKey = new CompositeKey(key);
+
+if (!cKey.pkg.equals(currentPkg)) {
+currentPkg = cKey.pkg;
+if (w != null) {
+w.close();
+}
+File outFile = new File(currentPkg.replace('.', 
File.separatorChar), Constants.L10N_PREFIX + language + Constants.L10N_SUFFIX);
+FileOutputStream fos = new FileOutputStream(outFile);
+w = new 

[tomcat] branch 7.0.x updated (0424263 -> 05806e7)

2019-08-15 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a change to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git.


from 0424263  Remove unnecessary code
 new 8a74ed9  Back-port import code so bulk updates can be imported from 
8.5.x
 new 05806e7  Back-port corrections and improvements to English i18n 
messages

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/LocalStrings.properties |   2 +-
 java/javax/servlet/http/LocalStrings.properties|   6 +-
 .../apache/catalina/core/LocalStrings.properties   | 144 -
 .../catalina/ha/deploy/LocalStrings.properties |  12 +-
 .../catalina/ha/session/LocalStrings.properties|  72 -
 .../apache/catalina/ha/tcp/LocalStrings.properties |  20 +--
 .../apache/catalina/loader/LocalStrings.properties |  18 +--
 .../catalina/manager/LocalStrings.properties   |  10 +-
 .../apache/catalina/mbeans/LocalStrings.properties |  10 +-
 .../apache/catalina/realm/LocalStrings.properties  |  94 +--
 .../catalina/session/LocalStrings.properties   |  54 +++
 .../catalina/startup/LocalStrings.properties   |  90 +--
 .../apache/catalina/users/LocalStrings.properties  |   6 +-
 .../apache/catalina/util/LocalStrings.properties   |   4 +-
 .../apache/catalina/valves/LocalStrings.properties |  10 +-
 java/org/apache/coyote/ajp/LocalStrings.properties |   6 +-
 .../apache/coyote/http11/LocalStrings.properties   |   2 +-
 .../tomcat/buildutil/translate/Constants.java  |  16 +-
 .../apache/tomcat/buildutil/translate/Import.java  | 135 
 .../apache/tomcat/buildutil/translate/Utils.java   | 180 +
 .../tomcat/util/http/LocalStrings.properties   |   2 +-
 .../util/http/parser/LocalStrings.properties   |   2 +-
 .../tomcat/util/scan/LocalStrings.properties   |  10 +-
 .../util/threads/res/LocalStrings.properties   |   2 +-
 .../websocket/server/LocalStrings.properties   |   2 +-
 webapps/docs/changelog.xml |   4 +
 26 files changed, 615 insertions(+), 298 deletions(-)
 copy webapps/examples/WEB-INF/classes/checkbox/CheckTest.java => 
java/org/apache/tomcat/buildutil/translate/Constants.java (66%)
 create mode 100644 java/org/apache/tomcat/buildutil/translate/Import.java
 create mode 100644 java/org/apache/tomcat/buildutil/translate/Utils.java


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat] 02/02: Back-port corrections and improvements to English i18n messages

2019-08-15 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 05806e7a6b00571313c8ce5052fe79f36ad3d09a
Author: Mark Thomas 
AuthorDate: Thu Aug 15 16:00:43 2019 +0100

Back-port corrections and improvements to English i18n messages
---
 java/javax/servlet/LocalStrings.properties |   2 +-
 java/javax/servlet/http/LocalStrings.properties|   6 +-
 .../apache/catalina/core/LocalStrings.properties   | 144 ++---
 .../catalina/ha/deploy/LocalStrings.properties |  12 +-
 .../catalina/ha/session/LocalStrings.properties|  72 +--
 .../apache/catalina/ha/tcp/LocalStrings.properties |  20 +--
 .../apache/catalina/loader/LocalStrings.properties |  18 +--
 .../catalina/manager/LocalStrings.properties   |  10 +-
 .../apache/catalina/mbeans/LocalStrings.properties |  10 +-
 .../apache/catalina/realm/LocalStrings.properties  |  94 +++---
 .../catalina/session/LocalStrings.properties   |  54 
 .../catalina/startup/LocalStrings.properties   |  90 ++---
 .../apache/catalina/users/LocalStrings.properties  |   6 +-
 .../apache/catalina/util/LocalStrings.properties   |   4 +-
 .../apache/catalina/valves/LocalStrings.properties |  10 +-
 java/org/apache/coyote/ajp/LocalStrings.properties |   6 +-
 .../apache/coyote/http11/LocalStrings.properties   |   2 +-
 .../tomcat/util/http/LocalStrings.properties   |   2 +-
 .../util/http/parser/LocalStrings.properties   |   2 +-
 .../tomcat/util/scan/LocalStrings.properties   |  10 +-
 .../util/threads/res/LocalStrings.properties   |   2 +-
 .../websocket/server/LocalStrings.properties   |   2 +-
 webapps/docs/changelog.xml |   4 +
 23 files changed, 293 insertions(+), 289 deletions(-)

diff --git a/java/javax/servlet/LocalStrings.properties 
b/java/javax/servlet/LocalStrings.properties
index 0c880a3..b57cb4c 100644
--- a/java/javax/servlet/LocalStrings.properties
+++ b/java/javax/servlet/LocalStrings.properties
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-err.not_iso8859_1=Not an ISO 8859-1 character: {0}
+err.not_iso8859_1=Not an ISO 8859-1 character: [{0}]
 
 httpConstraintElement.invalidRolesDeny=Roles may not be specified when using 
DENY
 
diff --git a/java/javax/servlet/http/LocalStrings.properties 
b/java/javax/servlet/http/LocalStrings.properties
index 6c69cec..8f71d86 100644
--- a/java/javax/servlet/http/LocalStrings.properties
+++ b/java/javax/servlet/http/LocalStrings.properties
@@ -14,13 +14,13 @@
 # limitations under the License.
 
 err.cookie_name_blank=Cookie name may not be null or zero length
-err.cookie_name_is_token=Cookie name "{0}" is a reserved token
+err.cookie_name_is_token=Cookie name [{0}] is a reserved token
 err.io.indexOutOfBounds=Invalid offset [{0}] and / or length [{1}] specified 
for array of size [{2}]
 err.io.nullArray=Null passed for byte array in write method
 err.io.short_read=Short Read
 
-http.method_delete_not_supported=Http method DELETE is not supported by this 
URL
+http.method_delete_not_supported=HTTP method DELETE is not supported by this 
URL
 http.method_get_not_supported=HTTP method GET is not supported by this URL
-http.method_not_implemented=Method {0} is not implemented by this servlet for 
this URI
+http.method_not_implemented=Method [{0}] is not implemented by this Servlet 
for this URI
 http.method_post_not_supported=HTTP method POST is not supported by this URL
 http.method_put_not_supported=HTTP method PUT is not supported by this URL
diff --git a/java/org/apache/catalina/core/LocalStrings.properties 
b/java/org/apache/catalina/core/LocalStrings.properties
index 3d40c12..8c78f97 100644
--- a/java/org/apache/catalina/core/LocalStrings.properties
+++ b/java/org/apache/catalina/core/LocalStrings.properties
@@ -13,14 +13,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-applicationContext.addFilter.ise=Filters can not be added to context {0} as 
the context has been initialised
+applicationContext.addFilter.ise=Filters cannot be added to context [{0}] as 
the context has been initialised
 applicationContext.addListener.iae.cnfe=Unable to create an instance of type 
[{0}]
 applicationContext.addListener.iae.init=Unable to add an instance of type 
[{0}] as a listener
 applicationContext.addListener.iae.sclNotAllowed=Once the first 
ServletContextListener has been called, no more ServletContextListeners may be 
added.
 applicationContext.addListener.iae.wrongType=The type specified [{0}] is not 
one of the expected listener types
-applicationContext.addListener.ise=Listeners can not be added to context {0} 
as the context has been initialised
-applicationContext.addRole.ise=Roles can not be added to context {0} as the 
context has been initialised

[GitHub] [tomcat] markt-asf commented on issue #189: Additional translations of Chinese

2019-08-15 Thread GitBox
markt-asf commented on issue #189: Additional translations of Chinese
URL: https://github.com/apache/tomcat/pull/189#issuecomment-521657310
 
 
   Just to let you know, I've written some utilities to back-port the 
translations and have run them for 9.0.x -> 8.5.x. I've also picked up the 
translations you've added so far at poeditor.
   I'll work on 8.5.x -> 7.0.x next. Watch the Tomcat dev list for progress 
updates.


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.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat] 02/02: Additional simplified Chinese translations by leeyazhou

2019-08-15 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 424e3fe186b60b8a932637fc2cb2c81a7ec294f5
Author: Mark Thomas 
AuthorDate: Thu Aug 15 15:12:57 2019 +0100

Additional simplified Chinese translations by leeyazhou
---
 .../connector/LocalStrings_zh_CN.properties|   2 +
 .../catalina/core/LocalStrings_zh_CN.properties|   6 ++
 .../ha/deploy/LocalStrings_zh_CN.properties|   2 +
 .../ha/session/LocalStrings_zh_CN.properties   |   5 +
 .../catalina/manager/LocalStrings_zh_CN.properties | 117 +
 .../manager/host/LocalStrings_zh_CN.properties |  38 ++-
 .../catalina/mapper/LocalStrings_zh_CN.properties  |   1 +
 .../catalina/realm/LocalStrings_zh_CN.properties   |   1 +
 .../servlets/LocalStrings_zh_CN.properties |   2 +
 .../catalina/session/LocalStrings_zh_CN.properties |   3 +
 .../catalina/startup/LocalStrings_zh_CN.properties |   6 +-
 .../tribes/group/LocalStrings_zh_CN.properties |   1 +
 .../interceptors/LocalStrings_zh_CN.properties |   2 +
 .../membership/LocalStrings_zh_CN.properties   |   3 +
 .../membership/cloud/LocalStrings_zh_CN.properties |   5 +-
 .../tribes/tipis/LocalStrings_zh_CN.properties |   1 +
 .../transport/nio/LocalStrings_zh_CN.properties|   4 +
 .../tribes/util/LocalStrings_zh_CN.properties  |   1 +
 .../catalina/users/LocalStrings_zh_CN.properties   |   1 +
 .../webresources/LocalStrings_zh_CN.properties |   1 +
 .../coyote/http11/LocalStrings_zh_CN.properties|   2 +-
 .../coyote/http2/LocalStrings_zh_CN.properties |   5 +
 .../jasper/resources/LocalStrings_zh_CN.properties |   4 +
 .../naming/factory/LocalStrings_zh_CN.properties   |   2 +
 .../tomcat/util/buf/LocalStrings_zh_CN.properties  |   1 +
 .../tomcat/util/http/LocalStrings_zh_CN.properties |   1 +
 .../tomcat/util/net/LocalStrings_zh_CN.properties  |   5 +-
 .../tomcat/websocket/LocalStrings_zh_CN.properties |   1 +
 webapps/docs/changelog.xml |   5 +
 29 files changed, 221 insertions(+), 7 deletions(-)

diff --git a/java/org/apache/catalina/connector/LocalStrings_zh_CN.properties 
b/java/org/apache/catalina/connector/LocalStrings_zh_CN.properties
index 650fd7f..835e729 100644
--- a/java/org/apache/catalina/connector/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/connector/LocalStrings_zh_CN.properties
@@ -19,6 +19,7 @@ coyoteAdapter.parsePathParam=无法使用编码[{0}]解析地址参数,url中
 
 coyoteConnector.invalidEncoding=编码 [{0}] 不能被 JRE 识别,Connector 将继续使用 [{1}]
 coyoteConnector.invalidPort=连接器不能启动,因为指定的端口 [{0}]无效
+coyoteConnector.parseBodyMethodNoTrace=方法TRACE禁止包含实体(详情查看RFC 2616 章节 9.6)
 coyoteConnector.protocolHandlerInstantiationFailed=协议处理程序实例化失败
 coyoteConnector.protocolHandlerNoAprLibrary=配置的协议[{0}]需要不可用的APR/本机库
 
coyoteConnector.protocolHandlerNoAprListener=配置的协议[{0}]需要不可用的aprlifecycleListener
@@ -28,6 +29,7 @@ coyoteConnector.protocolHandlerStopFailed=协议处理程序.停止失败
 coyoteInputStream.nbNotready=在非阻塞模式下,只有之前的读数据完成,并且isReady()方法返回true,你才可以使用 
ServletInputStream 读取数据
 
 coyoteRequest.changeSessionId=无法更改 session ID。 没有与此请求关联的 session。
+coyoteRequest.chunkedPostTooLarge=由于请求参数数据太大,导致参数不能解析。因为当前请求是块状请求,后续也不会处理。如果应用程序需要接收大的POST请求,可以使用连接器的maxPostSize解决它。
 coyoteRequest.filterAsyncSupportUnknown=无法确定是否有任何过滤器不支持异步处理
 coyoteRequest.gssLifetimeFail=为用户主体 [{0}] 获取剩余生命期失败
 coyoteRequest.noMultipartConfig=由于没有提供multi-part配置,无法处理parts
diff --git a/java/org/apache/catalina/core/LocalStrings_zh_CN.properties 
b/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
index 01d4c4d..cd0a37b 100644
--- a/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
@@ -52,9 +52,11 @@ filterChain.filter=Filter 执行抛出一个异常
 naming.addEnvEntry=添加环境条目 [{0}]
 naming.addResourceEnvRef=添加资源环境引用 [{0}]
 naming.invalidEnvEntryType=环境条目[{0}]没有一个有效哦的类型
+naming.jmxRegistrationFailed=注册到JMX失败:[{0}]
 naming.namingContextCreationFailed=创建上下文名称失败
 naming.wsdlFailed=未找到 wsdl 文件:[{0}]
 
+standardContext.applicationListener=配置应用程序监听器[{0}]错误
 standardContext.backgroundProcess.resources=异常处理资源[{0}] 后台进程
 standardContext.cookieProcessor.null=不允许将上下文的CookieProcessor 设置为null
 standardContext.errorPage.required=ErrorPage不能为null
@@ -69,19 +71,23 @@ standardContext.listenerStart=异常将上下文初始化事件发送到类的
 standardContext.loginConfig.errorPage=表单错误页[{0}]必须以"/"开始
 standardContext.loginConfig.errorWarning=警告:Servlet 2.4中,表单错误页[{0}]必须以"/"开始
 standardContext.loginConfig.loginPage=表单登录页面 [{0}] 必须以''/''开头
+standardContext.manager=配置类为[{0}]的管理器
 standardContext.managerFail=会话管理器无法启动
 standardContext.namingResource.init.fail=未能初始化新的命名资源
 standardContext.notStarted=名为[{0}]的上下文还没有被启动
 standardContext.parameter.duplicate=重复的上下文初始化参数[{0}]
 standardContext.predestroy.duplicate=类 [{0}] 的 @PreDestroy 方法定义重复
+standardContext.resourcesInit=初始化静态变量错误
 

[tomcat] branch master updated (ef8ccbeb -> 424e3fe)

2019-08-15 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git.


from ef8ccbeb Add utility to back-port translation updates
 new 06c7f44  Update French translations
 new 424e3fe  Additional simplified Chinese translations by leeyazhou

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:
 .../connector/LocalStrings_zh_CN.properties|   2 +
 .../catalina/core/LocalStrings_fr.properties   |   1 +
 .../catalina/core/LocalStrings_zh_CN.properties|   6 ++
 .../ha/deploy/LocalStrings_zh_CN.properties|   2 +
 .../ha/session/LocalStrings_zh_CN.properties   |   5 +
 .../catalina/manager/LocalStrings_zh_CN.properties | 117 +
 .../manager/host/LocalStrings_zh_CN.properties |  38 ++-
 .../catalina/mapper/LocalStrings_zh_CN.properties  |   1 +
 .../catalina/realm/LocalStrings_zh_CN.properties   |   1 +
 .../servlets/LocalStrings_zh_CN.properties |   2 +
 .../catalina/session/LocalStrings_zh_CN.properties |   3 +
 .../catalina/startup/LocalStrings_zh_CN.properties |   6 +-
 .../tribes/group/LocalStrings_zh_CN.properties |   1 +
 .../interceptors/LocalStrings_zh_CN.properties |   2 +
 .../membership/LocalStrings_zh_CN.properties   |   3 +
 .../membership/cloud/LocalStrings_zh_CN.properties |   5 +-
 .../tribes/tipis/LocalStrings_zh_CN.properties |   1 +
 .../transport/nio/LocalStrings_zh_CN.properties|   4 +
 .../tribes/util/LocalStrings_zh_CN.properties  |   1 +
 .../catalina/users/LocalStrings_zh_CN.properties   |   1 +
 .../webresources/LocalStrings_zh_CN.properties |   1 +
 .../coyote/http11/LocalStrings_zh_CN.properties|   2 +-
 .../coyote/http2/LocalStrings_zh_CN.properties |   5 +
 .../jasper/resources/LocalStrings_zh_CN.properties |   4 +
 .../naming/factory/LocalStrings_fr.properties  |   4 +
 .../naming/factory/LocalStrings_zh_CN.properties   |   2 +
 .../tomcat/util/buf/LocalStrings_fr.properties |   3 +
 .../tomcat/util/buf/LocalStrings_zh_CN.properties  |   1 +
 .../tomcat/util/http/LocalStrings_zh_CN.properties |   1 +
 .../tomcat/util/net/LocalStrings_zh_CN.properties  |   5 +-
 .../util/net/jsse/LocalStrings_fr.properties   |   2 +
 .../util/net/openssl/LocalStrings_fr.properties|   1 +
 .../tomcat/websocket/LocalStrings_zh_CN.properties |   1 +
 webapps/docs/changelog.xml |  13 +++
 34 files changed, 240 insertions(+), 7 deletions(-)


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat] 01/02: Update French translations

2019-08-15 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 06c7fd57e20986d39832c77662f106f47938
Author: Mark Thomas 
AuthorDate: Thu Aug 15 15:10:59 2019 +0100

Update French translations
---
 java/org/apache/catalina/core/LocalStrings_fr.properties  | 1 +
 java/org/apache/naming/factory/LocalStrings_fr.properties | 4 
 java/org/apache/tomcat/util/buf/LocalStrings_fr.properties| 3 +++
 java/org/apache/tomcat/util/net/jsse/LocalStrings_fr.properties   | 2 ++
 .../org/apache/tomcat/util/net/openssl/LocalStrings_fr.properties | 1 +
 webapps/docs/changelog.xml| 8 
 6 files changed, 19 insertions(+)

diff --git a/java/org/apache/catalina/core/LocalStrings_fr.properties 
b/java/org/apache/catalina/core/LocalStrings_fr.properties
index f4bb7d9..d5c9892 100644
--- a/java/org/apache/catalina/core/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/core/LocalStrings_fr.properties
@@ -92,6 +92,7 @@ aprListener.tooLateForSSLRandomSeed=setSSLRandomSeed 
impossible: SSL a déjà é
 aprListener.wrongFIPSMode=Valuer inattendue de l''option FIPSMode de 
AprLifecycleListener: [{0}]
 
 asyncContextImpl.asyncDispachError=Erreur lors d'un dispatch asynchrone
+asyncContextImpl.asyncRunnableError=Erreur lors du traitement asynchrone du 
Runnable via AsyncContext.start()
 asyncContextImpl.dispatchingStarted=Une opération de dispatch asynchrone a 
déjà été appelée, plusieurs dispatch au cours d'un même cycle asynchrone n'est 
pas autorisé
 asyncContextImpl.noAsyncDispatcher=Le Servlet dispatcher retourné par le 
ServletContext ne supporte pas de dispatch asynchrone
 asyncContextImpl.onCompleteError=L''appel à onComplete() a échoué pour 
l''écouteur de type [{0}]
diff --git a/java/org/apache/naming/factory/LocalStrings_fr.properties 
b/java/org/apache/naming/factory/LocalStrings_fr.properties
index 18cc08f..e427e8b 100644
--- a/java/org/apache/naming/factory/LocalStrings_fr.properties
+++ b/java/org/apache/naming/factory/LocalStrings_fr.properties
@@ -15,6 +15,10 @@
 
 dataSourceLinkFactory.badWrapper=Pas un enrobeur pour le type [{0}]
 
+factoryBase.factoryClassError=Impossible de charger la classe de la fabrique 
de ressources
+factoryBase.factoryCreationError=Impossible de créer l'instance de la fabrique 
de ressources
+factoryBase.instanceCreationError=Impossible de créer l'instance de la 
ressource
+
 lookupFactory.circularReference=Trouvé une référence circulaire avec [{0}]
 lookupFactory.createFailed=Echec de création de l'instance de la classe de 
fabrique de recherche JNDI
 lookupFactory.loadFailed=Echec de chargement de la classe de fabrique de 
recherche JNDI
diff --git a/java/org/apache/tomcat/util/buf/LocalStrings_fr.properties 
b/java/org/apache/tomcat/util/buf/LocalStrings_fr.properties
index f05a942..c62f2f5 100644
--- a/java/org/apache/tomcat/util/buf/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/util/buf/LocalStrings_fr.properties
@@ -13,6 +13,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+asn1Parser.lengthInvalid=Une longueur d''octets invalide [{0}] a été rapportée 
alors que la longueur de données en entrée est de [{1}] octets
+asn1Parser.tagMismatch=La valeur [{0}] était attendue mais la valeur [{1}] a 
été rencontrée
+
 b2cConverter.unknownEncoding=L''encodage de caractères [{0}] n''est pas 
supporté
 
 byteBufferUtils.cleaner=Impossible d'utiliser le nettoyeur de ByteBuffers 
directs, une fuite de mémoire peut se produire
diff --git a/java/org/apache/tomcat/util/net/jsse/LocalStrings_fr.properties 
b/java/org/apache/tomcat/util/net/jsse/LocalStrings_fr.properties
index 14ce0ce..36dae5f 100644
--- a/java/org/apache/tomcat/util/net/jsse/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/util/net/jsse/LocalStrings_fr.properties
@@ -35,3 +35,5 @@ jsseUtil.noCrlSupport=Le truststoreProvider [{0}] ne supporte 
pas d''option de c
 jsseUtil.noVerificationDepth=Le truststoreProvider [{0}] ne supporte pas 
l''option de configuration certificateVerificationDepth
 jsseUtil.trustedCertNotChecked=Les dates de validité du certificat de 
confiance dont l''alias est [{0}] n''ont pas été vérifiées car sont type est 
inconnu
 jsseUtil.trustedCertNotValid=Le certificat de confiance avec l''alias [{0}] et 
le DN [{1}] n''est pas valide à cause de [{2}], les certificats signés par ce 
certificat de confiance SERONT acceptés
+
+pemFile.noMultiPrimes=Le certificat PKCS#1 est dans un format mutli-prime et 
Java ne fournit pas d'API pour construire une clé privée RSA à partir de ce 
format
diff --git a/java/org/apache/tomcat/util/net/openssl/LocalStrings_fr.properties 
b/java/org/apache/tomcat/util/net/openssl/LocalStrings_fr.properties
index b9238be..ecdf34a 100644
--- a/java/org/apache/tomcat/util/net/openssl/LocalStrings_fr.properties
+++ 

[tomcat] 02/02: Add Simplified Chinese translations

2019-08-15 Thread markt
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 be0d580eee72aed615171ae7068be2b168d9bdd5
Author: Mark Thomas 
AuthorDate: Thu Aug 15 14:54:59 2019 +0100

Add Simplified Chinese translations
---
 build.xml  |  10 ++
 java/javax/el/LocalStrings_zh_CN.properties|  50 
 java/javax/servlet/LocalStrings_zh_CN.properties   |  22 
 .../servlet/http/LocalStrings_zh_CN.properties |  23 
 .../authenticator/LocalStrings_zh_CN.properties|  45 +++
 .../jaspic/LocalStrings_zh_CN.properties   |  25 
 .../connector/LocalStrings_zh_CN.properties|  41 +++
 .../catalina/core/LocalStrings_zh_CN.properties| 103 
 .../catalina/deploy/LocalStrings_zh_CN.properties  |  20 +++
 .../catalina/filters/LocalStrings_zh_CN.properties |  35 ++
 .../ha/authenticator/LocalStrings_zh_CN.properties |  16 +++
 .../ha/deploy/LocalStrings_zh_CN.properties|  28 +
 .../ha/session/LocalStrings_zh_CN.properties   |  37 ++
 .../catalina/ha/tcp/LocalStrings_zh_CN.properties  |  23 
 .../catalina/loader/LocalStrings_zh_CN.properties  |  32 +
 .../catalina/manager/LocalStrings_zh_CN.properties |  77 
 .../manager/host/LocalStrings_zh_CN.properties |  57 +
 .../catalina/mapper/LocalStrings_zh_CN.properties  |  20 +++
 .../catalina/realm/LocalStrings_zh_CN.properties   |  49 
 .../security/LocalStrings_zh_CN.properties |  16 +++
 .../servlets/LocalStrings_zh_CN.properties |  28 +
 .../catalina/session/LocalStrings_zh_CN.properties |  42 +++
 .../catalina/startup/LocalStrings_zh_CN.properties |  72 +++
 .../tribes/group/LocalStrings_zh_CN.properties |  18 +++
 .../interceptors/LocalStrings_zh_CN.properties |  53 
 .../tribes/io/LocalStrings_zh_CN.properties|  23 
 .../tribes/jmx/LocalStrings_zh_CN.properties   |  17 +++
 .../membership/LocalStrings_zh_CN.properties   |  28 +
 .../tribes/tipis/LocalStrings_zh_CN.properties |  27 +
 .../tribes/transport/LocalStrings_zh_CN.properties |  20 +++
 .../transport/bio/LocalStrings_zh_CN.properties|  26 
 .../transport/nio/LocalStrings_zh_CN.properties|  33 +
 .../tribes/util/LocalStrings_zh_CN.properties  |  18 +++
 .../catalina/users/LocalStrings_zh_CN.properties   |  24 
 .../catalina/util/LocalStrings_zh_CN.properties|  29 +
 .../catalina/valves/LocalStrings_zh_CN.properties  |  60 +
 .../webresources/LocalStrings_zh_CN.properties |  27 +
 .../apache/coyote/LocalStrings_zh_CN.properties|  31 +
 .../coyote/ajp/LocalStrings_zh_CN.properties   |  22 
 .../coyote/http11/LocalStrings_zh_CN.properties|  32 +
 .../http11/filters/LocalStrings_zh_CN.properties   |  24 
 .../http11/upgrade/LocalStrings_zh_CN.properties   |  22 
 .../coyote/http2/LocalStrings_zh_CN.properties |  55 +
 .../jasper/resources/LocalStrings_zh_CN.properties | 135 +
 .../apache/naming/LocalStrings_zh_CN.properties|  21 
 .../naming/factory/LocalStrings_zh_CN.properties   |  16 +++
 .../dbcp/dbcp2/LocalStrings_zh_CN.properties   |  20 +++
 .../tomcat/util/LocalStrings_zh_CN.properties  |  23 
 .../tomcat/util/buf/LocalStrings_zh_CN.properties  |  16 +++
 .../util/compat/LocalStrings_zh_CN.properties  |  16 +++
 .../descriptor/web/LocalStrings_zh_CN.properties   |  27 +
 .../util/digester/LocalStrings_zh_CN.properties|  16 +++
 .../tomcat/util/http/LocalStrings_zh_CN.properties |  24 
 .../util/http/parser/LocalStrings_zh_CN.properties |  27 +
 .../tomcat/util/net/LocalStrings_zh_CN.properties  |  67 ++
 .../util/net/jsse/LocalStrings_zh_CN.properties|  22 
 .../util/net/openssl/LocalStrings_zh_CN.properties |  34 ++
 .../tomcat/util/scan/LocalStrings_zh_CN.properties |  22 
 .../tomcat/websocket/LocalStrings_zh_CN.properties |  56 +
 .../websocket/pojo/LocalStrings_zh_CN.properties   |  25 
 .../websocket/server/LocalStrings_zh_CN.properties |  25 
 res/maven/mvn-pub.xml  |   2 +-
 res/maven/tomcat-i18n-zh-CN.pom|  35 ++
 webapps/docs/changelog.xml |   4 +
 .../WEB-INF/classes/LocalStrings_zh_CN.properties  |  38 ++
 65 files changed, 2130 insertions(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index 863f2be..aeeb2b0 100644
--- a/build.xml
+++ b/build.xml
@@ -909,6 +909,16 @@
   
 
+
+  
+
+  
+  
+  
+
 
   
 
diff --git a/java/javax/el/LocalStrings_zh_CN.properties 
b/java/javax/el/LocalStrings_zh_CN.properties
new file mode 100644
index 000..99ab703
--- /dev/null
+++ b/java/javax/el/LocalStrings_zh_CN.properties
@@ -0,0 +1,50 @@
+# 

[tomcat] branch 8.5.x updated (cc0bd3c -> be0d580)

2019-08-15 Thread markt
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 cc0bd3c  Back-port additions and improvements to the Russian i18n 
messages.
 new b2d767e  Add Korean translations to standard Tomcat distribution
 new be0d580  Add Simplified Chinese 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:
 build.xml  |  20 ++
 java/javax/el/LocalStrings_ko.properties   |  52 
 java/javax/el/LocalStrings_zh_CN.properties|  50 
 java/javax/servlet/LocalStrings_ko.properties  |  23 ++
 java/javax/servlet/LocalStrings_zh_CN.properties   |  22 ++
 java/javax/servlet/http/LocalStrings_ko.properties |  27 ++
 .../servlet/http/LocalStrings_zh_CN.properties |  23 ++
 .../authenticator/LocalStrings_ko.properties   |  72 +
 .../authenticator/LocalStrings_zh_CN.properties|  45 +++
 .../jaspic/LocalStrings_ko.properties  |  30 ++
 .../jaspic/LocalStrings_zh_CN.properties   |  25 ++
 .../catalina/connector/LocalStrings_ko.properties  |  89 ++
 .../connector/LocalStrings_zh_CN.properties|  41 +++
 .../catalina/core/LocalStrings_ko.properties   | 262 +
 .../catalina/core/LocalStrings_zh_CN.properties| 103 +++
 .../catalina/deploy/LocalStrings_ko.properties |  25 ++
 .../catalina/deploy/LocalStrings_zh_CN.properties  |  20 ++
 .../catalina/filters/LocalStrings_ko.properties|  65 +
 .../catalina/filters/LocalStrings_zh_CN.properties |  35 +++
 .../ha/authenticator/LocalStrings_ko.properties|  17 ++
 .../ha/authenticator/LocalStrings_zh_CN.properties |  16 ++
 .../catalina/ha/context/LocalStrings_ko.properties |  19 ++
 .../catalina/ha/deploy/LocalStrings_ko.properties  |  52 
 .../ha/deploy/LocalStrings_zh_CN.properties|  28 ++
 .../catalina/ha/session/LocalStrings_ko.properties |  90 ++
 .../ha/session/LocalStrings_zh_CN.properties   |  37 +++
 .../catalina/ha/tcp/LocalStrings_ko.properties |  42 +++
 .../catalina/ha/tcp/LocalStrings_zh_CN.properties  |  23 ++
 .../catalina/loader/LocalStrings_ko.properties |  71 +
 .../catalina/loader/LocalStrings_zh_CN.properties  |  32 +++
 .../catalina/manager/LocalStrings_ko.properties| 177 
 .../catalina/manager/LocalStrings_zh_CN.properties |  77 +
 .../manager/host/LocalStrings_ko.properties|  91 ++
 .../manager/host/LocalStrings_zh_CN.properties |  57 
 .../catalina/mapper/LocalStrings_ko.properties |  31 ++
 .../catalina/mapper/LocalStrings_zh_CN.properties  |  20 ++
 .../catalina/mbeans/LocalStrings_ko.properties |  23 ++
 .../catalina/realm/LocalStrings_ko.properties  | 104 +++
 .../catalina/realm/LocalStrings_zh_CN.properties   |  49 
 .../catalina/security/LocalStrings_ko.properties   |  22 ++
 .../security/LocalStrings_zh_CN.properties |  16 ++
 .../catalina/servlets/LocalStrings_ko.properties   |  55 
 .../servlets/LocalStrings_zh_CN.properties |  28 ++
 .../catalina/session/LocalStrings_ko.properties|  83 ++
 .../catalina/session/LocalStrings_zh_CN.properties |  42 +++
 .../catalina/startup/LocalStrings_ko.properties| 162 +++
 .../catalina/startup/LocalStrings_zh_CN.properties |  72 +
 .../storeconfig/LocalStrings_ko.properties |  22 ++
 .../tribes/group/LocalStrings_ko.properties|  28 ++
 .../tribes/group/LocalStrings_zh_CN.properties |  18 ++
 .../group/interceptors/LocalStrings_ko.properties  |  83 ++
 .../interceptors/LocalStrings_zh_CN.properties |  53 
 .../catalina/tribes/io/LocalStrings_ko.properties  |  27 ++
 .../tribes/io/LocalStrings_zh_CN.properties|  23 ++
 .../catalina/tribes/jmx/LocalStrings_ko.properties |  21 ++
 .../tribes/jmx/LocalStrings_zh_CN.properties   |  17 ++
 .../tribes/membership/LocalStrings_ko.properties   |  56 
 .../membership/LocalStrings_zh_CN.properties   |  28 ++
 .../tribes/tipis/LocalStrings_ko.properties|  53 
 .../tribes/tipis/LocalStrings_zh_CN.properties |  27 ++
 .../tribes/transport/LocalStrings_ko.properties|  24 ++
 .../tribes/transport/LocalStrings_zh_CN.properties |  20 ++
 .../transport/bio/LocalStrings_ko.properties   |  40 +++
 .../transport/bio/LocalStrings_zh_CN.properties|  26 ++
 .../transport/nio/LocalStrings_ko.properties   |  57 
 .../transport/nio/LocalStrings_zh_CN.properties|  33 +++
 .../tribes/util/LocalStrings_ko.properties |  25 ++
 .../tribes/util/LocalStrings_zh_CN.properties  |  18 ++
 .../catalina/users/LocalStrings_ko.properties  |  30 ++
 

[tomcat] branch master updated: Add utility to back-port translation updates

2019-08-15 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/master by this push:
 new ef8ccbeb Add utility to back-port translation updates
ef8ccbeb is described below

commit ef8ccbeb00446e35c18a6d8110a5b894de064b3d
Author: Mark Thomas 
AuthorDate: Thu Aug 15 14:17:59 2019 +0100

Add utility to back-port translation updates
---
 .../buildutil/translate/BackportTranslations.java  | 66 ++
 1 file changed, 66 insertions(+)

diff --git 
a/java/org/apache/tomcat/buildutil/translate/BackportTranslations.java 
b/java/org/apache/tomcat/buildutil/translate/BackportTranslations.java
new file mode 100644
index 000..6c27177
--- /dev/null
+++ b/java/org/apache/tomcat/buildutil/translate/BackportTranslations.java
@@ -0,0 +1,66 @@
+/*
+* 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.IOException;
+import java.util.Properties;
+
+/**
+ * Generates a set of translated property files to back-port updates to a
+ * previous version. If the source and target use the same value for the 
English
+ * key then any translated value for that key is copied from the source to the
+ * target.
+ */
+public class BackportTranslations extends BackportBase {
+
+public static void main(String... args) throws IOException {
+BackportTranslations backport = new BackportTranslations(args);
+backport.execute();
+}
+
+protected BackportTranslations(String[] args) throws IOException {
+super(args);
+}
+
+
+@Override
+protected void execute() throws IOException {
+for (String langauge : targetTranslations.keySet()) {
+// Skip source
+if (langauge.length() == 0) {
+continue;
+}
+
+Properties sourceTranslated = sourceTranslations.get(langauge);
+Properties targetTranslated = targetTranslations.get(langauge);
+if (targetTranslated == null) {
+targetTranslated = new Properties();
+targetTranslations.put(langauge, targetTranslated);
+}
+
+for (Object key : targetEnglish.keySet()) {
+if (sourceTranslated.containsKey(key) &&
+targetEnglish.get(key).equals(sourceEnglish.get(key))) 
{
+
+targetTranslated.put(key, sourceTranslated.get(key));
+}
+}
+
+Utils.export(langauge, targetTranslated, storageDir);
+}
+}
+}


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat] 05/05: Back-port additions and improvements to the Russian i18n messages.

2019-08-15 Thread markt
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 cc0bd3c3f5a528d46210a24e5dfe8789f0af6340
Author: Mark Thomas 
AuthorDate: Thu Aug 15 14:37:35 2019 +0100

Back-port additions and improvements to the Russian i18n messages.
---
 .../catalina/core/LocalStrings_ru.properties   | 20 
 .../catalina/ha/deploy/LocalStrings_ru.properties  | 18 ++
 .../catalina/loader/LocalStrings_ru.properties | 16 
 .../catalina/manager/LocalStrings_ru.properties|  2 +-
 .../manager/host/LocalStrings_ru.properties|  4 
 .../catalina/realm/LocalStrings_ru.properties  | 18 ++
 .../catalina/startup/LocalStrings_ru.properties| 22 ++
 .../group/interceptors/LocalStrings_ru.properties  | 22 ++
 .../catalina/tribes/io/LocalStrings_ru.properties  | 16 
 .../tribes/tipis/LocalStrings_ru.properties| 16 
 .../transport/bio/LocalStrings_ru.properties   | 16 
 .../catalina/util/LocalStrings_ru.properties   | 16 
 .../catalina/valves/LocalStrings_ru.properties | 21 +
 .../coyote/http11/LocalStrings_ru.properties   | 16 
 .../http11/upgrade/LocalStrings_ru.properties  | 16 
 .../apache/coyote/http2/LocalStrings_ru.properties | 16 
 .../jasper/resources/LocalStrings_ru.properties| 22 ++
 .../apache/tomcat/util/LocalStrings_ru.properties  | 16 
 .../tomcat/util/http/LocalStrings_ru.properties| 16 
 .../tomcat/util/net/LocalStrings_ru.properties | 19 +++
 .../util/net/jsse/LocalStrings_ru.properties   | 16 
 .../util/net/openssl/LocalStrings_ru.properties| 16 
 webapps/docs/changelog.xml |  4 
 .../WEB-INF/classes/LocalStrings_ru.properties | 16 
 24 files changed, 379 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/core/LocalStrings_ru.properties 
b/java/org/apache/catalina/core/LocalStrings_ru.properties
new file mode 100644
index 000..2bb9746
--- /dev/null
+++ b/java/org/apache/catalina/core/LocalStrings_ru.properties
@@ -0,0 +1,20 @@
+# 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.
+
+applicationContext.addJspFile.iae=Файл JSP [{0}] содержит ошибки
+applicationContext.addListener.iae.cnfe=Невозможно создать экземпляр типа [{0}]
+applicationContext.setAttribute.namenull=Имя не может быть пустым
+
+standardWrapper.isUnavailable=Сервлет [{0}] временно недоступен
diff --git a/java/org/apache/catalina/ha/deploy/LocalStrings_ru.properties 
b/java/org/apache/catalina/ha/deploy/LocalStrings_ru.properties
new file mode 100644
index 000..113715a
--- /dev/null
+++ b/java/org/apache/catalina/ha/deploy/LocalStrings_ru.properties
@@ -0,0 +1,18 @@
+# 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.
+
+farmWarDeployer.modInstall=Установка веб приложения [{0}] из [{1}]
+
+warWatcher.checkingWar=Проверяем WAR файл [{}]
diff --git a/java/org/apache/catalina/loader/LocalStrings_ru.properties 
b/java/org/apache/catalina/loader/LocalStrings_ru.properties
new file mode 100644
index 000..a851ce0
--- /dev/null
+++ b/java/org/apache/catalina/loader/LocalStrings_ru.properties
@@ -0,0 +1,16 

[tomcat] branch 8.5.x updated (bf05105 -> cc0bd3c)

2019-08-15 Thread markt
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 bf05105  Back-port improvements and corrections to English messages
 new d0b9947  Add German translations to the standard Tomcat distribution
 new d3af85c  Back-port updates and additions to Spanish i18n messages
 new 67ff0e7  Back-port additions and updates to the French i18n messages
 new 84cf2b0  Back-port fixes and updates to the Japanese i18n messages.
 new cc0bd3c  Back-port additions and improvements to the Russian i18n 
messages.

The 5 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  |  10 ++
 .../el/LocalStrings_de.properties} |   8 +-
 java/javax/el/LocalStrings_fr.properties   |  52 ++
 java/javax/el/LocalStrings_ja.properties   |  52 ++
 .../servlet/LocalStrings_de.properties}|   4 +-
 java/javax/servlet/LocalStrings_fr.properties  |   4 +
 java/javax/servlet/LocalStrings_ja.properties  |   4 +
 .../servlet/http/LocalStrings_de.properties}   |   4 +-
 .../authenticator/LocalStrings_de.properties}  |   9 +-
 .../jaspic/LocalStrings_de.properties} |   4 +-
 .../catalina/connector/LocalStrings_de.properties  |  27 +++
 .../catalina/core/LocalStrings_de.properties   |  59 +++
 .../catalina/core/LocalStrings_es.properties   |  24 ++-
 .../catalina/core/LocalStrings_fr.properties   | 193 +++--
 .../catalina/core/LocalStrings_ja.properties   | 174 ++-
 .../core/LocalStrings_ru.properties}   |   6 +-
 .../LocalStrings_de.properties}|   3 +-
 .../deploy}/LocalStrings_es.properties |   6 +-
 .../catalina/deploy/LocalStrings_fr.properties |  25 +++
 .../catalina/deploy/LocalStrings_ja.properties |  25 +++
 .../catalina/filters/LocalStrings_de.properties|  32 
 .../ha/authenticator/LocalStrings_de.properties}   |   4 +-
 .../ha/authenticator}/LocalStrings_es.properties   |   2 +-
 .../authenticator}/LocalStrings_fr.properties  |   3 +-
 .../ha/authenticator}/LocalStrings_ja.properties   |   4 +-
 .../ha/context}/LocalStrings_fr.properties |   5 +-
 .../ha/context}/LocalStrings_ja.properties |   4 +-
 .../ha/deploy/LocalStrings_de.properties}  |   9 +-
 .../catalina/ha/deploy/LocalStrings_es.properties  |  29 
 .../catalina/ha/deploy/LocalStrings_fr.properties  |  52 ++
 .../catalina/ha/deploy/LocalStrings_ja.properties  |  52 ++
 .../ha/deploy/LocalStrings_ru.properties}  |   4 +-
 .../catalina/ha/session/LocalStrings_de.properties |  26 +++
 .../catalina/ha/session/LocalStrings_es.properties |   5 +
 .../catalina/ha/session/LocalStrings_fr.properties |  90 ++
 .../catalina/ha/session/LocalStrings_ja.properties |  90 ++
 .../ha/tcp/LocalStrings_de.properties} |   6 +-
 .../catalina/ha/tcp/LocalStrings_es.properties |   5 +
 .../catalina/ha/tcp/LocalStrings_fr.properties |  42 +
 .../catalina/ha/tcp/LocalStrings_ja.properties |  42 +
 .../LocalStrings_de.properties}|   5 +-
 .../catalina/loader/LocalStrings_es.properties |   3 +
 .../catalina/loader/LocalStrings_fr.properties |  54 +-
 .../catalina/loader/LocalStrings_ja.properties |  48 +
 .../loader/LocalStrings_ru.properties} |   4 +-
 .../catalina/manager/LocalStrings_de.properties|  19 +-
 .../catalina/manager/LocalStrings_es.properties|  17 +-
 .../catalina/manager/LocalStrings_fr.properties| 115 ++--
 .../catalina/manager/LocalStrings_ja.properties|  96 ++
 .../catalina/manager/LocalStrings_ru.properties|   2 +-
 .../manager/host/LocalStrings_de.properties|  36 
 .../manager/host/LocalStrings_es.properties|   5 +-
 .../manager/host/LocalStrings_fr.properties|  91 ++
 .../manager/host/LocalStrings_ja.properties|  91 ++
 .../manager/host/LocalStrings_ru.properties|   4 +
 .../mapper/LocalStrings_de.properties} |   5 +-
 .../mapper}/LocalStrings_es.properties |   8 +-
 .../catalina/mapper/LocalStrings_fr.properties |  31 
 .../catalina/mapper/LocalStrings_ja.properties |  31 
 .../mbeans}/LocalStrings_es.properties |   2 +-
 .../catalina/mbeans/LocalStrings_fr.properties |   5 +-
 .../catalina/mbeans/LocalStrings_ja.properties |  23 +++
 .../catalina/realm/LocalStrings_de.properties  |  52 ++
 .../catalina/realm/LocalStrings_es.properties  |   4 +-
 .../catalina/realm/LocalStrings_fr.properties  |  71 

[tomcat] 02/05: Back-port updates and additions to Spanish i18n messages

2019-08-15 Thread markt
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 d3af85cbdb8142ce9b443470835ed8d6093688a4
Author: Mark Thomas 
AuthorDate: Thu Aug 15 14:34:41 2019 +0100

Back-port updates and additions to Spanish i18n messages
---
 .../catalina/core/LocalStrings_es.properties   | 24 +++--
 .../deploy}/LocalStrings_es.properties |  4 +-
 .../ha/authenticator}/LocalStrings_es.properties   |  2 +-
 .../catalina/ha/deploy/LocalStrings_es.properties  | 29 ++
 .../catalina/ha/session/LocalStrings_es.properties |  5 ++
 .../catalina/ha/tcp/LocalStrings_es.properties |  5 ++
 .../catalina/loader/LocalStrings_es.properties |  3 ++
 .../catalina/manager/LocalStrings_es.properties| 17 --
 .../manager/host/LocalStrings_es.properties|  5 +-
 .../mapper}/LocalStrings_es.properties | 11 ++--
 .../mbeans}/LocalStrings_es.properties |  2 +-
 .../catalina/realm/LocalStrings_es.properties  |  4 +-
 .../catalina/session/LocalStrings_es.properties|  5 ++
 .../catalina/startup/LocalStrings_es.properties| 18 ++-
 .../tribes/group}/LocalStrings_es.properties   |  5 +-
 .../group/interceptors/LocalStrings_es.properties  | 47 
 .../tribes/io}/LocalStrings_es.properties  |  9 +++-
 .../tribes/jmx}/LocalStrings_es.properties |  2 +-
 .../tribes/membership}/LocalStrings_es.properties  | 13 +++--
 .../tribes/tipis}/LocalStrings_es.properties   |  9 +++-
 .../tribes/transport/LocalStrings_es.properties|  4 ++
 .../transport/{ => bio}/LocalStrings_es.properties |  4 +-
 .../transport/nio/LocalStrings_es.properties   | 34 
 .../tribes/util}/LocalStrings_es.properties|  5 +-
 .../catalina/util/LocalStrings_es.properties   |  9 
 .../catalina/valves/LocalStrings_es.properties | 22 ++--
 java/org/apache/coyote/LocalStrings_es.properties  | 10 
 .../apache/coyote/ajp/LocalStrings_es.properties   |  1 +
 .../coyote/http11/LocalStrings_es.properties   |  9 +++-
 .../http11/filters}/LocalStrings_es.properties |  4 +-
 .../upgrade}/LocalStrings_es.properties|  6 ++-
 .../apache/coyote/http2/LocalStrings_es.properties | 62 ++
 .../jasper/resources/LocalStrings_es.properties|  2 +
 .../util/{buf => }/LocalStrings_es.properties  |  5 +-
 .../tomcat/util/buf/LocalStrings_es.properties |  2 +
 .../util/compat}/LocalStrings_es.properties|  4 +-
 .../util/descriptor/web/LocalStrings_es.properties | 10 
 .../{buf => digester}/LocalStrings_es.properties   |  2 +-
 .../tomcat/util/http/LocalStrings_es.properties| 25 +
 .../web => http/parser}/LocalStrings_es.properties | 11 ++--
 .../tomcat/util/net/LocalStrings_es.properties | 40 +-
 .../util/{buf => scan}/LocalStrings_es.properties  |  5 +-
 webapps/docs/changelog.xml |  4 ++
 43 files changed, 444 insertions(+), 55 deletions(-)

diff --git a/java/org/apache/catalina/core/LocalStrings_es.properties 
b/java/org/apache/catalina/core/LocalStrings_es.properties
index d5bf5d1..12d48e6 100644
--- a/java/org/apache/catalina/core/LocalStrings_es.properties
+++ b/java/org/apache/catalina/core/LocalStrings_es.properties
@@ -14,6 +14,7 @@
 # limitations under the License.
 
 applicationContext.addFilter.ise=No se pueden añadir filtros al contexto [{0}] 
ya que éste ha sido inicializado
+applicationContext.addJspFile.iae=El archivo JSP [{0}] no es válido
 applicationContext.addListener.iae.cnfe=No puedo crear una instancia del tipo 
[{0}]
 applicationContext.addListener.iae.sclNotAllowed=Una vez que el primer 
ServletContextListener ha sido llamado, no se pueden añadir más 
ServletContextListeners.
 applicationContext.addListener.iae.wrongType=El tipo especificado [{0}] no es 
uno de los tipos de escuchador esperados
@@ -21,6 +22,7 @@ applicationContext.addListener.ise=No se pueden añadir 
escuchadores al contexto
 applicationContext.addRole.ise=No se pueden añadir roles al contexto [{0}], 
una vez que ha sido inicializado.
 applicationContext.addServlet.ise=No se pueden añadir servlets al contexto 
[{0}], una vez que ha sido inicializado.
 applicationContext.attributeEvent=Excepción lanzada por escuchador de eventos 
de atributos
+applicationContext.invalidServletName=Incapaz de añadir la definición servlet 
devido a que el nombre servlet no es válido [{0}].
 applicationContext.lookup.error=No pude localizar el recurso [{0}] en el 
contexto [{1}]
 applicationContext.mapping.error=Error durante mapeo
 applicationContext.requestDispatcher.iae=La Trayectoria [{0}] no comienza con 
carácter "/"
@@ -28,6 +30,7 @@ applicationContext.resourcePaths.iae=La Trayectoria [{0}] no 
comienza con carác
 applicationContext.role.iae=Un rol individual que se ha de declarar para el 
contexto [{0}] no puede ser nulo o cadena 

[tomcat] 01/05: Add German translations to the standard Tomcat distribution

2019-08-15 Thread markt
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 d0b994717449d2d64b3c7ae37d1e3d8b546d4c98
Author: Mark Thomas 
AuthorDate: Thu Aug 15 14:33:02 2019 +0100

Add German translations to the standard Tomcat distribution

Includes back-port of updates and additions from 9.0.x
---
 build.xml  | 10 +++
 java/javax/el/LocalStrings_de.properties   | 22 +++
 java/javax/servlet/LocalStrings_de.properties  | 20 ++
 java/javax/servlet/http/LocalStrings_de.properties | 16 +
 .../authenticator/LocalStrings_de.properties   | 23 +++
 .../jaspic/LocalStrings_de.properties  | 18 +
 .../catalina/connector/LocalStrings_de.properties  | 27 
 .../catalina/core/LocalStrings_de.properties   | 59 +
 .../catalina/deploy/LocalStrings_de.properties | 17 +
 .../catalina/filters/LocalStrings_de.properties| 32 +
 .../ha/authenticator/LocalStrings_de.properties| 16 +
 .../catalina/ha/deploy/LocalStrings_de.properties  | 23 +++
 .../catalina/ha/session/LocalStrings_de.properties | 26 
 .../catalina/ha/tcp/LocalStrings_de.properties | 20 ++
 .../catalina/loader/LocalStrings_de.properties | 19 ++
 .../catalina/manager/LocalStrings_de.properties| 19 +-
 .../manager/host/LocalStrings_de.properties| 36 ++
 .../catalina/mapper/LocalStrings_de.properties | 19 ++
 .../catalina/realm/LocalStrings_de.properties  | 52 +++
 .../catalina/security/LocalStrings_de.properties   | 16 +
 .../catalina/servlets/LocalStrings_de.properties   | 20 ++
 .../catalina/session/LocalStrings_de.properties| 31 +
 .../catalina/startup/LocalStrings_de.properties| 47 +
 .../group/interceptors/LocalStrings_de.properties  | 32 +
 .../catalina/tribes/io/LocalStrings_de.properties  | 20 ++
 .../tribes/membership/LocalStrings_de.properties   | 24 +++
 .../tribes/tipis/LocalStrings_de.properties| 20 ++
 .../tribes/transport/LocalStrings_de.properties| 16 +
 .../transport/bio/LocalStrings_de.properties   | 18 +
 .../transport/nio/LocalStrings_de.properties   | 24 +++
 .../tribes/util/LocalStrings_de.properties | 16 +
 .../catalina/users/LocalStrings_de.properties  | 16 +
 .../catalina/util/LocalStrings_de.properties   | 29 
 .../catalina/valves/LocalStrings_de.properties | 47 +
 .../webresources/LocalStrings_de.properties| 16 +
 java/org/apache/coyote/LocalStrings_de.properties  | 27 
 .../apache/coyote/ajp/LocalStrings_de.properties   | 18 +
 .../coyote/http11/LocalStrings_de.properties   | 23 +++
 .../http11/filters/LocalStrings_de.properties  | 18 +
 .../http11/upgrade/LocalStrings_de.properties  | 18 +
 .../apache/coyote/http2/LocalStrings_de.properties | 42 
 .../jasper/resources/LocalStrings_de.properties| 77 ++
 java/org/apache/naming/LocalStrings_de.properties  | 20 ++
 .../factory/webservices/LocalStrings_de.properties | 16 +
 .../tomcat/dbcp/dbcp2/LocalStrings_de.properties   | 16 +
 .../apache/tomcat/util/LocalStrings_de.properties  | 18 +
 .../tomcat/util/buf/LocalStrings_de.properties | 16 +
 .../tomcat/util/compat/LocalStrings_de.properties  | 16 +
 .../util/descriptor/web/LocalStrings_de.properties | 20 ++
 .../util/digester/LocalStrings_de.properties   | 16 +
 .../tomcat/util/http/LocalStrings_de.properties| 24 +++
 .../util/http/parser/LocalStrings_de.properties| 22 +++
 .../tomcat/util/net/LocalStrings_de.properties | 48 ++
 .../util/net/jsse/LocalStrings_de.properties   | 25 +++
 .../util/net/openssl/LocalStrings_de.properties| 36 ++
 .../tomcat/util/scan/LocalStrings_de.properties| 16 +
 .../tomcat/websocket/LocalStrings_de.properties| 36 ++
 .../websocket/pojo/LocalStrings_de.properties  | 22 +++
 .../websocket/server/LocalStrings_de.properties| 22 +++
 res/maven/mvn-pub.xml  |  1 +
 res/maven/tomcat-i18n-de.pom   | 35 ++
 webapps/docs/changelog.xml |  5 ++
 .../WEB-INF/classes/LocalStrings_de.properties | 28 
 63 files changed, 1544 insertions(+), 3 deletions(-)

diff --git a/build.xml b/build.xml
index 64c06b5..70e6d84 100644
--- a/build.xml
+++ b/build.xml
@@ -849,6 +849,16 @@
   filesId="files.tomcat-dbcp" />
 
 
+
+  
+
+  
+  
+  
+
 
   
diff --git a/java/javax/el/LocalStrings_de.properties 
b/java/javax/el/LocalStrings_de.properties
new file mode 100644
index 000..0147116
--- /dev/null
+++ 

[tomcat] 03/03: Back-port improvements and corrections to English messages

2019-08-15 Thread markt
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 bf051059e5672d9bfe9d914f22bcb6e025c09ff7
Author: Mark Thomas 
AuthorDate: Thu Aug 15 12:18:12 2019 +0100

Back-port improvements and corrections to English messages
---
 .../apache/catalina/core/LocalStrings.properties   |  2 +-
 .../catalina/ha/deploy/LocalStrings.properties |  2 +-
 .../catalina/ha/session/LocalStrings.properties| 38 +++---
 .../apache/catalina/ha/tcp/LocalStrings.properties |  4 +--
 .../catalina/manager/LocalStrings.properties   | 10 +++---
 .../apache/catalina/mapper/LocalStrings.properties |  2 +-
 .../catalina/session/LocalStrings.properties   |  2 +-
 .../catalina/startup/LocalStrings.properties   | 16 -
 .../catalina/tribes/group/LocalStrings.properties  |  2 +-
 .../group/interceptors/LocalStrings.properties |  4 +--
 .../catalina/tribes/io/LocalStrings.properties |  2 +-
 .../tribes/membership/LocalStrings.properties  |  6 ++--
 .../catalina/tribes/tipis/LocalStrings.properties  |  4 +--
 .../tribes/transport/bio/LocalStrings.properties   |  4 +--
 .../tribes/transport/nio/LocalStrings.properties   |  4 +--
 .../apache/catalina/util/LocalStrings.properties   |  4 +--
 .../apache/catalina/valves/LocalStrings.properties |  2 +-
 .../apache/coyote/http11/LocalStrings.properties   |  2 +-
 .../apache/coyote/http2/LocalStrings.properties|  8 ++---
 .../util/descriptor/web/LocalStrings.properties|  4 +--
 .../tomcat/util/http/LocalStrings.properties   |  2 +-
 .../util/http/parser/LocalStrings.properties   |  5 +--
 .../apache/tomcat/util/net/LocalStrings.properties |  4 +--
 .../tomcat/util/net/jsse/LocalStrings.properties   |  2 +-
 .../tomcat/util/scan/LocalStrings.properties   |  4 +--
 webapps/docs/changelog.xml |  8 +
 26 files changed, 78 insertions(+), 69 deletions(-)

diff --git a/java/org/apache/catalina/core/LocalStrings.properties 
b/java/org/apache/catalina/core/LocalStrings.properties
index 197cb49..8f943c5 100644
--- a/java/org/apache/catalina/core/LocalStrings.properties
+++ b/java/org/apache/catalina/core/LocalStrings.properties
@@ -186,7 +186,7 @@ standardContext.parameter.required=Both parameter name and 
parameter value are r
 standardContext.pathInvalid=A context path must either be an empty string or 
start with a ''/'' and do not end with a ''/''. The path [{0}] does not meet 
these criteria and has been changed to [{1}]
 standardContext.postconstruct.duplicate=Duplicate post construct method 
definition for class [{0}]
 standardContext.postconstruct.required=Both fully qualified class name and 
method name are required
-standardContext.predestroy.duplicate=Duplicate pre destroy method definition 
for class [{0}]
+standardContext.predestroy.duplicate=Duplicate @PreDestroy method definition 
for class [{0}]
 standardContext.predestroy.required=Both fully qualified class name and method 
name are required
 standardContext.reloadingCompleted=Reloading Context with name [{0}] is 
completed
 standardContext.reloadingStarted=Reloading Context with name [{0}] has started
diff --git a/java/org/apache/catalina/ha/deploy/LocalStrings.properties 
b/java/org/apache/catalina/ha/deploy/LocalStrings.properties
index b8b68e7..400593e 100644
--- a/java/org/apache/catalina/ha/deploy/LocalStrings.properties
+++ b/java/org/apache/catalina/ha/deploy/LocalStrings.properties
@@ -19,7 +19,7 @@ farmWarDeployer.deployEnd=Deployment from [{0}] finished.
 farmWarDeployer.fileCopyFail=Unable to copy from [{0}] to [{1}]
 farmWarDeployer.hostOnly=FarmWarDeployer can only work as host cluster 
subelement!
 farmWarDeployer.hostParentEngine=FarmWarDeployer can only work if parent of 
[{0}] is an engine!
-farmWarDeployer.mbeanNameFail=Can''t construct MBean object name for engine 
[{0}] and host [{1}]
+farmWarDeployer.mbeanNameFail=Cannot construct MBean object name for engine 
[{0}] and host [{1}]
 farmWarDeployer.modInstall=Installing webapp [{0}] from [{1}]
 farmWarDeployer.modInstallFail=Unable to install WAR file
 farmWarDeployer.modRemoveFail=No removal
diff --git a/java/org/apache/catalina/ha/session/LocalStrings.properties 
b/java/org/apache/catalina/ha/session/LocalStrings.properties
index eb58879..406a2cc 100644
--- a/java/org/apache/catalina/ha/session/LocalStrings.properties
+++ b/java/org/apache/catalina/ha/session/LocalStrings.properties
@@ -20,14 +20,14 @@ backupManager.stopped=Manager [{0}] is stopping
 
 clusterSessionListener.noManager=Context manager doesn''t exist:[{0}]
 
-deltaManager.createMessage.access=Manager [{0}]: create session message [{1}] 
access.
-deltaManager.createMessage.accessChangePrimary=Manager [{0}]: create session 
message [{1}] access to change primary.
-deltaManager.createMessage.allSessionData=Manager [{0}] send all session data.

[tomcat] branch 8.5.x updated (f11b95c -> bf05105)

2019-08-15 Thread markt
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 f11b95c  8.5.44 vote cancelled
 new 1148ee7  Increment version number for next development cycle
 new 2bffa95  Copy and modify import code from 9.0.x to import i18n 
back-ports
 new bf05105  Back-port improvements and corrections to English messages

The 3 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.properties.default   |   2 +-
 .../apache/catalina/core/LocalStrings.properties   |   2 +-
 .../catalina/ha/deploy/LocalStrings.properties |   2 +-
 .../catalina/ha/session/LocalStrings.properties|  38 +++---
 .../apache/catalina/ha/tcp/LocalStrings.properties |   4 +-
 .../catalina/manager/LocalStrings.properties   |  10 +-
 .../apache/catalina/mapper/LocalStrings.properties |   2 +-
 .../catalina/session/LocalStrings.properties   |   2 +-
 .../catalina/startup/LocalStrings.properties   |  16 +--
 .../catalina/tribes/group/LocalStrings.properties  |   2 +-
 .../group/interceptors/LocalStrings.properties |   4 +-
 .../catalina/tribes/io/LocalStrings.properties |   2 +-
 .../tribes/membership/LocalStrings.properties  |   6 +-
 .../catalina/tribes/tipis/LocalStrings.properties  |   4 +-
 .../tribes/transport/bio/LocalStrings.properties   |   4 +-
 .../tribes/transport/nio/LocalStrings.properties   |   4 +-
 .../apache/catalina/util/LocalStrings.properties   |   4 +-
 .../apache/catalina/valves/LocalStrings.properties |   2 +-
 .../apache/coyote/http11/LocalStrings.properties   |   2 +-
 .../apache/coyote/http2/LocalStrings.properties|   8 +-
 .../tomcat/buildutil/translate/Constants.java  |  16 +--
 .../apache/tomcat/buildutil/translate/Import.java  | 133 +++
 .../apache/tomcat/buildutil/translate/Utils.java   | 145 +
 .../util/descriptor/web/LocalStrings.properties|   4 +-
 .../tomcat/util/http/LocalStrings.properties   |   2 +-
 .../util/http/parser/LocalStrings.properties   |   5 +-
 .../apache/tomcat/util/net/LocalStrings.properties |   4 +-
 .../tomcat/util/net/jsse/LocalStrings.properties   |   2 +-
 .../tomcat/util/scan/LocalStrings.properties   |   4 +-
 res/maven/mvn.properties.default   |   2 +-
 webapps/docs/changelog.xml |  12 +-
 31 files changed, 368 insertions(+), 81 deletions(-)
 copy webapps/examples/WEB-INF/classes/checkbox/CheckTest.java => 
java/org/apache/tomcat/buildutil/translate/Constants.java (66%)
 create mode 100644 java/org/apache/tomcat/buildutil/translate/Import.java
 create mode 100644 java/org/apache/tomcat/buildutil/translate/Utils.java


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat] 01/03: Increment version number for next development cycle

2019-08-15 Thread markt
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 1148ee7366cf7092636ca5963e59218ea7734a8c
Author: Mark Thomas 
AuthorDate: Wed Aug 14 23:39:19 2019 +0100

Increment version number for next development cycle
---
 build.properties.default | 2 +-
 res/maven/mvn.properties.default | 2 +-
 webapps/docs/changelog.xml   | 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index e067b36..563b0db 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -25,7 +25,7 @@
 # - Version Control Flags -
 version.major=8
 version.minor=5
-version.build=45
+version.build=46
 version.patch=0
 version.suffix=-dev
 
diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default
index 66a9337..ece9033 100644
--- a/res/maven/mvn.properties.default
+++ b/res/maven/mvn.properties.default
@@ -39,7 +39,7 @@ 
maven.asf.release.repo.url=https://repository.apache.org/service/local/staging/d
 maven.asf.release.repo.repositoryId=apache.releases.https
 
 # Release version info
-maven.asf.release.deploy.version=8.5.45
+maven.asf.release.deploy.version=8.5.46
 
 #Where do we load the libraries from
 tomcat.lib.path=../../output/build/lib
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 2d0cb26..47f9854 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -44,7 +44,9 @@
   They eventually become mixed with the numbered issues (i.e., numbered
   issues do not "pop up" wrt. others).
 -->
-
+
+
+
   
 
   


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat] 02/03: Copy and modify import code from 9.0.x to import i18n back-ports

2019-08-15 Thread markt
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 2bffa95a4c5f016f173241a565b7cadefbc85ca5
Author: Mark Thomas 
AuthorDate: Thu Aug 15 11:43:29 2019 +0100

Copy and modify import code from 9.0.x to import i18n back-ports
---
 .../tomcat/buildutil/translate/Constants.java  |  29 +
 .../apache/tomcat/buildutil/translate/Import.java  | 133 +++
 .../apache/tomcat/buildutil/translate/Utils.java   | 145 +
 3 files changed, 307 insertions(+)

diff --git a/java/org/apache/tomcat/buildutil/translate/Constants.java 
b/java/org/apache/tomcat/buildutil/translate/Constants.java
new file mode 100644
index 000..403daa6
--- /dev/null
+++ b/java/org/apache/tomcat/buildutil/translate/Constants.java
@@ -0,0 +1,29 @@
+/*
+* 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;
+
+public class Constants {
+
+public static final String L10N_PREFIX = "LocalStrings";
+public static final String L10N_SUFFIX = ".properties";
+
+public static final String[] SEARCH_DIRS = new String[] { "java", 
"webapps" };
+
+public static final String STORAGE_DIR = ".settings/translations";
+
+public static final String END_PACKAGE_MARKER = ".zzz.";
+}
diff --git a/java/org/apache/tomcat/buildutil/translate/Import.java 
b/java/org/apache/tomcat/buildutil/translate/Import.java
new file mode 100644
index 000..f309217
--- /dev/null
+++ b/java/org/apache/tomcat/buildutil/translate/Import.java
@@ -0,0 +1,133 @@
+/*
+* 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.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
+import java.util.Properties;
+
+public class Import {
+
+public static void main(String... args) throws IOException {
+File root = new File(Constants.STORAGE_DIR);
+
+for (File f : root.listFiles()) {
+// Not robust but good enough
+if (f.isFile() && f.getName().startsWith(Constants.L10N_PREFIX)) {
+processFile(f);
+}
+}
+}
+
+
+@SuppressWarnings("null")
+private static void processFile(File f) throws IOException {
+String language = Utils.getLanguage(f.getName());
+
+// Unlike the master branch, don't skip the original so we can import
+// updates to the English translations
+Properties props = Utils.load(f);
+Object[] objKeys = props.keySet().toArray();
+Arrays.sort(objKeys);
+
+String currentPkg = null;
+Writer w = null;
+String currentGroup = "zzz";
+
+for (Object objKey : objKeys) {
+String key = (String) objKey;
+CompositeKey cKey = new CompositeKey(key);
+
+if (!cKey.pkg.equals(currentPkg)) {
+currentPkg = cKey.pkg;
+if (w != null) {
+w.close();
+}
+File outFile = new File(currentPkg.replace('.', 
File.separatorChar), Constants.L10N_PREFIX + language + Constants.L10N_SUFFIX);
+FileOutputStream fos = new FileOutputStream(outFile);
+w = new OutputStreamWriter(fos, StandardCharsets.UTF_8);
+ 

[tomcat] branch master updated: Refactor for a separate class to back-port translations

2019-08-15 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/master by this push:
 new 5ac9b8f  Refactor for a separate class to back-port translations
5ac9b8f is described below

commit 5ac9b8fe0175de9aae56816b50edef636c23e39c
Author: Mark Thomas 
AuthorDate: Thu Aug 15 11:41:58 2019 +0100

Refactor for a separate class to back-port translations
---
 .../{BackportEnglish.java => BackportBase.java}| 36 +---
 .../buildutil/translate/BackportEnglish.java   | 38 +-
 2 files changed, 24 insertions(+), 50 deletions(-)

diff --git a/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java 
b/java/org/apache/tomcat/buildutil/translate/BackportBase.java
similarity index 60%
copy from java/org/apache/tomcat/buildutil/translate/BackportEnglish.java
copy to java/org/apache/tomcat/buildutil/translate/BackportBase.java
index 180be8f..1a4830f 100644
--- a/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java
+++ b/java/org/apache/tomcat/buildutil/translate/BackportBase.java
@@ -23,22 +23,22 @@ import java.util.Map;
 import java.util.Properties;
 
 /**
- * Generates a set of English property files to back-port updates to a previous
- * version. Where a key exists in the source and target versions the value is
- * copied from the source to the target, overwriting the value in the target.
- * The expectation is that the changes will be manually reviewed before
- * committing them.
+ * Base class providing common implementation for back-port utilities.
  */
-public class BackportEnglish {
+public abstract class BackportBase {
 
-private static final Map sourceTranslations = new 
HashMap<>();
-private static final Map targetTranslations = new 
HashMap<>();
+protected final Map sourceTranslations = new 
HashMap<>();
+protected final Map targetTranslations = new 
HashMap<>();
+protected final File targetRoot;
+protected final Properties sourceEnglish;
+protected final Properties targetEnglish;
+protected final File storageDir;
 
-public static void main(String... args) throws IOException {
+protected BackportBase(String... args) throws IOException {
 if (args.length != 1) {
 throw new IllegalArgumentException("Missing back-port target");
 }
-File targetRoot = new File(args[0]);
+targetRoot = new File(args[0]);
 
 if (!targetRoot.isDirectory()) {
 throw new IllegalArgumentException("Back-port target not a 
directory");
@@ -55,17 +55,11 @@ public class BackportEnglish {
 Utils.processDirectory(targetRoot, directory, targetTranslations);
 }
 
-Properties sourceEnglish = sourceTranslations.get("");
-Properties targetEnglish = targetTranslations.get("");
+sourceEnglish = sourceTranslations.get("");
+targetEnglish = targetTranslations.get("");
 
-for (Object key : sourceEnglish.keySet()) {
-if (targetEnglish.containsKey(key)) {
-targetEnglish.put(key, sourceEnglish.get(key));
-}
-}
-
-File storageDir = new File(targetRoot, Constants.STORAGE_DIR);
-
-Utils.export("", targetEnglish, storageDir);
+storageDir = new File(targetRoot, Constants.STORAGE_DIR);
 }
+
+protected abstract void execute() throws IOException;
 }
diff --git a/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java 
b/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java
index 180be8f..c6f9608 100644
--- a/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java
+++ b/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java
@@ -16,11 +16,7 @@
 */
 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 set of English property files to back-port updates to a previous
@@ -29,43 +25,27 @@ import java.util.Properties;
  * The expectation is that the changes will be manually reviewed before
  * committing them.
  */
-public class BackportEnglish {
-
-private static final Map sourceTranslations = new 
HashMap<>();
-private static final Map targetTranslations = new 
HashMap<>();
+public class BackportEnglish extends BackportBase {
 
 public static void main(String... args) throws IOException {
-if (args.length != 1) {
-throw new IllegalArgumentException("Missing back-port target");
-}
-File targetRoot = new File(args[0]);
+BackportEnglish backport = new BackportEnglish(args);
+backport.execute();
+}
 
-if (!targetRoot.isDirectory()) {
-throw new IllegalArgumentException("Back-port target not a 
directory");
-}
 
-File sourceRoot = 

Re: [VOTE] Release Apache Tomcat 9.0.24

2019-08-15 Thread Martin Grigorov
On Thu, Aug 15, 2019 at 12:45 AM Mark Thomas  wrote:

> The proposed Apache Tomcat 9.0.24 release is now available for voting.
>
> The major changes compared to the 9.0.22 release are:
>
> - Expand Graal native image support to include JNDI, JSPs and JULI
>
> - Expand the HTTP/2 excessive overhead protection to cover various forms
>   of abusive client behaviour and close the connection if any such
>   behaviour is detected.
>
> - Security improvements to the Windows installer including a change in
>   the default user from Local System to Local Service.
>
> Along with lots of other bug fixes and improvements.
>
> For full details, see the changelog:
> https://ci.apache.org/projects/tomcat/tomcat9/docs/changelog.html
>
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-9/v9.0.24/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1227/
> The tag is:
> https://github.com/apache/tomcat/tree/9.0.24
>
>
> The proposed 9.0.24 release is:
> [ ] Broken - do not release
> [ X ] Stable - go ahead and release as 9.0.24
>

Regards,
Martin


>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>