You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by kf...@apache.org on 2015/05/18 07:12:07 UTC
svn commit: r1679935 - in /tomcat/trunk/java/org/apache/catalina/ha/context:
LocalStrings.properties ReplicatedContext.java
Author: kfujino
Date: Mon May 18 05:12:06 2015
New Revision: 1679935
URL: http://svn.apache.org/r1679935
Log:
Use StringManager to provide i18n support in the org.apache.catalina.ha.context package
Added:
tomcat/trunk/java/org/apache/catalina/ha/context/LocalStrings.properties (with props)
Modified:
tomcat/trunk/java/org/apache/catalina/ha/context/ReplicatedContext.java
Added: tomcat/trunk/java/org/apache/catalina/ha/context/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/context/LocalStrings.properties?rev=1679935&view=auto
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/context/LocalStrings.properties (added)
+++ tomcat/trunk/java/org/apache/catalina/ha/context/LocalStrings.properties Mon May 18 05:12:06 2015
@@ -0,0 +1,19 @@
+# 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.
+
+applicationContext.setAttribute.namenull=Name cannot be null
+
+replicatedContext.startUnable=Unable to start ReplicatedContext
+replicatedContext.startFailed=Failed to start ReplicatedContext
\ No newline at end of file
Propchange: tomcat/trunk/java/org/apache/catalina/ha/context/LocalStrings.properties
------------------------------------------------------------------------------
svn:eol-style = native
Modified: tomcat/trunk/java/org/apache/catalina/ha/context/ReplicatedContext.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/context/ReplicatedContext.java?rev=1679935&r1=1679934&r2=1679935&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/context/ReplicatedContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/context/ReplicatedContext.java Mon May 18 05:12:06 2015
@@ -36,6 +36,7 @@ import org.apache.catalina.tribes.tipis.
import org.apache.catalina.tribes.tipis.ReplicatedMap;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
+import org.apache.tomcat.util.res.StringManager;
/**
* @version 1.0
@@ -44,6 +45,7 @@ public class ReplicatedContext extends S
private int mapSendOptions = Channel.SEND_OPTIONS_DEFAULT;
private static final Log log = LogFactory.getLog( ReplicatedContext.class );
protected static final long DEFAULT_REPL_TIMEOUT = 15000;//15 seconds
+ private static final StringManager sm = StringManager.getManager(ReplicatedContext.class);
/**
* Start this component and implement the requirements
@@ -68,8 +70,8 @@ public class ReplicatedContext extends S
}
super.startInternal();
} catch ( Exception x ) {
- log.error("Unable to start ReplicatedContext",x);
- throw new LifecycleException("Failed to start ReplicatedContext",x);
+ log.error(sm.getString("replicatedContext.startUnable"),x);
+ throw new LifecycleException(sm.getString("replicatedContext.startFailed"),x);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org