Author: remm
Date: Thu Dec 6 19:45:54 2018
New Revision: 1848351
URL: http://svn.apache.org/viewvc?rev=1848351&view=rev
Log:
Add i18n for more package.
Modified:
tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java
tomcat/trunk/java/org/apache/catalina/filters/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java
tomcat/trunk/java/org/apache/catalina/manager/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java
tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TwoPhaseCommitInterceptor.java
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
tomcat/trunk/java/org/apache/catalina/webresources/JarWarResourceSet.java
tomcat/trunk/java/org/apache/catalina/webresources/LocalStrings.properties
Modified: tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java?rev=1848351&r1=1848350&r2=1848351&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java Thu Dec
6 19:45:54 2018
@@ -133,7 +133,7 @@ public class CoyoteAdapter implements Ad
Response response = (Response) res.getNote(ADAPTER_NOTES);
if (request == null) {
- throw new IllegalStateException("Dispatch may only happen on an
existing request.");
+ throw new
IllegalStateException(sm.getString("coyoteAdapter.nullRequest"));
}
boolean success = true;
Modified:
tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties?rev=1848351&r1=1848350&r2=1848351&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties
[UTF-8] (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties
[UTF-8] Thu Dec 6 19:45:54 2018
@@ -20,6 +20,7 @@ coyoteAdapter.authorize=Authorizing user
coyoteAdapter.checkRecycled.request=Encountered a non-recycled request and
recycled it forcedly.
coyoteAdapter.checkRecycled.response=Encountered a non-recycled response and
recycled it forcedly.
coyoteAdapter.debug=The variable [{0}] has value [{1}]
+coyoteAdapter.nullRequest=An asynchronous dispatch may only happen on an
existing request
coyoteAdapter.parsePathParam=Unable to parse the path parameters using
encoding [{0}]. The path parameters in the URL will be ignored.
coyoteConnector.invalidEncoding=The encoding [{0}] is not recognised by the
JRE. The Connector will continue to use [{1}]
Modified: tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java?rev=1848351&r1=1848350&r2=1848351&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java Thu Dec 6
19:45:54 2018
@@ -1021,7 +1021,6 @@ public class ExpiresFilter extends Filte
*/
@Override
public boolean isReady() {
- // TODO Auto-generated method stub
return false;
}
@@ -1030,12 +1029,8 @@ public class ExpiresFilter extends Filte
*/
@Override
public void setWriteListener(WriteListener listener) {
- // TODO Auto-generated method stub
-
}
-
-
}
/**
@@ -1076,9 +1071,7 @@ public class ExpiresFilter extends Filte
try {
ints[i] = Integer.parseInt(intAsString);
} catch (NumberFormatException e) {
- throw new RuntimeException("Exception parsing number '" + i +
- "' (zero based) of comma delimited list '" +
- commaDelimitedInts + "'");
+ throw new
RuntimeException(sm.getString("expiresFilter.numberError", i,
commaDelimitedInts));
}
}
return ints;
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=1848351&r1=1848350&r2=1848351&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] Thu Dec 6 19:45:54 2018
@@ -34,6 +34,7 @@ expiresFilter.noDurationFound=Duration n
expiresFilter.noDurationUnitAfterAmount=Duration unit not found after amount
[{0}] in directive [{1}]
expiresFilter.noExpirationConfigured=Request [{0}] with response status [{1}]
content-type [{2}], no expiration configured
expiresFilter.noExpirationConfiguredForContentType=No Expires configuration
found for content-type [{0}]
+expiresFilter.numberError=Exception parsing number [{0}] (zero based) of comma
delimited list [{1}]
expiresFilter.responseAlreadyCommited=Request [{0}], cannot apply
ExpiresFilter on already committed response.
expiresFilter.setExpirationDate=Request [{0}] with response status [{1}]
content-type [{2}], set expiration date [{3}]
expiresFilter.skippedStatusCode=Request [{0}] with response status [{1}]
content-type [{1}], skip expiration header generation for given status
@@ -54,6 +55,8 @@ httpHeaderSecurityFilter.committed=Unabl
remoteCidrFilter.invalid=Invalid configuration provided for [{0}]. See
previous messages for details.
remoteCidrFilter.noRemoteIp=Client does not have an IP address. Request denied.
+remoteIpFilter.invalidNumber=Illegal number for parameter [{0}]: [{1}]
+
requestFilter.deny=Denied request for [{0}] based on property [{1}]
restCsrfPreventionFilter.invalidNonce=CSRF nonce validation failed
Modified: tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java?rev=1848351&r1=1848350&r2=1848351&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java Thu Dec
6 19:45:54 2018
@@ -45,6 +45,7 @@ import org.apache.catalina.util.RequestU
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.http.FastHttpDateFormat;
+import org.apache.tomcat.util.res.StringManager;
/**
* <p>
@@ -633,6 +634,7 @@ public class RemoteIpFilter extends Gene
// Log must be non-static as loggers are created per class-loader and this
// Filter may be used in multiple class loaders
private transient Log log = LogFactory.getLog(RemoteIpFilter.class);
+ protected static final StringManager sm =
StringManager.getManager(RemoteIpFilter.class);
protected static final String PROTOCOL_HEADER_PARAMETER = "protocolHeader";
@@ -986,7 +988,7 @@ public class RemoteIpFilter extends Gene
try {
setHttpServerPort(Integer.parseInt(getInitParameter(HTTP_SERVER_PORT_PARAMETER)));
} catch (NumberFormatException e) {
- throw new NumberFormatException("Illegal " +
HTTP_SERVER_PORT_PARAMETER + " : " + e.getMessage());
+ throw new
NumberFormatException(sm.getString("remoteIpFilter.invalidNumber",
HTTP_SERVER_PORT_PARAMETER, e.getLocalizedMessage()));
}
}
@@ -994,7 +996,7 @@ public class RemoteIpFilter extends Gene
try {
setHttpsServerPort(Integer.parseInt(getInitParameter(HTTPS_SERVER_PORT_PARAMETER)));
} catch (NumberFormatException e) {
- throw new NumberFormatException("Illegal " +
HTTPS_SERVER_PORT_PARAMETER + " : " + e.getMessage());
+ throw new
NumberFormatException(sm.getString("remoteIpFilter.invalidNumber",
HTTPS_SERVER_PORT_PARAMETER, e.getLocalizedMessage()));
}
}
}
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=1848351&r1=1848350&r2=1848351&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] Thu Dec 6 19:45:54 2018
@@ -117,6 +117,7 @@ htmlManagerServlet.title=Tomcat Web Appl
managerServlet.alreadyContext=FAIL - Application already exists at path [{0}]
managerServlet.certsNotAvailable=Certificate information cannot be obtained
from this connector at runtime
+managerServlet.copyError=Could not copy configuration file from path [{0}]
managerServlet.deleteFail=FAIL - Unable to delete [{0}]. The continued
presence of this file may cause problems.
managerServlet.deployFailed=FAIL - Failed to deploy application at context
path [{0}]
managerServlet.deployed=OK - Deployed application at context path [{0}]
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=1848351&r1=1848350&r2=1848351&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java Thu Dec
6 19:45:54 2018
@@ -819,8 +819,7 @@ public class ManagerServlet extends Http
}
if (ExpandWar.copy(new File(config),
new File(configBase, baseName + ".xml")) ==
false) {
- throw new Exception("Could not copy config file
from path '" +
- config + "'");
+ throw new
Exception(sm.getString("managerServlet.copyError", config));
}
}
// Upload WAR
Modified: tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java?rev=1848351&r1=1848350&r2=1848351&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java Thu Dec
6 19:45:54 2018
@@ -335,7 +335,7 @@ public class DefaultServlet extends Http
Globals.RESOURCES_ATTR);
if (resources == null) {
- throw new UnavailableException("No resources");
+ throw new
UnavailableException(sm.getString("defaultServlet.noResources"));
}
if (getServletConfig().getInitParameter("showServerInfo") != null) {
@@ -1670,7 +1670,7 @@ public class DefaultServlet extends Http
osWriter.flush();
return new ByteArrayInputStream(stream.toByteArray());
} catch (TransformerException e) {
- throw new ServletException("XSL transformer error", e);
+ throw new
ServletException(sm.getString("defaultServlet.xslError"), e);
} finally {
if (Globals.IS_SECURITY_ENABLED) {
PrivilegedSetTccl pa = new PrivilegedSetTccl(original);
@@ -1874,7 +1874,7 @@ public class DefaultServlet extends Http
}
copyRange(reader, new PrintWriter(buffer));
} catch (IOException e) {
- log("Failure to close reader", e);
+ log(sm.getString("defaultServlet.readerCloseFailed"), e);
} finally {
if (reader != null) {
try {
Modified: tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings.properties?rev=1848351&r1=1848350&r2=1848351&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings.properties
[UTF-8] (original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings.properties
[UTF-8] Thu Dec 6 19:45:54 2018
@@ -37,6 +37,9 @@ defaultServlet.blockExternalEntity=Block
defaultServlet.blockExternalEntity2=Blocked access to external entity with
name [{0}], publicId [{1}], baseURI [{2}] and systemId [{3}]
defaultServlet.blockExternalSubset=Blocked access to external subset with name
[{0}] and baseURI [{1}]
defaultServlet.missingResource=The requested resource [{0}] is not available
+defaultServlet.noResources=No static resources were found
+defaultServlet.readerCloseFailed=Failed to close reader
+defaultServlet.xslError=XSL transformer error
defaultservlet.skipfail=Only skipped [{0}] bytes when [{1}] were requested
Modified: tomcat/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java?rev=1848351&r1=1848350&r2=1848351&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java Thu
Dec 6 19:45:54 2018
@@ -354,7 +354,7 @@ public class GroupChannel extends Channe
//this could be the channel listener throwing an exception, we
should log it
//as a warning.
if ( log.isWarnEnabled() )
log.warn(sm.getString("groupChannel.receiving.error"),x);
- throw new RemoteProcessException("Exception:"+x.getMessage(),x);
+ throw new
RemoteProcessException(sm.getString("groupChannel.receiving.error"),x);
}
}
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/LocalStrings.properties?rev=1848351&r1=1848350&r2=1848351&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/LocalStrings.properties
[UTF-8] (original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/LocalStrings.properties
[UTF-8] Thu Dec 6 19:45:54 2018
@@ -57,6 +57,14 @@ nonBlockingCoordinator.memberAdded.faile
nonBlockingCoordinator.memberAlive.failed=Unable to perform member alive
check, assuming member down.
nonBlockingCoordinator.memberDisappeared.failed=Unable to start election when
member was removed.
nonBlockingCoordinator.processCoordinationMessage.failed=Error processing
coordination message. Could be fatal.
+nonBlockingCoordinator.report=CoordinationEvent[type={0}\n\
+\tLocal: {1}\n\
+\tCoord: {2}\n\
+\tView: {3}\n\
+\tSuggested View: {4}\n\
+\tMembers: {5}\n\
+\tInfo: {6}\n\
+]
orderInterceptor.messageAdded.sameCounter=Message added has the same counter,
synchronization bug. Disable the order interceptor
@@ -90,5 +98,6 @@ throughputInterceptor.report=ThroughputI
\tRx Speed:{8} MB/sec (since 1st msg)\n\
\tReceived:{9} MB]\n
+twoPhaseCommitInterceptor.expiredMessage=Removing expired message [{0}]
twoPhaseCommitInterceptor.heartbeat.failed=Unable to perform heartbeat on the
TwoPhaseCommit interceptor.
twoPhaseCommitInterceptor.originalMessage.missing=Received a confirmation, but
original message is missing. Id:[{0}]
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java?rev=1848351&r1=1848350&r2=1848351&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java
Thu Dec 6 19:45:54 2018
@@ -763,8 +763,9 @@ public class NonBlockingCoordinator exte
@Override
public void fireInterceptorEvent(InterceptorEvent event) {
if (event instanceof CoordinationEvent &&
- ((CoordinationEvent)event).type == CoordinationEvent.EVT_CONF_RX)
+ ((CoordinationEvent)event).type == CoordinationEvent.EVT_CONF_RX) {
log.info(event);
+ }
}
public static class CoordinationEvent implements InterceptorEvent {
@@ -831,16 +832,12 @@ public class NonBlockingCoordinator exte
@Override
public String toString() {
- StringBuilder buf = new StringBuilder("CoordinationEvent[type=");
- buf.append(type).append("\n\tLocal:");
Member local = interceptor.getLocalMember(false);
- buf.append(local!=null?local.getName():"").append("\n\tCoord:");
- buf.append(coord!=null?coord.getName():"").append("\n\tView:");
-
buf.append(Arrays.toNameString(view!=null?view.getMembers():null)).append("\n\tSuggested
View:");
-
buf.append(Arrays.toNameString(suggestedView!=null?suggestedView.getMembers():null)).append("\n\tMembers:");
- buf.append(Arrays.toNameString(mbrs)).append("\n\tInfo:");
- buf.append(info).append("]");
- return buf.toString();
+ return sm.getString("nonBlockingCoordinator.report", type, (local
!= null ? local.getName() : ""),
+ (coord != null ? coord.getName() : ""),
+ Arrays.toNameString(view != null ? view.getMembers() :
null),
+ Arrays.toNameString(suggestedView != null ?
suggestedView.getMembers() : null),
+ Arrays.toNameString(mbrs), info);
}
}
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TwoPhaseCommitInterceptor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TwoPhaseCommitInterceptor.java?rev=1848351&r1=1848350&r2=1848351&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TwoPhaseCommitInterceptor.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TwoPhaseCommitInterceptor.java
Thu Dec 6 19:45:54 2018
@@ -115,10 +115,9 @@ public class TwoPhaseCommitInterceptor e
for (int i=0; i<entries.length; i++ ) {
MapEntry entry = entries[i].getValue();
if ( entry.expired(now,expire) ) {
- if(log.isInfoEnabled())
- log.info("Message ["+entry.id+"] has expired.
Removing.");
+
log.info(sm.getString("twoPhaseCommitInterceptor.expiredMessage", entry.id));
messages.remove(entry.id);
- }//end if
+ }
}
} catch ( Exception x ) {
log.warn(sm.getString("twoPhaseCommitInterceptor.heartbeat.failed"),x);
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/LocalStrings.properties?rev=1848351&r1=1848350&r2=1848351&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/LocalStrings.properties
[UTF-8] (original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/LocalStrings.properties
[UTF-8] Thu Dec 6 19:45:54 2018
@@ -16,6 +16,7 @@
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.eventsError=Error processing events
nioReceiver.requestError=Unable to process request in NioReceiver
nioReceiver.run.fail=Unable to run replication listener
nioReceiver.start.fail=Unable to start cluster receiver
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java?rev=1848351&r1=1848350&r2=1848351&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
Thu Dec 6 19:45:54 2018
@@ -169,7 +169,7 @@ public class NioReceiver extends Receive
}
r.run();
} catch (Exception x) {
- log.error("", x);
+ log.error(sm.getString("nioReceiver.eventsError"), x);
}
}
}
Modified:
tomcat/trunk/java/org/apache/catalina/webresources/JarWarResourceSet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/JarWarResourceSet.java?rev=1848351&r1=1848350&r2=1848351&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/webresources/JarWarResourceSet.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/webresources/JarWarResourceSet.java
Thu Dec 6 19:45:54 2018
@@ -222,7 +222,7 @@ public class JarWarResourceSet extends A
*/
@Override
protected JarEntry getArchiveEntry(String pathInArchive) {
- throw new IllegalStateException("Coding error");
+ throw new
IllegalStateException(sm.getString("JarWarResourceSet.codingError"));
}
Modified:
tomcat/trunk/java/org/apache/catalina/webresources/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/LocalStrings.properties?rev=1848351&r1=1848350&r2=1848351&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/webresources/LocalStrings.properties
[UTF-8] (original)
+++ tomcat/trunk/java/org/apache/catalina/webresources/LocalStrings.properties
[UTF-8] Thu Dec 6 19:45:54 2018
@@ -45,6 +45,8 @@ jarResource.getUrlFail=Unable to determi
jarResourceRoot.invalidWebAppPath=This resource always refers to a directory
so the supplied webAppPath must end with / but the provided webAppPath was [{0}]
+JarWarResourceSet.codingError=Coding error
+
standardRoot.checkStateNotStarted=The resources may not be accessed if they
are not currently started
standardRoot.createInvalidFile=Unable to create WebResourceSet from [{0}]
standardRoot.createNoFileResourceSet=The FileResourceSet feature has not yet
been implemented
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
