You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2012/08/15 21:12:39 UTC
svn commit: r1373578 - in /tomcat/trunk/java/org/apache/coyote: ./ ajp/
Author: markt
Date: Wed Aug 15 19:12:38 2012
New Revision: 1373578
URL: http://svn.apache.org/viewvc?rev=1373578&view=rev
Log:
Clean-up l12n messages
Added:
tomcat/trunk/java/org/apache/coyote/LocalStrings_es.properties (with props)
Modified:
tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
tomcat/trunk/java/org/apache/coyote/LocalStrings.properties
tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings.properties
tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings_es.properties
Modified: tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1373578&r1=1373577&r2=1373578&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java Wed Aug 15 19:12:38 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/trunk/java/org/apache/coyote/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/LocalStrings.properties?rev=1373578&r1=1373577&r2=1373578&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/LocalStrings.properties (original)
+++ tomcat/trunk/java/org/apache/coyote/LocalStrings.properties Wed Aug 15 19:12:38 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}]
Added: tomcat/trunk/java/org/apache/coyote/LocalStrings_es.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/LocalStrings_es.properties?rev=1373578&view=auto
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/LocalStrings_es.properties (added)
+++ tomcat/trunk/java/org/apache/coyote/LocalStrings_es.properties Wed Aug 15 19:12:38 2012
@@ -0,0 +1,15 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+abstractConnectionHandler.error = Error leyendo requerimiento, ignorado
Propchange: tomcat/trunk/java/org/apache/coyote/LocalStrings_es.properties
------------------------------------------------------------------------------
svn:eol-style = native
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java?rev=1373578&r1=1373577&r2=1373578&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java Wed Aug 15 19:12:38 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/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java?rev=1373578&r1=1373577&r2=1373578&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java Wed Aug 15 19:12:38 2012
@@ -316,7 +316,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/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java?rev=1373578&r1=1373577&r2=1373578&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java Wed Aug 15 19:12:38 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/trunk/java/org/apache/coyote/ajp/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings.properties?rev=1373578&r1=1373577&r2=1373578&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings.properties (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings.properties Wed Aug 15 19:12:38 2012
@@ -12,19 +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.
-
-# $Id$
-
-# language
-
-# package org.apache.coyote.ajp
-
-#
-# AjpAprProtocol
-#
-
-ajpprotocol.proto.error=Error reading request, ignored
-ajpprotocol.failedread=Socket read failed
+ajpprocessor.failedread=Socket read failed
ajpprocessor.failedsend=Failed to send AJP message
ajpprocessor.header.error=Header message parsing failed
ajpprocessor.header.tooLong=Header message of length [{0}] received but the packetSize is only [{1}]
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=1373578&r1=1373577&r2=1373578&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings_es.properties (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings_es.properties Wed Aug 15 19:12:38 2012
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
ajpprotocol.proto.error = Error leyendo requerimiento, ignorado
-ajpprotocol.failedread = Fallo en lectura de Conector
+ajpprocessor.failedread = Fallo en lectura de Conector
ajpprocessor.failedsend = No pude enviar mensaje AJP
ajpprocessor.header.error = Fallo en an\u00E1lisis de mensaje de cabecera
ajpprocessor.request.prepare = Error preparando requerimiento
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org