Author: markt
Date: Tue Jan 12 11:09:18 2010
New Revision: 898279
URL: http://svn.apache.org/viewvc?rev=898279&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48523
Resolve duplicate keys
Modified:
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/ContextConfig.java
tomcat/trunk/java/org/apache/catalina/startup/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_ja.properties
tomcat/trunk/java/org/apache/tomcat/util/net/res/LocalStrings.properties
tomcat/trunk/java/org/apache/tomcat/util/net/res/LocalStrings_es.properties
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=898279&r1=898278&r2=898279&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/realm/LocalStrings.properties Tue Jan
12 11:09:18 2010
@@ -28,8 +28,6 @@
jaasRealm.loginException=Login exception authenticating username "{0}"
jaasRealm.unexpectedError=Unexpected error
jaasRealm.loginContextCreated=JAAS LoginContext created for username "{0}"
-jaasRealm.userPrincipalSuccess=Subject for username "{0}" returned user
Principal "{1}"
-jaasRealm.userPrincipalFailure=Subject for username "{0}" did not return a
valid user Principal
jaasRealm.cachePrincipal=User Principal "{0}" cached; has {1} role Principal(s)
jaasRealm.checkPrincipal=Checking Principal "{0}" [{1}]
jaasRealm.userPrincipalSuccess=Principal "{0}" is a valid user class. We will
use this as the user Principal.
Modified: tomcat/trunk/java/org/apache/catalina/realm/LocalStrings_es.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/LocalStrings_es.properties?rev=898279&r1=898278&r2=898279&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/LocalStrings_es.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/realm/LocalStrings_es.properties Tue
Jan 12 11:09:18 2010
@@ -24,8 +24,6 @@
jaasRealm.loginException = Excepci\u00F3n de Login autenticando nombre de
usuario {0}
jaasRealm.unexpectedError = Error inesperado
jaasRealm.loginContextCreated = JAAS LoginContext creado para nombre de
usuario "{0}"
-jaasRealm.userPrincipalSuccess = El asunto para el nombre de usuario "{0}"
devolvi\u00F3 usuario Principal "{1}"
-jaasRealm.userPrincipalFailure = El asunto para el nombre de usuario "{0}" no
devolvi\u00F3 un usuario Principal v\u00E1lido
jaasRealm.cachePrincipal = Usuario Principal "{0}" en cach\u00E9; tiene {1}
papel de Principal
jaasRealm.checkPrincipal = Revisando Principal "{0}" [{1}]
jaasRealm.userPrincipalSuccess = El Principal "{0}" es una clase v\u00E1lida
de usuario. La vamos a usar como usuario Principal.
Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=898279&r1=898278&r2=898279&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Tue Jan 12
11:09:18 2010
@@ -1541,7 +1541,7 @@
DirContextURLConnection dcUrlConn;
if (!(urlConn instanceof DirContextURLConnection)) {
// This should never happen
- sm.getString("contextConfig.jndiUrl", url);
+ sm.getString("contextConfig.jndiUrlNotDirContextConn", url);
return;
}
Modified: tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties?rev=898279&r1=898278&r2=898279&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties Tue
Jan 12 11:09:18 2010
@@ -39,10 +39,10 @@
contextConfig.inputStreamFile=Unable to process file [{0}] for annotations
contextConfig.inputStreamJar=Unable to process Jar entry [{0}] from Jar [{1}]
for annotations
contextConfig.inputStreamJndi=Unable to process resource element [{0}] for
annotations
-contextConfig.jndiUrl=Unable to process JNDI URL [{0}] for annotations
contextConfig.jarUrl=The connection created for URL [{0}] was not a
JarUrlConnection
contextConfig.jar=Unable to process resource [{0}] for annotations
-contextConfig.jndiUrl=The connection created for URL [{0}] was not a
DirContextURLConnection
+contextConfig.jndiUrl=Unable to process JNDI URL [{0}] for annotations
+contextConfig.jndiUrlNotDirContextConn=The connection created for URL [{0}]
was not a DirContextURLConnection
contextConfig.missingRealm=No Realm has been configured to authenticate against
contextConfig.role.auth=WARNING: Security role name {0} used in an
<auth-constraint> without being defined in a <security-role>
contextConfig.role.link=WARNING: Security role name {0} used in a <role-link>
without being defined in a <security-role>
@@ -130,7 +130,7 @@
webXml.mergeConflictLoginConfig=A LoginConfig was defined inconsistently in
multiple fragments including fragment with name [{1}] located at [{2}]
webXml.mergeConflictOrder=Fragment relative ordering contains circular
references. Thsi can be resolved by using absolute ordering in web.xml.
webXml.mergeConflictResource=The Resource [{0}] was defined inconsistently in
multiple fragments including fragment with name [{1}] located at [{2}]
-webXml.mergeConflictFilter=The Servlet [{0}] was defined inconsistently in
multiple fragments including fragment with name [{1}] located at [{2}]
+webXml.mergeConflictServlet=The Servlet [{0}] was defined inconsistently in
multiple fragments including fragment with name [{1}] located at [{2}]
webXml.mergeConflictSessionCookieName=The session cookie name was defined
inconsistently in multiple fragments with different values including fragment
with name [{0}] located at [{1}]
webXml.mergeConflictSessionCookieDomain=The session cookie domain was defined
inconsistently in multiple fragments with different values including fragment
with name [{0}] located at [{1}]
webXml.mergeConflictSessionCookiePath=The session cookie path was defined
inconsistently in multiple fragments with different values including fragment
with name [{0}] located at [{1}]
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=898279&r1=898278&r2=898279&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties Tue
Jan 12 11:09:18 2010
@@ -52,7 +52,6 @@
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.invalid.buffer=Page directive: invalid buffer size
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})
@@ -408,7 +407,6 @@
jsp.error.xml.invalidCharInXMLDecl = An invalid XML character (Unicode: 0x{0})
was found in the XML declaration.
jsp.error.xml.closeQuoteMissingInTextDecl = closing quote in the value
following \"{0}\" in the text declaration is missing.
jsp.error.xml.closeQuoteMissingInXMLDecl = closing quote in the value
following \"{0}\" in the XML declaration is missing.
-jsp.error.xml.invalidHighSurrogate = High surrogate bits in UTF-8 sequence
must not exceed 0x10 but found 0x{0}.
jsp.error.multiple.jsp = Cannot have multiple specifications of
jsp.error.jspoutput.conflict=<jsp:output>: illegal to have multiple
occurrences of \"{0}\" with different values (old: {1}, new: {2})
jsp.error.jspoutput.doctypenamesystem=<jsp:output>:
'doctype-root-element' and 'doctype-system' attributes must appear together
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=898279&r1=898278&r2=898279&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
(original)
+++ tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
Tue Jan 12 11:09:18 2010
@@ -48,7 +48,6 @@
jsp.error.outputfolder = no hay carpeta de salida
jsp.warning.bad.type = Aviso\: tipo incorrecto en archivo .class
jsp.error.data.file.write = Error mientras escrib\u00EDa el archivo de datos
-jsp.error.page.invalid.buffer = Directiva Page\: valor incorrecto para buffer
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.invalid.contenttype = Directiva Page\: valor incorrecto para
contentType
jsp.error.page.conflict.session = Directiva Page\: es ilegal tener
m\u00FAltiples ocurrencias de 'session' con valores distintos (viejo\: {0},
nuevo\: {1})
@@ -397,7 +396,7 @@
jsp.error.xml.expectedByte = Se esperaba byte {0} de {1}-byte de secuencia
UTF-8.
jsp.error.xml.invalidByte = Incorrecto byte {0} de {1}-byte de secuencia UTF-8.
jsp.error.xml.operationNotSupported = La operaci\u00F3n "{0}" no est\u00E1
soportada por lector {1}.
-jsp.error.xml.invalidHighSurrogate = Surrogaci\u00F3n Alta de bits en
secuencia UTF-8 no debe de exceder 0x10, pero se hall\u00F3 0x{0}.
+jsp.error.xml.invalidHighSurrogate = Los bits de surrogaci\u00F3n alta en
secuencai UTF-8 no deben de exceder 0x10 pero se hall\u00F3 0x{0}.
jsp.error.xml.invalidASCII = El Byte "{0}" no es ASCII de 7-bit.
jsp.error.xml.spaceRequiredBeforeEncodingInXMLDecl = Se necesita espacio en
blanco antes del pseudo-atributo encoding en la declaraci\u00F3n XML.
jsp.error.xml.spaceRequiredBeforeEncodingInTextDecl = Se necesita espacio en
blanco antes del pseudo-atributo encoding en la declaraci\u00F3n text.
@@ -411,7 +410,6 @@
jsp.error.xml.invalidCharInXMLDecl = Un car\u00E1cter XML incorrecto
(Unicode\: 0x{0}) se hall\u00F3 en la declaraci\u00F3n XML
jsp.error.xml.closeQuoteMissingInTextDecl = Faltan las comillas de cierre en
el valor que sigue a "{0}" en la declaraci\u00F3n text.
jsp.error.xml.closeQuoteMissingInXMLDecl = Faltan las comillas de cierre en el
valor que sigue a "{0}" en la declaraci\u00F3n XML.
-jsp.error.xml.invalidHighSurrogate = Los bits de surrogaci\u00F3n alta en
secuencai UTF-8 no deben de exceder 0x10 pero se hall\u00F3 0x{0}.
jsp.error.multiple.jsp = No puedo tener m\u00FAltiples especificaciones de
jsp.error.jspoutput.conflict = <jsp\:output>\: ilegal tener ocurrencias
m\u00FAltiples de "{0}" con diferentes valores (viejo\: {1}, nuevo\: {2})
jsp.error.jspoutput.doctypenamesystem = <jsp\:output>\: atributos
'doctype-root-element' y 'doctype-system' deben de aparecer juntos
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=898279&r1=898278&r2=898279&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties
(original)
+++ tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties
Tue Jan 12 11:09:18 2010
@@ -48,7 +48,6 @@
jsp.error.classname=.class\u30d5\u30a1\u30a4\u30eb\u304b\u3089\u30af\u30e9\u30b9\u540d\u3092\u6c7a\u5b9a\u3067\u304d\u307e\u305b\u3093
jsp.warning.bad.type=\u8b66\u544a:
.class\u30d5\u30a1\u30a4\u30eb\u4e2d\u306e\u578b\u304c\u9055\u3044\u307e\u3059
jsp.error.data.file.write=\u30c7\u30fc\u30bf\u30d5\u30a1\u30a4\u30eb\u3092\u66f8\u304d\u8fbc\u307f\u4e2d\u306e\u30a8\u30e9\u30fc\u3067\u3059
-jsp.error.page.invalid.buffer=page\u6307\u793a\u5b50:
\u7121\u52b9\u306a\u30d0\u30c3\u30d5\u30a1\u30b5\u30a4\u30ba\u3067\u3059
jsp.error.page.conflict.contenttype=page\u6307\u793a\u5b50:
'contentType'\u3092\u7570\u306a\u308b\u5024\u3067\u8907\u6570\u56de\u6307\u5b9a\u3059\u308b\u306e\u306f\u7121\u52b9\u3067\u3059
(\u65e7: {0}, \u65b0: {1})
jsp.error.page.invalid.contenttype=page\u6307\u793a\u5b50:
contentType\u5c5e\u6027\u306e\u5024\u304c\u7121\u52b9\u3067\u3059
jsp.error.page.conflict.session=page\u6307\u793a\u5b50:
'session'\u3092\u7570\u306a\u308b\u5024\u3067\u8907\u6570\u56de\u6307\u5b9a\u3059\u308b\u306e\u306f\u7121\u52b9\u3067\u3059
(\u65e7: {0}, \u65b0: {1})
@@ -384,7 +383,6 @@
jsp.error.xml.invalidCharInXMLDecl =
XML\u5ba3\u8a00\u306e\u4e2d\u306b\u7121\u52b9\u306aXML\u6587\u5b57 (Unicode:
0x{0}) \u304c\u898b\u3064\u304b\u308a\u307e\u3057\u305f
jsp.error.xml.closeQuoteMissingInTextDecl =
\u30c6\u30ad\u30b9\u30c8\u5ba3\u8a00\u4e2d\u306e\"{0}\"\u306b\u7d9a\u304f\u5024\u306e\u4e2d\u306e\u6700\u5f8c\u306e\u30af\u30aa\u30fc\u30c8\u304c\u3042\u308a\u307e\u305b\u3093
jsp.error.xml.closeQuoteMissingInXMLDecl =
XML\u5ba3\u8a00\u4e2d\u306e\"{0}\"\u306b\u7d9a\u304f\u5024\u306e\u4e2d\u306e\u6700\u5f8c\u306e\u30af\u30aa\u30fc\u30c8\u304c\u3042\u308a\u307e\u305b\u3093
-jsp.error.xml.invalidHighSurrogate =
UTF-8\u30b7\u30fc\u30b1\u30f3\u30b9\u306e\u30cf\u30a4\u30b5\u30ed\u30b2\u30fc\u30c8\u30d3\u30c3\u30c8\u306f0x10\u3092\u8d8a\u3048\u3066\u306f\u3044\u3051\u307e\u305b\u3093\u304c\u30010x{0}\u304c\u898b\u3064\u304b\u308a\u307e\u3057\u305f
jsp.error.multiple.jsp =
\u8907\u6570\u306e\u4ed5\u69d8\u3092\u6e80\u305f\u3059\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093
jsp.error.jspoutput.conflict=<jsp:output>:
\"{0}\"\u306b\u7570\u306a\u308b\u5024\u3092\u8907\u6570\u56de\u6307\u5b9a\u3059\u308b\u306e\u306f\u7121\u52b9\u3067\u3059
(\u65e7: {1}, \u65b0: {2})
jsp.error.jspoutput.doctypenamesystem=<jsp:output>:
'doctype-root-element' \u53ca\u3073 'doctype-system'
\u5c5e\u6027\u306f\u540c\u6642\u306b\u6307\u5b9a\u3057\u306a\u3051\u308c\u3070\u3044\u3051\u307e\u305b\u3093
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/res/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/res/LocalStrings.properties?rev=898279&r1=898278&r2=898279&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/res/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/res/LocalStrings.properties
Tue Jan 12 11:09:18 2010
@@ -34,7 +34,6 @@
endpoint.poll.limitedpollsize=Failed to create poller with specified size of
{0}
endpoint.poll.initfail=Poller creation failed
endpoint.poll.fail=Critical poller failure (restarting poller): [{0}] {1}
-endpoint.poll.fail=Socket [{0}] poll event: [{1}] {2}
endpoint.poll.error=Unexpected poller error
endpoint.process.fail=Error allocating socket processor
endpoint.sendfile.error=Unexpected sendfile error
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/res/LocalStrings_es.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/res/LocalStrings_es.properties?rev=898279&r1=898278&r2=898279&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/res/LocalStrings_es.properties
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/res/LocalStrings_es.properties
Tue Jan 12 11:09:18 2010
@@ -31,7 +31,6 @@
endpoint.poll.limitedpollsize = No pude crear encuestador de medida
espec\u00EDfica de {0}
endpoint.poll.initfail = Fall\u00F3 la creaci\u00F3n del encuestador
endpoint.poll.fail = Fallo cr\u00EDtico de encuestador (reiniciando
encuestador)\: [{0}] {1}
-endpoint.poll.fail = Conector [{0}] evento de encuesta\: [{1}] {2}
endpoint.poll.error = Error inesperado de encuestador
endpoint.process.fail = Error reservando procesador de conector
endpoint.sendfile.error = Error inesperado de env\u00EDo de fichero
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
