[GitHub] tomcat pull request #:

[markt-asf]

Github user markt-asf commented on the pull request:


https://github.com/apache/tomcat/commit/d46012cb159c3384303eeceffc54eb78e6a62671#commitcomment-21553794
  
In java/org/apache/el/Messages.properties:
In java/org/apache/el/Messages.properties on line 32:
Let me take a closer look at this one. Generally, I think we need to move 
away from using ''{n}'' and use [{n}] more consistently.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

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

svn commit: r1789442 - /tomcat/trunk/java/org/apache/el/Messages.properties

[markt]

Author: markt
Date: Thu Mar 30 07:54:35 2017
New Revision: 1789442

URL: http://svn.apache.org/viewvc?rev=1789442&view=rev
Log:
Follow up to r1789415

Modified:
tomcat/trunk/java/org/apache/el/Messages.properties

Modified: tomcat/trunk/java/org/apache/el/Messages.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/Messages.properties?rev=1789442&r1=1789441&r2=1789442&view=diff
==
--- tomcat/trunk/java/org/apache/el/Messages.properties (original)
+++ tomcat/trunk/java/org/apache/el/Messages.properties Thu Mar 30 07:54:35 2017
@@ -29,7 +29,7 @@ error.value.literal.write=ValueExpressio
 
 # ExpressionFactoryImpl
 error.null=Expression cannot be null
-error.mixed=Expression cannot contain both ''#{..}'' and ''${..}'' : {0}
+error.mixed=Expression cannot contain both '#{...}' and '${...}' : {0}
 error.method=Not a valid MethodExpression : {0}
 error.method.nullParms=Parameter types cannot be null
 error.value.expectedType=Expected type cannot be null



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

svn commit: r1789443 - in /tomcat/trunk/java: javax/el/ org/apache/el/ org/apache/jasper/resources/ org/apache/naming/

[markt]

Author: markt
Date: Thu Mar 30 07:59:07 2017
New Revision: 1789443

URL: http://svn.apache.org/viewvc?rev=1789443&view=rev
Log:
Replace the use of '...' to delimit values in messages with [...] because a) it 
is more consistent and b) ' needs to be escaped whereas [ and ] do not.

Modified:
tomcat/trunk/java/javax/el/LocalStrings.properties
tomcat/trunk/java/javax/el/LocalStrings_es.properties
tomcat/trunk/java/org/apache/el/Messages.properties
tomcat/trunk/java/org/apache/el/Messages_es.properties
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/naming/LocalStrings.properties
tomcat/trunk/java/org/apache/naming/LocalStrings_es.properties

Modified: tomcat/trunk/java/javax/el/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/LocalStrings.properties?rev=1789443&r1=1789442&r2=1789443&view=diff
==
--- tomcat/trunk/java/javax/el/LocalStrings.properties (original)
+++ tomcat/trunk/java/javax/el/LocalStrings.properties Thu Mar 30 07:59:07 2017
@@ -16,11 +16,11 @@
 # Default localized string information
 # Localized for Locale en_US
 
-propertyNotFound=Property ''{1}'' not found on type {0}
-propertyNotReadable=Property ''{1}'' not readable on type {0}
-propertyNotWritable=Property ''{1}'' not writable on type {0}
-propertyReadError=Error reading ''{1}'' on type {0}
-propertyWriteError=Error writing ''{1}'' on type {0}
+propertyNotFound=Property [{1}] not found on type {0}
+propertyNotReadable=Property [{1}] not readable on type {0}
+propertyNotWritable=Property [{1}] not writable on type {0}
+propertyReadError=Error reading [{1}] on type {0}
+propertyWriteError=Error writing [{1}] on type {0}
 objectNotAssignable=Unable to add an object of type [{0}] to an array of 
objects of type [{1}]
 
 beanNameELResolver.beanReadOnly=The bean name [{0}] is read-only

Modified: tomcat/trunk/java/javax/el/LocalStrings_es.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/LocalStrings_es.properties?rev=1789443&r1=1789442&r2=1789443&view=diff
==
--- tomcat/trunk/java/javax/el/LocalStrings_es.properties (original)
+++ tomcat/trunk/java/javax/el/LocalStrings_es.properties Thu Mar 30 07:59:07 
2017
@@ -12,9 +12,9 @@
 # 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.
-propertyNotFound = Propiedad ''{1}'' no hallada en el tipo {0}
-propertyNotReadable = Propiedad ''{1}'' no legible para el tipo {0}
-propertyNotWritable = Propiedad ''{1}'' no grabable para el tipo {0}
-propertyReadError = Error reading ''{1}'' en el tipo {0}
-propertyWriteError = Error writing ''{1}'' en el tipo {0}
+propertyNotFound = Propiedad [{1}] no hallada en el tipo {0}
+propertyNotReadable = Propiedad [{1}] no legible para el tipo {0}
+propertyNotWritable = Propiedad [{1}] no grabable para el tipo {0}
+propertyReadError = Error reading [{1}] en el tipo {0}
+propertyWriteError = Error writing [{1}] en el tipo {0}
 objectNotAssignable = No puedo a\u00F1adir un objeto del tipo [{0}] a un 
arreglo de objetos del tipo [{1}]

Modified: tomcat/trunk/java/org/apache/el/Messages.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/Messages.properties?rev=1789443&r1=1789442&r2=1789443&view=diff
==
--- tomcat/trunk/java/org/apache/el/Messages.properties (original)
+++ tomcat/trunk/java/org/apache/el/Messages.properties Thu Mar 30 07:59:07 2017
@@ -16,11 +16,11 @@
 # General Errors
 error.convert=Cannot convert {0} of type {1} to {2}
 error.compare=Cannot compare {0} to {1}
-error.function=Problems calling function ''{0}''
-error.unreachable.base=Target Unreachable, identifier ''{0}'' resolved to null
-error.unreachable.property=Target Unreachable, ''{0}'' returned null
-error.resolver.unhandled=ELResolver did not handle type: {0} with property of 
''{1}''
-error.resolver.unhandled.null=ELResolver cannot handle a null base Object with 
identifier ''{0}''
+error.function=Problems calling function [{0}]
+error.unreachable.base=Target Unreachable, identifier [{0}] resolved to null
+error.unreachable.property=Target Unreachable, [{0}] returned null
+error.resolver.unhandled=ELResolver did not handle type: {0} with property of 
[{1}]
+error.resolver.unhandled.null=ELResolver cannot handle a null base Object with 
identifier [{0}]
 error.invoke.wrongParams=The method [{0}] was called with [{1}] parameter(s) 
when it expected [{2}]
 error.inv

svn commit: r1789447 - in /tomcat/trunk/java/org/apache: catalina/core/ catalina/filters/ catalina/ha/deploy/ catalina/manager/ catalina/mbeans/ catalina/realm/ catalina/startup/ catalina/tribes/membe

[markt]

Author: markt
Date: Thu Mar 30 08:12:02 2017
New Revision: 1789447

URL: http://svn.apache.org/viewvc?rev=1789447&view=rev
Log:
Replace the use of "..." to delimit values in messages with [...] because it is 
more consistent.

Modified:
tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/filters/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/filters/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/ha/deploy/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/mbeans/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/mbeans/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/catalina/realm/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/realm/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties

tomcat/trunk/java/org/apache/catalina/tribes/membership/LocalStrings.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/el/Messages_es.properties
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties

Modified: tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties?rev=1789447&r1=1789446&r2=1789447&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties Thu Mar 
30 08:12:02 2017
@@ -76,7 +76,7 @@ aprListener.config=APR/OpenSSL configura
 aprListener.skipFIPSInitialization=Already in FIPS mode; skipping FIPS 
initialization.
 aprListener.enterAlreadyInFIPSMode=AprLifecycleListener is configured to force 
entering FIPS mode, but library is already in FIPS mode ({0})
 aprListener.requireNotInFIPSMode=AprLifecycleListener is configured to require 
the library to already be in FIPS mode, but it was not in FIPS mode
-aprListener.wrongFIPSMode=Unexpected value of FIPSMode option of 
AprLifecycleListener: "{0}"
+aprListener.wrongFIPSMode=Unexpected value of FIPSMode option of 
AprLifecycleListener: [{0}]
 aprListener.initializingFIPS=Initializing FIPS mode...
 aprListener.initializeFIPSSuccess=Successfully entered FIPS mode
 aprListener.initializeFIPSFailed=Failed to enter FIPS mode
@@ -125,7 +125,7 @@ standardContext.backgroundProcess.resour
 standardContext.cluster.noManager=No manager found. Checking if cluster 
manager should be used. Cluster configured: [{0}], Application distributable: 
[{1}]
 standardContext.configurationFail=One or more components marked the context as 
not correctly configured
 standardContext.cookieProcessor.null=It is not permitted to set the 
CookieProcessor for a Context to null
-standardContext.duplicateListener=The listener "{0}" is already configured for 
this context. The duplicate definition has been ignored.
+standardContext.duplicateListener=The listener [{0}] is already configured for 
this context. The duplicate definition has been ignored.
 standardContext.errorPage.error=Error page location {0} must start with a ''/''
 standardContext.errorPage.required=ErrorPage cannot be null
 standardContext.errorPage.warning=WARNING: Error page location {0} must start 
with a ''/'' in Servlet 2.4

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=1789447&r1=1789446&r2=1789447&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties Thu 
Mar 30 08:12:02 2017
@@ -76,7 +76,7 @@ standardContext.applicationSkipped = Se
 standardContext.backgroundProcess.loader = Excepci\u00F3n al procesar cargador 
{0} de proceso en segundo plano
 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 usa

svn commit: r1789453 - in /tomcat/trunk/java/javax: el/ servlet/ servlet/http/

[markt]

Author: markt
Date: Thu Mar 30 08:21:58 2017
New Revision: 1789453

URL: http://svn.apache.org/viewvc?rev=1789453&view=rev
Log:
Add [...] delimiters to values in messages that don't currently have them for 
javax packages

Modified:
tomcat/trunk/java/javax/el/LocalStrings.properties
tomcat/trunk/java/javax/el/LocalStrings_es.properties
tomcat/trunk/java/javax/servlet/LocalStrings.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.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

Modified: tomcat/trunk/java/javax/el/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/LocalStrings.properties?rev=1789453&r1=1789452&r2=1789453&view=diff
==
--- tomcat/trunk/java/javax/el/LocalStrings.properties (original)
+++ tomcat/trunk/java/javax/el/LocalStrings.properties Thu Mar 30 08:21:58 2017
@@ -16,11 +16,11 @@
 # Default localized string information
 # Localized for Locale en_US
 
-propertyNotFound=Property [{1}] not found on type {0}
-propertyNotReadable=Property [{1}] not readable on type {0}
-propertyNotWritable=Property [{1}] not writable on type {0}
-propertyReadError=Error reading [{1}] on type {0}
-propertyWriteError=Error writing [{1}] on type {0}
+propertyNotFound=Property [{1}] not found on type [{0}]
+propertyNotReadable=Property [{1}] not readable on type [{0}]
+propertyNotWritable=Property [{1}] not writable on type [{0}]
+propertyReadError=Error reading [{1}] on type [{0}]
+propertyWriteError=Error writing [{1}] on type [{0}]
 objectNotAssignable=Unable to add an object of type [{0}] to an array of 
objects of type [{1}]
 
 beanNameELResolver.beanReadOnly=The bean name [{0}] is read-only

Modified: tomcat/trunk/java/javax/el/LocalStrings_es.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/LocalStrings_es.properties?rev=1789453&r1=1789452&r2=1789453&view=diff
==
--- tomcat/trunk/java/javax/el/LocalStrings_es.properties (original)
+++ tomcat/trunk/java/javax/el/LocalStrings_es.properties Thu Mar 30 08:21:58 
2017
@@ -13,8 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 propertyNotFound = Propiedad [{1}] no hallada en el tipo {0}
-propertyNotReadable = Propiedad [{1}] no legible para el tipo {0}
-propertyNotWritable = Propiedad [{1}] no grabable para el tipo {0}
-propertyReadError = Error reading [{1}] en el tipo {0}
-propertyWriteError = Error writing [{1}] en el tipo {0}
+propertyNotReadable = Propiedad [{1}] no legible para el tipo [{0}]
+propertyNotWritable = Propiedad [{1}] no grabable para el tipo [{0}]
+propertyReadError = Error reading [{1}] en el tipo [{0}]
+propertyWriteError = Error writing [{1}] en el tipo [{0}]
 objectNotAssignable = No puedo a\u00F1adir un objeto del tipo [{0}] a un 
arreglo de objetos del tipo [{1}]

Modified: tomcat/trunk/java/javax/servlet/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/LocalStrings.properties?rev=1789453&r1=1789452&r2=1789453&view=diff
==
--- tomcat/trunk/java/javax/servlet/LocalStrings.properties (original)
+++ tomcat/trunk/java/javax/servlet/LocalStrings.properties Thu Mar 30 08:21:58 
2017
@@ -16,7 +16,7 @@
 # Default localized string information
 # Localized for Locale en_US
 
-err.not_iso8859_1=Not an ISO 8859-1 character: {0}
+err.not_iso8859_1=Not an ISO 8859-1 character: [{0}]
 value.true=true
 value.false=false
 

Modified: tomcat/trunk/java/javax/servlet/LocalStrings_es.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/LocalStrings_es.properties?rev=1789453&r1=1789452&r2=1789453&view=diff
==
--- tomcat/trunk/java/javax/servlet/LocalStrings_es.properties (original)
+++ tomcat/trunk/java/javax/servlet/LocalStrings_es.properties Thu Mar 30 
08:21:58 2017
@@ -12,7 +12,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-err.not_iso8859_1 = No es un car\u00E1cter ISO 8859-1\: {0}
+err.not_iso8859_1 = No es un car\u00E1cter ISO 8859-1\: [{0}]
 value.true = true
 value.false = false
 httpConstraintElement.invalidRolesDeny = No se pueden especificar Roles al 
utilizar DENY (DENEGAR)

Modified: tomcat/trunk/java/javax/servlet/LocalStrings_fr.properties
URL: 
h

svn commit: r1789456 [2/2] - in /tomcat/trunk/java: javax/servlet/ org/apache/catalina/authenticator/ org/apache/catalina/connector/ org/apache/catalina/core/ org/apache/catalina/filters/ org/apache/c

[markt]

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=1789456&r1=1789455&r2=1789456&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties 
(original)
+++ tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties 
Thu Mar 30 08:40:14 2017
@@ -19,40 +19,40 @@ jsp.error.compiler = No hay compilador J
 jsp.error.no.scratch.dir = El motor JSP no tiene configurado un directorio de 
trabajo.\n\
 \ A\u00F1ada "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}
-jsp.message.parent_class_loader_is = El cargador de clases es\: {0}
-jsp.message.dont.modify.servlets = IMPORTANTE\: No modifique los servlets 
generados
+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}
+jsp.message.parent_class_loader_is = El cargador de clases es: {0}
+jsp.message.dont.modify.servlets = IMPORTANTE: No modifique los servlets 
generados
 jsp.error.unavailable = JSP ha sido marcado como no disponible
-jsp.error.usebean.duplicate = useBean\: Nombre de bean duplicado\: {0}
-jsp.error.invalid.scope = Valor ilegal de atributo ''scope''\: {0} (debe de 
ser uno de "page", "request", "session", o "application")
+jsp.error.usebean.duplicate = useBean: Nombre de bean duplicado: {0}
+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 datos
-jsp.error.page.conflict.contenttype = Directiva Page\: es ilegal tener 
m\u00FAltiples ocurrencias de ''contentType'' con valores distintos (viejo\: 
{0}, nuevo\: {1})
-jsp.error.page.conflict.session = Directiva Page\: es ilegal tener 
m\u00FAltiples ocurrencias de ''session'' con valores distintos (viejo\: {0}, 
nuevo\: {1})
-jsp.error.page.invalid.session = Directiva Page\: valor incorrecto para session
-jsp.error.page.conflict.buffer = Directiva Page\: es ilegal tener 
m\u00FAltiples ocurrencias de ''buffer'' con valores distintos (viejo\: {0}, 
nuevo\: {1})
-jsp.error.page.invalid.buffer = Directiva Page\: valor incorrecto para 
b\u00FAfer
-jsp.error.page.conflict.autoflush = Directiva Page\: es ilegal tener 
m\u00FAltiples ocurrencias de ''autoFlush'' con valores distintos (viejo\: {0}, 
nuevo\: {1})
-jsp.error.page.conflict.isthreadsafe = Directiva Page\: es ilegal tener 
m\u00FAltiples ocurrencias de ''isThreadSafe'' con valores distintos (viejo\: 
{0}, nuevo\: {1})
-jsp.error.page.invalid.isthreadsafe = \=Directiva Page\: valor incorrecto para 
isThreadSafe
-jsp.error.page.conflict.info = Directiva Page\: es ilegal tener m\u00FAltiples 
ocurrencias de ''info'' con valores distintos (viejo\: {0}, nuevo\: {1})
-jsp.error.page.invalid.info = \=Directiva Page\: valor incorrecto para info
-jsp.error.page.conflict.iserrorpage = Directiva Page\: es ilegal tener 
m\u00FAltiples ocurrencias de ''isErrorPage'' con valores distintos (viejo\: 
{0}, nuevo\: {1})
-jsp.error.page.invalid.iserrorpage = \=Directiva Page\: valor incorrecto para 
isErrorPage
-jsp.error.page.conflict.errorpage = Directiva Page\: es ilegal tener 
m\u00FAltiples ocurrencias de ''errorPage'' con valores distintos (viejo\: {0}, 
nuevo\: {1})
-jsp.error.page.conflict.language = Directiva Page\: es ilegal tener 
m\u00FAltiples ocurrencias de ''language'' con valores distintos (viejo\: {0}, 
nuevo\: {1})
-jsp.error.tag.conflict.language = Directiva Tag\: es ilegal tener 
m\u00FAltiples ocurrencias de ''language'' con valores distintos (viejo\: {0}, 
nuevo\: {1})
-jsp.error.page.language.nonjava = Directiva Page\: atributo language incorrecto
-jsp.error.tag.language.nonjava = Directiva Tag\: atributo language incorrecto
-jsp.error.page.conflict.extends = Directiva Page\: es ilegal tener 
m\u00FAltiples ocurrencias de ''extends'' con valores distintos (viejo\: {0}, 
nuevo\: {1})
-jsp.error.page.conflict.iselignored = Directiva Page\: es ilegal tener 
m\u00FAltiples ocurrencias de ''isELIgnored'' con valores distintos (viejo\: 
{0}, nuevo\: {1})
-jsp.error.tag.conflict.iselignored = Directiva Tag\: es ilegal tener 
m\u00FAltiples ocurrencias de ''isELIgnored'' con valores distintos (viejo\: 
{0}, nuevo\: {1})
-jsp.error.page.invalid.iselignored = Directiva Page\: valor inv\u00E1lido para 
isELIgnored
-jsp.error.tag.invalid.iselignored = Directiva Tag\: valor inco

svn commit: r1789456 [1/2] - in /tomcat/trunk/java: javax/servlet/ org/apache/catalina/authenticator/ org/apache/catalina/connector/ org/apache/catalina/core/ org/apache/catalina/filters/ org/apache/c

[markt]

Author: markt
Date: Thu Mar 30 08:40:14 2017
New Revision: 1789456

URL: http://svn.apache.org/viewvc?rev=1789456&view=rev
Log:
: does not need to be escaped in the value component of a properties file

Modified:
tomcat/trunk/java/javax/servlet/LocalStrings_es.properties

tomcat/trunk/java/org/apache/catalina/authenticator/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/connector/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/filters/LocalStrings_es.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/manager/LocalStrings_es.properties

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

tomcat/trunk/java/org/apache/catalina/tribes/transport/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/util/LocalStrings_es.properties
tomcat/trunk/java/org/apache/el/Messages_es.properties
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
tomcat/trunk/java/org/apache/naming/LocalStrings_es.properties
tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings_es.properties

Modified: tomcat/trunk/java/javax/servlet/LocalStrings_es.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/LocalStrings_es.properties?rev=1789456&r1=1789455&r2=1789456&view=diff
==
--- tomcat/trunk/java/javax/servlet/LocalStrings_es.properties (original)
+++ tomcat/trunk/java/javax/servlet/LocalStrings_es.properties Thu Mar 30 
08:40:14 2017
@@ -12,7 +12,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-err.not_iso8859_1 = No es un car\u00E1cter ISO 8859-1\: [{0}]
+err.not_iso8859_1 = No es un car\u00E1cter ISO 8859-1: [{0}]
 value.true = true
 value.false = false
 httpConstraintElement.invalidRolesDeny = No se pueden especificar Roles al 
utilizar DENY (DENEGAR)

