[tomcat] branch master updated: Update Korean translations

[woonsan]

This is an automated email from the ASF dual-hosted git repository.

woonsan 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 723ce7a  Update Korean translations
723ce7a is described below

commit 723ce7a739d4362f558baa68647c7e317879afe2
Author: Woonsan Ko 
AuthorDate: Wed Jul 10 21:49:14 2019 -0400

Update Korean translations
---
 .../catalina/connector/LocalStrings_ko.properties  |  1 +
 .../catalina/core/LocalStrings_ko.properties   |  2 ++
 java/org/apache/coyote/LocalStrings_ko.properties  |  1 +
 .../apache/coyote/http2/LocalStrings_ko.properties | 13 
 .../jasper/resources/LocalStrings_ko.properties| 38 ++
 .../tomcat/util/http/LocalStrings_ko.properties|  1 +
 6 files changed, 56 insertions(+)

diff --git a/java/org/apache/catalina/connector/LocalStrings_ko.properties 
b/java/org/apache/catalina/connector/LocalStrings_ko.properties
index ab670f0..f64437b 100644
--- a/java/org/apache/catalina/connector/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/connector/LocalStrings_ko.properties
@@ -80,6 +80,7 @@ inputBuffer.streamClosed=스트림이 닫혔습니다.
 outputBuffer.writeNull=write(String,int,int) 메소드에 전달되는 String 아규먼트는 널일 수 없습니다.
 
 request.asyncNotSupported=현재 체인의 필터 또는 서블릿이, 비동기 오퍼레이션들을 지원하지 않습니다.
+request.fragmentInDispatchPath=디스패치 경로 [{0}](으)로부터 URI fragment를 제거했습니다.
 request.illegalWrap=요청 wrapper는 반드시 getRequest()로부터 얻어진 요청을 wrap해야 합니다.
 request.notAsync=만일 현재의 쓰레드가 비동기 모드에 있지 않다면, 이 메소드를 호출하는 것은 불허됩니다. (즉, 
isAsyncStarted()가 false를 반환하는 경우)
 
diff --git a/java/org/apache/catalina/core/LocalStrings_ko.properties 
b/java/org/apache/catalina/core/LocalStrings_ko.properties
index 7b7cab5..3ab874e 100644
--- a/java/org/apache/catalina/core/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ko.properties
@@ -58,6 +58,8 @@ applicationFilterConfig.release=타입이 [{1}](이)고 이름이 [{0}]인 필
 applicationFilterRegistration.nullInitParam=이름 또는 값 또는 둘 다 널이어서, 필터를 위한 초기화 
파라미터를 설정할 수 없습니다. 이름: [{0}], 값: [{1}]
 applicationFilterRegistration.nullInitParams=널인 이름 또는 값 때문에, 필터의 초기화 파라미터를 설정할 
수 없습니다. 이름: [{0}], 값: [{1}]
 
+applicationHttpRequest.fragmentInDispatchPath=디스패치 경로 [{0}](으)로부터 URI 
fragment를 제거했습니다.
+
 applicationPushBuilder.methodInvalid=PUSH 요청을 위한 HTTP 메소드는 반드시 캐시 가능하고 안전해야 
하는데, [{0}]은(는) 그렇지 않습니다.
 applicationPushBuilder.methodNotToken=HTTP 메소드들은 토큰들이어야 하지만, [{0}]은(는) 토큰이 아닌 
문자를 포함하고 있습니다.
 
diff --git a/java/org/apache/coyote/LocalStrings_ko.properties 
b/java/org/apache/coyote/LocalStrings_ko.properties
index cd876ff..9b54838 100644
--- a/java/org/apache/coyote/LocalStrings_ko.properties
+++ b/java/org/apache/coyote/LocalStrings_ko.properties
@@ -17,6 +17,7 @@ abstractConnectionHandler.connectionsGet=소켓 [{1}]을(를) 위한 프로세
 abstractConnectionHandler.error=요청을 읽는 중 오류 발생. 무시합니다.
 abstractConnectionHandler.ioexception.debug=IOException들은 정상적이므로, 무시합니다.
 abstractConnectionHandler.negotiatedProcessor.fail=Negotiate된 프로토콜 [{0}]을(를) 
위한 프로세서를 생성하지 못했습니다.
+abstractConnectionHandler.oome=요청 처리를 완료하지 못했습니다.
 abstractConnectionHandler.process=상태가 [{1}]인 소켓 [{0}]을(를) 처리합니다.
 abstractConnectionHandler.processorPop=캐시로부터 프로세서 [{0}]을(를) 추출했습니다.
 abstractConnectionHandler.protocolexception.debug=ProtocolException들은 정상적이므로, 
무시합니다.
diff --git a/java/org/apache/coyote/http2/LocalStrings_ko.properties 
b/java/org/apache/coyote/http2/LocalStrings_ko.properties
index 65d4d99..e47f17e 100644
--- a/java/org/apache/coyote/http2/LocalStrings_ko.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_ko.properties
@@ -37,7 +37,9 @@ hpack.invalidCharacter=code point [{1}]에 위치한 유니코드 문자 [{0}]
 hpackEncoder.encodeHeader=인코딩 헤더 [{0}]와(과) 그의 값 [{1}]
 
 hpackdecoder.headerTableIndexInvalid=[{1}]개의 정적 엔트리들과 [{2}]개의 동적 엔트리들이 존재하기에, 
헤더 테이블 인덱스 [{0}]은(는) 유효하지 않습니다.
+hpackdecoder.maxMemorySizeExceeded=헤더 테이블 크기 [{1}]이(가) 최대 크기 [{1}]을(를) 초과합니다.
 hpackdecoder.notImplemented=아직 구현 안됨
+hpackdecoder.nullHeader=인덱스가 [{0}]인 위치에 널 헤더가 존재합니다.
 hpackdecoder.tableSizeUpdateNotAtStart=테이블 크기 변경은, 반드시 헤더 블록의 시작 시에 전송되어야만 합니다.
 hpackdecoder.zeroNotValidHeaderTableIndex=0은 유효한 헤더 테이블 인덱스가 아닙니다.
 
@@ -83,6 +85,7 @@ stream.header.connection=연결 [{0}], 스트림 [{1}], HTTP 헤더 
[connection]
 stream.header.contentLength=연결 [{0}], 스트림 [{1}], 해당 Content-Length 헤더 값 
[{2}]은(는) 수신된 데이터의 크기 [{3}]와(과) 일치하지 않습니다.
 stream.header.debug=연결 [{0}], 스트림 [{1}], HTTP 헤더: [{2}], 값: [{3}]
 stream.header.duplicate=연결 [{0}], 스트림 [{1}], 여러 개의 [{3}] 헤더들을 받았습니다.
+stream.header.empty=연결 [{0}], 스트림 [{1}], 헤더 이름이 빈 문자열이어서 유효하지 않습니다.
 stream.header.invalid=연결 [{0}], 스트림 [{1}], 헤더 [{2}]이(가) 유효하지 않은 값을 포함했습니다: 
[{3}]
 stream.header.noPath=연결 [{0}], 스트림 [{1}], [:path] 가상 헤더가 비어 있었습니다.
 stream.header.required=연결 [{0}], 스트림 [{1}], 하나 이상의 필수 헤더들이 없습니다.
@@ -124,6 +127,7 @@ upgradeHandler.init=연결 [{0}], 상태 [{1}]
 upgradeHandler.initialWindowSize.invalid=연결 [{0}]: 값 [{1}]은(는), 초기 윈도우 크기로서 
불허되므로, 무시됩니다.

svn commit: r34834 [2/2] - in /dev/tomcat/tomcat-7/v7.0.95: ./ bin/ bin/embed/ bin/extras/ src/

[violetagg]

Added: dev/tomcat/tomcat-7/v7.0.95/bin/extras/tomcat-juli-adapters.jar.sha512
==
--- dev/tomcat/tomcat-7/v7.0.95/bin/extras/tomcat-juli-adapters.jar.sha512 
(added)
+++ dev/tomcat/tomcat-7/v7.0.95/bin/extras/tomcat-juli-adapters.jar.sha512 Wed 
Jul 10 23:10:45 2019
@@ -0,0 +1 @@
+9d1674801dade7255f5f1b23831b8c84c117ef8ced0154f7b25954b795a5a5952a5525001eb7e856f0afee70cff469a21669300f850c51cd4b042e6dd5ad9255
 *tomcat-juli-adapters.jar
\ No newline at end of file

Added: dev/tomcat/tomcat-7/v7.0.95/bin/extras/tomcat-juli.jar
==
Binary file - no diff available.

Propchange: dev/tomcat/tomcat-7/v7.0.95/bin/extras/tomcat-juli.jar
--
svn:mime-type = application/octet-stream

Added: dev/tomcat/tomcat-7/v7.0.95/bin/extras/tomcat-juli.jar.asc
==
--- dev/tomcat/tomcat-7/v7.0.95/bin/extras/tomcat-juli.jar.asc (added)
+++ dev/tomcat/tomcat-7/v7.0.95/bin/extras/tomcat-juli.jar.asc Wed Jul 10 
23:10:45 2019
@@ -0,0 +1,16 @@
+-BEGIN PGP SIGNATURE-
+
+iQIzBAABCAAdFiEEcT2oi+UJEVNf5xb1IIsKsdYwEccFAl0mZ98ACgkQIIsKsdYw
+EccRzRAAlWUWkPn//sB/emeET35vONr7hX47/NWKyfIddq9dALAcqbnlcVw3Qfgn
+BcsvAng1p56KlFhES/49C3FCQabZ12R0eOlmIaHVl9dl3EHGz4E91eYB4ksmGpvI
+AuqQaqnMif+zpwgVhoEEUgdpcmbB0wHRUgtoB+Z9edx1DU2BvuQt61qMo7mxUR8I
+V/T8GY9vLhRi2iwX07zwbn9FnSu7GnUApzPlfc5pqd+ZSYb54SavSCE6pJ2tvdud
+sriI5+gdVLToG+fA66nfr0gOgSflGrvqkKMF6qwXqA83kWhJ4Xv5bq+kIsOSHYZS
+0sc8eBPdAQp1XMKqayKDxkPeQ/znyr1awhRA9ZULcqUGhZK3hCwsMs6MXu0coDc5
+S/ObmCNJ7CJFL5comIiiveKqymu1RXnMK+6MfkWo/996lQVeF4W/c6UPMNSLip3/
++3YwWANbb1tnjDhzwrQBX/2oXAx5TW4/S+wt7DqZKQAjRju+g0sf6MLAgqZdr34p
+9ig3Q/8vq1e1UpZN17kWhCIcZV6P4abCZv2xIGVtsOBEcluQ4A/nM5lP1akcR1Sv
+YQkeSiYAQziYzMfsnxXVyw0+l/B525zNIixUoVSicbqLWu44+B+3kFHwp0iwmmKP
+K/8R3n6HaFWR9R68+Kn1NGT80xWVMYUWkpSptbiREqg24DJOJI0=
+=p9k+
+-END PGP SIGNATURE-

Added: dev/tomcat/tomcat-7/v7.0.95/bin/extras/tomcat-juli.jar.sha512
==
--- dev/tomcat/tomcat-7/v7.0.95/bin/extras/tomcat-juli.jar.sha512 (added)
+++ dev/tomcat/tomcat-7/v7.0.95/bin/extras/tomcat-juli.jar.sha512 Wed Jul 10 
23:10:45 2019
@@ -0,0 +1 @@
+86657e617c50a7a560393cd12f402ecad84dfd1e2621a096d11b6de648ced41c9c15e2b6c372638d2ab38357fb2f6b46f67c9b150bff8a019cfadca1d3011319
 *tomcat-juli.jar
\ No newline at end of file

Added: dev/tomcat/tomcat-7/v7.0.95/src/apache-tomcat-7.0.95-src.tar.gz
==
Binary file - no diff available.

Propchange: dev/tomcat/tomcat-7/v7.0.95/src/apache-tomcat-7.0.95-src.tar.gz
--
svn:mime-type = application/octet-stream

Added: dev/tomcat/tomcat-7/v7.0.95/src/apache-tomcat-7.0.95-src.tar.gz.asc
==
--- dev/tomcat/tomcat-7/v7.0.95/src/apache-tomcat-7.0.95-src.tar.gz.asc (added)
+++ dev/tomcat/tomcat-7/v7.0.95/src/apache-tomcat-7.0.95-src.tar.gz.asc Wed Jul 
10 23:10:45 2019
@@ -0,0 +1,16 @@
+-BEGIN PGP SIGNATURE-
+
+iQIzBAABCAAdFiEEcT2oi+UJEVNf5xb1IIsKsdYwEccFAl0maeYACgkQIIsKsdYw
+Ecfo1Q//WNm64anCwO9H62vNbJzMABGv/9rQyDAToDivjEP9FiMri/hJnS/q1zRE
+D9IGE22b7MuWnbDog9DIsFoePQ1vM8IIAIxQZ3QC/thbrTb4TP4Kh7dNBpqIK709
+bG46vc/dTixMNiRshiv0XAuIU9Cy4PPQJXh3hjkWYR3SwyThJT6BtbWJuPMlDcTg
+vTExSYQ+FEayfHGKajvRQeIQgjnUGIuho8owLazSU6fUGnfguZwpbuixyq7L9Hn3
+SP1nHEFxhyF+/YyJ1fBZipfdT/7qzQDjQGkIeC4vW4PYo8AixYWP92NEiOj4o0PR
+irqbs7VXvt1kMPbg6x87aL/bLp/xbAAObSR0SqbGiAMtZKCSIlsvBDlOc+9OyL6i
+zDe60NPwvd3dBCekUCTEkjTZQYAqKf3FTjmeyTuFnKNtCZeA6id7kGq8Iq5cFV5F
+BOCXd39xzPe/3r/eIcge4w/9bXdzy8E4iAb+Jy7Ic6q7lvbLLUWcTfilD63dbjes
+NsPzTIJfaLjhvbrwK3xeZmNuonCmET7wa9tsPjN7vpAG8/nN1OH3QcN6jcGMDjnB
+Y2mR+Ep7FDsueTMk1/AOTzSuuOo5NP9qSDaslhNQwklN7suEIarKZKG9ozzKF7vk
+qYEUVvAEalfljqQ06u43TnNM6VCQglmaAbi1e+RfjryHdWLnprs=
+=gbEV
+-END PGP SIGNATURE-

Added: dev/tomcat/tomcat-7/v7.0.95/src/apache-tomcat-7.0.95-src.tar.gz.sha512
==
--- dev/tomcat/tomcat-7/v7.0.95/src/apache-tomcat-7.0.95-src.tar.gz.sha512 
(added)
+++ dev/tomcat/tomcat-7/v7.0.95/src/apache-tomcat-7.0.95-src.tar.gz.sha512 Wed 
Jul 10 23:10:45 2019
@@ -0,0 +1 @@
+9b6070edc65a1b8946b4adca97a2184f7bcb8beeb3c3810f82a32cf3575c2bf9397d35bf9afa19910aeda919abf335d99a7a00f2021c050145ee2ecbb172f9d0
 *apache-tomcat-7.0.95-src.tar.gz
\ No newline at end of file

Added: dev/tomcat/tomcat-7/v7.0.95/src/apache-tomcat-7.0.95-src.zip
==
Binary file - no diff available.

Propchange: dev/tomcat/tomcat-7/v7.0.95/src/apache-tomcat-7.0.95-src.zip
--

svn commit: r34834 [1/2] - in /dev/tomcat/tomcat-7/v7.0.95: ./ bin/ bin/embed/ bin/extras/ src/

[violetagg]

Author: violetagg
Date: Wed Jul 10 23:10:45 2019
New Revision: 34834

Log:
Stage Tomcat 7.0.95

Added:
dev/tomcat/tomcat-7/v7.0.95/
dev/tomcat/tomcat-7/v7.0.95/KEYS
dev/tomcat/tomcat-7/v7.0.95/README.html
dev/tomcat/tomcat-7/v7.0.95/RELEASE-NOTES
dev/tomcat/tomcat-7/v7.0.95/bin/
dev/tomcat/tomcat-7/v7.0.95/bin/README.html
dev/tomcat/tomcat-7/v7.0.95/bin/apache-tomcat-7.0.95-deployer.tar.gz   
(with props)
dev/tomcat/tomcat-7/v7.0.95/bin/apache-tomcat-7.0.95-deployer.tar.gz.asc
dev/tomcat/tomcat-7/v7.0.95/bin/apache-tomcat-7.0.95-deployer.tar.gz.sha512
dev/tomcat/tomcat-7/v7.0.95/bin/apache-tomcat-7.0.95-deployer.zip   (with 
props)
dev/tomcat/tomcat-7/v7.0.95/bin/apache-tomcat-7.0.95-deployer.zip.asc
dev/tomcat/tomcat-7/v7.0.95/bin/apache-tomcat-7.0.95-deployer.zip.sha512
dev/tomcat/tomcat-7/v7.0.95/bin/apache-tomcat-7.0.95-fulldocs.tar.gz   
(with props)
dev/tomcat/tomcat-7/v7.0.95/bin/apache-tomcat-7.0.95-fulldocs.tar.gz.asc
dev/tomcat/tomcat-7/v7.0.95/bin/apache-tomcat-7.0.95-fulldocs.tar.gz.sha512
dev/tomcat/tomcat-7/v7.0.95/bin/apache-tomcat-7.0.95-windows-x64.zip   
(with props)
dev/tomcat/tomcat-7/v7.0.95/bin/apache-tomcat-7.0.95-windows-x64.zip.asc
dev/tomcat/tomcat-7/v7.0.95/bin/apache-tomcat-7.0.95-windows-x64.zip.sha512
dev/tomcat/tomcat-7/v7.0.95/bin/apache-tomcat-7.0.95-windows-x86.zip   
(with props)
dev/tomcat/tomcat-7/v7.0.95/bin/apache-tomcat-7.0.95-windows-x86.zip.asc
dev/tomcat/tomcat-7/v7.0.95/bin/apache-tomcat-7.0.95-windows-x86.zip.sha512
dev/tomcat/tomcat-7/v7.0.95/bin/apache-tomcat-7.0.95.exe   (with props)
dev/tomcat/tomcat-7/v7.0.95/bin/apache-tomcat-7.0.95.exe.asc
dev/tomcat/tomcat-7/v7.0.95/bin/apache-tomcat-7.0.95.exe.sha512
dev/tomcat/tomcat-7/v7.0.95/bin/apache-tomcat-7.0.95.tar.gz   (with props)
dev/tomcat/tomcat-7/v7.0.95/bin/apache-tomcat-7.0.95.tar.gz.asc
dev/tomcat/tomcat-7/v7.0.95/bin/apache-tomcat-7.0.95.tar.gz.sha512
dev/tomcat/tomcat-7/v7.0.95/bin/apache-tomcat-7.0.95.zip   (with props)
dev/tomcat/tomcat-7/v7.0.95/bin/apache-tomcat-7.0.95.zip.asc
dev/tomcat/tomcat-7/v7.0.95/bin/apache-tomcat-7.0.95.zip.sha512
dev/tomcat/tomcat-7/v7.0.95/bin/embed/
dev/tomcat/tomcat-7/v7.0.95/bin/embed/apache-tomcat-7.0.95-embed.tar.gz   
(with props)
dev/tomcat/tomcat-7/v7.0.95/bin/embed/apache-tomcat-7.0.95-embed.tar.gz.asc

dev/tomcat/tomcat-7/v7.0.95/bin/embed/apache-tomcat-7.0.95-embed.tar.gz.sha512
dev/tomcat/tomcat-7/v7.0.95/bin/embed/apache-tomcat-7.0.95-embed.zip   
(with props)
dev/tomcat/tomcat-7/v7.0.95/bin/embed/apache-tomcat-7.0.95-embed.zip.asc
dev/tomcat/tomcat-7/v7.0.95/bin/embed/apache-tomcat-7.0.95-embed.zip.sha512
dev/tomcat/tomcat-7/v7.0.95/bin/extras/
dev/tomcat/tomcat-7/v7.0.95/bin/extras/catalina-jmx-remote.jar   (with 
props)
dev/tomcat/tomcat-7/v7.0.95/bin/extras/catalina-jmx-remote.jar.asc
dev/tomcat/tomcat-7/v7.0.95/bin/extras/catalina-jmx-remote.jar.sha512
dev/tomcat/tomcat-7/v7.0.95/bin/extras/catalina-ws.jar   (with props)
dev/tomcat/tomcat-7/v7.0.95/bin/extras/catalina-ws.jar.asc
dev/tomcat/tomcat-7/v7.0.95/bin/extras/catalina-ws.jar.sha512
dev/tomcat/tomcat-7/v7.0.95/bin/extras/tomcat-juli-adapters.jar   (with 
props)
dev/tomcat/tomcat-7/v7.0.95/bin/extras/tomcat-juli-adapters.jar.asc
dev/tomcat/tomcat-7/v7.0.95/bin/extras/tomcat-juli-adapters.jar.sha512
dev/tomcat/tomcat-7/v7.0.95/bin/extras/tomcat-juli.jar   (with props)
dev/tomcat/tomcat-7/v7.0.95/bin/extras/tomcat-juli.jar.asc
dev/tomcat/tomcat-7/v7.0.95/bin/extras/tomcat-juli.jar.sha512
dev/tomcat/tomcat-7/v7.0.95/src/
dev/tomcat/tomcat-7/v7.0.95/src/apache-tomcat-7.0.95-src.tar.gz   (with 
props)
dev/tomcat/tomcat-7/v7.0.95/src/apache-tomcat-7.0.95-src.tar.gz.asc
dev/tomcat/tomcat-7/v7.0.95/src/apache-tomcat-7.0.95-src.tar.gz.sha512
dev/tomcat/tomcat-7/v7.0.95/src/apache-tomcat-7.0.95-src.zip   (with props)
dev/tomcat/tomcat-7/v7.0.95/src/apache-tomcat-7.0.95-src.zip.asc
dev/tomcat/tomcat-7/v7.0.95/src/apache-tomcat-7.0.95-src.zip.sha512

