You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2018/11/12 11:16:40 UTC

svn commit: r1846398 [2/5] - in /tomcat/trunk: java/javax/el/ java/javax/servlet/ java/javax/servlet/http/ java/org/apache/catalina/authenticator/ java/org/apache/catalina/authenticator/jaspic/ java/org/apache/catalina/connector/ java/org/apache/catali...

Modified: tomcat/trunk/java/org/apache/catalina/manager/host/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/host/LocalStrings.properties?rev=1846398&r1=1846397&r2=1846398&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/host/LocalStrings.properties [UTF-8] (original)
+++ tomcat/trunk/java/org/apache/catalina/manager/host/LocalStrings.properties [UTF-8] Mon Nov 12 11:16:39 2018
@@ -13,79 +13,77 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+hostManagerServlet.add=add: Adding host [{0}]
+hostManagerServlet.addFailed=FAIL - Failed to add host [{0}]
+hostManagerServlet.alreadyHost=FAIL - Host already exists with host name [{0}]
 hostManagerServlet.alreadyStarted=FAIL - Host [{0}] is already started
 hostManagerServlet.alreadyStopped=FAIL - Host [{0}] is already stopped
 hostManagerServlet.appBaseCreateFail=FAIL - Failed to create appBase [{0}] for host [{1}]
+hostManagerServlet.cannotRemoveOwnHost=FAIL - Cannot remove own host [{0}]
+hostManagerServlet.cannotStartOwnHost=FAIL - Cannot start own host [{0}]
+hostManagerServlet.cannotStopOwnHost=FAIL - Cannot stop own host [{0}]
 hostManagerServlet.configBaseCreateFail=FAIL - Failed to identify configBase for host [{0}]
-hostManagerServlet.noCommand=FAIL - No command was specified
-hostManagerServlet.postCommand=FAIL - Tried to use command [{0}] via a GET request but POST is required
-hostManagerServlet.unknownCommand=FAIL - Unknown command [{0}]
-hostManagerServlet.noWrapper=Container has not called setWrapper() for this servlet
-hostManagerServlet.invalidHostName=FAIL - Invalid host name [{0}] was specified
-hostManagerServlet.noHost=FAIL - Host name [{0}] does not exist
-hostManagerServlet.alreadyHost=FAIL - Host already exists with host name [{0}]
-hostManagerServlet.managerXml=FAIL - Couldn't install manager.xml
 hostManagerServlet.exception=FAIL - Encountered exception [{0}]
-hostManagerServlet.add=OK - Host [{0}] added
-hostManagerServlet.addFailed=FAIL - Failed to add host [{0}]
-hostManagerServlet.cannotRemoveOwnHost=FAIL - Cannot remove own host [{0}]
-hostManagerServlet.remove=OK - Removed host [{0}]
-hostManagerServlet.removeFailed=FAIL - Failed to remove host [{0}]
+hostManagerServlet.invalidHostName=FAIL - Invalid host name [{0}] was specified
+hostManagerServlet.list=list: Listing hosts for engine [{0}]
 hostManagerServlet.listed=OK - Listed hosts
 hostManagerServlet.listitem=[{0}]:[{1}]
-hostManagerServlet.cannotStartOwnHost=FAIL - Cannot start own host [{0}]
-hostManagerServlet.started=OK - Host [{0}] started
-hostManagerServlet.startFailed=FAIL - Failed to start host [{0}]
-hostManagerServlet.cannotStopOwnHost=FAIL - Cannot stop own host [{0}]
-hostManagerServlet.stopped=OK - Host [{0}] stopped
-hostManagerServlet.stopFailed=FAIL - Failed to stop host [{0}]
-hostManagerServlet.add=add: Adding host [{0}]
+hostManagerServlet.managerXml=FAIL - Couldn't install manager.xml
+hostManagerServlet.noCommand=FAIL - No command was specified
+hostManagerServlet.noHost=FAIL - Host name [{0}] does not exist
+hostManagerServlet.noWrapper=Container has not called setWrapper() for this servlet
+hostManagerServlet.persist=persist: Persisting current configuration
+hostManagerServlet.persistFailed=FAIL - Failed to persist configuration
+hostManagerServlet.persisted=OK - Configuration persisted
+hostManagerServlet.postCommand=FAIL - Tried to use command [{0}] via a GET request but POST is required
 hostManagerServlet.remove=remove: Removing host [{0}]
-hostManagerServlet.list=list: Listing hosts for engine [{0}]
+hostManagerServlet.removeFailed=FAIL - Failed to remove host [{0}]
 hostManagerServlet.start=start: Starting host with name [{0}]
+hostManagerServlet.startFailed=FAIL - Failed to start host [{0}]
+hostManagerServlet.started=OK - Host [{0}] started
 hostManagerServlet.stop=stop: Stopping host with name [{0}]
-hostManagerServlet.persist=persist: Persisting current configuration
-hostManagerServlet.persisted=OK - Configuration persisted
-hostManagerServlet.persistFailed=FAIL - Failed to persist configuration
+hostManagerServlet.stopFailed=FAIL - Failed to stop host [{0}]
+hostManagerServlet.stopped=OK - Host [{0}] stopped
+hostManagerServlet.unknownCommand=FAIL - Unknown command [{0}]
 
-htmlHostManagerServlet.title=Tomcat Virtual Host Manager
-htmlHostManagerServlet.messageLabel=Message:
-htmlHostManagerServlet.manager=Host Manager
-htmlHostManagerServlet.list=List Virtual Hosts
-htmlHostManagerServlet.helpHtmlManagerFile=../docs/html-host-manager-howto.html
-htmlHostManagerServlet.helpHtmlManager=HTML Host Manager Help
-htmlHostManagerServlet.helpManagerFile=../docs/host-manager-howto.html
-htmlHostManagerServlet.helpManager=Host Manager Help
-htmlHostManagerServlet.hostName=Host name
-htmlHostManagerServlet.hostAliases=Host aliases
-htmlHostManagerServlet.hostTasks=Commands
-htmlHostManagerServlet.hostsStart=Start
-htmlHostManagerServlet.hostsStop=Stop
-htmlHostManagerServlet.hostsRemove=Remove
-htmlHostManagerServlet.hostsPersist=Persist
-htmlHostManagerServlet.hostThis=Host Manager installed - commands disabled
-htmlHostManagerServlet.addTitle=Add Virtual Host
-htmlHostManagerServlet.addHost=Host
-htmlHostManagerServlet.addName=Name:
 htmlHostManagerServlet.addAliases=Aliases:
 htmlHostManagerServlet.addAppBase=App base:
-htmlHostManagerServlet.addManager=Manager App
 htmlHostManagerServlet.addAutoDeploy=AutoDeploy
+htmlHostManagerServlet.addButton=Add
+htmlHostManagerServlet.addCopyXML=CopyXML
 htmlHostManagerServlet.addDeployOnStartup=DeployOnStartup
 htmlHostManagerServlet.addDeployXML=DeployXML
+htmlHostManagerServlet.addHost=Host
+htmlHostManagerServlet.addManager=Manager App
+htmlHostManagerServlet.addName=Name:
+htmlHostManagerServlet.addTitle=Add Virtual Host
 htmlHostManagerServlet.addUnpackWARs=UnpackWARs
-htmlHostManagerServlet.addCopyXML=CopyXML
-htmlHostManagerServlet.addButton=Add
-htmlHostManagerServlet.serverTitle=Server Information
-htmlHostManagerServlet.serverVersion=Tomcat Version
-htmlHostManagerServlet.serverJVMVersion=JVM Version
+htmlHostManagerServlet.helpHtmlManager=HTML Host Manager Help
+htmlHostManagerServlet.helpHtmlManagerFile=../docs/html-host-manager-howto.html
+htmlHostManagerServlet.helpManager=Host Manager Help
+htmlHostManagerServlet.helpManagerFile=../docs/host-manager-howto.html
+htmlHostManagerServlet.hostAliases=Host aliases
+htmlHostManagerServlet.hostName=Host name
+htmlHostManagerServlet.hostTasks=Commands
+htmlHostManagerServlet.hostThis=Host Manager installed - commands disabled
+htmlHostManagerServlet.hostsPersist=Persist
+htmlHostManagerServlet.hostsRemove=Remove
+htmlHostManagerServlet.hostsStart=Start
+htmlHostManagerServlet.hostsStop=Stop
+htmlHostManagerServlet.list=List Virtual Hosts
+htmlHostManagerServlet.manager=Host Manager
+htmlHostManagerServlet.messageLabel=Message:
+htmlHostManagerServlet.persistAll=Save current configuration (including virtual hosts) to server.xml and per web application context.xml files
+htmlHostManagerServlet.persistAllButton=All
+htmlHostManagerServlet.persistTitle=Persist configuration
 htmlHostManagerServlet.serverJVMVendor=JVM Vendor
+htmlHostManagerServlet.serverJVMVersion=JVM Version
+htmlHostManagerServlet.serverOSArch=OS Architecture
 htmlHostManagerServlet.serverOSName=OS Name
 htmlHostManagerServlet.serverOSVersion=OS Version
-htmlHostManagerServlet.serverOSArch=OS Architecture
-htmlHostManagerServlet.persistTitle=Persist configuration
-htmlHostManagerServlet.persistAll=Save current configuration (including virtual hosts) to server.xml and per web application context.xml files
-htmlHostManagerServlet.persistAllButton=All
+htmlHostManagerServlet.serverTitle=Server Information
+htmlHostManagerServlet.serverVersion=Tomcat Version
+htmlHostManagerServlet.title=Tomcat Virtual Host Manager
 
-statusServlet.title=Server Status
 statusServlet.complete=Complete Server Status
+statusServlet.title=Server Status

Modified: tomcat/trunk/java/org/apache/catalina/mapper/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mapper/LocalStrings.properties?rev=1846398&r1=1846397&r2=1846398&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/mapper/LocalStrings.properties [UTF-8] (original)
+++ tomcat/trunk/java/org/apache/catalina/mapper/LocalStrings.properties [UTF-8] Mon Nov 12 11:16:39 2018
@@ -13,19 +13,19 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-mapper.addHost.success=Registered host [{0}]
 mapper.addHost.sameHost=Duplicate registration of the same host [{0}]. Ignored.
-mapper.addHostAlias.success=Registered alias [{0}] for host [{1}]
+mapper.addHost.success=Registered host [{0}]
 mapper.addHostAlias.sameHost=Duplicate registration of alias [{0}] for the same host [{1}]. Ignored.
