Author: kfujino
Date: Thu May 21 09:54:44 2015
New Revision: 1680792
URL: http://svn.apache.org/r1680792
Log:
Use StringManager to provide i18n support in the
org.apache.catalina.tribes.tipis package.
Added:
tomcat/trunk/java/org/apache/catalina/tribes/tipis/LocalStrings.properties
(with props)
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
tomcat/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java
tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java?rev=1680792&r1=1680791&r2=1680792&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
Thu May 21 09:54:44 2015
@@ -42,6 +42,7 @@ import org.apache.catalina.tribes.group.
import org.apache.catalina.tribes.group.RpcChannel;
import org.apache.catalina.tribes.io.XByteBuffer;
import org.apache.catalina.tribes.util.Arrays;
+import org.apache.catalina.tribes.util.StringManager;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
@@ -55,6 +56,8 @@ public abstract class AbstractReplicated
private static final long serialVersionUID = 1L;
+ protected static final StringManager sm =
StringManager.getManager(AbstractReplicatedMap.class);
+
private final Log log = LogFactory.getLog(AbstractReplicatedMap.class);
/**
@@ -200,7 +203,7 @@ public abstract class AbstractReplicated
protected void init(MapOwner owner, Channel channel, String mapContextName,
long timeout, int channelSendOptions,ClassLoader[] cls, boolean
terminate) {
long start = System.currentTimeMillis();
- if (log.isInfoEnabled()) log.info("Initializing AbstractReplicatedMap
with context name:"+mapContextName);
+ if (log.isInfoEnabled())
log.info(sm.getString("abstractReplicatedMap.init.start", mapContextName));
this.mapOwner = owner;
this.externalLoaders = cls;
this.channelSendOptions = channelSendOptions;
@@ -228,15 +231,15 @@ public abstract class AbstractReplicated
//state is transferred, we are ready for messaging
broadcast(MapMessage.MSG_START, true);
} catch (ChannelException x) {
- log.warn("Unable to send map start message.");
+
log.warn(sm.getString("abstractReplicatedMap.unableSend.startMessage"));
if (terminate) {
breakdown();
- throw new RuntimeException("Unable to start replicated
map.",x);
+ throw new
RuntimeException(sm.getString("abstractReplicatedMap.unableStart"),x);
}
}
long complete = System.currentTimeMillis() - start;
if (log.isInfoEnabled())
- log.info("AbstractReplicatedMap[" +mapContextName + "]
initialization was completed in " + complete + " ms.");
+ log.info(sm.getString("abstractReplicatedMap.init.completed",
mapContextName, complete));
}
@@ -321,7 +324,7 @@ public abstract class AbstractReplicated
messageReceived(resp[i].getMessage(), resp[i].getSource());
}
} else {
- log.warn("broadcast received 0 replies, probably a timeout.");
+
log.warn(sm.getString("abstractReplicatedMap.broadcast.noReplies"));
}
} else {
channel.send(channel.getMembers(),msg,channelSendOptions);
@@ -433,7 +436,7 @@ public abstract class AbstractReplicated
entry.getBackupNodes());
rentry.resetDiff();
} catch (IOException x) {
- log.error("Unable to diff object. Will replicate the
entire object instead.", x);
+
log.error(sm.getString("abstractReplicatedMap.unable.diffObject"), x);
} finally {
rentry.unlock();
}
@@ -457,7 +460,7 @@ public abstract class AbstractReplicated
channel.send(entry.getBackupNodes(), msg,
channelSendOptions);
}
} catch (ChannelException x) {
- log.error("Unable to replicate data.", x);
+
log.error(sm.getString("abstractReplicatedMap.unable.replicate"), x);
}
} //end if
@@ -497,15 +500,15 @@ public abstract class AbstractReplicated
}
stateTransferred = true;
} else {
- log.warn("Transfer state, 0 replies, probably a timeout.");
+
log.warn(sm.getString("abstractReplicatedMap.transferState.noReplies"));
}
}
} catch (ChannelException x) {
- log.error("Unable to transfer LazyReplicatedMap state.", x);
+
log.error(sm.getString("abstractReplicatedMap.unable.transferState"), x);
} catch (IOException x) {
- log.error("Unable to transfer LazyReplicatedMap state.", x);
+
log.error(sm.getString("abstractReplicatedMap.unable.transferState"), x);
} catch (ClassNotFoundException x) {
- log.error("Unable to transfer LazyReplicatedMap state.", x);
+
log.error(sm.getString("abstractReplicatedMap.unable.transferState"), x);
}
}
@@ -586,9 +589,9 @@ public abstract class AbstractReplicated
memberAlive(mapmsg.getPrimary());
}
} catch (IOException x ) {
- log.error("Unable to deserialize MapMessage.",x);
+
log.error(sm.getString("abstractReplicatedMap.unable.deserialize.MapMessage"),x);
} catch (ClassNotFoundException x ) {
- log.error("Unable to deserialize MapMessage.",x);
+
log.error(sm.getString("abstractReplicatedMap.unable.deserialize.MapMessage"),x);
}
}
@@ -605,10 +608,10 @@ public abstract class AbstractReplicated
try {
mapmsg.deserialize(getExternalLoaders());
} catch (IOException x) {
- log.error("Unable to deserialize MapMessage.", x);
+
log.error(sm.getString("abstractReplicatedMap.unable.deserialize.MapMessage"),
x);
return;
} catch (ClassNotFoundException x) {
- log.error("Unable to deserialize MapMessage.", x);
+
log.error(sm.getString("abstractReplicatedMap.unable.deserialize.MapMessage"),
x);
return;
}
if ( log.isTraceEnabled() )
@@ -666,7 +669,7 @@ public abstract class AbstractReplicated
try {
diff.applyDiff(mapmsg.getDiffValue(), 0,
mapmsg.getDiffValue().length);
} catch (Exception x) {
- log.error("Unable to apply diff to key:" +
entry.getKey(), x);
+
log.error(sm.getString("abstractReplicatedMap.unableApply.diff",
entry.getKey()), x);
} finally {
diff.unlock();
}
@@ -748,7 +751,7 @@ public abstract class AbstractReplicated
entry.setBackupNodes(backup);
entry.setPrimary(channel.getLocalMember(false));
} catch (ChannelException x) {
- log.error("Unable to select backup node.", x);
+
log.error(sm.getString("abstractReplicatedMap.unableSelect.backup"), x);
} //catch
} //end if
} //while
@@ -791,7 +794,7 @@ public abstract class AbstractReplicated
}
}
if (log.isInfoEnabled())
- log.info("Member["+member+"] disappeared. Related map entries will
be relocated to the new node.");
+ log.info(sm.getString("abstractReplicatedMap.member.disappeared",
member));
long start = System.currentTimeMillis();
Iterator<Map.Entry<K,MapEntry<K,V>>> i =
innerMap.entrySet().iterator();
while (i.hasNext()) {
@@ -805,7 +808,7 @@ public abstract class AbstractReplicated
entry.setBackupNodes(backup);
entry.setPrimary(channel.getLocalMember(false));
} catch (ChannelException x) {
- log.error("Unable to relocate[" + entry.getKey() + "] to a
new backup node", x);
+
log.error(sm.getString("abstractReplicatedMap.unable.relocate",
entry.getKey()), x);
}
} else if (member.equals(entry.getPrimary())) {
if (log.isDebugEnabled()) log.debug("[2] Primary disappeared");
@@ -836,13 +839,13 @@ public abstract class AbstractReplicated
if ( mapOwner!=null )
mapOwner.objectMadePrimary(entry.getKey(),entry.getValue());
} catch (ChannelException x) {
- log.error("Unable to relocate[" + entry.getKey() + "] to a
new backup node", x);
+
log.error(sm.getString("abstractReplicatedMap.unable.relocate",
entry.getKey()), x);
}
}
} //while
long complete = System.currentTimeMillis() - start;
- if (log.isInfoEnabled()) log.info("Relocation of map entries was
complete in " + complete + " ms.");
+ if (log.isInfoEnabled())
log.info(sm.getString("abstractReplicatedMap.relocate.complete", complete));
}
public int getNextBackupIndex() {
@@ -870,7 +873,7 @@ public abstract class AbstractReplicated
try {
ping(accessTimeout);
}catch ( Exception x ) {
- log.error("Unable to send AbstractReplicatedMap.ping message",x);
+
log.error(sm.getString("abstractReplicatedMap.heartbeat.failed"),x);
}
}
@@ -897,7 +900,7 @@ public abstract class AbstractReplicated
getChannel().send(getMapMembers(), msg,
getChannelSendOptions());
}
} catch ( ChannelException x ) {
- log.error("Unable to replicate out data for a
LazyReplicatedMap.remove operation",x);
+ log.error(sm.getString("abstractReplicatedMap.unable.remove"),x);
}
return entry!=null?entry.getValue():null;
}
@@ -927,7 +930,7 @@ public abstract class AbstractReplicated
Response[] resp =
getRpcChannel().send(entry.getBackupNodes(),msg, RpcChannel.FIRST_REPLY,
Channel.SEND_OPTIONS_DEFAULT, getRpcTimeout());
if (resp == null || resp.length == 0) {
//no responses
- log.warn("Unable to retrieve remote object for key:" +
key);
+
log.warn(sm.getString("abstractReplicatedMap.unable.retrieve", key));
return null;
}
msg = (MapMessage) resp[0].getMessage();
@@ -961,7 +964,7 @@ public abstract class AbstractReplicated
if ( getMapOwner()!=null )
getMapOwner().objectMadePrimary(key, entry.getValue());
} catch (Exception x) {
- log.error("Unable to replicate out data for a
LazyReplicatedMap.get operation", x);
+ log.error(sm.getString("abstractReplicatedMap.unable.get"), x);
return null;
}
}
@@ -1027,7 +1030,7 @@ public abstract class AbstractReplicated
entry.setBackupNodes(backup);
}
} catch (ChannelException x) {
- log.error("Unable to replicate out data for a
LazyReplicatedMap.put operation", x);
+ log.error(sm.getString("abstractReplicatedMap.unable.put"), x);
}
innerMap.put(key,entry);
return old;
@@ -1080,7 +1083,7 @@ public abstract class AbstractReplicated
@Override
public Object clone() {
- throw new UnsupportedOperationException("This operation is not valid
on a replicated map");
+ throw new
UnsupportedOperationException(sm.getString("abstractReplicatedMap.unsupport.operation"));
}
/**
@@ -1416,7 +1419,7 @@ public abstract class AbstractReplicated
try {
return key(null);
} catch ( Exception x ) {
- throw new RuntimeException("Deserialization error of the
MapMessage.key", x);
+ throw new
RuntimeException(sm.getString("mapMessage.deserialize.error.key"), x);
}
}
@@ -1436,7 +1439,7 @@ public abstract class AbstractReplicated
try {
return value(null);
} catch ( Exception x ) {
- throw new RuntimeException("Deserialization error of the
MapMessage.value", x);
+ throw new
RuntimeException(sm.getString("mapMessage.deserialize.error.value"), x);
}
}
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java?rev=1680792&r1=1680791&r2=1680792&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java
Thu May 21 09:54:44 2015
@@ -173,7 +173,7 @@ public class LazyReplicatedMap<K,V> exte
//we published out to a backup, mark the test success
success = true;
}catch ( ChannelException x ) {
- log.error("Unable to replicate backup key:"+key+" to
backup:"+next+". Reason:"+x.getMessage(),x);
+
log.error(sm.getString("lazyReplicatedMap.unableReplicate.backup", key, next,
x.getMessage()), x);
}
try {
//publish the data out to all nodes
@@ -189,7 +189,7 @@ public class LazyReplicatedMap<K,V> exte
//log the error, but proceed, this should only happen if a
node went down,
//and if the node went down, then it can't receive the
message, the others
//should still get it.
- log.error("Unable to replicate proxy key:"+key+" to
backup:"+next+". Reason:"+x.getMessage(),x);
+
log.error(sm.getString("lazyReplicatedMap.unableReplicate.proxy", key, next,
x.getMessage()), x);
}
} while ( !success && (firstIdx!=nextIdx));
return backup;
Added:
tomcat/trunk/java/org/apache/catalina/tribes/tipis/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/tipis/LocalStrings.properties?rev=1680792&view=auto
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/tipis/LocalStrings.properties
(added)
+++ tomcat/trunk/java/org/apache/catalina/tribes/tipis/LocalStrings.properties
Thu May 21 09:54:44 2015
@@ -0,0 +1,43 @@
+# 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.
+
+abstractReplicatedMap.init.start=Initializing AbstractReplicatedMap with
context name:{0}
+abstractReplicatedMap.unableSend.startMessage=Unable to send map start message.
+abstractReplicatedMap.unableStart=Unable to start replicated map.
+abstractReplicatedMap.init.completed=AbstractReplicatedMap[{0}] initialization
was completed in {1} ms.
+abstractReplicatedMap.broadcast.noReplies=broadcast received 0 replies,
probably a timeout.
+abstractReplicatedMap.unable.diffObject=Unable to diff object. Will replicate
the entire object instead.
+abstractReplicatedMap.unable.replicate=Unable to replicate data.
+abstractReplicatedMap.transferState.noReplies=Transfer state, 0 replies,
probably a timeout.
+abstractReplicatedMap.unable.transferState=Unable to transfer
LazyReplicatedMap state.
+abstractReplicatedMap.unable.deserialize.MapMessage=Unable to deserialize
MapMessage.
+abstractReplicatedMap.unableApply.diff=Unable to apply diff to key:{0}
+abstractReplicatedMap.unableSelect.backup=Unable to select backup node.
+abstractReplicatedMap.member.disappeared=Member[{0}] disappeared. Related map
entries will be relocated to the new node.
+abstractReplicatedMap.unable.relocate=Unable to relocate[{0}] to a new backup
node
+abstractReplicatedMap.relocate.complete=Relocation of map entries was complete
in {0} ms.
+abstractReplicatedMap.heartbeat.failed=Unable to send
AbstractReplicatedMap.ping message
+abstractReplicatedMap.unable.remove=Unable to replicate out data for a
LazyReplicatedMap.remove operation
+abstractReplicatedMap.unable.retrieve=Unable to retrieve remote object for
key:{0}
+abstractReplicatedMap.unable.get=Unable to replicate out data for a
LazyReplicatedMap.get operation
+abstractReplicatedMap.unable.put=Unable to replicate out data for a
LazyReplicatedMap.put operation
+abstractReplicatedMap.unsupport.operation=This operation is not valid on a
replicated map
+mapMessage.deserialize.error.key=Deserialization error of the MapMessage.key
+mapMessage.deserialize.error.value=Deserialization error of the
MapMessage.value
+lazyReplicatedMap.unableReplicate.backup=Unable to replicate backup key:{0} to
backup:{1}. Reason:{2}
+lazyReplicatedMap.unableReplicate.proxy=Unable to replicate proxy key:{0} to
backup:{1}. Reason:{2}
+replicatedMap.member.disappeared=Member[{0}] disappeared. Related map entries
will be relocated to the new node.
+replicatedMap.unable.relocate=Unable to relocate[{0}] to a new backup node
+replicatedMap.relocate.complete=Relocation of map entries was complete in {0}
ms.
\ No newline at end of file
Propchange:
tomcat/trunk/java/org/apache/catalina/tribes/tipis/LocalStrings.properties
------------------------------------------------------------------------------
svn:eol-style = native
Modified: tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java?rev=1680792&r1=1680791&r2=1680792&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java Thu
May 21 09:54:44 2015
@@ -151,7 +151,7 @@ public class ReplicatedMap<K,V> extends
}
}
if (log.isInfoEnabled())
- log.info("Member["+member+"] disappeared. Related map entries will
be relocated to the new node.");
+ log.info(sm.getString("replicatedMap.member.disappeared", member));
long start = System.currentTimeMillis();
Iterator<Map.Entry<K,MapEntry<K,V>>> i =
innerMap.entrySet().iterator();
while (i.hasNext()) {
@@ -169,7 +169,7 @@ public class ReplicatedMap<K,V> extends
entry.setBackupNodes(backup);
entry.setPrimary(channel.getLocalMember(false));
} catch (ChannelException x) {
- log.error("Unable to relocate[" + entry.getKey() + "] to a
new backup node", x);
+ log.error(sm.getString("replicatedMap.unable.relocate",
entry.getKey()), x);
}
} else if (member.equals(entry.getPrimary())) {
entry.setPrimary(null);
@@ -195,13 +195,13 @@ public class ReplicatedMap<K,V> extends
if ( mapOwner!=null )
mapOwner.objectMadePrimary(entry.getKey(),entry.getValue());
} catch (ChannelException x) {
- log.error("Unable to relocate[" + entry.getKey() + "] to a
new backup node", x);
+ log.error(sm.getString("replicatedMap.unable.relocate",
entry.getKey()), x);
}
}
} //while
long complete = System.currentTimeMillis() - start;
- if (log.isInfoEnabled()) log.info("Relocation of map entries was
complete in " + complete + " ms.");
+ if (log.isInfoEnabled())
log.info(sm.getString("replicatedMap.relocate.complete", complete));
}
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