Added: dev/tomcat/tomcat-7/v7.0.95/KEYS
==
--- dev/tomcat/tomcat-7/v7.0.95/KEYS (added)
+++ dev/tomcat/tomcat-7/v7.0.95/KEYS Wed Jul 10 23:10:45 2019
@@ -0,0 +1,650 @@
+This file contains the PGP&GPG keys of various Apache developers.
+Please don't use them for email unless you have to. Their main
+purpose is code signing.
+
+Apache users: pgp < KEYS
+Apache developers:
+(pgpk -ll  && pgpk -xa ) >> this file.
+  or
+(gpg --fingerprint --list-sigs 
+ && gpg --armor --export ) >> this file.
+
+Apache developers: please ensure that your key is also available via the
+PGP keyservers (such as pgpkeys.mit.edu).
+
+
+Type Bits/KeyIDDate   User ID
+pub  2048/F22C4FED 2001/07/02 Andy Armstrong 
+
+-BEGIN PGP PUBLIC KEY BLOCK-

[tomcat] tag 7.0.95 created (now 647a7eb)

[violetagg]

This is an automated email from the ASF dual-hosted git repository.

violetagg pushed a change to tag 7.0.95
in repository https://gitbox.apache.org/repos/asf/tomcat.git.


  at 647a7eb  (commit)
This tag includes the following new commits:

 new 647a7eb  Tag 7.0.95

The 1 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.



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

[tomcat] 01/01: Tag 7.0.95

[violetagg]

This is an automated email from the ASF dual-hosted git repository.

violetagg pushed a commit to tag 7.0.95
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 647a7ebfa4922b9fa213fe642e6180395bbfc135
Author: Violeta Georgieva 
AuthorDate: Thu Jul 11 01:15:23 2019 +0300

Tag 7.0.95
---
 build.properties.default | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.properties.default b/build.properties.default
index 4a30427..6296d9b 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -27,7 +27,7 @@ version.major=7
 version.minor=0
 version.build=95
 version.patch=0
-version.suffix=-dev
+version.suffix=
 
 # - Build control flags -
 # Note enabling validation uses Checkstyle which is LGPL licensed


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

[tomcat] 01/02: add .idea project directory to git ignores

[violetagg]

This is an automated email from the ASF dual-hosted git repository.

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

commit cd4cdca0ff68674a4d1af12a944705f6dc285596
Author: Jeremy Boynes 
AuthorDate: Sun Jan 26 21:23:55 2014 +0200

add .idea project directory to git ignores

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1561535 
13f79535-47bb-0310-9956-ffa450edef68

(cherry picked from commit 192595113af44907debe8aaa1cd9ac929550fdd7)
---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index fe779f2..c845b41 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,6 +28,7 @@ mvn.properties
 .fbprefs
 .project
 .settings
+.idea
 *.iml
 *.asc
 *.jj


-
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 (2f9339e -> cf947e3)

[violetagg]

This is an automated email from the ASF dual-hosted git repository.

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


from 2f9339e  Fix javadoc
 new cd4cdca  add .idea project directory to git ignores
 new cf947e3  Ignore more IntelliJ files

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:
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)


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

[tomcat] 02/02: Ignore more IntelliJ files

[violetagg]

This is an automated email from the ASF dual-hosted git repository.

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

commit cf947e312236872eeab15a14a5fb993701de07a0
Author: Emmanuel Bourg 
AuthorDate: Wed May 8 23:20:46 2019 +0300

Ignore more IntelliJ files

(cherry picked from commit 95f85b74f1ae24b8490094efc2837ee15079f871)
---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index c845b41..d4d5202 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,6 +30,8 @@ mvn.properties
 .settings
 .idea
 *.iml
+*.ipr
+*.iws
 *.asc
 *.jj
 *.tmp


-
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: Ignore more IntelliJ files

[violetagg]

This is an automated email from the ASF dual-hosted git repository.

violetagg 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 cb85254  Ignore more IntelliJ files
cb85254 is described below

commit cb8525421edccdfedf48bbdd453c1070581fa308
Author: Emmanuel Bourg 
AuthorDate: Wed May 8 23:20:46 2019 +0300

Ignore more IntelliJ files

(cherry picked from commit 95f85b74f1ae24b8490094efc2837ee15079f871)
---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index b84d5df..69822ba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,6 +30,8 @@ mvn.properties
 .settings
 .idea
 *.iml
+*.ipr
+*.iws
 *.asc
 *.jj
 *.tmp


-
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 javadoc

[violetagg]

This is an automated email from the ASF dual-hosted git repository.

violetagg 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 2f9339e  Fix javadoc
2f9339e is described below

commit 2f9339e6ae5b6a64a4358c7ce37b059559faf7f7
Author: Violeta Georgieva 
AuthorDate: Thu Jul 11 00:26:58 2019 +0300

Fix javadoc
---
 java/org/apache/tomcat/websocket/Constants.java   | 2 +-
 java/org/apache/tomcat/websocket/pojo/Constants.java  | 2 +-
 java/org/apache/tomcat/websocket/pojo/PojoEndpointServer.java | 4 ++--
 java/org/apache/tomcat/websocket/server/Constants.java| 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/java/org/apache/tomcat/websocket/Constants.java 
