date:20180801

svn commit: r1837214 - in /tomcat/trunk/java/org/apache/catalina/tribes/membership: LocalStrings.properties StaticMembershipProvider.java

2018-08-01 Thread kfujino

Author: kfujino
Date: Wed Aug  1 07:16:05 2018
New Revision: 1837214

URL: http://svn.apache.org/viewvc?rev=1837214&view=rev
Log:
-Implement MemberMessage.toString.
-Add log messagess.

Modified:

tomcat/trunk/java/org/apache/catalina/tribes/membership/LocalStrings.properties

tomcat/trunk/java/org/apache/catalina/tribes/membership/StaticMembershipProvider.java

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/membership/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/LocalStrings.properties?rev=1837214&r1=1837213&r2=1837214&view=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/tribes/membership/LocalStrings.properties 
(original)
+++ 
tomcat/trunk/java/org/apache/catalina/tribes/membership/LocalStrings.properties 
Wed Aug  1 07:16:05 2018
@@ -55,4 +55,5 @@ staticMembershipProvider.pingThread.fail
 staticMembershipProvider.replyRequest.ignored=Message[{0}] is ignored.
 staticMembershipProvider.leftOver.ignored=Message[{0}] is ignored.
 staticMembershipProvider.stopMembership.sendFailed=Unable to send stop 
membership message.
-staticMembershipProvider.heartbeat.failed=Unable to send 
StaticMembershipProvider.ping message.
\ No newline at end of file
+staticMembershipProvider.heartbeat.failed=Unable to send 
StaticMembershipProvider.ping message.
+staticMembershipProvider.startMembership.noReplies=Received 0 replies, 
probably a timeout.
\ No newline at end of file

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/membership/StaticMembershipProvider.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/StaticMembershipProvider.java?rev=1837214&r1=1837213&r2=1837214&view=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/tribes/membership/StaticMembershipProvider.java
 (original)
+++ 
tomcat/trunk/java/org/apache/catalina/tribes/membership/StaticMembershipProvider.java
 Wed Aug  1 07:16:05 2018
@@ -143,7 +143,7 @@ public class StaticMembershipProvider ex
 messageReceived(resp[i].getMessage(), resp[i].getSource());
 }
 } else {
-log.warn("no response");
+
log.warn(sm.getString("staticMembershipProvider.startMembership.noReplies"));
 }
 }
 