-mapper.removeWrapper=Removing wrapper from Context [{0}] with path [{1}]
+mapper.addHostAlias.success=Registered alias [{0}] for host [{1}]
 mapper.duplicateHost=Duplicate Host [{0}]. The name is already used by Host [{1}]. This Host will be ignored.
 mapper.duplicateHostAlias=Duplicate host Alias [{0}] in Host [{1}]. The name is already used by Host [{2}]. This Alias will be ignored.
+mapper.removeWrapper=Removing wrapper from Context [{0}] with path [{1}]
 
-mapperListener.unknownDefaultHost=Unknown default host [{0}] for service [{1}]. Tomcat will not be able process HTTP/1.0 requests that do not specify a host name.
-mapperListener.registerHost=Register host [{0}] at domain [{1}] for service [{2}]
-mapperListener.unregisterHost=Unregister host [{0}] at domain [{1}] for service [{2}]
-mapperListener.registerContext=Register Context [{0}] for service [{1}]
-mapperListener.unregisterContext=Unregister Context [{0}] for service [{1}]
 mapperListener.pauseContext=Register Context [{0}] as being reloaded for service [{1}]
+mapperListener.registerContext=Register Context [{0}] for service [{1}]
+mapperListener.registerHost=Register host [{0}] at domain [{1}] for service [{2}]
 mapperListener.registerWrapper=Register Wrapper [{0}] in Context [{1}] for service [{2}]
+mapperListener.unknownDefaultHost=Unknown default host [{0}] for service [{1}]. Tomcat will not be able process HTTP/1.0 requests that do not specify a host name.
+mapperListener.unregisterContext=Unregister Context [{0}] for service [{1}]
+mapperListener.unregisterHost=Unregister host [{0}] at domain [{1}] for service [{2}]
 mapperListener.unregisterWrapper=Unregister Wrapper [{0}] in Context [{1}] for service [{2}]

Modified: tomcat/trunk/java/org/apache/catalina/mbeans/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/LocalStrings.properties?rev=1846398&r1=1846397&r2=1846398&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/mbeans/LocalStrings.properties [UTF-8] (original)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/LocalStrings.properties [UTF-8] Mon Nov 12 11:16:39 2018
@@ -16,8 +16,8 @@
 jmxRemoteLifecycleListener.createRegistryFailed=Unable to create the RMI registry for the [{0}] server using port [{1}]
 jmxRemoteLifecycleListener.createServerFailed=The JMX connector server could not be created or failed to start for the [{0}] server
 jmxRemoteLifecycleListener.destroyServerFailed=The JMX connector server could not be stopped for the [{0}] server
+jmxRemoteLifecycleListener.invalidRmiBindAddress=Invalid RMI bind address [{0}]
 jmxRemoteLifecycleListener.invalidURL=The JMX Service URL requested for the [{0}] server, [{1}], was invalid
 jmxRemoteLifecycleListener.start=The JMX Remote Listener has configured the registry on port [{0}] and the server on port [{1}] for the [{2}] server
-jmxRemoteLifecycleListener.invalidRmiBindAddress=Invalid RMI bind address [{0}]
 
 mBeanFactory.managerContext=Manager components may only be added to Contexts.

Modified: tomcat/trunk/java/org/apache/catalina/realm/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/LocalStrings.properties?rev=1846398&r1=1846397&r2=1846398&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/LocalStrings.properties [UTF-8] (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/LocalStrings.properties [UTF-8] Mon Nov 12 11:16:39 2018
@@ -13,36 +13,54 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# language
+combinedRealm.addRealm=Add [{0}] realm, making a total of [{1}] realms
+combinedRealm.authFail=Failed to authenticate user [{0}] with realm [{1}]
+combinedRealm.authStart=Attempting to authenticate user [{0}] with realm [{1}]
+combinedRealm.authSuccess=Authenticated user [{0}] with realm [{1}]
+combinedRealm.getPassword=The getPassword() method should never be called
+combinedRealm.getPrincipal=The getPrincipal() method should never be called
+combinedRealm.realmStartFail=Failed to start [{0}] realm
+combinedRealm.unexpectedMethod=An unexpected call was made to a method on the combined realm
+
+credentialHandler.invalidStoredCredential=The invalid stored credential string [{0}] was provided by the Realm to match with the user provided credentials
+credentialHandler.unableToMutateUserCredential=Failed to mutate user provided credentials. This typically means the CredentialHandler configuration is invalid
+
+dataSourceRealm.authenticateFailure=Username [{0}] NOT successfully authenticated
+dataSourceRealm.authenticateSuccess=Username [{0}] successfully authenticated
+dataSourceRealm.close=Exception closing database connection
+dataSourceRealm.exception=Exception performing authentication
+dataSourceRealm.getPassword.exception=Exception retrieving password for [{0}]
+dataSourceRealm.getRoles.exception=Exception retrieving roles for [{0}]
 
-# package org.apache.catalina.realm
+jaasCallback.username=Returned username [{0}]
 
-jaasRealm.beginLogin=JAASRealm login requested for username [{0}] using LoginContext for application [{1}]
 jaasRealm.accountExpired=Username [{0}] NOT authenticated due to expired account
 jaasRealm.authenticateFailure=Username [{0}] NOT successfully authenticated
 jaasRealm.authenticateSuccess=Username [{0}] successfully authenticated as Principal [{1}] -- Subject was created too
+jaasRealm.beginLogin=JAASRealm login requested for username [{0}] using LoginContext for application [{1}]
+jaasRealm.checkPrincipal=Checking Principal [{0}] [{1}]
 jaasRealm.credentialExpired=Username [{0}] NOT authenticated due to expired credential
 jaasRealm.failedLogin=Username [{0}] NOT authenticated due to failed login
-jaasRealm.loginException=Login exception authenticating username [{0}]
-jaasRealm.unexpectedError=Unexpected error
 jaasRealm.loginContextCreated=JAAS LoginContext created for username [{0}]
-jaasRealm.checkPrincipal=Checking Principal [{0}] [{1}]
-jaasRealm.userPrincipalSuccess=Principal [{0}] is a valid user class. We will use this as the user Principal.
-jaasRealm.userPrincipalFailure=No valid user Principal found
+jaasRealm.loginException=Login exception authenticating username [{0}]
 jaasRealm.rolePrincipalAdd=Adding role Principal [{0}] to this user Principal''s roles
 jaasRealm.rolePrincipalFailure=No valid role Principals found.
-jaasCallback.username=Returned username [{0}]
+jaasRealm.unexpectedError=Unexpected error
+jaasRealm.userPrincipalFailure=No valid user Principal found
+jaasRealm.userPrincipalSuccess=Principal [{0}] is a valid user class. We will use this as the user Principal.
+
 jdbcRealm.authenticateFailure=Username [{0}] NOT successfully authenticated
 jdbcRealm.authenticateSuccess=Username [{0}] successfully authenticated
 jdbcRealm.close=Exception closing database connection
 jdbcRealm.exception=Exception performing authentication
 jdbcRealm.open=Exception opening database connection
 jdbcRealm.open.invalidurl=Driver [{0}] does not support the url [{1}]
+
 jndiRealm.authenticateFailure=Username [{0}] NOT successfully authenticated
 jndiRealm.authenticateSuccess=Username [{0}] successfully authenticated
-jndiRealm.emptyCipherSuites=Empty String for cipher suites given. Using default cipher suites.
 jndiRealm.cipherSuites=Enable [{0}] as cipher suites for tls connection.
 jndiRealm.close=Exception closing directory server connection
+jndiRealm.emptyCipherSuites=Empty String for cipher suites given. Using default cipher suites.
 jndiRealm.exception=Exception performing authentication
 jndiRealm.exception.retry=Exception performing authentication. Retrying...
 jndiRealm.invalidHostnameVerifier=[{0}] not a valid class name for a HostnameVerifier
@@ -51,46 +69,36 @@ jndiRealm.invalidSslSocketFactory=[{0}]
 jndiRealm.negotiatedTls=Negotiated tls connection using protocol [{0}]
 jndiRealm.open=Exception opening directory server connection
 jndiRealm.tlsClose=Exception closing tls response
+
+lockOutRealm.authLockedUser=An attempt was made to authenticate the locked user [{0}]
+lockOutRealm.removeWarning=User [{0}] was removed from the failed users cache after [{1}] seconds to keep the cache size within the limit set
+
+mdCredentialHandler.unknownEncoding=The encoding [{0}] is not supported so the current setting of [{1}] will still be used
+
 memoryRealm.authenticateFailure=Username [{0}] NOT successfully authenticated
 memoryRealm.authenticateSuccess=Username [{0}] successfully authenticated
 memoryRealm.loadExist=Memory database file [{0}] cannot be read
 memoryRealm.loadPath=Loading users from memory database file [{0}]
 memoryRealm.readXml=Exception while reading memory database file
 memoryRealm.xmlFeatureEncoding=Exception configuring digester to permit java encoding names in XML files. Only IANA encoding names will be supported.
+
+pbeCredentialHandler.invalidKeySpec=Unable to generate a password based key
+
 realmBase.algorithm=Invalid message digest algorithm [{0}] specified
-realmBase.delegatedCredentialFail=Unable to obtain delegated credentials for user [{0}]
-realmBase.digest=Error digesting user credentials
-realmBase.forbidden=Access to the requested resource has been denied
-realmBase.hasRoleFailure=Username [{0}] does NOT have role [{1}]
-realmBase.hasRoleSuccess=Username [{0}] has role [{1}]
 realmBase.authenticateFailure=Username [{0}] NOT successfully authenticated
 realmBase.authenticateSuccess=Username [{0}] successfully authenticated
-realmBase.gssNameFail=Failed to extract name from established GSSContext
-realmBase.gotX509Username=Got user name from X509 certificate: [{0}]
+realmBase.cannotGetRoles=Cannot get roles from principal [{0}]
 realmBase.createUsernameRetriever.ClassCastException=Class [{0}] is not an X509UsernameRetriever.
 realmBase.createUsernameRetriever.newInstance=Cannot create object of type [{0}].
 realmBase.credentialHandler.customCredentialHandler=Unable to set the property [{0}] to value [{1}] as a custom CredentialHandler has been configured
-realmBase.cannotGetRoles=Cannot get roles from principal [{0}]
+realmBase.delegatedCredentialFail=Unable to obtain delegated credentials for user [{0}]
+realmBase.digest=Error digesting user credentials
+realmBase.forbidden=Access to the requested resource has been denied
+realmBase.gotX509Username=Got user name from X509 certificate: [{0}]
 realmBase.gssContextNotEstablished=Authenticator implementation error: the passed security context is not fully established
+realmBase.gssNameFail=Failed to extract name from established GSSContext
+realmBase.hasRoleFailure=Username [{0}] does NOT have role [{1}]
+realmBase.hasRoleSuccess=Username [{0}] has role [{1}]
+
 userDatabaseRealm.lookup=Exception looking up UserDatabase under key [{0}]
 userDatabaseRealm.noDatabase=No UserDatabase component found under key [{0}]
-dataSourceRealm.authenticateFailure=Username [{0}] NOT successfully authenticated
-dataSourceRealm.authenticateSuccess=Username [{0}] successfully authenticated
-dataSourceRealm.close=Exception closing database connection
-dataSourceRealm.exception=Exception performing authentication
-dataSourceRealm.getPassword.exception=Exception retrieving password for [{0}]
-dataSourceRealm.getRoles.exception=Exception retrieving roles for [{0}]
-combinedRealm.unexpectedMethod=An unexpected call was made to a method on the combined realm
-combinedRealm.getPassword=The getPassword() method should never be called
-combinedRealm.getPrincipal=The getPrincipal() method should never be called
-combinedRealm.authStart=Attempting to authenticate user [{0}] with realm [{1}]
-combinedRealm.authFail=Failed to authenticate user [{0}] with realm [{1}]
-combinedRealm.authSuccess=Authenticated user [{0}] with realm [{1}]
-combinedRealm.addRealm=Add [{0}] realm, making a total of [{1}] realms
-combinedRealm.realmStartFail=Failed to start [{0}] realm
-lockOutRealm.authLockedUser=An attempt was made to authenticate the locked user [{0}]
-lockOutRealm.removeWarning=User [{0}] was removed from the failed users cache after [{1}] seconds to keep the cache size within the limit set
-credentialHandler.invalidStoredCredential=The invalid stored credential string [{0}] was provided by the Realm to match with the user provided credentials
-credentialHandler.unableToMutateUserCredential=Failed to mutate user provided credentials. This typically means the CredentialHandler configuration is invalid
-mdCredentialHandler.unknownEncoding=The encoding [{0}] is not supported so the current setting of [{1}] will still be used
-pbeCredentialHandler.invalidKeySpec=Unable to generate a password based key
\ No newline at end of file

Modified: tomcat/trunk/java/org/apache/catalina/security/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/security/LocalStrings.properties?rev=1846398&r1=1846397&r2=1846398&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/security/LocalStrings.properties [UTF-8] (original)
+++ tomcat/trunk/java/org/apache/catalina/security/LocalStrings.properties [UTF-8] Mon Nov 12 11:16:39 2018
@@ -13,9 +13,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-SecurityUtil.doAsPrivilege=An exception occurs when running the PrivilegedExceptionAction block.
 SecurityListener.checkUmaskFail=Start attempted with umask setting of [{0}]. Running Tomcat without a umask at least as restrictive as [{1}] has been blocked by the Lifecycle listener org.apache.catalina.security.SecurityListener (usually configured in CATALINA_BASE/conf/server.xml)
 SecurityListener.checkUmaskNone=No umask setting was found in system property [{0}]. However, it appears Tomcat is running on a platform that supports umask. The system property is typically set in CATALINA_HOME/bin/catalina.sh. The Lifecycle listener org.apache.catalina.security.SecurityListener (usually configured in CATALINA_BASE/conf/server.xml) expects a umask at least as restrictive as [{1}]
 SecurityListener.checkUmaskParseFail=Failed to parse value [{0}] as a valid umask.
 SecurityListener.checkUmaskSkip=Unable to determine umask. It appears Tomcat is running on Windows so skip the umask check.
-SecurityListener.checkUserWarning=Start attempted while running as user [{0}]. Running Tomcat as this user has been blocked by the Lifecycle listener org.apache.catalina.security.SecurityListener (usually configured in CATALINA_BASE/conf/server.xml)
\ No newline at end of file
+SecurityListener.checkUserWarning=Start attempted while running as user [{0}]. Running Tomcat as this user has been blocked by the Lifecycle listener org.apache.catalina.security.SecurityListener (usually configured in CATALINA_BASE/conf/server.xml)
+
+SecurityUtil.doAsPrivilege=An exception occurs when running the PrivilegedExceptionAction block.

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=1846398&r1=1846397&r2=1846398&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] Mon Nov 12 11:16:39 2018
@@ -32,16 +32,20 @@ cgiServlet.runReaderInterrupt=Interrupte
 cgiServlet.runStdErr=stderr line: [{0}]
 cgiServlet.runStdErrCount=Received [{0}] lines on stderr
 cgiServlet.runStdErrFail=I/O problems with stderr