b/java/org/apache/tomcat/websocket/Constants.java
index bdadbb6..440050a 100644
--- a/java/org/apache/tomcat/websocket/Constants.java
+++ b/java/org/apache/tomcat/websocket/Constants.java
@@ -28,7 +28,7 @@ import javax.websocket.Extension;
 public class Constants {
 
 /**
- * @deprecated. Will be removed in 8.5.x onwards.
+ * @deprecated Will be removed in 8.5.x onwards.
  */
 @Deprecated
 protected static final String PACKAGE_NAME = 
Constants.class.getPackage().getName();
diff --git a/java/org/apache/tomcat/websocket/pojo/Constants.java 
b/java/org/apache/tomcat/websocket/pojo/Constants.java
index 4edd4dd..5e4d511 100644
--- a/java/org/apache/tomcat/websocket/pojo/Constants.java
+++ b/java/org/apache/tomcat/websocket/pojo/Constants.java
@@ -22,7 +22,7 @@ package org.apache.tomcat.websocket.pojo;
 public class Constants {
 
 /**
- * @deprecated. Will be removed in 8.5.x onwards.
+ * @deprecated Will be removed in 8.5.x onwards.
  */
 @Deprecated
 protected static final String PACKAGE_NAME = 
Constants.class.getPackage().getName();
diff --git a/java/org/apache/tomcat/websocket/pojo/PojoEndpointServer.java 
b/java/org/apache/tomcat/websocket/pojo/PojoEndpointServer.java
index f7766e6..0caa168 100644
--- a/java/org/apache/tomcat/websocket/pojo/PojoEndpointServer.java
+++ b/java/org/apache/tomcat/websocket/pojo/PojoEndpointServer.java
@@ -35,13 +35,13 @@ public class PojoEndpointServer extends PojoEndpointBase {
 StringManager.getManager(PojoEndpointServer.class);
 
 /**
- * @deprecated. Will be removed in 8.5.x onwards.
+ * @deprecated Will be removed in 8.5.x onwards.
  */
 @Deprecated
 public static final String POJO_PATH_PARAM_KEY = 
Constants.POJO_PATH_PARAM_KEY;
 
 /**
- * @deprecated. Will be removed in 8.5.x onwards.
+ * @deprecated Will be removed in 8.5.x onwards.
  */
 @Deprecated
 public static final String POJO_METHOD_MAPPING_KEY = 
Constants.POJO_METHOD_MAPPING_KEY;
diff --git a/java/org/apache/tomcat/websocket/server/Constants.java 
b/java/org/apache/tomcat/websocket/server/Constants.java
index 4afb1a7..6892a5a 100644
--- a/java/org/apache/tomcat/websocket/server/Constants.java
+++ b/java/org/apache/tomcat/websocket/server/Constants.java
@@ -22,7 +22,7 @@ package org.apache.tomcat.websocket.server;
 public class Constants {
 
 /**
- * @deprecated. Will be removed in 8.5.x onwards.
+ * @deprecated Will be removed in 8.5.x onwards.
  */
 @Deprecated
 protected static final String PACKAGE_NAME = 
Constants.class.getPackage().getName();


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

Re: Graal and Tomcat Native

[Rémy Maucherat]

On Wed, Jul 10, 2019 at 9:10 PM Igal Sapir  wrote:

> Rémy,
>
> At the risk of pointing out the obvious as I'm sure that you are much
> more familiar with this than I am:
>
> On 7/10/2019 11:42 AM, Rémy Maucherat wrote:
> > Hi,
> >
> > I'm a bit stumped there, as I'm trying to get native to work in that
> > rather special environment.
> >
> > JNI_OnLoad fails with:
> > WARNING: The APR based Apache Tomcat Native library failed to load.
> > The error reported was [Unsupported JNI version 0x, required
> > by bin/libtcnative-1.so.0.2.23]
> > java.lang.UnsatisfiedLinkError: Unsupported JNI version 0x,
> > required by bin/libtcnative-1.so.0.2.23
> > at
> >
> com.oracle.svm.jni.JNILibraryInitializer.initialize(JNILibraryLoadFeature.java:87)
> > at
> >
> com.oracle.svm.core.jdk.NativeLibrarySupport.loadLibrary0(NativeLibrarySupport.java:153)
> > at
> >
> com.oracle.svm.core.jdk.NativeLibrarySupport.loadLibrary(NativeLibrarySupport.java:98)
> > at
> > java.lang.ClassLoader.loadLibrary(Target_java_lang_ClassLoader.java:126)
> > at java.lang.Runtime.load0(Runtime.java:809)
> > at java.lang.Runtime.load(Runtime.java:241)
> > at java.lang.System.load(System.java:366)
> > at org.apache.tomcat.jni.Library.(Library.java:42)
> >
> > Although this looks weird, this is actually returning -1 and it's
> > normal when it fails [it's a bad error message]. Most likely this
> > doesn't work:
> > if ((*vm)->GetEnv(vm, &ppe, JNI_VERSION_1_4)) {
> > return JNI_ERR;
> > }
> >
> > Any ideas ?
>
>  From [1]: "JNI_OnLoad must return the JNI version needed by the native
> library".  -1 is translated into 0x, which is the invalid result.
>
>  From the snippet you posted I'm guessing that the returned value is
> supposed to be JNI_VERSION_1_4 or greater.
>
> Do you know what that snippet is trying to check?
>

https://docs.oracle.com/javase/9/docs/specs/jni/invocation.html#getenv
So it seems to fail and return JNI_ERR (-1). I think it's failing there
because there's no other error message.

Rémy


>
> Igal
>
> [1]
>
> https://docs.oracle.com/javase/8/docs/technotes/guides/jni/spec/invocation.html#JNJI_OnLoad
>
>
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>

Re: Graal and Tomcat Native

[Igal Sapir]

Rémy,

At the risk of pointing out the obvious as I'm sure that you are much 
more familiar with this than I am:


On 7/10/2019 11:42 AM, Rémy Maucherat wrote:

Hi,

I'm a bit stumped there, as I'm trying to get native to work in that 
rather special environment.


JNI_OnLoad fails with:
WARNING: The APR based Apache Tomcat Native library failed to load. 
The error reported was [Unsupported JNI version 0x, required 
by bin/libtcnative-1.so.0.2.23]
java.lang.UnsatisfiedLinkError: Unsupported JNI version 0x, 
required by bin/libtcnative-1.so.0.2.23
at 
com.oracle.svm.jni.JNILibraryInitializer.initialize(JNILibraryLoadFeature.java:87)
at 
com.oracle.svm.core.jdk.NativeLibrarySupport.loadLibrary0(NativeLibrarySupport.java:153)
at 
com.oracle.svm.core.jdk.NativeLibrarySupport.loadLibrary(NativeLibrarySupport.java:98)
at 
java.lang.ClassLoader.loadLibrary(Target_java_lang_ClassLoader.java:126)

at java.lang.Runtime.load0(Runtime.java:809)
at java.lang.Runtime.load(Runtime.java:241)
at java.lang.System.load(System.java:366)
at org.apache.tomcat.jni.Library.(Library.java:42)

Although this looks weird, this is actually returning -1 and it's 
normal when it fails [it's a bad error message]. Most likely this 
doesn't work:

    if ((*vm)->GetEnv(vm, &ppe, JNI_VERSION_1_4)) {
        return JNI_ERR;
    }

Any ideas ?


From [1]: "JNI_OnLoad must return the JNI version needed by the native 
library".  -1 is translated into 0x, which is the invalid result.


From the snippet you posted I'm guessing that the returned value is 
supposed to be JNI_VERSION_1_4 or greater.


Do you know what that snippet is trying to check?

Igal

[1] 
https://docs.oracle.com/javase/8/docs/technotes/guides/jni/spec/invocation.html#JNJI_OnLoad




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

Graal and Tomcat Native

[Rémy Maucherat]

Hi,

I'm a bit stumped there, as I'm trying to get native to work in that rather
special environment.

JNI_OnLoad fails with:
WARNING: The APR based Apache Tomcat Native library failed to load. The
error reported was [Unsupported JNI version 0x, required by
bin/libtcnative-1.so.0.2.23]
java.lang.UnsatisfiedLinkError: Unsupported JNI version 0x,
required by bin/libtcnative-1.so.0.2.23
at
com.oracle.svm.jni.JNILibraryInitializer.initialize(JNILibraryLoadFeature.java:87)
at
com.oracle.svm.core.jdk.NativeLibrarySupport.loadLibrary0(NativeLibrarySupport.java:153)
at
com.oracle.svm.core.jdk.NativeLibrarySupport.loadLibrary(NativeLibrarySupport.java:98)
at java.lang.ClassLoader.loadLibrary(Target_java_lang_ClassLoader.java:126)
at java.lang.Runtime.load0(Runtime.java:809)
at java.lang.Runtime.load(Runtime.java:241)
at java.lang.System.load(System.java:366)
at org.apache.tomcat.jni.Library.(Library.java:42)

Although this looks weird, this is actually returning -1 and it's normal
when it fails [it's a bad error message]. Most likely this doesn't work:
if ((*vm)->GetEnv(vm, &ppe, JNI_VERSION_1_4)) {
return JNI_ERR;
}

Any ideas ?

Rémy

Re: [VOTE][RESULT] Release Apache Tomcat 9.0.22

[Igal Sapir]

Chris,

On 7/10/2019 6:44 AM, Christopher Schultz wrote:

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

All,

Yep, the APR library was the problem. For some reason, it did not load
for a great many (all?) tests. I'll have to check my testing process.

- -chris


I would suspect an all or nothing thing here.  Hard to imagine why it 
would load for some but not all.


Do you point to the APR library with `test.apr.loc`?  I expect the log 
output to show whether it was found or not.


Best,

Igal



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

[tomcat] branch master updated: Polish. Align with 8.5.x.

[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 f3517e7  Polish. Align with 8.5.x.
f3517e7 is described below

commit f3517e7acfac217ae1659f0732000f598c2317f9
Author: Mark Thomas 
AuthorDate: Wed Jul 10 16:08:47 2019 +0100

Polish. Align with 8.5.x.
---
 java/org/apache/coyote/Response.java | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/coyote/Response.java 
b/java/org/apache/coyote/Response.java
index 1aa1937..b9f22b7 100644
--- a/java/org/apache/coyote/Response.java
+++ b/java/org/apache/coyote/Response.java
@@ -503,6 +503,9 @@ public final class Response {
 }
 
 
+/**
+ * @return The name of the current encoding
+ */
 public String getCharacterEncoding() {
 return characterEncoding;
 }
@@ -561,8 +564,7 @@ public final class Response {
 
 String ret = contentType;
 
-if (ret != null
-&& charset != null) {
+if (ret != null && charset != null) {
 ret = ret + ";charset=" + characterEncoding;
 }
 


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

[tomcat] 02/02: Improve async Servlet error handling

[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 64e468afc66b3d3a50d140d160bf345a4c6b53a1
Author: Mark Thomas 
AuthorDate: Wed Jul 10 16:33:03 2019 +0100

Improve async Servlet error handling

If an unhandled exception occurs on a asynchronous thread started via
AsyncContext.start(Runnable), process it using the standard error page
mechanism.
---
 .../org/apache/catalina/core/AsyncContextImpl.java |  14 +-
 .../apache/catalina/core/LocalStrings.properties   |   1 +
 .../http/TestHttpServletResponseSendError.java | 368 +
 webapps/docs/changelog.xml |   5 +
 4 files changed, 386 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/catalina/core/AsyncContextImpl.java 
b/java/org/apache/catalina/core/AsyncContextImpl.java
index bba05e9..c39b48e 100644
--- a/java/org/apache/catalina/core/AsyncContextImpl.java
+++ b/java/org/apache/catalina/core/AsyncContextImpl.java
@@ -266,7 +266,7 @@ public class AsyncContextImpl implements AsyncContext, 
AsyncContextCallback {
 logDebug("start  ");
 }
 check();
-Runnable wrapper = new RunnableWrapper(run, context);
+Runnable wrapper = new RunnableWrapper(run, context, 
this.request.getCoyoteRequest());
 this.request.getCoyoteRequest().action(ActionCode.ASYNC_RUN, wrapper);
 }
 
@@ -556,10 +556,13 @@ public class AsyncContextImpl implements AsyncContext, 
AsyncContextCallback {
 
 private final Runnable wrapped;
 private final Context context;
+private final org.apache.coyote.Request coyoteRequest;
 
-public RunnableWrapper(Runnable wrapped, Context ctxt) {
+public RunnableWrapper(Runnable wrapped, Context ctxt,
+org.apache.coyote.Request coyoteRequest) {
 this.wrapped = wrapped;
 this.context = ctxt;
+this.coyoteRequest = coyoteRequest;
 }
 
 @Override
@@ -582,6 +585,13 @@ public class AsyncContextImpl implements AsyncContext, 
AsyncContextCallback {
 (context.getLoader().getClassLoader());
 }
 wrapped.run();
+} catch (Throwable t) {
+ExceptionUtils.handleThrowable(t);
+
context.getLogger().error(sm.getString("asyncContextImpl.asyncRunnableError"), 
t);
+coyoteRequest.setAttribute(RequestDispatcher.ERROR_EXCEPTION, 
t);
+org.apache.coyote.Response coyoteResponse = 
coyoteRequest.getResponse();
+
coyoteResponse.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+coyoteResponse.setError();
 } finally {
 if (Globals.IS_SECURITY_ENABLED) {
 PrivilegedAction pa = new PrivilegedSetTccl(
diff --git a/java/org/apache/catalina/core/LocalStrings.properties 
b/java/org/apache/catalina/core/LocalStrings.properties
index f788a76..3d40c12 100644
--- a/java/org/apache/catalina/core/LocalStrings.properties
+++ b/java/org/apache/catalina/core/LocalStrings.properties
@@ -93,6 +93,7 @@ aprListener.tooLateForSSLRandomSeed=Cannot setSSLRandomSeed: 
SSL has already bee
 aprListener.wrongFIPSMode=Unexpected value of FIPSMode option of 
AprLifecycleListener: "{0}"
 
 asyncContextImpl.asyncDispachError=Error during asynchronous dispatch
+asyncContextImpl.asyncRunnableError=Error during processing of asynchronous 
Runnable via AsyncContext.start()
 asyncContextImpl.dispatchingStarted=Asynchronous dispatch operation has 
already been called. Additional asynchronous dispatch operation within the same 
asynchronous cycle is not allowed.
 asyncContextImpl.noAsyncDispatcher=The dispatcher returned from the 
ServletContext does not support asynchronous dispatching
 asyncContextImpl.onCompleteError=onComplete() call failed for listener of type 
[{0}]
diff --git a/test/javax/servlet/http/TestHttpServletResponseSendError.java 
b/test/javax/servlet/http/TestHttpServletResponseSendError.java
new file mode 100644
index 000..8e0e89e
--- /dev/null
+++ b/test/javax/servlet/http/TestHttpServletResponseSendError.java
@@ -0,0 +1,368 @@
+/*
+ * 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.
+ * 

[tomcat] branch 7.0.x updated (0ebe425 -> 64e468a)

[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 0ebe425  Polish & minor refactoring to better align with 8.5.x
 new b9ccc2d  Push the error state tracking down to the Coyote Response
 new 64e468a  Improve async Servlet error handling

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/org/apache/catalina/connector/Response.java   |  41 +--
 .../org/apache/catalina/core/AsyncContextImpl.java |  14 +-
 .../apache/catalina/core/LocalStrings.properties   |   1 +
 java/org/apache/coyote/Response.java   |  67 +++-
 .../http/TestHttpServletResponseSendError.java | 368 +
 webapps/docs/changelog.xml |   5 +
 6 files changed, 455 insertions(+), 41 deletions(-)
 create mode 100644 
test/javax/servlet/http/TestHttpServletResponseSendError.java


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

[tomcat] 01/02: Push the error state tracking down to the Coyote Response

[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 b9ccc2d576c6e6cd60cd1841ba7ff3382f3f24ef
Author: Mark Thomas 
AuthorDate: Fri Feb 1 10:52:53 2019 +

Push the error state tracking down to the Coyote Response

This is to support error handling of async requests dispatched to a
container provided thread.
---
 java/org/apache/catalina/connector/Response.java | 41 ++-
 java/org/apache/coyote/Response.java | 67 +++-
 2 files changed, 69 insertions(+), 39 deletions(-)

diff --git a/java/org/apache/catalina/connector/Response.java 
b/java/org/apache/catalina/connector/Response.java
index 19399d6..539fe6b 100644
--- a/java/org/apache/catalina/connector/Response.java
+++ b/java/org/apache/catalina/connector/Response.java
@@ -33,7 +33,6 @@ import java.util.List;
 import java.util.Locale;
 import java.util.TimeZone;
 import java.util.Vector;
-import java.util.concurrent.atomic.AtomicInteger;
 
 import javax.servlet.ServletOutputStream;
 import javax.servlet.SessionTrackingMode;
@@ -219,37 +218,6 @@ public class Response implements HttpServletResponse {
  */
 private boolean isCharacterEncodingSet = false;
 
-/**
- * With the introduction of async processing and the possibility of
- * non-container threads calling sendError() tracking the current error
- * state and ensuring that the correct error page is called becomes more
- * complicated. This state attribute helps by tracking the current error
- * state and informing callers that attempt to change state if the change
- * was successful or if another thread got there first.
- *
- * 
- * The state machine is very simple:
- *
- * 0 - NONE
- * 1 - NOT_REPORTED
- * 2 - REPORTED
- *
- *
- *   -->>-- >NONE
- *   |   ||
- *   |   || setError()
- *   ^   ^|
- *   |   |   \|/
- *   |   |-<-NOT_REPORTED
- *   ||
- *   ^| report()
- *   ||
- *   |   \|/
- *   | 0;
+return getCoyoteResponse().isError();
 }
 
 
 public boolean isErrorReportRequired() {
-return errorState.get() == 1;
+return getCoyoteResponse().isErrorReportRequired();
 }
 
 
 public boolean setErrorReported() {
-return errorState.compareAndSet(1, 2);
+return getCoyoteResponse().setErrorReported();
 }
 
 
diff --git a/java/org/apache/coyote/Response.java 
b/java/org/apache/coyote/Response.java
index 38e62b2..568eb19 100644
--- a/java/org/apache/coyote/Response.java
+++ b/java/org/apache/coyote/Response.java
@@ -19,6 +19,7 @@ package org.apache.coyote;
 import java.io.IOException;
 import java.io.StringReader;
 import java.util.Locale;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import org.apache.tomcat.util.buf.ByteChunk;
 import org.apache.tomcat.util.http.MimeHeaders;
@@ -103,14 +104,45 @@ public final class Response {
 private long commitTime = -1;
 
 /**
+ * Has the charset been explicitly set.
+ */
+boolean charsetSet = false;
+
+/**
  * Holds request error exception.
  */
 Exception errorException = null;
 
 /**
- * Has the charset been explicitly set.
+ * With the introduction of async processing and the possibility of
+ * non-container threads calling sendError() tracking the current error
+ * state and ensuring that the correct error page is called becomes more
+ * complicated. This state attribute helps by tracking the current error
+ * state and informing callers that attempt to change state if the change
+ * was successful or if another thread got there first.
+ *
+ * 
+ * The state machine is very simple:
+ *
+ * 0 - NONE
+ * 1 - NOT_REPORTED
+ * 2 - REPORTED
+   

[tomcat] branch 8.5.x updated: Polish. Align with master.

[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 916c128  Polish. Align with master.
916c128 is described below

commit 916c128fe82a5b10456bf3d7bff8d282266c1e51
Author: Mark Thomas 
AuthorDate: Wed Jul 10 16:10:23 2019 +0100

Polish. Align with master.
---
 java/org/apache/coyote/Response.java | 12 +---
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/java/org/apache/coyote/Response.java 
b/java/org/apache/coyote/Response.java
index c3ee057..536f50f 100644
--- a/java/org/apache/coyote/Response.java
+++ b/java/org/apache/coyote/Response.java
@@ -456,13 +456,12 @@ public final class Response {
 return contentLanguage;
 }
 
+
 /**
- * Overrides the name of the character encoding used in the body
- * of the response. This method must be called prior to writing output
- * using getWriter().
+ * Overrides the character encoding used in the body of the response. This
+ * method must be called prior to writing output using getWriter().
  *
- * @param characterEncoding String containing the name of the character
- *  encoding.
+ * @param characterEncoding The name of character encoding.
  */
 public void setCharacterEncoding(String characterEncoding) {
 if (isCommitted()) {
@@ -547,8 +546,7 @@ public final class Response {
 
 String ret = contentType;
 
-if (ret != null
-&& charset != null) {
+if (ret != null && charset != null) {
 ret = ret + ";charset=" + characterEncoding;
 }
 


-
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: Polish & minor refactoring to better align with 8.5.x

[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 0ebe425  Polish & minor refactoring to better align with 8.5.x
0ebe425 is described below

commit 0ebe425cad26bdafcabfc1f85f383491739d6ae7
Author: Mark Thomas 
AuthorDate: Wed Jul 10 15:49:19 2019 +0100

Polish & minor refactoring to better align with 8.5.x

This is in preparation for looking at the larger refactoring for the
addition of error state.
---
 java/org/apache/coyote/Response.java | 104 +++
 1 file changed, 68 insertions(+), 36 deletions(-)

diff --git a/java/org/apache/coyote/Response.java 
b/java/org/apache/coyote/Response.java
index 1d38316..38e62b2 100644
--- a/java/org/apache/coyote/Response.java
+++ b/java/org/apache/coyote/Response.java
@@ -32,7 +32,7 @@ import org.apache.tomcat.util.http.parser.MediaType;
  * @author Jason Hunter [j...@eng.sun.com]
  * @author James Todd [go...@eng.sun.com]
  * @author Harish Prabandham
- * @author Hans Bergsten 
+ * @author Hans Bergsten [h...@gefionsoftware.com]
  * @author Remy Maucherat
  */
 public final class Response {
@@ -42,7 +42,7 @@ public final class Response {
 /**
  * Default locale as mandated by the spec.
  */
-private static Locale DEFAULT_LOCALE = Locale.getDefault();
+private static final Locale DEFAULT_LOCALE = Locale.getDefault();
 
 
 // - Instance Variables
@@ -62,7 +62,7 @@ public final class Response {
 /**
  * Response headers.
  */
-MimeHeaders headers = new MimeHeaders();
+final MimeHeaders headers = new MimeHeaders();
 
 
 /**
@@ -74,19 +74,19 @@ public final class Response {
 /**
  * Notes.
  */
-Object notes[] = new Object[Constants.MAX_NOTES];
+final Object notes[] = new Object[Constants.MAX_NOTES];
 
 
 /**
  * Committed flag.
  */
-boolean committed = false;
+volatile boolean committed = false;
 
 
 /**
  * Action hook.
  */
-public ActionHook hook;
+public volatile ActionHook hook;
 
 
 /**
@@ -114,6 +114,7 @@ public final class Response {
 
 Request req;
 
+
 // - Properties
 
 public Request getRequest() {
@@ -151,7 +152,6 @@ public final class Response {
 
 //  Per-Response "notes" 
 
-
 public final void setNote(int pos, Object value) {
 notes[pos] = value;
 }
@@ -164,35 +164,38 @@ public final class Response {
 
 //  Actions 
 
-
 public void action(ActionCode actionCode, Object param) {
 if (hook != null) {
-if( param==null )
+if (param == null) {
 hook.action(actionCode, this);
-else
+} else {
 hook.action(actionCode, param);
+}
 }
 }
 
 
 //  State 
 
-
 public int getStatus() {
 return status;
 }
 
 
 /**
- * Set the response status
+ * Set the response status.
+ *
+ * @param status The status value to set
  */
-public void setStatus( int status ) {
+public void setStatus(int status) {
 this.status = status;
 }
 
 
 /**
  * Get the status message.
+ *
+ * @return The message associated with the current status
  */
 public String getMessage() {
 return message;
@@ -201,6 +204,8 @@ public final class Response {
 
 /**
  * Set the status message.
+ *
+ * @param message The status message to set
  */
 public void setMessage(String message) {
 this.message = message;
@@ -230,10 +235,10 @@ public final class Response {
 
 // -Error State 
 
-
 /**
- * Set the error Exception that occurred during
- * request processing.
+ * Set the error Exception that occurred during request processing.
+ *
+ * @param ex The exception that occurred
  */
 public void setErrorException(Exception ex) {
 errorException = ex;
@@ -241,8 +246,9 @@ public final class Response {
 
 
 /**
- * Get the Exception that occurred during request
- * processing.
+ * Get the Exception that occurred during request processing.
+ *
+ * @return The exception that occurred
  */
 public Exception getErrorException() {
 return errorException;
@@ -281,8 +287,14 @@ public final class Response {
 
 //  Headers 
 /**
- * Warning: This method always returns false for Content-Type
+ * Does the response contain the given header.
+ * 
+ * Warning: This method always returns false for 

[tomcat] branch master updated: Add some Tribes interfaces to the reflection list

[remm]

This is an automated email from the ASF dual-hosted git repository.

remm 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 cc93ffb  Add some Tribes interfaces to the reflection list
cc93ffb is described below

commit cc93ffb998bcf1001c8aeab1bff316d814f9feda
Author: remm 
AuthorDate: Wed Jul 10 16:59:19 2019 +0200

Add some Tribes interfaces to the reflection list
---
 res/tomcat-maven/tomcat-reflection.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/res/tomcat-maven/tomcat-reflection.json 
b/res/tomcat-maven/tomcat-reflection.json
index ab1e477..bf3de8a 100644
--- a/res/tomcat-maven/tomcat-reflection.json
+++ b/res/tomcat-maven/tomcat-reflection.json
@@ -36,6 +36,8 @@
 { "name":"org.apache.catalina.WebResourceRoot" },
 { "name":"org.apache.catalina.WebResourceSet" },
 { "name":"org.apache.catalina.Wrapper" },
+{ "name":"org.apache.catalina.tribes.Channel" },
+{ "name":"org.apache.catalina.tribes.MembershipService" },
 { "name":"org.apache.coyote.UpgradeProtocol" },
 { "name":"com.sun.org.apache.xerces.internal.jaxp.SAXParserFactoryImpl", 
"methods" : [{"name": "","parameterTypes":[]}] },
 { "name":"com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl", 
"methods" : [{"name": "","parameterTypes":[]}] },


-
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: Improve async Servlet error handling

[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 0467b4f  Improve async Servlet error handling
0467b4f is described below

commit 0467b4f51c966f624c149c3047e39b40b33d08a7
Author: Mark Thomas 
AuthorDate: Wed Jul 10 15:49:19 2019 +0100

Improve async Servlet error handling

If an unhandled exception occurs on a asynchronous thread started via
AsyncContext.start(Runnable), process it using the standard error page
mechanism.
---
 .../org/apache/catalina/core/AsyncContextImpl.java |   7 +
 .../apache/catalina/core/LocalStrings.properties   |   1 +
 .../http/TestHttpServletResponseSendError.java | 368 +
 webapps/docs/changelog.xml |   5 +
 4 files changed, 381 insertions(+)

diff --git a/java/org/apache/catalina/core/AsyncContextImpl.java 
b/java/org/apache/catalina/core/AsyncContextImpl.java
index 4621644..674236c 100644
--- a/java/org/apache/catalina/core/AsyncContextImpl.java
+++ b/java/org/apache/catalina/core/AsyncContextImpl.java
@@ -532,6 +532,13 @@ public class AsyncContextImpl implements AsyncContext, 
AsyncContextCallback {
 ClassLoader oldCL = context.bind(Globals.IS_SECURITY_ENABLED, 
null);
 try {
 wrapped.run();
+} catch (Throwable t) {
+ExceptionUtils.handleThrowable(t);
+
context.getLogger().error(sm.getString("asyncContextImpl.asyncRunnableError"), 
t);
+coyoteRequest.setAttribute(RequestDispatcher.ERROR_EXCEPTION, 
t);
+org.apache.coyote.Response coyoteResponse = 
coyoteRequest.getResponse();
+
coyoteResponse.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+coyoteResponse.setError();
 } finally {
 context.unbind(Globals.IS_SECURITY_ENABLED, oldCL);
 }
diff --git a/java/org/apache/catalina/core/LocalStrings.properties 
b/java/org/apache/catalina/core/LocalStrings.properties
index ff89a88..197cb49 100644
--- a/java/org/apache/catalina/core/LocalStrings.properties
+++ b/java/org/apache/catalina/core/LocalStrings.properties
@@ -93,6 +93,7 @@ aprListener.tooLateForSSLRandomSeed=Cannot setSSLRandomSeed: 
SSL has already bee
 aprListener.wrongFIPSMode=Unexpected value of FIPSMode option of 
AprLifecycleListener: [{0}]
 
 asyncContextImpl.asyncDispachError=Error during asynchronous dispatch
+asyncContextImpl.asyncRunnableError=Error during processing of asynchronous 
Runnable via AsyncContext.start()
 asyncContextImpl.dispatchingStarted=Asynchronous dispatch operation has 
already been called. Additional asynchronous dispatch operation within the same 
asynchronous cycle is not allowed.
 asyncContextImpl.noAsyncDispatcher=The dispatcher returned from the 
ServletContext does not support asynchronous dispatching
 asyncContextImpl.onCompleteError=onComplete() call failed for listener of type 
[{0}]
diff --git a/test/javax/servlet/http/TestHttpServletResponseSendError.java 
b/test/javax/servlet/http/TestHttpServletResponseSendError.java
new file mode 100644
index 000..256b536
--- /dev/null
+++ b/test/javax/servlet/http/TestHttpServletResponseSendError.java
@@ -0,0 +1,368 @@
+/*
+ * 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 javax.servlet.http;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import javax.servlet.AsyncContext;
+import javax.servlet.ServletException;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameter;
+
+import org.apache.catalina.Context;
+import org.apache.catalina.Wrapper;
+import org.apache.catalina.startup.Tomcat;
+import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.tomcat.util.buf.ByteChunk;
+import org.apache.tomcat.util.descriptor.web.ErrorPage;
+
+/**
+ * These tests evolved out of a discussion in the Jakarta Servlet project
+ * regarding the intended 

[tomcat] branch master updated: Improve async Servlet error handling

[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 e1d24b0  Improve async Servlet error handling
e1d24b0 is described below

commit e1d24b0c1aeb52221f87fe78125fb665d2b0d25e
Author: Mark Thomas 
AuthorDate: Wed Jul 10 15:49:19 2019 +0100

Improve async Servlet error handling

If an unhandled exception occurs on a asynchronous thread started via
AsyncContext.start(Runnable), process it using the standard error page
mechanism.
---
 .../org/apache/catalina/core/AsyncContextImpl.java |   7 +
 .../apache/catalina/core/LocalStrings.properties   |   1 +
 .../http/TestHttpServletResponseSendError.java | 368 +
 webapps/docs/changelog.xml |   5 +
 4 files changed, 381 insertions(+)

diff --git a/java/org/apache/catalina/core/AsyncContextImpl.java 
b/java/org/apache/catalina/core/AsyncContextImpl.java
index 4621644..674236c 100644
--- a/java/org/apache/catalina/core/AsyncContextImpl.java
+++ b/java/org/apache/catalina/core/AsyncContextImpl.java
@@ -532,6 +532,13 @@ public class AsyncContextImpl implements AsyncContext, 
AsyncContextCallback {
 ClassLoader oldCL = context.bind(Globals.IS_SECURITY_ENABLED, 
null);
 try {
 wrapped.run();
+} catch (Throwable t) {
+ExceptionUtils.handleThrowable(t);
+
context.getLogger().error(sm.getString("asyncContextImpl.asyncRunnableError"), 
t);
+coyoteRequest.setAttribute(RequestDispatcher.ERROR_EXCEPTION, 
t);
+org.apache.coyote.Response coyoteResponse = 
coyoteRequest.getResponse();
+
coyoteResponse.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+coyoteResponse.setError();
 } finally {
 context.unbind(Globals.IS_SECURITY_ENABLED, oldCL);
 }
diff --git a/java/org/apache/catalina/core/LocalStrings.properties 
b/java/org/apache/catalina/core/LocalStrings.properties
index 6a01297..25edb38 100644
--- a/java/org/apache/catalina/core/LocalStrings.properties
+++ b/java/org/apache/catalina/core/LocalStrings.properties
@@ -92,6 +92,7 @@ aprListener.tooLateForSSLRandomSeed=Cannot setSSLRandomSeed: 
SSL has already bee
 aprListener.wrongFIPSMode=Unexpected value of FIPSMode option of 
AprLifecycleListener: [{0}]
 
 asyncContextImpl.asyncDispachError=Error during asynchronous dispatch
+asyncContextImpl.asyncRunnableError=Error during processing of asynchronous 
Runnable via AsyncContext.start()
 asyncContextImpl.dispatchingStarted=Asynchronous dispatch operation has 
already been called. Additional asynchronous dispatch operation within the same 
asynchronous cycle is not allowed.
 asyncContextImpl.noAsyncDispatcher=The dispatcher returned from the 
ServletContext does not support asynchronous dispatching
 asyncContextImpl.onCompleteError=onComplete() call failed for listener of type 
[{0}]
diff --git a/test/javax/servlet/http/TestHttpServletResponseSendError.java 
b/test/javax/servlet/http/TestHttpServletResponseSendError.java
new file mode 100644
index 000..256b536
--- /dev/null
+++ b/test/javax/servlet/http/TestHttpServletResponseSendError.java
@@ -0,0 +1,368 @@
+/*
+ * 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 javax.servlet.http;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import javax.servlet.AsyncContext;
+import javax.servlet.ServletException;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameter;
+
+import org.apache.catalina.Context;
+import org.apache.catalina.Wrapper;
+import org.apache.catalina.startup.Tomcat;
+import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.tomcat.util.buf.ByteChunk;
+import org.apache.tomcat.util.descriptor.web.ErrorPage;
+
+/**
+ * These tests evolved out of a discussion in the Jakarta Servlet project
+ * regarding the intende

[tomcat] branch master updated: Call security CL also in embedded

[remm]

This is an automated email from the ASF dual-hosted git repository.

remm 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 e88a2da  Call security CL also in embedded
e88a2da is described below

commit e88a2da53db3e788a6927a373667e6daf614f10f
Author: remm 
AuthorDate: Wed Jul 10 16:47:13 2019 +0200

Call security CL also in embedded
---
 java/org/apache/catalina/startup/Tomcat.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/java/org/apache/catalina/startup/Tomcat.java 
b/java/org/apache/catalina/startup/Tomcat.java
index 71d923a..5431e02 100644
--- a/java/org/apache/catalina/startup/Tomcat.java
+++ b/java/org/apache/catalina/startup/Tomcat.java
@@ -67,6 +67,7 @@ import org.apache.catalina.core.StandardService;
 import org.apache.catalina.core.StandardWrapper;
 import org.apache.catalina.realm.GenericPrincipal;
 import org.apache.catalina.realm.RealmBase;
+import org.apache.catalina.security.SecurityClassLoad;
 import org.apache.catalina.util.ContextName;
 import org.apache.catalina.util.IOTools;
 import org.apache.tomcat.util.ExceptionUtils;
@@ -1397,6 +1398,7 @@ public class Tomcat {
 Registry.disableRegistry();
 }
 }
+
SecurityClassLoad.securityClassLoad(Thread.currentThread().getContextClassLoader());
 org.apache.catalina.startup.Tomcat tomcat = new 
org.apache.catalina.startup.Tomcat();
 // Create a Catalina instance and let it parse the configuration files
 // It will also set a shutdown hook to stop the Server when needed


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

[tomcat] branch master updated: Avoid non fatal NPEs with Tribes when JMX is not available

[remm]

This is an automated email from the ASF dual-hosted git repository.

remm 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 e6eb0f3  Avoid non fatal NPEs with Tribes when JMX is not available
e6eb0f3 is described below

commit e6eb0f38c5c2137b212d7182bfb9926c656b59f3
Author: remm 
AuthorDate: Wed Jul 10 16:46:22 2019 +0200

Avoid non fatal NPEs with Tribes when JMX is not available
---
 java/org/apache/catalina/tribes/jmx/JmxRegistry.java | 3 +++
 webapps/docs/changelog.xml   | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/java/org/apache/catalina/tribes/jmx/JmxRegistry.java 
b/java/org/apache/catalina/tribes/jmx/JmxRegistry.java
index b4d4565..5c3893c 100644
--- a/java/org/apache/catalina/tribes/jmx/JmxRegistry.java
+++ b/java/org/apache/catalina/tribes/jmx/JmxRegistry.java
@@ -96,6 +96,9 @@ public class JmxRegistry {
 }
 
 public ObjectName registerJmx(String keyprop, Object bean) {
+if (mbserver == null) {
+return null;
+}
 String oNameStr = baseOname.toString() + keyprop;
 ObjectName oName = null;
 try {
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index dcd6634..a322c06 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -70,6 +70,9 @@
 membership. The namespace is still a failure on startup but it is easy
 to provide. (remm)
   
+  
+Avoid non fatal NPEs with Tribes when JMX is not available. (remm)
+  
 
   
   


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

[tomcat] branch master updated: Verified the Graal shared libraries allow TLS to work

[remm]

This is an automated email from the ASF dual-hosted git repository.

remm 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 b228431  Verified the Graal shared libraries allow TLS to work
b228431 is described below

commit b228431569ee9ab6d1269b9ff59e5ada2186abb9
Author: remm 
AuthorDate: Wed Jul 10 16:43:23 2019 +0200

Verified the Graal shared libraries allow TLS to work

But this makes things a lot more complicated if building a container
image.
---
 res/tomcat-maven/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/tomcat-maven/README.md b/res/tomcat-maven/README.md
index ab700b5..02ce071 100644
--- a/res/tomcat-maven/README.md
+++ b/res/tomcat-maven/README.md
@@ -103,5 +103,5 @@ Generate the final json files using 
native-image-configuration then use native i
 ```
 $JAVA_HOME/bin/native-image-configure generate 
--trace-input=$TOMCAT_MAVEN/target/trace-file.json 
--output-dir=$TOMCAT_MAVEN/target
 $JAVA_HOME/bin/native-image --no-server --allow-incomplete-classpath 
--enable-https 
--initialize-at-build-time=org.eclipse.jdt,org.apache.el.parser.SimpleNode,javax.servlet.jsp.JspFactory,org.apache.jasper.servlet.JasperInitializer,org.apache.jasper.runtime.JspFactoryImpl
 -H:+JNI -H:+ReportUnsupportedElementsAtRuntime -H:+ReportExceptionStackTraces 
-H:EnableURLProtocols=jar -H:ConfigurationFileDirectories=$TOMCAT_MAVEN/target/ 
-H:ReflectionConfigurationFiles=$TOMCAT_MAVEN/tomcat-reflecti [...]
-./tomcat-maven-1.0 -Dcatalina.base=. 
-Djava.util.logging.config.file=conf/logging.properties 
-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager
+./tomcat-maven-1.0 -Djava.library.path=$JAVA_HOME/jre/lib/amd64 
-Dcatalina.base=. -Djava.util.logging.config.file=conf/logging.properties 
-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager
 ```


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

[tomcat] branch master updated: Avoid Kubernetes membership failure on startup

[remm]

This is an automated email from the ASF dual-hosted git repository.

remm 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 bf8223a  Avoid Kubernetes membership failure on startup
bf8223a is described below

commit bf8223a7afe4b52513e7a0370d353aecb356b4f8
Author: remm 
AuthorDate: Wed Jul 10 16:19:05 2019 +0200

Avoid Kubernetes membership failure on startup

Failing on startup prevents building a Graal configuration using the
tooling.
---
 .../tribes/membership/cloud/KubernetesMembershipProvider.java  |  8 ++--
 webapps/docs/changelog.xml | 10 ++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git 
a/java/org/apache/catalina/tribes/membership/cloud/KubernetesMembershipProvider.java
 
b/java/org/apache/catalina/tribes/membership/cloud/KubernetesMembershipProvider.java
index 153359d..e977542 100644
--- 
a/java/org/apache/catalina/tribes/membership/cloud/KubernetesMembershipProvider.java
+++ 
b/java/org/apache/catalina/tribes/membership/cloud/KubernetesMembershipProvider.java
@@ -80,8 +80,12 @@ public class KubernetesMembershipProvider extends 
CloudMembershipProvider {
 if (saTokenFile == null) {
 saTokenFile = 
"/var/run/secrets/kubernetes.io/serviceaccount/token";
 }
-byte[] bytes = 
Files.readAllBytes(FileSystems.getDefault().getPath(saTokenFile));
-streamProvider = new TokenStreamProvider(new String(bytes, 
StandardCharsets.US_ASCII), caCertFile);
+try {
+byte[] bytes = 
Files.readAllBytes(FileSystems.getDefault().getPath(saTokenFile));
+streamProvider = new TokenStreamProvider(new String(bytes, 
StandardCharsets.US_ASCII), caCertFile);
+} catch (IOException e) {
+
log.error(sm.getString("kubernetesMembershipProvider.streamError"), e);
+}
 } else {
 if (protocol == null) {
 protocol = "http";
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index cffca39..dcd6634 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -62,6 +62,16 @@
   
 
   
+  
+
+  
+Avoid failing Kubernetes membership (and preventing startup) if the
+stream cannot be opened, to get the same behavior as the DNS based
+membership. The namespace is still a failure on startup but it is easy
+to provide. (remm)
+  
+
+  
   
 
   


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

Re: [VOTE][RESULT] Release Apache Tomcat 9.0.22

[Christopher Schultz]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

All,

Yep, the APR library was the problem. For some reason, it did not load
for a great many (all?) tests. I'll have to check my testing process.

- -chris

> All,
> 
> I can see that everything I wasn't expecting to fail is an APR
> test. NIO/NIO2 didn't fail those same tests. Strange that 
> javax.el.TestCompositeELResolver.APR test would fail when 
> javax.el.TestCompositeELResolver.NIO test does not.
> 
> I'll start looking, there.
> 
> -chris
> 
>> Mark,
> 
>> On 7/9/19 09:51, Mark Thomas wrote:
>>> The following votes were cast:
> 
>>> Binding: +1: remm, markt, isapir
> 
>>> No other votes were cast.
> 
>>> The vote therefore passes.
> 
>>> Thanks to everyone who contributed to this release.
> 
>> I'm a bit late, but I got a bunch of unusual unit test failures.
>> I usually have problems with the TLS cipher suites and anything 
>> involving multicast networking, but this time I got other things 
>> failing .
> 
>> The highlights are below. I'll follow-up with some details such
>> as stack traces.
> 
>> * Environment *  Java (build): openjdk version "1.8.0_212" 
>> OpenJDK Runtime Environment (build 
>> 1.8.0_212-8u212-b03-2~deb9u1-b03) OpenJDK 64-Bit Server VM
>> (build 25.212-b03, mixed mode) *  Java (test): openjdk
>> version "1.8.0_212" OpenJDK Runtime Environment (build 
>> 1.8.0_212-8u212-b03-2~deb9u1-b03) OpenJDK 64-Bit Server VM
>> (build 25.212-b03, mixed mode) *  OS:   Linux 4.9.0-7-amd64
>> x86_64 * cc:   cc (Debian 6.3.0-18+deb9u1) 6.3.0 20170516 *
>> make: GNU Make 4.1 *  OpenSSL:  OpenSSL 1.1.1 11 Sep 2018 *
>> APR: 1.5.2 * * Valid SHA-512 signature for
>> apache-tomcat-9.0.22.zip * Valid GPG signature for
>> apache-tomcat-9.0.22.zip * Valid SHA-512 signature for
>> apache-tomcat-9.0.22.tar.gz * Valid GPG signature for 
>> apache-tomcat-9.0.22.tar.gz * Valid SHA-512 signature for 
>> apache-tomcat-9.0.22.exe * Valid GPG signature for 
>> apache-tomcat-9.0.22.exe * Valid SHA512 signature for 
>> apache-tomcat-9.0.22-src.zip * Valid GPG signature for 
>> apache-tomcat-9.0.22-src.zip * Valid SHA512 signature for 
>> apache-tomcat-9.0.22-src.tar.gz * Valid GPG signature for 
>> apache-tomcat-9.0.22-src.tar.gz * * Binary Zip and tarball: Same
>> * Source Zip and tarball: Same * * Building dependencies
>> returned: 0 * tcnative builds cleanly * Tomcat builds cleanly *
>> Junit Tests: FAILED * * Tests that failed: * 
>> javax.el.TestCompositeELResolver.APR.txt * 
>> javax.servlet.annotation.TestServletSecurity.APR.txt * 
>> javax.servlet.annotation.TestServletSecurityMappings.APR.txt * 
>> javax.servlet.http.TestHttpServlet.APR.txt * 
>> javax.servlet.jsp.TestPageContext.APR.txt * 
>> javax.servlet.jsp.el.TestScopedAttributeELResolver.APR.txt * 
>> org.apache.catalina.authenticator.TestDigestAuthenticator.APR.txt
>> * org.apache.catalina.authenticator.TestFormAuthenticator.APR.txt
>> * 
>> org.apache.catalina.authenticator.TestNonLoginAndBasicAuthenticator.A
P
>
>> 
R.
> 
> 
> txt
>> * 
>> org.apache.catalina.authenticator.TestSSOnonLoginAndBasicAuthenticato
r
>
>> 
.A
> 
> 
> PR.txt
>> * 
>> org.apache.catalina.authenticator.TestSSOnonLoginAndDigestAuthenticat
o
>
>> 
r.
> 
> 
> APR.txt
>> * org.apache.catalina.connector.TestConnector.APR.txt * 
>> org.apache.catalina.connector.TestCoyoteAdapter.APR.txt * 
>> org.apache.catalina.connector.TestCoyoteInputStream.APR.txt * 
>> org.apache.catalina.connector.TestCoyoteOutputStream.APR.txt * 
>> org.apache.catalina.connector.TestInputBuffer.APR.txt * 
>> org.apache.catalina.connector.TestKeepAliveCount.APR.txt * 
>> org.apache.catalina.connector.TestMaxConnections.APR.txt * 
>> org.apache.catalina.connector.TestOutputBuffer.APR.txt * 
>> org.apache.catalina.connector.TestRequest.APR.txt * 
>> org.apache.catalina.connector.TestResponse.APR.txt * 
>> org.apache.catalina.connector.TestSendFile.APR.txt * 
>> org.apache.catalina.core.TestApplicationContext.APR.txt * 
>> org.apache.catalina.core.TestApplicationContextGetRequestDispatcher.A
P
>
>> 
R.
> 
> 
> txt
>> * 
>> org.apache.catalina.core.TestApplicationContextGetRequestDispatcherB.
A
>
>> 
PR
> 
> 
> .txt
>> * org.apache.catalina.core.TestApplicationHttpRequest.APR.txt * 
>> org.apache.catalina.core.TestApplicationMapping.APR.txt * 
>> org.apache.catalina.core.TestAsyncContextImpl.APR.txt * 
>> org.apache.catalina.core.TestStandardContext.APR.txt * 
>> org.apache.catalina.core.TestStandardContextAliases.APR.txt * 
>> org.apache.catalina.core.TestStandardContextResources.APR.txt * 
>> org.apache.catalina.core.TestStandardContextValve.APR.txt * 
>> org.apache.catalina.core.TestStandardHostValve.APR.txt * 
>> org.apache.catalina.core.TestStandardWrapper.APR.txt * 
>> org.apache.catalina.core.TestSwallowAbortedUploads.APR.txt * 
>> org.apache.catalina.filters.TestAddCharSetFilter.APR.txt * 
>> org.apache.catalina.filters.TestExpiresFilter.APR.txt * 
>> org.apache.catalina.filters.TestRemoteIpFilter.APR.txt * 
>> org.apache.catalina.filt

Re: [VOTE][RESULT] Release Apache Tomcat 9.0.22

[Christopher Schultz]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

All,

I can see that everything I wasn't expecting to fail is an APR test.
NIO/NIO2 didn't fail those same tests. Strange that
javax.el.TestCompositeELResolver.APR test would fail when
javax.el.TestCompositeELResolver.NIO test does not.

I'll start looking, there.

- -chris

> Mark,
> 
> On 7/9/19 09:51, Mark Thomas wrote:
>> The following votes were cast:
> 
>> Binding: +1: remm, markt, isapir
> 
>> No other votes were cast.
> 
>> The vote therefore passes.
> 
>> Thanks to everyone who contributed to this release.
> 
> I'm a bit late, but I got a bunch of unusual unit test failures. I 
> usually have problems with the TLS cipher suites and anything 
> involving multicast networking, but this time I got other things
> failing .
> 
> The highlights are below. I'll follow-up with some details such as 
> stack traces.
> 
> * Environment *  Java (build): openjdk version "1.8.0_212"
> OpenJDK Runtime Environment (build
> 1.8.0_212-8u212-b03-2~deb9u1-b03) OpenJDK 64-Bit Server VM (build
> 25.212-b03, mixed mode) *  Java (test): openjdk version
> "1.8.0_212" OpenJDK Runtime Environment (build
> 1.8.0_212-8u212-b03-2~deb9u1-b03) OpenJDK 64-Bit Server VM (build
> 25.212-b03, mixed mode) *  OS:   Linux 4.9.0-7-amd64 x86_64 *
> cc:   cc (Debian 6.3.0-18+deb9u1) 6.3.0 20170516 *  make:
> GNU Make 4.1 *  OpenSSL:  OpenSSL 1.1.1 11 Sep 2018 *  APR:
> 1.5.2 * * Valid SHA-512 signature for apache-tomcat-9.0.22.zip *
> Valid GPG signature for apache-tomcat-9.0.22.zip * Valid SHA-512
> signature for apache-tomcat-9.0.22.tar.gz * Valid GPG signature for
> apache-tomcat-9.0.22.tar.gz * Valid SHA-512 signature for
> apache-tomcat-9.0.22.exe * Valid GPG signature for
> apache-tomcat-9.0.22.exe * Valid SHA512 signature for
> apache-tomcat-9.0.22-src.zip * Valid GPG signature for
> apache-tomcat-9.0.22-src.zip * Valid SHA512 signature for
> apache-tomcat-9.0.22-src.tar.gz * Valid GPG signature for
> apache-tomcat-9.0.22-src.tar.gz * * Binary Zip and tarball: Same *
> Source Zip and tarball: Same * * Building dependencies returned: 0 
> * tcnative builds cleanly * Tomcat builds cleanly * Junit Tests:
> FAILED * * Tests that failed: *
> javax.el.TestCompositeELResolver.APR.txt *
> javax.servlet.annotation.TestServletSecurity.APR.txt *
> javax.servlet.annotation.TestServletSecurityMappings.APR.txt *
> javax.servlet.http.TestHttpServlet.APR.txt *
> javax.servlet.jsp.TestPageContext.APR.txt *
> javax.servlet.jsp.el.TestScopedAttributeELResolver.APR.txt *
> org.apache.catalina.authenticator.TestDigestAuthenticator.APR.txt *
> org.apache.catalina.authenticator.TestFormAuthenticator.APR.txt * 
> org.apache.catalina.authenticator.TestNonLoginAndBasicAuthenticator.AP
R.
>
> 
txt
> * 
> org.apache.catalina.authenticator.TestSSOnonLoginAndBasicAuthenticator
.A
>
> 
PR.txt
> * 
> org.apache.catalina.authenticator.TestSSOnonLoginAndDigestAuthenticato
r.
>
> 
APR.txt
> * org.apache.catalina.connector.TestConnector.APR.txt *
> org.apache.catalina.connector.TestCoyoteAdapter.APR.txt *
> org.apache.catalina.connector.TestCoyoteInputStream.APR.txt *
> org.apache.catalina.connector.TestCoyoteOutputStream.APR.txt *
> org.apache.catalina.connector.TestInputBuffer.APR.txt *
> org.apache.catalina.connector.TestKeepAliveCount.APR.txt *
> org.apache.catalina.connector.TestMaxConnections.APR.txt *
> org.apache.catalina.connector.TestOutputBuffer.APR.txt *
> org.apache.catalina.connector.TestRequest.APR.txt *
> org.apache.catalina.connector.TestResponse.APR.txt *
> org.apache.catalina.connector.TestSendFile.APR.txt *
> org.apache.catalina.core.TestApplicationContext.APR.txt * 
> org.apache.catalina.core.TestApplicationContextGetRequestDispatcher.AP
R.
>
> 
txt
> * 
> org.apache.catalina.core.TestApplicationContextGetRequestDispatcherB.A
PR
>
> 
.txt
> * org.apache.catalina.core.TestApplicationHttpRequest.APR.txt *
> org.apache.catalina.core.TestApplicationMapping.APR.txt *
> org.apache.catalina.core.TestAsyncContextImpl.APR.txt *
> org.apache.catalina.core.TestStandardContext.APR.txt *
> org.apache.catalina.core.TestStandardContextAliases.APR.txt *
> org.apache.catalina.core.TestStandardContextResources.APR.txt *
> org.apache.catalina.core.TestStandardContextValve.APR.txt *
> org.apache.catalina.core.TestStandardHostValve.APR.txt *
> org.apache.catalina.core.TestStandardWrapper.APR.txt *
> org.apache.catalina.core.TestSwallowAbortedUploads.APR.txt *
> org.apache.catalina.filters.TestAddCharSetFilter.APR.txt *
> org.apache.catalina.filters.TestExpiresFilter.APR.txt *
> org.apache.catalina.filters.TestRemoteIpFilter.APR.txt *
> org.apache.catalina.filters.TestRestCsrfPreventionFilter2.APR.txt *
> org.apache.catalina.ha.context.TestReplicatedContext.APR.txt *
> org.apache.catalina.loader.TestVirtualContext.APR.txt * 
> org.apache.catalina.loader.TestWebappClassLoaderExecutorMemoryLeak.APR
.t
>
> 
xt
> * org.apache.catalina.mapper.TestMapperListener.APR.txt *
> org.apache.catalina.mapper.TestMappe

Re: [VOTE][RESULT] Release Apache Tomcat 9.0.22

[Christopher Schultz]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Mark,

On 7/9/19 09:51, Mark Thomas wrote:
> The following votes were cast:
> 
> Binding: +1: remm, markt, isapir
> 
> No other votes were cast.
> 
> The vote therefore passes.
> 
> Thanks to everyone who contributed to this release.

I'm a bit late, but I got a bunch of unusual unit test failures. I
usually have problems with the TLS cipher suites and anything
involving multicast networking, but this time I got other things failing
.

The highlights are below. I'll follow-up with some details such as
stack traces.

* Environment
*  Java (build): openjdk version "1.8.0_212" OpenJDK Runtime
Environment (build 1.8.0_212-8u212-b03-2~deb9u1-b03) OpenJDK 64-Bit
Server VM (build 25.212-b03, mixed mode)
*  Java (test): openjdk version "1.8.0_212" OpenJDK Runtime
Environment (build 1.8.0_212-8u212-b03-2~deb9u1-b03) OpenJDK 64-Bit
Server VM (build 25.212-b03, mixed mode)
*  OS:   Linux 4.9.0-7-amd64 x86_64
*  cc:   cc (Debian 6.3.0-18+deb9u1) 6.3.0 20170516
*  make: GNU Make 4.1
*  OpenSSL:  OpenSSL 1.1.1 11 Sep 2018
*  APR:  1.5.2
*
* Valid SHA-512 signature for apache-tomcat-9.0.22.zip
* Valid GPG signature for apache-tomcat-9.0.22.zip
* Valid SHA-512 signature for apache-tomcat-9.0.22.tar.gz
* Valid GPG signature for apache-tomcat-9.0.22.tar.gz
* Valid SHA-512 signature for apache-tomcat-9.0.22.exe
* Valid GPG signature for apache-tomcat-9.0.22.exe
* Valid SHA512 signature for apache-tomcat-9.0.22-src.zip
* Valid GPG signature for apache-tomcat-9.0.22-src.zip
* Valid SHA512 signature for apache-tomcat-9.0.22-src.tar.gz
* Valid GPG signature for apache-tomcat-9.0.22-src.tar.gz
*
* Binary Zip and tarball: Same
* Source Zip and tarball: Same
*
* Building dependencies returned: 0
* tcnative builds cleanly
* Tomcat builds cleanly
* Junit Tests: FAILED
*
* Tests that failed:
* javax.el.TestCompositeELResolver.APR.txt
* javax.servlet.annotation.TestServletSecurity.APR.txt
* javax.servlet.annotation.TestServletSecurityMappings.APR.txt
* javax.servlet.http.TestHttpServlet.APR.txt
* javax.servlet.jsp.TestPageContext.APR.txt
* javax.servlet.jsp.el.TestScopedAttributeELResolver.APR.txt
* org.apache.catalina.authenticator.TestDigestAuthenticator.APR.txt
* org.apache.catalina.authenticator.TestFormAuthenticator.APR.txt
*
org.apache.catalina.authenticator.TestNonLoginAndBasicAuthenticator.APR.
txt
*
org.apache.catalina.authenticator.TestSSOnonLoginAndBasicAuthenticator.A
PR.txt
*
org.apache.catalina.authenticator.TestSSOnonLoginAndDigestAuthenticator.
APR.txt
* org.apache.catalina.connector.TestConnector.APR.txt
* org.apache.catalina.connector.TestCoyoteAdapter.APR.txt
* org.apache.catalina.connector.TestCoyoteInputStream.APR.txt
* org.apache.catalina.connector.TestCoyoteOutputStream.APR.txt
* org.apache.catalina.connector.TestInputBuffer.APR.txt
* org.apache.catalina.connector.TestKeepAliveCount.APR.txt
* org.apache.catalina.connector.TestMaxConnections.APR.txt
* org.apache.catalina.connector.TestOutputBuffer.APR.txt
* org.apache.catalina.connector.TestRequest.APR.txt
* org.apache.catalina.connector.TestResponse.APR.txt
* org.apache.catalina.connector.TestSendFile.APR.txt
* org.apache.catalina.core.TestApplicationContext.APR.txt
*
org.apache.catalina.core.TestApplicationContextGetRequestDispatcher.APR.
txt
*
org.apache.catalina.core.TestApplicationContextGetRequestDispatcherB.APR
.txt
* org.apache.catalina.core.TestApplicationHttpRequest.APR.txt
* org.apache.catalina.core.TestApplicationMapping.APR.txt
* org.apache.catalina.core.TestAsyncContextImpl.APR.txt
* org.apache.catalina.core.TestStandardContext.APR.txt
* org.apache.catalina.core.TestStandardContextAliases.APR.txt
* org.apache.catalina.core.TestStandardContextResources.APR.txt
* org.apache.catalina.core.TestStandardContextValve.APR.txt
* org.apache.catalina.core.TestStandardHostValve.APR.txt
* org.apache.catalina.core.TestStandardWrapper.APR.txt
* org.apache.catalina.core.TestSwallowAbortedUploads.APR.txt
* org.apache.catalina.filters.TestAddCharSetFilter.APR.txt
* org.apache.catalina.filters.TestExpiresFilter.APR.txt
* org.apache.catalina.filters.TestRemoteIpFilter.APR.txt
* org.apache.catalina.filters.TestRestCsrfPreventionFilter2.APR.txt
* org.apache.catalina.ha.context.TestReplicatedContext.APR.txt
* org.apache.catalina.loader.TestVirtualContext.APR.txt
*
org.apache.catalina.loader.TestWebappClassLoaderExecutorMemoryLeak.APR.t
xt
* org.apache.catalina.mapper.TestMapperListener.APR.txt
* org.apache.catalina.mapper.TestMapperWebapps.APR.txt
* org.apache.catalina.mbeans.TestRegistration.APR.txt
* org.apache.catalina.nonblocking.TestNonBlockingAPI.APR.txt
* org.apache.catalina.servlets.TestDefaultServlet.APR.txt
* org.apache.catalina.servlets.TestDefaultServletEncodingWithBom.APR.txt
*
org.apache.catalina.servlets.TestDefaultServletEncodingWithoutBom.APR.tx
t
* org.apache.catalina.servlets.TestDefaultServletOptions.APR.txt
* org.apache.catalina.servlets.TestDefaultServletPut.APR.txt
* org.apache.

[tomcat] branch master updated: Trivial change to align with 8.5.x

[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 8840b68  Trivial change to align with 8.5.x
8840b68 is described below

commit 8840b683050f5b6840569a8fa1d2a5398c2b37e6
Author: Mark Thomas 
AuthorDate: Wed Jul 10 12:57:41 2019 +0100

Trivial change to align with 8.5.x
---
 java/org/apache/catalina/security/SecurityClassLoad.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/java/org/apache/catalina/security/SecurityClassLoad.java 
b/java/org/apache/catalina/security/SecurityClassLoad.java
index 2a44caf..2510424 100644
--- a/java/org/apache/catalina/security/SecurityClassLoad.java
+++ b/java/org/apache/catalina/security/SecurityClassLoad.java
@@ -30,8 +30,7 @@ public final class SecurityClassLoad {
 }
 
 
-static void securityClassLoad(ClassLoader loader, boolean 
requireSecurityManager)
-throws Exception {
+static void securityClassLoad(ClassLoader loader, boolean 
requireSecurityManager) throws Exception {
 
 if (requireSecurityManager && System.getSecurityManager() == null) {
 return;


-
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: Align AsyncContextImpl with 8.5.x

[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 c2b6147  Align AsyncContextImpl with 8.5.x
c2b6147 is described below

commit c2b6147a6d22a55618b2db88bfe2f732fc8663d9
Author: Mark Thomas 
AuthorDate: Wed Jul 10 13:00:30 2019 +0100

Align AsyncContextImpl with 8.5.x

Spacing, improved i18n, simplify code, remove anonymous inner classes,
obtain InstanceManager directly from the Context
---
 .../org/apache/catalina/core/AsyncContextImpl.java | 110 ++---
 .../apache/catalina/core/LocalStrings.properties   |  17 +---
 .../catalina/core/LocalStrings_es.properties   |  12 ---
 .../catalina/core/LocalStrings_fr.properties   |  27 +++--
 .../catalina/core/LocalStrings_ja.properties   |  12 ---
 .../catalina/security/SecurityClassLoad.java   |  63 +---
 6 files changed, 90 insertions(+), 151 deletions(-)

diff --git a/java/org/apache/catalina/core/AsyncContextImpl.java 
b/java/org/apache/catalina/core/AsyncContextImpl.java
index 15c6610..bba05e9 100644
--- a/java/org/apache/catalina/core/AsyncContextImpl.java
+++ b/java/org/apache/catalina/core/AsyncContextImpl.java
@@ -21,9 +21,7 @@ import java.lang.reflect.InvocationTargetException;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import javax.naming.NamingException;
@@ -50,16 +48,11 @@ import org.apache.coyote.AsyncContextCallback;
 import org.apache.coyote.RequestInfo;
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
-import org.apache.tomcat.InstanceManager;
 import org.apache.tomcat.util.ExceptionUtils;
 import org.apache.tomcat.util.res.StringManager;
 import org.apache.tomcat.util.security.PrivilegedGetTccl;
 import org.apache.tomcat.util.security.PrivilegedSetTccl;
-/**
- *
- * @author fhanik
- *
- */
+
 public class AsyncContextImpl implements AsyncContext, AsyncContextCallback {
 
 private static final Log log = LogFactory.getLog(AsyncContextImpl.class);
@@ -78,14 +71,14 @@ public class AsyncContextImpl implements AsyncContext, 
AsyncContextCallback {
 
 private volatile ServletRequest servletRequest = null;
 private volatile ServletResponse servletResponse = null;
-private List listeners = new 
ArrayList();
+private final List listeners = new 
ArrayList();
 private boolean hasOriginalRequestAndResponse = true;
 private volatile Runnable dispatch = null;
 private Context context = null;
+// Default of 3 (30s) is set by the connector
 private long timeout = -1;
 private AsyncEvent event = null;
-private Request request;
-private volatile InstanceManager instanceManager;
+private volatile Request request;
 
 public AsyncContextImpl(Request request) {
 if (log.isDebugEnabled()) {
@@ -105,8 +98,7 @@ public class AsyncContextImpl implements AsyncContext, 
AsyncContextCallback {
 
 @Override
 public void fireOnComplete() {
-List listenersCopy =
-new ArrayList();
+List listenersCopy = new 
ArrayList();
 listenersCopy.addAll(listeners);
 
 ClassLoader oldCL;
@@ -130,8 +122,8 @@ public class AsyncContextImpl implements AsyncContext, 
AsyncContextCallback {
 listener.fireOnComplete(event);
 } catch (Throwable t) {
 ExceptionUtils.handleThrowable(t);
-log.warn("onComplete() failed for listener of type [" +
-listener.getClass().getName() + "]", t);
+log.warn(sm.getString("asyncContextImpl.onCompleteError",
+listener.getClass().getName()), t);
 }
 }
 } finally {
@@ -166,18 +158,17 @@ public class AsyncContextImpl implements AsyncContext, 
AsyncContextCallback {
 listener.fireOnTimeout(event);
 } catch (Throwable t) {
 ExceptionUtils.handleThrowable(t);
-log.warn("onTimeout() failed for listener of type [" +
-listener.getClass().getName() + "]", t);
+
log.warn(sm.getString("asyncContextImpl.onTimeoutError",
+listener.getClass().getName()), t);
 }
 }
 request.getCoyoteRequest().action(
 ActionCode.ASYNC_IS_TIMINGOUT, result);
-return !result.get();
 } finally {
 Thread.currentThread().setContextClassLoader(oldCL);
 }
 }
-return true;
+return !result.get();
 }

[tomcat] branch 8.5.x updated: Align with 9.0.x

[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 b5ec896  Align with 9.0.x
b5ec896 is described below

commit b5ec8964c9c9e1ae1d3d1a351eed867e3ce00699
Author: Mark Thomas 
AuthorDate: Wed Jul 10 12:59:16 2019 +0100

Align with 9.0.x
---
 .../apache/catalina/security/SecurityClassLoad.java| 18 ++
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/java/org/apache/catalina/security/SecurityClassLoad.java 
b/java/org/apache/catalina/security/SecurityClassLoad.java
index a76515d..1bb6ecd 100644
--- a/java/org/apache/catalina/security/SecurityClassLoad.java
+++ b/java/org/apache/catalina/security/SecurityClassLoad.java
@@ -14,13 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.catalina.security;
 
 /**
- * Static class used to preload java classes when using the Java 
SecurityManager
- * so that the defineClassInPackage RuntimePermission does not trigger an
- * AccessControlException.
+ * Static class used to preload java classes when using the
+ * Java SecurityManager so that the defineClassInPackage
+ * RuntimePermission does not trigger an AccessControlException.
  *
  * @author Glenn L. Nielsen
  */
@@ -30,6 +29,7 @@ public final class SecurityClassLoad {
 securityClassLoad(loader, true);
 }
 
+
 static void securityClassLoad(ClassLoader loader, boolean 
requireSecurityManager) throws Exception {
 
 if (requireSecurityManager && System.getSecurityManager() == null) {
@@ -49,6 +49,7 @@ public final class SecurityClassLoad {
 loadTomcatPackage(loader);
 }
 
+
 private static final void loadCorePackage(ClassLoader loader) throws 
Exception {
 final String basePackage = "org.apache.catalina.core.";
 loader.loadClass(basePackage + "AccessLogAdapter");
@@ -67,17 +68,20 @@ public final class SecurityClassLoad {
 loader.loadClass(basePackage + 
"ApplicationHttpRequest$AttributeNamesEnumerator");
 }
 
+
 private static final void loadLoaderPackage(ClassLoader loader) throws 
Exception {
 final String basePackage = "org.apache.catalina.loader.";
 loader.loadClass(basePackage + 
"WebappClassLoaderBase$PrivilegedFindClassByName");
 loader.loadClass(basePackage + 
"WebappClassLoaderBase$PrivilegedHasLoggingConfig");
 }
 
+
 private static final void loadRealmPackage(ClassLoader loader) throws 
Exception {
 final String basePackage = "org.apache.catalina.realm.";
 loader.loadClass(basePackage + "LockOutRealm$LockRecord");
 }
 
+
 private static final void loadServletsPackage(ClassLoader loader) throws 
Exception {
 final String basePackage = "org.apache.catalina.servlets.";
 // Avoid a possible memory leak in the DefaultServlet when running with
@@ -88,6 +92,7 @@ public final class SecurityClassLoad {
 loader.loadClass(basePackage + "DefaultServlet");
 }
 
+
 private static final void loadSessionPackage(ClassLoader loader) throws 
Exception {
 final String basePackage = "org.apache.catalina.session.";
 loader.loadClass(basePackage + "StandardSession");
@@ -95,6 +100,7 @@ public final class SecurityClassLoad {
 loader.loadClass(basePackage + "StandardManager$PrivilegedDoUnload");
 }
 
+
 private static final void loadUtilPackage(ClassLoader loader) throws 
Exception {
 final String basePackage = "org.apache.catalina.util.";
 loader.loadClass(basePackage + "ParameterMap");
@@ -102,6 +108,7 @@ public final class SecurityClassLoad {
 loader.loadClass(basePackage + "TLSUtil");
 }
 
+
 private static final void loadValvesPackage(ClassLoader loader) throws 
Exception {
 final String basePackage = "org.apache.catalina.valves.";
 loadAnonymousInnerClasses(loader, basePackage + 
"AbstractAccessLogValve");
@@ -116,10 +123,12 @@ public final class SecurityClassLoad {
 loader.loadClass(basePackage + "http2.Stream$PrivilegedPush");
 }
 
+
 private static final void loadJavaxPackage(ClassLoader loader) throws 
Exception {
 loader.loadClass("javax.servlet.http.Cookie");
 }
 
+
 private static final void loadConnectorPackage(ClassLoader loader) throws 
Exception {
 final String basePackage = "org.apache.catalina.connector.";
 loader.loadClass(basePackage + 
"RequestFacade$GetAttributePrivilegedAction");
@@ -144,6 +153,7 @@ public final class SecurityClassLoad {
 loadAnonymousInnerClasses(loader, basePackage + "Response");
 }
 
+
 private static final void loadTomcatPackage(ClassLoader loader) throws 
Exception {
 final String basePackage = "org.apache.tomcat.";
 // buf


-

[tomcat] branch 7.0.x updated: Trivial space change to align with 8.5.x

[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 bb52b78  Trivial space change to align with 8.5.x
bb52b78 is described below

commit bb52b783b8753d1bf2216ee7891db21260834216
Author: Mark Thomas 
AuthorDate: Wed Jul 10 12:41:47 2019 +0100

Trivial space change to align with 8.5.x
---
 java/org/apache/tomcat/InstrumentableClassLoader.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/java/org/apache/tomcat/InstrumentableClassLoader.java 
b/java/org/apache/tomcat/InstrumentableClassLoader.java
index 8e2a2da..d2e18dc 100644
--- a/java/org/apache/tomcat/InstrumentableClassLoader.java
+++ b/java/org/apache/tomcat/InstrumentableClassLoader.java
@@ -75,5 +75,4 @@ public interface InstrumentableClassLoader {
  * @return the transformer-free copy of this class loader.
  */
 ClassLoader copyWithoutTransformers();
-
 }


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

[tomcat] branch 8.5.x updated: Align AsyncCotextImpl with master

[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 cadaf9d  Align AsyncCotextImpl with master
cadaf9d is described below

commit cadaf9d0957db86e76af629fecf2da3314b57198
Author: Mark Thomas 
AuthorDate: Wed Jul 10 12:34:48 2019 +0100

Align AsyncCotextImpl with master

Improved i18n, use of ReflectiveOperationException, refactoring to
remove local InstanceManager reference
---
 .../org/apache/catalina/core/AsyncContextImpl.java | 47 ++
 .../apache/catalina/core/LocalStrings.properties   |  5 +++
 .../catalina/core/LocalStrings_fr.properties   | 15 ++-
 3 files changed, 31 insertions(+), 36 deletions(-)

diff --git a/java/org/apache/catalina/core/AsyncContextImpl.java 
b/java/org/apache/catalina/core/AsyncContextImpl.java
index 51198b2..4621644 100644
--- a/java/org/apache/catalina/core/AsyncContextImpl.java
+++ b/java/org/apache/catalina/core/AsyncContextImpl.java
@@ -19,9 +19,7 @@ package org.apache.catalina.core;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import javax.naming.NamingException;
@@ -47,7 +45,6 @@ import org.apache.coyote.AsyncContextCallback;
 import org.apache.coyote.RequestInfo;
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
-import org.apache.tomcat.InstanceManager;
 import org.apache.tomcat.util.ExceptionUtils;
 import org.apache.tomcat.util.buf.UDecoder;
 import org.apache.tomcat.util.res.StringManager;
@@ -78,7 +75,6 @@ public class AsyncContextImpl implements AsyncContext, 
AsyncContextCallback {
 private long timeout = -1;
 private AsyncEvent event = null;
 private volatile Request request;
-private volatile InstanceManager instanceManager;
 
 public AsyncContextImpl(Request request) {
 if (log.isDebugEnabled()) {
@@ -108,8 +104,8 @@ public class AsyncContextImpl implements AsyncContext, 
AsyncContextCallback {
 listener.fireOnComplete(event);
 } catch (Throwable t) {
 ExceptionUtils.handleThrowable(t);
-log.warn("onComplete() failed for listener of type [" +
-listener.getClass().getName() + "]", t);
+log.warn(sm.getString("asyncContextImpl.onCompleteError",
+listener.getClass().getName()), t);
 }
 }
 } finally {
@@ -137,8 +133,8 @@ public class AsyncContextImpl implements AsyncContext, 
AsyncContextCallback {
 listener.fireOnTimeout(event);
 } catch (Throwable t) {
 ExceptionUtils.handleThrowable(t);
-log.warn("onTimeout() failed for listener of type [" +
-listener.getClass().getName() + "]", t);
+
log.warn(sm.getString("asyncContextImpl.onTimeoutError",
+listener.getClass().getName()), t);
 }
 }
 request.getCoyoteRequest().action(
@@ -275,10 +271,9 @@ public class AsyncContextImpl implements AsyncContext, 
AsyncContextCallback {
 check();
 T listener = null;
 try {
- listener = (T) getInstanceManager().newInstance(clazz.getName(),
- clazz.getClassLoader());
-} catch (InstantiationException | IllegalAccessException | 
NamingException |
-ClassNotFoundException e) {
+ listener = (T) context.getInstanceManager().newInstance(
+ clazz.getName(), clazz.getClassLoader());
+} catch (ReflectiveOperationException | NamingException e) {
 ServletException se = new ServletException(e);
 throw se;
 } catch (Exception e) {
@@ -297,7 +292,6 @@ public class AsyncContextImpl implements AsyncContext, 
AsyncContextCallback {
 dispatch = null;
 event = null;
 hasOriginalRequestAndResponse = true;
-instanceManager = null;
 listeners.clear();
 request = null;
 clearServletRequestResponse();
@@ -338,8 +332,8 @@ public class AsyncContextImpl implements AsyncContext, 
AsyncContextCallback {
 listener.fireOnStartAsync(event);
 } catch (Throwable t) {
 ExceptionUtils.handleThrowable(t);
-log.warn("onStartAsync() failed for listener of type [" +
-listener.getClass().getName() + "]", t);
+log.warn(sm.getString("asyncContextImpl.onStartAsyncError",
+listener.getClass()

[ANN] Apache Tomcat 8.5.43 available

[Mark Thomas]

The Apache Tomcat team announces the immediate availability of Apache
Tomcat 8.5.43.

Apache Tomcat 8 is an open source software implementation of the Java
Servlet, JavaServer Pages, Java Unified Expression Language, Java
WebSocket and Java Authentication Service Provider Interface for
Containers technologies.

Apache Tomcat 8.5.x replaces 8.0.x and includes new features pulled
forward from the 9.0.x branch. The notable changes since 8.5.42 include:

- Add the ability for a UserDatabase to monitor the backing XML file
  for changes and reload the source file if a change in the last
  modified time is detected. This is enabled by default meaning that
  changes to $CATALINA_BASE/conf/tomcat-users.xml will now take
  effect a short time after the file is saved.

- Update to Tomcat Native 1.2.23 including Windows binaries built
  with OpenSSL 1.1.1c


Please refer to the change log for the complete list of changes:
http://tomcat.apache.org/tomcat-8.5-doc/changelog.html

Downloads:
http://tomcat.apache.org/download-80.cgi

Migration guides from Apache Tomcat 7.x and 8.0.x:
http://tomcat.apache.org/migration.html

Enjoy!

- The Apache Tomcat team

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

svn commit: r1862873 - in /tomcat/site/trunk: ./ docs/ xdocs/

[markt]

Author: markt
Date: Wed Jul 10 11:05:37 2019
New Revision: 1862873

URL: http://svn.apache.org/viewvc?rev=1862873&view=rev
Log:
Update site for 8.5.43 release

Modified:
tomcat/site/trunk/build.properties.default
tomcat/site/trunk/docs/doap_Tomcat.rdf
tomcat/site/trunk/docs/download-80.html
tomcat/site/trunk/docs/index.html
tomcat/site/trunk/docs/migration-85.html
tomcat/site/trunk/docs/oldnews.html
tomcat/site/trunk/docs/whichversion.html
tomcat/site/trunk/xdocs/doap_Tomcat.rdf
tomcat/site/trunk/xdocs/download-80.xml
tomcat/site/trunk/xdocs/index.xml
tomcat/site/trunk/xdocs/migration-85.xml
tomcat/site/trunk/xdocs/oldnews.xml
tomcat/site/trunk/xdocs/whichversion.xml

Modified: tomcat/site/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/build.properties.default?rev=1862873&r1=1862872&r2=1862873&view=diff
==
--- tomcat/site/trunk/build.properties.default (original)
+++ tomcat/site/trunk/build.properties.default Wed Jul 10 11:05:37 2019
@@ -37,7 +37,7 @@ tomcat.loc=http://www.apache.org/dist/to
 
 # - Tomcat versions -
 tomcat70=7.0.94
-tomcat85=8.5.42
+tomcat85=8.5.43
 tomcat90=9.0.22
 
 # - Download destination -

Modified: tomcat/site/trunk/docs/doap_Tomcat.rdf
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/doap_Tomcat.rdf?rev=1862873&r1=1862872&r2=1862873&view=diff
==
--- tomcat/site/trunk/docs/doap_Tomcat.rdf (original)
+++ tomcat/site/trunk/docs/doap_Tomcat.rdf Wed Jul 10 11:05:37 2019
@@ -67,8 +67,8 @@
 
   
 Latest Stable 8.5.x Release
-2019-06-07
-8.5.42
+2019-07-09
+8.5.43
   
 
 

Modified: tomcat/site/trunk/docs/download-80.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-80.html?rev=1862873&r1=1862872&r2=1862873&view=diff
==
--- tomcat/site/trunk/docs/download-80.html (original)
+++ tomcat/site/trunk/docs/download-80.html Wed Jul 10 11:05:37 2019
@@ -226,7 +226,7 @@
 Quick Navigation
 
 
-[define v]8.5.42[end]
+[define v]8.5.43[end]
 https://www.apache.org/dist/tomcat/tomcat-8/KEYS";>KEYS |
 [v] |
 Browse |

Modified: tomcat/site/trunk/docs/index.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1862873&r1=1862872&r2=1862873&view=diff
==
--- tomcat/site/trunk/docs/index.html (original)
+++ tomcat/site/trunk/docs/index.html Wed Jul 10 11:05:37 2019
@@ -278,67 +278,68 @@ changelog.
 
 
 
-
-2019-07-02 Tomcat Native 1.2.23 Released
+
+2019-07-09 Tomcat 8.5.43 Released
 
 
 
-The Apache Tomcat Project is proud to announce the release of version 1.2.23 of
-Tomcat Native. The notable changes since 1.2.21 include:
-
+The Apache Tomcat Project is proud to announce the release of version 8.5.43
+of Apache Tomcat. Apache Tomcat 8.5.x replaces 8.0.x and includes new features
+pulled forward from Tomcat 9.0.x. The minimum Java version and implemented
+specification versions remain unchanged. The notable changes compared
+to 8.5.42 include:
 
 
-  
-Add support for TLS key logging when using OpenSSL 1.1.1 or later.
-  
-Fix crashes when a CRL file or path is configured.
-  
-Update Windows binaries to APR 1.7.0 and OpenSSL 1.1.1c.
+
+Add the ability for a UserDatabase to monitor the backing XML file for
+changes and reload the source file if a change in the last modified time is
+detected. This is enabled by default meaning that changes to
+$CATALINA_BASE/conf/tomcat-users.xml will now take effect a short time 
after
+the file is saved.
+
+Update to Tomcat Native 1.2.23 including Windows binaries built with 
OpenSSL
+1.1.1c.
 
 
 
+
+
+Full details of these changes, and all the other changes, are available in the
+Tomcat 8.5
+changelog.
+
+
+
 
 
-https://tomcat.apache.org/download-native.cgi";>Download |
-ChangeLog for 1.2.23
+https://tomcat.apache.org/download-80.cgi";>Download
 
 
 
 
-
-2019-06-07 Tomcat 8.5.42 Released
+
+2019-07-02 Tomcat Native 1.2.23 Released
 
 
 
-The Apache Tomcat Project is proud to announce the release of version 8.5.42
-of Apache Tomcat. Apache Tomcat 8.5.x replaces 8.0.x and includes new features
-pulled forward from Tomcat 9.0.x. The minimum Java version and implemented
-specification versions remain unchanged. The notable changes compared
-to 8.5.41 include:
+The Apache Tomcat Project is proud to announce the release of version 1.2.23 of
+Tomcat Native. The notable changes since 1.2.21 include:
+
 
 
-
-Fix various concurrency and stability issues for HTTP/2.
-
-Add support for same-site cookie attribute. Patch provided by John
-Kelly.
-
-Add an option to sort directory listings provided by the Default
-

Re: Tag Tomcat 7

[Violeta Georgieva]

На ср, 10.07.2019 г. в 12:34 ч. Mark Thomas  написа:
>
> On 10/07/2019 10:28, Mark Thomas wrote:
> > On 10/07/2019 10:23, Mark Thomas wrote:
> >> On 10/07/2019 09:24, Violeta Georgieva wrote:
> >>> Hi Mark,
> >>>
> >>> На ср, 10.07.2019 г. в 10:53 ч. Mark Thomas  >>> > написа:
> 
>  On 10/07/2019 06:40, Violeta Georgieva wrote:
> > Hi,
> >
> > I'm planning to tag Tomcat 7 later today.
> > If you want to include something please reply here.
> 
>  I have some clean-up I am working on but it should be all
non-functional
>  changes so it doesn't really matter if it gets committed before tag
or
>  after tag. Feel free to ignore me unless I am getting in the way in
>  which case just let me know.
> >>>
> >>> I can wait, so go ahead and tell me when you are ready. Ok?
> >>
> >> I'm done for now. Feel free to go ahead when you are ready.
> >
> > Scratch that. My clean-up broke stuff and I missed it as the problems
> > were masked by an IDE config error.
> >
> > Working on fixing this now...
>
> Phew...
>
> That wasn't as bad as I feared when I saw the errors. All fixed. Over to
> you...

Thanks

svn commit: r1862872 - in /tomcat/site/trunk/docs/tomcat-8.5-doc: ./ api/ api/org/apache/catalina/ api/org/apache/catalina/ant/ api/org/apache/catalina/ant/jmx/ api/org/apache/catalina/authenticator/

[markt]

Author: markt
Date: Wed Jul 10 11:02:00 2019
New Revision: 1862872

URL: http://svn.apache.org/viewvc?rev=1862872&view=rev
Log:
Update docs for 8.5.43 release


[This commit notification would consist of 62 parts, 
which exceeds the limit of 50 ones, so it was shortened to the summary.]

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

[ANN] Apache Tomcat 9.0.22 available

[Mark Thomas]

The Apache Tomcat team announces the immediate availability of Apache
Tomcat 9.0.22.

Apache Tomcat 9 is an open source software implementation of the Java
Servlet, JavaServer Pages, Java Unified Expression Language, Java
WebSocket and JASPIC technologies.

Apache Tomcat 9.0.22 is a bugfix and feature release. The notable
changes compared to 9.0.21 include:

- Add user buildable optional modules for easier CDI 2 and JAX-RS
  support. Also include a new documentation page describing how to
  use it.

- Update to Tomcat Native 1.2.23 including Windows binaries built
  with OpenSSL 1.1.1c

- Update to Eclipse Complier for Java 4.12

Please refer to the change log for the complete list of changes:
http://tomcat.apache.org/tomcat-9.0-doc/changelog.html


Downloads:
http://tomcat.apache.org/download-90.cgi

Migration guides from Apache Tomcat 7.x and 8.x:
http://tomcat.apache.org/migration.html

Enjoy!

- The Apache Tomcat team

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

svn commit: r1862870 - in /tomcat/site/trunk: ./ docs/ xdocs/

[markt]

Author: markt
Date: Wed Jul 10 10:42:46 2019
New Revision: 1862870

URL: http://svn.apache.org/viewvc?rev=1862870&view=rev
Log:
Update site for 9.0.22 release

Modified:
tomcat/site/trunk/build.properties.default
tomcat/site/trunk/docs/doap_Tomcat.rdf
tomcat/site/trunk/docs/download-90.html
tomcat/site/trunk/docs/index.html
tomcat/site/trunk/docs/migration-9.html
tomcat/site/trunk/docs/oldnews.html
tomcat/site/trunk/docs/whichversion.html
tomcat/site/trunk/xdocs/doap_Tomcat.rdf
tomcat/site/trunk/xdocs/download-90.xml
tomcat/site/trunk/xdocs/index.xml
tomcat/site/trunk/xdocs/migration-9.xml
tomcat/site/trunk/xdocs/oldnews.xml
tomcat/site/trunk/xdocs/whichversion.xml

Modified: tomcat/site/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/build.properties.default?rev=1862870&r1=1862869&r2=1862870&view=diff
==
--- tomcat/site/trunk/build.properties.default (original)
+++ tomcat/site/trunk/build.properties.default Wed Jul 10 10:42:46 2019
@@ -38,7 +38,7 @@ tomcat.loc=http://www.apache.org/dist/to
 # - Tomcat versions -
 tomcat70=7.0.94
 tomcat85=8.5.42
-tomcat90=9.0.21
+tomcat90=9.0.22
 
 # - Download destination -
 tomcat-site-docs.home=${base.path}/tomcat-site-docs/

Modified: tomcat/site/trunk/docs/doap_Tomcat.rdf
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/doap_Tomcat.rdf?rev=1862870&r1=1862869&r2=1862870&view=diff
==
--- tomcat/site/trunk/docs/doap_Tomcat.rdf (original)
+++ tomcat/site/trunk/docs/doap_Tomcat.rdf Wed Jul 10 10:42:46 2019
@@ -60,8 +60,8 @@
 
   
 Latest Stable 9.0.x Release
-2019-06-07
-9.0.21
+2019-07-09
+9.0.22
   
 
 

Modified: tomcat/site/trunk/docs/download-90.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-90.html?rev=1862870&r1=1862869&r2=1862870&view=diff
==
--- tomcat/site/trunk/docs/download-90.html (original)
+++ tomcat/site/trunk/docs/download-90.html Wed Jul 10 10:42:46 2019
@@ -219,7 +219,7 @@
 Quick Navigation
 
 
-[define v]9.0.21[end]
+[define v]9.0.22[end]
 https://www.apache.org/dist/tomcat/tomcat-9/KEYS";>KEYS |
 [v] |
 Browse |

Modified: tomcat/site/trunk/docs/index.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1862870&r1=1862869&r2=1862870&view=diff
==
--- tomcat/site/trunk/docs/index.html (original)
+++ tomcat/site/trunk/docs/index.html Wed Jul 10 10:42:46 2019
@@ -243,64 +243,64 @@ project logo are trademarks of the Apach
 
 
 
-
-2019-07-02 Tomcat Native 1.2.23 Released
+
+2019-07-09 Tomcat 9.0.22 Released
 
 
 
-The Apache Tomcat Project is proud to announce the release of version 1.2.23 of
-Tomcat Native. The notable changes since 1.2.21 include:
-
+The Apache Tomcat Project is proud to announce the release of version 9.0.22
+of Apache Tomcat. The notable changes compared to 9.0.21 include:
 
 
-  
-Add support for TLS key logging when using OpenSSL 1.1.1 or later.
-  
-Fix crashes when a CRL file or path is configured.
-  
-Update Windows binaries to APR 1.7.0 and OpenSSL 1.1.1c.
 
-
+Add user buildable optional modules for easier CDI 2 and JAX-RS support.
+Also include a new documentation page describing how to use it.
 
-
+Update to Tomcat Native 1.2.23 including Windows binaries built with 
OpenSSL
+1.1.1c.
 
-https://tomcat.apache.org/download-native.cgi";>Download |
-ChangeLog for 1.2.23
+Update to Eclipse Complier for Java 4.12.
 
-
+
 
-
-
-2019-06-07 Tomcat 9.0.21 Released
-
 
 
-The Apache Tomcat Project is proud to announce the release of version 9.0.21
-of Apache Tomcat. The notable changes compared to 9.0.20 include:
-
-
+Full details of these changes, and all the other changes, are available in the
+Tomcat 9
+changelog.
+
 
-Fix various concurrency and stability issues for HTTP/2.
 
-Add support for same-site cookie attribute. Patch provided by John
-Kelly.
+
 
-Add an option to sort directory listings provided by the Default
-Servlet.
+https://tomcat.apache.org/download-90.cgi";>Download
 
-
+
 
+
+
+2019-07-02 Tomcat Native 1.2.23 Released
+
 
 
-Full details of these changes, and all the other changes, are available in the
-Tomcat 9
-changelog.
+The Apache Tomcat Project is proud to announce the release of version 1.2.23 of
+Tomcat Native. The notable changes since 1.2.21 include:
 
 
+
+  
+Add support for TLS key logging when using OpenSSL 1.1.1 or later.
+  
+Fix crashes when a CRL file or path is configured.
+  
+Update Windows binaries to APR 1.7.0 and OpenSSL 1.1.1c.
+
+
 
 
 
-https://tomcat.apache.org/download-90.cgi";>Download
+https://tomcat.apache.org/download-native.cg

svn commit: r1862868 - in /tomcat/site/trunk/docs/tomcat-9.0-doc: ./ api/ api/org/apache/catalina/ api/org/apache/catalina/ant/ api/org/apache/catalina/ant/jmx/ api/org/apache/catalina/authenticator/

[markt]

Author: markt
Date: Wed Jul 10 10:40:12 2019
New Revision: 1862868

URL: http://svn.apache.org/viewvc?rev=1862868&view=rev
Log:
Update docs for 9.0.22 release


[This commit notification would consist of 63 parts, 
which exceeds the limit of 50 ones, so it was shortened to the summary.]

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

[Bug 50025] getConnection method in class DataSourceProxy is ignoring credentials

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=50025

--- Comment #9 from James Crane  ---
(In reply to Randy Bonnette from comment #8)
> Here're the parameters:
> https://arcgis.env.nm.gov/docs/api/index.html?org/apache/tomcat/jdbc/pool/
> DataSourceProxy.html https://xxxreal.com/
> I used Spring Boot 1.5.4 and had this error: "SQLException: The url cannot
> be null". Found the solution on stackoverflow.


I had the same problem. Did you find any solution?

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch master updated: Add https (no TLS without it) to the command line

[remm]

This is an automated email from the ASF dual-hosted git repository.

remm 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 79324e2  Add https (no TLS without it) to the command line
79324e2 is described below

commit 79324e2101d1938210c81abeeeb662d87569a105
Author: remm 
AuthorDate: Wed Jul 10 11:45:17 2019 +0200

Add https (no TLS without it) to the command line

TLS doesn't really work though
(https://github.com/oracle/graal/issues/951 and
https://github.com/oracle/graal/issues/1336).
Also Tomcat Native fails to load with an initial JNI error.
Update some version numbers.
---
 res/tomcat-maven/README.md | 4 ++--
 res/tomcat-maven/pom.xml   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/res/tomcat-maven/README.md b/res/tomcat-maven/README.md
index f0448d7..ab700b5 100644
--- a/res/tomcat-maven/README.md
+++ b/res/tomcat-maven/README.md
@@ -82,7 +82,7 @@ oc policy add-role-to-user view system:serviceaccount:$(oc 
project -q):default -
 
 Download Graal native-image and tools.
 ```
-export JAVA_HOME=/absolute...path...to/graalvm-ce-19.0.0
+export JAVA_HOME=/absolute...path...to/graalvm-ce-19.1.0
 export TOMCAT_MAVEN=/absolute...path...to/tomcat-maven
 cd $JAVA_HOME/bin
 ./gu install native-image
@@ -102,6 +102,6 @@ the substrate VM with the agent again.
 Generate the final json files using native-image-configuration then use native 
image using the generated reflection metadata:
 ```
 $JAVA_HOME/bin/native-image-configure generate 
--trace-input=$TOMCAT_MAVEN/target/trace-file.json 
--output-dir=$TOMCAT_MAVEN/target
-$JAVA_HOME/bin/native-image --no-server --allow-incomplete-classpath 
--initialize-at-build-time=org.eclipse.jdt,org.apache.el.parser.SimpleNode,javax.servlet.jsp.JspFactory,org.apache.jasper.servlet.JasperInitializer,org.apache.jasper.runtime.JspFactoryImpl
 -H:+ReportUnsupportedElementsAtRuntime -H:+ReportExceptionStackTraces 
-H:EnableURLProtocols=jar -H:ConfigurationFileDirectories=$TOMCAT_MAVEN/target/ 
-H:ReflectionConfigurationFiles=$TOMCAT_MAVEN/tomcat-reflection.json 
-H:ResourceConf [...]
+$JAVA_HOME/bin/native-image --no-server --allow-incomplete-classpath 
--enable-https 
--initialize-at-build-time=org.eclipse.jdt,org.apache.el.parser.SimpleNode,javax.servlet.jsp.JspFactory,org.apache.jasper.servlet.JasperInitializer,org.apache.jasper.runtime.JspFactoryImpl
 -H:+JNI -H:+ReportUnsupportedElementsAtRuntime -H:+ReportExceptionStackTraces 
-H:EnableURLProtocols=jar -H:ConfigurationFileDirectories=$TOMCAT_MAVEN/target/ 
-H:ReflectionConfigurationFiles=$TOMCAT_MAVEN/tomcat-reflecti [...]
 ./tomcat-maven-1.0 -Dcatalina.base=. 
-Djava.util.logging.config.file=conf/logging.properties 
-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager
 ```
diff --git a/res/tomcat-maven/pom.xml b/res/tomcat-maven/pom.xml
index fe699bd..54cc499 100644
--- a/res/tomcat-maven/pom.xml
+++ b/res/tomcat-maven/pom.xml
@@ -29,7 +29,7 @@
 
 UTF-8
 org.apache.catalina.startup.Tomcat
-9.0.21
+9.0.22
 
 
 


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

Re: Tag Tomcat 7

[Mark Thomas]

On 10/07/2019 10:28, Mark Thomas wrote:
> On 10/07/2019 10:23, Mark Thomas wrote:
>> On 10/07/2019 09:24, Violeta Georgieva wrote:
>>> Hi Mark,
>>>
>>> На ср, 10.07.2019 г. в 10:53 ч. Mark Thomas >> > написа:

 On 10/07/2019 06:40, Violeta Georgieva wrote:
> Hi,
>
> I'm planning to tag Tomcat 7 later today.
> If you want to include something please reply here.

 I have some clean-up I am working on but it should be all non-functional
 changes so it doesn't really matter if it gets committed before tag or
 after tag. Feel free to ignore me unless I am getting in the way in
 which case just let me know.
>>>
>>> I can wait, so go ahead and tell me when you are ready. Ok?
>>
>> I'm done for now. Feel free to go ahead when you are ready.
> 
> Scratch that. My clean-up broke stuff and I missed it as the problems
> were masked by an IDE config error.
> 
> Working on fixing this now...

Phew...

That wasn't as bad as I feared when I saw the errors. All fixed. Over to
you...

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: Fix backport / alignment errors

[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 7916724  Fix backport / alignment errors
7916724 is described below

commit 7916724e7517517e6444cee789a1c356f8b43fc5
Author: Mark Thomas 
AuthorDate: Wed Jul 10 10:33:28 2019 +0100

Fix backport / alignment errors
---
 java/org/apache/naming/NamingContext.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/java/org/apache/naming/NamingContext.java 
b/java/org/apache/naming/NamingContext.java
index 5c22b3c..ee83701 100644
--- a/java/org/apache/naming/NamingContext.java
+++ b/java/org/apache/naming/NamingContext.java
@@ -72,7 +72,7 @@ public class NamingContext implements Context {
  * @param env The environment to use to construct the naming context
  * @param name The name of the associated Catalina Context
  */
-public NamingContext(Hashtable env, String name) {
+public NamingContext(Hashtable env, String name) throws 
NamingException {
 this(env, name, new HashMap());
 }
 
@@ -85,9 +85,9 @@ public class NamingContext implements Context {
  * @param bindings The initial bindings for the naming context
  */
 public NamingContext(Hashtable env, String name,
-HashMap bindings) {
+HashMap bindings) throws NamingException {
 
-this.env = new Hashtable<>();
+this.env = new Hashtable();
 this.name = name;
 // Populating the environment hashtable
 if (env != null ) {


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

Re: Tag Tomcat 7

[Mark Thomas]

On 10/07/2019 10:23, Mark Thomas wrote:
> On 10/07/2019 09:24, Violeta Georgieva wrote:
>> Hi Mark,
>>
>> На ср, 10.07.2019 г. в 10:53 ч. Mark Thomas > > написа:
>>>
>>> On 10/07/2019 06:40, Violeta Georgieva wrote:
 Hi,

 I'm planning to tag Tomcat 7 later today.
 If you want to include something please reply here.
>>>
>>> I have some clean-up I am working on but it should be all non-functional
>>> changes so it doesn't really matter if it gets committed before tag or
>>> after tag. Feel free to ignore me unless I am getting in the way in
>>> which case just let me know.
>>
>> I can wait, so go ahead and tell me when you are ready. Ok?
> 
> I'm done for now. Feel free to go ahead when you are ready.

Scratch that. My clean-up broke stuff and I missed it as the problems
were masked by an IDE config error.

Working on fixing this now...

Mark

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

Re: Tag Tomcat 7

[Mark Thomas]

On 10/07/2019 09:24, Violeta Georgieva wrote:
> Hi Mark,
> 
> На ср, 10.07.2019 г. в 10:53 ч. Mark Thomas  > написа:
>>
>> On 10/07/2019 06:40, Violeta Georgieva wrote:
>> > Hi,
>> >
>> > I'm planning to tag Tomcat 7 later today.
>> > If you want to include something please reply here.
>>
>> I have some clean-up I am working on but it should be all non-functional
>> changes so it doesn't really matter if it gets committed before tag or
>> after tag. Feel free to ignore me unless I am getting in the way in
>> which case just let me know.
> 
> I can wait, so go ahead and tell me when you are ready. Ok?

I'm done for now. Feel free to go ahead when you are ready.

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: Clean-up. Align with 8.5.x

[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 b04a324  Clean-up. Align with 8.5.x
b04a324 is described below

commit b04a3244183c6a3f5975064b06335a038a1f5970
Author: Mark Thomas 
AuthorDate: Wed Jul 10 10:19:20 2019 +0100

Clean-up. Align with 8.5.x

Spacing, use of final, fix Javadoc warnings/errors, better field naming,
improved i18n
---
 .../org/apache/naming/ContextAccessController.java |  25 +-
 java/org/apache/naming/ContextBindings.java| 296 +++--
 java/org/apache/naming/LocalStrings.properties |  10 +-
 java/org/apache/naming/LocalStrings_es.properties  |  10 +-
 java/org/apache/naming/LocalStrings_fr.properties  |  12 +-
 java/org/apache/naming/LocalStrings_ja.properties  |  10 +-
 java/org/apache/naming/NamingContext.java  |  48 ++--
 java/org/apache/naming/NamingEntry.java|  19 --
 java/org/apache/naming/SelectorContext.java| 118 
 java/org/apache/naming/StringManager.java  |   5 +-
 java/org/apache/naming/package.html|   2 -
 11 files changed, 285 insertions(+), 270 deletions(-)

diff --git a/java/org/apache/naming/ContextAccessController.java 
b/java/org/apache/naming/ContextAccessController.java
index 4821e8b..6dd81ac 100644
--- a/java/org/apache/naming/ContextAccessController.java
+++ b/java/org/apache/naming/ContextAccessController.java
@@ -14,8 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-
 package org.apache.naming;
 
 import java.util.Hashtable;
@@ -27,27 +25,22 @@ import java.util.Hashtable;
  */
 public class ContextAccessController {
 
-
 // -- Variables
 
-
 /**
  * Catalina context names on which writing is not allowed.
  */
-private static Hashtable readOnlyContexts =
-new Hashtable();
+private static final Hashtable readOnlyContexts = new 
Hashtable();
 
 
 /**
  * Security tokens repository.
  */
-private static Hashtable securityTokens =
-new Hashtable();
+private static final Hashtable securityTokens = new 
Hashtable();
 
 
 // - Public Methods
 
-
 /**
  * Set a security token for a Catalina context. Can be set only once.
  *
@@ -81,12 +74,14 @@ public class ContextAccessController {
 
 
 /**
- * Check a submitted security token. The submitted token must be equal to
- * the token present in the repository. If no token is present for the
- * context, then returns true.
+ * Check a submitted security token.
  *
  * @param name Name of the Catalina context
  * @param token Submitted security token
+ *
+ * @return true if the submitted token is equal to the token
+ * in the repository or if no token is present in the repository.
+ * Otherwise, false
  */
 public static boolean checkSecurityToken
 (Object name, Object token) {
@@ -118,14 +113,14 @@ public class ContextAccessController {
 
 
 /**
- * Returns if a context is writable.
+ * Is the context is writable?
  *
  * @param name Name of the Catalina context
+ *
+ * @return true if it is writable, otherwise 
false
  */
 public static boolean isWritable(Object name) {
 return !(readOnlyContexts.containsKey(name));
 }
-
-
 }
 
diff --git a/java/org/apache/naming/ContextBindings.java 
b/java/org/apache/naming/ContextBindings.java
index efbfe25..990d1e0 100644
--- a/java/org/apache/naming/ContextBindings.java
+++ b/java/org/apache/naming/ContextBindings.java
@@ -14,8 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-
 package org.apache.naming;
 
 import java.util.Hashtable;
@@ -26,319 +24,343 @@ import javax.naming.NamingException;
 /**
  * Handles the associations :
  * 
- * Catalina context name with the NamingContext
- * Calling thread with the NamingContext
+ * Object with a NamingContext
+ * Calling thread with a NamingContext
+ * Calling thread with object bound to the same naming context
+ * Thread context class loader with a NamingContext
+ * Thread context class loader with object bound to the same
+ * NamingContext
  * 
+ * The objects are typically Catalina Server or Context objects.
  *
  * @author Remy Maucherat
  */
 public class ContextBindings {
 
-
 // -- Variables
 
-
 /**
- * Bindings name - naming context. Keyed by name.
+ * Bindings object - naming context. Keyed by object.
  */
-private static final Hashtable contextNameBindings =
-new Hashtable();
+ 

[tomcat] branch 8.5.x updated: Align with master - i18n improvements

[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 dcdd1aa  Align with master - i18n improvements
dcdd1aa is described below

commit dcdd1aaef899b950df27821f32fdab9bfc5628fa
Author: Mark Thomas 
AuthorDate: Wed Jul 10 10:16:40 2019 +0100

Align with master - i18n improvements
---
 java/org/apache/naming/LocalStrings.properties| 2 +-
 java/org/apache/naming/LocalStrings_fr.properties | 6 --
 java/org/apache/naming/LocalStrings_ja.properties | 4 +++-
 java/org/apache/naming/StringManager.java | 5 -
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/java/org/apache/naming/LocalStrings.properties 
b/java/org/apache/naming/LocalStrings.properties
index 062fd4c..952aaae 100644
--- a/java/org/apache/naming/LocalStrings.properties
+++ b/java/org/apache/naming/LocalStrings.properties
@@ -22,7 +22,7 @@ namingContext.contextExpected=Name is not bound to a Context
 namingContext.failResolvingReference=Unexpected exception resolving reference
 namingContext.invalidName=Name is not valid
 namingContext.nameNotBound=Name [{0}] is not bound in this Context. Unable to 
find [{1}].
-namingContext.noAbsoluteName=Can''t generate an absolute name for this 
namespace
+namingContext.noAbsoluteName=Cannot generate an absolute name for this 
namespace
 namingContext.readOnly=Context is read only
 
 selectorContext.methodUsingName=Call to method [{0}] with a Name of [{1}]
diff --git a/java/org/apache/naming/LocalStrings_fr.properties 
b/java/org/apache/naming/LocalStrings_fr.properties
index b7bc794..33dd57d 100644
--- a/java/org/apache/naming/LocalStrings_fr.properties
+++ b/java/org/apache/naming/LocalStrings_fr.properties
@@ -18,11 +18,13 @@ contextBindings.noContextBoundToThread=Aucun Contexte de 
nommage lié à ce thre
 contextBindings.unknownContext=Nom de Contexte inconnu : [{0}]
 
 namingContext.alreadyBound=Le Nom [{0}] est déjà lié à ce Contexte
-namingContext.contextExpected=Le Nom n''est pas lié à un Contexte
+namingContext.contextExpected=Le Nom n'est pas lié à un Contexte
 namingContext.failResolvingReference=Une erreur s est produite durant la 
résolution de la référence
 namingContext.invalidName=Le Nom est invalide
 namingContext.nameNotBound=Le Nom [{0}] n''est pas lié à ce Contexte
 namingContext.noAbsoluteName=Impossible de générer un nom absolu pour cet 
espace de nommage (namespace)
 namingContext.readOnly=Le Contexte est en lecture seule
 
-selectorContext.noJavaUrl=Ce Contexte doit être accédé par une java: URL
+selectorContext.methodUsingName=Appel de la méthode [{0}] avec le nom [{1}]
+selectorContext.methodUsingString=Appel de la méthode [{0}] avec la String 
[{1}]
+selectorContext.noJavaUrl=Ce Contexte doit être accédé par une URL commençant 
par 'java:'
diff --git a/java/org/apache/naming/LocalStrings_ja.properties 
b/java/org/apache/naming/LocalStrings_ja.properties
index 79bbf34..f976573 100644
--- a/java/org/apache/naming/LocalStrings_ja.properties
+++ b/java/org/apache/naming/LocalStrings_ja.properties
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-contextBindings.noContextBoundToCL=名前付けコンテキストはこのクラスローダにバインドされていません
+contextBindings.noContextBoundToCL=Naming Contextはこのクラスローダにバインドされていません
 contextBindings.noContextBoundToThread=名前付けコンテキストはこのスレッドにバインドされていません
 contextBindings.unknownContext=未知のコンテキスト名です: [{0}]
 
@@ -25,4 +25,6 @@ namingContext.nameNotBound=名前 [{0}] はこのコンテキストにバイン
 namingContext.noAbsoluteName=この名前空間に絶対名を生成できません
 namingContext.readOnly=コンテキストはリードオンリーです
 
+selectorContext.methodUsingName=オブジェクト名 [{1}] に対してメソッド [{0}] を呼び出します。
+selectorContext.methodUsingString=メソッド[{0}]を[{1}]の文字列で呼び出します。
 selectorContext.noJavaUrl=このコンテキストにはjava: URLを用いてアクセスされねばいけません
diff --git a/java/org/apache/naming/StringManager.java 
b/java/org/apache/naming/StringManager.java
index 5e36c1a..8e9922d 100644
--- a/java/org/apache/naming/StringManager.java
+++ b/java/org/apache/naming/StringManager.java
@@ -110,7 +110,10 @@ public class StringManager {
 String str = null;
 
 try {
-str = bundle.getString(key);
+// Avoid NPE if bundle is null and treat it like an MRE
+if (bundle != null) {
+str = bundle.getString(key);
+}
 } catch(MissingResourceException mre) {
 //bad: shouldn't mask an exception the following way:
 //   str = "[cannot find message associated with key '" + key + "' 
due to " + mre + "]";


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

[tomcat] branch master updated: NamingManager.getObjectInstance does not work with Graal

[remm]

This is an automated email from the ASF dual-hosted git repository.

remm 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 984ff60  NamingManager.getObjectInstance does not work with Graal
984ff60 is described below

commit 984ff60dc0bfae9b3890cdf4a352706e797317c5
Author: remm 
AuthorDate: Wed Jul 10 10:51:37 2019 +0200

NamingManager.getObjectInstance does not work with Graal

For me it returns the reference in the native image, so obviously this
is not good. Resolve the reference using simple less flexible code. The
intermediate factory (that would use FactoryBase.getObjectInstance) must
be defined in the configuration manually because Graal doesn't trace it.
---
 java/org/apache/naming/NamingContext.java | 32 ---
 res/tomcat-maven/tomcat-reflection.json   |  6 +-
 2 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/java/org/apache/naming/NamingContext.java 
b/java/org/apache/naming/NamingContext.java
index b6a97bb..0471279 100644
--- a/java/org/apache/naming/NamingContext.java
+++ b/java/org/apache/naming/NamingContext.java
@@ -39,6 +39,7 @@ import javax.naming.OperationNotSupportedException;
 import javax.naming.Reference;
 import javax.naming.Referenceable;
 import javax.naming.spi.NamingManager;
+import javax.naming.spi.ObjectFactory;
 
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
@@ -791,6 +792,21 @@ public class NamingContext implements Context {
 // -- Protected Methods
 
 
+private static final boolean GRAAL;
+
+static {
+boolean result = false;
+try {
+Class nativeImageClazz = 
Class.forName("org.graalvm.nativeimage.ImageInfo");
+result = 
Boolean.TRUE.equals(nativeImageClazz.getMethod("inImageCode").invoke(null));
+} catch (ClassNotFoundException e) {
+// Must be Graal
+} catch (ReflectiveOperationException | IllegalArgumentException e) {
+// Should never happen
+}
+GRAAL = result;
+}
+
 /**
  * Retrieves the named object.
  *
@@ -836,9 +852,19 @@ public class NamingContext implements Context {
 }
 } else if (entry.type == NamingEntry.REFERENCE) {
 try {
-Object obj = NamingManager.getObjectInstance
-(entry.value, name, this, env);
-if(entry.value instanceof ResourceRef) {
+Object obj = null;
+if (!GRAAL) {
+obj = NamingManager.getObjectInstance(entry.value, 
name, this, env);
+} else {
+// NamingManager.getObjectInstance would simply return 
the reference here
+// Use the configured object factory to resolve it 
directly if possible
+// Note: This may need manual constructor reflection 
configuration
+Reference reference = (Reference) entry.value;
+Class factoryClass = 
getClass().getClassLoader().loadClass(reference.getFactoryClassName());
+ObjectFactory factory = (ObjectFactory) 
factoryClass.newInstance();
+obj = factory.getObjectInstance(entry.value, name, 
this, env);
+}
+if (entry.value instanceof ResourceRef) {
 boolean singleton = Boolean.parseBoolean(
 (String) ((ResourceRef) entry.value).get(
 "singleton").getContent());
diff --git a/res/tomcat-maven/tomcat-reflection.json 
b/res/tomcat-maven/tomcat-reflection.json
index 8885dac..ab1e477 100644
--- a/res/tomcat-maven/tomcat-reflection.json
+++ b/res/tomcat-maven/tomcat-reflection.json
@@ -40,5 +40,9 @@
 { "name":"com.sun.org.apache.xerces.internal.jaxp.SAXParserFactoryImpl", 
"methods" : [{"name": "","parameterTypes":[]}] },
 { "name":"com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl", 
"methods" : [{"name": "","parameterTypes":[]}] },
 { "name":"org.apache.catalina.authenticator.jaspic.AuthConfigFactoryImpl", 
"methods" : [{"name": "","parameterTypes":[]}] },
-{ "name":"org.apache.el.ExpressionFactoryImpl", "methods" : 
[{"name":"","parameterTypes":[]}] }
+{ "name":"org.apache.el.ExpressionFactoryImpl", "methods" : 
[{"name":"","parameterTypes":[]}] },
+{ "name":"org.apache.naming.factory.EjbFactory", "methods" : [{"name": 
"","parameterTypes":[]}] },
+{ "name":"org.apache.naming.factory.ResourceEnvFactory", "methods" : [{"name": 
"","parameterTypes":[]}] },
+{ "name":"org.apache.naming.factory.ResourceFactory", "methods" : [{"name": 
"","parameterTypes":[]}] },
+{ "name":"org.apache.naming.factory.TransactionFactory", "method

[tomcat] branch 7.0.x updated: Align with 8.5.x

[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 682e8d4  Align with 8.5.x
682e8d4 is described below

commit 682e8d434b2cd61ef7b8694196cc3adae8d20ef0
Author: Mark Thomas 
AuthorDate: Wed Jul 10 09:34:13 2019 +0100

Align with 8.5.x

Code clean-up. i18n improvements, fix SpotBugs warnings, spacing,
refactor to reduce duplication
---
 java/org/apache/naming/factory/BeanFactory.java|  16 +-
 .../naming/factory/DataSourceLinkFactory.java  |  12 +-
 java/org/apache/naming/factory/EjbFactory.java | 172 +
 java/org/apache/naming/factory/FactoryBase.java| 141 +
 .../apache/naming/factory/LocalStrings.properties  |   9 ++
 .../naming/factory/LocalStrings_es.properties  |  20 +++
 .../naming/factory/LocalStrings_fr.properties  |  28 
 .../naming/factory/LocalStrings_ja.properties  |  28 
 java/org/apache/naming/factory/LookupFactory.java  |   2 +-
 .../apache/naming/factory/MailSessionFactory.java  |   4 +-
 .../apache/naming/factory/ResourceEnvFactory.java  | 103 ++--
 .../org/apache/naming/factory/ResourceFactory.java | 159 ++-
 .../apache/naming/factory/ResourceLinkFactory.java |   4 +-
 .../org/apache/naming/factory/SendMailFactory.java |  49 +++---
 .../apache/naming/factory/TransactionFactory.java  | 103 ++--
 java/org/apache/naming/factory/package.html|   2 -
 java/org/apache/naming/java/package.html   |   2 -
 17 files changed, 380 insertions(+), 474 deletions(-)

diff --git a/java/org/apache/naming/factory/BeanFactory.java 
b/java/org/apache/naming/factory/BeanFactory.java
index 56c97ac..ec06cd3 100644
--- a/java/org/apache/naming/factory/BeanFactory.java
+++ b/java/org/apache/naming/factory/BeanFactory.java
@@ -86,7 +86,7 @@ import org.apache.naming.ResourceRef;
  * 
  * 
  *
- * @author mailto:aner at ncstech.com">Aner Perez
+ * @author Aner Perez [aner at ncstech.com]
  */
 public class BeanFactory
 implements ObjectFactory {
@@ -145,7 +145,7 @@ public class BeanFactory
 BeanInfo bi = Introspector.getBeanInfo(beanClass);
 PropertyDescriptor[] pda = bi.getPropertyDescriptors();
 
-Object bean = beanClass.newInstance();
+Object bean = beanClass.getConstructor().newInstance();
 
 /* Look for properties with explicitly configured setter */
 RefAddr ra = ref.get("forceString");
@@ -306,6 +306,18 @@ public class BeanFactory
 NamingException ne = new NamingException(ie2.getMessage());
 ne.setRootCause(ie2);
 throw ne;
+} catch (IllegalArgumentException e) {
+NamingException ne = new NamingException(e.getMessage());
+ne.setRootCause(e);
+throw ne;
+} catch (SecurityException e) {
+NamingException ne = new NamingException(e.getMessage());
+ne.setRootCause(e);
+throw ne;
+} catch (NoSuchMethodException e) {
+NamingException ne = new NamingException(e.getMessage());
+ne.setRootCause(e);
+throw ne;
 } catch (java.lang.reflect.InvocationTargetException ite) {
 Throwable cause = ite.getCause();
 if (cause instanceof ThreadDeath) {
diff --git a/java/org/apache/naming/factory/DataSourceLinkFactory.java 
b/java/org/apache/naming/factory/DataSourceLinkFactory.java
index 904c482..bd029fe 100644
--- a/java/org/apache/naming/factory/DataSourceLinkFactory.java
+++ b/java/org/apache/naming/factory/DataSourceLinkFactory.java
@@ -18,7 +18,6 @@
 
 package org.apache.naming.factory;
 
-import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -38,7 +37,6 @@ import javax.sql.DataSource;
 /**
  * Object factory for resource links for shared data sources.
  *
- * @author Filip Hanik
  */
 public class DataSourceLinkFactory extends ResourceLinkFactory {
 
@@ -71,10 +69,10 @@ public class DataSourceLinkFactory extends 
ResourceLinkFactory {
 
 protected Object wrapDataSource(Object datasource, String username, String 
password) throws NamingException {
 try {
-Class proxyClass = 
Proxy.getProxyClass(datasource.getClass().getClassLoader(), 
datasource.getClass().getInterfaces());
-Constructor proxyConstructor = proxyClass.getConstructor(new 
Class[] { InvocationHandler.class });
-DataSourceHandler handler = new 
DataSourceHandler((DataSource)datasource, username, password);
-return proxyConstructor.newInstance(handler);
+DataSourceHandler han

[tomcat] branch 8.5.x updated: Align with master

[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 4809c7f  Align with master
4809c7f is described below

commit 4809c7f70fe3856dd590ec193cdb81ea973f579b
Author: Mark Thomas 
AuthorDate: Wed Jul 10 09:33:23 2019 +0100

Align with master

Code clean-up. i18n improvements, fix SpotBugs warnings, spacing
---
 java/org/apache/naming/factory/Constants.java  |  1 -
 .../naming/factory/DataSourceLinkFactory.java  | 11 -
 java/org/apache/naming/factory/FactoryBase.java| 12 ++
 .../apache/naming/factory/LocalStrings.properties  |  9 +++
 .../naming/factory/LocalStrings_es.properties  | 20 
 .../naming/factory/LocalStrings_fr.properties  | 28 ++
 .../naming/factory/LocalStrings_ja.properties  | 28 ++
 java/org/apache/naming/factory/LookupFactory.java  |  2 +-
 .../org/apache/naming/factory/ResourceFactory.java |  9 +++
 .../apache/naming/factory/ResourceLinkFactory.java |  4 ++--
 10 files changed, 105 insertions(+), 19 deletions(-)

diff --git a/java/org/apache/naming/factory/Constants.java 
b/java/org/apache/naming/factory/Constants.java
index 0cc4cf47..b8690af 100644
--- a/java/org/apache/naming/factory/Constants.java
+++ b/java/org/apache/naming/factory/Constants.java
@@ -45,5 +45,4 @@ public final class Constants {
 public static final String DEFAULT_LOOKUP_JNDI_FACTORY = Package + 
".LookupFactory";
 
 public static final String FACTORY = "factory";
-
 }
diff --git a/java/org/apache/naming/factory/DataSourceLinkFactory.java 
b/java/org/apache/naming/factory/DataSourceLinkFactory.java
index 09a83ef..bd029fe 100644
--- a/java/org/apache/naming/factory/DataSourceLinkFactory.java
+++ b/java/org/apache/naming/factory/DataSourceLinkFactory.java
@@ -18,7 +18,6 @@
 
 package org.apache.naming.factory;
 
-import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -70,10 +69,10 @@ public class DataSourceLinkFactory extends 
ResourceLinkFactory {
 
 protected Object wrapDataSource(Object datasource, String username, String 
password) throws NamingException {
 try {
-Class proxyClass = 
Proxy.getProxyClass(datasource.getClass().getClassLoader(), 
datasource.getClass().getInterfaces());
-Constructor proxyConstructor = proxyClass.getConstructor(new 
Class[] { InvocationHandler.class });
-DataSourceHandler handler = new 
DataSourceHandler((DataSource)datasource, username, password);
-return proxyConstructor.newInstance(handler);
+DataSourceHandler handler =
+new DataSourceHandler((DataSource)datasource, username, 
password);
+return 
Proxy.newProxyInstance(datasource.getClass().getClassLoader(),
+datasource.getClass().getInterfaces(), handler);
 }catch (Exception x) {
 if (x instanceof InvocationTargetException) {
 Throwable cause = x.getCause();
@@ -138,7 +137,7 @@ public class DataSourceLinkFactory extends 
ResourceLinkFactory {
 if (iface == DataSource.class) {
 return ds;
 } else {
-throw new SQLException("Not a wrapper of "+iface.getName());
+throw new 
SQLException(sm.getString("dataSourceLinkFactory.badWrapper", iface.getName()));
 }
 }
 
diff --git a/java/org/apache/naming/factory/FactoryBase.java 
b/java/org/apache/naming/factory/FactoryBase.java
index ee5510e..a49c4b1 100644
--- a/java/org/apache/naming/factory/FactoryBase.java
+++ b/java/org/apache/naming/factory/FactoryBase.java
@@ -25,12 +25,16 @@ import javax.naming.RefAddr;
 import javax.naming.Reference;
 import javax.naming.spi.ObjectFactory;
 
+import org.apache.naming.StringManager;
+
 /**
  * Abstract base class that provides common functionality required by
  * sub-classes. This class exists primarily to reduce code duplication.
  */
 public abstract class FactoryBase implements ObjectFactory {
 
+private static final StringManager sm = 
StringManager.getManager(FactoryBase.class);
+
 /**
  * Creates a new object instance.
  *
@@ -63,8 +67,7 @@ public abstract class FactoryBase implements ObjectFactory {
 factoryClass = Class.forName(factoryClassName);
 }
 } catch(ClassNotFoundException e) {
-NamingException ex = new NamingException(
-"Could not load resource factory class");
+NamingException ex = new 
NamingException(sm.getString("factoryBase.factoryClassError"));
 ex.initCause(e);
 throw ex;
  

[tomcat] branch master updated: Trivial clean-up

[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 5b49ca7  Trivial clean-up
5b49ca7 is described below

commit 5b49ca7f7649a55bb785359a416c9f4be4f0fa1d
Author: Mark Thomas 
AuthorDate: Wed Jul 10 09:31:08 2019 +0100

Trivial clean-up
---
 java/org/apache/naming/factory/Constants.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/java/org/apache/naming/factory/Constants.java 
b/java/org/apache/naming/factory/Constants.java
index 0cc4cf47..b8690af 100644
--- a/java/org/apache/naming/factory/Constants.java
+++ b/java/org/apache/naming/factory/Constants.java
@@ -45,5 +45,4 @@ public final class Constants {
 public static final String DEFAULT_LOOKUP_JNDI_FACTORY = Package + 
".LookupFactory";
 
 public static final String FACTORY = "factory";
-
 }


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

Re: Tag Tomcat 7

[Violeta Georgieva]

Hi Mark,

На ср, 10.07.2019 г. в 10:53 ч. Mark Thomas  написа:
>
> On 10/07/2019 06:40, Violeta Georgieva wrote:
> > Hi,
> >
> > I'm planning to tag Tomcat 7 later today.
> > If you want to include something please reply here.
>
> I have some clean-up I am working on but it should be all non-functional
> changes so it doesn't really matter if it gets committed before tag or
> after tag. Feel free to ignore me unless I am getting in the way in
> which case just let me know.

I can wait, so go ahead and tell me when you are ready. Ok?

Regards,
Violeta

[tomcat] branch master updated: Clean-up. Indents and braces

[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 60d8400  Clean-up. Indents and braces
60d8400 is described below

commit 60d8400e0331cd1adbfce27b8f921fbdb88c6625
Author: Mark Thomas 
AuthorDate: Wed Jul 10 09:03:26 2019 +0100

Clean-up. Indents and braces
---
 .../naming/factory/webservices/ServiceProxy.java   | 12 ++---
 .../factory/webservices/ServiceRefFactory.java | 60 +++---
 2 files changed, 35 insertions(+), 37 deletions(-)

diff --git a/java/org/apache/naming/factory/webservices/ServiceProxy.java 
b/java/org/apache/naming/factory/webservices/ServiceProxy.java
index 114a445..d6c03b1 100644
--- a/java/org/apache/naming/factory/webservices/ServiceProxy.java
+++ b/java/org/apache/naming/factory/webservices/ServiceProxy.java
@@ -101,14 +101,12 @@ public class ServiceProxy implements InvocationHandler {
  * @return Returns the correct Port
  * @throws ServiceException if port's QName is an unknown Port (not 
defined in WSDL).
  */
-private Object getProxyPortQNameClass(Object[] args)
-throws ServiceException {
+private Object getProxyPortQNameClass(Object[] args) throws 
ServiceException {
 QName name = (QName) args[0];
 String nameString = name.getLocalPart();
 Class serviceendpointClass = (Class) args[1];
 
-for (@SuppressWarnings("unchecked")
-Iterator ports = service.getPorts(); ports.hasNext();) {
+for (@SuppressWarnings("unchecked") Iterator ports = 
service.getPorts(); ports.hasNext();) {
 QName portName = ports.next();
 String portnameString = portName.getLocalPart();
 if (portnameString.equals(nameString)) {
@@ -132,12 +130,12 @@ public class ServiceProxy implements InvocationHandler {
  * @return Returns the correct Port
  * @throws ServiceException if port's QName is an unknown Port
  */
-private Remote getProxyPortClass(Object[] args)
-throws ServiceException {
+private Remote getProxyPortClass(Object[] args) throws ServiceException {
 Class serviceendpointClass = (Class) args[0];
 
-if (this.portComponentRef == null)
+if (this.portComponentRef == null) {
 return service.getPort(serviceendpointClass);
+}
 
 QName portname = 
this.portComponentRef.get(serviceendpointClass.getName());
 if (portname != null) {
diff --git a/java/org/apache/naming/factory/webservices/ServiceRefFactory.java 
b/java/org/apache/naming/factory/webservices/ServiceRefFactory.java
index b47c4ff..1f37d30 100644
--- a/java/org/apache/naming/factory/webservices/ServiceRefFactory.java
+++ b/java/org/apache/naming/factory/webservices/ServiceRefFactory.java
@@ -65,31 +65,32 @@ public class ServiceRefFactory implements ObjectFactory {
  */
 @Override
 public Object getObjectInstance(Object obj, Name name, Context nameCtx,
-Hashtable environment)
-throws Exception {
+Hashtable environment) throws Exception {
 
 if (obj instanceof ServiceRef) {
 ServiceRef ref = (ServiceRef) obj;
 
 // ClassLoader
-ClassLoader tcl =
-Thread.currentThread().getContextClassLoader();
-if (tcl == null)
+ClassLoader tcl = Thread.currentThread().getContextClassLoader();
+if (tcl == null) {
 tcl = this.getClass().getClassLoader();
+}
 ServiceFactory factory = ServiceFactory.newInstance();
 javax.xml.rpc.Service service = null;
 
 // Service Interface
 RefAddr tmp = ref.get(ServiceRef.SERVICE_INTERFACE);
 String serviceInterface = null;
-if (tmp != null)
+if (tmp != null) {
 serviceInterface = (String) tmp.getContent();
+}
 
 // WSDL
 tmp = ref.get(ServiceRef.WSDL);
 String wsdlRefAddr = null;
-if (tmp != null)
+if (tmp != null) {
 wsdlRefAddr = (String) tmp.getContent();
+}
 
 // PortComponent
 Hashtable portComponentRef = new Hashtable<>();
@@ -124,8 +125,7 @@ public class ServiceRefFactory implements ObjectFactory {
 serviceQname );
 }
 } catch (Exception e) {
-NamingException ex = new NamingException
-("Could not create service");
+NamingException ex = new NamingException("Could not create 
service");
 ex.initCause(e);
 throw ex;
 }
@@ -134,8 +134,7 @@ public class ServiceRefFactory implements ObjectFactory {
 try {
 serviceInterfaceClass = tcl

[tomcat] branch 7.0.x updated: Clean-up. Indents and braces

[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 9b7c17d  Clean-up. Indents and braces
9b7c17d is described below

commit 9b7c17d415ba219aab6321ee830259bd789b0071
Author: Mark Thomas 
AuthorDate: Wed Jul 10 09:03:26 2019 +0100

Clean-up. Indents and braces
---
 .../naming/factory/webservices/ServiceProxy.java   |  9 ++--
 .../factory/webservices/ServiceRefFactory.java | 54 +++---
 2 files changed, 31 insertions(+), 32 deletions(-)

diff --git a/java/org/apache/naming/factory/webservices/ServiceProxy.java 
b/java/org/apache/naming/factory/webservices/ServiceProxy.java
index 4539c83..d6c03b1 100644
--- a/java/org/apache/naming/factory/webservices/ServiceProxy.java
+++ b/java/org/apache/naming/factory/webservices/ServiceProxy.java
@@ -101,8 +101,7 @@ public class ServiceProxy implements InvocationHandler {
  * @return Returns the correct Port
  * @throws ServiceException if port's QName is an unknown Port (not 
defined in WSDL).
  */
-private Object getProxyPortQNameClass(Object[] args)
-throws ServiceException {
+private Object getProxyPortQNameClass(Object[] args) throws 
ServiceException {
 QName name = (QName) args[0];
 String nameString = name.getLocalPart();
 Class serviceendpointClass = (Class) args[1];
@@ -131,12 +130,12 @@ public class ServiceProxy implements InvocationHandler {
  * @return Returns the correct Port
  * @throws ServiceException if port's QName is an unknown Port
  */
-private Remote getProxyPortClass(Object[] args)
-throws ServiceException {
+private Remote getProxyPortClass(Object[] args) throws ServiceException {
 Class serviceendpointClass = (Class) args[0];
 
-if (this.portComponentRef == null)
+if (this.portComponentRef == null) {
 return service.getPort(serviceendpointClass);
+}
 
 QName portname = 
this.portComponentRef.get(serviceendpointClass.getName());
 if (portname != null) {
diff --git a/java/org/apache/naming/factory/webservices/ServiceRefFactory.java 
b/java/org/apache/naming/factory/webservices/ServiceRefFactory.java
index 6d9a496..299ae4a 100644
--- a/java/org/apache/naming/factory/webservices/ServiceRefFactory.java
+++ b/java/org/apache/naming/factory/webservices/ServiceRefFactory.java
@@ -65,31 +65,32 @@ public class ServiceRefFactory implements ObjectFactory {
  */
 @Override
 public Object getObjectInstance(Object obj, Name name, Context nameCtx,
-Hashtable environment)
-throws Exception {
+Hashtable environment) throws Exception {
 
 if (obj instanceof ServiceRef) {
 ServiceRef ref = (ServiceRef) obj;
 
 // ClassLoader
-ClassLoader tcl =
-Thread.currentThread().getContextClassLoader();
-if (tcl == null)
+ClassLoader tcl = Thread.currentThread().getContextClassLoader();
+if (tcl == null) {
 tcl = this.getClass().getClassLoader();
+}
 ServiceFactory factory = ServiceFactory.newInstance();
 javax.xml.rpc.Service service = null;
 
 // Service Interface
 RefAddr tmp = ref.get(ServiceRef.SERVICE_INTERFACE);
 String serviceInterface = null;
-if (tmp != null)
+if (tmp != null) {
 serviceInterface = (String) tmp.getContent();
+}
 
 // WSDL
 tmp = ref.get(ServiceRef.WSDL);
 String wsdlRefAddr = null;
-if (tmp != null)
+if (tmp != null) {
 wsdlRefAddr = (String) tmp.getContent();
+}
 
 // PortComponent
 Hashtable portComponentRef = new 
Hashtable();
@@ -124,8 +125,7 @@ public class ServiceRefFactory implements ObjectFactory {
 serviceQname );
 }
 } catch (Exception e) {
-NamingException ex = new NamingException
-("Could not create service");
+NamingException ex = new NamingException("Could not create 
service");
 ex.initCause(e);
 throw ex;
 }
@@ -134,8 +134,7 @@ public class ServiceRefFactory implements ObjectFactory {
 try {
 serviceInterfaceClass = tcl.loadClass(serviceInterface);
 } catch(ClassNotFoundException e) {
-NamingException ex = new NamingException
-("Could not load service Interface");
+NamingException ex = new NamingException("Could not load 
service Interface");
 ex.initCause(e);
 throw ex;
 

[tomcat] branch 8.5.x updated: Clean-up. Indents and braces

[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 6e360bc  Clean-up. Indents and braces
6e360bc is described below

commit 6e360bc8c59bbdb3a917ce72239089218b252db1
Author: Mark Thomas 
AuthorDate: Wed Jul 10 09:03:26 2019 +0100

Clean-up. Indents and braces
---
 .../naming/factory/webservices/ServiceProxy.java   |  9 ++--
 .../factory/webservices/ServiceRefFactory.java | 54 +++---
 2 files changed, 31 insertions(+), 32 deletions(-)

diff --git a/java/org/apache/naming/factory/webservices/ServiceProxy.java 
b/java/org/apache/naming/factory/webservices/ServiceProxy.java
index 4539c83..d6c03b1 100644
--- a/java/org/apache/naming/factory/webservices/ServiceProxy.java
+++ b/java/org/apache/naming/factory/webservices/ServiceProxy.java
@@ -101,8 +101,7 @@ public class ServiceProxy implements InvocationHandler {
  * @return Returns the correct Port
  * @throws ServiceException if port's QName is an unknown Port (not 
defined in WSDL).
  */
-private Object getProxyPortQNameClass(Object[] args)
-throws ServiceException {
+private Object getProxyPortQNameClass(Object[] args) throws 
ServiceException {
 QName name = (QName) args[0];
 String nameString = name.getLocalPart();
 Class serviceendpointClass = (Class) args[1];
@@ -131,12 +130,12 @@ public class ServiceProxy implements InvocationHandler {
  * @return Returns the correct Port
  * @throws ServiceException if port's QName is an unknown Port
  */
-private Remote getProxyPortClass(Object[] args)
-throws ServiceException {
+private Remote getProxyPortClass(Object[] args) throws ServiceException {
 Class serviceendpointClass = (Class) args[0];
 
-if (this.portComponentRef == null)
+if (this.portComponentRef == null) {
 return service.getPort(serviceendpointClass);
+}
 
 QName portname = 
this.portComponentRef.get(serviceendpointClass.getName());
 if (portname != null) {
diff --git a/java/org/apache/naming/factory/webservices/ServiceRefFactory.java 
b/java/org/apache/naming/factory/webservices/ServiceRefFactory.java
index 9f92d43..1f37d30 100644
--- a/java/org/apache/naming/factory/webservices/ServiceRefFactory.java
+++ b/java/org/apache/naming/factory/webservices/ServiceRefFactory.java
@@ -65,31 +65,32 @@ public class ServiceRefFactory implements ObjectFactory {
  */
 @Override
 public Object getObjectInstance(Object obj, Name name, Context nameCtx,
-Hashtable environment)
-throws Exception {
+Hashtable environment) throws Exception {
 
 if (obj instanceof ServiceRef) {
 ServiceRef ref = (ServiceRef) obj;
 
 // ClassLoader
-ClassLoader tcl =
-Thread.currentThread().getContextClassLoader();
-if (tcl == null)
+ClassLoader tcl = Thread.currentThread().getContextClassLoader();
+if (tcl == null) {
 tcl = this.getClass().getClassLoader();
+}
 ServiceFactory factory = ServiceFactory.newInstance();
 javax.xml.rpc.Service service = null;
 
 // Service Interface
 RefAddr tmp = ref.get(ServiceRef.SERVICE_INTERFACE);
 String serviceInterface = null;
-if (tmp != null)
+if (tmp != null) {
 serviceInterface = (String) tmp.getContent();
+}
 
 // WSDL
 tmp = ref.get(ServiceRef.WSDL);
 String wsdlRefAddr = null;
-if (tmp != null)
+if (tmp != null) {
 wsdlRefAddr = (String) tmp.getContent();
+}
 
 // PortComponent
 Hashtable portComponentRef = new Hashtable<>();
@@ -124,8 +125,7 @@ public class ServiceRefFactory implements ObjectFactory {
 serviceQname );
 }
 } catch (Exception e) {
-NamingException ex = new NamingException
-("Could not create service");
+NamingException ex = new NamingException("Could not create 
service");
 ex.initCause(e);
 throw ex;
 }
@@ -134,8 +134,7 @@ public class ServiceRefFactory implements ObjectFactory {
 try {
 serviceInterfaceClass = tcl.loadClass(serviceInterface);
 } catch(ClassNotFoundException e) {
-NamingException ex = new NamingException
-("Could not load service Interface");
+NamingException ex = new NamingException("Could not load 
service Interface");
 ex.initCause(e);
 throw ex;

[tomcat] branch 7.0.x updated: Code clean-up.

[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 2b6d105  Code clean-up.
2b6d105 is described below

commit 2b6d105f6061a0d4f3a803357486acf7b9d69191
Author: Mark Thomas 
AuthorDate: Wed Jul 10 09:01:44 2019 +0100

Code clean-up.

Generally, align with 8.5.x. Add i18n, enhanced for loops, reduced
casting, use interfaces rather than concrete types.
---
 .../factory/webservices/LocalStrings.properties| 16 ++
 .../factory/webservices/LocalStrings_fr.properties | 16 ++
 .../factory/webservices/LocalStrings_ja.properties | 16 ++
 .../naming/factory/webservices/ServiceProxy.java   | 15 +++--
 .../factory/webservices/ServiceRefFactory.java | 66 +++---
 5 files changed, 75 insertions(+), 54 deletions(-)

diff --git a/java/org/apache/naming/factory/webservices/LocalStrings.properties 
b/java/org/apache/naming/factory/webservices/LocalStrings.properties
new file mode 100644
index 000..0c5d17e
--- /dev/null
+++ b/java/org/apache/naming/factory/webservices/LocalStrings.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.
+
+serviceProxy.portNotFound=Port-component-ref [{0}] not found
diff --git 
a/java/org/apache/naming/factory/webservices/LocalStrings_fr.properties 
b/java/org/apache/naming/factory/webservices/LocalStrings_fr.properties
new file mode 100644
index 000..94053ed
--- /dev/null
+++ b/java/org/apache/naming/factory/webservices/LocalStrings_fr.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.
+
+serviceProxy.portNotFound=Le port-component-ref [{0}] n''a pas été trouvé
diff --git 
a/java/org/apache/naming/factory/webservices/LocalStrings_ja.properties 
b/java/org/apache/naming/factory/webservices/LocalStrings_ja.properties
new file mode 100644
index 000..a210092
--- /dev/null
+++ b/java/org/apache/naming/factory/webservices/LocalStrings_ja.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.
+
+serviceProxy.portNotFound=port-component-ref [{0}] [{0}]が見つかりません
diff --git a/java/org/apache/naming/factory/webservices/ServiceProxy.java 
b/java/org/apache/naming/factory/webservices/ServiceProxy.java
index 4f6fee3..4539c83 100644
--- a/java/org/apache/naming/factory/webservices/ServiceProxy.java
+++ b/java/org/apache/naming/factory/webservices/ServiceProxy.java
@@ -14,8 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-
 package org.apache.naming.factory.webservices;
 
 import java.lang.reflect.InvocationHandler;
@@ -

[tomcat] branch 8.5.x updated: Code clean-up.

[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 414a39d  Code clean-up.
414a39d is described below

commit 414a39d917afd4e4d9caea7eabaa31f2d374fe20
Author: Mark Thomas 
AuthorDate: Wed Jul 10 09:02:55 2019 +0100

Code clean-up.

Generally, align with master. Add i18n, enhanced for loops, reduced
casting, use interfaces rather than concrete types.
---
 .../factory/webservices/LocalStrings.properties| 16 +++
 .../factory/webservices/LocalStrings_fr.properties | 16 +++
 .../factory/webservices/LocalStrings_ja.properties | 16 +++
 .../naming/factory/webservices/ServiceProxy.java   |  9 --
 .../factory/webservices/ServiceRefFactory.java | 32 ++
 5 files changed, 68 insertions(+), 21 deletions(-)

diff --git a/java/org/apache/naming/factory/webservices/LocalStrings.properties 
b/java/org/apache/naming/factory/webservices/LocalStrings.properties
new file mode 100644
index 000..0c5d17e
--- /dev/null
+++ b/java/org/apache/naming/factory/webservices/LocalStrings.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.
+
+serviceProxy.portNotFound=Port-component-ref [{0}] not found
diff --git 
a/java/org/apache/naming/factory/webservices/LocalStrings_fr.properties 
b/java/org/apache/naming/factory/webservices/LocalStrings_fr.properties
new file mode 100644
index 000..94053ed
--- /dev/null
+++ b/java/org/apache/naming/factory/webservices/LocalStrings_fr.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.
+
+serviceProxy.portNotFound=Le port-component-ref [{0}] n''a pas été trouvé
diff --git 
a/java/org/apache/naming/factory/webservices/LocalStrings_ja.properties 
b/java/org/apache/naming/factory/webservices/LocalStrings_ja.properties
new file mode 100644
index 000..a210092
--- /dev/null
+++ b/java/org/apache/naming/factory/webservices/LocalStrings_ja.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.
+
+serviceProxy.portNotFound=port-component-ref [{0}] [{0}]が見つかりません
diff --git a/java/org/apache/naming/factory/webservices/ServiceProxy.java 
b/java/org/apache/naming/factory/webservices/ServiceProxy.java
index 5341688..4539c83 100644
--- a/java/org/apache/naming/factory/webservices/ServiceProxy.java
+++ b/java/org/apache/naming/factory/webservices/ServiceProxy.java
@@ -27,6 +27,8 @@ import javax.xml.namespace.QName;
 import javax.xml.rpc.Service;
 import javax.xml.rpc.ServiceException;
 
+import org.apache.naming.StringManager;
+
 /**
  * Object proxy for Web Services.
  *
@@ -

Re: Tag Tomcat 7

[Mark Thomas]

On 10/07/2019 06:40, Violeta Georgieva wrote:
> Hi,
> 
> I'm planning to tag Tomcat 7 later today.
> If you want to include something please reply here.

I have some clean-up I am working on but it should be all non-functional
changes so it doesn't really matter if it gets committed before tag or
after tag. Feel free to ignore me unless I am getting in the way in
which case just let me know.

Mark

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