@@ -340,7 +340,15 @@ public class StaticMembershipProvider ex
 
 @Override
 public String toString() {
-return super.toString();
+StringBuilder buf = new StringBuilder("MemberMessage[");
+buf.append("name=");
+buf.append(new String(membershipId));
+buf.append("; type=");
+buf.append(getTypeDesc());
+buf.append("; member=");
+buf.append(member);
+buf.append("]");
+return buf.toString();
 }
 
 protected String getTypeDesc() {



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

svn commit: r1837218 - /tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties

2018-08-01 Thread ebourg

Author: ebourg
Date: Wed Aug  1 09:26:04 2018
New Revision: 1837218

URL: http://svn.apache.org/viewvc?rev=1837218&view=rev
Log:
Fixed an error in the French translation of the jasper messages: 'library' 
stands for 'bibliothèque' and not 'librairie'

Modified:
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties

Modified: 
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties?rev=1837218&r1=1837217&r2=1837218&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties 
(original)
+++ tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties 
Wed Aug  1 09:26:04 2018
@@ -76,12 +76,12 @@ jsp.warning.unknown.element.in.tagfile=A
 jsp.warning.unknown.element.in.attribute=Attention: El\u00e9ment inconnu [{0}] 
dans l''attribute
 jsp.error.teiclass.instantiation=Impossible de charger ou d''instancier la 
classe TagExtraInfo: [{0}]
 jsp.error.non_null_tei_and_var_subelems=Le tag [{0}] poss\u00e8de une ou 
plusieurs variables subelements et une classe TagExtraInfo qui retourne une ou 
plusieurs VariableInfo
-jsp.error.parse.error.in.TLD=Erreur d''\u00e9valuation (parse) dans le 
descripteur de librairie de tag (TLD): [{0}]
+jsp.error.parse.error.in.TLD=Erreur d''\u00e9valuation (parse) dans le 
descripteur de la bibliothèque de tag (TLD): [{0}]
 jsp.error.file.not.found=Le fichier [{0}] n''a pas \u00e9t\u00e9 trouv\u00e9
 jsp.error.missing_attribute=D''apr\u00e8s le TLD l''attribut [{0}] est 
obligatoire pour le tag [{1}]
 jsp.error.bad_attribute=L''attribut [{0}] est incorrect pour le tag [{1}] 
d''apr\u00e8s la TLD indiqu\u00e9e
 jsp.error.unable.to_find_method=Impossible de trouver une m\u00e9thode de mise 
\u00e0 jour pour l''attribut: [{0}]
-jsp.error.bad_tag=Aucun tag [{0}] dans la librairie de tag import\u00e9e avec 
le pr\u00e9fixe [{1}]
+jsp.error.bad_tag=Aucun tag [{0}] dans la bibliothèque de tag import\u00e9e 
avec le pr\u00e9fixe [{1}]
 jsp.error.jspc.uriroot_not_dir=L''option -uriroot doit indiqu\u00e9 un 
r\u00e9pertoire d\u00e9j\u00e0 existant
 jspc.implicit.uriRoot=uriRoot r\u00e9gl\u00e9 implicitement \u00e0 [{0}]
 jspc.usage=Usage: jspc  [--] \n\
@@ -162,7 +162,7 @@ End of content automatically created by
 -->\n
 jspc.error.generalException=ERREUR-le fichier [{0}] a g\u00e9n\u00e9r\u00e9 
l''exception g\u00e9n\u00e9rale suivante:
 jspc.error.fileDoesNotExist=L''argument fichier [{0}] n''existe pas
-jsp.error.library.invalid=La page JSP page est incorrecte d''apr\u00e8s la 
librairie [{0}]: [{1}]
+jsp.error.library.invalid=La page JSP page est incorrecte d''apr\u00e8s la 
bibliothèque [{0}]: [{1}]
 jsp.error.tlvclass.instantiation=Impossible de charger ou d''instancier la 
classe TagLibraryValidator: [{0}]
 jsp.error.tlv.invalid.page=Message d''erreurs de validation provenant du 
TagLibraryValidator pour [{0}] en [{1}]
 jsp.error.tei.invalid.attributes=Message d''erreurs de validation provenant du 
TagExtraInfo pour [{0}]
@@ -187,8 +187,8 @@ jsp.error.corresponding.servlet=Erreur d
 jsp.error.jspbody.required=Doit utiliser jsp:body pour indiqu\u00e9 le corps 
de tag body de [{0}] si jsp:attribute est utilis\u00e9.
 jsp.error.jspbody.emptybody.only=Le tag [{0}] ne peut avoir que jsp:attribute 
dans son corps.
 jsp.error.no.scriptlets=Les \u00e9l\u00e9ments de Scripting ( <%!,

svn commit: r1837219 - /tomcat/trunk/java/org/apache/naming/LocalStrings.properties

2018-08-01 Thread ebourg

Author: ebourg
Date: Wed Aug  1 09:40:15 2018
New Revision: 1837219

URL: http://svn.apache.org/viewvc?rev=1837219&view=rev
Log:
Fixed an improperly doubled quote in the English messages

Modified:
tomcat/trunk/java/org/apache/naming/LocalStrings.properties

Modified: tomcat/trunk/java/org/apache/naming/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/LocalStrings.properties?rev=1837219&r1=1837218&r2=1837219&view=diff
==
--- tomcat/trunk/java/org/apache/naming/LocalStrings.properties (original)
+++ tomcat/trunk/java/org/apache/naming/LocalStrings.properties Wed Aug  1 
09:40:15 2018
@@ -25,4 +25,4 @@ namingContext.nameNotBound=Name [{0}] is
 namingContext.readOnly=Context is read only
 namingContext.invalidName=Name is not valid
 namingContext.alreadyBound=Name [{0}] is already bound in this Context
-namingContext.noAbsoluteName=Can''t generate an absolute name for this 
namespace
+namingContext.noAbsoluteName=Can't generate an absolute name for this namespace



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

Re: JDK 11 Early Access build 22 & JDK 12 Early Access b02 are available.

2018-08-01 Thread Mark Thomas

Rory,

I can confirm that there is a JDK bug here.

The short version is that server initiated renegotiation of a TLSv1.2
connection fails if the Java client is configured to allow TLSv1.3

Details available under internal review ID : 9056398

As always, I'm happy to provide further details if required.

Cheers,

Mark


On 31/07/18 15:19, Rory O'Donnell wrote:
> Hi Mark,
> 
> Does the latest JDK 11 EA build 24 also fail ? If yes, could you log a
> bug as we are now
> 
> in Rampdown Phase 2.
> 
> Thanks,Rory
> 
> 
> On 31/07/2018 15:10, Mark Thomas wrote:
>> On 17/07/18 12:26, Rory O'Donnell wrote:
>>
>> 
>>
>>> *JDK 12 Early Access  Build 02 is available at
>>> **http://jdk.java.net/12/*
>> I've just run the Tomcat 9 test suite with the JDK 12 EA4 build and I
>> see a few TLS related failures:
>>
>>     [concat] Testsuites with failed tests:
>>     [concat] TEST-org.apache.tomcat.util.net.TestClientCert.NIO.txt
>>     [concat] TEST-org.apache.tomcat.util.net.TestClientCert.NIO2.txt
>>     [concat] TEST-org.apache.tomcat.util.net.TestCustomSsl.NIO.txt
>>     [concat] TEST-org.apache.tomcat.util.net.TestCustomSsl.NIO2.txt
>>
>> I haven't dug into why the tests are failing yet.
>>
>> I also saw some failures in the OpenSSL tests but those are expected due
>> to the OpenSSL version I have installed locally.
>>
>> Mark
>>
>> -
>> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
>> For additional commands, e-mail: dev-h...@tomcat.apache.org
>>
> 


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

Re: JDK 11 Early Access build 22 & JDK 12 Early Access b02 are available.

2018-08-01 Thread Rory O'Donnell


Thanks Mark, I'll follow up and advise when it's moved into JBS

Rgds,Rory


On 01/08/2018 10:41, Mark Thomas wrote:

Rory,

I can confirm that there is a JDK bug here.

The short version is that server initiated renegotiation of a TLSv1.2
connection fails if the Java client is configured to allow TLSv1.3

Details available under internal review ID : 9056398

As always, I'm happy to provide further details if required.

Cheers,

Mark


On 31/07/18 15:19, Rory O'Donnell wrote:

Hi Mark,

Does the latest JDK 11 EA build 24 also fail ? If yes, could you log a
bug as we are now

in Rampdown Phase 2.

Thanks,Rory


On 31/07/2018 15:10, Mark Thomas wrote:

On 17/07/18 12:26, Rory O'Donnell wrote:




*JDK 12 Early Access  Build 02 is available at
**http://jdk.java.net/12/*

I've just run the Tomcat 9 test suite with the JDK 12 EA4 build and I
see a few TLS related failures:

 [concat] Testsuites with failed tests:
 [concat] TEST-org.apache.tomcat.util.net.TestClientCert.NIO.txt
 [concat] TEST-org.apache.tomcat.util.net.TestClientCert.NIO2.txt
 [concat] TEST-org.apache.tomcat.util.net.TestCustomSsl.NIO.txt
 [concat] TEST-org.apache.tomcat.util.net.TestCustomSsl.NIO2.txt

I haven't dug into why the tests are failing yet.

I also saw some failures in the OpenSSL tests but those are expected due
to the OpenSSL version I have installed locally.

Mark

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



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

svn commit: r1837221 - /tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties

2018-08-01 Thread ebourg

Author: ebourg
Date: Wed Aug  1 10:19:53 2018
New Revision: 1837221

URL: http://svn.apache.org/viewvc?rev=1837221&view=rev
Log:
Fixed a broken parameter in the Spanish messages

Modified:
tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties

Modified: tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties?rev=1837221&r1=1837220&r2=1837221&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties Wed 
Aug  1 10:19:53 2018
@@ -78,7 +78,7 @@ standardContext.backgroundProcess.loader
 standardContext.backgroundProcess.manager = Excepci\u00F3n al procesar gestor 
[{0}] de proceso en segundo plano
 standardContext.cluster.noManager = No se ha hallado el gestor. Revisando si 
hay que usar el gestor de cl\u00FAster. Cl\u00FAster configurado: [{0}], 
Aplicaci\u00F3n distribu\u00EDble: [{1}]
 standardContext.duplicateListener = El escuchador [{0}] ya est\u00E1 
configurado para este contexto. La definici\u00F3n duplicada ha sido ignorada.
-standardContext.errorPage.error = La localizaci\u00F3n de la p\u00E1gina de 
error 0} debe de comenzar con ''/''
+standardContext.errorPage.error = La localizaci\u00F3n de la p\u00E1gina de 
error [{0}} debe de comenzar con ''/''
 standardContext.errorPage.required = ErrorPage no puede ser nulo
 standardContext.errorPage.warning = AVISO: La localizaci\u00F3n de la 
p\u00E1gina de error [{0}] debe de comenzar con ''/'' en Servlet 2.4
 standardContext.filterMap.either = El mapeo de filtro debe de especificar o un 
 o un 



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

svn commit: r1837222 - in /tomcat/trunk: java/javax/servlet/http/ java/org/apache/catalina/authenticator/ java/org/apache/catalina/connector/ java/org/apache/catalina/core/ java/org/apache/catalina/ma

2018-08-01 Thread ebourg

Author: ebourg
Date: Wed Aug  1 10:24:31 2018
New Revision: 1837222

URL: http://svn.apache.org/viewvc?rev=1837222&view=rev
Log:
Fixed the improperly doubled quotes in the French messages (single quotes 
should only be doubled when the messages have parameters)

Modified:
tomcat/trunk/java/javax/servlet/http/LocalStrings_fr.properties

tomcat/trunk/java/org/apache/catalina/authenticator/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/catalina/connector/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/catalina/realm/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/catalina/security/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/catalina/session/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/catalina/util/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/catalina/valves/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/naming/LocalStrings_fr.properties
tomcat/trunk/webapps/examples/WEB-INF/classes/LocalStrings_fr.properties

Modified: tomcat/trunk/java/javax/servlet/http/LocalStrings_fr.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/http/LocalStrings_fr.properties?rev=1837222&r1=1837221&r2=1837222&view=diff
==
--- tomcat/trunk/java/javax/servlet/http/LocalStrings_fr.properties (original)
+++ tomcat/trunk/java/javax/servlet/http/LocalStrings_fr.properties Wed Aug  1 
10:24:31 2018
@@ -22,7 +22,7 @@ err.io.short_read=Lecture partielle
 
 http.method_not_implemented=Le m\u00e9thode [{0}] n''est pas d\u00e9finie dans 
la RFC 2068 et n''est pas support\u00e9e par l''API Servlet
 
-http.method_get_not_supported=La m\u00e9thode HTTP GET n''est pas 
support\u00e9e par cette URL
-http.method_post_not_supported=La m\u00e9thode HTTP POST n''est pas 
support\u00e9e par cette URL
-http.method_put_not_supported=La m\u00e9thode HTTP PUT n''est pas 
support\u00e9e par cette URL
-http.method_delete_not_supported=La m\u00e9thode HTTP DELETE n''est pas 
support\u00e9e par cette URL
+http.method_get_not_supported=La m\u00e9thode HTTP GET n'est pas 
support\u00e9e par cette URL
+http.method_post_not_supported=La m\u00e9thode HTTP POST n'est pas 
support\u00e9e par cette URL
+http.method_put_not_supported=La m\u00e9thode HTTP PUT n'est pas 
support\u00e9e par cette URL
+http.method_delete_not_supported=La m\u00e9thode HTTP DELETE n'est pas 
support\u00e9e par cette URL

Modified: 
tomcat/trunk/java/org/apache/catalina/authenticator/LocalStrings_fr.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/LocalStrings_fr.properties?rev=1837222&r1=1837221&r2=1837222&view=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/authenticator/LocalStrings_fr.properties 
(original)
+++ 
tomcat/trunk/java/org/apache/catalina/authenticator/LocalStrings_fr.properties 
Wed Aug  1 10:24:31 2018
@@ -15,7 +15,7 @@
 
 authenticator.certificates=Aucune cha\u00eene de certificat client (client 
certificate chain) dans cette requ\u00eate
 authenticator.formlogin=R\u00e9f\u00e9rence directe \u00e0 la form de 
connexion (form login page) invalide
-authenticator.manager=Exception lors de l''initialisation des gestionnaires 
d''authentification (trust managers)
+authenticator.manager=Exception lors de l'initialisation des gestionnaires 
d'authentification (trust managers)
 authenticator.notContext=Erreur de configuration:  Doit \u00eatre attach\u00e9 
\u00e0 un contexte
-authenticator.unauthorized=Impossible d''authentifier avec les cr\u00e9dits 
fournis (provided credentials)
+authenticator.unauthorized=Impossible d'authentifier avec les cr\u00e9dits 
fournis (provided credentials)
 

Modified: 
tomcat/trunk/java/org/apache/catalina/connector/LocalStrings_fr.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/LocalStrings_fr.properties?rev=1837222&r1=1837221&r2=1837222&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/LocalStrings_fr.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/LocalStrings_fr.properties 
Wed Aug  1 10:24:31 2018
@@ -19,8 +19,8 @@
 #
 
 coyoteConnector.protocolHandlerDestroyFailed=La destruction du gestionnaire de 
protocole a \u00e9chou\u00e9
-coyoteConnector.protocolHandlerInitializationFailed=L''initialisation du 
gestionnaire de protocole a \u00e9chou\u00e9
-coyoteConnector.protocolHandler

Re: svn commit: r1837219 - /tomcat/trunk/java/org/apache/naming/LocalStrings.properties

2018-08-01 Thread Mark Thomas


On 01/08/2018 10:40, ebo...@apache.org wrote:

Author: ebourg
Date: Wed Aug  1 09:40:15 2018
New Revision: 1837219

URL: http://svn.apache.org/viewvc?rev=1837219&view=rev
Log:
Fixed an improperly doubled quote in the English messages


For the benefit of the archives this change is correct but we do need to 
be careful.


Any string that includes substitutions (i.e. {0}, {1}, etc.) requires 
that any ' characters are escaped as '' due to how MessageFormat.format 
behaves.


Mark

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

svn commit: r1837223 - /tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties

2018-08-01 Thread ebourg

Author: ebourg
Date: Wed Aug  1 10:39:05 2018
New Revision: 1837223

URL: http://svn.apache.org/viewvc?rev=1837223&view=rev
Log:
Fixed the missing double quotes in the Japanese messages

Modified:
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties

Modified: 
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties?rev=1837223&r1=1837222&r2=1837223&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties 
(original)
+++ tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties 
Wed Aug  1 10:39:05 2018
@@ -41,13 +41,13 @@ jsp.error.page.invalid.info=page\u6307\u
 jsp.error.page.conflict.iserrorpage=page\u6307\u793a\u5b50: 
''isErrorPage''\u3092\u7570\u306a\u308b\u5024\u3067\u8907\u6570\u56de\u6307\u5b9a\u3059\u308b\u306e\u306f\u7121\u52b9\u3067\u3059
 (\u65e7: [{0}], \u65b0: [{1}])
 jsp.error.page.invalid.iserrorpage=page\u6307\u793a\u5b50: 
isErrorPage\u5c5e\u6027\u306e\u5024\u304c\u7121\u52b9\u3067\u3059
 jsp.error.page.conflict.errorpage=page\u6307\u793a\u5b50: 
''errorPage''\u3092\u7570\u306a\u308b\u5024\u3067\u8907\u6570\u56de\u6307\u5b9a\u3059\u308b\u306e\u306f\u7121\u52b9\u3067\u3059
 (\u65e7: [{0}], \u65b0: [{1}])
-jsp.error.page.conflict.language=page\u6307\u793a\u5b50: 
'language'\u3092\u7570\u306a\u308b\u5024\u3067\u8907\u6570\u56de\u6307\u5b9a\u3059\u308b\u306e\u306f\u7121\u52b9\u3067\u3059
 (\u65e7: [{0}], \u65b0: [{1}])
+jsp.error.page.conflict.language=page\u6307\u793a\u5b50: 
''language''\u3092\u7570\u306a\u308b\u5024\u3067\u8907\u6570\u56de\u6307\u5b9a\u3059\u308b\u306e\u306f\u7121\u52b9\u3067\u3059
 (\u65e7: [{0}], \u65b0: [{1}])
 jsp.error.tag.conflict.language=tag\u6307\u793a\u5b50: 
''language''\u3092\u7570\u306a\u308b\u5024\u3067\u8907\u6570\u56de\u6307\u5b9a\u3059\u308b\u306e\u306f\u7121\u52b9\u3067\u3059
 (\u65e7: [{0}], \u65b0: [{1}])
 jsp.error.page.language.nonjava=page\u6307\u793a\u5b50: 
\u7121\u52b9\u306alanguage\u5c5e\u6027\u3067\u3059
 jsp.error.tag.language.nonjava=tag\u6307\u793a\u5b50: 
\u7121\u52b9\u306alanguage\u5c5e\u6027\u3067\u3059
 jsp.error.page.conflict.extends=page\u6307\u793a\u5b50: 
''extends''\u3092\u7570\u306a\u308b\u5024\u3067\u8907\u6570\u56de\u6307\u5b9a\u3059\u308b\u306e\u306f\u7121\u52b9\u3067\u3059
 (\u65e7: [{0}], \u65b0: [{1}])
 jsp.error.page.conflict.iselignored=page\u6307\u793a\u5b50: 
''isELIgnored''\u3092\u7570\u306a\u308b\u5024\u3067\u8907\u6570\u56de\u6307\u5b9a\u3059\u308b\u306e\u306f\u7121\u52b9\u3067\u3059
 (\u65e7: [{0}], \u65b0: [{1}])
-jsp.error.tag.conflict.iselignored=tag\u6307\u793a\u5b50: 
'isELIgnored'\u3092\u7570\u306a\u308b\u5024\u3067\u8907\u6570\u56de\u6307\u5b9a\u3059\u308b\u306e\u306f\u7121\u52b9\u3067\u3059
 (\u65e7: [{0}], \u65b0: [{1}])
+jsp.error.tag.conflict.iselignored=tag\u6307\u793a\u5b50: 
''isELIgnored''\u3092\u7570\u306a\u308b\u5024\u3067\u8907\u6570\u56de\u6307\u5b9a\u3059\u308b\u306e\u306f\u7121\u52b9\u3067\u3059
 (\u65e7: [{0}], \u65b0: [{1}])
 jsp.error.page.invalid.iselignored=page\u6307\u793a\u5b50: 
isELIgnored\u306b\u7121\u52b9\u306a\u5024\u304c\u6307\u5b9a\u3055\u308c\u3066\u3044\u307e\u3059
 jsp.error.tag.invalid.iselignored=tag\u6307\u793a\u5b50: 
isELIgnored\u306b\u7121\u52b9\u306a\u5024\u304c\u6307\u5b9a\u3055\u308c\u3066\u3044\u307e\u3059
 
jsp.error.page.multi.pageencoding=page\u6307\u793a\u5b50\u306f\u8907\u6570\u306epageencoding\u3092\u6301\u3064\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093



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

svn commit: r1837224 - /tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties

2018-08-01 Thread markt

Author: markt
Date: Wed Aug  1 10:39:29 2018
New Revision: 1837224

URL: http://svn.apache.org/viewvc?rev=1837224&view=rev
Log:
Follow-up to r1837221
{ -> ]

Modified:
tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties

Modified: tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties?rev=1837224&r1=1837223&r2=1837224&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties Wed 
Aug  1 10:39:29 2018
@@ -78,7 +78,7 @@ standardContext.backgroundProcess.loader
 standardContext.backgroundProcess.manager = Excepci\u00F3n al procesar gestor 
[{0}] de proceso en segundo plano
 standardContext.cluster.noManager = No se ha hallado el gestor. Revisando si 
hay que usar el gestor de cl\u00FAster. Cl\u00FAster configurado: [{0}], 
Aplicaci\u00F3n distribu\u00EDble: [{1}]
 standardContext.duplicateListener = El escuchador [{0}] ya est\u00E1 
configurado para este contexto. La definici\u00F3n duplicada ha sido ignorada.
-standardContext.errorPage.error = La localizaci\u00F3n de la p\u00E1gina de 
error [{0}} debe de comenzar con ''/''
+standardContext.errorPage.error = La localizaci\u00F3n de la p\u00E1gina de 
error [{0}] debe de comenzar con ''/''
 standardContext.errorPage.required = ErrorPage no puede ser nulo
 standardContext.errorPage.warning = AVISO: La localizaci\u00F3n de la 
p\u00E1gina de error [{0}] debe de comenzar con ''/'' en Servlet 2.4
 standardContext.filterMap.either = El mapeo de filtro debe de especificar o un 
 o un 



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

Re: svn commit: r1837219 - /tomcat/trunk/java/org/apache/naming/LocalStrings.properties

2018-08-01 Thread Emmanuel Bourg

Le 01/08/2018 à 12:36, Mark Thomas a écrit :

> For the benefit of the archives this change is correct but we do need to
> be careful.
> 
> Any string that includes substitutions (i.e. {0}, {1}, etc.) requires
> that any ' characters are escaped as '' due to how MessageFormat.format
> behaves.

Yes that's what I'm reviewing currently. I've grepped extensively the
message files and found several inconsistencies, either messages with
parameter and single quotes, or messages without parameters and double
quotes. I wonder if code analysis tools like Findbugs can spot these
issues automatically.

Emmanuel Bourg

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

buildbot failure in on tomcat-trunk

2018-08-01 Thread buildbot

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

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

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' 
triggered this build
Build Source Stamp: [branch tomcat/trunk] 1837222
Blamelist: ebourg

BUILD FAILED: failed compile_1

Sincerely,
 -The Buildbot




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

Message files encoding

2018-08-01 Thread Emmanuel Bourg

Hi all,

The LocalString*.properties files are ASCII encoded which renders the
modification of the non-english messages rather inconvenient.
Contributors either need a specialized resource editor or go through a
native2ascii roundtrip.

How do feel about converting the message files to UTF-8 to facilitate
the modifications and transform them with native2ascii at build time?

Emmanuel Bourg

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

Re: Message files encoding

2018-08-01 Thread Mark Thomas

On 01/08/18 12:03, Emmanuel Bourg wrote:
> Hi all,
> 
> The LocalString*.properties files are ASCII encoded which renders the
> modification of the non-english messages rather inconvenient.
> Contributors either need a specialized resource editor or go through a
> native2ascii roundtrip.
> 
> How do feel about converting the message files to UTF-8 to facilitate
> the modifications and transform them with native2ascii at build time?

I like the idea but that will make building with later versions of Java
problematic - or at least more complex - since native2ascii has been
removed in Java 9 onwards.

Mark

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

Re: Message files encoding

2018-08-01 Thread Martin Grigorov

Hi,

On Wed, Aug 1, 2018 at 2:08 PM Mark Thomas  wrote:

> On 01/08/18 12:03, Emmanuel Bourg wrote:
> > Hi all,
> >
> > The LocalString*.properties files are ASCII encoded which renders the
> > modification of the non-english messages rather inconvenient.
> > Contributors either need a specialized resource editor or go through a
> > native2ascii roundtrip.
> >
> > How do feel about converting the message files to UTF-8 to facilitate
> > the modifications and transform them with native2ascii at build time?
>
> I like the idea but that will make building with later versions of Java
> problematic - or at least more complex - since native2ascii has been
> removed in Java 9 onwards.
>

What about using the XML version of Java Properties ?
https://docs.oracle.com/javase/7/docs/api/java/util/Properties.html#loadFromXML(java.io.InputStream)
This way the encoding could be specified in the XML file itself and there
is no need to use native2ascii at all.

Martin


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

Re: svn commit: r1837219 - /tomcat/trunk/java/org/apache/naming/LocalStrings.properties

2018-08-01 Thread Konstantin Kolinko

2018-08-01 12:40 GMT+03:00  :
> Author: ebourg
> Date: Wed Aug  1 09:40:15 2018
> New Revision: 1837219
>
> URL: http://svn.apache.org/viewvc?rev=1837219&view=rev
> Log:
> Fixed an improperly doubled quote in the English messages
>
> Modified:
> tomcat/trunk/java/org/apache/naming/LocalStrings.properties
>
> Modified: tomcat/trunk/java/org/apache/naming/LocalStrings.properties
> URL: 
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/LocalStrings.properties?rev=1837219&r1=1837218&r2=1837219&view=diff
> ==
> --- tomcat/trunk/java/org/apache/naming/LocalStrings.properties (original)
> +++ tomcat/trunk/java/org/apache/naming/LocalStrings.properties Wed Aug  1 
> 09:40:15 2018
> @@ -25,4 +25,4 @@ namingContext.nameNotBound=Name [{0}] is
>  namingContext.readOnly=Context is read only
>  namingContext.invalidName=Name is not valid
>  namingContext.alreadyBound=Name [{0}] is already bound in this Context
> -namingContext.noAbsoluteName=Can''t generate an absolute name for this 
> namespace
> +namingContext.noAbsoluteName=Can't generate an absolute name for this 
> namespace

Proper written spelling is "Cannot".  ("Can't" is for spoken
language.) So that you can remove the apostrophe altogether.

Or replace with a different word ("Failed to generate...", "Unable to
generate...").

Best regards,
Konstantin Kolinko

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

buildbot success in on tomcat-trunk

2018-08-01 Thread buildbot

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

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

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' 
triggered this build
Build Source Stamp: [branch tomcat/trunk] 1837224
Blamelist: ebourg,markt

Build succeeded!

Sincerely,
 -The Buildbot




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

Re: Message files encoding

2018-08-01 Thread Emmanuel Bourg

Le 01/08/2018 à 13:08, Mark Thomas a écrit :

> I like the idea but that will make building with later versions of Java
> problematic - or at least more complex - since native2ascii has been
> removed in Java 9 onwards.

Good point, I wasn't aware of native2ascii removal. I checked the Ant
code and Stefan actually re-implemented native2ascii two years ago to
work around this issue [1]. The feature was released in Ant 1.9.8.

Emmanuel Bourg

[1] https://bz.apache.org/bugzilla/show_bug.cgi?id=59855

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

Re: Message files encoding

2018-08-01 Thread Emmanuel Bourg

Le 01/08/2018 à 13:16, Martin Grigorov a écrit :

> What about using the XML version of Java Properties ?
> https://docs.oracle.com/javase/7/docs/api/java/util/Properties.html#loadFromXML(java.io.InputStream)
> This way the encoding could be specified in the XML file itself and there
> is no need to use native2ascii at all.

I'm not really fond of XML properties files, the plain text format is
more compact and easier to browse in my opinion. XML files are
interesting when structured with different levels, but properties files
even in XML format have a flat layout.

Emmanuel Bourg

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

Re: Message files encoding

2018-08-01 Thread Martin Grigorov

On Wed, Aug 1, 2018 at 2:56 PM Emmanuel Bourg  wrote:

> Le 01/08/2018 à 13:16, Martin Grigorov a écrit :
>
> > What about using the XML version of Java Properties ?
> >
> https://docs.oracle.com/javase/7/docs/api/java/util/Properties.html#loadFromXML(java.io.InputStream)
> > This way the encoding could be specified in the XML file itself and there
> > is no need to use native2ascii at all.
>
> I'm not really fond of XML properties files, the plain text format is
> more compact and easier to browse in my opinion. XML files are
> interesting when structured with different levels, but properties files
> even in XML format have a flat layout.
>

I hope the following changes your mind:

1) Bulgarian translations in XML format:
https://github.com/apache/wicket/blob/master/wicket-core/src/main/java/org/apache/wicket/Application_bg.properties.xml
2) Czech translation in ascii format:
https://github.com/apache/wicket/blob/master/wicket-core/src/main/java/org/apache/wicket/Application_cs.properties