Modified: 
tomcat/trunk/java/org/apache/catalina/authenticator/LocalStrings_es.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/LocalStrings_es.properties?rev=1789456&r1=1789455&r2=1789456&view=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/authenticator/LocalStrings_es.properties 
(original)
+++ 
tomcat/trunk/java/org/apache/catalina/authenticator/LocalStrings_es.properties 
Thu Mar 30 08:40:14 2017
@@ -17,7 +17,7 @@ authenticator.formlogin = Referencia dir
 authenticator.loginFail = No pude ingresar
 authenticator.manager = Excepci\u00F3n inicializando administradores de 
confianza
 authenticator.noAuthHeader = El cliente no ha enviado autorizaci\u00F3n de 
cabecera
-authenticator.notContext = Error de Configuraci\u00F3n\: Debe de estar unido a 
un Contexto
+authenticator.notContext = Error de Configuraci\u00F3n: Debe de estar unido a 
un Contexto
 authenticator.requestBodyTooBig = El cuerpo del requerimiento era demasiado 
grande para realizar cach\u00E9 durante el proceso de autenticaci\u00F3n
 authenticator.sessionExpired = El tiempo permitido para realizar login ha sido 
excedido. Si deseas continuar, debes hacer clik dos veces y volver a hacer clik 
otra vez o cerrar y reabrir tu navegador
 authenticator.unauthorized = Imposible autenticar mediante las credenciales 
suministradas

Modified: 
tomcat/trunk/java/org/apache/catalina/connector/LocalStrings_es.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/LocalStrings_es.properties?rev=1789456&r1=1789455&r2=1789456&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/LocalStrings_es.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/LocalStrings_es.properties 
Thu Mar 30 08:40:14 2017
@@ -51,7 +51,7 @@ coyoteRequest.uploadLocationInvalid = No
 coyoteRequest.sessionEndAccessFail = Excepci\u00F3n disparada acabando acceso 
a sesi\u00F3n mientras se reciclaba el requerimiento
 requestFacade.nullRequest = El objeto de requerimiento ha sido reciclado y ya 
no est\u00E1 asociado con esta fachada
 responseFacade.nullResponse = El objeto de respuesta ha sido reciclado y ya no 
est\u00E1 asociado con esta fachada
-mapperListener.unknownDefaultHost = M\u00E1quin

svn commit: r1789458 - in /tomcat/trunk/java/org/apache: catalina/filters/ catalina/ha/session/ catalina/manager/host/ catalina/tribes/transport/ jasper/resources/

[markt]

Author: markt
Date: Thu Mar 30 08:42:43 2017
New Revision: 1789458

URL: http://svn.apache.org/viewvc?rev=1789458&view=rev
Log:
! does not need to be escaped in the value component of a properties file

Modified:
tomcat/trunk/java/org/apache/catalina/filters/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings_es.properties

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

tomcat/trunk/java/org/apache/catalina/tribes/transport/LocalStrings_es.properties
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties

Modified: 
tomcat/trunk/java/org/apache/catalina/filters/LocalStrings_es.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/LocalStrings_es.properties?rev=1789458&r1=1789457&r2=1789458&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/filters/LocalStrings_es.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/filters/LocalStrings_es.properties 
Thu Mar 30 08:42:43 2017
@@ -25,7 +25,7 @@ expiresFilter.noExpirationConfiguredForC
 expiresFilter.useMatchingConfiguration = El Uso de {0} coincidente con [{1}] 
para content-type [{2}] devuelve {3}
 expiresFilter.useDefaultConfiguration = El uso de {0} por defecto para 
content-type [{1}] devuelve {2}
 expiresFilter.unsupportedStartingPoint = No soportado startingPoint [{0}]
-expiresFilter.unknownParameterIgnored = \u00A1Se ignora el par\u00E1metro 
desconocido [{0}] con valor [{1}] especificado\!
+expiresFilter.unknownParameterIgnored = \u00A1Se ignora el par\u00E1metro 
desconocido [{0}] con valor [{1}] especificado!
 expiresFilter.exceptionProcessingParameter = Excepci\u00F3n al procesar 
par\u00E1metro de configuraci\u00F3n [{0}]:[{1}]
 expiresFilter.filterInitialized = Filtro inicializado con configuraci\u00F3n 
{0}
 expiresFilter.expirationHeaderAlreadyDefined = Ya se ha definido cabecera de 
expiraci\u00F3n para el requerimiento [{0}] con status de respuesta [{1}] y 
content-type [{2}]

Modified: 
tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings_es.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings_es.properties?rev=1789458&r1=1789457&r2=1789458&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings_es.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings_es.properties 
Thu Mar 30 08:42:43 2017
@@ -59,7 +59,7 @@ jvmRoute.cannotFindSession = No puedo ha
 jvmRoute.changeSession = Cambiada sesi\u00F3n desde [{0}] a [{1}]
 jvmRoute.failover = Detectada una ca\u00EDda con diferente jvmRoute - ruta 
original: [{0}] nueva: [{1}] en id de sesi\u00F3n [{2}]
 jvmRoute.foundManager = Hallado Cl\u00FAster DeltaManager {0} en {1}
-jvmRoute.missingJvmRouteAttribute = \u00A1No se ha configurado atributo de 
motor jvmRoute\!
+jvmRoute.missingJvmRouteAttribute = \u00A1No se ha configurado atributo de 
motor jvmRoute!
 jvmRoute.noCluster = La v\u00E1lvula JvmRouterBinderValve se encuentra 
configurada, pero no se usa el cl\u00FAster. A\u00FAn funcionar\u00E1 la 
tolerancia a fallos, siempre que se est\u00E9 usando PersistentManager.
 jvmRoute.notFoundManager = No hallado Cl\u00FAster DeltaManager {0} en {1}
 jvmRoute.turnoverInfo = Ajustado tiempo de Chequeo a {0} mseg

Modified: 
tomcat/trunk/java/org/apache/catalina/manager/host/LocalStrings_es.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/host/LocalStrings_es.properties?rev=1789458&r1=1789457&r2=1789458&view=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/manager/host/LocalStrings_es.properties 
(original)
+++ 
tomcat/trunk/java/org/apache/catalina/manager/host/LocalStrings_es.properties 
Thu Mar 30 08:42:43 2017
@@ -48,7 +48,7 @@ htmlHostManagerServlet.messageLabel = Me
 htmlHostManagerServlet.manager = Gestor de M\u00E1quina
 htmlHostManagerServlet.list = Lista de M\u00E1quinas Virtuales
 htmlHostManagerServlet.helpHtmlManagerFile = html-host-manager-howto.html
-htmlHostManagerServlet.helpHtmlManager = Ayuda de Gestor de M\u00E1quina HTML 
(\u00A1En breve\!)
+htmlHostManagerServlet.helpHtmlManager = Ayuda de Gestor de M\u00E1quina HTML 
(\u00A1En breve!)
 htmlHostManagerServlet.helpManagerFile = ../docs/host-manager-howto.html
 htmlHostManagerServlet.helpManager = Ayuda de Gestor de M\u00E1quina
 htmlHostManagerServlet.hostName = Nombre de M\u00E1quina

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/transport/LocalStrings_es.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/LocalStrings_es.properties?rev=1789458&r1=1789457&r2=1789458&view=diff

svn commit: r1789461 - in /tomcat/trunk/java/org/apache: catalina/ha/session/LocalStrings_es.properties catalina/ha/tcp/LocalStrings_es.properties el/Messages_es.properties jasper/resources/LocalStrin

[markt]

Author: markt
Date: Thu Mar 30 08:45:03 2017
New Revision: 1789461

URL: http://svn.apache.org/viewvc?rev=1789461&view=rev
Log:
= does not need to be escaped in the value component of a properties file

Modified:
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/el/Messages_es.properties
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties

Modified: 
tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings_es.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings_es.properties?rev=1789461&r1=1789460&r2=1789461&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings_es.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings_es.properties 
Thu Mar 30 08:45:03 2017
@@ -12,7 +12,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-deltaManager.createSession.newSession = Creada una DeltaSession con Id [{0}] 
Total contador\={1}
+deltaManager.createSession.newSession = Creada una DeltaSession con Id [{0}] 
Total contador={1}
 deltaManager.createMessage.access = Gestor [{0}]: creado mensaje de 
sesi\u00F3n [{1}] acceso.
 deltaManager.createMessage.accessChangePrimary = Gestor [{0}]: creado mensaje 
de sesi\u00F3n [{1}] acceso para cambiar el primario.
 deltaManager.createMessage.allSessionData = Gestor [{0}] env\u00EDa todos los 
datos de sesi\u00F3n.
@@ -36,7 +36,7 @@ deltaManager.receiveMessage.accessed = G
 deltaManager.receiveMessage.createNewSession = Gestor [{0}]: creada 
sesi\u00F3n [{1}] recibida.
 deltaManager.receiveMessage.delta = Gestor [{0}]: delta sesi\u00F3n [{1}] 
recibida.
 deltaManager.receiveMessage.error = Gestor [{0}]: No puedo recibir mensaje a 
trav\u00E9s del canal TCP
-deltaManager.receiveMessage.eventType = Gestor [{0}]: recibido SessionMessage 
de tipo\=({1}) desde [{2}]
+deltaManager.receiveMessage.eventType = Gestor [{0}]: recibido SessionMessage 
de tipo=({1}) desde [{2}]
 deltaManager.receiveMessage.expired = Gestor [{0}]: expirada sesi\u00F3n [{1}] 
recibida.
 deltaManager.receiveMessage.transfercomplete = Gestor [{0}] recibido desde 
nodo [{1}:{2}] estado de sesi\u00F3n transferido.
 deltaManager.receiveMessage.unloadingAfter = Gestor [{0}]: completada la 
descarga de sesiones
@@ -52,7 +52,7 @@ deltaManager.waitForSessionState = Gesto
 deltaManager.unableSerializeSessionID = No puedo seriallizar la ID de 
sesi\u00F3n [{0}]
 deltaRequest.showPrincipal = El Principal [{0}] est\u00E1 puesto a sesi\u00F3n 
{1}
 deltaRequest.wrongPrincipalClass = DeltaManager s\u00F3lo soporta 
GenericPrincipal. Tu reino utiliz\u00F3 clase principal {0}.
-deltaSession.notifying = Notificando cl\u00FAster de expiraci\u00F3n 
primaria\={0} sessionId [{1}]
+deltaSession.notifying = Notificando cl\u00FAster de expiraci\u00F3n 
primaria={0} sessionId [{1}]
 deltaSession.readSession = readObject() cargando sesi\u00F3n [{0}]
 deltaSession.writeSession = writeObject() guardando sesi\u00F3n [{0}]
 jvmRoute.cannotFindSession = No puedo hallar sesi\u00F3n [{0}]

Modified: 
tomcat/trunk/java/org/apache/catalina/ha/tcp/LocalStrings_es.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/tcp/LocalStrings_es.properties?rev=1789461&r1=1789460&r2=1789461&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/tcp/LocalStrings_es.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/tcp/LocalStrings_es.properties Thu 
Mar 30 08:45:03 2017
@@ -14,17 +14,17 @@
 # limitations under the License.
 
 ReplicationValve.crossContext.add = a\u00F1adir contenedor de r\u00E9plica de 
sesi\u00F3n de Contexto Cruzado a replicationValve threadlocal
-ReplicationValve.crossContext.registerSession = retistrar id de sesi\u00F3n de 
Contexto Cruzado\={0} desde contexto {1}
+ReplicationValve.crossContext.registerSession = retistrar id de sesi\u00F3n de 
Contexto Cruzado={0} desde contexto {1}
 ReplicationValve.crossContext.remove = quitar contenedor de r\u00E9plica de 
sesi\u00F3n de Contexto Cruzado a replicationValve threadlocal
 ReplicationValve.crossContext.sendDelta = enviar delta de sesi\u00F3n de 
Contexto Cruzado desde contexto {0}.
-ReplicationValve.filter.loading = Cargando filtros de requerimiento\={0}
-ReplicationValve.filter.failure = No puedo compilar filtror\={0}
+ReplicationValve.filter.loading = Cargando filtros de requerimiento={0}
+ReplicationValve.filter.failure = No puedo compilar filtror={0}
 ReplicationValve.invoke.uri = Invocando requerimiento de r\u00E9plica en {0}
 ReplicationValve.nocluster = No cluster configur

svn commit: r1789462 - in /tomcat/trunk/java: javax/servlet/http/ org/apache/catalina/manager/ org/apache/jasper/resources/

[markt]

Author: markt
Date: Thu Mar 30 08:47:54 2017
New Revision: 1789462

URL: http://svn.apache.org/viewvc?rev=1789462&view=rev
Log:
" does not need to be escaped in the value component of a properties file

Modified:
tomcat/trunk/java/javax/servlet/http/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/catalina/manager/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_de.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/jasper/resources/LocalStrings.properties
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_ja.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=1789462&r1=1789461&r2=1789462&view=diff
==
--- tomcat/trunk/java/javax/servlet/http/LocalStrings_fr.properties (original)
+++ tomcat/trunk/java/javax/servlet/http/LocalStrings_fr.properties Thu Mar 30 
08:47:54 2017
@@ -16,8 +16,8 @@
 # Default localized string information
 # Localized for Locale fr_FR
 
-err.cookie_name_is_token=Le nom de cookie [{0}] est un \"token\" 
r\u00e9serv\u00e9
-err.io.negativelength=Taille n\u00e9gative donn\u00e9e dans la m\u00e9thode 
\"write\"
+err.cookie_name_is_token=Le nom de cookie [{0}] est un "token" 
r\u00e9serv\u00e9
+err.io.negativelength=Taille n\u00e9gative donn\u00e9e dans la m\u00e9thode 
"write"
 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

Modified: tomcat/trunk/java/org/apache/catalina/manager/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/LocalStrings.properties?rev=1789462&r1=1789461&r2=1789462&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/manager/LocalStrings.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/manager/LocalStrings.properties Thu 
Mar 30 08:47:54 2017
@@ -40,10 +40,10 @@ htmlManagerServlet.deployTitle=Deploy
 htmlManagerServlet.deployUpload=WAR file to deploy
 htmlManagerServlet.deployUploadFail=FAIL - Deploy Upload Failed, Exception: {0}
 htmlManagerServlet.deployUploadFile=Select WAR file to upload
-htmlManagerServlet.deployUploadInServerXml=FAIL - War file \"{0}\" cannot be 
uploaded if context is defined in server.xml
-htmlManagerServlet.deployUploadNotWar=FAIL - File uploaded \"{0}\" must be a 
.war
+htmlManagerServlet.deployUploadInServerXml=FAIL - War file "{0}" cannot be 
uploaded if context is defined in server.xml
+htmlManagerServlet.deployUploadNotWar=FAIL - File uploaded "{0}" must be a .war
 htmlManagerServlet.deployUploadNoFile=FAIL - File upload failed, no file
-htmlManagerServlet.deployUploadWarExists=FAIL - War file \"{0}\" already 
exists on server
+htmlManagerServlet.deployUploadWarExists=FAIL - War file "{0}" already exists 
on server
 htmlManagerServlet.deployWar=WAR or Directory URL:
 htmlManagerServlet.diagnosticsLeak=Check to see if a web application has 
caused a memory leak on stop, reload or undeploy
 htmlManagerServlet.diagnosticsLeakButton=Find leaks

Modified: 
tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_de.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_de.properties?rev=1789462&r1=1789461&r2=1789462&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_de.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_de.properties 
Thu Mar 30 08:47:54 2017
@@ -38,9 +38,9 @@ htmlManagerServlet.deployTitle=Installie
 htmlManagerServlet.deployUpload=Lokale WAR Datei zur Installation hochladen
 htmlManagerServlet.deployUploadFail=FEHLER - Hochladen zur Installation 
fehlgeschlagen, Ausnahme: {0}
 htmlManagerServlet.deployUploadFile=WAR Datei ausw\u00e4hlen
-htmlManagerServlet.deployUploadNotWar=FEHLER - Hochgeladene Datei \"{0}\" muss 
ein .war sein
+htmlManagerServlet.deployUploadNotWar=FEHLER - Hochgeladene Datei "{0}" muss 
ein .war sein
 htmlManagerServlet.deployUploadNoFile=FEHLER - Hochladen fehlgeschlagen, keine 
Datei vorhanden
-htmlManagerServlet.deployUploadWarExists=FEHLER - WAR Datei \"{0}\" existiert 
bereits auf Server
+htmlManagerServlet.deployUploadWarExists=FEHLER - WAR Datei "{0}" existiert 
bereits auf Server
 htmlManagerServlet.deployWar=WAR oder Verzeichnis URL:
 htmlManagerServlet.list=Anwendungen auflisten
 htmlManagerServlet.manager=Manager

Modified: 
tomcat/trunk/jav

svn commit: r1789463 - in /tomcat/trunk/java/org/apache: catalina/manager/ jasper/resources/

[markt]

Author: markt
Date: Thu Mar 30 08:50:51 2017
New Revision: 1789463

URL: http://svn.apache.org/viewvc?rev=1789463&view=rev
Log:
Additional replacement of "..." to delimit values in messages with [...] after 
removing unnecessary escaping of "

Modified:
tomcat/trunk/java/org/apache/catalina/manager/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_de.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/jasper/resources/LocalStrings.properties
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties

Modified: tomcat/trunk/java/org/apache/catalina/manager/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/LocalStrings.properties?rev=1789463&r1=1789462&r2=1789463&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/manager/LocalStrings.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/manager/LocalStrings.properties Thu 
Mar 30 08:50:51 2017
@@ -40,10 +40,10 @@ htmlManagerServlet.deployTitle=Deploy
 htmlManagerServlet.deployUpload=WAR file to deploy
 htmlManagerServlet.deployUploadFail=FAIL - Deploy Upload Failed, Exception: {0}
 htmlManagerServlet.deployUploadFile=Select WAR file to upload
-htmlManagerServlet.deployUploadInServerXml=FAIL - War file "{0}" cannot be 
uploaded if context is defined in server.xml
-htmlManagerServlet.deployUploadNotWar=FAIL - File uploaded "{0}" must be a .war
+htmlManagerServlet.deployUploadInServerXml=FAIL - War file [{0}] cannot be 
uploaded if context is defined in server.xml
+htmlManagerServlet.deployUploadNotWar=FAIL - File uploaded [{0}] must be a .war
 htmlManagerServlet.deployUploadNoFile=FAIL - File upload failed, no file
-htmlManagerServlet.deployUploadWarExists=FAIL - War file "{0}" already exists 
on server
+htmlManagerServlet.deployUploadWarExists=FAIL - War file [{0}] already exists 
on server
 htmlManagerServlet.deployWar=WAR or Directory URL:
 htmlManagerServlet.diagnosticsLeak=Check to see if a web application has 
caused a memory leak on stop, reload or undeploy
 htmlManagerServlet.diagnosticsLeakButton=Find leaks

Modified: 
tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_de.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_de.properties?rev=1789463&r1=1789462&r2=1789463&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_de.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_de.properties 
Thu Mar 30 08:50:51 2017
@@ -38,9 +38,9 @@ htmlManagerServlet.deployTitle=Installie
 htmlManagerServlet.deployUpload=Lokale WAR Datei zur Installation hochladen
 htmlManagerServlet.deployUploadFail=FEHLER - Hochladen zur Installation 
fehlgeschlagen, Ausnahme: {0}
 htmlManagerServlet.deployUploadFile=WAR Datei ausw\u00e4hlen
-htmlManagerServlet.deployUploadNotWar=FEHLER - Hochgeladene Datei "{0}" muss 
ein .war sein
+htmlManagerServlet.deployUploadNotWar=FEHLER - Hochgeladene Datei [{0}] muss 
ein .war sein
 htmlManagerServlet.deployUploadNoFile=FEHLER - Hochladen fehlgeschlagen, keine 
Datei vorhanden
-htmlManagerServlet.deployUploadWarExists=FEHLER - WAR Datei "{0}" existiert 
bereits auf Server
+htmlManagerServlet.deployUploadWarExists=FEHLER - WAR Datei [{0}] existiert 
bereits auf Server
 htmlManagerServlet.deployWar=WAR oder Verzeichnis URL:
 htmlManagerServlet.list=Anwendungen auflisten
 htmlManagerServlet.manager=Manager

Modified: 
tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_fr.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_fr.properties?rev=1789463&r1=1789462&r2=1789463&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_fr.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_fr.properties 
Thu Mar 30 08:50:51 2017
@@ -38,10 +38,10 @@ htmlManagerServlet.deployTitle=Deployer
 htmlManagerServlet.deployUpload=Fichier WAR \u00e0 d\u00e9ployer
 htmlManagerServlet.deployUploadFail=ECHEC - T\u00e9l\u00e9versement pour 
d\u00e9ploiement a \u00e9chou\u00e9, exception: {0}
 htmlManagerServlet.deployUploadFile=Choisir le fichier WAR \u00e0 
