Author: markt
Date: Wed Aug 15 19:20:39 2012
New Revision: 1373589
URL: http://svn.apache.org/viewvc?rev=1373589&view=rev
Log:
Clean-up l12n messages
Added:
tomcat/tc7.0.x/trunk/java/org/apache/coyote/LocalStrings_es.properties
- copied unchanged from r1373578,
tomcat/trunk/java/org/apache/coyote/LocalStrings_es.properties
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java
tomcat/tc7.0.x/trunk/java/org/apache/coyote/LocalStrings.properties
tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java
tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/LocalStrings.properties
tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/LocalStrings_es.properties
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1373578
Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1373589&r1=1373588&r2=1373589&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java Wed Aug
15 19:20:39 2012
@@ -628,11 +628,11 @@ public abstract class AbstractProtocol i
} catch(java.net.SocketException e) {
// SocketExceptions are normal
getLog().debug(sm.getString(
- "ajpprotocol.proto.socketexception.debug"), e);
+ "abstractConnectionHandler.socketexception.debug"), e);
} catch (java.io.IOException e) {
// IOExceptions are normal
getLog().debug(sm.getString(
- "ajpprotocol.proto.ioexception.debug"), e);
+ "abstractConnectionHandler.ioexception.debug"), e);
}
// Future developers: if you discover any other
// rare-but-nonfatal exceptions, catch them here, and log as
@@ -642,7 +642,8 @@ public abstract class AbstractProtocol i
// any other exception or error is odd. Here we log it
// with "ERROR" level, so it will show up even on
// less-than-verbose logs.
- getLog().error(sm.getString("ajpprotocol.proto.error"), e);
+ getLog().error(
+ sm.getString("abstractConnectionHandler.error"), e);
}
// Don't try to add upgrade processors back into the pool
if (!(processor instanceof UpgradeProcessor)) {
Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/LocalStrings.properties?rev=1373589&r1=1373588&r2=1373589&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/coyote/LocalStrings.properties
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/LocalStrings.properties Wed Aug
15 19:20:39 2012
@@ -12,6 +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.
+abstractConnectionHandler.error=Error reading request, ignored
+abstractConnectionHandler.ioexception.debug=IOExceptions are normal, ignored
+abstractConnectionHandler.socketexception.debug=SocketExceptions are normal,
ignored
abstractProtocolHandler.getAttribute=Get attribute [{0}] with value [{1}]
abstractProtocolHandler.setAttribute=Set attribute [{0}] with value [{1}]
Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java?rev=1373589&r1=1373588&r2=1373589&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java Wed
Aug 15 19:20:39 2012
@@ -319,7 +319,7 @@ public class AjpAprProcessor extends Abs
if (nRead > 0) {
inputBuffer.limit(inputBuffer.limit() + nRead);
} else {
- throw new IOException(sm.getString("ajpprotocol.failedread"));
+ throw new IOException(sm.getString("ajpprocessor.failedread"));
}
}
@@ -355,7 +355,7 @@ public class AjpAprProcessor extends Abs
if ((-nRead) == Status.ETIMEDOUT || (-nRead) == Status.TIMEUP)
{
return false;
} else {
- throw new
IOException(sm.getString("ajpprotocol.failedread"));
+ throw new
IOException(sm.getString("ajpprocessor.failedread"));
}
}
}
Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java?rev=1373589&r1=1373588&r2=1373589&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java Wed
Aug 15 19:20:39 2012
@@ -317,7 +317,7 @@ public class AjpNioProcessor extends Abs
} else if (res == 0 && !block) {
break;
} else {
- throw new IOException(sm.getString("ajpprotocol.failedread"));
+ throw new IOException(sm.getString("ajpprocessor.failedread"));
}
block = true;
}
Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java?rev=1373589&r1=1373588&r2=1373589&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java Wed Aug
15 19:20:39 2012
@@ -310,7 +310,7 @@ public class AjpProcessor extends Abstra
if (res > 0) {
read += res;
} else {
- throw new IOException(sm.getString("ajpprotocol.failedread"));
+ throw new IOException(sm.getString("ajpprocessor.failedread"));
}
}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/LocalStrings.properties?rev=1373589&r1=1373588&r2=1373589&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/LocalStrings.properties
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/LocalStrings.properties Wed
Aug 15 19:20:39 2012
@@ -12,25 +12,13 @@
# 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.
-
-# $Id$
-
-# language
-
-# package org.apache.coyote.ajp
-
-#
-# AjpAprProtocol
-#
-
ajpprotocol.endpoint.starterror=Error starting endpoint
ajpprotocol.init=Initializing Coyote AJP/1.3 on {0}
-ajpprotocol.proto.error=Error reading request, ignored
ajpprotocol.start=Starting Coyote AJP/1.3 on {0}
-ajpprotocol.failedread=Socket read failed
ajpprotocol.failedwrite=Socket write failed
ajpprotocol.request.register=Error registering request processor in JMX
+ajpprocessor.failedread=Socket read failed
ajpprocessor.failedflush=Failed to flush AJP message
ajpprocessor.failedsend=Failed to send AJP message
ajpprocessor.header.error=Header message parsing failed
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/LocalStrings_es.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/LocalStrings_es.properties?rev=1373589&r1=1373588&r2=1373589&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/LocalStrings_es.properties
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/LocalStrings_es.properties
Wed Aug 15 19:20:39 2012
@@ -16,9 +16,10 @@ ajpprotocol.endpoint.starterror = Error
ajpprotocol.init = Inicializando Coyote AJP/1.3 en {0}
ajpprotocol.proto.error = Error leyendo requerimiento, ignorado
ajpprotocol.start = Arrancando Coyote AJP/1.3 en {0}
-ajpprotocol.failedread = Fallo en lectura de Conector
ajpprotocol.failedwrite = Fallo en escritura de Conector
ajpprotocol.request.register = Error registrando procesador de requerimiento
en JMX
+
+ajpprocessor.failedread = Fallo en lectura de Conector
ajpprocessor.failedflush = No pude vaciar mensaje AJP
ajpprocessor.failedsend = No pude enviar mensaje AJP
ajpprocessor.header.error = Fallo en an\u00E1lisis de mensaje de cabecera
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