+
 defaultServlet.blockExternalEntity=Blocked access to external entity with publicId [{0}] and systemId [{0}]
 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.skipfail=Only skipped [{0}] bytes when [{1}] were requested
-webdavservlet.jaxpfailed=JAXP initialization failed
-webdavservlet.enternalEntityIgnored=The request included a reference to an external entity with PublicID [{0}] and SystemID [{1}] which was ignored
-webdavservlet.inputstreamclosefail=Failed to close the inputStream of [{0}]
+
 directory.filename=Filename
 directory.lastModified=Last Modified
 directory.parent=Up To [{0}]
 directory.size=Size
 directory.title=Directory Listing For [{0}]
+
+webdavservlet.enternalEntityIgnored=The request included a reference to an external entity with PublicID [{0}] and SystemID [{1}] which was ignored
+webdavservlet.inputstreamclosefail=Failed to close the inputStream of [{0}]
+webdavservlet.jaxpfailed=JAXP initialization failed

Modified: tomcat/trunk/java/org/apache/catalina/session/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/LocalStrings.properties?rev=1846398&r1=1846397&r2=1846398&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/session/LocalStrings.properties [UTF-8] (original)
+++ tomcat/trunk/java/org/apache/catalina/session/LocalStrings.properties [UTF-8] Mon Nov 12 11:16:39 2018
@@ -13,24 +13,26 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-fileStore.saving=Saving Session [{0}] to file [{1}]
-fileStore.loading=Loading Session [{0}] from file [{1}]
-fileStore.removing=Removing Session [{0}] at file [{1}]
-fileStore.createFailed=Unable to create directory [{0}] for the storage of session data
-fileStore.deleteFailed=Unable to delete file [{0}] which is preventing the creation of the session storage location
-fileStore.deleteSessionFailed=Unable to delete file [{0}] which is no longer required
-JDBCStore.close=Exception closing database connection [{0}]
-JDBCStore.saving=Saving Session [{0}] to database [{1}]
-JDBCStore.loading=Loading Session [{0}] from database [{1}]
-JDBCStore.removing=Removing Session [{0}] at database [{1}]
 JDBCStore.SQLException=SQL Error [{0}]
+JDBCStore.checkConnectionClassNotFoundException=JDBC driver class not found [{0}]
 JDBCStore.checkConnectionDBClosed=The database connection is null or was found to be closed. Trying to re-open it.
 JDBCStore.checkConnectionDBReOpenFail=The re-open on the database failed. The database could be down.
 JDBCStore.checkConnectionSQLException=A SQL exception occurred [{0}]
-JDBCStore.checkConnectionClassNotFoundException=JDBC driver class not found [{0}]
-JDBCStore.wrongDataSource=Cannot open JNDI DataSource [{0}]
-JDBCStore.missingDataSourceName=No valid JNDI name was given.
+JDBCStore.close=Exception closing database connection [{0}]
 JDBCStore.commitSQLException=SQLException committing connection before closing
+JDBCStore.loading=Loading Session [{0}] from database [{1}]
+JDBCStore.missingDataSourceName=No valid JNDI name was given.
+JDBCStore.removing=Removing Session [{0}] at database [{1}]
+JDBCStore.saving=Saving Session [{0}] to database [{1}]
+JDBCStore.wrongDataSource=Cannot open JNDI DataSource [{0}]
+
+fileStore.createFailed=Unable to create directory [{0}] for the storage of session data
+fileStore.deleteFailed=Unable to delete file [{0}] which is preventing the creation of the session storage location
+fileStore.deleteSessionFailed=Unable to delete file [{0}] which is no longer required
+fileStore.loading=Loading Session [{0}] from file [{1}]
+fileStore.removing=Removing Session [{0}] at file [{1}]
+fileStore.saving=Saving Session [{0}] to file [{1}]
+
 managerBase.container.noop=Managers added to containers other than Contexts will never be used
 managerBase.contextNull=The Context must be set to a non-null value before the Manager is used
 managerBase.createSession.ise=createSession: Too many active sessions
@@ -38,25 +40,41 @@ managerBase.sessionAttributeNameFilter=S
 managerBase.sessionAttributeValueClassNameFilter=Skipped session attribute named [{0}] because the value type [{1}] did not match the filter [{2}]
 managerBase.sessionTimeout=Invalid session timeout setting [{0}]
 managerBase.setContextNotNew=It is illegal to call setContext() to change the Context associated with a Manager if the Manager is not in the NEW state
+
+persistentManager.backupMaxIdle=Backing up session [{0}] to Store, idle for [{1}] seconds
+persistentManager.deserializeError=Error deserializing Session [{0}]: [{1}]
+persistentManager.loading=Loading [{0}] persisted sessions
+persistentManager.serializeError=Error serializing Session [{0}]: [{1}]
+persistentManager.storeKeysException=Unable to determine the list of session IDs for sessions in the session store, assuming that the store is empty
+persistentManager.storeSizeException=Unable to determine the number of sessions in the session store, assuming that the store is empty
+persistentManager.swapIn=Swapping session [{0}] in from Store
+persistentManager.swapInException=Exception in the Store during swapIn: [{0}]
+persistentManager.swapInInvalid=Swapped session [{0}] is invalid
+persistentManager.swapMaxIdle=Swapping session [{0}] to Store, idle for [{1}] seconds
+persistentManager.swapTooManyActive=Swapping out session [{0}], idle for [{1}] seconds too many sessions active
+persistentManager.tooManyActive=Too many active sessions, [{0}], looking for idle sessions to swap out
+persistentManager.unloading=Saving [{0}] persisted sessions
+
+standardManager.deletePersistedFileFail=Unable to delete [{0}] after reading the persisted sessions. The continued presence of this file may cause future attempts to persist sessions to fail.
 standardManager.loading=Loading persisted sessions from [{0}]
 standardManager.loading.exception=Exception while loading persisted sessions