I can easily read 1) (bulgarian, is my native lang).
I know some Czech but the \u0xyz makes it really hard / imposible to read
it as is.


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

Re: Message files encoding

2018-08-01 Thread Mark Thomas

On 01/08/18 12:47, Emmanuel Bourg wrote:
> Le 01/08/2018 à 13:08, Mark Thomas a écrit :
> 
>> I like the idea but that will make building with later versions of Java
>> problematic - or at least more complex - since native2ascii has been
>> removed in Java 9 onwards.
> 
> Good point, I wasn't aware of native2ascii removal. I checked the Ant
> code and Stefan actually re-implemented native2ascii two years ago to
> work around this issue [1]. The feature was released in Ant 1.9.8.

That solves the complexity problem. It looks like all that would be
required is a change from copying the file to using native2ascii with
appropriate src and destinations.

No objections here.

Mark

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

svn commit: r1837227 - in /tomcat/trunk/java/org/apache: catalina/ha/deploy/ catalina/ha/session/ catalina/tribes/group/ catalina/tribes/io/ jasper/resources/ naming/

2018-08-01 Thread ebourg

Author: ebourg
Date: Wed Aug  1 12:13:38 2018
New Revision: 1837227

URL: http://svn.apache.org/viewvc?rev=1837227&view=rev
Log:
Replaced "Can't" with "Cannot" in the English message files

Modified:
tomcat/trunk/java/org/apache/catalina/ha/deploy/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/tribes/group/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/tribes/io/LocalStrings.properties
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
tomcat/trunk/java/org/apache/naming/LocalStrings.properties

Modified: 
tomcat/trunk/java/org/apache/catalina/ha/deploy/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/deploy/LocalStrings.properties?rev=1837227&r1=1837226&r2=1837227&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/deploy/LocalStrings.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/deploy/LocalStrings.properties Wed 
Aug  1 12:13:38 2018
@@ -20,7 +20,7 @@ farmWarDeployer.deployEnd=Deployment fro
 farmWarDeployer.fileCopyFail=Unable to copy from [{0}] to [{1}]
 farmWarDeployer.hostOnly=FarmWarDeployer can only work as host cluster 
subelement!
 farmWarDeployer.hostParentEngine=FarmWarDeployer can only work if parent of 
[{0}] is an engine!
-farmWarDeployer.mbeanNameFail=Can''t construct MBean object name for engine 
[{0}] and host [{1}]
+farmWarDeployer.mbeanNameFail=Cannot construct MBean object name for engine 
[{0}] and host [{1}]
 farmWarDeployer.alreadyDeployed=webapp [{0}] are already deployed.
 farmWarDeployer.modInstall=Installing webapp [{0}] from [{1}]
 farmWarDeployer.modRemoveFail=No removal

Modified: 
tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties?rev=1837227&r1=1837226&r2=1837227&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties 
Wed Aug  1 12:13:38 2018
@@ -63,7 +63,7 @@ deltaRequest.ssid.null=Session Id is nul
 deltaSession.notifying=Notifying cluster of expiration primary=[{0}] sessionId 
[{1}]
 deltaSession.readSession=readObject() loading session [{0}]
 deltaSession.writeSession=writeObject() storing session [{0}]
-jvmRoute.cannotFindSession=Can''t find session [{0}]
+jvmRoute.cannotFindSession=Cannot find session [{0}]
 jvmRoute.changeSession=Changed session from [{0}] to [{1}]
 jvmRoute.failover=Detected a failover with different jvmRoute - orginal route: 
[{0}] new one: [{1}] at session id [{2}]
 jvmRoute.foundManager=Found Cluster Manager [{0}] at [{1}]

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/group/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/LocalStrings.properties?rev=1837227&r1=1837226&r2=1837227&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/tribes/group/LocalStrings.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/group/LocalStrings.properties 
Wed Aug  1 12:13:38 2018
@@ -15,7 +15,7 @@
 
 channelCoordinator.alreadyStarted=Channel already started for level:[{0}]
 channelCoordinator.invalid.startLevel=Invalid start level, valid levels 
are:SND_RX_SEQ,SND_TX_SEQ,MBR_TX_SEQ,MBR_RX_SEQ
-groupChannel.nullMessage=Can't send a NULL message
+groupChannel.nullMessage=Cannot send a NULL message
 groupChannel.noDestination=No destination given
 groupChannel.unable.deserialize=Unable to deserialize message:[{0}]
 groupChannel.receiving.error=Error receiving message:

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/io/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/io/LocalStrings.properties?rev=1837227&r1=1837226&r2=1837227&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/tribes/io/LocalStrings.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/io/LocalStrings.properties Wed 
Aug  1 12:13:38 2018
@@ -17,7 +17,7 @@ bufferPool.created=Created a buffer pool
 objectReader.retrieveFailed.socketReceiverBufferSize=Unable to retrieve the 
socket receiver buffer size, setting to default 43800 bytes.
 replicationStream.conflict=conflicting non-public interface class loaders
 xByteBuffer.size.larger.buffer=Size is larger than existing buffer.
-xByteBuffer.unableTrim=Can''t trim more bytes than are available. length:[{0}] 
trim:[{1}]
+xByteBuffer.unableTrim=Cannot trim more bytes than are available. length:[{0}] 
trim:[{1}]
 x

Re: svn commit: r1837219 - /tomcat/trunk/java/org/apache/naming/LocalStrings.properties

2018-08-01 Thread Emmanuel Bourg

Le 01/08/2018 à 13:17, Konstantin Kolinko a écrit :

> Proper written spelling is "Cannot".  ("Can't" is for spoken
> language.) So that you can remove the apostrophe altogether.

Thank you for the suggestion, I replaced a handful of occurrences.

Emmanuel Bourg

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

Re: Message files encoding

2018-08-01 Thread Emmanuel Bourg

Le 01/08/2018 à 14:08, Martin Grigorov a écrit :

> I hope the following changes your mind:
> 
> 1) Bulgarian translations in XML format:
> https://github.com/apache/wicket/blob/master/wicket-core/src/main/java/org/apache/wicket/Application_bg.properties.xml
> 2) Czech translation in ascii format:
> https://github.com/apache/wicket/blob/master/wicket-core/src/main/java/org/apache/wicket/Application_cs.properties
> 
> I can easily read 1) (bulgarian, is my native lang).
> I know some Czech but the \u0xyz makes it really hard / imposible to read
> it as is.

I know, that's exactly why I'm suggesting to switch to UTF-8 and ditch
the unicode escape sequences. Sorry if this wasn't clear.

Emmanuel Bourg

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

[Bug 60594] RFC 7230/3986 url requirement that prevents unencoded curly braces should be optional, since it breaks existing sites

2018-08-01 Thread bugzilla

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

--- Comment #33 from Mark Thomas  ---
The point regarding log files is a valid one but if the parsing of the request
target fails, the access log will contain null rather than the request target.

Generally, we do allow potentially security sensitive information to appear in
the logs if debug logging is enabled. I'll look to see what we can do in that
case.

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

[Bug 60594] RFC 7230/3986 url requirement that prevents unencoded curly braces should be optional, since it breaks existing sites

2018-08-01 Thread bugzilla

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

--- Comment #34 from Mark Thomas  ---
Ah. No need. Enable debug logging for
org.apache.coyote.http11.Http11InputBuffer and it will log the entire request
headers.

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

svn commit: r1837237 - /tomcat/trunk/build.xml

2018-08-01 Thread ebourg

Author: ebourg
Date: Wed Aug  1 13:38:12 2018
New Revision: 1837237

URL: http://svn.apache.org/viewvc?rev=1837237&view=rev
Log:
Convert the message files from UTF-8 to ASCII at build time

Modified:
tomcat/trunk/build.xml

Modified: tomcat/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1837237&r1=1837236&r2=1837237&view=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Wed Aug  1 13:38:12 2018
@@ -702,12 +702,18 @@
   
   
 
+
 
 
 
 
   
 
+
+
+
 
   
 



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

svn commit: r1837238 - /tomcat/trunk/build.xml

2018-08-01 Thread ebourg

Author: ebourg
Date: Wed Aug  1 14:01:37 2018
New Revision: 1837238

URL: http://svn.apache.org/viewvc?rev=1837238&view=rev
Log:
Also convert the Messages*.properties file to ASCII

Modified:
tomcat/trunk/build.xml

Modified: tomcat/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1837238&r1=1837237&r2=1837238&view=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Wed Aug  1 14:01:37 2018
@@ -703,6 +703,7 @@
   
 
 
+
 
 
 
@@ -713,7 +714,7 @@
 
-
+
 
   
 



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

svn commit: r1837239 [2/8] - in /tomcat/trunk/java: javax/el/ javax/servlet/ javax/servlet/http/ org/apache/catalina/authenticator/ org/apache/catalina/connector/ org/apache/catalina/core/ org/apache/

2018-08-01 Thread ebourg

Modified: tomcat/trunk/java/org/apache/catalina/core/LocalStrings_ja.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/LocalStrings_ja.properties?rev=1837239&r1=1837238&r2=1837239&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/LocalStrings_ja.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/LocalStrings_ja.properties Wed 
Aug  1 14:04:20 2018
@@ -13,77 +13,77 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-applicationContext.attributeEvent=\u5c5e\u6027\u30a4\u30d9\u30f3\u30c8\u30ea\u30b9\u30ca\u306b\u3088\u3063\u3066\u4f8b\u5916\u304c\u6295\u3052\u3089\u308c\u307e\u3057\u305f
-applicationContext.mapping.error=\u30de\u30c3\u30d4\u30f3\u30b0\u4e2d\u306e\u30a8\u30e9\u30fc\u3067\u3059
-applicationContext.requestDispatcher.iae=\u30d1\u30b9 [{0}] 
\u304c"/"\u6587\u5b57\u3067\u59cb\u307e\u308a\u307e\u305b\u3093
-applicationContext.setAttribute.namenull=name\u304cnull\u3067\u306f\u3044\u3051\u307e\u305b\u3093
-applicationDispatcher.allocateException=\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8 
[{0}] \u306b\u4f8b\u5916\u3092\u5272\u308a\u5f53\u3066\u307e\u3059
-applicationDispatcher.deallocateException=\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8 
[{0}] \u306e\u4f8b\u5916\u3092\u89e3\u9664\u3057\u307e\u3059
-applicationDispatcher.forward.ise=\u30ec\u30b9\u30dd\u30f3\u30b9\u3092\u30b3\u30df\u30c3\u30c8\u3057\u305f\u5f8c\u3067\u30d5\u30a9\u30ef\u30fc\u30c9\u3067\u304d\u307e\u305b\u3093
-applicationDispatcher.isUnavailable=\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8 [{0}] 
\u306f\u73fe\u5728\u5229\u7528\u3067\u304d\u307e\u305b\u3093
-applicationDispatcher.serviceException=\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8 
[{0}] 
\u306eServlet.service()\u304c\u4f8b\u5916\u3092\u6295\u3052\u307e\u3057\u305f
-filterChain.filter=\u30d5\u30a3\u30eb\u30bf\u306e\u5b9f\u884c\u306b\u3088\u308a\u4f8b\u5916\u3092\u6295\u3052\u307e\u3057\u305f
-filterChain.servlet=\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8\u306e\u5b9f\u884c\u306b\u3088\u308a\u4f8b\u5916\u3092\u6295\u3052\u307e\u3057\u305f
-naming.bindFailed=\u30aa\u30d6\u30b8\u30a7\u30af\u30c8\u306e\u30d0\u30a4\u30f3\u30c9\u306b\u5931\u6557\u3057\u307e\u3057\u305f:
 [{0}]
