This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 7.0.x
in repository

commit 91bc1b242569349c26f5d7beedbd169afaf5e200
Author: Mark Thomas <>
AuthorDate: Wed Sep 11 15:37:47 2019 +0100

    Remove unused i18n messages (removal of translations to follow)
 java/org/apache/catalina/loader/         | 2 --
 java/org/apache/catalina/manager/     | 1 -
 java/org/apache/catalina/startup/        | 3 ---
 java/org/apache/jasper/resources/        | 1 -
 java/org/apache/tomcat/util/http/parser/ | 1 -
 java/org/apache/tomcat/websocket/        | 1 -
 java/org/apache/tomcat/websocket/server/ | 3 ---
 7 files changed, 12 deletions(-)

diff --git a/java/org/apache/catalina/loader/ 
index 436a7ce..9639ec9 100644
--- a/java/org/apache/catalina/loader/
+++ b/java/org/apache/catalina/loader/
@@ -52,8 +52,6 @@ webappClassLoader.checkThreadLocalsForLeaksNull=The web 
application [{0}] create
 webappClassLoader.checkThreadsHttpClient=Found HttpClient keep-alive thread 
using web application class loader. Fixed by switching thread to the parent 
class loader.
 webappClassLoader.clearJdbc=The web application [{0}] registered the JDBC 
driver [{1}] but failed to unregister it when the web application was stopped. 
To prevent a memory leak, the JDBC Driver has been forcibly unregistered.
 webappClassLoader.clearObjectStreamClassCachesFail=Failed to clear soft 
references from ObjectStreamClass$Caches for web application [{0}]
-webappClassLoader.clearReferencesResourceBundlesCount=Removed [{0}] 
ResourceBundle references from the cache for web application [{1}]
-webappClassLoader.clearReferencesResourceBundlesFail=Failed to clear 
ResourceBundle references for web application [{0}]
 webappClassLoader.clearRmi=Found RMI Target with stub class class [{0}] and 
value [{1}]. This RMI Target has been forcibly removed to prevent a memory leak.
 webappClassLoader.clearRmiFail=Failed to clear context class loader referenced 
from sun.rmi.transport.Target for web application [{0}]
 webappClassLoader.clearRmiInfo=Failed to find class sun.rmi.transport.Target 
to clear context class loader for web application [{0}]. This is expected on 
non-Sun JVMs.
diff --git a/java/org/apache/catalina/manager/ 
index f742471..7e79891 100644
--- a/java/org/apache/catalina/manager/
+++ b/java/org/apache/catalina/manager/
@@ -162,7 +162,6 @@ managerServlet.sslReloadFail=ОШИБКА - Не удалось перезагр
 managerServlet.startFailed=ОШИБКА - Application at context path [{0}] could 
not be started
 managerServlet.started=OK - Запущено приложение по пути контекста [{0}]
 managerServlet.stopped=OK - Остановлено приложение по пути контекста [{0}]
-managerServlet.storeConfig.invalidMBean=ОШИБКА - Не удалось найти StoreConfig 
 managerServlet.storeConfig.noMBean=ОШИБКА - Нет StoreConfig MBean, 
зарегистрированный на [{0}]
 managerServlet.threaddump=OK - JVM thread dump
 managerServlet.trustedCertsNotConfigured=Для этого виртуального хоста не 
настроены доверенные сертификаты безопасности
diff --git a/java/org/apache/catalina/startup/ 
index cb76e8e..a405f28 100644
--- a/java/org/apache/catalina/startup/
+++ b/java/org/apache/catalina/startup/
@@ -32,7 +32,6 @@ contextConfig.authenticatorInstantiate=Cannot instantiate an 
authenticator of cl
 contextConfig.authenticatorMissing=Cannot configure an authenticator for 
method [{0}]
 contextConfig.authenticatorResources=Cannot load authenticators mapping list
 contextConfig.badUrl=Unable to process context descriptor [{0}]
-contextConfig.baseError=Unable to determine location of global configuration 
(usually $CATALINA_BASE/conf)
 contextConfig.cce=Lifecycle event data object [{0}] is not a Context
 contextConfig.contextClose=Error closing context.xml
 contextConfig.contextMissing=Missing context.xml: [{0}]
@@ -47,7 +46,6 @@ contextConfig.init=ContextConfig: Initializing
 contextConfig.inputStreamFile=Unable to process file [{0}] for annotations
 contextConfig.inputStreamJar=Unable to process Jar entry [{0}] from Jar [{1}] 
for annotations
 contextConfig.inputStreamJndi=Unable to process resource element [{0}] for 
-contextConfig.invalidSci=The ServletContentInitializer [{0}] could not be 
 contextConfig.invalidSciHandlesTypes=Unable to load class [{0}] to check 
