[tomcat] branch master updated: Trivial formatting for consistency and readability

[isapir]

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

isapir 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 1343a38  Trivial formatting for consistency and readability
1343a38 is described below

commit 1343a38cb6a4aab5f892cc265e273c71ccb60bb8
Author: Igal Sapir 
AuthorDate: Fri Apr 26 20:43:35 2019 -0700

Trivial formatting for consistency and readability
---
 java/org/apache/catalina/startup/Bootstrap.java | 57 +
 1 file changed, 20 insertions(+), 37 deletions(-)

diff --git a/java/org/apache/catalina/startup/Bootstrap.java 
b/java/org/apache/catalina/startup/Bootstrap.java
index 4b3a315..ac2bfe5 100644
--- a/java/org/apache/catalina/startup/Bootstrap.java
+++ b/java/org/apache/catalina/startup/Bootstrap.java
@@ -133,7 +133,6 @@ public final class Bootstrap {
  */
 private Object catalinaDaemon = null;
 
-
 ClassLoader commonLoader = null;
 ClassLoader catalinaLoader = null;
 ClassLoader sharedLoader = null;
@@ -145,9 +144,9 @@ public final class Bootstrap {
 private void initClassLoaders() {
 try {
 commonLoader = createClassLoader("common", null);
-if( commonLoader == null ) {
+if (commonLoader == null) {
 // no config file, default to this loader - we might be in a 
'single' env.
-commonLoader=this.getClass().getClassLoader();
+commonLoader = this.getClass().getClassLoader();
 }
 catalinaLoader = createClassLoader("server", commonLoader);
 sharedLoader = createClassLoader("shared", commonLoader);
@@ -276,15 +275,13 @@ public final class Bootstrap {
 method.invoke(startupInstance, paramValues);
 
 catalinaDaemon = startupInstance;
-
 }
 
 
 /**
  * Load daemon.
  */
-private void load(String[] arguments)
-throws Exception {
+private void load(String[] arguments) throws Exception {
 
 // Call the load() method
 String methodName = "load";
@@ -301,10 +298,10 @@ public final class Bootstrap {
 }
 Method method =
 catalinaDaemon.getClass().getMethod(methodName, paramTypes);
-if (log.isDebugEnabled())
+if (log.isDebugEnabled()) {
 log.debug("Calling startup class " + method);
+}
 method.invoke(catalinaDaemon, param);
-
 }
 
 
@@ -314,10 +311,8 @@ public final class Bootstrap {
 private Object getServer() throws Exception {
 
 String methodName = "getServer";
-Method method =
-catalinaDaemon.getClass().getMethod(methodName);
+Method method = catalinaDaemon.getClass().getMethod(methodName);
 return method.invoke(catalinaDaemon);
-
 }
 
 
@@ -329,12 +324,10 @@ public final class Bootstrap {
  * @param arguments Initialization arguments
  * @throws Exception Fatal initialization error
  */
-public void init(String[] arguments)
-throws Exception {
+public void init(String[] arguments) throws Exception {
 
 init();
 load(arguments);
-
 }
 
 
@@ -342,13 +335,13 @@ public final class Bootstrap {
  * Start the Catalina daemon.
  * @throws Exception Fatal start error
  */
-public void start()
-throws Exception {
-if( catalinaDaemon==null ) init();
+public void start() throws Exception {
+if (catalinaDaemon == null) {
+init();
+}
 
-Method method = catalinaDaemon.getClass().getMethod("start", (Class [] 
)null);
+Method method = catalinaDaemon.getClass().getMethod("start", (Class 
[])null);
 method.invoke(catalinaDaemon, (Object [])null);
-
 }
 
 
@@ -356,12 +349,9 @@ public final class Bootstrap {
  * Stop the Catalina Daemon.
  * @throws Exception Fatal stop error
  */
-public void stop()
-throws Exception {
-
-Method method = catalinaDaemon.getClass().getMethod("stop", (Class [] 
) null);
-method.invoke(catalinaDaemon, (Object [] ) null);
-
+public void stop() throws Exception {
+Method method = catalinaDaemon.getClass().getMethod("stop", (Class []) 
null);
+method.invoke(catalinaDaemon, (Object []) null);
 }
 
 
@@ -369,13 +359,11 @@ public final class Bootstrap {
  * Stop the standalone server.
  * @throws Exception Fatal stop error
  */
-public void stopServer()
-throws Exception {
+public void stopServer() throws Exception {
 
 Method method =
 catalinaDaemon.getClass().getMethod("stopServer", (Class []) null);
 method.invoke(catalinaDaemon, (Object []) null);
-
 }
 
 
@@ -384,12 +372,11 @@ public final class Bootstrap {
  * @param arguments Command line arguments
  * @throws Exception Fatal stop error
  */
-public void 

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

[markt]

Author: markt
Date: Fri Apr 26 22:14:26 2019
New Revision: 1858232

URL: http://svn.apache.org/viewvc?rev=1858232=rev
Log:
This does work - some tlp servers seem to be behind on sync

Modified:
tomcat/site/trunk/docs/.htaccess
tomcat/site/trunk/xdocs/.htaccess

Modified: tomcat/site/trunk/docs/.htaccess
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/.htaccess?rev=1858232=1858231=1858232=diff
==
--- tomcat/site/trunk/docs/.htaccess (original)
+++ tomcat/site/trunk/docs/.htaccess Fri Apr 26 22:14:26 2019
@@ -1,3 +1,2 @@
-RewriteEngine On
-RewriteRule "^/svn\.html$" "/source.html" [PT,R=301]
+Redirect "/svn.html" "/source.html"
 

Modified: tomcat/site/trunk/xdocs/.htaccess
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/.htaccess?rev=1858232=1858231=1858232=diff
==
--- tomcat/site/trunk/xdocs/.htaccess (original)
+++ tomcat/site/trunk/xdocs/.htaccess Fri Apr 26 22:14:26 2019
@@ -1,3 +1,2 @@
-RewriteEngine On
-RewriteRule "^/svn\.html$" "/source.html" [PT,R=301]
+Redirect "/svn.html" "/source.html"
 



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

svn commit: r1858230 - /tomcat/site/trunk/xdocs/.htaccess

[markt]

Author: markt
Date: Fri Apr 26 22:02:40 2019
New Revision: 1858230

URL: http://svn.apache.org/viewvc?rev=1858230=rev
Log:
Another attempt

Modified:
tomcat/site/trunk/xdocs/.htaccess

Modified: tomcat/site/trunk/xdocs/.htaccess
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/.htaccess?rev=1858230=1858229=1858230=diff
==
--- tomcat/site/trunk/xdocs/.htaccess (original)
+++ tomcat/site/trunk/xdocs/.htaccess Fri Apr 26 22:02:40 2019
@@ -1,3 +1,3 @@
 RewriteEngine On
-RewriteRule "^/svn\.html$" "/source.html" [R=301]
+RewriteRule "^/svn\.html$" "/source.html" [PT,R=301]
 



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

svn commit: r1858231 - /tomcat/site/trunk/docs/.htaccess

[markt]

Author: markt
Date: Fri Apr 26 22:03:10 2019
New Revision: 1858231

URL: http://svn.apache.org/viewvc?rev=1858231=rev
Log:
Another attempt

Modified:
tomcat/site/trunk/docs/.htaccess

Modified: tomcat/site/trunk/docs/.htaccess
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/.htaccess?rev=1858231=1858230=1858231=diff
==
--- tomcat/site/trunk/docs/.htaccess (original)
+++ tomcat/site/trunk/docs/.htaccess Fri Apr 26 22:03:10 2019
@@ -1,3 +1,3 @@
 RewriteEngine On
-RewriteRule "^/svn\.html$" "/source.html" [R=301]
+RewriteRule "^/svn\.html$" "/source.html" [PT,R=301]
 



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

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

[markt]

Author: markt
Date: Fri Apr 26 22:00:16 2019
New Revision: 1858229

URL: http://svn.apache.org/viewvc?rev=1858229=rev
Log:
Typo in docs?

Modified:
tomcat/site/trunk/docs/.htaccess
tomcat/site/trunk/xdocs/.htaccess

Modified: tomcat/site/trunk/docs/.htaccess
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/.htaccess?rev=1858229=1858228=1858229=diff
==
--- tomcat/site/trunk/docs/.htaccess (original)
+++ tomcat/site/trunk/docs/.htaccess Fri Apr 26 22:00:16 2019
@@ -1,3 +1,3 @@
 RewriteEngine On
-RewriteRule "^/svn\.html$" "source.html" [R=301]
+RewriteRule "^/svn\.html$" "/source.html" [R=301]
 

Modified: tomcat/site/trunk/xdocs/.htaccess
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/.htaccess?rev=1858229=1858228=1858229=diff
==
--- tomcat/site/trunk/xdocs/.htaccess (original)
+++ tomcat/site/trunk/xdocs/.htaccess Fri Apr 26 22:00:16 2019
@@ -1,3 +1,3 @@
 RewriteEngine On
-RewriteRule "^/svn\.html$" "source.html" [R=301]
+RewriteRule "^/svn\.html$" "/source.html" [R=301]
 



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

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

[markt]

Author: markt
Date: Fri Apr 26 21:54:45 2019
New Revision: 1858228

URL: http://svn.apache.org/viewvc?rev=1858228=rev
Log:
Back to RewriteRule

Modified:
tomcat/site/trunk/docs/.htaccess
tomcat/site/trunk/xdocs/.htaccess

Modified: tomcat/site/trunk/docs/.htaccess
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/.htaccess?rev=1858228=1858227=1858228=diff
==
--- tomcat/site/trunk/docs/.htaccess (original)
+++ tomcat/site/trunk/docs/.htaccess Fri Apr 26 21:54:45 2019
@@ -1 +1,3 @@
-Redirect "/svn.html" "/source.html"
+RewriteEngine On
+RewriteRule "^/svn\.html$" "source.html" [R=301]
+

Modified: tomcat/site/trunk/xdocs/.htaccess
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/.htaccess?rev=1858228=1858227=1858228=diff
==
--- tomcat/site/trunk/xdocs/.htaccess (original)
+++ tomcat/site/trunk/xdocs/.htaccess Fri Apr 26 21:54:45 2019
@@ -1 +1,3 @@
-Redirect "/svn.html" "/source.html"
+RewriteEngine On
+RewriteRule "^/svn\.html$" "source.html" [R=301]
+



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

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

[markt]

Author: markt
Date: Fri Apr 26 21:48:26 2019
New Revision: 1858227

URL: http://svn.apache.org/viewvc?rev=1858227=rev
Log:
Simplify

Modified:
tomcat/site/trunk/docs/.htaccess
tomcat/site/trunk/xdocs/.htaccess

Modified: tomcat/site/trunk/docs/.htaccess
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/.htaccess?rev=1858227=1858226=1858227=diff
==
--- tomcat/site/trunk/docs/.htaccess (original)
+++ tomcat/site/trunk/docs/.htaccess Fri Apr 26 21:48:26 2019
@@ -1,2 +1 @@
-RewriteEngine On
-RewriteRule ^svn.html source.html [R=301]
+Redirect "/svn.html" "/source.html"

Modified: tomcat/site/trunk/xdocs/.htaccess
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/.htaccess?rev=1858227=1858226=1858227=diff
==
--- tomcat/site/trunk/xdocs/.htaccess (original)
+++ tomcat/site/trunk/xdocs/.htaccess Fri Apr 26 21:48:26 2019
@@ -1,2 +1 @@
-RewriteEngine On
-RewriteRule ^svn.html source.html [R=301]
+Redirect "/svn.html" "/source.html"



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

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

[markt]

Author: markt
Date: Fri Apr 26 21:43:46 2019
New Revision: 1858226

URL: http://svn.apache.org/viewvc?rev=1858226=rev
Log:
Tweak rewrite rule as it isn;t working at the moment

Modified:
tomcat/site/trunk/docs/.htaccess
tomcat/site/trunk/xdocs/.htaccess

Modified: tomcat/site/trunk/docs/.htaccess
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/.htaccess?rev=1858226=1858225=1858226=diff
==
--- tomcat/site/trunk/docs/.htaccess (original)
+++ tomcat/site/trunk/docs/.htaccess Fri Apr 26 21:43:46 2019
@@ -1,2 +1,2 @@
 RewriteEngine On
-RewriteRule ^/svn.html /source.html [R=301]
\ No newline at end of file
+RewriteRule ^svn.html source.html [R=301]

Modified: tomcat/site/trunk/xdocs/.htaccess
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/.htaccess?rev=1858226=1858225=1858226=diff
==
--- tomcat/site/trunk/xdocs/.htaccess (original)
+++ tomcat/site/trunk/xdocs/.htaccess Fri Apr 26 21:43:46 2019
@@ -1,2 +1,2 @@
 RewriteEngine On
-RewriteRule ^/svn.html /source.html [R=301]
\ No newline at end of file
+RewriteRule ^svn.html source.html [R=301]



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

[tomcat] branch master updated: Import update Czech translations from POEDitor

[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 e0c112c  Import update Czech translations from POEDitor
e0c112c is described below

commit e0c112c514b07e5c323ca3a184fe26029e3cde4e
Author: Mark Thomas 
AuthorDate: Fri Apr 26 21:56:07 2019 +0100

Import update Czech translations from POEDitor
---
 java/org/apache/catalina/core/LocalStrings_cs.properties | 1 +
 java/org/apache/catalina/ha/session/LocalStrings_cs.properties   | 1 +
 java/org/apache/catalina/manager/LocalStrings_cs.properties  | 1 +
 java/org/apache/catalina/realm/LocalStrings_cs.properties| 3 +++
 java/org/apache/catalina/util/LocalStrings_cs.properties | 2 ++
 java/org/apache/catalina/valves/LocalStrings_cs.properties   | 1 +
 java/org/apache/coyote/http11/upgrade/LocalStrings_cs.properties | 2 ++
 java/org/apache/jasper/resources/LocalStrings_cs.properties  | 2 ++
 java/org/apache/tomcat/util/net/LocalStrings_cs.properties   | 1 +
 java/org/apache/tomcat/websocket/pojo/LocalStrings_cs.properties | 1 +
 webapps/docs/changelog.xml   | 4 
 webapps/examples/WEB-INF/classes/LocalStrings_cs.properties  | 2 ++
 12 files changed, 21 insertions(+)

diff --git a/java/org/apache/catalina/core/LocalStrings_cs.properties 
b/java/org/apache/catalina/core/LocalStrings_cs.properties
index 207926f..a0277a4 100644
--- a/java/org/apache/catalina/core/LocalStrings_cs.properties
+++ b/java/org/apache/catalina/core/LocalStrings_cs.properties
@@ -16,6 +16,7 @@
 applicationContext.addJspFile.iae=JSP soubor [{0}] není validní
 applicationContext.addListener.iae.cnfe=Nelze vytvořit instanci typu [{0}]
 applicationContext.addListener.iae.wrongType=Specifikovaný typ [{0}] není mezi 
očekávanými typy listenerem
+applicationContext.addRole.ise=Role nelze přidat do contextu [{0}], neboť byl 
již inicializován
 applicationContext.setAttribute.namenull=Jméno nemůže mít hodnotu null
 applicationContext.setSessionTracking.ise=Sledovací mód session pro kontext 
[{0}] nelze nastavit, neboť kontext právě běží
 
diff --git a/java/org/apache/catalina/ha/session/LocalStrings_cs.properties 
b/java/org/apache/catalina/ha/session/LocalStrings_cs.properties
index ae77d59..3e7cbc3 100644
--- a/java/org/apache/catalina/ha/session/LocalStrings_cs.properties
+++ b/java/org/apache/catalina/ha/session/LocalStrings_cs.properties
@@ -17,6 +17,7 @@ deltaManager.createSession.newSession=Nová DeltaSession 
vytořena s ID [{0}] Ce
 deltaManager.foundMasterMember=V kontextu [{0}] byl nalezen hlavní člen 
replikace [{1}]
 deltaManager.noContextManager=Manager [{0}]: Odpověď na zprávu ''Dej všechna 
session data'' poslanou na [{1}] byla přijata zpráva ''Žádný odpovídající 
kontext manager'' po [{2}] ms
 deltaManager.receiveMessage.delta.unknown=Manager [{0}]: obdrženy delta změny 
pro neznámou session [{1}]
+deltaManager.registerCluster=Registrace manageru [{0}] do cluster elementu 
[{1}] se jménem [{2}]
 deltaManager.unloading.ioe=IOException při ukládání relace: [{0}]
 
 deltaRequest.removeUnable=Nelze odstranit element:
diff --git a/java/org/apache/catalina/manager/LocalStrings_cs.properties 
b/java/org/apache/catalina/manager/LocalStrings_cs.properties
index cbbefe6..62f28bb 100644
--- a/java/org/apache/catalina/manager/LocalStrings_cs.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_cs.properties
@@ -22,6 +22,7 @@ htmlManagerServlet.deployButton=Nasazení
 htmlManagerServlet.deployUploadNoFile=FAIL - nahrání souboru selhalo, žádný 
soubor
 htmlManagerServlet.diagnosticsSslConnectorCertsText=Výpis nakonfigurovaných 
TLS virtuáníchl hostů (včetně jejich certifikátů).
 htmlManagerServlet.expire.explain=s nečinností 
+htmlManagerServlet.jvmFreeMemory=Volná paměť:
 htmlManagerServlet.noManager=-
 htmlManagerServlet.serverIPAddress=IP Adresa
 htmlManagerServlet.serverJVMVersion=Verze JVM
diff --git a/java/org/apache/catalina/realm/LocalStrings_cs.properties 
b/java/org/apache/catalina/realm/LocalStrings_cs.properties
index 81c6a65..6b22972 100644
--- a/java/org/apache/catalina/realm/LocalStrings_cs.properties
+++ b/java/org/apache/catalina/realm/LocalStrings_cs.properties
@@ -19,11 +19,14 @@ combinedRealm.authSuccess=Autentizovaný uživatel [{0}] s 
REALMem [{1}]
 dataSourceRealm.getPassword.exception=Výjima získán hesla pro [{0}]
 dataSourceRealm.getRoles.exception=Chyba načtení rolí pro [{0}]
 
+jaasRealm.loginException=Výjimka přihlášení autentizace uživatele  [{0}]
+
 lockOutRealm.authLockedUser=Byl učiněn pokus autentizovat zamknutého uživatele 
[{0}]
 
 memoryRealm.loadExist=Soubor database v paměti [{0}] nelze přečíst
 
 realmBase.authenticateFailure=Uživatel [{0}] nebyl úspěšně autentizován
 realmBase.createUsernameRetriever.ClassCastException=Třída [{0}] není 
X509UsernameRetriever.

[tomcat] branch master updated (c3e33a0 -> a01cff1)

[markt]

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

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


from c3e33a0  Remove unused translations
 new 16ea770  Import updated Japanese translations from POEditor
 new a01cff1  Import updated French translations

The 20788 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/loader/LocalStrings_ja.properties | 2 +-
 java/org/apache/catalina/servlets/LocalStrings_fr.properties   | 2 ++
 java/org/apache/catalina/util/LocalStrings_ja.properties   | 2 --
 java/org/apache/coyote/http2/LocalStrings_fr.properties| 2 ++
 java/org/apache/tomcat/util/modeler/LocalStrings_fr.properties | 1 +
 java/org/apache/tomcat/util/net/LocalStrings_fr.properties | 2 ++
 webapps/docs/changelog.xml | 4 
 7 files changed, 12 insertions(+), 3 deletions(-)


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

[tomcat] branch master updated: Remove unused translations

[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 c3e33a0  Remove unused translations
c3e33a0 is described below

commit c3e33a090791bf3abdeead4075d403f6ab337e97
Author: Mark Thomas 
AuthorDate: Fri Apr 26 20:56:27 2019 +0100

Remove unused translations
---
 java/org/apache/catalina/util/LocalStrings_ko.properties | 2 --
 1 file changed, 2 deletions(-)

diff --git a/java/org/apache/catalina/util/LocalStrings_ko.properties 
b/java/org/apache/catalina/util/LocalStrings_ko.properties
index 1e47647..04369f3 100644
--- a/java/org/apache/catalina/util/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/util/LocalStrings_ko.properties
@@ -37,8 +37,6 @@ lifecycleBase.startFail=구성요소 [{0}]을(를) 시작하지 못했습니다.
 lifecycleBase.stopFail=구성요소 [{0}]을(를) 중지시키지 못했습니다.
 
 lifecycleMBeanBase.registerFail=구성요소 초기화 중, [{1}](이)라는 이름을 가진 객체 [{0}]을(를) 
등록하지 못했습니다.
-lifecycleMBeanBase.unregisterFail=구성요소가 소멸되는 동안, [{0}](이)라는 이름의 MBean의 등록을 
제거하지 못했습니다.
-lifecycleMBeanBase.unregisterNoServer=MBean [{0}]의 등록을 제거하기 위한 MBean 서버가 없습니다.
 
 netmask.cidrNegative=CIDR [{0}]이(가) 음수입니다.
 netmask.cidrNotNumeric=CIDR [{0}]이(가) 숫자가 아닙니다.


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

[tomcat] branch master updated: Import updated French translations from POEditor

[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 88e0379  Import updated French translations from POEditor
88e0379 is described below

commit 88e03792f840bdbc2bbf07d38074823e17bff412
Author: Mark Thomas 
AuthorDate: Fri Apr 26 20:55:18 2019 +0100

Import updated French translations from POEditor
---
 java/org/apache/catalina/startup/LocalStrings_fr.properties| 2 ++
 java/org/apache/catalina/util/LocalStrings_fr.properties   | 2 --
 java/org/apache/jasper/resources/LocalStrings_fr.properties| 2 ++
 java/org/apache/tomcat/util/net/openssl/LocalStrings_fr.properties | 1 +
 webapps/docs/changelog.xml | 4 
 5 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/catalina/startup/LocalStrings_fr.properties 
b/java/org/apache/catalina/startup/LocalStrings_fr.properties
index e6de388..be6ae00 100644
--- a/java/org/apache/catalina/startup/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/startup/LocalStrings_fr.properties
@@ -147,6 +147,8 @@ hostConfig.stop="HostConfig": Traitement du "STOP"
 hostConfig.undeploy=Retrait de l''application web ayant pour chemin de 
contexte [{0}]
 hostConfig.undeployVersion=Retrait de l''ancienne version du contexte [{0}] 
car elle n''a pas de session active
 
+listener.createFailed=L''écouteur optionnel [{0}] n''est pas activé
+
 passwdUserDatabase.readFail=Echec d'obtention de la liste complète des 
utilisateurs depuis /etc/passwd
 
 tomcat.addWebapp.conflictChild=Impossible de déployer le WAR à [{0}] sur le 
chemin de contexte [{1}] à cause du contexte existant [{2}]
diff --git a/java/org/apache/catalina/util/LocalStrings_fr.properties 
b/java/org/apache/catalina/util/LocalStrings_fr.properties
index 2bd8f58..e29925b 100644
--- a/java/org/apache/catalina/util/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/util/LocalStrings_fr.properties
@@ -37,8 +37,6 @@ lifecycleBase.startFail=Echec de démarrage du composant [{0}]
 lifecycleBase.stopFail=Echec de l''arrêt du composant [{0}]
 
 lifecycleMBeanBase.registerFail=Echec de l''enregistrement de l''objet [{0}] 
avec le nom [{1}] pendant l''initialisation du composant
-lifecycleMBeanBase.unregisterFail=Impossible de désenregistrer le mbean avec 
le nom [{0}] pendant la destruction du composant
-lifecycleMBeanBase.unregisterNoServer=Aucun serveur de mbean n''est disponible 
pour désenregistrer le mbean [{0}]
 
 netmask.cidrNegative=Le CIDR [{0}] est négatif
 netmask.cidrNotNumeric=Le CIDR [{0}] n''est pas un nombre
diff --git a/java/org/apache/jasper/resources/LocalStrings_fr.properties 
b/java/org/apache/jasper/resources/LocalStrings_fr.properties
index f31b5c8..f2f142d 100644
--- a/java/org/apache/jasper/resources/LocalStrings_fr.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_fr.properties
@@ -302,6 +302,8 @@ jsp.warning.tagPreDestroy=Erreur lors du traitement de 
preDestroy pour l''instan
 jsp.warning.tagRelease=Erreur lors du traitement de release pour l''instance 
de tag [{0}]
 jsp.warning.unknown.sourceVM=La VM source [{0}] inconnue a été ignorée
 jsp.warning.unknown.targetVM=La VM cible [{0}] inconnue a été ignorée
+jsp.warning.unsupported.sourceVM=La VM source [{0}] demandée n''est pas 
supportée, [{1}] sera utilisé
+jsp.warning.unsupported.targetVM=La VM cible [{0}] demandée n''est pas 
supportée, [{1}] sera utilisé
 jsp.warning.xpoweredBy=WARNING: Valeur invalide pour le paramètre 
d'initialisation xpoweredBy, la valeur par défaut "false" sera utilisée
 
 jspc.delete.fail=Impossible d''effacer le fichier [{0}]
diff --git a/java/org/apache/tomcat/util/net/openssl/LocalStrings_fr.properties 
b/java/org/apache/tomcat/util/net/openssl/LocalStrings_fr.properties
index d7baef8..b9238be 100644
--- a/java/org/apache/tomcat/util/net/openssl/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/util/net/openssl/LocalStrings_fr.properties
@@ -50,6 +50,7 @@ openssl.errMakeConf=Impossible de créer le contexte de 
OpenSSLConf
 openssl.errorSSLCtxInit=Erreur d'initialisation du contexte SSL
 openssl.keyManagerMissing=Aucun gestionnaire de clés trouvé
 openssl.makeConf=Création du contexte de OpenSSLConf
+openssl.nonJsseCertficate=Le certificat [{0}] ou sa clé privée [{1}] n''a pas 
pu être traité en utilisant un gestionnaire de clé de JSSE, et sera directement 
passée à OpenSSL
 openssl.trustManagerMissing=Gestionnaire de confiance non trouvé
 
 opensslconf.applyCommand=Application de la commande OpenSSLConf (nom [{0}] 
valeur [{1}])
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index d84eee8..26824d5 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -136,6 +136,10 @@
 63370: Message files (LocalStrings_*.properties) of the
 examples webapp not 

[tomcat] branch master updated: Add 9.0.19 release date

[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 ce3b69e  Add 9.0.19 release date
ce3b69e is described below

commit ce3b69e1a1771dcb7aa2f387b56a00d75638bed6
Author: Mark Thomas 
AuthorDate: Fri Apr 26 20:49:14 2019 +0100

Add 9.0.19 release date
---
 webapps/docs/changelog.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 1fbe000..d84eee8 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -139,7 +139,7 @@
 
   
 
-
+
   
 
   


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

[tomcat] branch master updated: Add javadoc to describe this method.

[schultz]

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

schultz 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 62e0fca  Add javadoc to describe this method.
 new c84623e  Merge pull request #160 from ChristopherSchultz/master
62e0fca is described below

commit 62e0fcafa800f0ac1dee514a65f4adb596d45d7d
Author: Christopher Schultz 
AuthorDate: Wed Apr 24 12:45:04 2019 -0400

Add javadoc to describe this method.
---
 java/org/apache/tomcat/util/IntrospectionUtils.java | 17 +
 1 file changed, 17 insertions(+)

diff --git a/java/org/apache/tomcat/util/IntrospectionUtils.java 
b/java/org/apache/tomcat/util/IntrospectionUtils.java
index bb954fb..3ffa702 100644
--- a/java/org/apache/tomcat/util/IntrospectionUtils.java
+++ b/java/org/apache/tomcat/util/IntrospectionUtils.java
@@ -434,6 +434,23 @@ public final class IntrospectionUtils {
 }
 
 
+/**
+ * Checks to see if the specified class is an instance of or assignable 
from
+ * the specified type. The class clazz, all its superclasses,
+ * interfaces and those superinterfaces are tested for a match against
+ * the type name type.
+ *
+ * This is similar to instanceof or {@link 
Class#isAssignableFrom}
+ * except that the target type will not be resolved into a Class
+ * object, which provides some security and memory benefits.
+ *
+ * @param clazz The class to test for a match.
+ * @param type The name of the type that clazz must be.
+ *
+ * @return true if the clazz tested is an
+ * instance of the specified type,
+ * false otherwise.
+ */
 public static boolean isInstance(Class clazz, String type) {
 if (type.equals(clazz.getName())) {
 return true;


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

[GitHub] [tomcat] ChristopherSchultz merged pull request #160: Add javadoc to describe IntrospectionUtils.isInstance

[GitBox]

ChristopherSchultz merged pull request #160: Add javadoc to describe 
IntrospectionUtils.isInstance
URL: https://github.com/apache/tomcat/pull/160
 
 
   


This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

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

Re: Finally getting around to switching to Git

[Tim Funk]

Or maybe confluence cwiki?

-Tim

On Fri, Apr 26, 2019 at 8:26 AM Coty Sutherland  wrote:

> On Fri, Apr 26, 2019 at 3:13 AM Mark Thomas  wrote:
> ...
> > I'd suggest sharing Git experiences is a topic of conversation at the
> > Hackathon.
> >
>
> +1, except I won't be there :( Is that something we can have someone take
> notes on and send to the dev list after?
>
>

Re: Finally getting around to switching to Git

[Coty Sutherland]

On Fri, Apr 26, 2019 at 3:13 AM Mark Thomas  wrote:

> On 25/04/2019 20:07, Christopher Schultz wrote:
> > On 4/25/19 14:03, Igal Sapir wrote:
>
> 
>
> >> In some projects it's easy to maintain a single repository and
> >> switch between branches, but I find the differences between 7.0.x
> >> and master to be so major that I chose to follow Mark's method and
> >> keep separate local copies where the IDE settings do not get
> >> mangled up each time I switch branches.
> >
> > Sounds good. What is Mark's Method™? Is it documented anywhere?
>
> Overly complicated ;) - and not yet.
>
> I'm currently using one checkout per major version because Eclipse can't
> handle Git worktrees. I think I'd prefer a single checkout with
> worktrees but until I can try it I don't know. I did try switching to
> IntelliJ as it can handle Git worktrees but the pain of switching IDEs
> was greater than the minor annoyance of multiple checkouts so I quickyl
> returned to Eclipse.
>
> I do have a GitHub fork that I intend to use for large patches that need
> review. I don't use it much.
>
> I'm still getting used to my local setup and tweaking the configuration
> here and there so it does what I want by default when I pull / push etc.
>
> I'd suggest sharing Git experiences is a topic of conversation at the
> Hackathon.
>

+1, except I won't be there :( Is that something we can have someone take
notes on and send to the dev list after?


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

Re: Becoming graalvm friendly?

[Romain Manni-Bucau]

Depending the reflection usage you can generate a feature registering all
the classes for reflections, is it predicble and "generable" at build time?
Can lead to a "a bit too big" metadata space but nothing crazy.

here what i used in manual mode for a sample (if it helps):
https://github.com/rmannibucau/docosh/blob/broken-graal-threadlocal/src/main/java/com/github/rmannibucau/docker/compose/cli/svm/Feature_Reflections.java#L35

Romain Manni-Bucau
@rmannibucau  |  Blog
 | Old Blog
 | Github  |
LinkedIn  | Book



Le ven. 26 avr. 2019 à 11:42, Rémy Maucherat  a écrit :

> On Thu, Apr 25, 2019 at 3:07 PM Rémy Maucherat  wrote:
>
> > On Wed, Apr 24, 2019 at 6:29 PM Romain Manni-Bucau <
> rmannibu...@gmail.com>
> > wrote:
> >
> >> Awesome news Rémy, thanks for sharing!
> >>
> >
> > Next roadblock is https://github.com/oracle/graal/issues/684
> > It's probably not 100% mandatory but I'd rather have a minimum of
> > flexibility (I'm not a big believer of Java only embedding since
> > configuration can get complex fast and it's harder to maintain long
> term).
> >
> > Feel free to help if you'd like.
> >
>
> Ok, so after configuring reflection to some extent in order to examine the
> behavior, I am now rather confident things might work out eventually.
> I thought the best strategy was to add tracing to Tomcat and have the user
> do a regular run with its config to generate the reflection json. In the
> end, I found that there's a tool to do that already in graal, in the form
> of a jvm agent. I then ran into
> https://github.com/oracle/graal/issues/1194
> (exact same crash trace), not sure about any workaround so I'll wait for
> the issue to be resolved in a future RC.
>
> Rémy
>

Re: Becoming graalvm friendly?

[Rémy Maucherat]

On Thu, Apr 25, 2019 at 3:07 PM Rémy Maucherat  wrote:

> On Wed, Apr 24, 2019 at 6:29 PM Romain Manni-Bucau 
> wrote:
>
>> Awesome news Rémy, thanks for sharing!
>>
>
> Next roadblock is https://github.com/oracle/graal/issues/684
> It's probably not 100% mandatory but I'd rather have a minimum of
> flexibility (I'm not a big believer of Java only embedding since
> configuration can get complex fast and it's harder to maintain long term).
>
> Feel free to help if you'd like.
>

Ok, so after configuring reflection to some extent in order to examine the
behavior, I am now rather confident things might work out eventually.
I thought the best strategy was to add tracing to Tomcat and have the user
do a regular run with its config to generate the reflection json. In the
end, I found that there's a tool to do that already in graal, in the form
of a jvm agent. I then ran into https://github.com/oracle/graal/issues/1194
(exact same crash trace), not sure about any workaround so I'll wait for
the issue to be resolved in a future RC.

Rémy

Re: JDK 13 - Early Access build 17 is available

[Rory O'Donnell]

Thanks Mark,

I forgot to highlight the fix in b15 -

 * build 15  - Unable to read certain PKCS12 keystores from
   SequenceInputStream (JDK-8157404)
   

Rgds,Rory

On 25/04/2019 17:44, Mark Thomas wrote:

On 19/04/2019 13:40, Rory O'Donnell wrote:

*Hi Mark, *

*OpenJDK builds *- JDK 13 - Early Access build 17 is available at
http://jdk.java.net/13/

FYI,

Built and run Tomcat 9.0.x/master unit tests without any failures.

Built Tomcat 9.0.x/master and passed a (very) basic smoke test.

No issues found.

Mark


--
Rgds, Rory O'Donnell
Quality Engineering Manager
Oracle EMEA, Dublin, Ireland

[tomcat] branch 8.5.x updated (ecc0c5f -> 4ab58e9)

[markt]

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

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


from ecc0c5f  Don't warn that SSLv2Hello is unavailable unless explicitly 
configured
 new 47d55da  Better Javadoc for getContent()
 new a89d5f2  Minor clean-up to reduce diff to 9.0.x
 new 4ab58e9  Fix logic that assumed caching was always enabled

The 19159 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/WebResource.java  |  3 +-
 .../apache/catalina/servlets/DefaultServlet.java   | 34 +-
 webapps/docs/changelog.xml |  5 
 3 files changed, 27 insertions(+), 15 deletions(-)


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

[tomcat] branch master updated (687c0ff -> a8f1e96)

[markt]

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

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


from 687c0ff  Merge pull request #159 from 
woonsan/bugfix/messages_of_examples_war
 new c50bfe1  Better Javadoc for getContent()
 new a8f1e96  Fix logic that assumed caching was always enabled

The 20781 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/WebResource.java |  3 ++-
 java/org/apache/catalina/servlets/DefaultServlet.java | 16 
 webapps/docs/changelog.xml|  5 +
 3 files changed, 19 insertions(+), 5 deletions(-)


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

Re: Finally getting around to switching to Git

[Mark Thomas]

On 25/04/2019 20:07, Christopher Schultz wrote:
> On 4/25/19 14:03, Igal Sapir wrote:



>> In some projects it's easy to maintain a single repository and
>> switch between branches, but I find the differences between 7.0.x
>> and master to be so major that I chose to follow Mark's method and
>> keep separate local copies where the IDE settings do not get
>> mangled up each time I switch branches.
> 
> Sounds good. What is Mark's Method™? Is it documented anywhere?

Overly complicated ;) - and not yet.

I'm currently using one checkout per major version because Eclipse can't
handle Git worktrees. I think I'd prefer a single checkout with
worktrees but until I can try it I don't know. I did try switching to
IntelliJ as it can handle Git worktrees but the pain of switching IDEs
was greater than the minor annoyance of multiple checkouts so I quickyl
returned to Eclipse.

I do have a GitHub fork that I intend to use for large patches that need
review. I don't use it much.

I'm still getting used to my local setup and tweaking the configuration
here and there so it does what I want by default when I pull / push etc.

I'd suggest sharing Git experiences is a topic of conversation at the
Hackathon.

Mark

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