-naming.unbindFailed=\u30aa\u30d6\u30b8\u30a7\u30af\u30c8\u306e\u30a2\u30f3\u30d0\u30a4\u30f3\u30c9\u306b\u5931\u6557\u3057\u307e\u3057\u305f:
 [{0}]
-naming.invalidEnvEntryType=\u74b0\u5883\u30a8\u30f3\u30c8\u30ea [{0}] 
\u306f\u7121\u52b9\u306a\u578b\u3092\u6301\u3063\u3066\u3044\u307e\u3059
-naming.invalidEnvEntryValue=\u74b0\u5883\u30a8\u30f3\u30c8\u30ea [{0}] 
\u306f\u7121\u52b9\u306a\u5024\u3092\u6301\u3063\u3066\u3044\u307e\u3059
-naming.namingContextCreationFailed=\u540d\u524d\u4ed8\u304d\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u306e\u751f\u6210\u306b\u5931\u6557\u3057\u307e\u3057\u305f:
 [{0}]
-standardContext.applicationListener=\u30af\u30e9\u30b9 [{0}] 
\u306e\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30ea\u30b9\u30ca\u306e\u8a2d\u5b9a\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f
-standardContext.applicationSkipped=\u524d\u306e\u30a8\u30e9\u30fc\u306e\u305f\u3081\u306b\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30ea\u30b9\u30ca\u306e\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3092\u30b9\u30ad\u30c3\u30d7\u3057\u307e\u3059
-standardContext.errorPage.error=\u30a8\u30e9\u30fc\u30da\u30fc\u30b8\u306e\u4f4d\u7f6e
 [{0}] 
\u306f''/''\u3067\u59cb\u307e\u3089\u306a\u3051\u308c\u3070\u3044\u3051\u307e\u305b\u3093
-standardContext.errorPage.required=ErrorPage\u304cnull\u3067\u306f\u3044\u3051\u307e\u305b\u3093
-standardContext.errorPage.warning=\u8b66\u544a: Servlet 
2.4\u3067\u306f\u30a8\u30e9\u30fc\u30da\u30fc\u30b8\u306e\u4f4d\u7f6e [{0}] 
\u306f''/''\u3067\u59cb\u307e\u3089\u306a\u3051\u308c\u3070\u3044\u3051\u307e\u305b\u3093
-standardContext.filterMap.either=\u30d5\u30a3\u30eb\u30bf\u30de\u30c3\u30d4\u30f3\u30b0\u306f\u53c8\u306f\u306e\u3069\u3061\u3089\u304b\u3092\u6307\u5b9a\u3057\u306a\u3051\u308c\u3070\u3044\u3051\u307e\u305b\u3093
-standardContext.filterMap.name=\u30d5\u30a3\u30eb\u30bf\u30de\u30c3\u30d4\u30f3\u30b0\u306f\u672a\u77e5\u306e\u30d5\u30a3\u30eb\u30bf\u540d
 [{0}] \u3092\u6307\u5b9a\u3057\u307e\u3057\u305f
-standardContext.filterMap.pattern=\u30d5\u30a3\u30eb\u30bf\u30de\u30c3\u30d4\u30f3\u30b0\u4e2d\u306b\u7121\u52b9\u306a
  [{0}] \u304c\u3042\u308a\u307e\u3059
-standardContext.filterStart=\u30d5\u30a3\u30eb\u30bf [{0}] 
\u306e\u8d77\u52d5\u4e2d\u306e\u4f8b\u5916\u3067\u3059
-standardContext.isUnavailable=\u3053\u306e\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u306f\u73fe\u5728\u5229\u7528\u3067\u304d\u307e\u305b\u3093
-standardContext.listenerStart=\u30af\u30e9\u30b9 [{0}] 
\u306e\u30ea\u30b9\u30ca\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u306b\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u521d\u671f\u5316\u30a4\u30d9\u30f3\u30c8\u3092\u9001\u4fe1\u4e2d\u306e\u4f8b\u5916\u3067\u3059
-standardContex

svn commit: r1837239 [1/8] - in /tomcat/trunk/java: javax/el/ javax/servlet/ javax/servlet/http/ org/apache/catalina/authenticator/ org/apache/catalina/connector/ org/apache/catalina/core/ org/apache/

2018-08-01 Thread ebourg

Author: ebourg
Date: Wed Aug  1 14:04:20 2018
New Revision: 1837239

URL: http://svn.apache.org/viewvc?rev=1837239&view=rev
Log:
Converted the message files to UTF-8

Modified:
tomcat/trunk/java/javax/el/LocalStrings_es.properties
tomcat/trunk/java/javax/servlet/LocalStrings_es.properties
tomcat/trunk/java/javax/servlet/LocalStrings_fr.properties
tomcat/trunk/java/javax/servlet/LocalStrings_ja.properties
tomcat/trunk/java/javax/servlet/http/LocalStrings_es.properties
tomcat/trunk/java/javax/servlet/http/LocalStrings_fr.properties
tomcat/trunk/java/javax/servlet/http/LocalStrings_ja.properties

tomcat/trunk/java/org/apache/catalina/authenticator/LocalStrings_es.properties

tomcat/trunk/java/org/apache/catalina/authenticator/LocalStrings_fr.properties

tomcat/trunk/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/catalina/connector/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/connector/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/catalina/connector/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/catalina/core/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/catalina/filters/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/filters/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/ha/tcp/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/loader/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/loader/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/catalina/loader/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_de.properties
tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_ru.properties

tomcat/trunk/java/org/apache/catalina/manager/host/LocalStrings_es.properties

tomcat/trunk/java/org/apache/catalina/manager/host/LocalStrings_ru.properties
tomcat/trunk/java/org/apache/catalina/mbeans/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/catalina/realm/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/realm/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/catalina/realm/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/catalina/security/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/security/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/catalina/security/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/catalina/session/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/session/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/catalina/session/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_ja.properties

tomcat/trunk/java/org/apache/catalina/tribes/transport/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/users/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/users/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/catalina/users/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/catalina/util/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/util/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/catalina/util/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/catalina/valves/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/valves/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/valves/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/catalina/valves/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/coyote/LocalStrings_es.properties
tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings_es.properties
tomcat/trunk/java/org/apache/coyote/http11/LocalStrings_es.properties
tomcat/trunk/java/org/apache/coyote/http11/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/coyote/http11/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/el/Messages_es.properties
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
tomca

svn commit: r1837239 [5/8] - in /tomcat/trunk/java: javax/el/ javax/servlet/ javax/servlet/http/ org/apache/catalina/authenticator/ org/apache/catalina/connector/ org/apache/catalina/core/ org/apache/

2018-08-01 Thread ebourg

Modified: 
tomcat/trunk/java/org/apache/catalina/session/LocalStrings_ja.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/LocalStrings_ja.properties?rev=1837239&r1=1837238&r2=1837239&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/session/LocalStrings_ja.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/session/LocalStrings_ja.properties 
Wed Aug  1 14:04:20 2018
@@ -13,47 +13,47 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-fileStore.saving=\u30bb\u30c3\u30b7\u30e7\u30f3 [{0}] 
\u3092\u30d5\u30a1\u30a4\u30eb [{1}] \u306b\u4fdd\u5b58\u3057\u307e\u3059
-fileStore.loading=\u30bb\u30c3\u30b7\u30e7\u30f3 [{0}] 
\u3092\u30d5\u30a1\u30a4\u30eb [{1}] 
\u304b\u3089\u30ed\u30fc\u30c9\u3057\u307e\u3059
-fileStore.removing=\u30bb\u30c3\u30b7\u30e7\u30f3 [{0}] 
\u3092\u30d5\u30a1\u30a4\u30eb [{1}] \u304b\u3089\u524a\u9664\u3057\u307e\u3059
-JDBCStore.close=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u63a5\u7d9a [{0}] 
\u3092\u30af\u30ed\u30fc\u30ba\u4e2d\u306e\u4f8b\u5916\u3067\u3059
-JDBCStore.saving=\u30bb\u30c3\u30b7\u30e7\u30f3 [{0}] 
\u3092\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9 [{1}] 
\u306b\u4fdd\u5b58\u3057\u307e\u3059
-JDBCStore.loading=\u30bb\u30c3\u30b7\u30e7\u30f3 [{0}] 
\u3092\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9 [{1}] 
\u304b\u3089\u30ed\u30fc\u30c9\u3057\u307e\u3059
-JDBCStore.removing= \u30bb\u30c3\u30b7\u30e7\u30f3 [{0}] 
\u3092\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9 [{1}] 
\u304b\u3089\u524a\u9664\u3057\u307e\u3059
-JDBCStore.SQLException=SQL\u30a8\u30e9\u30fc [{0}]
-JDBCStore.checkConnectionDBClosed=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u63a5\u7d9a\u304cnull\u3067\u3042\u308b\u304b\u3001\u30af\u30ed\u30fc\u30ba\u3055\u308c\u3066\u3044\u308b\u306e\u304c\u898b\u3064\u304b\u308a\u307e\u3057\u305f\u3002\u518d\u30aa\u30fc\u30d7\u30f3\u3057\u3066\u304f\u3060\u3055\u3044\u3002
-JDBCStore.checkConnectionDBReOpenFail=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u306e\u518d\u30aa\u30fc\u30d7\u30f3\u304c\u5931\u6557\u3057\u307e\u3057\u305f\u3002\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u304c\u30c0\u30a6\u30f3\u3057\u3066\u3044\u308b\u304b\u3082\u3057\u308c\u307e\u305b\u3093\u3002
-JDBCStore.checkConnectionSQLException=SQL\u4f8b\u5916\u304c\u767a\u751f\u3057\u307e\u3057\u305f
 [{0}]
-JDBCStore.checkConnectionClassNotFoundException=JDBC\u30c9\u30e9\u30a4\u30d0\u30af\u30e9\u30b9\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093
 [{0}]
-managerBase.createSession.ise=createSession: 
\u30a2\u30af\u30c6\u30a3\u30d6\u30bb\u30c3\u30b7\u30e7\u30f3\u304c\u591a\u3059\u304e\u307e\u3059
-managerBase.sessionTimeout=\u7121\u52b9\u306a\u30bb\u30c3\u30b7\u30e7\u30f3\u30bf\u30a4\u30e0\u30a2\u30a6\u30c8\u8a2d\u5b9a\u3067\u3059
 [{0}]
-standardManager.loading=[{0}] 
\u304b\u3089\u6301\u7d9a\u3055\u308c\u305f\u30bb\u30c3\u30b7\u30e7\u30f3\u3092\u30ed\u30fc\u30c9\u3057\u3066\u3044\u307e\u3059
-standardManager.loading.exception=\u6301\u7d9a\u3055\u308c\u305f\u30bb\u30c3\u30b7\u30e7\u30f3\u3092\u30ed\u30fc\u30c9\u4e2d\u306bException\u304c\u767a\u751f\u3057\u307e\u3057\u305f
-standardManager.unloading=\u6301\u7d9a\u3055\u308c\u305f\u30bb\u30c3\u30b7\u30e7\u30f3\u3092
 [{0}] \u306b\u4fdd\u5b58\u3057\u307e\u3059
-standardManager.managerLoad=\u6c38\u7d9a\u8a18\u61b6\u88c5\u7f6e\u304b\u3089\u30bb\u30c3\u30b7\u30e7\u30f3\u3092\u30ed\u30fc\u30c9\u4e2d\u306e\u4f8b\u5916\u3067\u3059
-standardManager.managerUnload=\u6c38\u7d9a\u8a18\u61b6\u88c5\u7f6e\u306b\u30bb\u30c3\u30b7\u30e7\u30f3\u3092\u30a2\u30f3\u30ed\u30fc\u30c9\u4e2d\u306e\u4f8b\u5916\u3067\u3059
-standardSession.attributeEvent=\u30bb\u30c3\u30b7\u30e7\u30f3\u5c5e\u6027\u30a4\u30d9\u30f3\u30c8\u30ea\u30b9\u30ca\u304c\u4f8b\u5916\u3092\u6295\u3052\u307e\u3057\u305f
-standardSession.bindingEvent=\u30bb\u30c3\u30b7\u30e7\u30f3\u30d0\u30a4\u30f3\u30c7\u30a3\u30f3\u30b0\u30a4\u30d9\u30f3\u30c8\u30ea\u30b9\u30ca\u304c\u4f8b\u5916\u3092\u6295\u3052\u307e\u3057\u305f
-standardSession.invalidate.ise=invalidate: 
\u30bb\u30c3\u30b7\u30e7\u30f3\u306f\u65e2\u306b\u7121\u52b9\u5316\u3055\u308c\u3066\u3044\u307e\u3059
-standardSession.isNew.ise=isNew: 
\u30bb\u30c3\u30b7\u30e7\u30f3\u306f\u65e2\u306b\u7121\u52b9\u5316\u3055\u308c\u3066\u3044\u307e\u3059
-standardSession.getAttribute.ise=getAttribute: 
\u30bb\u30c3\u30b7\u30e7\u30f3\u306f\u65e2\u306b\u7121\u52b9\u5316\u3055\u308c\u3066\u3044\u307e\u3059
-standardSession.getAttributeNames.ise=getAttributeNames: 
\u30bb\u30c3\u30b7\u30e7\u30f3\u306f\u65e2\u306b\u7121\u52b9\u5316\u3055\u308c\u3066\u3044\u307e\u3059
-standardSession.getCreationTime.ise=getCreationTime: 
\u30bb\u30c3\u30b7\u30e7\u30f3\u306f\u65e2\u306b\u7121\u52b9\u5316\u3055\u308c\u3066\u3044\u307e\u3059
-standardSession.getThisAccessedTime.ise=getThisAccessedTime: 
\u30bb\u30c3\u30b7\u30e7\u30f3\u306f\u65e2\u306b\u7121\u52b9\u5316\u3055\u308c\u3066\u3044\u307e\u3059
-standardSession.getLastAccessedTime.ise=getLas

svn commit: r1837239 [3/8] - in /tomcat/trunk/java: javax/el/ javax/servlet/ javax/servlet/http/ org/apache/catalina/authenticator/ org/apache/catalina/connector/ org/apache/catalina/core/ org/apache/

2018-08-01 Thread ebourg