-standardManager.deletePersistedFileFail=Unable to delete [{0}] after reading the persisted sessions. The continued presence of this file may cause future attempts to persist sessions to fail.
+standardManager.managerLoad=Exception loading sessions from persistent storage
+standardManager.managerUnload=Exception unloading sessions to persistent storage
 standardManager.unloading=Saving persisted sessions to [{0}]
 standardManager.unloading.debug=Unloading persisted sessions
 standardManager.unloading.nosessions=No persisted sessions to unload
-standardManager.managerLoad=Exception loading sessions from persistent storage
-standardManager.managerUnload=Exception unloading sessions to persistent storage
+
 standardSession.attributeEvent=Session attribute event listener threw exception
 standardSession.bindingEvent=Session binding event listener threw exception
-standardSession.invalidate.ise=invalidate: Session already invalidated
-standardSession.isNew.ise=isNew: Session already invalidated
 standardSession.getAttribute.ise=getAttribute: Session already invalidated
 standardSession.getAttributeNames.ise=getAttributeNames: Session already invalidated
 standardSession.getCreationTime.ise=getCreationTime: Session already invalidated
 standardSession.getIdleTime.ise=getIdleTime: Session already invalidated
-standardSession.getThisAccessedTime.ise=getThisAccessedTime: Session already invalidated
 standardSession.getLastAccessedTime.ise=getLastAccessedTime: Session already invalidated
+standardSession.getThisAccessedTime.ise=getThisAccessedTime: Session already invalidated
 standardSession.getValueNames.ise=getValueNames: Session already invalidated
+standardSession.invalidate.ise=invalidate: Session already invalidated
+standardSession.isNew.ise=isNew: Session already invalidated
 standardSession.logoutfail=Exception logging out user when expiring session
 standardSession.notDeserializable=Cannot deserialize session attribute [{0}] for session [{1}]
 standardSession.notSerializable=Cannot serialize session attribute [{0}] for session [{1}]
@@ -65,16 +83,3 @@ standardSession.sessionEvent=Session eve
 standardSession.setAttribute.iae=setAttribute: Non-serializable attribute [{0}]
 standardSession.setAttribute.ise=setAttribute: Session [{0}] has already been invalidated
 standardSession.setAttribute.namenull=setAttribute: name parameter cannot be null
-persistentManager.loading=Loading [{0}] persisted sessions
-persistentManager.unloading=Saving [{0}] persisted sessions
-persistentManager.deserializeError=Error deserializing Session [{0}]: [{1}]
-persistentManager.serializeError=Error serializing Session [{0}]: [{1}]
-persistentManager.swapMaxIdle=Swapping session [{0}] to Store, idle for [{1}] seconds
-persistentManager.backupMaxIdle=Backing up session [{0}] to Store, idle for [{1}] seconds
-persistentManager.tooManyActive=Too many active sessions, [{0}], looking for idle sessions to swap out
-persistentManager.swapTooManyActive=Swapping out session [{0}], idle for [{1}] seconds too many sessions active
-persistentManager.swapIn=Swapping session [{0}] in from Store
-persistentManager.swapInException=Exception in the Store during swapIn: [{0}]
-persistentManager.swapInInvalid=Swapped session [{0}] is invalid
-persistentManager.storeKeysException=Unable to determine the list of session IDs for sessions in the session store, assuming that the store is empty
-persistentManager.storeSizeException=Unable to determine the number of sessions in the session store, assuming that the store is empty