t\u00e9l\u00e9verser
-htmlManagerServlet.deployUploadInServerXml=ECHEC - Fichier WAR "{0}" ne peut 
\u00eatre t\u00e9l\u00e9vers\u00e9 lorsque le contexte est d\u00e9fini dans 
server.xml
-htmlManagerServlet.deployUploadNotWar=ECHEC - Fichier \u00e0 
t\u00e9l\u00e9verser, "{0}", doit \u00eatre un .war
+htmlManagerServ

svn commit: r1789465 - in /tomcat/trunk/java/org/apache/jasper/resources: LocalStrings.properties LocalStrings_ja.properties

[markt]

Author: markt
Date: Thu Mar 30 08:54:58 2017
New Revision: 1789465

URL: http://svn.apache.org/viewvc?rev=1789465&view=rev
Log:
' does not need to be escaped in the value component of a properties file 
(assuming the value won't be passed to a MessageFormat instance)

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

Modified: tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties?rev=1789465&r1=1789464&r2=1789465&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties 
(original)
+++ tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties Thu 
Mar 30 08:54:58 2017
@@ -233,8 +233,8 @@ jsp.error.parse.xml.invalidPublicId=Inva
 jsp.error.unsupported.encoding=Unsupported encoding: {0}
 jsp.error.taglibDirective.absUriCannotBeResolved=The absolute uri: {0} cannot 
be resolved in either web.xml or the jar files deployed with this application
 jsp.error.taglibDirective.uriInvalid=The URI provided for a tag library [{0}] 
is not a valid URI
-jsp.error.taglibDirective.missing.location=Neither \'uri\' nor \'tagdir\' 
attribute specified
-jsp.error.taglibDirective.both_uri_and_tagdir=Both \'uri\' and \'tagdir\' 
attributes specified
+jsp.error.taglibDirective.missing.location=Neither 'uri' nor 'tagdir' 
attribute specified
+jsp.error.taglibDirective.both_uri_and_tagdir=Both 'uri' and 'tagdir' 
attributes specified
 jsp.error.invalid.tagdir=Tag file directory {0} does not start with 
"/WEB-INF/tags"
 #jspx.error.templateDataNotInJspCdata=Validation Error: Element <{0}> 
cannot have template data. Template data must be encapsulated within a 
 element. [JSP1.2 PFD section 5.1.9]\nTemplate data in error: 
{1}
 #Error while processing taglib jar file {0}: {1}
@@ -263,13 +263,13 @@ jsp.error.deferredmethodsignaturewithout
 jsp.error.deferredvaluetypewithoutdeferredvalue=Cannot specify a value type if 
'deferredValue' is not 'true'
 jsp.error.deferredmethodandvalue='deferredValue' and 'deferredMethod' cannot 
be both 'true'
 jsp.error.fragmentwithtype=Cannot specify both 'fragment' and 'type' 
attributes.  If 'fragment' is present, 'type' is fixed as 
'javax.servlet.jsp.tagext.JspFragment'
-jsp.error.var_and_varReader=Only one of \'var\' or \'varReader\' may be 
specified
-jsp.error.missing_var_or_varReader=Missing \'var\' or \'varReader\' attribute
+jsp.error.var_and_varReader=Only one of 'var' or 'varReader' may be specified
+jsp.error.missing_var_or_varReader=Missing 'var' or 'varReader' attribute
 jsp.warning.bad.urlpattern.propertygroup=Bad value {0} in the url-pattern 
subelement in web.xml
 jsp.error.literal_with_void=A literal value was specified for attribute {0} 
that is defined as a deferred method with a return type of void. JSP.2.3.4 does 
not permit literal values in this case
 jsp.error.unknown_attribute_type=Unknown attribute type ({1}) for attribute 
{0}.
 jsp.error.coerce_to_type=Cannot coerce value ({2}) to type ({1}) for attribute 
{0}.
-jsp.error.jspelement.missing.name=Mandatory XML-style \'name\' attribute 
missing
+jsp.error.jspelement.missing.name=Mandatory XML-style 'name' attribute missing
 jsp.error.could.not.add.taglibraries=Could not add one or more tag libraries.
 jsp.error.duplicate.name.jspattribute=The attribute {0} specified in the 
standard or custom action also appears as the value of the name attribute in 
the enclosed jsp:attribute
 jsp.error.not.in.template={0} not allowed in a template text body.
@@ -340,7 +340,7 @@ jsp.error.variable.either.name=Either na
 jsp.error.variable.both.name=Cannot specify both name-given or 
name-from-attribute attributes in a variable directive
 jsp.error.variable.alias=Both or none of the name-from-attribute and alias 
attributes must be specified in a variable directive
 jsp.error.attribute.null_name=Null attribute name
-jsp.error.jsptext.badcontent=\'<\', when appears in the body of 
, must be encapsulated within a CDATA
+jsp.error.jsptext.badcontent='<', when appears in the body of 
, must be encapsulated within a CDATA
 jsp.error.jsproot.version.invalid=Invalid version number: [{0}], must be 
"1.2", "2.0", "2.1", "2.2" or "2.3"
 jsp.error.noFunction=The function {0} cannot be located with the specified 
prefix
 jsp.error.noFunctionMethod=Method [{0}] for function [{1}] not found in class 
[{2}]

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=1789465&r1=1789464&r2=1789465&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_ja.pr

svn commit: r1789466 - in /tomcat/trunk/java/org/apache: catalina/valves/LocalStrings_es.properties el/Messages_es.properties jasper/resources/LocalStrings_es.properties

[markt]

Author: markt
Date: Thu Mar 30 08:55:46 2017
New Revision: 1789466

URL: http://svn.apache.org/viewvc?rev=1789466&view=rev
Log:
# does not need to be escaped in the value component of a properties file

Modified:
tomcat/trunk/java/org/apache/catalina/valves/LocalStrings_es.properties
tomcat/trunk/java/org/apache/el/Messages_es.properties
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties

Modified: 
tomcat/trunk/java/org/apache/catalina/valves/LocalStrings_es.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/LocalStrings_es.properties?rev=1789466&r1=1789465&r2=1789466&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/valves/LocalStrings_es.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/valves/LocalStrings_es.properties Thu 
Mar 30 08:55:46 2017
@@ -32,7 +32,7 @@ remoteIpValve.invalidPortHeader = Valor
 sslValve.certError = No pude procesar cadena de certificado [{0}] para crear 
un objeto  java.security.cert.X509Certificate
 sslValve.invalidProvider = El proveedor de SSL especificado en el conecto 
asociado con este requerimiento de [{0}] ies inv\u00E1lido. No se pueden 
procesar los datos del certificado.
 stuckThreadDetectionValve.notifyStuckThreadDetected = El hilo  [{0}] (id={6}) 
ha estado activo durante {1} miilisegundos (desde {2}) para servir el mismo 
requerimiento para {4} y puede estar atascado (el umbral configurado para este 
StuckThreadDetectionValve es de {5} segundos). Hay {3} hilo(s) en total que son 
monitorizados por esta V\u00E1lvula y pueden estar atascados.
-stuckThreadDetectionValve.notifyStuckThreadCompleted = El hilo [{0}] (id={3}), 
que previamente se report\u00F3 como atascado, se ha completado. Estuvo activo 
por aproximadamente {1} milisegundos. {2, choice,0\#|0< Hay a\u00FAn {2} 
hilo(s) que son monitorizados por esta V\u00E1lvula y pueden estar atascados.}
+stuckThreadDetectionValve.notifyStuckThreadCompleted = El hilo [{0}] (id={3}), 
que previamente se report\u00F3 como atascado, se ha completado. Estuvo activo 
por aproximadamente {1} milisegundos. {2, choice,0#|0< Hay a\u00FAn {2} hilo(s) 
que son monitorizados por esta V\u00E1lvula y pueden estar atascados.}
 
 # HTTP status reports
 http.400.desc = El requerimiento enviado por el cliente era 
sint\u00E1cticamente incorrecto.

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=1789466&r1=1789465&r2=1789466&view=diff
==
--- tomcat/trunk/java/org/apache/el/Messages_es.properties (original)
+++ tomcat/trunk/java/org/apache/el/Messages_es.properties Thu Mar 30 08:55:46 
2017
@@ -21,7 +21,7 @@ error.resolver.unhandled = ELResolver no
 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.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.value.expectedType = El tipo esperado no puede ser nulo

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=1789466&r1=1789465&r2=1789466&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties 
(original)
+++ tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties 
Thu Mar 30 08:55:46 2017
@@ -165,7 +165,7 @@ jspc.usage = Uso: jspc  [--] <
 \   (s\u00F3lo se aplica a la primera p\u00E1gina 
JSP)\n\
 \-mappedGenera llamadas separadas a write() para cada 
l\u00EDnea de\n\
 \   HTML en el JSP\n\
-\-die[\#]Genera un c\u00F3digo de retorno de error (\#) en 
errores\n\
+\-die[#]Genera un c\u00F3digo de retorno de error (#) en 
errores\n\
 \   fatales. (por defecto 1).\n\
 \-uribase  El directorio uri de donde deben de partir las\n\
 \   compilaciones. (por defecto "/")\n\
@@ -273,7 +273,7 @@ jsp.error.prolog_pagedir_encoding_mismat
 jsp.error.prolog_config_encoding_mismatch = El Page-encoding especificado en 
XML prolog ({0}) difiere del especificado en jsp-property-group ({1})
 jsp.error.attribute.custom.non_rt_with_expr = Seg\u00FAn el TLD o la directiva 
attribute del 

svn commit: r1789467 - /tomcat/trunk/webapps/examples/WEB-INF/classes/LocalStrings_es.properties

[markt]

Author: markt
Date: Thu Mar 30 09:00:46 2017
New Revision: 1789467

URL: http://svn.apache.org/viewvc?rev=1789467&view=rev
Log:
Remove unnecessary escaping

Modified:
tomcat/trunk/webapps/examples/WEB-INF/classes/LocalStrings_es.properties

Modified: 
tomcat/trunk/webapps/examples/WEB-INF/classes/LocalStrings_es.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/LocalStrings_es.properties?rev=1789467&r1=1789466&r2=1789467&view=diff
==
--- tomcat/trunk/webapps/examples/WEB-INF/classes/LocalStrings_es.properties 
(original)
+++ tomcat/trunk/webapps/examples/WEB-INF/classes/LocalStrings_es.properties 
Thu Mar 30 09:00:46 2017
@@ -12,31 +12,31 @@
 # 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.
-helloworld.title = Hola Mundo\!
-requestinfo.title = Ejemplo de Informacion de Requerimiento\:
-requestinfo.label.method = M\u00E9todo\:
-requestinfo.label.requesturi = URI de Requerimiento\:
-requestinfo.label.protocol = Protocolo\:
-requestinfo.label.pathinfo = Info de Ruta\:
-requestinfo.label.remoteaddr = Direccion Remota\:
-requestheader.title = Ejemplo de Cabecera de Requerimiento\:
-requestparams.title = Ejemplo de par\u00E1metros de Requerimiento\:
-requestparams.params-in-req = Par\u00E1metros en este Request\:
+helloworld.title = Hola Mundo!
+requestinfo.title = Ejemplo de Informacion de Requerimiento:
+requestinfo.label.method = M\u00E9todo:
+requestinfo.label.requesturi = URI de Requerimiento:
+requestinfo.label.protocol = Protocolo:
+requestinfo.label.pathinfo = Info de Ruta:
+requestinfo.label.remoteaddr = Direccion Remota:
+requestheader.title = Ejemplo de Cabecera de Requerimiento:
+requestparams.title = Ejemplo de par\u00E1metros de Requerimiento:
+requestparams.params-in-req = Par\u00E1metros en este Request:
 requestparams.no-params = No hay p\u00E1rametro. Por favor, usa alguno
-requestparams.firstname = Nombre\:
-requestparams.lastname = Apellidos\:
+requestparams.firstname = Nombre:
+requestparams.lastname = Apellidos:
 cookies.title = Ejemplo de Cookies
-cookies.cookies = Tu navegador est\u00E1 enviando los siguientes cookies\:
+cookies.cookies = Tu navegador est\u00E1 enviando los siguientes cookies:
 cookies.no-cookies = Tu navegador no est\u00E1 enviando cookies
 cookies.make-cookie = Crea un cookie para enviarlo a tu navegador
-cookies.name = Nombre\:
-cookies.value = Valor\:
-cookies.set = Acabas de enviar a tu navegador estos cookies\:
+cookies.name = Nombre:
+cookies.value = Valor:
+cookies.set = Acabas de enviar a tu navegador estos cookies:
 sessions.title = Ejemplo de Sesiones
-sessions.id = ID de Sesi\u00F3n\:
-sessions.created = Creado\:
-sessions.lastaccessed = Ultimo Acceso\:
-sessions.data = Lo siguientes datos est\u00E1n en tu sesi\u00F3n\:
-sessions.adddata = A\u00F1ade datos a tu sesi\u00F3n\:
-sessions.dataname = Nombre del atributo de sesi\u00F3n\:
-sessions.datavalue = Valor del atributo de sesi\u00F3n\:
+sessions.id = ID de Sesi\u00F3n:
+sessions.created = Creado:
+sessions.lastaccessed = Ultimo Acceso:
+sessions.data = Lo siguientes datos est\u00E1n en tu sesi\u00F3n:
+sessions.adddata = A\u00F1ade datos a tu sesi\u00F3n:
+sessions.dataname = Nombre del atributo de sesi\u00F3n:
+sessions.datavalue = Valor del atributo de sesi\u00F3n:



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

svn commit: r1789470 - in /tomcat/trunk/java: javax/el/ org/apache/catalina/core/ org/apache/catalina/filters/ org/apache/catalina/ha/session/ org/apache/catalina/servlets/ org/apache/jasper/resources

[markt]

Author: markt
Date: Thu Mar 30 09:06:46 2017
New Revision: 1789470

URL: http://svn.apache.org/viewvc?rev=1789470&view=rev
Log:
Replace the use of (...) to delimit values in messages with [...] because it is 
more consistent.

Modified:
tomcat/trunk/java/javax/el/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/filters/LocalStrings.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.properties
tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings.properties
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/LocalStrings.properties

Modified: tomcat/trunk/java/javax/el/LocalStrings_es.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/LocalStrings_es.properties?rev=1789470&r1=1789469&r2=1789470&view=diff
==
--- tomcat/trunk/java/javax/el/LocalStrings_es.properties (original)
+++ tomcat/trunk/java/javax/el/LocalStrings_es.properties Thu Mar 30 09:06:46 
2017
@@ -12,7 +12,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-propertyNotFound = Propiedad [{1}] no hallada en el tipo {0}
+propertyNotFound = Propiedad [{1}] no hallada en el tipo [{0}]
 propertyNotReadable = Propiedad [{1}] no legible para el tipo [{0}]
 propertyNotWritable = Propiedad [{1}] no grabable para el tipo [{0}]
 propertyReadError = Error reading [{1}] en el tipo [{0}]

Modified: tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties?rev=1789470&r1=1789469&r2=1789470&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties Thu Mar 
30 09:06:46 2017
@@ -74,7 +74,7 @@ aprListener.flags=APR capabilities: IPv6
 aprListener.currentFIPSMode=Current FIPS mode: {0}
 aprListener.config=APR/OpenSSL configuration: useAprConnector [{0}], 
useOpenSSL [{1}]
 aprListener.skipFIPSInitialization=Already in FIPS mode; skipping FIPS 
initialization.
-aprListener.enterAlreadyInFIPSMode=AprLifecycleListener is configured to force 
entering FIPS mode, but library is already in FIPS mode ({0})
+aprListener.enterAlreadyInFIPSMode=AprLifecycleListener is configured to force 
entering FIPS mode, but library is already in FIPS mode [{0}]
 aprListener.requireNotInFIPSMode=AprLifecycleListener is configured to require 
the library to already be in FIPS mode, but it was not in FIPS mode
 aprListener.wrongFIPSMode=Unexpected value of FIPSMode option of 
AprLifecycleListener: [{0}]
 aprListener.initializingFIPS=Initializing FIPS mode...
@@ -83,7 +83,7 @@ aprListener.initializeFIPSFailed=Failed
 aprListener.tooLateForSSLEngine=Cannot setSSLEngine: SSL has already been 
initialized
 aprListener.tooLateForSSLRandomSeed=Cannot setSSLRandomSeed: SSL has already 
been initialized
 aprListener.tooLateForFIPSMode=Cannot setFIPSMode: SSL has already been 
initialized
-aprListener.initializedOpenSSL=OpenSSL successfully initialized ({0})
+aprListener.initializedOpenSSL=OpenSSL successfully initialized [{0}]
 
 asyncContextImpl.request.ise=It is illegal to call getRequest() after 
complete() or any of the dispatch() methods has been called
 asyncContextImpl.requestEnded=The request associated with the AsyncContext has 
already completed processing.

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=1789470&r1=1789469&r2=1789470&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties Thu 
Mar 30 09:06:46 2017
@@ -51,7 +51,7 @@ aprListener.aprDestroy = No pude apagar
 aprListener.sslInit = No pude inicializar el SSLEngine (Motor SSL)
 aprListener.tcnValid = Cargada la biblioteca nativa APR de Apache T

svn commit: r1789472 - in /tomcat/trunk/java/org/apache/tomcat: util/descriptor/web/ util/net/ util/net/jsse/ util/net/openssl/ util/threads/res/ websocket/server/

[markt]

Author: markt
Date: Thu Mar 30 09:11:34 2017
New Revision: 1789472

URL: http://svn.apache.org/viewvc?rev=1789472&view=rev
Log:
Add [...] delimiters to values in messages that don't currently have them for 
org.apache.tomcat packages

Modified:

tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings.properties

tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings_es.properties
tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties
tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings_es.properties
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/LocalStrings.properties
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/LocalStrings_es.properties
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/LocalStrings.properties
tomcat/trunk/java/org/apache/tomcat/util/threads/res/LocalStrings.properties

tomcat/trunk/java/org/apache/tomcat/util/threads/res/LocalStrings_es.properties
tomcat/trunk/java/org/apache/tomcat/websocket/server/LocalStrings.properties

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings.properties?rev=1789472&r1=1789471&r2=1789472&view=diff
==
--- 
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings.properties 
(original)
+++ 
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings.properties 
Thu Mar 30 09:11:34 2017
@@ -24,8 +24,8 @@ servletDef.invalidServletName=Invalid  element not valid in 
web-fragment.xml and will be ignored
 webRuleSet.absoluteOrderingCount= element is limited to 1 
occurrence
 webRuleSet.nameCount= element is limited to 1 occurrence
-webRuleSet.postconstruct.duplicate=Duplicate post construct method definition 
for class {0}
-webRuleSet.predestroy.duplicate=Duplicate pre destroy method definition for 
class {0}
+webRuleSet.postconstruct.duplicate=Duplicate post construct method definition 
for class [{0}]
+webRuleSet.predestroy.duplicate=Duplicate pre destroy method definition for 
class [{0}]
 webRuleSet.relativeOrdering= element not valid in web.xml and will 
be ignored
 webRuleSet.relativeOrderingCount= element is limited to 1 occurrence
 
@@ -57,8 +57,8 @@ webXml.mergeConflictString=The [{0}] wit
 webXml.multipleOther=Multiple others entries in ordering
 webXml.unrecognisedPublicId=The public ID [{0}] did not match any of the known 
public ID''s for web.xml files so the version could not be identified
 webXml.version.unknown=Unknown version string [{0}]. Default version will be 
used.
-webXml.wrongFragmentName=Used a wrong fragment name {0} at web.xml 
absolute-ordering tag!
+webXml.wrongFragmentName=Used a wrong fragment name [{0}] at web.xml 
absolute-ordering tag!
 
-webXmlParser.applicationParse=Parse error in application web.xml file at {0}
-webXmlParser.applicationPosition=Occurred at line {0} column {1}
-webXmlParser.applicationStart=Parsing application web.xml file at {0}
+webXmlParser.applicationParse=Parse error in application web.xml file at [{0}]
+webXmlParser.applicationPosition=Occurred at line [{0}] column [{1}]
+webXmlParser.applicationStart=Parsing application web.xml file at [{0}]

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings_es.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings_es.properties?rev=1789472&r1=1789471&r2=1789472&view=diff
==
--- 
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings_es.properties
 (original)
+++ 
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings_es.properties
 Thu Mar 30 09:11:34 2017
@@ -16,6 +16,6 @@
 webRuleSet.absoluteOrdering = Elemento  no v\u00E1lido en 
web-fragment.xml y ser\u00E1 ignorado
 webRuleSet.relativeOrdering = elemento  no v\u00E1lido en web.xml y 
ser\u00E1 ignorado
 
-webXmlParser.applicationParse = Error de evaluaci\u00F3n (parse) en el archivo 
web.xml de la aplicaci\u00F3n a {0}
-webXmlParser.applicationPosition = Se ha producido en la l\u00EDnea {0} 
columna {1}
-webXmlParser.applicationStart = Analizando fichero de aplicaci\u00F3n web.xml 
en {0}
+webXmlParser.applicationParse = Error de evaluaci\u00F3n (parse) en el archivo 
web.xml de la aplicaci\u00F3n a [{0}]
+webXmlParser.applicationPosition = Se ha producido en la l\u00EDnea [{0}] 
columna [{1}]
+webXmlParser.applicationStart = Analizando fichero de aplicaci\u00F3n web.xml 
en [{0}]

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/

svn commit: r1789474 - in /tomcat/trunk/java/org/apache: el/Messages.properties el/Messages_es.properties naming/LocalStrings.properties naming/LocalStrings_es.properties naming/LocalStrings_fr.proper

[markt]

Author: markt
Date: Thu Mar 30 09:14:40 2017
New Revision: 1789474

URL: http://svn.apache.org/viewvc?rev=1789474&view=rev
Log:
Add [...] delimiters to values in messages that don't currently have them for 
org.apache.el and org.apache.naming packages

Modified:
tomcat/trunk/java/org/apache/el/Messages.properties
tomcat/trunk/java/org/apache/el/Messages_es.properties
tomcat/trunk/java/org/apache/naming/LocalStrings.properties
tomcat/trunk/java/org/apache/naming/LocalStrings_es.properties
tomcat/trunk/java/org/apache/naming/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/naming/LocalStrings_ja.properties

Modified: tomcat/trunk/java/org/apache/el/Messages.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/Messages.properties?rev=1789474&r1=1789473&r2=1789474&view=diff
==
--- tomcat/trunk/java/org/apache/el/Messages.properties (original)
+++ tomcat/trunk/java/org/apache/el/Messages.properties Thu Mar 30 09:14:40 2017
@@ -14,23 +14,23 @@
 # limitations under the License.
 
 # General Errors
-error.convert=Cannot convert {0} of type {1} to {2}
-error.compare=Cannot compare {0} to {1}
+error.convert=Cannot convert [{0}] of type [{1}] to [{2}]
+error.compare=Cannot compare [{0}] to [{1}]
 error.function=Problems calling function [{0}]
 error.unreachable.base=Target Unreachable, identifier [{0}] resolved to null
 error.unreachable.property=Target Unreachable, [{0}] returned null
-error.resolver.unhandled=ELResolver did not handle type: {0} with property of 
[{1}]
+error.resolver.unhandled=ELResolver did not handle type: [{0}] with property 
of [{1}]
 error.resolver.unhandled.null=ELResolver cannot handle a null base Object with 
identifier [{0}]
 error.invoke.wrongParams=The method [{0}] was called with [{1}] parameter(s) 
when it expected [{2}]
 error.invoke.tooFewParams=The method [{0}] was called with [{1}] parameter(s) 
when it expected at least [{2}]
 
 # ValueExpressionLiteral
-error.value.literal.write=ValueExpression is a literal and not writable: {0}
+error.value.literal.write=ValueExpression is a literal and not writable: [{0}]
 
 # ExpressionFactoryImpl
 error.null=Expression cannot be null
-error.mixed=Expression cannot contain both '#{...}' and '${...}' : {0}
-error.method=Not a valid MethodExpression : {0}
+error.mixed=Expression cannot contain both '#{...}' and '${...}' : [{0}]
+error.method=Not a valid MethodExpression : [{0}]
 error.method.nullParms=Parameter types cannot be null
 error.value.expectedType=Expected type cannot be null
 
@@ -47,7 +47,7 @@ error.method.ambiguous=Unable to find un
 # ValidatingVisitor
 error.fnMapper.null=Expression uses functions, but no FunctionMapper was 
provided
 error.fnMapper.method=Function [{0}] not found
-error.fnMapper.paramcount=Function [{0}] specifies {1} params, but {2} were 
declared
+error.fnMapper.paramcount=Function [{0}] specifies [{1}] params, but [{2}] 
were declared
 
 # ExpressionImpl
 error.context.null=ELContext was null

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=1789474&r1=1789473&r2=1789474&view=diff
==
--- tomcat/trunk/java/org/apache/el/Messages_es.properties (original)
+++ tomcat/trunk/java/org/apache/el/Messages_es.properties Thu Mar 30 09:14:40 
2017
@@ -12,17 +12,17 @@
 # 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.
-error.convert = No puedo convertir {0} desde tipo {1} a {2}
-error.compare = No puedo comparar {0} con {1}
+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.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.resolver.unhandled = ELResolver no manej\u00F3 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.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.mixed = La expresi\u00F3n no puede contenera la vez ''#{..}'' y 
''${..}'' : [{0}]
+error.method = No es una MethodExpression v\u00E1lida: [{0}]
 error.method.nullParms = Los tip

svn commit: r1789476 [1/2] - in /tomcat/trunk/java/org/apache/jasper/resources: LocalStrings.properties LocalStrings_es.properties LocalStrings_fr.properties LocalStrings_ja.properties

[markt]

Author: markt
Date: Thu Mar 30 09:20:56 2017
New Revision: 1789476

URL: http://svn.apache.org/viewvc?rev=1789476&view=rev
Log:
Add [...] delimiters to values in messages that don't currently have them for 
org.apache.jasper packages

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

Modified: tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties?rev=1789476&r1=1789475&r2=1789476&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties 
(original)
+++ tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties Thu 
Mar 30 09:20:56 2017
@@ -20,65 +20,65 @@ jsp.error.compiler=No Java compiler avai
 jsp.error.no.scratch.dir=The JSP engine is not configured with a scratch dir.\
 \n Please add "jsp.initparams=scratchdir=" \
 \n in the servlets.properties file for this context.
-jsp.error.bad.scratch.dir=The scratchDir you specified: {0} is unusable.
-jsp.message.scratch.dir.is=Scratch dir for the JSP engine is: {0}
-jsp.message.parent_class_loader_is=Parent class loader is: {0}
+jsp.error.bad.scratch.dir=The scratchDir you specified: [{0}] is unusable.
+jsp.message.scratch.dir.is=Scratch dir for the JSP engine is: [{0}]
+jsp.message.parent_class_loader_is=Parent class loader is: [{0}]
 jsp.message.dont.modify.servlets=IMPORTANT: Do not modify the generated 
servlets
 jsp.error.unavailable=JSP has been marked unavailable
-jsp.error.usebean.duplicate=useBean: Duplicate bean name: {0}
-jsp.error.invalid.scope=Illegal value of ''scope'' attribute: {0} (must be one 
of "page", "request", "session", or "application")
+jsp.error.usebean.duplicate=useBean: Duplicate bean name: [{0}]
+jsp.error.invalid.scope=Illegal value of ''scope'' attribute: [{0}] (must be 
one of "page", "request", "session", or "application")
 jsp.error.classname=Can't determine classname from .class file
 jsp.error.outputfolder=No output folder
 jsp.error.data.file.write=Error while writing data file
-jsp.error.page.conflict.contenttype=Page directive: illegal to have multiple 
occurrences of ''contentType'' with different values (old: {0}, new: {1})
-jsp.error.page.conflict.session=Page directive: illegal to have multiple 
occurrences of ''session'' with different values (old: {0}, new: {1})
+jsp.error.page.conflict.contenttype=Page directive: illegal to have multiple 
occurrences of ''contentType'' with different values (old: [{0}], new: [{1}])
+jsp.error.page.conflict.session=Page directive: illegal to have multiple 
occurrences of ''session'' with different values (old: [{0}], new: [{1}])
 jsp.error.page.invalid.session=Page directive: invalid value for session
-jsp.error.page.conflict.buffer=Page directive: illegal to have multiple 
occurrences of ''buffer'' with different values (old: {0}, new: {1})
+jsp.error.page.conflict.buffer=Page directive: illegal to have multiple 
occurrences of ''buffer'' with different values (old: [{0}], new: [{1}])
 jsp.error.page.invalid.buffer=Page directive: invalid value for buffer
-jsp.error.page.conflict.autoflush=Page directive: illegal to have multiple 
occurrences of ''autoFlush'' with different values (old: {0}, new: {1})
+jsp.error.page.conflict.autoflush=Page directive: illegal to have multiple 
occurrences of ''autoFlush'' with different values (old: [{0}], new: [{1}])
 jsp.error.page.invalid.import=Page directive: invalid value for import
-jsp.error.page.conflict.isthreadsafe=Page directive: illegal to have multiple 
occurrences of ''isThreadSafe'' with different values (old: {0}, new: {1})
+jsp.error.page.conflict.isthreadsafe=Page directive: illegal to have multiple 
occurrences of ''isThreadSafe'' with different values (old: [{0}], new: [{1}])
 jsp.error.page.invalid.isthreadsafe=Page directive: invalid value for 
isThreadSafe
-jsp.error.page.conflict.info=Page directive: illegal to have multiple 
occurrences of ''info'' with different values (old: {0}, new: {1})
+jsp.error.page.conflict.info=Page directive: illegal to have multiple 
occurrences of ''info'' with different values (old: [{0}], new: [{1}])
 jsp.error.page.invalid.info=Page directive: invalid value for info
-jsp.error.page.conflict.iserrorpage=Page directive: illegal to have multiple 
occurrences of ''isErrorPage'' with different values (old: {0}, new: {1})
+jsp.error.page.conflict.iserrorpage=Page directive: illegal to have multiple 
occurrences of ''isErrorPage'' with different values (old: [{0}], new: [{1}])
 jsp.error.page.invalid.iserrorpage=Page directive: invalid value for 
isErrorPage
-jsp.error.page.conflict.errorpage=Page directi

svn commit: r1789476 [2/2] - in /tomcat/trunk/java/org/apache/jasper/resources: LocalStrings.properties LocalStrings_es.properties LocalStrings_fr.properties LocalStrings_ja.properties

[markt]

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=1789476&r1=1789475&r2=1789476&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties 
(original)
+++ tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties 
Thu Mar 30 09:20:56 2017
@@ -19,12 +19,12 @@
 jsp.error.no.scratch.dir=Le moteur de JSP engine n''est pas configur\u00e9 
avec un r\u00e9pertoire de travail.\
 \n Merci d''ajouter "jsp.initparams=scratchdir=" \
 \n dans le fichier "servlets.properties" de ce contexte.
-jsp.error.bad.scratch.dir=Le param\u00eatre "scratchDir" que vous avez 
sp\u00e9cifi\u00e9: {0} est inutilisable.
-jsp.message.scratch.dir.is=Le r\u00e9pertoire de travail (scratch dir) pour le 
moteur de JSP est: {0}
-jsp.message.parent_class_loader_is=Le chargeur de classe parent (class loader) 
est: {0}
+jsp.error.bad.scratch.dir=Le param\u00eatre "scratchDir" que vous avez 
sp\u00e9cifi\u00e9: [{0}] est inutilisable.
+jsp.message.scratch.dir.is=Le r\u00e9pertoire de travail (scratch dir) pour le 
moteur de JSP est: [{0}]
+jsp.message.parent_class_loader_is=Le chargeur de classe parent (class loader) 
est: [{0}]
 jsp.message.dont.modify.servlets=IMPORTANT: Ne pas modifier les servlets 
g\u00e9n\u00e9r\u00e9es
 jsp.error.unavailable=La JSP a \u00e9t\u00e9 marqu\u00e9e comme non disponible
-jsp.error.usebean.duplicate=useBean: Nom de bean dupliqu\u00e9: {0}
+jsp.error.usebean.duplicate=useBean: Nom de bean dupliqu\u00e9: [{0}]
 jsp.error.classname=Impossible de d\u00e9terminer le nom de classe 
d''apr\u00e8s le fichier .class
 jsp.error.data.file.write=Erreur lors de l''\u00e9criture du fichier de 
donn\u00e9es
 #Directive de Page: valeur incorrecte pour pageEncoding
@@ -33,24 +33,24 @@ jsp.error.page.invalid.buffer=Directive
 jsp.error.page.invalid.isthreadsafe=Directive de Page: valeur incorrecte pour 
isThreadSafe
 jsp.error.page.invalid.info=Directive de Page: valeur incorrecte pour info
 jsp.error.page.invalid.iserrorpage=Directive de Page: valeur incorrecte pour 
isErrorPage
-jsp.error.include.exception=Impossible d''inclure (include) {0}
+jsp.error.include.exception=Impossible d''inclure (include) [{0}]
 jsp.error.stream.closed=Flux ferm\u00e9
 jsp.error.invalid.directive=Directive incorrecte
-jsp.error.directive.istagfile=La directive {0} ne peut \u00eatre utilis\u00e9e 
dans un fichier tag
-jsp.error.directive.isnottagfile=La directive {0} ne peut \u00eatre 
utilis\u00e9e que dans un fichier tag
-jsp.error.action.istagfile=L''action {0} ne peut \u00eatre utilis\u00e9e dans 
un fichier tag
-jsp.error.action.isnottagfile=L''action {0} ne peut \u00eatre utilis\u00e9e 
que dans un fichier tag
-jsp.error.unterminated=Tag {0} non termin\u00e9
-jsp.error.loadclass.taghandler=Impossible de charger la classe {0}
+jsp.error.directive.istagfile=La directive [{0}] ne peut \u00eatre 
utilis\u00e9e dans un fichier tag
+jsp.error.directive.isnottagfile=La directive [{0}] ne peut \u00eatre 
utilis\u00e9e que dans un fichier tag
+jsp.error.action.istagfile=L''action [{0}] ne peut \u00eatre utilis\u00e9e 
dans un fichier tag
+jsp.error.action.isnottagfile=L''action [{0}] ne peut \u00eatre utilis\u00e9e 
que dans un fichier tag
+jsp.error.unterminated=Tag [{0}] non termin\u00e9
+jsp.error.loadclass.taghandler=Impossible de charger la classe [{0}]
 jsp.error.unable.compile=Impossible de compiler la classe pour la JSP
 jsp.error.unable.load=Impossible de charger la classe pour la JSP
-jsp.error.mandatory.attribute={0}: L''attribut obligatoire {1} est manquant
+jsp.error.mandatory.attribute=[{0}]: L''attribut obligatoire [{1}] est manquant
 jsp.engine.info=Moteur Jasper JSP 2.3
-jsp.error.invalid.expression=[{0}] contient d''incorrecte(s) expression(s): {1}
-jsp.error.invalid.attribute={0}: Attribut incorrect: {1}
-jsp.error.file.cannot.read=Impossible de lire le fichier: {0}
-jsp.error.file.already.registered=Inclusion r\u00e9cursive du fichier {0}
-jsp.error.file.not.registered=Le fichier {0} n''appara\u00eet pas dans 
l''inclusion (include)
+jsp.error.invalid.expression=[{0}] contient d''incorrecte(s) expression(s): 
[{1}]
+jsp.error.invalid.attribute=[{0}]: Attribut incorrect: [{1}]
+jsp.error.file.cannot.read=Impossible de lire le fichier: [{0}]
+jsp.error.file.already.registered=Inclusion r\u00e9cursive du fichier [{0}]
+jsp.error.file.not.registered=Le fichier [{0}] n''appara\u00eet pas dans 
l''inclusion (include)
 jsp.error.quotes.unterminated=guillemets non termin\u00e9s
 jsp.error.attr.quoted=La valeur de l''attribute doit \u00eatre entre guillemets
 jsp.error.beans.nullbean=Tentative d''op\u00e9ration bean sur un objet nul.
@@ -72,17 +72,17 @@ jsp.warning.mappedFile=Attention: Valeur
 jsp.warning.classDebugInfo=Attention: Valeur incorrecte pour le initParam 
classdebug

svn commit: r1789479 - in /tomcat/trunk/java/org/apache/coyote: ajp/LocalStrings.properties ajp/LocalStrings_es.properties http2/LocalStrings.properties

[markt]

Author: markt
Date: Thu Mar 30 09:22:14 2017
New Revision: 1789479

URL: http://svn.apache.org/viewvc?rev=1789479&view=rev
Log:
Add [...] delimiters to values in messages that don't currently have them for 
org.apache.coyote packages

Modified:
tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings.properties
tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings_es.properties
tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties

Modified: tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings.properties?rev=1789479&r1=1789478&r2=1789479&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings.properties (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings.properties Thu Mar 30 
09:22:14 2017
@@ -29,8 +29,8 @@ ajpprocessor.request.process=Error proce
 ajpprocessor.certs.fail=Certificate conversion failed
 
 ajpmessage.null=Cannot append null value
-ajpmessage.overflow=Overflow error for buffer adding {0} bytes at position {1}
-ajpmessage.invalid=Invalid message received with signature {0}
-ajpmessage.invalidLength=Invalid message received with length {0}
+ajpmessage.overflow=Overflow error for buffer adding [{0}] bytes at position 
[{1}]
+ajpmessage.invalid=Invalid message received with signature [{0}]
+ajpmessage.invalidLength=Invalid message received with length [{0}]
 ajpMessage.invalidPos=Requested read of bytes at position [{0}] which is 
beyond the end of the AJP message
 

Modified: tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings_es.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings_es.properties?rev=1789479&r1=1789478&r2=1789479&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings_es.properties 
(original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings_es.properties Thu Mar 
30 09:22:14 2017
@@ -20,5 +20,5 @@ ajpprocessor.request.prepare = Error pre
 ajpprocessor.request.process = Error procesando requerimiento
 ajpprocessor.certs.fail = Fallo en conversi\u00F3n de Certificado
 ajpmessage.null = No puedo a\u00F1adir valor nulo
-ajpmessage.overflow = Error de desbordamiento en b\u00FAfer al a\u00F1adir {0} 
bytes en posici\u00F3n {1}
-ajpmessage.invalid = Mensaje inv\u00E1lido recibido con firma {0}
+ajpmessage.overflow = Error de desbordamiento en b\u00FAfer al a\u00F1adir 
[{0}] bytes en posici\u00F3n [{1}]
+ajpmessage.invalid = Mensaje inv\u00E1lido recibido con firma [{0}]

Modified: tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties?rev=1789479&r1=1789478&r2=1789479&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties Thu Mar 
30 09:22:14 2017
@@ -31,7 +31,7 @@ connectionSettings.windowSizeTooBig=Conn
 frameType.checkPayloadSize=Payload size of [{0}] is not valid for frame type 
[{1}]
 frameType.checkStream=Invalid frame type [{0}]
 
-hpack.integerEncodedOverTooManyOctets=HPACK variable length integer encoded 
over too many octets, max is {0}
+hpack.integerEncodedOverTooManyOctets=HPACK variable length integer encoded 
over too many octets, max is [{0}]
 hpack.invalidCharacter=The Unicode character [{0}] at code point [{1}] cannot 
be encoded as it is outside the permitted range of 0 to 255.
 
 hpackdecoder.zeroNotValidHeaderTableIndex=Zero is not a valid header table 
index



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

svn commit: r1789480 [3/4] - in /tomcat/trunk/java/org/apache/catalina: connector/ core/ filters/ ha/deploy/ ha/session/ ha/tcp/ loader/ manager/ manager/host/ mbeans/ realm/ servlets/ session/ startu

[markt]

Modified: tomcat/trunk/java/org/apache/catalina/mbeans/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/LocalStrings.properties?rev=1789480&r1=1789479&r2=1789480&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/mbeans/LocalStrings.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/LocalStrings.properties Thu 
Mar 30 09:36:16 2017
@@ -13,11 +13,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-jmxRemoteLifecycleListener.createRegistryFailed=Unable to create the RMI 
registry for the {0} server using port {1}
-jmxRemoteLifecycleListener.createServerFailed=The JMX connector server could 
not be created or failed to start for the {0} server
-jmxRemoteLifecycleListener.destroyServerFailed=The JMX connector server could 
not be stopped for the {0} server
-jmxRemoteLifecycleListener.invalidURL=The JMX Service URL requested for the 
{0} server, [{1}], was invalid
-jmxRemoteLifecycleListener.start=The JMX Remote Listener has configured the 
registry on port {0} and the server on port {1} for the {2} server
+jmxRemoteLifecycleListener.createRegistryFailed=Unable to create the RMI 
registry for the [{0}] server using port [{1}]
+jmxRemoteLifecycleListener.createServerFailed=The JMX connector server could 
not be created or failed to start for the [{0}] server
+jmxRemoteLifecycleListener.destroyServerFailed=The JMX connector server could 
not be stopped for the [{0}] server
+jmxRemoteLifecycleListener.invalidURL=The JMX Service URL requested for the 
[{0}] server, [{1}], was invalid
+jmxRemoteLifecycleListener.start=The JMX Remote Listener has configured the 
registry on port [{0}] and the server on port [{1}] for the [{2}] server
 jmxRemoteLifecycleListener.invalidRmiBindAddress=Invalid RMI bind address [{0}]
 
 mBeanFactory.managerContext=Manager components may only be added to Contexts.

Modified: 
tomcat/trunk/java/org/apache/catalina/mbeans/LocalStrings_fr.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/LocalStrings_fr.properties?rev=1789480&r1=1789479&r2=1789480&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/mbeans/LocalStrings_fr.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/LocalStrings_fr.properties Thu 
Mar 30 09:36:16 2017
@@ -13,8 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-jmxRemoteLifecycleListener.createRegistryFailed=Cr\u00e9ation du 
r\u00e9pertoire RMI impossible pour le serveur {0} utilisant le port {1}
-jmxRemoteLifecycleListener.createServerFailed=Le connecteur serveur JMX pour 
le serveur {0} n''a pas pu \u00eatre cr\u00e9\u00e9 n''a pas d\u00e9marr\u00e9
-jmxRemoteLifecycleListener.destroyServerFailed=Le connecteur serveur JMX pour 
le serveur {0} n''a pas pu \u00eatre stopp\u00e9
-jmxRemoteLifecycleListener.invalidURL=L''URL demand\u00e9e pour le serveur 
{0}, [{1}], est incorrect
-jmxRemoteLifecycleListener.start=L''\u00e9couteur distant JMX a configur\u00e9 
le r\u00e9pertoire sur le port {0} et le serveur sur le port {1} pour le 
serveur {2}
+jmxRemoteLifecycleListener.createRegistryFailed=Cr\u00e9ation du 
r\u00e9pertoire RMI impossible pour le serveur [{0}] utilisant le port [{1}]
+jmxRemoteLifecycleListener.createServerFailed=Le connecteur serveur JMX pour 
le serveur [{0}] n''a pas pu \u00eatre cr\u00e9\u00e9 n''a pas d\u00e9marr\u00e9
+jmxRemoteLifecycleListener.destroyServerFailed=Le connecteur serveur JMX pour 
le serveur [{0}] n''a pas pu \u00eatre stopp\u00e9
+jmxRemoteLifecycleListener.invalidURL=L''URL demand\u00e9e pour le serveur 
[{0}], [{1}], est incorrect
+jmxRemoteLifecycleListener.start=L''\u00e9couteur distant JMX a configur\u00e9 
le r\u00e9pertoire sur le port [{0}] et le serveur sur le port [{1}] pour le 
serveur [{2}]

Modified: tomcat/trunk/java/org/apache/catalina/realm/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/LocalStrings.properties?rev=1789480&r1=1789479&r2=1789480&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/realm/LocalStrings.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/realm/LocalStrings.properties Thu Mar 
30 09:36:16 2017
@@ -32,52 +32,52 @@ jaasRealm.userPrincipalFailure=No valid
 jaasRealm.rolePrincipalAdd=Adding role Principal [{0}] to this user 
Principal''s roles
 jaasRealm.rolePrincipalFailure=No valid role Principals found.
 jaasCallback.username=Returned username [{0}]
-jdbcRealm.authenticateFailure=Username {0} NOT successfully authenticated
-jdbcRealm.authenticateSuccess=Username {0} successfully authenticated
+jdbcRealm.authenticateFailure=Usern

svn commit: r1789480 [1/4] - in /tomcat/trunk/java/org/apache/catalina: connector/ core/ filters/ ha/deploy/ ha/session/ ha/tcp/ loader/ manager/ manager/host/ mbeans/ realm/ servlets/ session/ startu

[markt]

Author: markt
Date: Thu Mar 30 09:36:16 2017
New Revision: 1789480

URL: http://svn.apache.org/viewvc?rev=1789480&view=rev
Log:
Add [...] delimiters to values in messages that don't currently have them for 
org.apache.catalina packages

Modified:
tomcat/trunk/java/org/apache/catalina/connector/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/core/LocalStrings.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.properties
tomcat/trunk/java/org/apache/catalina/filters/LocalStrings_es.properties
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/ha/session/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/ha/tcp/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/ha/tcp/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/loader/LocalStrings.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.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/host/LocalStrings.properties

tomcat/trunk/java/org/apache/catalina/manager/host/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/mbeans/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/mbeans/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/catalina/realm/LocalStrings.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/servlets/LocalStrings.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.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.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/storeconfig/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/tribes/group/LocalStrings.properties

tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/tribes/io/LocalStrings.properties

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

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

tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/LocalStrings.properties

tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/tribes/util/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/users/LocalStrings.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.

svn commit: r1789480 [2/4] - in /tomcat/trunk/java/org/apache/catalina: connector/ core/ filters/ ha/deploy/ ha/session/ ha/tcp/ loader/ manager/ manager/host/ mbeans/ realm/ servlets/ session/ startu

[markt]

Modified: tomcat/trunk/java/org/apache/catalina/filters/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/LocalStrings.properties?rev=1789480&r1=1789479&r2=1789480&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/filters/LocalStrings.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/filters/LocalStrings.properties Thu 
Mar 30 09:36:16 2017
@@ -26,19 +26,19 @@ filterbase.noSuchProperty=The property [
 http.403=Access to the specified resource [{0}] has been forbidden.
 
 expiresFilter.noExpirationConfigured=Request [{0}] with response status [{1}] 
content-type [{2}], no expiration configured
-expiresFilter.setExpirationDate=Request [{0}] with response status [{1}] 
content-type [{2}], set expiration date {3}
+expiresFilter.setExpirationDate=Request [{0}] with response status [{1}] 
content-type [{2}], set expiration date [{3}]
 expiresFilter.startingPointNotFound=Starting point 
(access|now|modification|a|m) not found in directive [{0}]
 expiresFilter.startingPointInvalid=Invalid starting point 
(access|now|modification|a|m) [{0}] in directive [{1}]
 expiresFilter.responseAlreadyCommited=Request [{0}], cannot apply 
ExpiresFilter on already committed response.
 expiresFilter.noExpirationConfiguredForContentType=No Expires configuration 
found for content-type [{0}]
-expiresFilter.useMatchingConfiguration=Use {0} matching [{1}] for content-type 
[{2}] returns {3}
-expiresFilter.useDefaultConfiguration=Use default {0} for content-type [{1}] 
returns {2}
+expiresFilter.useMatchingConfiguration=Use [{0}] matching [{1}] for 
content-type [{2}] returns [{3}]
+expiresFilter.useDefaultConfiguration=Use default [{0}] for content-type [{1}] 
returns [{2}]
 expiresFilter.noDurationFound=Duration not found in directive [{0}]
 expiresFilter.noDurationUnitAfterAmount=Duration unit not found after amount 
[{0}] in directive [{1}]
 expiresFilter.unsupportedStartingPoint=Unsupported startingPoint [{0}]
 expiresFilter.unknownParameterIgnored=Unknown parameter [{0}] with value [{1}] 
is ignored !
 expiresFilter.exceptionProcessingParameter=Exception processing configuration 
parameter [{0}]:[{1}]
-expiresFilter.filterInitialized=Filter initialized with configuration {0}
+expiresFilter.filterInitialized=Filter initialized with configuration [{0}]
 expiresFilter.expirationHeaderAlreadyDefined=Request [{0}] with response 
status [{1}] content-type [{2}], expiration header already defined
 expiresFilter.skippedStatusCode=Request [{0}] with response status [{1}] 
content-type [{1}], skip expiration header generation for given status
 expiresFilter.invalidDurationNumber=Invalid duration (number) [{0}] in 
directive [{1}]

Modified: 
tomcat/trunk/java/org/apache/catalina/filters/LocalStrings_es.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/LocalStrings_es.properties?rev=1789480&r1=1789479&r2=1789480&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/filters/LocalStrings_es.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/filters/LocalStrings_es.properties 
Thu Mar 30 09:36:16 2017
@@ -17,16 +17,16 @@ csrfPrevention.invalidRandomClass = No p
 filterbase.noSuchProperty = La propiedad [{0}] no est\u00E1 definida para los 
filtros del tipo [{1}]
 http.403 = El acceso al recurso especificado [{0}] ha sido prohibido.
 expiresFilter.noExpirationConfigured = No se ha configurado expiraci\u00F3n 
para el requerimiento [{0}] con status de respuesta [{1}] y content-type [{2}]
-expiresFilter.setExpirationDate = El requerimiento [{0}] con status de 
respuesta [{1}] y content-type [{2}], pone fecha de expiraci\u00F3n a {3}
+expiresFilter.setExpirationDate = El requerimiento [{0}] con status de 
respuesta [{1}] y content-type [{2}], pone fecha de expiraci\u00F3n a [{3}]
 expiresFilter.startingPointNotFound = Punto de Arranque 
(access|now|modification|a|m) no hallado en la directiva [{0}]
 expiresFilter.startingPointInvalid = Punto de arranque inv\u00E1lido 
(access|now|modification|a|m) [{0}] en la directiva [{1}]
 expiresFilter.responseAlreadyCommited = El requerimiento [{0}], no puede 
aplicar ExpiresFilter en respuesta ya acometida.
 expiresFilter.noExpirationConfiguredForContentType = No se ha hallado 
configuraci\u00F3n de Expiraci\u00F3n para content-type [{0}]
-expiresFilter.useMatchingConfiguration = El Uso de {0} coincidente con [{1}] 
para content-type [{2}] devuelve {3}
-expiresFilter.useDefaultConfiguration = El uso de {0} por defecto para 
content-type [{1}] devuelve {2}
+expiresFilter.useMatchingConfiguration = El Uso de [{0}] coincidente con [{1}] 
para content-type [{2}] devuelve [{3}]
+expiresFilter.useDefaultConfiguration = El uso de [{0}] por defecto para 
content-type [{1}] devuelve [{2}]
 expiresFilter.unsupportedStartingPoint = No sopo

svn commit: r1789480 [4/4] - in /tomcat/trunk/java/org/apache/catalina: connector/ core/ filters/ ha/deploy/ ha/session/ ha/tcp/ loader/ manager/ manager/host/ mbeans/ realm/ servlets/ session/ startu

[markt]

Modified: 
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_es.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_es.properties?rev=1789480&r1=1789479&r2=1789480&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_es.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_es.properties 
Thu Mar 30 09:36:16 2017
@@ -15,27 +15,27 @@
 catalina.configFail = No pude cargar la configuraci\u00F3n del servidor desde 
[{0}]
 catalina.shutdownHookFail = El gancho de apagado ha experimentado un error al 
intentar para el servidor
 catalina.stopServer = No se ha configurado puerto de apagado. Apagando el 
servidor a trav\u00E9s de se\u00F1al de SO. Servidor no apagado.
-contextConfig.altDDNotFound = fichero alt-dd {0} no hallado
+contextConfig.altDDNotFound = fichero alt-dd [{0}] no hallado
 contextConfig.applicationUrl = No pude determinar la URL para la 
aplicaci\u00F3n web.xml
 contextConfig.applicationMissing = Falta el archivo web.xml de la 
aplicaci\u00F3n. Utilizando los par\u00E1metros por defecto
-contextConfig.applicationParse = Error de evaluaci\u00F3n (parse) en el 
archivo web.xml de la aplicaci\u00F3n a {0}
-contextConfig.applicationPosition = Se ha producido en la l\u00EDnea {0} 
columna {1}
-contextConfig.applicationStart = Analizando fichero de aplicaci\u00F3n web.xml 
en {0}
-contextConfig.authenticatorConfigured = Configuraci\u00F3n de un 
autentificador (authenticator) para el m\u00E9todo {0}
-contextConfig.authenticatorInstantiate = Imposible de instanciar un 
autenticador (authenticator) para la clase {0}
-contextConfig.authenticatorMissing = Imposible de configurar un autentificador 
(authenticator) para el m\u00E9todo {0}
+contextConfig.applicationParse = Error de evaluaci\u00F3n (parse) en el 
archivo web.xml de la aplicaci\u00F3n a [{0}]
+contextConfig.applicationPosition = Se ha producido en la l\u00EDnea [{0}] 
columna [{1}]
+contextConfig.applicationStart = Analizando fichero de aplicaci\u00F3n web.xml 
en [{0}]
+contextConfig.authenticatorConfigured = Configuraci\u00F3n de un 
autentificador (authenticator) para el m\u00E9todo [{0}]
+contextConfig.authenticatorInstantiate = Imposible de instanciar un 
autenticador (authenticator) para la clase [{0}]
+contextConfig.authenticatorMissing = Imposible de configurar un autentificador 
(authenticator) para el m\u00E9todo [{0}]
 contextConfig.authenticatorResources = Imposible de cargar la lista de 
correspondencia de autenticadores (authenticators)
 contextConfig.badUrl = No pude procesar descriptor de contextor [{0}]
-contextConfig.cce = El objeto de los datos de evento de ciclo de vida 
(Lifecycle event data object) {0} no es un Contexto
-contextConfig.contextClose = Error cerrando context.xml: {0}
-contextConfig.contextMissing = Falta context.xml: {0}
-contextConfig.contextParse = Error de an\u00E1lisis en context.xml: {0}
-contextConfig.defaultError = Error al procesar web.xml por defecto con nombre 
{0} en {1}
+contextConfig.cce = El objeto de los datos de evento de ciclo de vida 
(Lifecycle event data object) [{0}] no es un Contexto
+contextConfig.contextClose = Error cerrando context.xml: [{0}]
+contextConfig.contextMissing = Falta context.xml: [{0}]
+contextConfig.contextParse = Error de an\u00E1lisis en context.xml: [{0}]
+contextConfig.defaultError = Error al procesar web.xml por defecto con nombre 
[{0}] en [{1}]
 contextConfig.defaultMissing = No se ha hallado web.xml global
-contextConfig.defaultPosition = Se ha producido en la l\u00EDnea {0} columna 
{1}
+contextConfig.defaultPosition = Se ha producido en la l\u00EDnea [{0}] columna 
[{1}]
 contextConfig.destroy = ContextConfig: Destruyendo
 contextConfig.fileUrl = No puedo crear un objeto Fichero desde la URL [{0}]
-contextConfig.fixDocBase = Excepci\u00F3n arreglando docBase: {0}
+contextConfig.fixDocBase = Excepci\u00F3n arreglando docBase: [{0}]
 contextConfig.init = ContextConfig: Inicializando
 contextConfig.inputStreamFile = No puedo procesar el fichero [{0}] para las 
anotaciones
 contextConfig.inputStreamJar = No puedo procesar la entrada de Jar [{0}] desde 
el Jar [{1}] para las anotaciones
@@ -44,42 +44,42 @@ contextConfig.invalidSci = No se pudo cr
 contextConfig.invalidSciHandlesTypes = No puedo cargar la clase [{0}] para 
revisar contra la anotaci\u00F3n  @HandlesTypes de uno o m\u00E1s 
ServletContentInitializers.
 contextConfig.jndiUrl = No puedo procesar la URL JNDI [{0}] para las 
anotaciones
 contextConfig.jndiUrlNotDirContextConn = La conexi\u00F3n creada para la URL 
[{0}] no era una DirContextURLConnection
-contextConfig.jspFile.error = El archivo JSP {0} debe de comenzar con ''/''
-contextConfig.jspFile.warning = AVISO: El archivo JSP {0} debe de comenzar con 
''/'' en Servlet 2.4
+contextConfig.jspFile.error = El archivo JSP [{0}] debe de comenzar con ''/''
+contextCo

svn commit: r1789481 - /tomcat/trunk/webapps/docs/changelog.xml

[markt]

Author: markt
Date: Thu Mar 30 09:55:28 2017
New Revision: 1789481

URL: http://svn.apache.org/viewvc?rev=1789481&view=rev
Log: (empty)

Modified:
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1789481&r1=1789480&r2=1789481&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Mar 30 09:55:28 2017
@@ -77,6 +77,10 @@
 60932: Correctly escape single quotes when used in i18n
 messages. Based on a patch by Michael Osipov. (markt)
   
+  
+Review i18n property files, remove unencessary escaping and 
consistently
+use [...] to delimit inserted values. (markt)
+  
 
   
 



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

svn commit: r1789482 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/connector/ java/org/apache/catalina/core/ java/org/apache/catalina/ha/deploy/ java/org/apache/catalina/ha/session/ java/org

[markt]

Author: markt
Date: Thu Mar 30 09:58:41 2017
New Revision: 1789482

URL: http://svn.apache.org/viewvc?rev=1789482&view=rev
Log:
Correctly escape single quotes when used in i18n messages.
Based on a patch by Michael Osipov.

Modified:
tomcat/tc8.5.x/trunk/   (props changed)

tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/LocalStrings.properties
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/LocalStrings.properties

tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/LocalStrings_es.properties

tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties

tomcat/tc8.5.x/trunk/java/org/apache/catalina/ha/deploy/LocalStrings.properties

tomcat/tc8.5.x/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties
tomcat/tc8.5.x/trunk/java/org/apache/catalina/ha/tcp/LocalStrings.properties

tomcat/tc8.5.x/trunk/java/org/apache/catalina/ha/tcp/LocalStrings_es.properties
tomcat/tc8.5.x/trunk/java/org/apache/catalina/realm/LocalStrings.properties

tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties

tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/LocalStrings_es.properties

tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/interceptors/LocalStrings.properties

tomcat/tc8.5.x/trunk/java/org/apache/catalina/webresources/LocalStrings.properties
tomcat/tc8.5.x/trunk/java/org/apache/el/Messages.properties
tomcat/tc8.5.x/trunk/java/org/apache/el/Messages_es.properties

tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties

tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties

tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties

tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings.properties

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/LocalStrings.properties
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 30 09:58:41 2017
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
 
,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747
 
924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1

svn commit: r1789485 [2/2] - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/connector/ java/org/apache/catalina/core/ java/org/apache/catalina/ha/deploy/ java/org/apache/catalina/ha/session/ ja

[markt]

Modified: 
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/http/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/http/LocalStrings.properties?rev=1789485&r1=1789484&r2=1789485&view=diff
==
--- 
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/http/LocalStrings.properties 
(original)
+++ 
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/http/LocalStrings.properties 
Thu Mar 30 10:00:13 2017
@@ -22,7 +22,7 @@ parameters.invalidChunk=Invalid chunk st
 parameters.maxCountFail=More than the maximum number of request parameters 
(GET plus POST) for a single request ([{0}]) were detected. Any parameters 
beyond this limit have been ignored. To change this limit, set the 
maxParameterCount attribute on the Connector.
 parameters.maxCountFail.fallToDebug=\n Note: further occurrences of this error 
will be logged at DEBUG level.
 parameters.multipleDecodingFail=Character decoding failed. A total of [{0}] 
failures were detected but only the first was logged. Enable debug level 
logging for this logger to log all failures.
-parameters.noequal=Parameter starting at position [{0}] and ending at position 
[{1}] with a value of [{0}] was not followed by an '=' character
+parameters.noequal=Parameter starting at position [{0}] and ending at position 
[{1}] with a value of [{0}] was not followed by an ''='' character
 parameters.fallToDebug=\n Note: further occurrences of Parameter errors will 
be logged at DEBUG level.
 
 cookies.invalidCookieToken=Cookies: Invalid cookie. Value not a token or 
quoted value

Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1789485&r1=1789484&r2=1789485&view=diff
==
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Thu Mar 30 10:00:13 2017
@@ -68,6 +68,10 @@
 Correct comments about Java 8 in Jre8Compat.
 Patch provided by fibbers via Github. (violetagg)
   
+  
+60932: Correctly escape single quotes when used in i18n
+messages. Based on a patch by Michael Osipov. (markt)
+  
 
   
 



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

svn commit: r1789485 [1/2] - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/connector/ java/org/apache/catalina/core/ java/org/apache/catalina/ha/deploy/ java/org/apache/catalina/ha/session/ ja

[markt]

Author: markt
Date: Thu Mar 30 10:00:13 2017
New Revision: 1789485

URL: http://svn.apache.org/viewvc?rev=1789485&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=60932
Correctly escape single quotes when used in i18n messages.
Based on a patch by Michael Osipov.

Modified:
tomcat/tc8.0.x/trunk/   (props changed)

tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/LocalStrings.properties
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties

tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/LocalStrings_es.properties

tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties

tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/deploy/LocalStrings.properties

tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/tcp/LocalStrings.properties

tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/tcp/LocalStrings_es.properties
tomcat/tc8.0.x/trunk/java/org/apache/catalina/realm/LocalStrings.properties

tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties

tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/LocalStrings_es.properties

tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/LocalStrings.properties

tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/LocalStrings.properties
tomcat/tc8.0.x/trunk/java/org/apache/el/Messages.properties
tomcat/tc8.0.x/trunk/java/org/apache/el/Messages_es.properties

tomcat/tc8.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties

tomcat/tc8.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties

tomcat/tc8.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties

tomcat/tc8.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties

tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings.properties

tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/http/LocalStrings.properties
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 30 10:00:13 2017
@@ -1,2 +1,2 @@
 
/tomcat/tc8.5.x/trunk:1735042,1737966,1743139-1743140,1744151,1747537,1747925,1748002,1754614,1754643,1762124,1762183,1762203,1763792,1772948,1777014,1779719,1782037,1782240,1782386-1782387,1785669,1786845,1788249,1788324,1788905,1789216,1789335
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1637890,1637892,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886
 
,1644890,1644892,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657
 
592,1657607,1657609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660

svn commit: r1789488 [2/2] - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/connector/ java/org/apache/catalina/core/ java/org/apache/catalina/deploy/ java/org/apache/catalina/ha/deploy/ java/o

[markt]

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties?rev=1789488&r1=1789487&r2=1789488&view=diff
==
--- 
tomcat/tc7.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties 
(original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties 
Thu Mar 30 10:24:36 2017
@@ -41,40 +41,40 @@ jsp.error.usebean.missing.attribute=useB
 jsp.error.usebean.missing.type=useBean ({0}): Either class or type attribute 
must be \
 specified: 
 jsp.error.usebean.duplicate=useBean: Duplicate bean name: {0}
-jsp.error.usebean.prohibited.as.session=Can't use as session bean {0} since it 
is prohibited \
+jsp.error.usebean.prohibited.as.session=Can''t use as session bean {0} since 
it is prohibited \
 by jsp directive defined earlier: 
 jsp.error.usebean.not.both=useBean: Can't specify both class and beanName 
attribute: 
 jsp.error.usebean.bad.type.cast=useBean ({0}): Type ({1}) is not assignable 
from class ({2}) 
-jsp.error.invalid.scope=Illegal value of \'scope\' attribute: {0} (must be one 
of \"page\", \"request\", \"session\", or \"application\")
+jsp.error.invalid.scope=Illegal value of \''scope\'' attribute: {0} (must be 
one of \"page\", \"request\", \"session\", or \"application\")
 jsp.error.classname=Can't determine classname from .class file
 jsp.error.outputfolder=No output folder
 jsp.warning.bad.type=Warning: bad type in .class file
 jsp.error.data.file.write=Error while writing data file
-jsp.error.page.conflict.contenttype=Page directive: illegal to have multiple 
occurrences of 'contentType' with different values (old: {0}, new: {1})
+jsp.error.page.conflict.contenttype=Page directive: illegal to have multiple 
occurrences of ''contentType'' with different values (old: {0}, new: {1})
 jsp.error.page.invalid.contenttype=Page directive: invalid value for 
contentType
-jsp.error.page.conflict.session=Page directive: illegal to have multiple 
occurrences of 'session' with different values (old: {0}, new: {1})
+jsp.error.page.conflict.session=Page directive: illegal to have multiple 
occurrences of ''session'' with different values (old: {0}, new: {1})
 jsp.error.page.invalid.session=Page directive: invalid value for session
-jsp.error.page.conflict.buffer=Page directive: illegal to have multiple 
occurrences of 'buffer' with different values (old: {0}, new: {1})
+jsp.error.page.conflict.buffer=Page directive: illegal to have multiple 
occurrences of ''buffer'' with different values (old: {0}, new: {1})
 jsp.error.page.invalid.buffer=Page directive: invalid value for buffer
-jsp.error.page.conflict.autoflush=Page directive: illegal to have multiple 
occurrences of 'autoFlush' with different values (old: {0}, new: {1})
+jsp.error.page.conflict.autoflush=Page directive: illegal to have multiple 
occurrences of ''autoFlush'' with different values (old: {0}, new: {1})
 jsp.error.page.invalid.autoflush=Page directive: invalid value for autoFlush
 jsp.error.page.invalid.import=Page directive: invalid value for import
-jsp.error.page.conflict.isthreadsafe=Page directive: illegal to have multiple 
occurrences of 'isThreadSafe' with different values (old: {0}, new: {1})
+jsp.error.page.conflict.isthreadsafe=Page directive: illegal to have multiple 
occurrences of ''isThreadSafe'' with different values (old: {0}, new: {1})
 jsp.error.page.invalid.isthreadsafe=Page directive: invalid value for 
isThreadSafe
-jsp.error.page.conflict.info=Page directive: illegal to have multiple 
occurrences of 'info' with different values (old: {0}, new: {1})
+jsp.error.page.conflict.info=Page directive: illegal to have multiple 
occurrences of ''info'' with different values (old: {0}, new: {1})
 jsp.error.page.invalid.info=Page directive: invalid value for info
-jsp.error.page.conflict.iserrorpage=Page directive: illegal to have multiple 
occurrences of 'isErrorPage' with different values (old: {0}, new: {1})
+jsp.error.page.conflict.iserrorpage=Page directive: illegal to have multiple 
occurrences of ''isErrorPage'' with different values (old: {0}, new: {1})
 jsp.error.page.invalid.iserrorpage=Page directive: invalid value for 
isErrorPage
-jsp.error.page.conflict.errorpage=Page directive: illegal to have multiple 
occurrences of 'errorPage' with different values (old: {0}, new: {1})
-jsp.error.page.conflict.language=Page directive: illegal to have multiple 
occurrences of 'language' with different values (old: {0}, new: {1})
-jsp.error.tag.conflict.language=Tag directive: illegal to have multiple 
occurrences of 'language' with different values (old: {0}, new: {1})
+jsp.error.page.conflict.errorpage=Page directive: illegal to have multiple 
occurrences of ''errorPage'' with different values (old: {0}, new: {1})
+jsp.error.page.conflict.language=Page directive: illegal to have multi

svn commit: r1789488 [1/2] - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/connector/ java/org/apache/catalina/core/ java/org/apache/catalina/deploy/ java/org/apache/catalina/ha/deploy/ java/o

[markt]

Author: markt
Date: Thu Mar 30 10:24:36 2017
New Revision: 1789488

URL: http://svn.apache.org/viewvc?rev=1789488&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=60932
Correctly escape single quotes when used in i18n messages.
Based on a patch by Michael Osipov.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)

tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/LocalStrings.properties
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties

tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings_es.properties

tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties
tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/LocalStrings.properties

tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/deploy/LocalStrings.properties

tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties

tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/LocalStrings_es.properties
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/tcp/LocalStrings.properties

tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/tcp/LocalStrings_es.properties
tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/LocalStrings.properties

tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties

tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/LocalStrings_es.properties

tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/transport/LocalStrings.properties

tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/transport/LocalStrings_es.properties
tomcat/tc7.0.x/trunk/java/org/apache/el/Messages.properties
tomcat/tc7.0.x/trunk/java/org/apache/el/Messages_es.properties

tomcat/tc7.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties

tomcat/tc7.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties

tomcat/tc7.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties

tomcat/tc7.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties

tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/LocalStrings.properties

tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/LocalStrings.properties

tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/res/LocalStrings.properties
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 30 10:24:36 2017
@@ -1,3 +1,3 @@
 
/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553
 
-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681703,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702739,1702
 
742,1702744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549

[Bug 60932] Invalid or incomplete escaping of apostrophe (') in messages passed to MessageFormat

[bugzilla]

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

Mark Thomas  changed:

   What|Removed |Added

 Resolution|--- |FIXED
 Status|NEW |RESOLVED

--- Comment #2 from Mark Thomas  ---
Fixed in:
- trunk for 9.0.0.M20 onwards
- 8.5.x for 8.5.14 onwards
- 8.0.x for 8.0.44 onwards
- 7.0.x for 7.0.78 onwards

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

Re: [VOTE] Release Apache Tomcat 7.0.77

[Martin Grigorov]

On Tue, Mar 28, 2017 at 6:45 PM, Violeta Georgieva 
wrote:

> The proposed Apache Tomcat 7.0.77 release is now available for voting.
>
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-7/v7.0.77/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1128/
> The svn tag is:
> http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_77/
>
> The proposed 7.0.77 release is:
> [ ] Broken - do not release
> [ X ] Stable - go ahead and release as 7.0.77 Stable
>

Regards,
Martin


>
> Regards,
> Violeta
>

Re: [VOTE][RESULT] Release Apache Tomcat 9.0.0.M19

[Mark Thomas]

The following votes were cast:

Binding:
+1: violetagg, remm, mgrigorov, fschumacher, kfujino, markt

No other voters were cast.

The vote therefore passes.

Thanks to everyone who helped with this release.

Mark

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

svn commit: r18969 - /dev/tomcat/tomcat-9/v9.0.0.M19/ /release/tomcat/tomcat-9/v9.0.0.M19/

[markt]

Author: markt
Date: Thu Mar 30 15:57:53 2017
New Revision: 18969

Log:
Release 9.0.0.M19

Added:
release/tomcat/tomcat-9/v9.0.0.M19/
  - copied from r18968, dev/tomcat/tomcat-9/v9.0.0.M19/
Removed:
dev/tomcat/tomcat-9/v9.0.0.M19/


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

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

[Mark Thomas]

The following votes were cast:

Binding:
+1: violetagg, mgrigorov, remm, fschumacher, kfujino, markt

Non-binding:
+1: csutherl

The vote therefore passes.

Thanks to everyone who contributed to this release.

Mark

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

svn commit: r18970 - /dev/tomcat/tomcat-8/v8.5.13/ /release/tomcat/tomcat-8/v8.5.13/

[markt]

Author: markt
Date: Thu Mar 30 16:01:22 2017
New Revision: 18970

Log:
Release 8.5.13

Added:
release/tomcat/tomcat-8/v8.5.13/
  - copied from r18969, dev/tomcat/tomcat-8/v8.5.13/
Removed:
dev/tomcat/tomcat-8/v8.5.13/


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

URI encoding

[Rémy Maucherat]

Hi,

On the Servlet EG mailing list, I noticed a request for comments on URI
encoding, which adds a per webapp parameter for encoding and, most
importantly, that it also affects the URI. The problem is that decoding is
still needed to first map the URI to the webapp, making this added feature
a problem. OTOH, if decoding twice is needed, only people who use this
parameter would pay the price.

Comments ?

Rémy

potential NPE on 8.5.13

[Romain Manni-Bucau]

Hi guys,

seems on the last release we can get a NPE we didnt get before.

In org.apache.catalina.core.ApplicationMapping#getServletMapping for case
PATH pathInfo can be null so the toString() doesnt behave very well.

Got it with a @WebServlet("/foo/*")

Romain Manni-Bucau
@rmannibucau  |  Blog
 | Old Blog
 | Github  |
LinkedIn  | JavaEE Factory

Re: potential NPE on 8.5.13

[Romain Manni-Bucau]

oops, hit enter too fast

important detail: it is in a request.getRequestDispatcher("WEB-INF/test.jsp"
).forward(request, response);


Romain Manni-Bucau
@rmannibucau  |  Blog
 | Old Blog
 | Github  |
LinkedIn  | JavaEE Factory


2017-03-30 19:40 GMT+02:00 Romain Manni-Bucau :

> Hi guys,
>
> seems on the last release we can get a NPE we didnt get before.
>
> In org.apache.catalina.core.ApplicationMapping#getServletMapping for case
> PATH pathInfo can be null so the toString() doesnt behave very well.
>
> Got it with a @WebServlet("/foo/*")
>
> Romain Manni-Bucau
> @rmannibucau  |  Blog
>  | Old Blog
>  | Github
>  | LinkedIn
>  | JavaEE Factory
> 
>

Re: potential NPE on 8.5.13

[Violeta Georgieva]

Hi,

2017-03-30 20:41 GMT+03:00 Romain Manni-Bucau :
>
> oops, hit enter too fast
>
> important detail: it is in a
request.getRequestDispatcher("WEB-INF/test.jsp"
> ).forward(request, response);

Do you experience this with 8.5.12 (latest release) or 8.5.13 (currently
release that we vote)?
We have a fix in 8.5.13 for an issue similar to what you describe.
https://bz.apache.org/bugzilla/show_bug.cgi?id=60882

Regards,
Violeta

>
> Romain Manni-Bucau
> @rmannibucau  |  Blog
>  | Old Blog
>  | Github <
https://github.com/rmannibucau> |
> LinkedIn  | JavaEE Factory
> 
>
> 2017-03-30 19:40 GMT+02:00 Romain Manni-Bucau :
>
> > Hi guys,
> >
> > seems on the last release we can get a NPE we didnt get before.
> >
> > In org.apache.catalina.core.ApplicationMapping#getServletMapping for
case
> > PATH pathInfo can be null so the toString() doesnt behave very well.
> >
> > Got it with a @WebServlet("/foo/*")
> >
> > Romain Manni-Bucau
> > @rmannibucau  |  Blog
> >  | Old Blog
> >  | Github
> >  | LinkedIn
> >  | JavaEE Factory
> > 
> >

[Bug 60944] New: Tomcat Production Issue connections in CLOSE_WAIT

[bugzilla]

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

Bug ID: 60944
   Summary: Tomcat Production Issue connections in CLOSE_WAIT
   Product: Tomcat 7
   Version: 7.0.39
  Hardware: Sun
OS: Linux
Status: NEW
  Severity: critical
  Priority: P2
 Component: Catalina
  Assignee: dev@tomcat.apache.org
  Reporter: adil.ak...@globalpay.com
  Target Milestone: ---

I have Tomcat Server version: Apache Tomcat/7.0.39 running on Production
environment having at least ~100 users during the day totaling about 10-20K in
24 hours. I'm having issue from time to time and issue resolves when I restart
the server.

Upon checking netstat for the listening port, I see all the connections are in
CLOSE_WAIT. When this happens tomcat stops to serving any request and
application is not responsive. When I restart server, tomcat works and starts
taking traffic and all ports goes either ESTABLISHED or TIME_WAIT.

Below are the details

Server version: Apache Tomcat/7.0.39
Server built:   Mar 22 2013 12:37:24
Server number:  7.0.39.0
OS Name:Linux
OS Version: 2.6.32-642.13.1.el6.x86_64
Architecture:   amd64
JVM Version:1.8.0_111-b15
JVM Vendor: Oracle Corporation

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

Re: [VOTE] Release Apache Tomcat 6.0.52

[Violeta Georgieva]

2017-03-28 22:38 GMT+03:00 Violeta Georgieva :
>
> The proposed Apache Tomcat 6.0.52 release is now available for voting.
>
> Note: This is the last Tomcat 6 release.
>
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-6/v6.0.52/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1129/
> The svn tag is:
> http://svn.apache.org/repos/asf/tomcat/tc6.0.x/tags/TOMCAT_6_0_52/
>
> The proposed 6.0.52 release is:
> [ ] Broken - do not release
[X] Stable - go ahead and release as 6.0.52 Stable

Regards,
Violeta

Re: [VOTE] Release Apache Tomcat 9.0.0.M19

[Rainer Jung]

Am 27.03.2017 um 14:56 schrieb Mark Thomas:

The proposed Apache Tomcat 9.0.0.M19 release is now available for voting.

This is a milestone release for the 9.0.x branch. It should be
noted that, as a milestone release:
- Servlet 4.0 is not finalised
- The EGs have not started work on JSP 2.4, EL 3.1 or WebSocket 1.2/2.0

The major changes compared to the 9.0.0.M18 release are:

- Various HTTP/2 improvements

- Fixes for sendfile related issues that could cause subsequent requests
  to experience IllegalStateExceptions

- Servlet 4.0 updates


Along with lots of other bug fixes and improvements

For full details, see the changelog:
http://svn.apache.org/repos/asf/tomcat/trunk/webapps/docs/changelog.xml

It can be obtained from:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-9/v9.0.0.M19/
The Maven staging repo is:
https://repository.apache.org/content/repositories/orgapachetomcat-1125/
The svn tag is:
http://svn.apache.org/repos/asf/tomcat/tags/TOMCAT_9_0_0_M19/

The proposed 9.0.0.M19 release is:
[ ] Broken - do not release
[X] Alpha - go ahead and release as 9.0.0.M19


I know the vote is over but for the sake of completeness:

+1 to release as alpha.

Please see below for some details on increased number of NPE during 
shutdown.


Details
===

- SHA1 and MD5 OK
- signatures OK
- key in KEYS file
- gz and zip for src and bin consistent
- src consistent with svn tag
  - except bin shell scripts are not executable in src tarball
(not critical)
- builds fine
- build result looks consistent with binaries
- no checkstyle complaints
- no Javadoc warnings
- Unit tests: No failures

  - WARN messages:
- some message that were logged in M17 by localhost-startStop-1
  are now logged by main
- the message "[main] 
org.apache.tomcat.util.net.Nio2Endpoint.shutdownExecutor The executor 
associated with thread pool [http-nio2-127.0.0.1-auto-I] has not fully 
shutdown. Some application threads may still be running." (6 times) is 
now gone
- the message 
"org.apache.catalina.loader.WebappClassLoaderBase.clearReferencesThreads 
The web application [ROOT] is still processing a request that has yet to 
finish. This is very likely to create a memory leak. You can control the 
time allowed for requests to finish by using the unloadDelay attribute 
of the standard Context implementation. Stack trace of request 
processing thread:" reduced from 18 times to 3 times

- more Tribes warnings (46 versus 72)
- more Tribes errors (7 versus 12)

  - SEVERE message
- more "org.apache.coyote.http11.Http11Processor.service Error 
processing request" (apr 3 versus 6, nio 3 versus 10)
- more "org.apache.coyote.http11.Http11Processor.endRequest Error 
finishing response" (apr 1 versus 7, nio 1 versus 13)
- more 
"org.apache.coyote.AbstractProtocol$ConnectionHandler.process Error 
reading request, ignored" (apr 4 versus 6)
- new message "org.apache.catalina.core.StandardWrapperValve.invoke 
Servlet.service() for servlet [jsp] in context with path [/test] threw 
exception [Page-encoding specified in XML prolog (ISO-8859-1) is 
different from that specified in jsp-property-group (UTF-8)] with root 
cause" (one for apr, nio and nio2)
- less "org.apache.catalina.connector.CoyoteAdapter.asyncDispatch 
Exception while processing an asynchronous request" (nio2 1 versus 0)
- no more "org.apache.catalina.core.StandardWrapperValve.invoke 
Servlet.service() for servlet [simple] in context with path [] threw 
exception"
- much less "org.apache.catalina.core.StandardHostValve.invoke 
Exception Processing /simple" (apr, nio and nio2 5 each versus now only 
one for nio)


  - Exceptions: the biggest difference is more NullPointerException 
(about 32 new ones). They seem to happen after the stop was issued and 
only for apr and nio, not for nio2. Two cases:
- org.apache.coyote.http11.Http11Processor.endRequest Error 
finishing response (20 times)


Stack

at 
org.apache.coyote.http11.Http11OutputBuffer.commit(Http11OutputBuffer.java:329) 

at 
org.apache.coyote.http11.Http11Processor.prepareResponse(Http11Processor.java:1000) 


at org.apache.coyote.AbstractProcessor.action(AbstractProcessor.java:258)
at 
org.apache.coyote.http11.Http11Processor.endRequest(Http11Processor.java:1169)


Line 329 is:

socketWrapper.write(isBlocking(), headerBuffer);

Tests with this NPE (maybe it varies):

nio org.apache.catalina.connector.TestRequest [testBug57215f]
nio org.apache.catalina.core.TestApplicationContext [testBug53467]
nio org.apache.catalina.core.TestStandardContextResources 
[testResourcesWebInfClasses]

nio org.apache.catalina.mbeans.TestRegistration [testMBeanDeregistration]
nio org.apache.catalina.startup.TestTomcat [testJsps]
nio org.apache.catalina.startup.TestTomcatClassLoader 
[testDefaultClassLoader]

nio org.apache.el.TestELInJsp [testBug46596]
nio org.apache.jasper.compiler.TestEncodingDetector [testEncodedJsp[1]]
nio org.apache.jasper.compiler.TestEncodingDetector [testEncodedJsp[4]

Re: potential NPE on 8.5.13

[Romain Manni-Bucau]

experienced it only on 8.5.13, 8.5.12 was working fine


Romain Manni-Bucau
@rmannibucau  |  Blog
 | Old Blog
 | Github  |
LinkedIn  | JavaEE Factory


2017-03-30 19:53 GMT+02:00 Violeta Georgieva :

> Hi,
>
> 2017-03-30 20:41 GMT+03:00 Romain Manni-Bucau :
> >
> > oops, hit enter too fast
> >
> > important detail: it is in a
> request.getRequestDispatcher("WEB-INF/test.jsp"
> > ).forward(request, response);
>
> Do you experience this with 8.5.12 (latest release) or 8.5.13 (currently
> release that we vote)?
> We have a fix in 8.5.13 for an issue similar to what you describe.
> https://bz.apache.org/bugzilla/show_bug.cgi?id=60882
>
> Regards,
> Violeta
>
> >
> > Romain Manni-Bucau
> > @rmannibucau  |  Blog
> >  | Old Blog
> >  | Github <
> https://github.com/rmannibucau> |
> > LinkedIn  | JavaEE Factory
> > 
> >
> > 2017-03-30 19:40 GMT+02:00 Romain Manni-Bucau :
> >
> > > Hi guys,
> > >
> > > seems on the last release we can get a NPE we didnt get before.
> > >
> > > In org.apache.catalina.core.ApplicationMapping#getServletMapping for
> case
> > > PATH pathInfo can be null so the toString() doesnt behave very well.
> > >
> > > Got it with a @WebServlet("/foo/*")
> > >
> > > Romain Manni-Bucau
> > > @rmannibucau  |  Blog
> > >  | Old Blog
> > >  | Github
> > >  | LinkedIn
> > >  | JavaEE Factory
> > > 
> > >
>

Re: potential NPE on 8.5.13

[Romain Manni-Bucau]

hmm, after a deeper check it seems it can be IDE related. I'll run tomee
test suite this night with that upgrade (8.5.13), think it could have been
due to a messy Idea cache. Will report tomorrow morning the results. Thanks
Violeta to have pointed this bugzilla out, helped to see that.


Romain Manni-Bucau
@rmannibucau  |  Blog
 | Old Blog
 | Github  |
LinkedIn  | JavaEE Factory


2017-03-30 21:50 GMT+02:00 Romain Manni-Bucau :

> experienced it only on 8.5.13, 8.5.12 was working fine
>
>
> Romain Manni-Bucau
> @rmannibucau  |  Blog
>  | Old Blog
>  | Github
>  | LinkedIn
>  | JavaEE Factory
> 
>
> 2017-03-30 19:53 GMT+02:00 Violeta Georgieva :
>
>> Hi,
>>
>> 2017-03-30 20:41 GMT+03:00 Romain Manni-Bucau :
>> >
>> > oops, hit enter too fast
>> >
>> > important detail: it is in a
>> request.getRequestDispatcher("WEB-INF/test.jsp"
>> > ).forward(request, response);
>>
>> Do you experience this with 8.5.12 (latest release) or 8.5.13 (currently
>> release that we vote)?
>> We have a fix in 8.5.13 for an issue similar to what you describe.
>> https://bz.apache.org/bugzilla/show_bug.cgi?id=60882
>>
>> Regards,
>> Violeta
>>
>> >
>> > Romain Manni-Bucau
>> > @rmannibucau  |  Blog
>> >  | Old Blog
>> >  | Github <
>> https://github.com/rmannibucau> |
>> > LinkedIn  | JavaEE Factory
>> > 
>> >
>> > 2017-03-30 19:40 GMT+02:00 Romain Manni-Bucau :
>> >
>> > > Hi guys,
>> > >
>> > > seems on the last release we can get a NPE we didnt get before.
>> > >
>> > > In org.apache.catalina.core.ApplicationMapping#getServletMapping for
>> case
>> > > PATH pathInfo can be null so the toString() doesnt behave very well.
>> > >
>> > > Got it with a @WebServlet("/foo/*")
>> > >
>> > > Romain Manni-Bucau
>> > > @rmannibucau  |  Blog
>> > >  | Old Blog
>> > >  | Github
>> > >  | LinkedIn
>> > >  | JavaEE Factory
>> > > 
>> > >
>>
>
>

Re: [VOTE] Release Apache Tomcat 7.0.77

[Violeta Georgieva]

2017-03-28 19:45 GMT+03:00 Violeta Georgieva :
>
> The proposed Apache Tomcat 7.0.77 release is now available for voting.
>
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-7/v7.0.77/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1128/
> The svn tag is:
> http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_77/
>
> The proposed 7.0.77 release is:
> [ ] Broken - do not release
[X] Stable - go ahead and release as 7.0.77 Stable

Regards,
Violeta

Re: [VOTE] Release Apache Tomcat 8.5.13

[Rainer Jung]

Am 27.03.2017 um 17:13 schrieb Mark Thomas:

The proposed Apache Tomcat 8.5.13 release is now available for voting.

The major changes compared to the 8.5.12 release are:

- Various HTTP/2 improvements

- Fixes for sendfile related issues that could cause subsequent requests
  to experience IllegalStateExceptions

- Servlet 4.0 updates


It can be obtained from:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.5.13/
The Maven staging repo is:
https://repository.apache.org/content/repositories/orgapachetomcat-1126/
The svn tag is:
http://svn.apache.org/repos/asf/tomcat/tc8.5.x/tags/TOMCAT_8_5_13/

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


I know the vote is over but for the sake of completeness:

+1 to release.

Details
===

- SHA1 and MD5 OK
- signatures OK
- key in KEYS file
- gz and zip for src and bin consistent
- src consistent with svn tag
  - except bin shell scripts are not executable in src tarball
(not critical)
- builds fine
  - warning about unchecked calls or conversions in:
- org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
- org/apache/tomcat/jdbc/pool/PoolProperties.java
  Not a regression
- build result looks consistent with binaries
- no checkstyle complaints
- no Javadoc warnings

- Unit tests: No failures

  - WARN messages:
- less Tribes warnings (72 versus 62)
- less 
"org.apache.catalina.loader.WebappClassLoaderBase.clearReferencesThreads 
The web application [ROOT] is still processing a request that has yet to 
finish. This is very likely to create a memory leak. You can control the 
time allowed for requests to finish by using the unloadDelay attribute 
of the standard Context implementation. Stack trace of request 
processing thread:" (4 versus 2)
- no more "org.apache.tomcat.util.net.Nio2Endpoint.shutdownExecutor 
The executor associated with thread pool [http-nio2-127.0.0.1-auto-I] 
has not fully shutdown. Some application threads may still be running." 
(2 versus 0)


  - SEVERE message
- less "org.apache.coyote.http11.Http11Processor.service Error 
processing request" (nio2 3 versus 2)
- slight change in 
"org.apache.coyote.http11.Http11Processor.endRequest Error finishing 
response" (nio 1 versus 2, nio2 1 versus 0)
- more 
"org.apache.coyote.AbstractProtocol$ConnectionHandler.process Error 
reading request, ignored" (apr 4 versus 5)
- slight change in 
"org.apache.catalina.connector.CoyoteAdapter.asyncDispatch Exception 
while processing an asynchronous" (apr 1 versus 0, io 0 versus 1)
- more "org.apache.tomcat.util.net.AprEndpoint$Poller.run Poller 
failed with error [9] : [Bad file number]" (apr 1 versus 2)

- minor changes for Tribes

  - Exceptions
- fewer java.io.IOException in apr (5 versus 4)
- more "java.io.IOException: Broken pipe" (11 versus 12)
- "org.apache.catalina.connector.CoyoteAdapter.asyncDispatch 
Exception while processing an asynchronous request" (1 moved from apr to 
nio)

- more "java.net.ConnectException" in tribes (2 versus 3)
- more "java.nio.channels.ClosedChannelException" (5 versus 6)
- fewer "java.lang.NullPointerException" (9 versus 7)
- fewer "org.apache.catalina.tribes.ChannelException: Sender not 
connected.; No faulty members identified." (8 versus 7)
- new "java.lang.IllegalStateException: Calling [asyncComplete()] 
is not valid for a request with Async state [MUST_COMPLETE]" (once)
- new 
"org.apache.catalina.tribes.transport.nio.NioReplicationTask.run 
IOException in replication worker, unable to drain channel. Probable 
cause: Keep alive socket closed[null]." (once)


- JMX MBean Comparison with 8.5.12:
  - ProtocolHandler MBean new attribute "sendReasonPhrase: false"
- attribute compressableMimeTypes additional list elements
  "application/json" and "application/xml" as expected
- attribute compressibleMimeType String
  ",application/json,application/xml" appended to value
  as expected
- for http additional attributes "truststoreType: JKS",
  "trustMaxCertLength: 10", "truststoreAlgorithm: PKIX",
  "algorithm: SunX509", "sSLDisableSessionTickets: false",
  "sessionCacheSize: 0", "keystoreType: JKS",
  "sslProtocol: TLS", "sSLVerifyDepth: 10",
  "clientAuth: NONE", "sSLVerifyClient: NONE",
  "ciphers: HIGH:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!kRSA",
  "sSLCipherSuite: HIGH:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!kRSA",
  "sSLDisableCompression: true", "keystoreFile: /home/.../.keystore",
  "sessionTimeout: 86400",
  "compressibleMimeType: text/html,text/xml,text/plain,text/css,text",
  "compressibleMimeTypes" (same as compressibleMimeType but as a 
String Array)
  - Connector MBean new attribute "ciphers: 
HIGH:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!kRSA:!DHE"

  - Logging MBean: three new loggers,
"org.apache.tomcat.util.net",
"org.apache.tomcat.util.net.SSLHostConfig",
"org.apache.tomcat.

Re: [VOTE] Release Apache Tomcat 7.0.77

[Coty Sutherland]

On Tue, Mar 28, 2017 at 12:45 PM, Violeta Georgieva
 wrote:
> The proposed Apache Tomcat 7.0.77 release is now available for voting.
>
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-7/v7.0.77/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1128/
> The svn tag is:
> http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_77/
>
> The proposed 7.0.77 release is:
> [ ] Broken - do not release
> [x] Stable - go ahead and release as 7.0.77 Stable

+1

> Regards,
> Violeta

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

Re: [VOTE] Release Apache Tomcat 8.0.43

[Rémy Maucherat]

2017-03-28 17:28 GMT+02:00 Violeta Georgieva :

> The proposed Apache Tomcat 8.0.43 release is now available for voting.
>
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.0.43/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1127/
> The svn tag is:
> http://svn.apache.org/repos/asf/tomcat/tc8.0.x/tags/TOMCAT_8_0_43/
>
> The proposed 8.0.43 release is:
> [ ] Broken - do not release
> [X] Stable - go ahead and release as 8.0.43
>
> Rémy

Re: [VOTE] Release Apache Tomcat 7.0.77

[Rémy Maucherat]

2017-03-28 18:45 GMT+02:00 Violeta Georgieva :

> The proposed Apache Tomcat 7.0.77 release is now available for voting.
>
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-7/v7.0.77/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1128/
> The svn tag is:
> http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_77/
>
> The proposed 7.0.77 release is:
> [ ] Broken - do not release
> [X] Stable - go ahead and release as 7.0.77 Stable
>
> Rémy

Re: [VOTE] Release Apache Tomcat 8.0.43

[Rainer Jung]

Am 28.03.2017 um 17:28 schrieb Violeta Georgieva:

The proposed Apache Tomcat 8.0.43 release is now available for voting.

It can be obtained from:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.0.43/
The Maven staging repo is:
https://repository.apache.org/content/repositories/orgapachetomcat-1127/
The svn tag is:
http://svn.apache.org/repos/asf/tomcat/tc8.0.x/tags/TOMCAT_8_0_43/

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


+1 to release but note one hang in TestSsl testRenegotiateWorks for 
NIO2. Same as with 8.0.42 so likely reproducible.


Details
===

- MD5 OK
- signatures OK
- key in KEYS file
- gz and zip for src and bin consistent
- src completely consistent with svn tag
- builds fine
  - warning about unchecked calls or conversions in:
- org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
- org/apache/tomcat/jdbc/pool/PoolProperties.java
  Not a regression
- build result looks consistent with binaries
- no checkstyle complaints
- no Javadoc warnings

- Unit tests: Hang for NIO2 in TestSsl testRenegotiateWorks.
  Same as for 8.0.42, see my vote mail there for stack and logs.
  No other failures.
  - ERROR message:
- more "Incomplete jul log message ... (only message)" (4 versus 6)
- more "ERROR:null" (4 versus 6)

  - WARN messages:
- less Tribes warnings (68 versus 58)
- more 
org.apache.catalina.loader.WebappClassLoaderBase.clearReferencesThreads


  - SEVERE messages
- new org.apache.catalina.connector.CoyoteAdapter.asyncDispatch 
Exception while processing an asynchronous request" (bio 1)


  - Exceptions: not compared

- JMX MBean Comparison with 8.0.42:
  - ThreadPool MBean attribute currentThreadCount changed
from 0 to 10 (ajp) resp. 1 to 10 (http)
  - Threading MBean analogously shows 19 more daemon threads
  - ProtocolHandler MBean for http new attribute
"compressibleMimeType: 
text/html,text/xml,text/plain,text/css,text/javascript,application/javascript"


Build and tests were done using Java 1.7.0_80. OS was Solaris 10 Sparc, 
tcnative was 1.2.12 based on APR 1.5.2 and OpenSSL 1.0.2k.


Thanks for RM and regards,

Rainer

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

Re: potential NPE on 8.5.13

[Romain Manni-Bucau]

Seems it was it. TomEE is almost green with a "clean" 8.5.13.

Only issue I got was: javax.management.ServiceNotFoundException: Cannot
find operation getLastAccessedTimestamp

In a test we use JMX to get some meta about the sessions.

Issue comes from that
commit 
org.apache.tomcat.util.modeler.ManagedBean#createOperationKey(java.lang.String,
java.lang.String[]) where the join value is not used and the signature with
a hook where the append would be done is not used as well.


Romain Manni-Bucau
@rmannibucau  |  Blog
 | Old Blog
 | Github  |
LinkedIn  | JavaEE Factory


2017-03-30 22:00 GMT+02:00 Romain Manni-Bucau :

> hmm, after a deeper check it seems it can be IDE related. I'll run tomee
> test suite this night with that upgrade (8.5.13), think it could have been
> due to a messy Idea cache. Will report tomorrow morning the results. Thanks
> Violeta to have pointed this bugzilla out, helped to see that.
>
>
> Romain Manni-Bucau
> @rmannibucau  |  Blog
>  | Old Blog
>  | Github
>  | LinkedIn
>  | JavaEE Factory
> 
>
> 2017-03-30 21:50 GMT+02:00 Romain Manni-Bucau :
>
>> experienced it only on 8.5.13, 8.5.12 was working fine
>>
>>
>> Romain Manni-Bucau
>> @rmannibucau  |  Blog
>>  | Old Blog
>>  | Github
>>  | LinkedIn
>>  | JavaEE Factory
>> 
>>
>> 2017-03-30 19:53 GMT+02:00 Violeta Georgieva :
>>
>>> Hi,
>>>
>>> 2017-03-30 20:41 GMT+03:00 Romain Manni-Bucau :
>>> >
>>> > oops, hit enter too fast
>>> >
>>> > important detail: it is in a
>>> request.getRequestDispatcher("WEB-INF/test.jsp"
>>> > ).forward(request, response);
>>>
>>> Do you experience this with 8.5.12 (latest release) or 8.5.13 (currently
>>> release that we vote)?
>>> We have a fix in 8.5.13 for an issue similar to what you describe.
>>> https://bz.apache.org/bugzilla/show_bug.cgi?id=60882
>>>
>>> Regards,
>>> Violeta
>>>
>>> >
>>> > Romain Manni-Bucau
>>> > @rmannibucau  |  Blog
>>> >  | Old Blog
>>> >  | Github <
>>> https://github.com/rmannibucau> |
>>> > LinkedIn  | JavaEE Factory
>>> > 
>>> >
>>> > 2017-03-30 19:40 GMT+02:00 Romain Manni-Bucau :
>>> >
>>> > > Hi guys,
>>> > >
>>> > > seems on the last release we can get a NPE we didnt get before.
>>> > >
>>> > > In org.apache.catalina.core.ApplicationMapping#getServletMapping for
>>> case
>>> > > PATH pathInfo can be null so the toString() doesnt behave very well.
>>> > >
>>> > > Got it with a @WebServlet("/foo/*")
>>> > >
>>> > > Romain Manni-Bucau
>>> > > @rmannibucau  |  Blog
>>> > >  | Old Blog
>>> > >  | Github
>>> > >  | LinkedIn
>>> > >  | JavaEE Factory
>>> > > 
>>> > >
>>>
>>
>>
>

Re: [VOTE] Release Apache Tomcat 7.0.77

[Rainer Jung]

Am 28.03.2017 um 18:45 schrieb Violeta Georgieva:

The proposed Apache Tomcat 7.0.77 release is now available for voting.

It can be obtained from:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-7/v7.0.77/
The Maven staging repo is:
https://repository.apache.org/content/repositories/orgapachetomcat-1128/
The svn tag is:
http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_77/

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


+1 to release, thanks for RM.

Details:

- MD5 OK
- signatures OK
- key in KEYS file
- gz and zip for src and bin consistent
- src completely consistent with svn tag
- builds fine
   - warnings about unchecked calls or conversions in:
 - o.a.t.dbcp
 - javax/el/ResourceBundleELResolver.java
   Both not a regression
- build result looks consistent with binaries
- no checkstyle complaints
- no Javadoc warnings
- Unit tests: no errors or failures

  - ERROR message:
- fewer "ERROR:null" (4 versus 2)
- new 
"org.apache.catalina.core.AprLifecycleListener.initializeSSLnull" (once)

- new "org.apache.catalina.core.StandardWrapperValve.eventnull" (once)

  - WARN messages
- more tribes (50 versus 60)
  - SEVERE messages
- new "SEVERE: Servlet.service() for servlet [comet] in context 
with path [] threw exception" (once)
- no more 
"org.apache.catalina.connector.CoyoteAdapter.asyncDispatch An exception 
or error occurred in the container during the request processing"
- new "org.apache.tomcat.websocket.pojo.PojoEndpointBase.onError No 
error handling configured for 
[org.apache.tomcat.websocket.TesterEchoServer$Basic] and the following 
error occurred" (once)
- fewer "org.apache.catalina.core.StandardWrapperValve.event 
Servlet.service() for servlet [comet] in context with path [] threw 
exception" (6 versus 4)
fewer 
"org.apache.catalina.tribes.group.interceptors.NonBlockingCoordinator.memberDisappeared 
Unable to start election when member was removed." (6 versus 5)
- fewer 
"org.apache.catalina.loader.WebappClassLoaderBase.clearReferencesThreads 
The web application [] appears to have started a thread named 
[http-nio-127.0.0.1-auto-I-exec-P] but has failed to stop it. This 
is very likely to create a memory leak." (12 versus 3)
- new 
"org.apache.catalina.loader.WebappClassLoaderBase.clearReferencesThreads 
The web application [] appears to have started a thread named 
[WebSocketServer-ROOT-2] but has failed to stop it. This is very likely 
to create a memory leak." (once)


- JMX MBean Comparison with 7.0.75:
  - ThreadPool MBean attribute currentThreadCount changed
from 0 to 10 (ajp) resp. 1 to 10 (http)
  - Threading MBean analogously shows 19 more daemon threads
  - ProtocolHandler MBean for http new attribute
"compressibleMimeType: 
text/html,text/xml,text/plain,text/css,text/javascript,application/javascript" 




Build and tests were done using Java 1.6.0_45, java.7.home was pointing
to 1.7.0_80. OS was Solaris 10 Sparc, tcnative was 1.2.12 based on APR 
1.5.2 and OpenSSL 1.0.2k.



Regards,

Rainer

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

Re: [VOTE] Release Apache Tomcat 6.0.52

[Rainer Jung]

Am 28.03.2017 um 21:38 schrieb Violeta Georgieva:

The proposed Apache Tomcat 6.0.52 release is now available for voting.

Note: This is the last Tomcat 6 release.

It can be obtained from:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-6/v6.0.52/
The Maven staging repo is:
https://repository.apache.org/content/repositories/orgapachetomcat-1129/
The svn tag is:
http://svn.apache.org/repos/asf/tomcat/tc6.0.x/tags/TOMCAT_6_0_52/

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


I see JVM crashes in APR:

org.apache.catalina.connector.TestSendFile
 testSendFile
org.apache.catalina.core.TestApplicationContext
 testGetRequestDispatcherNullPath02
org.apache.catalina.core.TestApplicationHttpRequest testMergeQueryString02
org.apache.catalina.startup.TestTomcat testSingleWebapp

all result in:

Caused an ERROR
Forked Java VM exited abnormally. Please note the time in the report 
does not reflect the time until the VM exit.
junit.framework.AssertionFailedError: Forked Java VM exited abnormally. 
Please note the time in the report does not reflect the time until the 
VM exit.


I'd say they happen during shutdown.

Here are the stacks of the crashing threads:

Crash 1:

...
 --- called from signal handler with signal 11 (SIGSEGV) ---
 faddfdb0 impl_pollset_remove (eebf68, b377f6a4, 1585, d7403c92, 
eebfa0, eebf68) + 1c

 faddfcd4 apr_pollset_remove (eebf68, b377f6a4, 54bf0, 51add715, 0, 0) + 10
 faed4b80 Java_org_apache_tomcat_jni_Poll_maintain (1, 0, 659884, 
1157648, b377f82c, 0) + 160

 f8c0c280 * org/apache/tomcat/jni/Poll.maintain(J[JZ)I+-27472
 f8c0c224 * org/apache/tomcat/jni/Poll.maintain(J[JZ)I+0
 f8c058b8 * org/apache/tomcat/util/net/AprEndpoint$Poller.run()V+659 
(line 1612)

...

or from the hs_err file:

Current thread (0x006597c8):  JavaThread 
"http-127.0.0.1-auto-1-Poller-0" daemon [_thread_in_native, id=14]


C  [libapr-1.so.0+0x1fdb0]
C  [libapr-1.so.0+0x1fcdc]  apr_pollset_remove+0x18
C  [libtcnative-1.so.0.2.12+0x14b88] 
Java_org_apache_tomcat_jni_Poll_maintain+0x168

j  org.apache.tomcat.jni.Poll.maintain(J[JZ)I+38064
j  org.apache.tomcat.jni.Poll.maintain(J[JZ)I+0
j  org.apache.tomcat.util.net.AprEndpoint$Poller.run()V+659

Log:

[junit] Running org.apache.catalina.connector.TestSendFile
[junit] Mar 30, 2017 12:40:13 PM 
org.apache.catalina.startup.LoggingBaseTest setUp

[junit] INFO: Starting test case [testSendFile]
[junit] Created file:/var/tmp/testSendFile-1490870414108-0.txt with 
10 bytes.
[junit] Created file:/var/tmp/testSendFile-1490870414168-1.txt with 
20 bytes.
[junit] Created file:/var/tmp/testSendFile-1490870414185-2.txt with 
30 bytes.
[junit] Created file:/var/tmp/testSendFile-1490870414210-3.txt with 
40 bytes.
[junit] Created file:/var/tmp/testSendFile-1490870414222-4.txt with 
50 bytes.
[junit] Created file:/var/tmp/testSendFile-1490870414236-5.txt with 
60 bytes.
[junit] Created file:/var/tmp/testSendFile-1490870414254-6.txt with 
70 bytes.
[junit] Created file:/var/tmp/testSendFile-1490870414356-7.txt with 
80 bytes.
[junit] Created file:/var/tmp/testSendFile-1490870414376-8.txt with 
90 bytes.
[junit] Created file:/var/tmp/testSendFile-1490870414443-9.txt with 
100 bytes.
[junit] Mar 30, 2017 12:40:14 PM 
org.apache.catalina.core.AprLifecycleListener init
[junit] INFO: Loaded APR based Apache Tomcat Native library 1.2.12 
using APR version 1.5.2.
[junit] Mar 30, 2017 12:40:14 PM 
org.apache.catalina.core.AprLifecycleListener init
[junit] INFO: APR capabilities: IPv6 [true], sendfile [true], 
accept filters [false], random [true].
[junit] Mar 30, 2017 12:40:14 PM 
org.apache.catalina.core.AprLifecycleListener initializeSSL
[junit] INFO: OpenSSL successfully initialized with version OpenSSL 
1.0.2k  26 Jan 2017
[junit] Mar 30, 2017 12:40:15 PM 
org.apache.coyote.http11.Http11AprProtocol init
[junit] INFO: Initializing Coyote HTTP/1.1 on 
http-127.0.0.1-auto-1-56737
[junit] Mar 30, 2017 12:40:15 PM 
org.apache.catalina.core.StandardService start

[junit] INFO: Starting service Tomcat
[junit] Mar 30, 2017 12:40:15 PM 
org.apache.catalina.core.StandardEngine start

[junit] INFO: Starting Servlet Engine: Apache Tomcat/6.0.52
[junit] Mar 30, 2017 12:40:17 PM 
org.apache.coyote.http11.Http11AprProtocol start

[junit] INFO: Starting Coyote HTTP/1.1 on http-127.0.0.1-auto-1-56737
[junit] Server Wrote 10 bytes in 8 ms.
[junit] Client received 10 bytes in 238 ms.
[junit] #
[junit] # An unexpected error has been detected by HotSpot Virtual 
Machine:

[junit] #
[junit] #  SIGSEGV (0xb) at pc=0xfaddfdb0, pid=24546, tid=14
[junit] #
[junit] # Java VM: Java HotSpot(TM) Server VM (1.5.0_22-b03 mixed mode)
[junit] # Problematic frame:
[junit] # C  [libapr-1.so.0+0x1fdb0]
[junit] #
[junit] # An error report file with more i

Re: [VOTE] Release Apache Tomcat 6.0.52

[Rainer Jung]

Using gdb I see:

Case 1:

#7  impl_pollset_remove (pollset=0xeebf68, descriptor=0xb377f6a4) at 
poll/unix/port.c:283

fd = 
ep = 
rv = 0
res = 
err = 0
found = 
#8  0xfaddfcdc in apr_pollset_remove (pollset=0xeebf68, 
descriptor=descriptor@entry=0xb377f6a4) at poll/unix/pollset.c:343

No locals.
#9  0xfaed4b88 in Java_org_apache_tomcat_jni_Poll_maintain (e=0x659884, 
o=, pollset=, set=0xb377f82c, 
remove=) at src/poll.c:484
fd = {p = 0x0, desc_type = APR_POLL_SOCKET, reqevents = 5, 
rtnevents = 0, desc = {f = 0x0, s = 0x0}, client_data = 0xe527b8}

s = 
p = 0x1157648
i = 0
num = 1
now = 
ep = 
ip = 

(gdb) print *pollset
$1 = {pool = 0xeebf28, nelts = 0, nalloc = 8193, flags = 6, wakeup_pipe 
= {0x1157558, 0x11575a8}, wakeup_pfd = {p = 0xeebf28, desc_type = 
APR_POLL_FILE, reqevents = 1,
rtnevents = -16516, desc = {f = 0x1157558, s = 0x1157558}, 
client_data = 0xeebf7c}, p = 0xeebfa0, provider = 0xfadf8838}

(gdb) print *descriptor
$2 = {p = 0x0, desc_type = APR_POLL_SOCKET, reqevents = 5, rtnevents = 
0, desc = {f = 0x0, s = 0x0}, client_data = 0xe527b8}

(gdb) print *pollset->pool
$3 = {parent = 0x6557d0, child = 0x0, sibling = 0x0, ref = 0x13b8c60, 
cleanups = 0x1157638, free_cleanups = 0x0, allocator = 0x319d68, 
subprocesses = 0x0, abort_fn = 0,
  user_data = 0x0, tag = 0x0, active = 0xde0a50, self = 0xeebf10, 
self_first_avail = 0xeebf68 "", pre_cleanups = 0x0}



So we crash here:

282 if (descriptor->desc_type == APR_POLL_SOCKET) {
=> 283 fd = descriptor->desc.s->socketdes;
284 }
...

because descriptor->desc.s is NULL.


Case 2:

#8  0xfadd8980 in allocator_free (node=0xb8f170, allocator=0x2d8238) at 
memory/unix/apr_pools.c:370

freelist = 0x0
max_index = 
max_free_index = 
next = 
index = 
current_free_index = 
#9  apr_pool_destroy (pool=0xb8f188) at memory/unix/apr_pools.c:856
active = 0xb8f170
allocator = 0x2d8238

(gdb) print *node
$2 = {next = 0x0, ref = 0xb8f170, index = 0, free_index = 1465, 
first_avail = 0x0, endp = 0xb91170 ""}

(gdb) print *allocator
$1 = {max_index = 7756680, max_free_index = 1601139303, 
current_free_index = 0, mutex = 0x6368655f, owner = 0x0, free = 
{0x61745f6a, 0x0, 0x72726f72, 0x5f737472, 0x6572726f,
0x7200, 0x4, 0x7a8, 0x, 0x0, 0x6, 0xb91b20, 0x7, 
0x765b88, 0x, 0x0, 0x9, 0x, 0x, 0xa}}

(gdb) print *allocator->mutex
Cannot access memory at address 0x6368655f


So we crash here:

 369 if (allocator->mutex)
=>  370 apr_thread_mutex_lock(allocator->mutex);

since the mutex is already invalid.


Case 3:

#8  0xfadd8980 in allocator_free (node=0x5bd138, allocator=0xd7f138) at 
memory/unix/apr_pools.c:370

freelist = 0x0
max_index = 
max_free_index = 
next = 
index = 
current_free_index = 
#9  apr_pool_destroy (pool=0x5bd150) at memory/unix/apr_pools.c:856
active = 0x5bd138
allocator = 0xd7f138

(gdb) print *node
$1 = {next = 0x6d1bd8, ref = 0x5bd138, index = 0, free_index = 65, 
first_avail = 0xf24cf8 "", endp = 0x5bf138 ""}

(gdb) print *allocator
$2 = {max_index = 16381824, max_free_index = 1601139303, 
current_free_index = 6773064, mutex = 0x6368655f, owner = 0x87cf60, free 
= {0x61745f6a, 0x0, 0x72726f72, 0x5f737472,
0x6572726f, 0x72000c0c, 0xc0c0c01, 0x30, 0x1010100, 0x0, 0x0, 
0x675948, 0x59b70002, 0x706e10, 0x1204b600, 0x0, 0x5b60006, 0xb700072a, 
0x1bb50008, 0xd7f130}}

(gdb) print *allocator->mutex
Cannot access memory at address 0x6368655f


So the same as Case 2.


Case 4:

Not easily analyzable with gdb.

Regards,

Rainer



Am 30.03.2017 um 23:37 schrieb Rainer Jung:

Am 28.03.2017 um 21:38 schrieb Violeta Georgieva:

The proposed Apache Tomcat 6.0.52 release is now available for voting.

Note: This is the last Tomcat 6 release.

It can be obtained from:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-6/v6.0.52/
The Maven staging repo is:
https://repository.apache.org/content/repositories/orgapachetomcat-1129/
The svn tag is:
http://svn.apache.org/repos/asf/tomcat/tc6.0.x/tags/TOMCAT_6_0_52/

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


I see JVM crashes in APR:

org.apache.catalina.connector.TestSendFile
 testSendFile
org.apache.catalina.core.TestApplicationContext
 testGetRequestDispatcherNullPath02
org.apache.catalina.core.TestApplicationHttpRequest testMergeQueryString02
org.apache.catalina.startup.TestTomcat testSingleWebapp

all result in:

Caused an ERROR
Forked Java VM exited abnormally. Please note the time in the report
does not reflect the time until the VM exit.
junit.framework.AssertionFailedError: Forked Java VM exited abnormally.
Please note the time in the report does not reflect the time until the
VM exit.

I'd say they happen during shutdown.

Here are 

Odd behaviour of "deprecated" websocket API example - chat servlet - 7.0.77

[Konstantin Kolinko]

Hi!

While smoke-testing Tomcat 7.0.77, I noted an odd behaviour with old
chat servlet example.

I wonder whether this is reproducible.
"Scenario 1" may be a browser bug, as I see it in Firefox, but not in Chrome.

I tested one of scenarios in 7.0.76 and it reproduced there as well
(details below).

Configuration:
==

I am running Tomcat 7.0.77 with Java 8 (8u121 32-bit, Windows 10).

Default configuration
+ removed AJP connector
+ configured protocol attribute on HTTP connector.
Starting with NIO implementation.

Running without Security manager.

Using Firefox 52.0.2 (64-bit).

Windows 10.

Scenario 1:
==

1. Start Tomcat.
Start Firefox, open a new window in privacy mode (Ctrl+Shift+P)

2. Open http://localhost:8080/examples/websocket-deprecated/

3. Ctrl+click on "Chat example" link, so that it is opened in
background in a new tab.

Switch to the opened tab.
There is a log pane with the following text.
[[[
Info: WebSocket connection opened.
* Guest1 has joined.
]]]

Send some chat texts (type some in chat box and press enter).
The sent text is echoed
[[[
Guest1: foobar
]]]

Close the tab.

4. Repeat step 3 to open a new tab again.

> Ctrl+click on "Chat example" link, so that it is opened in background in a 
> new tab.
> Switch to the opened tab.

EXPECTED:
"connection opened" and "Guest 2 has joined" text in the log pane.

ACTUAL
There is no text. The log pane is empty.

Further repeats (closing and opening) show the same behaviour (no text).

Restarting Tomcat resets behaviour to Step 3. (First opening - OK,
Second and further - bad).

This is reproducible in 7.0.77 with NIO.
This is reproducible in 7.0.77 with BIO.
This is reproducible in 7.0.76 with NIO.  (Thus it is not new in 7.0.77)

This is not reproducible in 7.0.77 with APR.

With APR there is no difference between first and second subsequent openings:
the "connection opened" and "guest joined" text is always printed,
BUT I see notable delay between opening the tab and appearance of the text:
the delay is about 0,5- 1 second (just less than a heart beat, can
blink eyes twice).

Changing browser to Chrome (incognito mode), 57.0.2987.133 (64-bit)
the problem does not reproduce:
any connector (BIO, NIO, APR) - expected "connection opened", "guest
joined" text appears immediately.

Scenario 2

Trying a more simple scenario:
Just open the "chat" example in a tab and refresh it (F5 or Ctrl+F5)
in Firefox:
- NIO & BIO: no issues. "connection opened" and "Guest joined"
messages appear immeadiately
- APR: "connection opened" and "Guest joined" messages appear with the
same 0,5 sec delay as mentioned above.


Scenario 3
=
1. Start Tomcat. Start Chrome, open new windows in incognito mode (Ctrl+Shif+N).
2. Open two copies of chat example in two browser tabs
http://localhost:8080/examples/websocket-deprecated/chat.html

3. Switch to the second copy (second tab) and press F5 key on keyboard
several times (refreshing the page).
4. Switch to the first copy (fist tab) and look what text is printed
in the log pane. I see:
[[[
Info: WebSocket connection opened.
* Guest1 has joined.
* Guest2 has joined.
* Guest2 has disconnected.
* Guest3 has joined.
* Guest3 has disconnected.
* Guest4 has joined.
* Guest4 has disconnected.
* Guest5 has joined.
* Guest5 has disconnected.
* Guest5 has disconnected.
* Guest5 has disconnected.
* Guest6 has joined.
* Guest6 has disconnected.
* Guest6 has disconnected.
* Guest6 has disconnected.
* Guest7 has joined.
* Guest7 has disconnected.
* Guest8 has joined.
]]]

I do not understand why the same "disconnected" message is repeated 3 times.

This is reproducible with 7.0.77 + any of NIO, BIO, APR.

Using Firefox + NIO/BIO/APR I do not see connection difficulties from
scenario 1,
and I do not see repeated messages.

Scenario 3 + JSR356
=
Trying this scenario with modern (Websocket spec API) implementation
of chat servlet.
In Chrome:
1. Single reload of second tab results in Guest number increased by 2.
The log pane messages in the first tab are grouped by 2:
[[[
* Guest32 has disconnected.
* Guest33 has disconnected.
* Guest34 has joined.
* Guest35 has joined.
* Guest34 has disconnected.
* Guest35 has disconnected.
* Guest36 has joined.
* Guest37 has joined.
* Guest36 has disconnected.
* Guest37 has disconnected.
* Guest38 has joined.
]]]

2. The are IOException and NullPointerException in Tomcat logs
(catalina.2017-03-31.log)

i18n text "Программа на вашем хост-компьютере разорвала установленное
подключение"
means that "Connection was broken"

[[[
Mar 31, 2017 2:04:42 AM websocket.chat.ChatAnnotation onError
SEVERE: Chat Error: java.io.IOException:
java.util.concurrent.ExecutionException: java.io.IOException:
Программа на вашем хост-компьютере разорвала установленное подключение
java.io.IOException: java.util.concurrent.ExecutionException:
java.io.IOException: Программа на вашем хост-компьютере разорвала
установленное подключение
at 
org.apache.tomcat.websocket.WsRemoteEndpointImplBase.st

[GUMP@vmgump-vm3]: Project tomcat-tc8.0.x-test-nio2 (in module tomcat-8.0.x) failed

[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-tc8.0.x-test-nio2 has an issue affecting its community 
integration.
This issue affects 1 projects,
 and has been outstanding for 3 runs.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-tc8.0.x-test-nio2 :  Tomcat 8.x, a web server implementing the 
Java Servlet 3.1,
...


Full details are available at:

http://vmgump-vm3.apache.org/tomcat-8.0.x/tomcat-tc8.0.x-test-nio2/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
commons-daemon.native.src.tgz.
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
tomcat-native.tar.gz.
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-8.0.x/output/logs-NIO2
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-NIO2/logs
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-NIO2/logs]



The following work was performed:
http://vmgump-vm3.apache.org/tomcat-8.0.x/tomcat-tc8.0.x-test-nio2/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-test-nio2.html
Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-test-nio2 (Type: Build)
Work ended in a state of : Failed
Elapsed: 20 mins 3 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only org.apache.tools.ant.Main 
-Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Dbase.path=/srv/gump/public/workspace/tomcat-8.0.x/tomcat-build-libs 
-Dexecute.test.nio2=true -Dtest.temp=output/test-tmp-NIO2 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Dtest.accesslog=true 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.6-SNAPSHOT.jar
 -Dexamples.sources.skip=true 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20170331.jar
 
-Dtest.openssl.path=/srv/gump/public/workspace/openssl-1.0.2/dest-20170331/bin/openssl
 -Dexecute.test.nio=false 
-Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dexecute.test.apr=false -Dexecute.test.bio=false 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20170331-native-src.tar.gz
 -Dtest.repor
 ts=output/logs-NIO2 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20170331-native-src.tar.gz
 -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar 
-Dtest.relaxTiming=true -Dtest.excludePerformance=true 
-Djava.net.preferIPv4Stack=/srv/gump/public/workspace/tomcat-8.0.x/true 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar
 -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-8.0.x]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-8.0.x/output/testclasses:/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:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-tribes.jar:/srv/gum

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

[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-test-nio2 has an issue affecting its community integration.
This issue affects 1 projects,
 and has been outstanding for 2 runs.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-trunk-test-nio2 :  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-test-nio2/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
commons-daemon.native.src.tgz.
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
tomcat-native.tar.gz.
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/logs-NIO2
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO2/logs
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO2/logs]



The following work was performed:
http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-test-nio2/gump_work/build_tomcat-trunk_tomcat-trunk-test-nio2.html
Work Name: build_tomcat-trunk_tomcat-trunk-test-nio2 (Type: Build)
Work ended in a state of : Failed
Elapsed: 16 mins 6 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only org.apache.tools.ant.Main 
-Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Djava.net.preferIPv4Stack=/srv/gump/public/workspace/tomcat-trunk/true 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.6-SNAPSHOT.jar
 -Dtest.reports=output/logs-NIO2 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20170331-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Dbase.path=/srv/gump/public/workspace/tomcat-trunk/tomcat-build-libs 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar 
-Dtest.relaxTiming=true 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20170331.jar
 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20170331-native-src
 .tar.gz -Dtest.temp=output/test-tmp-NIO2 -Dtest.accesslog=true 
-Dexecute.test.nio=false 
-Dtest.openssl.path=/srv/gump/public/workspace/openssl-master/dest-20170331/bin/openssl
 -Dexecute.test.apr=false -Dtest.excludePerformance=true 
-Dexecute.test.nio2=true 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar
 -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[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/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/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:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jaspic-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build

[GUMP@vmgump-vm3]: Project tomcat-tc7.0.x-test-apr (in module tomcat-7.0.x) failed

[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-tc7.0.x-test-apr has an issue affecting its community 
integration.
This issue affects 1 projects,
 and has been outstanding for 9 runs.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-tc7.0.x-test-apr :  Tomcat 7.x, a web server implementing Java 
Servlet 3.0,
...


Full details are available at:
http://vmgump-vm3.apache.org/tomcat-7.0.x/tomcat-tc7.0.x-test-apr/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property 
tomcat-dbcp-src.jar.
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
commons-daemon.native.src.tgz.
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
tomcat-native.tar.gz.
 -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property 
tomcat-dbcp.home.
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-7.0.x/output/logs-APR
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-7.0.x/output/test-tmp-APR/logs



The following work was performed:
http://vmgump-vm3.apache.org/tomcat-7.0.x/tomcat-tc7.0.x-test-apr/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-test-apr.html
Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-test-apr (Type: Build)
Work ended in a state of : Failed
Elapsed: 36 mins 19 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only org.apache.tools.ant.Main 
-Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Dbase.path=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-build-libs 
-Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x 
-Dtest.temp=output/test-tmp-APR 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.6-SNAPSHOT.jar
 -Dexamples.sources.skip=true 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20170331.jar
 
-Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-src.jar
 -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps 
-Dtest.excludePerformance=true 
-Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dcommons-dbcp.home=/srv/gump/public/workspace/commons-dbcp-1.x 
-Dexecute.test.apr=true -Dexec
 ute.test.bio=false 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20170331-native-src.tar.gz
 -Dtest.reports=output/logs-APR 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20170331-native-src.tar.gz
 -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar 
-Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native-12/dest-20170331/lib 
-Dtest.relaxTiming=true -Dexecute.test.nio=false -Dtest.accesslog=true 
-Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-20170331.jar
 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar
 -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-7.0.x]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-7.0.x/output/testclasses:/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:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-coyote.jar:/