Modified: 
tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_ja.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_ja.properties?rev=1837239&r1=1837238&r2=1837239&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_ja.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_ja.properties 
Wed Aug  1 14:04:20 2018
@@ -13,70 +13,70 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-htmlManagerServlet.appsAvailable=\u5b9f\u884c\u4e2d
-htmlManagerServlet.appsName=\u8868\u793a\u540d
-htmlManagerServlet.appsPath=\u30d1\u30b9
-htmlManagerServlet.appsReload=\u518d\u30ed\u30fc\u30c9
-htmlManagerServlet.appsUndeploy=\u914d\u5099\u89e3\u9664
-htmlManagerServlet.appsSessions=\u30bb\u30c3\u30b7\u30e7\u30f3
-htmlManagerServlet.appsStart=\u8d77\u52d5
-htmlManagerServlet.appsStop=\u505c\u6b62
-htmlManagerServlet.appsTasks=\u30b3\u30de\u30f3\u30c9
-htmlManagerServlet.appsTitle=\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3
-htmlManagerServlet.helpHtmlManager=HTML\u30de\u30cd\u30fc\u30b8\u30e3\u30d8\u30eb\u30d7
+htmlManagerServlet.appsAvailable=å®è¡ä¸
+htmlManagerServlet.appsName=è¡¨ç¤ºå
+htmlManagerServlet.appsPath=ãã¹
+htmlManagerServlet.appsReload=åãã¼ã
+htmlManagerServlet.appsUndeploy=éåè§£é¤
+htmlManagerServlet.appsSessions=ã»ãã·ã§ã³
+htmlManagerServlet.appsStart=èµ·å
+htmlManagerServlet.appsStop=åæ¢
+htmlManagerServlet.appsTasks=ã³ãã³ã
+htmlManagerServlet.appsTitle=ã¢ããªã±ã¼ã·ã§ã³
+htmlManagerServlet.helpHtmlManager=HTMLããã¼ã¸ã£ãã«ã
 htmlManagerServlet.helpHtmlManagerFile=../docs/html-manager-howto.html
-htmlManagerServlet.helpManager=\u30de\u30cd\u30fc\u30b8\u30e3\u30d8\u30eb\u30d7
+htmlManagerServlet.helpManager=ããã¼ã¸ã£ãã«ã
 htmlManagerServlet.helpManagerFile=../docs/manager-howto.html
-htmlManagerServlet.deployButton=\u914d\u5099
-htmlManagerServlet.deployConfig=XML\u8a2d\u5b9a\u30d5\u30a1\u30a4\u30eb\u306eURL:
-htmlManagerServlet.deployPath=\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u30d1\u30b9 
(\u7701\u7565\u53ef):
-htmlManagerServlet.deployServer=\u30b5\u30fc\u30d0\u4e0a\u306eWAR\u30d5\u30a1\u30a4\u30eb\u53c8\u306f\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u306e\u914d\u5099
-htmlManagerServlet.deployTitle=\u914d\u5099
-htmlManagerServlet.deployUpload=WAR\u30d5\u30a1\u30a4\u30eb\u306e\u914d\u5099
-htmlManagerServlet.deployUploadFail=FAIL - 
\u914d\u5099\u306e\u30a2\u30c3\u30d7\u30ed\u30fc\u30c9\u304c\u5931\u6557\u3057\u307e\u3057\u305f\u3001\u4f8b\u5916:
 [{0}]
-htmlManagerServlet.deployUploadFile=\u30a2\u30c3\u30d7\u30ed\u30fc\u30c9\u3059\u308bWAR\u30d5\u30a1\u30a4\u30eb\u306e\u9078\u629e
-htmlManagerServlet.deployUploadNotWar=FAIL - 
\u30a2\u30c3\u30d7\u30ed\u30fc\u30c9\u3059\u308b\u30d5\u30a1\u30a4\u30eb [{0}] 
\u306fWAR\u30d5\u30a1\u30a4\u30eb\u3067\u306a\u3051\u308c\u3070\u3044\u3051\u307e\u305b\u3093
-htmlManagerServlet.deployUploadNoFile=FAIL - 
\u30d5\u30a1\u30a4\u30eb\u306e\u30a2\u30c3\u30d7\u30ed\u30fc\u30c9\u304c\u5931\u6557\u3057\u307e\u3057\u305f\u3001\u30d5\u30a1\u30a4\u30eb\u304c\u5b58\u5728\u3057\u307e\u305b\u3093
-htmlManagerServlet.deployUploadWarExists=FAIL - WAR\u30d5\u30a1\u30a4\u30eb 
[{0}] 
\u306f\u65e2\u306b\u30b5\u30fc\u30d0\u4e0a\u306b\u5b58\u5728\u3057\u307e\u3059
-htmlManagerServlet.deployWar=WAR\u30d5\u30a1\u30a4\u30eb\u53c8\u306f\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u306eURL:
-htmlManagerServlet.list=\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u306e\u4e00\u89a7
-htmlManagerServlet.manager=\u30de\u30cd\u30fc\u30b8\u30e3
-htmlManagerServlet.messageLabel=\u30e1\u30c3\u30bb\u30fc\u30b8
-htmlManagerServlet.serverJVMVendor=JVM\u30d9\u30f3\u30c0
-htmlManagerServlet.serverJVMVersion=JVM\u30d0\u30fc\u30b8\u30e7\u30f3
-htmlManagerServlet.serverOSArch=OS\u30a2\u30fc\u30ad\u30c6\u30af\u30c1\u30e3
-htmlManagerServlet.serverOSName=OS\u540d
-htmlManagerServlet.serverOSVersion=OS\u30d0\u30fc\u30b8\u30e7\u30f3
-htmlManagerServlet.serverTitle=\u30b5\u30fc\u30d0\u60c5\u5831
-htmlManagerServlet.serverVersion=Tomcat\u30d0\u30fc\u30b8\u30e7\u30f3
-htmlManagerServlet.title=Tomcat 
Web\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30de\u30cd\u30fc\u30b8\u30e3
-managerServlet.alreadyContext=FAIL - 
\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u306f\u3001\u65e2\u306b\u30d1\u30b9
 [{0}] \u306b\u5b58\u5728\u3057\u307e\u3059
-managerServlet.deployed=OK - \u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u30d1\u30b9 
[{0}] 
\u3067\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u3092\u914d\u5099\u3057\u307e\u3057\u305f
-managerServlet.exception=FAIL - \u4f8b\u5916 [{0}] 
\u304c\u767a\u751f\u3057\u307e\u3057\u305f
-managerServlet.invalidPath=FAIL - 
\u7121\u52b9\u306a\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u30d1\u30b9 [{0}] 
\u304c\u6307\u5b9a\u3055\u308c\u307e\u3057\u305f
-managerServlet.listed=OK - \u30d0\u30

svn commit: r1837239 [8/8] - in /tomcat/trunk/java: javax/el/ javax/servlet/ javax/servlet/http/ org/apache/catalina/authenticator/ org/apache/catalina/connector/ org/apache/catalina/core/ org/apache/

2018-08-01 Thread ebourg

Modified: tomcat/trunk/java/org/apache/naming/LocalStrings_es.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/LocalStrings_es.properties?rev=1837239&r1=1837238&r2=1837239&view=diff
==
--- tomcat/trunk/java/org/apache/naming/LocalStrings_es.properties (original)
+++ tomcat/trunk/java/org/apache/naming/LocalStrings_es.properties Wed Aug  1 
14:04:20 2018
@@ -19,10 +19,10 @@ contextBindings.unknownContext = Context
 contextBindings.noContextBoundToThread = No hay contexto de nombres asociado a 
este hilo
 contextBindings.noContextBoundToCL = No hay contexto de nombres asociado a 
este cargador de clase
 selectorContext.noJavaUrl = Este contexto debe de ser accedido a traves de una 
URL de tipo java:
-selectorContext.methodUsingName = Llamada al m\u00E9todo [{0}] con un Nombre 
de [{1}]
-selectorContext.methodUsingString = Llamada al m\u00E9todo [{0}] con una 
Cadena de [{1}]
+selectorContext.methodUsingName = Llamada al mÃ©todo [{0}] con un Nombre de 
[{1}]
+selectorContext.methodUsingString = Llamada al mÃ©todo [{0}] con una Cadena de 
[{1}]
 namingContext.contextExpected = El nombre no esta asociado a ningun Contexto
-namingContext.failResolvingReference = Excepci\u00F3n inesperada resolviendo 
referencia
+namingContext.failResolvingReference = ExcepciÃ³n inesperada resolviendo 
referencia
 namingContext.nameNotBound = El nombre [{0}] no este asociado a este contexto
 namingContext.readOnly = El contexto es de solo lectura
 namingContext.invalidName = Nombre no valido

Modified: tomcat/trunk/java/org/apache/naming/LocalStrings_fr.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/LocalStrings_fr.properties?rev=1837239&r1=1837238&r2=1837239&view=diff
==
--- tomcat/trunk/java/org/apache/naming/LocalStrings_fr.properties (original)
+++ tomcat/trunk/java/org/apache/naming/LocalStrings_fr.properties Wed Aug  1 
14:04:20 2018
@@ -14,13 +14,13 @@
 # limitations under the License.
 
 contextBindings.unknownContext=Nom de Contexte inconnu : [{0}]
-contextBindings.noContextBoundToThread=Aucun Contexte de nommage li\u00e9 
\u00e0 ce thread
-contextBindings.noContextBoundToCL=Aucun Contexte de nommage li\u00e9 \u00e0 
ce chargeur de classes
-selectorContext.noJavaUrl=Ce Contexte doit \u00eatre acc\u00e9d\u00e9 par une 
java: URL
-namingContext.contextExpected=Le Nom n'est pas li\u00e9 \u00e0 un Contexte
-namingContext.failResolvingReference=Une erreur s est produite durant la 
r\u00e9solution de la r\u00e9f\u00e9rence
-namingContext.nameNotBound=Le Nom [{0}] n''est pas li\u00e9 \u00e0 ce Contexte
+contextBindings.noContextBoundToThread=Aucun Contexte de nommage liÃ© Ã  ce 
thread
+contextBindings.noContextBoundToCL=Aucun Contexte de nommage liÃ© Ã  ce 
chargeur de classes
+selectorContext.noJavaUrl=Ce Contexte doit Ãªtre accÃ©dÃ© par une java: URL
+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.nameNotBound=Le Nom [{0}] n''est pas liÃ© Ã  ce Contexte
 namingContext.readOnly=Le Contexte est en lecture seule
 namingContext.invalidName=Le Nom est invalide
-namingContext.alreadyBound=Le Nom [{0}] est d\u00e9j\u00e0 li\u00e9 \u00e0 ce 
Contexte
-namingContext.noAbsoluteName=Impossible de g\u00e9n\u00e9rer un nom absolu 
pour cet espace de nommage (namespace)
+namingContext.alreadyBound=Le Nom [{0}] est dÃ©jÃ  liÃ© Ã  ce Contexte
+namingContext.noAbsoluteName=Impossible de gÃ©nÃ©rer un nom absolu pour cet 
espace de nommage (namespace)

Modified: tomcat/trunk/java/org/apache/naming/LocalStrings_ja.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/LocalStrings_ja.properties?rev=1837239&r1=1837238&r2=1837239&view=diff
==
--- tomcat/trunk/java/org/apache/naming/LocalStrings_ja.properties (original)
+++ tomcat/trunk/java/org/apache/naming/LocalStrings_ja.properties Wed Aug  1 
14:04:20 2018
@@ -13,14 +13,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-contextBindings.unknownContext=\u672a\u77e5\u306e\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u540d\u3067\u3059:
 [{0}]
-contextBindings.noContextBoundToThread=\u540d\u524d\u4ed8\u3051\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u306f\u3053\u306e\u30b9\u30ec\u30c3\u30c9\u306b\u30d0\u30a4\u30f3\u30c9\u3055\u308c\u3066\u3044\u307e\u305b\u3093
-contextBindings.noContextBoundToCL=\u540d\u524d\u4ed8\u3051\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u306f\u3053\u306e\u30af\u30e9\u30b9\u30ed\u30fc\u30c0\u306b\u30d0\u30a4\u30f3\u30c9\u3055\u308c\u3066\u3044\u307e\u305b\u3093
-selectorContext.noJavaUrl=\u3053\u306e\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u306b\u306fjava:
 
URL\u3092\u7528\u3044\u3

svn commit: r1837239 [4/8] - in /tomcat/trunk/java: javax/el/ javax/servlet/ javax/servlet/http/ org/apache/catalina/authenticator/ org/apache/catalina/connector/ org/apache/catalina/core/ org/apache/

2018-08-01 Thread ebourg

Modified: 
tomcat/trunk/java/org/apache/catalina/manager/host/LocalStrings_ru.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/host/LocalStrings_ru.properties?rev=1837239&r1=1837238&r2=1837239&view=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/manager/host/LocalStrings_ru.properties 
(original)
+++ 
tomcat/trunk/java/org/apache/catalina/manager/host/LocalStrings_ru.properties 
Wed Aug  1 14:04:20 2018
@@ -1,87 +1,87 @@
-# 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.
-
-hostManagerServlet.alreadyStarted=\u041e\u0448\u0438\u0431\u043a\u0430\u002d 
\u0421\u0435\u0440\u0432\u0435\u0440 \u005b\u007b\u0030\u007d\u005d 
\u0443\u0436\u0435 \u0437\u0430\u043f\u0443\u0449\u0435\u043d
-hostManagerServlet.alreadyStopped=\u041e\u0448\u0438\u0431\u043a\u0430\u002d 
\u0421\u0435\u0440\u0432\u0435\u0440 \u005b\u007b\u0030\u007d\u005d 
\u0443\u0436\u0435 \u043e\u0441\u0442\u0430\u043d\u043e\u0432\u043b\u0435\u043d
-hostManagerServlet.appBaseCreateFail=\u041e\u0448\u0438\u0431\u043a\u0430\u002d
 \u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c 
\u0441\u043e\u0437\u0434\u0430\u0442\u044c \u0441\u043f\u0438\u0441\u043e\u043a 
\u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u0439 
\u005b\u007b\u0030\u007d\u005d \u0434\u043b\u044f 
\u0441\u0435\u0440\u0432\u0435\u0440\u0430 \u005b\u007b\u0031\u007d\u005d
-hostManagerServlet.configBaseCreateFail=\u041e\u0448\u0438\u0431\u043a\u0430\u002d
 \u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c 