against the @HandlesTypes annotation of one or more ServletContentInitializers.
 contextConfig.jar=Unable to process resource [{0}] for annotations
 contextConfig.jarFile=Unable to process Jar [{0}] for annotations
@@ -118,7 +116,6 @@ hostConfig.deploying=Deploying discovered web applications
 hostConfig.docBaseUrlInvalid=The provided docBase cannot be expressed as a URL
 hostConfig.expand=Expanding web application archive [{0}]
 hostConfig.expand.error=Exception while expanding web application archive [{0}]
-hostConfig.expanding=Expanding discovered web application archives
 hostConfig.ignorePath=Ignoring path [{0}] in appBase for automatic deployment
 hostConfig.illegalWarName=The war name [{0}] is invalid. The archive will be 
 hostConfig.jmx.register=Register context [{0}] failed
diff --git a/java/org/apache/jasper/resources/ 
index d21d377..9894d43 100644
--- a/java/org/apache/jasper/resources/
+++ b/java/org/apache/jasper/resources/
@@ -161,7 +161,6 @@ jsp.error.params.emptyBody=jsp:params must contain at least 
one nested jsp:param
 jsp.error.params.invalidUse=jsp:params must be a direct child of jsp:plugin Error in the tag library descriptor: [{0}]
 jsp.error.parse.xml=XML parsing error on file [{0}]
-jsp.error.parse.xml.invalidPublicId=Invalid PUBLIC ID: [{0}]
 jsp.error.parse.xml.line=XML parsing error on file [{0}]: (line [{1}], col 
 jsp.error.parse.xml.scripting.invalid.body=Body of [{0}] element must not 
contain any XML elements
 jsp.error.plugin.badtype=Illegal value for 'type' attribute in jsp:plugin: 
must be 'bean' or 'applet'
diff --git a/java/org/apache/tomcat/util/http/parser/ 
index 8af7cc0..e258d30 100644
--- a/java/org/apache/tomcat/util/http/parser/
+++ b/java/org/apache/tomcat/util/http/parser/
@@ -33,4 +33,3 @@ http.tooFewHextets=An IPv6 address must consist of 8 hextets 
but this address co
 http.tooManyColons=An IPv6 address may not contain more than 2 sequential 
colon characters.
 http.tooManyDoubleColons=An IPv6 address may only contain a single '::' 
 http.tooManyHextets=The IPv6 address contains [{0}] hextets but a valid IPv6 
address may not have more than 8.
-http.wrongOctetCount=An IPv4 address should have exactly 4 octets, not [{0}].
diff --git a/java/org/apache/tomcat/websocket/ 
index 4a5ee08..8507c1a 100644
--- a/java/org/apache/tomcat/websocket/
+++ b/java/org/apache/tomcat/websocket/
@@ -99,7 +99,6 @@ wsSession.duplicateHandlerBinary=A binary message handler has 
already been confi
 wsSession.duplicateHandlerPong=A pong message handler has already been 
 wsSession.duplicateHandlerText=A text message handler has already been 
 wsSession.flushFailOnClose=Failed to flush batched messages on session close
-wsSession.instanceDestroy=Endpoint instance unregistration failed
 wsSession.instanceNew=Endpoint instance registration failed
 wsSession.invalidHandlerTypePong=A pong message handler must implement 
 wsSession.messageFailed=Unable to write the complete message as the WebSocket 
connection has been closed
diff --git a/java/org/apache/tomcat/websocket/server/ 
index c002755..7fad34c 100644
--- a/java/org/apache/tomcat/websocket/server/
+++ b/java/org/apache/tomcat/websocket/server/
@@ -21,9 +21,6 @@ serverContainer.duplicatePaths=Multiple Endpoints may not be 
deployed to the sam
 serverContainer.encoderFail=Unable to create encoder of type [{0}]
 serverContainer.failedDeployment=Deployment of WebSocket Endpoints to the web 
application with path [{0}] in host [{1}] is not permitted due to the failure 
of a previous deployment
 serverContainer.missingAnnotation=Cannot deploy POJO class [{0}] as it is not 
annotated with @ServerEndpoint
-serverContainer.missingEndpoint=An Endpoint instance has been request for path 
[{0}] but no matching Endpoint class was found
-serverContainer.pojoDeploy=POJO class [{0}] deploying to path [{1}] in 
ServletContext [{2}]
-serverContainer.servletContextMismatch=Attempted to register a POJO annotated 
for WebSocket at path [{0}] in the ServletContext with context path [{1}] when 
the WebSocket ServerContainer is allocated to the ServletContext with context 
path [{2}]
 serverContainer.servletContextMissing=No ServletContext was specified
 serverContainer.threadGroupNotDestroyed=Unable to destroy WebSocket thread 
group [{0}] as [{1}] threads were still running when the web application was 
stopped. The thread group will be destroyed once the threads terminate.

To unsubscribe, e-mail:
For additional commands, e-mail:

Reply via email to