Author: kfujino
Date: Thu May 21 09:56:02 2015
New Revision: 1680793
URL: http://svn.apache.org/r1680793
Log:
Use StringManager to provide i18n support in the
org.apache.catalina.tribes.transport package.
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/transport/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/tribes/transport/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/tribes/transport/PooledSender.java
tomcat/trunk/java/org/apache/catalina/tribes/transport/ReceiverBase.java
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/transport/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/LocalStrings.properties?rev=1680793&r1=1680792&r2=1680793&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/transport/LocalStrings.properties
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/transport/LocalStrings.properties
Thu May 21 09:56:02 2015
@@ -13,24 +13,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-IDataSender.ack.eof=EOF reached at local port [{0}:{1,number,integer}]
-IDataSender.ack.missing=Unable to read acknowledgement from
[{0}:{1,number,integer}] in {2,number,integer} ms. Disconnecting socket, and
trying again.
-IDataSender.ack.wrong=Missing correct ACK after 10 bytes read at local port
[{0}:{1,number,integer}]
-IDataSender.closeSocket=Sender close socket to [{0}:{1,number,integer}] (close
count {2,number,integer})
-IDataSender.disconnect=Sender disconnect from [{0}:{1,number,integer}]
(disconnect count {2,number,integer})
-IDataSender.openSocket=Sender open socket to [{0}:{1,number,integer}] (open
count {2,number,integer})
-IDataSender.openSocket.failure=Open sender socket [{0}:{1,number,integer}]
failure! (open failure count {2,number,integer})
-IDataSender.send.again=Send data again to [{0}:{1,number,integer}]
-
-NioReceiver.alreadyStarted=ServerSocketChannel already started
-NioReceiver.cleanup.fail=Unable to cleanup on selector close
-NioReceiver.clientDisconnect=Replication client disconnected, error when
polling key. Ignoring client.
-NioReceiver.requestError=Unable to process request in NioReceiver
-NioReceiver.run.fail=Unable to run replication listener
-NioReceiver.start.fail=Unable to start cluster receiver
-NioReceiver.stop.fail=Unable to close cluster receiver selector
-NioReceiver.stop.threadRunning=The NioReceiver thread did not stop in a timely
manner. Errors may be observed when the selector is closed.
-NioReceiver.threadpool.fail=ThreadPool cannot be initialized. Listener not
started.
-NioReceiver.threadsExhausted=Channel key is registered, but has had no
interest ops for the last [{0}] ms. (cancelled: [{1}]):[{2}] last access:[{3}
Possible cause: all threads used, perform thread dump
-
+pooledSender.closed.queue=Queue is closed
PooledSender.senderDisconnectFail=Failed to disconnect sender
+receiverBase.bind.failed=Failed bind replication listener on address:{0}
+receiverBase.socket.bind=Receiver Server Socket bound to:{0}
+receiverBase.unable.bind=Unable to bind server socket to:{0} throwing error.
+receiverBase.udp.bind=UDP Receiver Server Socket bound to:{0}
+receiverBase.unable.bind.udp=Unable to bind UDP socket to:{0} throwing error.
\ No newline at end of file
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=1680793&r1=1680792&r2=1680793&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/transport/LocalStrings_es.properties
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/transport/LocalStrings_es.properties
Thu May 21 09:56:02 2015
@@ -12,12 +12,12 @@
# 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.
-IDataSender.ack.eof = EOF alcanzado en puerto local [{0}\:{1,number,integer}]
-IDataSender.ack.missing = No puedo leer reconocimiento desde
[{0}\:{1,number,integer}] en {2,number,integer} ms. Desconectando conector e
intentando otra vez.
-IDataSender.ack.wrong = Falta ACK correcto tras 10 bytes le\u00EDdos en puerto
local [{0}\:{1,number,integer}]
-IDataSender.closeSocket = El remitente cerr\u00F3 el conector con
[{0}\:{1,number,integer}] (contador de cierre {2,number,integer})
-IDataSender.disconnect = Remitente desconectado de [{0}\:{1,number,integer}]
(contador de desconexi\u00F3n {2,number,integer})
-IDataSender.openSocket = Remitente abri\u00F3 conector con
[{0}\:{1,number,integer}] (contador de apertura {2,number,integer})
-IDataSender.openSocket.failure = \u00A1No pude abrir conector de remitente
[{0}\:{1,number,integer}]\! (contador de fallo de apertura {2,number,integer})
-IDataSender.send.again = Enviar datos de nuevo a [{0}\:{1,number,integer}]
+bioSender.ack.eof = EOF alcanzado en puerto local [{0}\:{1,number,integer}]
+bioSender.ack.missing = No puedo leer reconocimiento desde
[{0}\:{1,number,integer}] en {2,number,integer} ms. Desconectando conector e
intentando otra vez.
+bioSender.ack.wrong = Falta ACK correcto tras 10 bytes le\u00EDdos en puerto
local [{0}\:{1,number,integer}]
+bioSender.closeSocket = El remitente cerr\u00F3 el conector con
[{0}\:{1,number,integer}] (contador de cierre {2,number,integer})
+bioSender.disconnect = Remitente desconectado de [{0}\:{1,number,integer}]
(contador de desconexi\u00F3n {2,number,integer})
+bioSender.openSocket = Remitente abri\u00F3 conector con
[{0}\:{1,number,integer}] (contador de apertura {2,number,integer})
+bioSender.openSocket.failure = \u00A1No pude abrir conector de remitente
[{0}\:{1,number,integer}]\! (contador de fallo de apertura {2,number,integer})
+bioSender.send.again = Enviar datos de nuevo a [{0}\:{1,number,integer}]
PooledSender.senderDisconnectFail = No pude desconectar al remitente
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/transport/PooledSender.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/PooledSender.java?rev=1680793&r1=1680792&r2=1680793&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/transport/PooledSender.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/transport/PooledSender.java
Thu May 21 09:56:02 2015
@@ -160,7 +160,7 @@ public abstract class PooledSender exten
public synchronized DataSender getSender(long timeout) {
long start = System.currentTimeMillis();
while ( true ) {
- if (!isOpen)throw new IllegalStateException("Queue is closed");
+ if (!isOpen)throw new
IllegalStateException(sm.getString("pooledSender.closed.queue"));
DataSender sender = null;
if (notinuse.size() == 0 && inuse.size() < limit) {
sender = parent.getNewDataSender();
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/transport/ReceiverBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/ReceiverBase.java?rev=1680793&r1=1680792&r2=1680793&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/transport/ReceiverBase.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/transport/ReceiverBase.java
Thu May 21 09:56:02 2015
@@ -31,6 +31,7 @@ import org.apache.catalina.tribes.Channe
import org.apache.catalina.tribes.MessageListener;
import org.apache.catalina.tribes.io.ListenCallback;
import org.apache.catalina.tribes.util.ExecutorFactory;
+import org.apache.catalina.tribes.util.StringManager;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
@@ -42,6 +43,8 @@ public abstract class ReceiverBase imple
private static final Object bindLock = new Object();
+ protected static final StringManager sm =
StringManager.getManager(Constants.Package);
+
private MessageListener listener;
private String host = "auto";
private InetAddress bind;
@@ -157,7 +160,7 @@ public abstract class ReceiverBase imple
log.debug("Starting replication listener on address:"+
host);
bind = java.net.InetAddress.getByName(host);
} catch (IOException ioe) {
- log.error("Failed bind replication listener on address:"+
host, ioe);
+ log.error(sm.getString("receiverBase.bind.failed", host), ioe);
}
}
return bind;
@@ -183,13 +186,12 @@ public abstract class ReceiverBase imple
addr = new InetSocketAddress(getBind(), port);
socket.bind(addr);
setPort(port);
- log.info("Receiver Server Socket bound to:"+addr);
+ log.info(sm.getString("receiverBase.socket.bind", addr));
retries = 0;
} catch ( IOException x) {
retries--;
if ( retries <= 0 ) {
- log.info("Unable to bind server socket to:" + addr +
- " throwing error.");
+ log.info(sm.getString("receiverBase.unable.bind",
addr));
throw x;
}
port++;
@@ -213,12 +215,12 @@ public abstract class ReceiverBase imple
addr = new InetSocketAddress(getBind(), portstart);
socket.bind(addr);
setUdpPort(portstart);
- log.info("UDP Receiver Server Socket bound to:"+addr);
+ log.info(sm.getString("receiverBase.udp.bind", addr));
return 0;
}catch ( IOException x) {
retries--;
if ( retries <= 0 ) {
- log.info("Unable to bind UDP socket to:"+addr+" throwing
error.");
+ log.info(sm.getString("receiverBase.unable.bind.udp",
addr));
throw x;
}
portstart++;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