\u043e\u043f\u0440\u0435\u0434\u0435\u043b\u0438\u0442\u044c 
\u0063\u006f\u006e\u0066\u0069\u0067\u0042\u0061\u0073\u0065 \u0434\u043b\u044f 
\u0441\u0435\u0440\u0432\u0435\u0440\u0430 \u005b\u007b\u0030\u007d\u005d
-hostManagerServlet.noCommand=\u041e\u0448\u0438\u0431\u043a\u0430\u002d\u0020\u041a\u043e\u043c\u0430\u043d\u0434\u0430\u0020\u043d\u0435\u0020\u0443\u043a\u0430\u0437\u0430\u043d\u0430\u002e
-hostManagerServlet.postCommand=\u041e\u0448\u0438\u0431\u043a\u0430\u002d\u0020\u041f\u044b\u0442\u0430\u043b\u0441\u044f\u0020\u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u044c\u0020\u043a\u043e\u043c\u0430\u043d\u0434\u0443\u0020\u007b\u0030\u007d\u0020\u0441\u0020\u043f\u043e\u043c\u043e\u0449\u044c\u044e\u0020\u0437\u0430\u043f\u0440\u043e\u0441\u0430\u0020\u0047\u0045\u0054\u002c\u0020\u043d\u043e\u0020\u0442\u0440\u0435\u0431\u0443\u0435\u0442\u0441\u044f\u0020\u0050\u004f\u0053\u0054
-hostManagerServlet.unknownCommand=\u041e\u0448\u0438\u0431\u043a\u0430\u002d\u0020\u041d\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u043d\u0430\u044f\u0020\u043a\u043e\u043c\u0430\u043d\u0434\u0430\u0020\u007b\u0030\u007d
-hostManagerServlet.noWrapper=\u0414\u043b\u044f\u0020\u044d\u0442\u043e\u0433\u043e\u0020\u0441\u0435\u0440\u0432\u0435\u0440\u0430\u0020\u043d\u0435\u0442\u0020\u0073\u0065\u0074\u0057\u0072\u0061\u0070\u0070\u0065\u0072\u0028\u0029\u0020
-hostManagerServlet.invalidHostName=\u041e\u0448\u0438\u0431\u043a\u0430\u002d\u0020\u0423\u043a\u0430\u0437\u0430\u043d\u043e\u0020\u043d\u0435\u0434\u043e\u043f\u0443\u0441\u0442\u0438\u043c\u043e\u0435\u0020\u0438\u043c\u044f\u0020\u0441\u0435\u0440\u0432\u0435\u0440\u0430\u0020\u007b\u0030\u007d
-hostManagerServlet.noHost=\u041e\u0448\u0438\u0431\u043a\u0430\u002d\u0020\u0418\u043c\u044f\u0020\u0441\u0435\u0440\u0432\u0435\u0440\u0430\u0020\u007b\u0030\u007d\u0020\u043d\u0435\u0020\u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442
-hostManagerServlet.alreadyHost=\u041e\u0448\u0438\u0431\u043a\u0430\u002d\u0020\u0423\u0436\u0435\u0020\u0435\u0441\u0442\u044c\u0020\u0441\u0435\u0440\u0432\u0435\u0440\u0020\u0441\u0020\u0442\u0430\u043a\u0438\u043c\u0020\u0438\u043c\u0435\u043d\u0435\u043c\u0020\u007b\u0030\u007d
-hostManagerServlet.managerXml=\u041e\u0448\u0438\u0431\u043a\u0430\u002d\u0020\u041d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e\u0020\u0443\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c\u0020\u006d\u0061\u006e\u0061\u0067\u0065\u0072\u002e\u0078\u006d\u006c
-hostManagerServlet.exception=\u041e\u0448\u0438\u0431\u043a\u0430\u002d\u0020\u041d\u0435\u043e\u0431\u044b\u0447\u043d\u0430\u044f\u0020\u0441\u0438\u0442\u0443

svn commit: r1837239 [6/8] - in /tomcat/trunk/java: javax/el/ javax/servlet/ javax/servlet/http/ org/apache/catalina/authenticator/ org/apache/catalina/connector/ org/apache/catalina/core/ org/apache/

2018-08-01 Thread ebourg

Modified: tomcat/trunk/java/org/apache/el/Messages_es.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/Messages_es.properties?rev=1837239&r1=1837238&r2=1837239&view=diff
==
--- tomcat/trunk/java/org/apache/el/Messages_es.properties (original)
+++ tomcat/trunk/java/org/apache/el/Messages_es.properties Wed Aug  1 14:04:20 
2018
@@ -15,22 +15,22 @@
 
 error.convert = No puedo convertir [{0}] desde tipo [{1}] a [{2}]
 error.compare = No puedo comparar [{0}] con [{1}]
-error.function = Problemas llamando a funci\u00F3n [{0}]
+error.function = Problemas llamando a funciÃ³n [{0}]
 error.unreachable.base = Objetivo inalcanzable, identificador [{0}] resuelto a 
nulo
-error.unreachable.property = Objetivo inalcanzable, [{0}] devolvi\u00F3 nulo
-error.resolver.unhandled = ELResolver no manej\u00F3 el tipo: [{0}] con 
propiedad de [{1}]
+error.unreachable.property = Objetivo inalcanzable, [{0}] devolviÃ³ nulo
+error.resolver.unhandled = ELResolver no manejÃ³ el tipo: [{0}] con propiedad 
de [{1}]
 error.resolver.unhandled.null = ELResolver no puede manejar un Objeto base 
nulo  con identificador de [{0}]
 error.value.literal.write = ValueExpression es un literal y no un grabable: 
[{0}]
-error.null = La expresi\u00F3n no puede ser nula
-error.mixed = La expresi\u00F3n no puede contenera la vez ''#{..}'' y 
''${..}'' : [{0}]
-error.method = No es una MethodExpression v\u00E1lida: [{0}]
-error.method.nullParms = Los tipos de par\u00E1metro no pueden ser nulo
+error.null = La expresiÃ³n no puede ser nula
+error.mixed = La expresiÃ³n no puede contenera la vez ''#{..}'' y ''${..}'' : 
[{0}]
+error.method = No es una MethodExpression vÃ¡lida: [{0}]
+error.method.nullParms = Los tipos de parÃ¡metro no pueden ser nulo
 error.value.expectedType = El tipo esperado no puede ser nulo
-error.syntax.set = Sit\u00E1xis ilegal para Operaci\u00F3n de Poner Valor
-error.method.notfound = M\u00E9todo no hallado: {0}.{1}({2})
-error.method.ambiguous = No pude hallar m\u00E9todo ambiguo: {0}.{1}({2})
-error.fnMapper.null = La expresi\u00F3n usa funciones, pero no se ha 
suministrado FunctionMapper
-error.fnMapper.method = Funci\u00F3n [{0}] no hallada
-error.fnMapper.paramcount = La funci\u00F3n [{0}] especifica [{1}] 
par\u00E9metros, pero [{2}] fueron declarados
+error.syntax.set = SitÃ¡xis ilegal para OperaciÃ³n de Poner Valor
+error.method.notfound = MÃ©todo no hallado: {0}.{1}({2})
+error.method.ambiguous = No pude hallar mÃ©todo ambiguo: {0}.{1}({2})
+error.fnMapper.null = La expresiÃ³n usa funciones, pero no se ha suministrado 
FunctionMapper
+error.fnMapper.method = FunciÃ³n [{0}] no hallada
+error.fnMapper.paramcount = La funciÃ³n [{0}] especifica [{1}] parÃ©metros, 
pero [{2}] fueron declarados
 error.context.null = ELContext era nulo
-error.identifier.notjava = El identificador [{0}] no es un identificado Java 
v\u00E1lido seg\u00FAn se requiere en la secci\u00F3n 1.9 de la 
especificaci\u00F3n EL (Identificador ::= identificador de lenguaje Java). Este 
chequeo se puede desactivar poniendo la propiedad del sistema  
org.apache.el.parser.SKIP_IDENTIFIER_CHECK a verdad (true).
+error.identifier.notjava = El identificador [{0}] no es un identificado Java 
vÃ¡lido segÃºn se requiere en la secciÃ³n 1.9 de la especificaciÃ³n EL 
(Identificador ::= identificador de lenguaje Java). Este chequeo se puede 
desactivar poniendo la propiedad del sistema  
org.apache.el.parser.SKIP_IDENTIFIER_CHECK a verdad (true).

Modified: 
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties?rev=1837239&r1=1837238&r2=1837239&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties 
(original)
+++ tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties 
Wed Aug  1 14:04:20 2018
@@ -17,7 +17,7 @@
 # Localized para Locale es_ES
 jsp.error.compiler = No hay compilador Java disponible
 jsp.error.no.scratch.dir = El motor JSP no tiene configurado un directorio de 
trabajo.\n\
-\ A\u00F1ada "jsp.initparams=scratchdir=" \n\
+\ AÃ±ada "jsp.initparams=scratchdir=" \n\
 \ en el fichero servlets.properties para este contexto.
 jsp.error.bad.scratch.dir = El directorio de trabajo especificado: [{0}] no es 
utilizable.
 jsp.message.scratch.dir.is = El directorio de trabajo para el motor JSP es: 
[{0}]
@@ -28,98 +28,98 @@ jsp.error.usebean.duplicate = useBean: N
 jsp.error.invalid.scope = Valor ilegal de atributo ''scope'': [{0}] (debe de 
ser uno de "page", "request", "session", o "application")
 jsp.error.classname = No pude determinar el nombre de clase desde el fichero 
.class
 jsp.error.outputfolder = no hay carpeta de salida
-jsp.error.data.file.write = Error mientras escrib\u00EDa el archivo de da

svn commit: r1837239 [7/8] - in /tomcat/trunk/java: javax/el/ javax/servlet/ javax/servlet/http/ org/apache/catalina/authenticator/ org/apache/catalina/connector/ org/apache/catalina/core/ org/apache/

2018-08-01 Thread ebourg

Modified: 
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties?rev=1837239&r1=1837238&r2=1837239&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties 
(original)
+++ tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties 
Wed Aug  1 14:04:20 2018
@@ -16,146 +16,146 @@
 # Default localized string information
 # Localized this the Default Locale as is ja_JP
 
-jsp.error.no.scratch.dir=JSP\u30a8\u30f3\u30b8\u30f3\u306b\u30c7\u30d5\u30a9\u30eb\u30c8\u306escratchDir\u304c\u8a2d\u5b9a\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002\
-\n 
\u3053\u306e\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u306eservlets.properties\u30d5\u30a1\u30a4\u30eb\u306b\u3001\
-\n "jsp.initparams=scratchdir=" 
\u3092\u8ffd\u52a0\u3057\u3066\u304f\u3060\u3055\u3044\u3002
-jsp.error.bad.scratch.dir=\u3042\u306a\u305f\u304c\u6307\u5b9a\u3057\u305fscratchDir:
 [{0}] \u306f\u4f7f\u7528\u3067\u304d\u307e\u305b\u3093
-jsp.message.scratch.dir.is=JSP\u30a8\u30f3\u30b8\u30f3\u306eScratchdir: [{0}]
-jsp.message.parent_class_loader_is=\u89aa\u30af\u30e9\u30b9\u30ed\u30fc\u30c0: 
[{0}]
-jsp.message.dont.modify.servlets=\u91cd\u8981: 
\u751f\u6210\u3055\u308c\u305f\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8\u3092\u5909\u66f4\u3057\u3066\u306f\u3044\u3051\u307e\u305b\u3093
-jsp.error.unavailable=JSP\u306f\u5229\u7528\u4e0d\u53ef\u3068\u30de\u30fc\u30af\u3055\u308c\u3066\u3044\u307e\u3059
-jsp.error.usebean.duplicate=useBean: 
beanName\u5c5e\u6027\u304c\u91cd\u8907\u3057\u3066\u3044\u307e\u3059: [{0}]
-jsp.error.invalid.scope=''scope''\u5c5e\u6027\u306e\u5024\u304c\u7121\u52b9\u3067\u3059:
 [{0}] 
("page"\u3001"request"\u3001"session"\u53c8\u306f"application"\u306e\u3069\u308c\u304b\u3067\u306a\u3051\u308c\u3070\u3044\u3051\u307e\u305b\u3093)
-jsp.error.classname=.class\u30d5\u30a1\u30a4\u30eb\u304b\u3089\u30af\u30e9\u30b9\u540d\u3092\u6c7a\u5b9a\u3067\u304d\u307e\u305b\u3093
-jsp.error.data.file.write=\u30c7\u30fc\u30bf\u30d5\u30a1\u30a4\u30eb\u3092\u66f8\u304d\u8fbc\u307f\u4e2d\u306e\u30a8\u30e9\u30fc\u3067\u3059
-jsp.error.page.conflict.contenttype=page\u6307\u793a\u5b50: 
''contentType''\u3092\u7570\u306a\u308b\u5024\u3067\u8907\u6570\u56de\u6307\u5b9a\u3059\u308b\u306e\u306f\u7121\u52b9\u3067\u3059
 (\u65e7: [{0}], \u65b0: [{1}])
-jsp.error.page.conflict.session=page\u6307\u793a\u5b50: 
''session''\u3092\u7570\u306a\u308b\u5024\u3067\u8907\u6570\u56de\u6307\u5b9a\u3059\u308b\u306e\u306f\u7121\u52b9\u3067\u3059
 (\u65e7: [{0}], \u65b0: [{1}])
-jsp.error.page.invalid.session=page\u6307\u793a\u5b50: 
session\u5c5e\u6027\u306e\u5024\u304c\u7121\u52b9\u3067\u3059
-jsp.error.page.conflict.buffer=page\u6307\u793a\u5b50: 
''buffer''\u3092\u7570\u306a\u308b\u5024\u3067\u8907\u6570\u56de\u6307\u5b9a\u3059\u308b\u306e\u306f\u7121\u52b9\u3067\u3059
 (\u65e7: [{0}], \u65b0: [{1}])
-jsp.error.page.invalid.buffer=page\u6307\u793a\u5b50: 
buffer\u5c5e\u6027\u306e\u5024\u304c\u7121\u52b9\u3067\u3059
-jsp.error.page.conflict.autoflush=page\u6307\u793a\u5b50: 
''autoFlush''\u3092\u7570\u306a\u308b\u5024\u3067\u8907\u6570\u56de\u6307\u5b9a\u3059\u308b\u306e\u306f\u7121\u52b9\u3067\u3059
 (\u65e7: [{0}], \u65b0: [{1}])
-jsp.error.page.conflict.isthreadsafe=page\u6307\u793a\u5b50: 
''isThreadSafe''\u3092\u7570\u306a\u308b\u5024\u3067\u8907\u6570\u56de\u6307\u5b9a\u3059\u308b\u306e\u306f\u7121\u52b9\u3067\u3059
 (\u65e7: [{0}], \u65b0: [{1}])