Modified: tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties?rev=1846398&r1=1846397&r2=1846398&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties [UTF-8] (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties [UTF-8] Mon Nov 12 11:16:39 2018
@@ -19,13 +19,19 @@ catalina.serverStartFail=The required Se
 catalina.shutdownHookFail=The shutdown hook experienced an error while trying to stop the server
 catalina.stopServer=No shutdown port configured. Shut down server through OS signal. Server not shut down.
 catalina.stopServer.connectException=Could not contact [{0}:{1}] (base port [{2}] and offset [{3}]). Tomcat may not be running.
+
+catalinaConfigurationSource.cannotObtainURL=Cannot obtain URL for the relative path [{0}]. Check that catalina.base is set.
+
+connector.noSetExecutor=Connector [{0}] does not support external executors. Method setExecutor(java.util.concurrent.Executor) not found.
+connector.noSetSSLImplementationName=Connector [{0}] does not support changing the SSL implementation. Method setSslImplementationName(String) not found.
+
 contextConfig.altDDNotFound=alt-dd file [{0}] not found
 contextConfig.annotationsStackOverflow=Unable to complete the scan for annotations for web application [{0}] due to a StackOverflowError. Possible root causes include a too low setting for -Xss and illegal cyclic inheritance dependencies. The class hierarchy being processed was [{1}]
-contextConfig.applicationUrl=Unable to determine URL for application web.xml
 contextConfig.applicationMissing=Missing application web.xml, using defaults only
 contextConfig.applicationParse=Parse error in application web.xml file at [{0}]
 contextConfig.applicationPosition=Occurred at line [{0}] column [{1}]
 contextConfig.applicationStart=Parsing application web.xml file at [{0}]
+contextConfig.applicationUrl=Unable to determine URL for application web.xml
 contextConfig.authenticatorConfigured=Configured an authenticator for method [{0}]
 contextConfig.authenticatorInstantiate=Cannot instantiate an authenticator of class [{0}]
 contextConfig.authenticatorMissing=Cannot configure an authenticator for method [{0}]
@@ -73,12 +79,15 @@ contextConfig.unknownUrlProtocol=The URL
 contextConfig.urlPatternValue=Both the urlPatterns and value attributes were set for the [{0}] annotation on class [{1}]
 contextConfig.webinfClassesUrl=Unable to determine URL for [{0}]
 contextConfig.xmlSettings=Context [{0}] will parse web.xml and web-fragment.xml files with validation:[{1}] and namespaceAware:[{2}]
+
+embedded.authenticatorNotInstanceOfValve=Specified Authenticator is not a Valve
 embedded.noEngines=No engines have been defined yet
 embedded.notmp=Cannot find specified temporary folder at [{0}]
-embedded.authenticatorNotInstanceOfValve=Specified Authenticator is not a Valve
+
 engineConfig.cce=Lifecycle event data object [{0}] is not an Engine
 engineConfig.start=EngineConfig: Processing START
 engineConfig.stop=EngineConfig: Processing STOP
+
 expandWar.copy=Error copying [{0}] to [{1}]
 expandWar.createFailed=Unable to create the directory [{0}]
 expandWar.createFileFailed=Unable to create the file [{0}]
@@ -87,13 +96,16 @@ expandWar.deleteOld=An expanded director
 expandWar.illegalPath=The archive [{0}] is malformed and will be ignored: an entry contains an illegal path [{1}] which was not expanded to [{2}] since that is outside of the defined docBase [{3}]
 expandWar.lastModifiedFailed=Unable to set the last modified time for [{0}]
 expandWar.missingJarEntry=Cannot get input stream for JarEntry [{0}] - broken WAR file?
+
 failedContext.start=Failed to process either the global, per-host or context-specific context.xml file therefore the [{0}] Context cannot be started.
+
 hostConfig.appBase=Application base [{1}] for host [{0}] does not exist or is not a directory. deployOnStartUp and autoDeploy have been set to false to prevent deployment errors. Other errors may still occur.
 hostConfig.canonicalizing=Unable to determine canonical path for [{0}] while attempting to undeploy [{1}]
 hostConfig.cce=Lifecycle event data object [{0}] is not a Host
 hostConfig.context.remove=Error while removing context [{0}]
 hostConfig.context.restart=Error during context [{0}] restart
 hostConfig.createDirs=Unable to create directory for deployment: [{0}]
+hostConfig.deploy.error=Exception while deploying web application directory [{0}]
 hostConfig.deployDescriptor=Deploying deployment descriptor [{0}]
 hostConfig.deployDescriptor.blocked=The web application with context path [{0}] was not deployed because it contained a deployment descriptor [{1}] which may include configuration necessary for the secure deployment of the application but processing of deployment descriptors is prevented by the deployXML setting of this host. An appropriate descriptor should be created at [{2}] to deploy this application.
 hostConfig.deployDescriptor.error=Error deploying deployment descriptor [{0}]
@@ -105,14 +117,13 @@ hostConfig.deployDescriptor.path=The pat
 hostConfig.deployDescriptor.threaded.error=Error waiting for multi-thread deployment of deployment descriptors to complete
 hostConfig.deployDir=Deploying web application directory [{0}]
 hostConfig.deployDir.error=Error deploying web application directory [{0}]
-hostConfig.deployDir.threaded.error=Error waiting for multi-thread deployment of directories to complete
 hostConfig.deployDir.finished=Deployment of web application directory [{0}] has finished in [{1}] ms
+hostConfig.deployDir.threaded.error=Error waiting for multi-thread deployment of directories to complete
 hostConfig.deployWar=Deploying web application archive [{0}]
 hostConfig.deployWar.error=Error deploying web application archive [{0}]
+hostConfig.deployWar.finished=Deployment of web application archive [{0}] has finished in [{1}] ms
 hostConfig.deployWar.hiddenDir=The directory [{0}] will be ignored because the WAR [{1}] takes priority and unpackWARs is false
 hostConfig.deployWar.threaded.error=Error waiting for multi-thread deployment of WAR files to complete
-hostConfig.deployWar.finished=Deployment of web application archive [{0}] has finished in [{1}] ms
-hostConfig.deploy.error=Exception while deploying web application directory [{0}]
 hostConfig.deploying=Deploying discovered web applications
 hostConfig.docBaseUrlInvalid=The provided docBase cannot be expressed as a URL
 hostConfig.expand=Expanding web application archive [{0}]
@@ -123,39 +134,39 @@ hostConfig.illegalWarName=The war name [
 hostConfig.jmx.register=Register context [{0}] failed
 hostConfig.jmx.unregister=Unregister context [{0}] failed
 hostConfig.reload=Reloading context [{0}]
+hostConfig.resourceNotAbsolute=Unable to remove resource from context [{0}] since [{1}] is not absolute
 hostConfig.start=HostConfig: Processing START
 hostConfig.stop=HostConfig: Processing STOP
 hostConfig.undeploy=Undeploying context [{0}]
-hostConfig.resourceNotAbsolute=Unable to remove resource from context [{0}] since [{1}] is not absolute
 hostConfig.undeployVersion=Undeploying old version of context [{0}] which has no active session
+
 passwdUserDatabase.readFail=Failed to obtain a complete set of users from /etc/passwd
-tomcat.baseDirNotDir=The location [{0}] specified for the base directory is not a directory
+
 tomcat.baseDirMakeFail=Unable to create the directory [{0}] to use as the base directory
+tomcat.baseDirNotDir=The location [{0}] specified for the base directory is not a directory
 tomcat.homeDirMakeFail=Unable to create the directory [{0}] to use as the home directory
+
 userConfig.database=Exception loading user database
 userConfig.deploy=Deploying web application for user [{0}]
+userConfig.deploy.threaded.error=Error waiting for multi-thread deployment of user directories to complete
 userConfig.deploying=Deploying user web applications
 userConfig.error=Error deploying web application for user [{0}]
 userConfig.start=UserConfig: Processing START
 userConfig.stop=UserConfig: Processing STOP
-userConfig.deploy.threaded.error=Error waiting for multi-thread deployment of user directories to complete
-versionLoggerListener.serverInfo.server.version=Server version:        {0}
-versionLoggerListener.serverInfo.server.built  =Server built:          {0}
-versionLoggerListener.serverInfo.server.number =Server number:         {0}
-versionLoggerListener.os.name                  =OS Name:               {0}
-versionLoggerListener.os.version               =OS Version:            {0}
-versionLoggerListener.os.arch                  =Architecture:          {0}
-versionLoggerListener.java.home                =Java Home:             {0}
-versionLoggerListener.vm.version               =JVM Version:           {0}
-versionLoggerListener.vm.vendor                =JVM Vendor:            {0}
-versionLoggerListener.catalina.base            =CATALINA_BASE:         {0}
-versionLoggerListener.catalina.home            =CATALINA_HOME:         {0}
-versionLoggerListener.arg                      =Command line argument: {0}
-versionLoggerListener.env                      =Environment variable:  {0} = {1}
-versionLoggerListener.prop                     =System property:       {0} = {1}
-webAnnotationSet.invalidInjection=Invalid method resource injection annotation.
 
-connector.noSetExecutor=Connector [{0}] does not support external executors. Method setExecutor(java.util.concurrent.Executor) not found.
-connector.noSetSSLImplementationName=Connector [{0}] does not support changing the SSL implementation. Method setSslImplementationName(String) not found.
+versionLoggerListener.arg=Command line argument: {0}
+versionLoggerListener.catalina.base=CATALINA_BASE:         {0}
+versionLoggerListener.catalina.home=CATALINA_HOME:         {0}
+versionLoggerListener.env=Environment variable:  {0} = {1}
+versionLoggerListener.java.home=Java Home:             {0}
+versionLoggerListener.os.arch=Architecture:          {0}
+versionLoggerListener.os.name=OS Name:               {0}
+versionLoggerListener.os.version=OS Version:            {0}
+versionLoggerListener.prop=System property:       {0} = {1}
+versionLoggerListener.serverInfo.server.built=Server built:          {0}
+versionLoggerListener.serverInfo.server.number=Server number:         {0}
+versionLoggerListener.serverInfo.server.version=Server version:        {0}
+versionLoggerListener.vm.vendor=JVM Vendor:            {0}
+versionLoggerListener.vm.version=JVM Version:           {0}
 
-catalinaConfigurationSource.cannotObtainURL=Cannot obtain URL for the relative path [{0}]. Check that catalina.base is set.
+webAnnotationSet.invalidInjection=Invalid method resource injection annotation.

Modified: tomcat/trunk/java/org/apache/catalina/storeconfig/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/LocalStrings.properties?rev=1846398&r1=1846397&r2=1846398&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/storeconfig/LocalStrings.properties [UTF-8] (original)
+++ tomcat/trunk/java/org/apache/catalina/storeconfig/LocalStrings.properties [UTF-8] Mon Nov 12 11:16:39 2018
@@ -13,8 +13,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-config.storeServerError=Error storing server
 config.storeContextError=Error storing context [{0}]
-factory.storeTag=store tag [{0}] ( Object: [{1}] )
+config.storeServerError=Error storing server
+
 factory.storeNoDescriptor=Descriptor for element class [{0}] not configured!
-storeConfigListener.notServer=The listener was added to component other than the Server and will therefore be ignored
\ No newline at end of file
+factory.storeTag=store tag [{0}] ( Object: [{1}] )
+
+storeConfigListener.notServer=The listener was added to component other than the Server and will therefore be ignored

Modified: tomcat/trunk/java/org/apache/catalina/tribes/group/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/LocalStrings.properties?rev=1846398&r1=1846397&r2=1846398&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/group/LocalStrings.properties [UTF-8] (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/group/LocalStrings.properties [UTF-8] Mon Nov 12 11:16:39 2018
@@ -15,13 +15,15 @@
 
 channelCoordinator.alreadyStarted=Channel already started for level:[{0}]
 channelCoordinator.invalid.startLevel=Invalid start level, valid levels are:SND_RX_SEQ,SND_TX_SEQ,MBR_TX_SEQ,MBR_RX_SEQ
-groupChannel.nullMessage=Cannot send a NULL message
+
+groupChannel.listener.alreadyExist=Listener already exists:[{0}][{1}]
 groupChannel.noDestination=No destination given
-groupChannel.unable.deserialize=Unable to deserialize message:[{0}]
+groupChannel.nullMessage=Cannot send a NULL message
+groupChannel.optionFlag.conflict=Interceptor option flag conflict: [{0}]
 groupChannel.receiving.error=Error receiving message:
 groupChannel.sendFail.noRpcChannelReply=Unable to find rpc channel, failed to send NoRpcChannelReply.
-groupChannel.optionFlag.conflict=Interceptor option flag conflict: [{0}]
-groupChannel.listener.alreadyExist=Listener already exists:[{0}][{1}]
+groupChannel.unable.deserialize=Unable to deserialize message:[{0}]
 groupChannel.unable.sendHeartbeat=Unable to send heartbeat through Tribes interceptor stack. Will try to sleep again.
 groupChannel.warn.noUtilityExecutor=No utility executor was set, creating one
+
 rpcChannel.replyFailed=Unable to send back reply in RpcChannel.

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=1846398&r1=1846397&r2=1846398&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] Mon Nov 12 11:16:39 2018
@@ -13,71 +13,82 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-domainFilterInterceptor.message.refused=Received message from cluster[{0}] was refused.
 domainFilterInterceptor.member.refused=Member was refused to join cluster[{0}]
-fragmentationInterceptor.heartbeat.failed=Unable to perform heartbeat clean up in the frag interceptor
+domainFilterInterceptor.message.refused=Received message from cluster[{0}] was refused.
+
+encryptInterceptor.algorithm.required=Encryption algorithm is required, fully-specified e.g. AES/CBC/PKCS5Padding
+encryptInterceptor.algorithm.requires-cbc-mode=EncryptInterceptor only supports CBC cipher modes, not [{0}]
+encryptInterceptor.decrypt.error.short-message=Failed to decrypt message: premature end-of-message
+encryptInterceptor.decrypt.failed=Failed to decrypt message
+encryptInterceptor.encrypt.failed=Failed to encrypt message
+encryptInterceptor.init.failed=Failed to initialize EncryptInterceptor
+encryptInterceptor.key.required=Encryption key is required
+
 fragmentationInterceptor.fragments.missing=Fragments are missing.
+fragmentationInterceptor.heartbeat.failed=Unable to perform heartbeat clean up in the frag interceptor
+
 gzipInterceptor.compress.failed=Unable to compress byte contents
 gzipInterceptor.decompress.failed=Unable to decompress byte contents
-gzipInterceptor.report=GZip Interceptor Report[\
-  \n\tTotal Messages: {0}\
-  \n\tTx Messages Compressed: {1}\
-  \n\tTx Messages Uncompressed: {2}\
-  \n\tRx Messages Compressed: {3}\
-  \n\tRx Messages Uncompressed: {4}\
-  \n\tTotal Tx bytes: {5}\
-  \n\tCompressed Tx bytes: {6}\
-  \n\tUncompressed Tx bytes: {7}\
-  \n\tTotal Rx bytes: {8}\
-  \n\tCompressed Rx bytes: {9}\
-  \n\tUncompressed Rx bytes: {10}\
-  \n]
+gzipInterceptor.report=GZip Interceptor Report[\n\
+\tTotal Messages: {0}\n\
+\tTx Messages Compressed: {1}\n\
+\tTx Messages Uncompressed: {2}\n\
+\tRx Messages Compressed: {3}\n\
+\tRx Messages Uncompressed: {4}\n\
+\tTotal Tx bytes: {5}\n\
+\tCompressed Tx bytes: {6}\n\
+\tUncompressed Tx bytes: {7}\n\
+\tTotal Rx bytes: {8}\n\
+\tCompressed Rx bytes: {9}\n\
+\tUncompressed Rx bytes: {10}\n\
+]
+
+messageDispatchInterceptor.AsyncMessage.failed=Error while processing async message.
+messageDispatchInterceptor.completeMessage.failed=Unable to report back completed message.
+messageDispatchInterceptor.errorMessage.failed=Unable to report back error message.
 messageDispatchInterceptor.queue.full=Asynchronous queue is full, reached its limit of [{0}] bytes, current:[{1}] bytes.
 messageDispatchInterceptor.unableAdd.queue=Unable to add the message to the async queue, queue bug?
 messageDispatchInterceptor.warning.optionflag=Warning, you are overriding the asynchronous option flag, this will disable the Channel.SEND_OPTIONS_ASYNCHRONOUS that other apps might use.
-messageDispatchInterceptor.completeMessage.failed=Unable to report back completed message.
-messageDispatchInterceptor.AsyncMessage.failed=Error while processing async message.
-messageDispatchInterceptor.errorMessage.failed=Unable to report back error message.
+
 nonBlockingCoordinator.electionMessage.sendfailed=Unable to send election message to:[{0}]
-nonBlockingCoordinator.processCoordinationMessage.failed=Error processing coordination message. Could be fatal.
-nonBlockingCoordinator.memberAdded.failed=Unable to start election when member was added.
-nonBlockingCoordinator.memberDisappeared.failed=Unable to start election when member was removed.
-nonBlockingCoordinator.heartbeat.inconsistency=Heartbeat found inconsistency, restart election
 nonBlockingCoordinator.heartbeat.failed=Unable to perform heartbeat.
+nonBlockingCoordinator.heartbeat.inconsistency=Heartbeat found inconsistency, restart election
+nonBlockingCoordinator.memberAdded.failed=Unable to start election when member was added.
 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.
+
 orderInterceptor.messageAdded.sameCounter=Message added has the same counter, synchronization bug. Disable the order interceptor
+
 staticMembershipInterceptor.no.failureDetector=There is no TcpFailureDetector. Automatic detection of static members does not work properly. By defining the StaticMembershipInterceptor under the TcpFailureDetector, automatic detection of the static members will work.
 staticMembershipInterceptor.no.pingInterceptor=There is no TcpPingInterceptor. The health check of static members does not work properly. By defining the TcpPingInterceptor, the health check of static members will work.
 staticMembershipInterceptor.sendLocalMember.failed=Local member notification failed.
 staticMembershipInterceptor.sendShutdown.failed=Shutdown notification failed.
-tcpFailureDetector.memberDisappeared.verify=Received memberDisappeared[{0}] message. Will verify.
+
 tcpFailureDetector.already.disappeared=Verification complete. Member already disappeared[{0}]
-tcpFailureDetector.member.disappeared=Verification complete. Member disappeared[{0}]
-tcpFailureDetector.still.alive=Verification complete. Member still alive[{0}]
+tcpFailureDetector.failureDetection.failed=Unable to perform failure detection check, assuming member down.[{0}]
 tcpFailureDetector.heartbeat.failed=Unable to perform heartbeat on the TcpFailureDetector.
+tcpFailureDetector.member.disappeared=Verification complete. Member disappeared[{0}]
+tcpFailureDetector.memberDisappeared.verify=Received memberDisappeared[{0}] message. Will verify.
 tcpFailureDetector.performBasicCheck.memberAdded=Member added, even though we weren''t notified:[{0}]
-tcpFailureDetector.suspectMember.dead=Suspect member, confirmed dead.[{0}]
+tcpFailureDetector.still.alive=Verification complete. Member still alive[{0}]
 tcpFailureDetector.suspectMember.alive=Suspect member, confirmed alive.[{0}]
-tcpFailureDetector.failureDetection.failed=Unable to perform failure detection check, assuming member down.[{0}]
+tcpFailureDetector.suspectMember.dead=Suspect member, confirmed dead.[{0}]
+
 tcpPingInterceptor.ping.failed=Unable to send TCP ping.
 tcpPingInterceptor.pingFailed.pingThread=Unable to send ping from TCP ping thread.
-throughputInterceptor.report=ThroughputInterceptor Report[\
-  \n\tTx Msg:{0} messages\
-  \n\tSent:{1} MB (total)\
-  \n\tSent:{2} MB (application)\
-  \n\tTime:{3} seconds\
-  \n\tTx Speed:{4} MB/sec (total)\
-  \n\tTx Speed:{5} MB/sec (application)\
-  \n\tError Msg:{6}\
-  \n\tRx Msg:{7} messages\
-  \n\tRx Speed:{8} MB/sec (since 1st msg)\
-  \n\tReceived:{9} MB]\n
-twoPhaseCommitInterceptor.originalMessage.missing=Received a confirmation, but original message is missing. Id:[{0}]
+
+throughputInterceptor.report=ThroughputInterceptor Report[\n\
+\tTx Msg:{0} messages\n\
+\tSent:{1} MB (total)\n\
+\tSent:{2} MB (application)\n\
+\tTime:{3} seconds\n\
+\tTx Speed:{4} MB/sec (total)\n\
+\tTx Speed:{5} MB/sec (application)\n\
+\tError Msg:{6}\n\
+\tRx Msg:{7} messages\n\
+\tRx Speed:{8} MB/sec (since 1st msg)\n\
+\tReceived:{9} MB]\n
+
 twoPhaseCommitInterceptor.heartbeat.failed=Unable to perform heartbeat on the TwoPhaseCommit interceptor.
-encryptInterceptor.init.failed=Failed to initialize EncryptInterceptor
-encryptInterceptor.encrypt.failed=Failed to encrypt message
-encryptInterceptor.decrypt.failed=Failed to decrypt message
-encryptInterceptor.decrypt.error.short-message=Failed to decrypt message: premature end-of-message
-encryptInterceptor.algorithm.required=Encryption algorithm is required, fully-specified e.g. AES/CBC/PKCS5Padding
-encryptInterceptor.key.required=Encryption key is required
-encryptInterceptor.algorithm.requires-cbc-mode=EncryptInterceptor only supports CBC cipher modes, not [{0}]
\ No newline at end of file
+twoPhaseCommitInterceptor.originalMessage.missing=Received a confirmation, but original message is missing. Id:[{0}]

Modified: tomcat/trunk/java/org/apache/catalina/tribes/io/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/io/LocalStrings.properties?rev=1846398&r1=1846397&r2=1846398&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/io/LocalStrings.properties [UTF-8] (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/io/LocalStrings.properties [UTF-8] Mon Nov 12 11:16:39 2018
@@ -14,11 +14,14 @@
 # limitations under the License.
 
 bufferPool.created=Created a buffer pool with max size:[{0}] bytes of type: [{1}]
+
 objectReader.retrieveFailed.socketReceiverBufferSize=Unable to retrieve the socket receiver buffer size, setting to default 43800 bytes.
+
 replicationStream.conflict=conflicting non-public interface class loaders
-xByteBuffer.size.larger.buffer=Size is larger than existing buffer.
-xByteBuffer.unableTrim=Cannot trim more bytes than are available. length:[{0}] trim:[{1}]
+
 xByteBuffer.discarded.invalidHeader=Discarded the package, invalid header
 xByteBuffer.no.package=No package exists in XByteBuffer
+xByteBuffer.size.larger.buffer=Size is larger than existing buffer.
 xByteBuffer.unableCreate=Unable to create data package, buffer is too small.
-xByteBuffer.wrong.class=Message has the wrong class. It should implement Serializable, instead it is:[{0}]
\ No newline at end of file
+xByteBuffer.unableTrim=Cannot trim more bytes than are available. length:[{0}] trim:[{1}]
+xByteBuffer.wrong.class=Message has the wrong class. It should implement Serializable, instead it is:[{0}]

Modified: tomcat/trunk/java/org/apache/catalina/tribes/jmx/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/jmx/LocalStrings.properties?rev=1846398&r1=1846397&r2=1846398&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/jmx/LocalStrings.properties [UTF-8] (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/jmx/LocalStrings.properties [UTF-8] Mon Nov 12 11:16:39 2018
@@ -15,7 +15,7 @@
 
 jmxRegistry.no.domain=JMX domain is not specified
 jmxRegistry.objectName.failed=The requested ObjectName [{0}] is not valid
-jmxRegistry.registerJmx.notCompliant=The requested object[{0}] is not compliant with JMX specification
 jmxRegistry.registerJmx.failed=Failed to register object [{0}] with name [{1}]
+jmxRegistry.registerJmx.notCompliant=The requested object[{0}] is not compliant with JMX specification
+jmxRegistry.unregisterJmx.failed=Failed to unregister MBean with name [{0}]
 jmxRegistry.unregisterJmx.notFound=The requested ObjectName [{0}] has not been registered in the MBeanServer
-jmxRegistry.unregisterJmx.failed=Failed to unregister MBean with name [{0}]
\ No newline at end of file

Modified: tomcat/trunk/java/org/apache/catalina/tribes/membership/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/LocalStrings.properties?rev=1846398&r1=1846397&r2=1846398&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/membership/LocalStrings.properties [UTF-8] (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/membership/LocalStrings.properties [UTF-8] Mon Nov 12 11:16:39 2018
@@ -13,47 +13,53 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-McastService.parseTTL=Unable to parse TTL: [{0}]
+McastService.domain=Unable to send domain update
 McastService.parseSoTimeout=Unable to parse SoTimeout: [{0}]
-McastService.stopFail=Unable to stop the mcast service, level: [{0}]
+McastService.parseTTL=Unable to parse TTL: [{0}]
 McastService.payload=Unable to send payload update
-McastService.domain=Unable to send domain update
+McastService.stopFail=Unable to stop the mcast service, level: [{0}]
+
+mcastService.exceed.maxPacketSize=Packet length[{0}] exceeds max packet size of [{1}] bytes.
 mcastService.missing.property=McastService:Required property [{0}] is missing.
 mcastService.noStart=Multicast send is not started or enabled.
-mcastService.exceed.maxPacketSize=Packet length[{0}] exceeds max packet size of [{1}] bytes.
+
 mcastServiceImpl.bind=Attempting to bind the multicast socket to [{0}:{1}]
 mcastServiceImpl.bind.failed=Binding to multicast address, failed. Binding to port only.
-mcastServiceImpl.setInterface=Setting multihome multicast interface to:[{0}]
-mcastServiceImpl.setSoTimeout=Setting cluster mcast soTimeout to [{0}]
-mcastServiceImpl.setTTL=Setting cluster mcast TTL to [{0}]
-mcastServiceImpl.receive.running=McastService.receive already running.
-mcastServiceImpl.unable.join=Unable to join multicast group, make sure your system has multicasting enabled.
-mcastServiceImpl.send.running=McastService.send already running.
+mcastServiceImpl.error.receiving=Error receiving mcast package. Sleeping 500ms
 mcastServiceImpl.invalid.startLevel=Invalid start level. Only acceptable levels are Channel.MBR_RX_SEQ and Channel.MBR_TX_SEQ
-mcastServiceImpl.waitForMembers.start=Sleeping for [{0}] milliseconds to establish cluster membership, start level:[{1}]
-mcastServiceImpl.waitForMembers.done=Done sleeping, membership established, start level:[{0}]
 mcastServiceImpl.invalid.stopLevel=Invalid stop level. Only acceptable levels are Channel.MBR_RX_SEQ and Channel.MBR_TX_SEQ
-mcastServiceImpl.packet.tooLong=Multicast packet received was too long, dropping package:[{0}]
-mcastServiceImpl.unableReceive.broadcastMessage=Unable to receive broadcast message.
 mcastServiceImpl.memberDisappeared.failed=Unable to process member disappeared message.
-mcastServiceImpl.error.receiving=Error receiving mcast package. Sleeping 500ms
-mcastServiceImpl.send.failed=Unable to send mcast message.
-mcastServiceImpl.recovery.stopFailed=Recovery thread failed to stop membership service.
-mcastServiceImpl.recovery.startFailed=Recovery thread failed to start membership service.
+mcastServiceImpl.packet.tooLong=Multicast packet received was too long, dropping package:[{0}]
+mcastServiceImpl.receive.running=McastService.receive already running.
 mcastServiceImpl.recovery=Tribes membership, running recovery thread, multicasting is not functional.
-mcastServiceImpl.recovery.successful=Membership recovery was successful.
 mcastServiceImpl.recovery.failed=Recovery attempt [{0}] failed, trying again in [{1}] seconds
+mcastServiceImpl.recovery.startFailed=Recovery thread failed to start membership service.
+mcastServiceImpl.recovery.stopFailed=Recovery thread failed to stop membership service.
+mcastServiceImpl.recovery.successful=Membership recovery was successful.
+mcastServiceImpl.send.failed=Unable to send mcast message.
+mcastServiceImpl.send.running=McastService.send already running.
+mcastServiceImpl.setInterface=Setting multihome multicast interface to:[{0}]
+mcastServiceImpl.setSoTimeout=Setting cluster mcast soTimeout to [{0}]
+mcastServiceImpl.setTTL=Setting cluster mcast TTL to [{0}]
+mcastServiceImpl.unable.join=Unable to join multicast group, make sure your system has multicasting enabled.
+mcastServiceImpl.unableReceive.broadcastMessage=Unable to receive broadcast message.
+mcastServiceImpl.waitForMembers.done=Done sleeping, membership established, start level:[{0}]
+mcastServiceImpl.waitForMembers.start=Sleeping for [{0}] milliseconds to establish cluster membership, start level:[{1}]
+
 memberImpl.invalid.package.begin=Invalid package, should start with:[{0}]
-memberImpl.package.small=Member package to small to validate.
-memberImpl.notEnough.bytes=Not enough bytes in member package.
 memberImpl.invalid.package.end=Invalid package, should end with:[{0}]
-memberImpl.unableParse.hostname=Unable to parse hostname.
 memberImpl.large.payload=Payload is to large for tribes to handle.
+memberImpl.notEnough.bytes=Not enough bytes in member package.
+memberImpl.package.small=Member package to small to validate.
+memberImpl.unableParse.hostname=Unable to parse hostname.
+
 staticMember.invalid.uuidLength=UUID must be exactly 16 bytes, not:[{0}]
-staticMembershipService.stopFail=Unable to stop the static membership service, level: [{0}]
+
+staticMembershipProvider.heartbeat.failed=Unable to send StaticMembershipProvider.ping message.
+staticMembershipProvider.leftOver.ignored=Message[{0}] is ignored.
 staticMembershipProvider.pingThread.failed=Unable to send ping.
 staticMembershipProvider.replyRequest.ignored=Message[{0}] is ignored.
-staticMembershipProvider.leftOver.ignored=Message[{0}] is ignored.
+staticMembershipProvider.startMembership.noReplies=Received 0 replies, probably a timeout.
 staticMembershipProvider.stopMembership.sendFailed=Unable to send stop membership message.
-staticMembershipProvider.heartbeat.failed=Unable to send StaticMembershipProvider.ping message.
-staticMembershipProvider.startMembership.noReplies=Received 0 replies, probably a timeout.
\ No newline at end of file
+
+staticMembershipService.stopFail=Unable to stop the static membership service, level: [{0}]

Modified: tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/LocalStrings.properties?rev=1846398&r1=1846397&r2=1846398&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/LocalStrings.properties (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/LocalStrings.properties Mon Nov 12 11:16:39 2018
@@ -13,19 +13,19 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+abstractStream.CACertUndefined=CA cert file undefined
 abstractStream.fileNotFound=CA cert file {0} not found
 abstractStream.trustManagerError=Could not create trust manager for {0}
-abstractStream.CACertUndefined=CA cert file undefined
 
 certificateStream.clientCertError=Could not create key manager for {0} ({1})
 
-tokenStream.failedConnection=Failed connection to {0} with token {1}
-
 cloudMembershipService.stopFail=Unable to stop the static membership service, level: [{0}]
 
-kubernetesMembershipProvider.noNamespace=Namespace not set
-kubernetesMembershipProvider.invalidPodsList=Invalid pods list: {0}
 kubernetesMembershipProvider.invalidPod=Pod is missing some required attributes
+kubernetesMembershipProvider.invalidPodsList=Invalid pods list: {0}
 kubernetesMembershipProvider.jsonError=JSON error
 kubernetesMembershipProvider.memberError=Error creating member
+kubernetesMembershipProvider.noNamespace=Namespace not set
 kubernetesMembershipProvider.streamError=Failed to open stream
+
+tokenStream.failedConnection=Failed connection to {0} with token {1}

Modified: 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=1846398&r1=1846397&r2=1846398&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/tipis/LocalStrings.properties [UTF-8] (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/tipis/LocalStrings.properties [UTF-8] Mon Nov 12 11:16:39 2018
@@ -13,38 +13,41 @@
 # 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.heartbeat.failed=Unable to send AbstractReplicatedMap.ping message
+abstractReplicatedMap.init.completed=AbstractReplicatedMap[{0}] initialization was completed in [{1}] ms.
+abstractReplicatedMap.init.start=Initializing AbstractReplicatedMap with context name:[{0}]
+abstractReplicatedMap.leftOver.ignored=Message[{0}] is ignored.
+abstractReplicatedMap.leftOver.pingMsg=PING message has been received beyond the timeout period. The map member[{0}] might have been removed from the map membership.
+abstractReplicatedMap.mapMember.unavailable=Member[{0}] is not available yet.
+abstractReplicatedMap.mapMemberAdded.added=Map member added:[{0}]
+abstractReplicatedMap.mapMemberAdded.nullMember=Notified member is not registered in the membership:[{0}].
+abstractReplicatedMap.member.disappeared=Member[{0}] disappeared. Related map entries will be relocated to the new node.
+abstractReplicatedMap.ping.stateTransferredMember=Member[{0}] is state transferred but not available yet.
+abstractReplicatedMap.ping.timeout=Member[{0}] in the Map[{1}] has timed-out in the ping processing.
+abstractReplicatedMap.relocate.complete=Relocation of map entries was complete in [{0}] ms.
 abstractReplicatedMap.transferState.noReplies=Transfer state, 0 replies, probably a timeout.
-abstractReplicatedMap.unable.transferState=Unable to transfer AbstractReplicatedMap 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.diffObject=Unable to diff object. Will replicate the entire object instead.
+abstractReplicatedMap.unable.get=Unable to replicate out data for a AbstractReplicatedMap.get operation
+abstractReplicatedMap.unable.put=Unable to replicate out data for a AbstractReplicatedMap.put operation
 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 AbstractReplicatedMap.remove operation
+abstractReplicatedMap.unable.replicate=Unable to replicate data.
 abstractReplicatedMap.unable.retrieve=Unable to retrieve remote object for key:[{0}]
-abstractReplicatedMap.unable.get=Unable to replicate out data for a AbstractReplicatedMap.get operation
-abstractReplicatedMap.unable.put=Unable to replicate out data for a AbstractReplicatedMap.put operation
-abstractReplicatedMap.mapMemberAdded.nullMember=Notified member is not registered in the membership:[{0}].
-abstractReplicatedMap.mapMemberAdded.added=Map member added:[{0}]
-abstractReplicatedMap.leftOver.pingMsg=PING message has been received beyond the timeout period. The map member[{0}] might have been removed from the map membership.
-abstractReplicatedMap.leftOver.ignored=Message[{0}] is ignored.
-abstractReplicatedMap.mapMember.unavailable=Member[{0}] is not available yet.
-abstractReplicatedMap.ping.timeout=Member[{0}] in the Map[{1}] has timed-out in the ping processing.
-abstractReplicatedMap.ping.stateTransferredMember=Member[{0}] is state transferred but not available yet.
-mapMessage.deserialize.error.key=Deserialization error of the MapMessage.key
-mapMessage.deserialize.error.value=Deserialization error of the MapMessage.value
+abstractReplicatedMap.unable.transferState=Unable to transfer AbstractReplicatedMap state.
+abstractReplicatedMap.unableApply.diff=Unable to apply diff to key:[{0}]
+abstractReplicatedMap.unableSelect.backup=Unable to select backup node.
+abstractReplicatedMap.unableSend.startMessage=Unable to send map start message.
+abstractReplicatedMap.unableStart=Unable to start replicated map.
+
 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}]
+
+mapMessage.deserialize.error.key=Deserialization error of the MapMessage.key
+mapMessage.deserialize.error.value=Deserialization error of the MapMessage.value
+
 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.
-replicatedMap.unableReplicate.completely=Unable to replicate backup key:[{0}]. Success nodes:[{1}]. Failed nodes:[{2}].
\ No newline at end of file
+replicatedMap.unable.relocate=Unable to relocate[{0}] to a new backup node
+replicatedMap.unableReplicate.completely=Unable to replicate backup key:[{0}]. Success nodes:[{1}]. Failed nodes:[{2}].

Modified: tomcat/trunk/java/org/apache/catalina/tribes/transport/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/LocalStrings.properties?rev=1846398&r1=1846397&r2=1846398&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/transport/LocalStrings.properties [UTF-8] (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/transport/LocalStrings.properties [UTF-8] Mon Nov 12 11:16:39 2018
@@ -13,10 +13,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-pooledSender.closed.queue=Queue is closed
 PooledSender.senderDisconnectFail=Failed to disconnect sender
+
+pooledSender.closed.queue=Queue is closed
+
 receiverBase.bind.failed=Failed bind replication listener on address:[{0}]
 receiverBase.socket.bind=Receiver Server Socket bound to:[{0}]
-receiverBase.unable.bind=Unable to bind server socket to:[{0}] throwing error.
 receiverBase.udp.bind=UDP Receiver Server Socket bound to:[{0}]
-receiverBase.unable.bind.udp=Unable to bind UDP socket to:[{0}] throwing error.
\ No newline at end of file
+receiverBase.unable.bind=Unable to bind server socket to:[{0}] throwing error.
+receiverBase.unable.bind.udp=Unable to bind UDP socket to:[{0}] throwing error.

Modified: tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/LocalStrings.properties?rev=1846398&r1=1846397&r2=1846398&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/LocalStrings.properties [UTF-8] (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/LocalStrings.properties [UTF-8] Mon Nov 12 11:16:39 2018
@@ -13,25 +13,28 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-bioReceiver.threadpool.fail=ThreadPool can initialized. Listener not started
-bioReceiver.start.fail=Unable to start cluster receiver
-bioReceiver.socket.closeFailed=Failed to close socket
-bioReceiver.run.fail=Unable to run replication listener.
 bioReceiver.already.started=ServerSocket already started
+bioReceiver.run.fail=Unable to run replication listener.
+bioReceiver.socket.closeFailed=Failed to close socket
+bioReceiver.start.fail=Unable to start cluster receiver
+bioReceiver.threadpool.fail=ThreadPool can initialized. Listener not started
 bioReceiver.threads.busy=All BIO server replication threads are busy, unable to handle more requests until a thread is freed up.
-bioReplicationTask.unable.service=Unable to service bio socket
-bioReplicationTask.socket.closeFailed=Failed to close socket
-bioReplicationTask.reader.closeFailed=Failed to close reader
+
 bioReplicationTask.messageDataReceived.error=Error thrown from messageDataReceived.
+bioReplicationTask.reader.closeFailed=Failed to close reader
+bioReplicationTask.socket.closeFailed=Failed to close socket
 bioReplicationTask.unable.sendAck=Unable to send ACK back through channel, channel disconnected?: [{0}]
-bioSender.disconnect=Sender disconnect from [{0}:{1,number,integer}] (disconnect count {2,number,integer})
-bioSender.send.again=Send data again to [{0}:{1,number,integer}]
-bioSender.openSocket=Sender open socket to [{0}:{1,number,integer}] (open count {2,number,integer})
-bioSender.openSocket.failure=Open sender socket [{0}:{1,number,integer}] failure! (open failure count {2,number,integer})
-bioSender.closeSocket=Sender close socket to [{0}:{1,number,integer}] (close count {2,number,integer})
+bioReplicationTask.unable.service=Unable to service bio socket
+
 bioSender.ack.eof=EOF reached at local port [{0}:{1,number,integer}]
+bioSender.ack.missing=Unable to read acknowledgement from [{0}:{1,number,integer}] in {2,number,integer} ms. Disconnecting socket, and trying again.
 bioSender.ack.wrong=Missing correct ACK after 10 bytes read at local port [{0}:{1,number,integer}]
+bioSender.closeSocket=Sender close socket to [{0}:{1,number,integer}] (close count {2,number,integer})
+bioSender.disconnect=Sender disconnect from [{0}:{1,number,integer}] (disconnect count {2,number,integer})
 bioSender.fail.AckReceived=Received a failed ack:org.apache.catalina.tribes.transport.Constants.FAIL_ACK_DATA
-bioSender.ack.missing=Unable to read acknowledgement from [{0}:{1,number,integer}] in {2,number,integer} ms. Disconnecting socket, and trying again.
+bioSender.openSocket=Sender open socket to [{0}:{1,number,integer}] (open count {2,number,integer})
+bioSender.openSocket.failure=Open sender socket [{0}:{1,number,integer}] failure! (open failure count {2,number,integer})
+bioSender.send.again=Send data again to [{0}:{1,number,integer}]
+
+pooledMultiSender.retrieve.fail=Unable to retrieve a sender from the sender pool
 pooledMultiSender.unable.retrieve.sender=Unable to retrieve a data sender, time out[{0}] ms) error.
-pooledMultiSender.retrieve.fail=Unable to retrieve a sender from the sender pool
\ No newline at end of file

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=1846398&r1=1846397&r2=1846398&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] Mon Nov 12 11:16:39 2018
@@ -23,31 +23,35 @@ nioReceiver.stop.fail=Unable to close cl
 nioReceiver.stop.threadRunning=The NioReceiver thread did not stop in a timely manner. Errors may be observed when the selector is closed.
 nioReceiver.threadpool.fail=ThreadPool cannot be initialized. Listener not started.
 nioReceiver.threadsExhausted=Channel key is registered, but has had no interest ops for the last [{0}] ms. (cancelled: [{1}]):[{2}] last access:[{3} Possible cause: all threads used, perform thread dump
-nioReplicationTask.unable.drainChannel.ioe=IOException in replication worker, unable to drain channel. Probable cause: Keep alive socket closed[{0}].
+
+nioReplicationTask.error.register.key=Error registering key for read:[{0}]
 nioReplicationTask.exception.drainChannel=Exception caught in TcpReplicationThread.drainChannel.
 nioReplicationTask.process.clusterMsg.failed=Processing of cluster message failed.
-nioReplicationTask.error.register.key=Error registering key for read:[{0}]
 nioReplicationTask.unable.ack=Unable to send ACK back through channel, channel disconnected?: [{0}]
-nioSender.sender.disconnected=Sender has been disconnected, can't selection key.
-nioSender.key.inValid=Key is not valid, it must have been cancelled.
-nioSender.unknown.state=Data is in unknown state. readyOps=[{0}]
-nioSender.unable.receive.ack=Unable to receive an ack message. EOF on socket channel has been reached.
-nioSender.receive.failedAck=Received a failed ack:org.apache.catalina.tribes.transport.Constants.FAIL_ACK_DATA
-nioSender.not.connected=NioSender is not connected, this should not occur.
+nioReplicationTask.unable.drainChannel.ioe=IOException in replication worker, unable to drain channel. Probable cause: Keep alive socket closed[{0}].
+
 nioSender.already.connected=NioSender is already in connected state.
 nioSender.datagram.already.established=Datagram channel has already been established. Connection might be in progress.
+nioSender.key.inValid=Key is not valid, it must have been cancelled.
+nioSender.not.connected=NioSender is not connected, this should not occur.
+nioSender.receive.failedAck=Received a failed ack:org.apache.catalina.tribes.transport.Constants.FAIL_ACK_DATA
+nioSender.sender.disconnected=Sender has been disconnected, can't selection key.
 nioSender.socketChannel.already.established=Socket channel has already been established. Connection might be in progress.
 nioSender.unable.disconnect=Unable to disconnect NioSender. msg=[{0}]
-parallelNioSender.send.failed=Parallel NIO send failed.
+nioSender.unable.receive.ack=Unable to receive an ack message. EOF on socket channel has been reached.
+nioSender.unknown.state=Data is in unknown state. readyOps=[{0}]
+
+parallelNioSender.error.keepalive=Error during keepalive test for sender:[{0}]
 parallelNioSender.operation.timedout=Operation has timed out([{0}] ms.).
-parallelNioSender.send.fail.retrying=Member send is failing for:[{0}] ; Setting to suspect and retrying.
 parallelNioSender.send.fail=Member send is failing for:[{0}] ; Setting to suspect.
+parallelNioSender.send.fail.retrying=Member send is failing for:[{0}] ; Setting to suspect and retrying.
+parallelNioSender.send.failed=Parallel NIO send failed.
+parallelNioSender.sendFailed.attempt=Send failed, attempt:[{0}] max:[{1}]
 parallelNioSender.sender.disconnected.notRetry=Not retrying send for:[{0}]; Sender is disconnected.
 parallelNioSender.sender.disconnected.sendFailed=Send failed, and sender is disconnected. Not retrying.
-parallelNioSender.sendFailed.attempt=Send failed, attempt:[{0}] max:[{1}]
 parallelNioSender.unable.setup.NioSender=Unable to setup NioSender.
-parallelNioSender.error.keepalive=Error during keepalive test for sender:[{0}]
+
 pooledParallelSender.sender.disconnected=Sender not connected.
-pooledParallelSender.unable.retrieveSender.timeout=Unable to retrieve a data sender, time out([{0}] ms) error.
+pooledParallelSender.unable.open=Unable to open NIO selector.
 pooledParallelSender.unable.retrieveSender=Unable to retrieve a sender from the sender pool
-pooledParallelSender.unable.open=Unable to open NIO selector.
\ No newline at end of file
+pooledParallelSender.unable.retrieveSender.timeout=Unable to retrieve a data sender, time out([{0}] ms) error.

Modified: tomcat/trunk/java/org/apache/catalina/tribes/util/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/util/LocalStrings.properties?rev=1846398&r1=1846397&r2=1846398&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/util/LocalStrings.properties [UTF-8] (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/util/LocalStrings.properties [UTF-8] Mon Nov 12 11:16:39 2018
@@ -13,11 +13,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-arrays.srcoffset.outOfBounds=srcoffset is out of bounds.
 arrays.keyoffset.outOfBounds=keyoffset is out of bounds.
 arrays.length.outOfBounds=not enough data elements in the key, length is out of bounds.
 arrays.malformed.arrays=byte arrays must be represented as {1,3,4,5,6}
-executorFactory.queue.full=Queue capacity is full.
+arrays.srcoffset.outOfBounds=srcoffset is out of bounds.
+
 executorFactory.not.running=Executor not running, can't force a command into the queues
+executorFactory.queue.full=Queue capacity is full.
+
 uuidGenerator.createRandom=Creation of SecureRandom instance for UUID generation using [{0}] took [{1}] milliseconds.
-uuidGenerator.unable.fit=Unable to fit [{0}] bytes into the array. length:[{1}] required length:[{2}]
\ No newline at end of file
+uuidGenerator.unable.fit=Unable to fit [{0}] bytes into the array. length:[{1}] required length:[{2}]

Modified: tomcat/trunk/java/org/apache/catalina/users/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/users/LocalStrings.properties?rev=1846398&r1=1846397&r2=1846398&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/users/LocalStrings.properties [UTF-8] (original)
+++ tomcat/trunk/java/org/apache/catalina/users/LocalStrings.properties [UTF-8] Mon Nov 12 11:16:39 2018
@@ -13,8 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-memoryUserDatabase.fileNotFound=The specified user database [{0}] could not be found
 memoryUserDatabase.fileDelete=Failed to delete [{0}]
+memoryUserDatabase.fileNotFound=The specified user database [{0}] could not be found
 memoryUserDatabase.notPersistable=User database is not persistable - no write permissions on directory
 memoryUserDatabase.nullGroup=Null or zero length group name specified. The group will be ignored.
 memoryUserDatabase.nullRole=Null or zero length role name specified. The role will be ignored.
@@ -22,8 +22,8 @@ memoryUserDatabase.nullUser=Null or zero
 memoryUserDatabase.readOnly=User database has been configured to be read only. Changes cannot be saved
 memoryUserDatabase.reload=Reloading memory user database [{0}] from updated source [{1}]
 memoryUserDatabase.reloadError=Error reloading memory user database [{0}] from updated source [{1}]
-memoryUserDatabase.renameOld=Cannot rename original file to [{0}]
 memoryUserDatabase.renameNew=Cannot rename new file to [{0}]
+memoryUserDatabase.renameOld=Cannot rename original file to [{0}]
 memoryUserDatabase.restoreOrig=Cannot restore [{0} to original file
 memoryUserDatabase.writeException=IOException writing to [{0}]
 memoryUserDatabase.xmlFeatureEncoding=Exception configuring digester to permit java encoding names in XML files. Only IANA encoding names will be supported.



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org