Author: remm
Date: Mon Dec 10 10:57:08 2018
New Revision: 1848561
URL: http://svn.apache.org/viewvc?rev=1848561&view=rev
Log:
More i18n items.
Added:
tomcat/trunk/java/org/apache/catalina/ssi/LocalStrings.properties (with
props)
Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java
tomcat/trunk/java/org/apache/catalina/filters/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/filters/WebdavFixFilter.java
tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
tomcat/trunk/java/org/apache/catalina/manager/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java?rev=1848561&r1=1848560&r2=1848561&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java Mon Dec 10
10:57:08 2018
@@ -1133,7 +1133,7 @@ public class StandardWrapper extends Con
throw f;
} catch (Throwable f) {
ExceptionUtils.handleThrowable(f);
- getServletContext().log("StandardWrapper.Throwable", f );
+
getServletContext().log(sm.getString("standardWrapper.initException",
getName()), f);
// If the servlet wanted to be unavailable it would have
// said so, so do not call unavailable(null).
throw new ServletException
Modified: tomcat/trunk/java/org/apache/catalina/filters/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/LocalStrings.properties?rev=1848561&r1=1848560&r2=1848561&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/filters/LocalStrings.properties
[UTF-8] (original)
+++ tomcat/trunk/java/org/apache/catalina/filters/LocalStrings.properties
[UTF-8] Mon Dec 10 10:57:08 2018
@@ -60,3 +60,6 @@ remoteIpFilter.invalidNumber=Illegal num
requestFilter.deny=Denied request for [{0}] based on property [{1}]
restCsrfPreventionFilter.invalidNonce=CSRF nonce validation failed
+
+webDavFilter.xpRootContext=WebdavFixFilter: the XP-x64-SP2 client will only
work with the root context
+webDavFilter.xpProblem=WebdavFixFilter: the XP-x64-SP2 client is known not to
work with WebDAV Servlet
Modified: tomcat/trunk/java/org/apache/catalina/filters/WebdavFixFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/WebdavFixFilter.java?rev=1848561&r1=1848560&r2=1848561&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/filters/WebdavFixFilter.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/filters/WebdavFixFilter.java Mon Dec
10 10:57:08 2018
@@ -26,6 +26,8 @@ import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.tomcat.util.res.StringManager;
+
/**
* Filter that attempts to force MS WebDAV clients connecting on port 80 to use
* a WebDAV client that actually works. Other workarounds that might help
@@ -59,9 +61,7 @@ import javax.servlet.http.HttpServletRes
public class WebdavFixFilter extends GenericFilter {
private static final long serialVersionUID = 1L;
-
- private static final String LOG_MESSAGE_PREAMBLE =
- "WebdavFixFilter: Detected client problem: ";
+ protected static final StringManager sm =
StringManager.getManager(WebdavFixFilter.class);
/* Start string for all versions */
private static final String UA_MINIDIR_START =
@@ -101,11 +101,11 @@ public class WebdavFixFilter extends Gen
} else if (ua.startsWith(UA_MINIDIR_5_2_3790)) {
// XP 64-bit SP2
if (!"".equals(httpRequest.getContextPath())) {
- log("XP-x64-SP2 clients only work with the root context");
+
getServletContext().log(sm.getString("webDavFilter.xpRootContext"));
}
// Namespace issue maybe
// see http://greenbytes.de/tech/webdav/webdav-redirector-list.html
- log("XP-x64-SP2 is known not to work with WebDAV Servlet");
+ getServletContext().log(sm.getString("webDavFilter.xpProblem"));
chain.doFilter(request, response);
} else {
@@ -131,9 +131,4 @@ public class WebdavFixFilter extends Gen
return location.toString();
}
- private void log(String msg) {
- StringBuilder builder = new StringBuilder(LOG_MESSAGE_PREAMBLE);
- builder.append(msg);
- getServletContext().log(builder.toString());
- }
}
Modified: tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java?rev=1848561&r1=1848560&r2=1848561&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java Mon
Dec 10 10:57:08 2018
@@ -134,7 +134,7 @@ public final class HTMLManagerServlet ex
doSessions(cn, request, response, smClient);
return;
} catch (Exception e) {
- log("HTMLManagerServlet.sessions[" + cn + "]", e);
+ log(sm.getString("htmlManagerServlet.error.sessions", cn), e);
message = smClient.getString("managerServlet.exception",
e.toString());
}
@@ -827,7 +827,7 @@ public final class HTMLManagerServlet ex
try {
idle = Integer.parseInt(idleParam);
} catch (NumberFormatException e) {
- log("Could not parse idle parameter to an int: " + idleParam);
+ log(sm.getString("managerServlet.error.idleParam", idleParam));
}
}
return sessions(cn, idle, smClient);
@@ -958,7 +958,7 @@ public final class HTMLManagerServlet ex
req.setAttribute(APPLICATION_ERROR, "Can't sort session
list: one session is invalidated");
}
} else {
- log("WARNING: unknown sort order: " + sortBy);
+ log(sm.getString("htmlManagerServlet.error.sortOrder",
sortBy));
}
}
// keep sort order
@@ -1021,7 +1021,7 @@ public final class HTMLManagerServlet ex
if (null == session) {
// Shouldn't happen, but let's play nice...
if (debug >= 1) {
- log("WARNING: can't invalidate null session " + sessionId);
+ log("Cannot invalidate null session " + sessionId);
}
continue;
}
@@ -1033,7 +1033,7 @@ public final class HTMLManagerServlet ex
}
} catch (IllegalStateException ise) {
if (debug >= 1) {
- log("Can't invalidate already invalidated session id " +
sessionId);
+ log("Cannot invalidate already invalidated session id " +
sessionId);
}
}
}
@@ -1056,7 +1056,7 @@ public final class HTMLManagerServlet ex
if (null == session) {
// Shouldn't happen, but let's play nice...
if (debug >= 1) {
- log("WARNING: can't remove attribute '" + attributeName + "'
for null session " + sessionId);
+ log("Cannot remove attribute '" + attributeName + "' for null
session " + sessionId);
}
return false;
}
@@ -1065,7 +1065,7 @@ public final class HTMLManagerServlet ex
session.removeAttribute(attributeName);
} catch (IllegalStateException ise) {
if (debug >= 1) {
- log("Can't remote attribute '" + attributeName + "' for
invalidated session id " + sessionId);
+ log("Cannot remote attribute '" + attributeName + "' for
invalidated session id " + sessionId);
}
}
return wasPresent;
Modified: tomcat/trunk/java/org/apache/catalina/manager/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/LocalStrings.properties?rev=1848561&r1=1848560&r2=1848561&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/LocalStrings.properties
[UTF-8] (original)
+++ tomcat/trunk/java/org/apache/catalina/manager/LocalStrings.properties
[UTF-8] Mon Dec 10 10:57:08 2018
@@ -73,6 +73,9 @@ htmlManagerServlet.diagnosticsSslConnect
htmlManagerServlet.diagnosticsSslConnectorTrustedCertsButton=Trusted
Certificates
htmlManagerServlet.diagnosticsSslConnectorTrustedCertsText=List the configured
TLS virtual hosts and the trusted certificates for each.
htmlManagerServlet.diagnosticsTitle=Diagnostics
+htmlManagerServlet.error.idleParam=Could not parse integer idle parameter [{0}]
+htmlManagerServlet.error.sessions=Error processing sessions command for
context [{0}]
+htmlManagerServlet.error.sortOrder=Unknown sort order [{0}]
htmlManagerServlet.expire.explain=with idle ≥
htmlManagerServlet.expire.unit=minutes
htmlManagerServlet.findleaksList=The following web applications were stopped
(reloaded, undeployed), but their\n\
@@ -122,6 +125,17 @@ managerServlet.deleteFail=FAIL - Unable
managerServlet.deployFailed=FAIL - Failed to deploy application at context
path [{0}]
managerServlet.deployed=OK - Deployed application at context path [{0}]
managerServlet.deployedButNotStarted=FAIL - Deployed application at context
path [{0}] but context failed to start
+managerServlet.error.deploy=Error deploying [{0}]
+managerServlet.error.idleParam=Could not parse integer idle parameter [{0}]
+managerServlet.error.reload=Error reloading [{0}]
+managerServlet.error.resources=Error displaying resources of type [{0}]
+managerServlet.error.serverInfo=Error displaying server information
+managerServlet.error.sessions=Error displaying sessions information for
context [{0}]
+managerServlet.error.start=Error starting [{0}]
+managerServlet.error.stop=Error stopping [{0}]
+managerServlet.error.storeConfig=Error storing configuration
+managerServlet.error.storeContextConfig=Error storing configuration for
context [{0}]
+managerServlet.error.undeploy=Error undeploying [{0}]
managerServlet.exception=FAIL - Encountered exception [{0}]
managerServlet.findleaksFail=FAIL - Find leaks failed: Host not instance of
StandardHost
managerServlet.findleaksList=OK - Found potential memory leaks in the
following applications:
@@ -149,6 +163,13 @@ managerServlet.resourcesType=OK - Listed
managerServlet.saveFail=FAIL - Configuration save failed: [{0}]
managerServlet.saved=OK - Server configuration saved
managerServlet.savedContext=OK - Context [{0}] configuration saved
+managerServlet.serverInfo=OK - Server info\n\
+Tomcat Version: [{0}]\n\
+OS Name: [{1}]\n\
+OS Version: [{2}]\n\
+OS Architecture: [{3}]\n\
+JVM Version: [{4}]\n\
+JVM Vendor: [{5}]
managerServlet.sessiondefaultmax=Default maximum session inactive interval
[{0}] minutes
managerServlet.sessions=OK - Session information for application at context
path [{0}]
managerServlet.sessiontimeout=[{0}] minutes: [{1}] sessions
Modified: tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java?rev=1848561&r1=1848560&r2=1848561&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java Mon Dec
10 10:57:08 2018
@@ -693,7 +693,7 @@ public class ManagerServlet extends Http
mBeanServer.invoke(storeConfigOname, "storeConfig", null,
null);
writer.println(smClient.getString("managerServlet.saved"));
} catch (Exception e) {
- log("managerServlet.storeConfig", e);
+ log(sm.getString("managerServlet.error.storeConfig"), e);
writer.println(smClient.getString("managerServlet.exception",
e.toString()));
}
@@ -715,7 +715,7 @@ public class ManagerServlet extends Http
writer.println(smClient.getString("managerServlet.savedContext",
path));
} catch (Exception e) {
- log("managerServlet.save[" + path + "]", e);
+ log(sm.getString("managerServlet.error.storeContextConfig",
path), e);
writer.println(smClient.getString("managerServlet.exception",
e.toString()));
}
@@ -848,7 +848,7 @@ public class ManagerServlet extends Http
}
}
} catch (Exception e) {
- log("managerServlet.check[" + displayPath + "]", e);
+ log(sm.getString("managerServlet.error.deploy", displayPath), e);
writer.println(smClient.getString("managerServlet.exception",
e.toString()));
return;
@@ -906,7 +906,7 @@ public class ManagerServlet extends Http
}
}
} catch (Exception e) {
- log("managerServlet.check[" + displayPath + "]", e);
+ log(sm.getString("managerServlet.error.deploy", displayPath), e);
writer.println(smClient.getString("managerServlet.exception",
e.toString()));
return;
@@ -1023,7 +1023,7 @@ public class ManagerServlet extends Http
writeDeployResult(writer, smClient, name, displayPath);
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
- log("ManagerServlet.install[" + displayPath + "]", t);
+ log(sm.getString("managerServlet.error.deploy", displayPath), t);
writer.println(smClient.getString("managerServlet.exception",
t.toString()));
}
@@ -1122,7 +1122,7 @@ public class ManagerServlet extends Http
cn.getDisplayName()));
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
- log("ManagerServlet.reload[" + cn.getDisplayName() + "]", t);
+ log(sm.getString("managerServlet.error.reload",
cn.getDisplayName()), t);
writer.println(smClient.getString("managerServlet.exception",
t.toString()));
}
@@ -1170,7 +1170,7 @@ public class ManagerServlet extends Http
}
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
- log("ManagerServlet.resources[" + type + "]", t);
+ log(sm.getString("managerServlet.error.resources", type), t);
writer.println(smClient.getString("managerServlet.exception",
t.toString()));
return;
@@ -1220,7 +1220,7 @@ public class ManagerServlet extends Http
}
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
- log("ManagerServlet.resources[" + type + "]", t);
+ log(sm.getString("managerServlet.error.resources", type), t);
writer.println(smClient.getString("managerServlet.exception",
t.toString()));
}
@@ -1237,24 +1237,12 @@ public class ManagerServlet extends Http
if (debug >= 1)
log("serverinfo");
try {
- StringBuilder props = new StringBuilder();
- props.append("OK - Server info");
- props.append("\nTomcat Version: ");
- props.append(ServerInfo.getServerInfo());
- props.append("\nOS Name: ");
- props.append(System.getProperty("os.name"));
- props.append("\nOS Version: ");
- props.append(System.getProperty("os.version"));
- props.append("\nOS Architecture: ");
- props.append(System.getProperty("os.arch"));
- props.append("\nJVM Version: ");
- props.append(System.getProperty("java.runtime.version"));
- props.append("\nJVM Vendor: ");
- props.append(System.getProperty("java.vm.vendor"));
- writer.println(props.toString());
+ writer.println(sm.getString("managerServlet.serverInfo",
ServerInfo.getServerInfo(),
+ System.getProperty("os.name"),
System.getProperty("os.version"), System.getProperty("os.arch"),
+ System.getProperty("java.runtime.version"),
System.getProperty("java.vm.vendor")));
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
- getServletContext().log("ManagerServlet.serverinfo",t);
+ log(sm.getString("managerServlet.error.serverInfo"), t);
writer.println(smClient.getString("managerServlet.exception",
t.toString()));
}
@@ -1362,7 +1350,7 @@ public class ManagerServlet extends Http
">" + idle,"" + expired));
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
- log("ManagerServlet.sessions[" + displayPath + "]", t);
+ log(sm.getString("managerServlet.error.sessions", displayPath), t);
writer.println(smClient.getString("managerServlet.exception",
t.toString()));
}
@@ -1386,7 +1374,7 @@ public class ManagerServlet extends Http
try {
idle = Integer.parseInt(idleParam);
} catch (NumberFormatException e) {
- log("Could not parse idle parameter to an int: " + idleParam);
+ log(sm.getString("managerServlet.error.idleParam", idleParam));
}
}
sessions(writer, cn, idle, smClient);
@@ -1427,8 +1415,7 @@ public class ManagerServlet extends Http
displayPath));
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
- getServletContext().log(sm.getString("managerServlet.startFailed",
- displayPath), t);
+ log(sm.getString("managerServlet.error.start", displayPath), t);
writer.println(smClient.getString("managerServlet.startFailed",
displayPath));
writer.println(smClient.getString("managerServlet.exception",
@@ -1474,7 +1461,7 @@ public class ManagerServlet extends Http
"managerServlet.stopped", displayPath));
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
- log("ManagerServlet.stop[" + displayPath + "]", t);
+ log(sm.getString("managerServlet.error.stop", displayPath), t);
writer.println(smClient.getString("managerServlet.exception",
t.toString()));
}
@@ -1556,7 +1543,7 @@ public class ManagerServlet extends Http
displayPath));
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
- log("ManagerServlet.undeploy[" + displayPath + "]", t);
+ log(sm.getString("managerServlet.error.undeploy", displayPath), t);
writer.println(smClient.getString("managerServlet.exception",
t.toString()));
}
Added: tomcat/trunk/java/org/apache/catalina/ssi/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ssi/LocalStrings.properties?rev=1848561&view=auto
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ssi/LocalStrings.properties (added)
+++ tomcat/trunk/java/org/apache/catalina/ssi/LocalStrings.properties Mon Dec
10 10:57:08 2018
@@ -0,0 +1,16 @@
+# 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.
+
+
Propchange: tomcat/trunk/java/org/apache/catalina/ssi/LocalStrings.properties
------------------------------------------------------------------------------
svn:eol-style = native
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