-jsp.error.page.invalid.isthreadsafe=page\u6307\u793a\u5b50: 
isThreadSafe\u306e\u5024\u304c\u7121\u52b9\u3067\u3059
-jsp.error.page.conflict.info=page\u6307\u793a\u5b50: 
''info''\u3092\u7570\u306a\u308b\u5024\u3067\u8907\u6570\u56de\u6307\u5b9a\u3059\u308b\u306e\u306f\u7121\u52b9\u3067\u3059
 (\u65e7: [{0}], \u65b0: [{1}])
-jsp.error.page.invalid.info=page\u6307\u793a\u5b50: 
info\u5c5e\u6027\u306e\u5024\u304c\u7121\u52b9\u3067\u3059
-jsp.error.page.conflict.iserrorpage=page\u6307\u793a\u5b50: 
''isErrorPage''\u3092\u7570\u306a\u308b\u5024\u3067\u8907\u6570\u56de\u6307\u5b9a\u3059\u308b\u306e\u306f\u7121\u52b9\u3067\u3059
 (\u65e7: [{0}], \u65b0: [{1}])
-jsp.error.page.invalid.iserrorpage=page\u6307\u793a\u5b50: 
isErrorPage\u5c5e\u6027\u306e\u5024\u304c\u7121\u52b9\u3067\u3059
-jsp.error.page.conflict.errorpage=page\u6307\u793a\u5b50: 
''errorPage''\u3092\u7570\u306a\u308b\u5024\u3067\u8907\u6570\u56de\u6307\u5b9a\u3059\u308b\u306e\u306f\u7121\u52b9\u3067\u3059
 (\u65e7: [{0}], \u65b0: [{1}])
-jsp.error.page.conflict.language=page\u6307\u793a\u5b50: 
''language''\u3092\u7570\u306a\u308b\u5024\u3067\u8907\u6570\u56de\u6307\u5b9a\u3059\u308b\u306e\u306f\u7121\u52b9\u3067\u3059
 (\u65e7: [{0}], \u65b0: [{1}])
-jsp.error.tag.conflict.language=tag\u6307\u793a\u5b50: 
''language''\u3092\u7570\u306a\u308b\u5024\u3067\u8907\u6570\u56de\u6307\u5b9a\u3059\u308b\u306e\u306f\u7121\u52b9\u3067\u3059

Re: Message files encoding

2018-08-01 Thread Emmanuel Bourg

Le 01/08/2018 à 14:12, Mark Thomas a écrit :

> That solves the complexity problem. It looks like all that would be
> required is a change from copying the file to using native2ascii with
> appropriate src and destinations.
> 
> No objections here.

Ok it's committed (r1837237 and r1837238 for the build part, and
r1837239 for the properties conversion).

This revealed some typos in the French translation, I'm going to run the
files through a spell checker now.

Should we backport this change?

Emmanuel Bourg

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

Re: Message files encoding

2018-08-01 Thread Mark Thomas

On 01/08/18 15:10, Emmanuel Bourg wrote:
> Le 01/08/2018 à 14:12, Mark Thomas a écrit :
> 
>> That solves the complexity problem. It looks like all that would be
>> required is a change from copying the file to using native2ascii with
>> appropriate src and destinations.
>>
>> No objections here.
> 
> Ok it's committed (r1837237 and r1837238 for the build part, and
> r1837239 for the properties conversion).

I think there is a little more work to be done. Currently the files are
corrupted when I look at them in an IDE. I've tried playing with
svn:mimetype without much luck.

> This revealed some typos in the French translation, I'm going to run the
> files through a spell checker now.

Cool.

> Should we backport this change?

+1 once we have trunk the way we want it.

Mark

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

svn commit: r1837243 - in /tomcat/trunk/java/org/apache: catalina/authenticator/ catalina/core/ catalina/loader/ catalina/manager/ catalina/mbeans/ catalina/realm/ catalina/users/ catalina/util/ catal

2018-08-01 Thread ebourg

Author: ebourg
Date: Wed Aug  1 14:52:10 2018
New Revision: 1837243

URL: http://svn.apache.org/viewvc?rev=1837243&view=rev
Log:
Fixed several mistakes and inconsistencies in the French messages

Modified:

tomcat/trunk/java/org/apache/catalina/authenticator/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/catalina/loader/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/catalina/mbeans/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/catalina/realm/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/catalina/users/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/catalina/util/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/catalina/valves/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/naming/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/LocalStrings_fr.properties

Modified: 
tomcat/trunk/java/org/apache/catalina/authenticator/LocalStrings_fr.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/LocalStrings_fr.properties?rev=1837243&r1=1837242&r2=1837243&view=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/authenticator/LocalStrings_fr.properties 
(original)
+++ 
tomcat/trunk/java/org/apache/catalina/authenticator/LocalStrings_fr.properties 
Wed Aug  1 14:52:10 2018
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 authenticator.certificates=Aucune chaÃ®ne de certificat client (client 
certificate chain) dans cette requÃªte
-authenticator.formlogin=RÃ©fÃ©rence directe Ã  la form de connexion (form 
login page) invalide
+authenticator.formlogin=RÃ©fÃ©rence directe au formulaire de connexion (form 
login page) invalide
 authenticator.manager=Exception lors de l'initialisation des gestionnaires 
d'authentification (trust managers)
 authenticator.notContext=Erreur de configuration:  Doit Ãªtre attachÃ© Ã  un 
contexte
 authenticator.unauthorized=Impossible d'authentifier avec les crÃ©dits fournis 
(provided credentials)

Modified: tomcat/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties?rev=1837243&r1=1837242&r2=1837243&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties Wed 
Aug  1 14:52:10 2018
@@ -40,10 +40,10 @@ standardContext.filterStart=Exception au
 standardContext.isUnavailable=Cette application n'est pas disponible 
actuellement
 standardContext.listenerStart=Exception lors de l''envoi de l''Ã©vÃ¨nement 
contexte initialisÃ© (context initialized) Ã  l''instance de classe d''Ã©coute 
(listener) [{0}]
 standardContext.listenerStop=Exception lors de l''envoi de l''Ã©vÃ¨nement 
contexte dÃ©truit (context destroyed) Ã  l''instance de classe d''Ã©coute [{0}]
-standardContext.loginConfig.errorPage=La forme de page d''erreur (form error 
page) [{0}] doit commencer par un ''/''
-standardContext.loginConfig.errorWarning=ATTENTION: La forme de page d''erreur 
(form error page) [{0}] doit commencer par un ''/'' dans l''API Servlet 2.4
-standardContext.loginConfig.loginPage=La forme de page de connexion (form 
login page) [{0}] doit commencer par un ''/''
-standardContext.loginConfig.loginWarning=ATTENTION: La forme de page de 
connexion (form login page) [{0}] doit commencer par un ''/'' dans l''API 
Servlet 2.4
+standardContext.loginConfig.errorPage=La page d''erreur du formulaire [{0}] 
doit commencer par un ''/''
+standardContext.loginConfig.errorWarning=ATTENTION: La page d''erreur du 
formulaire [{0}] doit commencer par un ''/'' dans l''API Servlet 2.4
+standardContext.loginConfig.loginPage=La page de connexion du formulaire [{0}] 
doit commencer par un ''/''
+standardContext.loginConfig.loginWarning=ATTENTION: La page de connexion du 
formulaire [{0}] doit commencer par un ''/'' dans l''API Servlet 2.4
 standardContext.loginConfig.required="LoginConfig" ne peut Ãªtre nul
 standardContext.notStarted=Le contexte [{0}] n''a pas encore Ã©tÃ© dÃ©marrÃ©
 standardContext.notWrapper=Le fils du contexte (child of context) doit Ãªtre 
un enrobeur (wrapper)

