You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by sc...@apache.org on 2015/01/21 17:15:57 UTC
svn commit: r1653574 - in /tomcat/trunk/java/org/apache/catalina/ha/deploy:
LocalStrings.properties WarWatcher.java
Author: schultz
Date: Wed Jan 21 16:15:56 2015
New Revision: 1653574
URL: http://svn.apache.org/r1653574
Log:
Prefer CamelCase for localized log strings.
Modified:
tomcat/trunk/java/org/apache/catalina/ha/deploy/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/ha/deploy/WarWatcher.java
Modified: tomcat/trunk/java/org/apache/catalina/ha/deploy/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/deploy/LocalStrings.properties?rev=1653574&r1=1653573&r2=1653574&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/deploy/LocalStrings.properties (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/deploy/LocalStrings.properties Wed Jan 21 16:15:56 2015
@@ -46,8 +46,8 @@ farmWarDeployer.undeployEnd=Undeployment
farmWarDeployer.undeployLocal=Undeploy local context [{0}]
farmWarDeployer.watchDir=Cluster deployment is watching [{0}] for changes.
-warWatcher.checking-wars=Checking WARs in {0}
-warWatcher.listed-file-does-not-exist={0} was detected in {1} but does not exist. Check directory permissions on {1}?
-warWatcher.checking-war=Checking WAR file {0}
-warWatcher.check-war.result=WarInfo.check() returned {0} for {1}
-warWatcher.cant-list-watchDir=Cannot list files in WatchDir "{0}": check to see if it is a directory and has read permissions.
+warWatcher.checkingWars=Checking WARs in {0}
+warWatcher.listedFileDoesNotExist={0} was detected in {1} but does not exist. Check directory permissions on {1}?
+warWatcher.checkingWar=Checking WAR file {0}
+warWatcher.checkWarResult=WarInfo.check() returned {0} for {1}
+warWatcher.cantListWatchDir=Cannot list files in WatchDir "{0}": check to see if it is a directory and has read permissions.
Modified: tomcat/trunk/java/org/apache/catalina/ha/deploy/WarWatcher.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/deploy/WarWatcher.java?rev=1653574&r1=1653573&r2=1653574&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/deploy/WarWatcher.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/deploy/WarWatcher.java Wed Jan 21 16:15:56 2015
@@ -69,10 +69,10 @@ public class WarWatcher {
*/
public void check() {
if (log.isDebugEnabled())
- log.debug(sm.getString("warWatcher.checking-wars", watchDir));
+ log.debug(sm.getString("warWatcher.checkingWars", watchDir));
File[] list = watchDir.listFiles(new WarFilter());
if (list == null) {
- log.warn(sm.getString("warWatcher.cant-list-watchDir",
+ log.warn(sm.getString("warWatcher.cantListWatchDir",
watchDir));
list = new File[0];
@@ -80,7 +80,7 @@ public class WarWatcher {
//first make sure all the files are listed in our current status
for (int i = 0; i < list.length; i++) {
if(!list[i].exists())
- log.warn(sm.getString("warWatcher.listed-file-does-not-exist",
+ log.warn(sm.getString("warWatcher.listedFileDoesNotExist",
list[i], watchDir));
addWarInfo(list[i]);
@@ -92,7 +92,7 @@ public class WarWatcher {
Map.Entry<String,WarInfo> entry = i.next();
WarInfo info = entry.getValue();
if(log.isTraceEnabled())
- log.trace(sm.getString("warWatcher.checking-war",
+ log.trace(sm.getString("warWatcher.checkingWar",
info.getWar()));
int check = info.check();
if (check == 1) {
@@ -103,7 +103,7 @@ public class WarWatcher {
i.remove();
}
if(log.isTraceEnabled())
- log.trace(sm.getString("warWatcher.check-war.result",
+ log.trace(sm.getString("warWatcher.checkWarResult",
Integer.valueOf(check),
info.getWar()));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org