Modified: 
tomcat/trunk/java/org/apache/catalina/loader/LocalStrings_fr.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/LocalStrings_fr.properties?rev=1837243&r1=1837242&r2=1837243&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/loader/LocalStrings_fr.properties 
(ori

svn commit: r1837244 - /tomcat/trunk/java/org/apache/catalina/manager/host/LocalStrings_ru.properties

2018-08-01 Thread markt

Author: markt
Date: Wed Aug  1 15:01:21 2018
New Revision: 1837244

URL: http://svn.apache.org/viewvc?rev=1837244&view=rev
Log:
Fix trailing whitespace

Modified:

tomcat/trunk/java/org/apache/catalina/manager/host/LocalStrings_ru.properties

Modified: 
tomcat/trunk/java/org/apache/catalina/manager/host/LocalStrings_ru.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/host/LocalStrings_ru.properties?rev=1837244&r1=1837243&r2=1837244&view=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/manager/host/LocalStrings_ru.properties 
(original)
+++ 
tomcat/trunk/java/org/apache/catalina/manager/host/LocalStrings_ru.properties 
Wed Aug  1 15:01:21 2018
@@ -20,7 +20,7 @@ hostManagerServlet.configBaseCreateFail=
 hostManagerServlet.noCommand=ÐÑÐ¸Ð±ÐºÐ°- ÐÐ¾Ð¼Ð°Ð½Ð´Ð° Ð½Ðµ ÑÐºÐ°Ð·Ð°Ð½Ð°.
 hostManagerServlet.postCommand=ÐÑÐ¸Ð±ÐºÐ°- ÐÑÑÐ°Ð»ÑÑ 
Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ {0} Ñ Ð¿Ð¾Ð¼Ð¾ÑÑÑ Ð·Ð°Ð¿ÑÐ¾ÑÐ° 
GET, Ð½Ð¾ ÑÑÐµÐ±ÑÐµÑÑÑ POST
 hostManagerServlet.unknownCommand=ÐÑÐ¸Ð±ÐºÐ°- ÐÐµÐ¸Ð·Ð²ÐµÑÑÐ½Ð°Ñ 
ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° {0}
-hostManagerServlet.noWrapper=ÐÐ»Ñ ÑÑÐ¾Ð³Ð¾ ÑÐµÑÐ²ÐµÑÐ° Ð½ÐµÑ 
setWrapper() 
+hostManagerServlet.noWrapper=ÐÐ»Ñ ÑÑÐ¾Ð³Ð¾ ÑÐµÑÐ²ÐµÑÐ° Ð½ÐµÑ 
setWrapper()
 hostManagerServlet.invalidHostName=ÐÑÐ¸Ð±ÐºÐ°- Ð£ÐºÐ°Ð·Ð°Ð½Ð¾ 
Ð½ÐµÐ´Ð¾Ð¿ÑÑÑÐ¸Ð¼Ð¾Ðµ Ð¸Ð¼Ñ ÑÐµÑÐ²ÐµÑÐ° {0}
 hostManagerServlet.noHost=ÐÑÐ¸Ð±ÐºÐ°- ÐÐ¼Ñ ÑÐµÑÐ²ÐµÑÐ° {0} Ð½Ðµ 
ÑÑÑÐµÑÑÐ²ÑÐµÑ
 hostManagerServlet.alreadyHost=ÐÑÐ¸Ð±ÐºÐ°- Ð£Ð¶Ðµ ÐµÑÑÑ ÑÐµÑÐ²ÐµÑ Ñ 
ÑÐ°ÐºÐ¸Ð¼ Ð¸Ð¼ÐµÐ½ÐµÐ¼ {0}



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

Re: Message files encoding

2018-08-01 Thread Emmanuel Bourg

Le 01/08/2018 à 16:34, Mark Thomas a écrit :

> I think there is a little more work to be done. Currently the files are
> corrupted when I look at them in an IDE. I've tried playing with
> svn:mimetype without much luck.

With IntelliJ the encoding is automatically detected as UTF-8, but I had
to restart the IDE otherwise it kept seeing them as ISO-8859-1 files and
started corrupting them. Invalidating the caches may also help ("File ->
Invalidate Caches / Restart" in IntelliJ). If it doesn't work there is a
per-project encoding for properties files that can be configured from
File -> Settings -> Editor -> File Encodings -> Properties Files.
Ironically I just noticed the 'Transparent native-to-ascii conversion'
checkbox there.

Emmanuel Bourg

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

svn commit: r1837245 - in /tomcat/trunk: java/javax/el/ java/javax/servlet/ java/javax/servlet/http/ java/org/apache/catalina/authenticator/ java/org/apache/catalina/authenticator/jaspic/ java/org/apa

2018-08-01 Thread markt

Author: markt
Date: Wed Aug  1 15:19:21 2018
New Revision: 1837245

URL: http://svn.apache.org/viewvc?rev=1837245&view=rev
Log:
Set svn:mime-type for UTF-8 propert files so they display correctly in web UI

Modified:
tomcat/trunk/java/javax/el/LocalStrings.properties   (props changed)
tomcat/trunk/java/javax/el/LocalStrings_es.properties   (props changed)
tomcat/trunk/java/javax/servlet/LocalStrings.properties   (props changed)
tomcat/trunk/java/javax/servlet/LocalStrings_es.properties   (props changed)
tomcat/trunk/java/javax/servlet/LocalStrings_fr.properties   (props changed)
tomcat/trunk/java/javax/servlet/LocalStrings_ja.properties   (props changed)
tomcat/trunk/java/javax/servlet/http/LocalStrings.properties   (props 
changed)
tomcat/trunk/java/javax/servlet/http/LocalStrings_es.properties   (props 
changed)
tomcat/trunk/java/javax/servlet/http/LocalStrings_fr.properties   (props 
changed)
tomcat/trunk/java/javax/servlet/http/LocalStrings_ja.properties   (props 
changed)
tomcat/trunk/java/org/apache/catalina/authenticator/LocalStrings.properties 
  (props changed)

tomcat/trunk/java/org/apache/catalina/authenticator/LocalStrings_es.properties  
 (props changed)

tomcat/trunk/java/org/apache/catalina/authenticator/LocalStrings_fr.properties  
 (props changed)

tomcat/trunk/java/org/apache/catalina/authenticator/LocalStrings_ja.properties  
 (props changed)

tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/LocalStrings.properties
   (props changed)
tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties   
(props changed)
tomcat/trunk/java/org/apache/catalina/connector/LocalStrings_es.properties  
 (props changed)
tomcat/trunk/java/org/apache/catalina/connector/LocalStrings_fr.properties  
 (props changed)
tomcat/trunk/java/org/apache/catalina/connector/LocalStrings_ja.properties  
 (props changed)
tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties   (props 
changed)
tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties   
(props changed)
tomcat/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties   
(props changed)
tomcat/trunk/java/org/apache/catalina/core/LocalStrings_ja.properties   
(props changed)
tomcat/trunk/java/org/apache/catalina/deploy/LocalStrings.properties   
(props changed)
tomcat/trunk/java/org/apache/catalina/filters/LocalStrings.properties   
(props changed)
tomcat/trunk/java/org/apache/catalina/filters/LocalStrings_es.properties   
(props changed)
tomcat/trunk/java/org/apache/catalina/filters/LocalStrings_fr.properties   
(props changed)

tomcat/trunk/java/org/apache/catalina/ha/authenticator/LocalStrings.properties  
 (props changed)
tomcat/trunk/java/org/apache/catalina/ha/context/LocalStrings.properties   
(props changed)
tomcat/trunk/java/org/apache/catalina/ha/deploy/LocalStrings.properties   
(props changed)
tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties   
(props changed)
tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings_es.properties 
  (props changed)
tomcat/trunk/java/org/apache/catalina/ha/tcp/LocalStrings.properties   
(props changed)
tomcat/trunk/java/org/apache/catalina/ha/tcp/LocalStrings_es.properties   
(props changed)
tomcat/trunk/java/org/apache/catalina/loader/LocalStrings.properties   
(props changed)
tomcat/trunk/java/org/apache/catalina/loader/LocalStrings_es.properties   
(props changed)
tomcat/trunk/java/org/apache/catalina/loader/LocalStrings_fr.properties   
(props changed)
tomcat/trunk/java/org/apache/catalina/loader/LocalStrings_ja.properties   
(props changed)
tomcat/trunk/java/org/apache/catalina/manager/LocalStrings.properties   
(props changed)
tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_de.properties   
(props changed)
tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_es.properties   
(props changed)
tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_fr.properties   
(props changed)
tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_ja.properties   
(props changed)
tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_ru.properties   
(props changed)
tomcat/trunk/java/org/apache/catalina/manager/host/LocalStrings.properties  
 (props changed)

tomcat/trunk/java/org/apache/catalina/manager/host/LocalStrings_es.properties   
(props changed)

tomcat/trunk/java/org/apache/catalina/manager/host/LocalStrings_ru.properties   
(props changed)
tomcat/trunk/java/org/apache/catalina/mapper/LocalStrings.properties   
(props changed)
tomcat/trunk/java/org/apache/catalina/mbeans/LocalStrings.properties   
(props changed)
tomcat/trunk/java/org/apache/catalina/mbeans/LocalStrings_fr.properties   
(props changed)
tomcat/trunk/java/org/apache/catalina/realm/LocalStrings.properties   
(props changed)
tomcat/trunk/ja

Re: Message files encoding

2018-08-01 Thread Mark Thomas

On 01/08/18 16:03, Emmanuel Bourg wrote:
> Le 01/08/2018 à 16:34, Mark Thomas a écrit :
> 
>> I think there is a little more work to be done. Currently the files are
>> corrupted when I look at them in an IDE. I've tried playing with
>> svn:mimetype without much luck.
> 
> With IntelliJ the encoding is automatically detected as UTF-8, but I had
> to restart the IDE otherwise it kept seeing them as ISO-8859-1 files and
> started corrupting them.

Eclipse doesn't appear to be so smart.

> Invalidating the caches may also help ("File ->
> Invalidate Caches / Restart" in IntelliJ). If it doesn't work there is a
> per-project encoding for properties files that can be configured from
> File -> Settings -> Editor -> File Encodings -> Properties Files.

Looks like the encoding will need to be set individually per file in
Eclipse. A bit of a pain but not too bad as you'll only need to set it
the first time you look at a file.

Mark

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

buildbot failure in on tomcat-trunk

2018-08-01 Thread buildbot

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

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

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' 
triggered this build
Build Source Stamp: [branch tomcat/trunk] 1837243
Blamelist: ebourg

BUILD FAILED: failed compile_1

Sincerely,
 -The Buildbot




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

svn commit: r1837246 - /tomcat/trunk/build.xml

2018-08-01 Thread markt

Author: markt
Date: Wed Aug  1 15:41:07 2018
New Revision: 1837246

URL: http://svn.apache.org/viewvc?rev=1837246&view=rev
Log:
ws police

Modified:
tomcat/trunk/build.xml

Modified: tomcat/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1837246&r1=1837245&r2=1837246&view=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Wed Aug  1 15:41:07 2018
@@ -710,7 +710,7 @@
 
   
 
-
+
 



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

buildbot success in on tomcat-trunk

2018-08-01 Thread buildbot

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

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

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' 
triggered this build
Build Source Stamp: [branch tomcat/trunk] 1837244
Blamelist: markt

Build succeeded!

Sincerely,
 -The Buildbot




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

Re: Message files encoding

2018-08-01 Thread Christopher Schultz

Mark,

On 8/1/18 11:21 AM, Mark Thomas wrote:
> On 01/08/18 16:03, Emmanuel Bourg wrote:
>> Le 01/08/2018 à 16:34, Mark Thomas a écrit :
>>
>>> I think there is a little more work to be done. Currently the files are
>>> corrupted when I look at them in an IDE. I've tried playing with
>>> svn:mimetype without much luck.
>>
>> With IntelliJ the encoding is automatically detected as UTF-8, but I had
>> to restart the IDE otherwise it kept seeing them as ISO-8859-1 files and
>> started corrupting them.
> 
> Eclipse doesn't appear to be so smart.
> 
>> Invalidating the caches may also help ("File ->
>> Invalidate Caches / Restart" in IntelliJ). If it doesn't work there is a
>> per-project encoding for properties files that can be configured from
>> File -> Settings -> Editor -> File Encodings -> Properties Files.
> 
> Looks like the encoding will need to be set individually per file in
> Eclipse. A bit of a pain but not too bad as you'll only need to set it
> the first time you look at a file.

Dare I suggest using a UTF-8 BOM?

-chris



signature.asc
Description: OpenPGP digital signature

svn commit: r1837259 - in /tomcat/tc8.5.x/trunk: java/org/apache/coyote/http2/Http2Protocol.java java/org/apache/coyote/http2/Http2UpgradeHandler.java test/org/apache/coyote/http2/TestAbstractStream.j

2018-08-01 Thread markt

Author: markt
Date: Wed Aug  1 20:27:24 2018
New Revision: 1837259

URL: http://svn.apache.org/viewvc?rev=1837259&view=rev
Log:
Fix error in back-port of HTTP/2 compression

Modified:
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Http2Protocol.java
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
tomcat/tc8.5.x/trunk/test/org/apache/coyote/http2/TestAbstractStream.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Http2Protocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Http2Protocol.java?rev=1837259&r1=1837258&r2=1837259&view=diff
==
--- tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Http2Protocol.java 
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Http2Protocol.java Wed 
Aug  1 20:27:24 2018
@@ -106,7 +106,7 @@ public class Http2Protocol implements Up
 @Override
 public InternalHttpUpgradeHandler getInternalUpgradeHandler(Adapter 
adapter,
 Request coyoteRequest) {
-Http2UpgradeHandler result = new Http2UpgradeHandler(adapter, 
coyoteRequest);
+Http2UpgradeHandler result = new Http2UpgradeHandler(this, adapter, 
coyoteRequest);
 
 result.setReadTimeout(getReadTimeout());
 result.setKeepAliveTimeout(getKeepAliveTimeout());

Modified: 
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java?rev=1837259&r1=1837258&r2=1837259&view=diff
==
--- tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java 
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java 
Wed Aug  1 20:27:24 2018
@@ -152,6 +152,14 @@ public class Http2UpgradeHandler extends
 private int maxTrailerSize = Constants.DEFAULT_MAX_TRAILER_SIZE;
 
 
+/**
+ * @param adapter   The adapter to use to process the upgrade
+ * @param coyoteRequest The request to use to process the upgrade
+ *
+ * @deprecated This will be removed in Tomcat 9 onwards.
+ * Use {@link #Http2UpgradeHandler(Http2Protocol, Adapter, 
Request)}
+ */
+@Deprecated
 public Http2UpgradeHandler(Adapter adapter, Request coyoteRequest) {
 this(null, adapter, coyoteRequest);
 }

Modified: 
tomcat/tc8.5.x/trunk/test/org/apache/coyote/http2/TestAbstractStream.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/coyote/http2/TestAbstractStream.java?rev=1837259&r1=1837258&r2=1837259&view=diff
==
--- tomcat/tc8.5.x/trunk/test/org/apache/coyote/http2/TestAbstractStream.java 
(original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/coyote/http2/TestAbstractStream.java 
Wed Aug  1 20:27:24 2018
@@ -28,7 +28,7 @@ public class TestAbstractStream {
 @Test
 public void testDependenciesFig3() {
 // Setup
-Http2UpgradeHandler handler = new Http2UpgradeHandler(null, null);
+Http2UpgradeHandler handler = new Http2UpgradeHandler(null, null, 
null);
 Stream a = new Stream(Integer.valueOf(1), handler);
 Stream b = new Stream(Integer.valueOf(2), handler);
 Stream c = new Stream(Integer.valueOf(3), handler);
@@ -59,7 +59,7 @@ public class TestAbstractStream {
 @Test
 public void testDependenciesFig4() {
 // Setup
-Http2UpgradeHandler handler = new Http2UpgradeHandler(null, null);
+Http2UpgradeHandler handler = new Http2UpgradeHandler(null, null, 
null);
 Stream a = new Stream(Integer.valueOf(1), handler);
 Stream b = new Stream(Integer.valueOf(2), handler);
 Stream c = new Stream(Integer.valueOf(3), handler);
@@ -90,7 +90,7 @@ public class TestAbstractStream {
 @Test
 public void testDependenciesFig5NonExclusive() {
 // Setup
-Http2UpgradeHandler handler = new Http2UpgradeHandler(null, null);
+Http2UpgradeHandler handler = new Http2UpgradeHandler(null, null, 
null);
 Stream a = new Stream(Integer.valueOf(1), handler);
 Stream b = new Stream(Integer.valueOf(2), handler);
 Stream c = new Stream(Integer.valueOf(3), handler);
@@ -132,7 +132,7 @@ public class TestAbstractStream {
 @Test
 public void testDependenciesFig5Exclusive() {
 // Setup
-Http2UpgradeHandler handler = new Http2UpgradeHandler(null, null);
+Http2UpgradeHandler handler = new Http2UpgradeHandler(null, null, 
null);
 Stream a = new Stream(Integer.valueOf(1), handler);
 Stream b = new Stream(Integer.valueOf(2), handler);
 Stream c = new Stream(Integer.valueOf(3), handler);
@@ -174,7 +174,7 @@ public class TestAbstrac

[GUMP@vmgump-vm3]: Project tomcat-trunk-validate-eoln (in module tomcat-trunk) failed

2018-08-01 Thread Bill Barker

To whom it may engage...

This is an automated request, but not an unsolicited one. For 
more information please visit http://gump.apache.org/nagged.html, 
and/or contact the folk at gene...@gump.apache.org.

Project tomcat-trunk-validate-eoln has an issue affecting its community 
integration.
This issue affects 1 projects.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-trunk-validate-eoln :  Tomcat 9.x, a web server implementing the 
Java Servlet 4.0,
...


Full details are available at:

http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-validate-eoln/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -INFO- Failed with reason build failed



The following work was performed:
http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-validate-eoln/gump_work/build_tomcat-trunk_tomcat-trunk-validate-eoln.html
Work Name: build_tomcat-trunk_tomcat-trunk-validate-eoln (Type: Build)
Work ended in a state of : Failed
Elapsed: 9 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only -Dsun.zip.disableMemoryMapping=true 
org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml 
validate-eoln 
[Working Directory: /srv/gump/public/workspace/tomcat-trunk]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/classes:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar
-
Buildfile: /srv/gump/public/workspace/tomcat-trunk/build.xml

build-prepare:
[mkdir] Created dir: /srv/gump/public/workspace/tomcat-trunk/output/classes
[mkdir] Created dir: /srv/gump/public/workspace/tomcat-trunk/output/build
[mkdir] Created dir: 
/srv/gump/public/workspace/tomcat-trunk/output/build/bin
[mkdir] Created dir: 
/srv/gump/public/workspace/tomcat-trunk/output/build/conf
[mkdir] Created dir: 
/srv/gump/public/workspace/tomcat-trunk/output/build/lib
[mkdir] Created dir: 
/srv/gump/public/workspace/tomcat-trunk/output/build/logs
[mkdir] Created dir: 
/srv/gump/public/workspace/tomcat-trunk/output/build/temp
[mkdir] Created dir: 
/srv/gump/public/workspace/tomcat-trunk/output/build/webapps

compile-prepare:
 [copy] Copying 1 file to 
/srv/gump/public/workspace/tomcat-trunk/java/org/apache/catalina/startup
 [copy] Copying 1 file to 
/srv/gump/public/workspace/tomcat-trunk/webapps/docs

validate-eoln:
[javac] Compiling 1 source file to 
/srv/gump/public/workspace/tomcat-trunk/output/classes
[javac] Support for javac --release has been added in Java9 ignoring it
 [checkeol] Checking line ends in 3257 file(s)
 [checkeol] Checking line ends in 100 file(s)
 [checkeol] Done line ends check in 3357 file(s), 2 error(s) found.
 [checkeol] The following files have wrong line ends: [
 [checkeol] 
/srv/gump/public/workspace/tomcat-trunk/java/org/apache/catalina/manager/LocalStrings_ru.properties:
 uses CRLF on line 1, 
 [checkeol] 
/srv/gump/public/workspace/tomcat-trunk/java/org/apache/catalina/manager/host/LocalStrings_ru.properties:
 uses CRLF on line 1]

BUILD FAILED
/srv/gump/public/workspace/tomcat-trunk/build.xml:648: The following files have 
wrong line ends: [
/srv/gump/public/workspace/tomcat-trunk/java/org/apache/catalina/manager/LocalStrings_ru.properties:
 uses CRLF on line 1, 
/srv/gump/public/workspace/tomcat-trunk/java/org/apache/catalina/manager/host/LocalStrings_ru.properties:
 uses CRLF on line 1]

Total time: 8 seconds
-

To subscribe to this information via syndicated feeds:
- RSS: 
http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-validate-eoln/rss.xml
- Atom: 
http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-validate-eoln/atom.xml

== Gump Tracking Only ===
Produced by Apache Gump(TM) version 2.3.
Gump Run 2018080206, vmgump-vm3.apache.org:vmgump:2018080206
Gump E-mail Identifier (unique within run) #1.

--
Apache Gump
http://gump.apache.org/ [Instance: vmgump-vm3]

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

49 matches

Mail list logo