This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push: new a2f6624 Remove unnecessary brackets. Based on a pull request by ijliym a2f6624 is described below commit a2f66240c1f09312bc045eec8af268d60129d9bb Author: Mark Thomas <ma...@apache.org> AuthorDate: Mon Oct 12 17:09:58 2020 +0100 Remove unnecessary brackets. Based on a pull request by ijliym --- .../catalina/authenticator/jaspic/LocalStrings_zh_CN.properties | 2 +- java/org/apache/catalina/loader/LocalStrings_zh_CN.properties | 2 +- java/org/apache/catalina/manager/LocalStrings_zh_CN.properties | 2 +- java/org/apache/catalina/realm/LocalStrings_zh_CN.properties | 2 +- java/org/apache/catalina/startup/LocalStrings_zh_CN.properties | 8 ++++---- java/org/apache/tomcat/util/LocalStrings_zh_CN.properties | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/java/org/apache/catalina/authenticator/jaspic/LocalStrings_zh_CN.properties b/java/org/apache/catalina/authenticator/jaspic/LocalStrings_zh_CN.properties index aed0961..8de2b56 100644 --- a/java/org/apache/catalina/authenticator/jaspic/LocalStrings_zh_CN.properties +++ b/java/org/apache/catalina/authenticator/jaspic/LocalStrings_zh_CN.properties @@ -16,7 +16,7 @@ authConfigFactoryImpl.load=从[{0}]加载持久化提供者注册信息 authConfigFactoryImpl.registerClass=正在为层[{1}]和应用程序上下文[{2}]注册类[{0}] authConfigFactoryImpl.registerInstance=正在为层[{1}]和应用程序上下文[{2}]注册类型为[{0}]的实例 -authConfigFactoryImpl.zeroLengthAppContext=:)应用上下文名称的长度为0是无效的 +authConfigFactoryImpl.zeroLengthAppContext=应用上下文名称的长度为0是无效的 authConfigFactoryImpl.zeroLengthMessageLayer=零长度的消息层名称是无效的 callbackHandlerImpl.jaspicCallbackMissing=接收到不支持的类型为{0}的JASPIC回调,该回调被忽略 diff --git a/java/org/apache/catalina/loader/LocalStrings_zh_CN.properties b/java/org/apache/catalina/loader/LocalStrings_zh_CN.properties index f70274e..1f9de7d 100644 --- a/java/org/apache/catalina/loader/LocalStrings_zh_CN.properties +++ b/java/org/apache/catalina/loader/LocalStrings_zh_CN.properties @@ -23,7 +23,7 @@ webappClassLoader.addTransformer.illegalArgument=Web应用程序[{0}]试图添 webappClassLoader.checkThreadLocalsForLeaks=web应用程序[{0}]创建了一个ThreadLocal,其键类型为[{1}](值为[{2}]),值类型为[{3}](值为[{4}),但在停止web应用程序时未能将其删除。线程将随着时间的推移而更新,以尝试避免可能的内存泄漏 webappClassLoader.checkThreadLocalsForLeaks.badKey=无法确定类型为[{0}]的键的字符串表示形式 webappClassLoader.checkThreadLocalsForLeaks.badValue=无法确定类型为 [{0}] 的值的字符串表示形式 -webappClassLoader.checkThreadLocalsForLeaks.unknown=:)未知 +webappClassLoader.checkThreadLocalsForLeaks.unknown=未知 webappClassLoader.checkThreadLocalsForLeaksFail=检查ThreadLocal引用失败,web应用程序:[{0}] webappClassLoader.checkThreadLocalsForLeaksNone=web应用程序 [{0}] 创建了1个ThreadLocal变量(键:[{2}] (类型[{1}]) ,值:[{4}](类型[{3}]) )。键仅被ThreadLocal Map弱引用,所以不是内存泄露。 webappClassLoader.checkThreadLocalsForLeaksNull=web应用程序[{0}]创建了一个ThreadLocal,其键类型为[{1}](值为[{2}])。ThreadLocal已正确设置为null,GC将删除该键 diff --git a/java/org/apache/catalina/manager/LocalStrings_zh_CN.properties b/java/org/apache/catalina/manager/LocalStrings_zh_CN.properties index 3058278..f11fac4 100644 --- a/java/org/apache/catalina/manager/LocalStrings_zh_CN.properties +++ b/java/org/apache/catalina/manager/LocalStrings_zh_CN.properties @@ -48,7 +48,7 @@ htmlManagerServlet.connectorStateTableTitleTime=时间 htmlManagerServlet.connectorStateTableTitleVHost=虚拟主机 htmlManagerServlet.connectorStateThreadBusy=当前线程繁忙: htmlManagerServlet.connectorStateThreadCount=当前线程数: -htmlManagerServlet.deployButton=:)部署 +htmlManagerServlet.deployButton=部署 htmlManagerServlet.deployConfig=XML配置文件路径: htmlManagerServlet.deployPath=Context路径: htmlManagerServlet.deployServer=服务器上.部署的目录或WAR文件 diff --git a/java/org/apache/catalina/realm/LocalStrings_zh_CN.properties b/java/org/apache/catalina/realm/LocalStrings_zh_CN.properties index f3d0b80..ae4fffb 100644 --- a/java/org/apache/catalina/realm/LocalStrings_zh_CN.properties +++ b/java/org/apache/catalina/realm/LocalStrings_zh_CN.properties @@ -29,7 +29,7 @@ dataSourceRealm.authenticateSuccess=用户名[{0}]已成功通过身份验证。 dataSourceRealm.close=关闭数据库连接时发生异常 dataSourceRealm.exception=认证异常 dataSourceRealm.getPassword.exception=获取用户名[{0}]对应的密码失败。 -dataSourceRealm.getRoles.exception=:)检索角色[{0}]异常 +dataSourceRealm.getRoles.exception=检索角色[{0}]异常 jaasCallback.username=返回用户名 [{0}] diff --git a/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties b/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties index c7e6a59..a1c4231 100644 --- a/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties +++ b/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties @@ -82,7 +82,7 @@ contextConfig.tomcatWebXmlError=处理 /WEB-INF/tomcat-web.xml 发生错误 contextConfig.unavailable=由于之前的错误,标记当前应用程序不可用 contextConfig.unknownUrlProtocol=注解解析过程中,URL协议[{0}]未识别。忽略URL[{1}]。 contextConfig.urlPatternValue=类文件[{1}]的urlPatterns和值属性上同时设置了注解[{0}] -contextConfig.xmlSettings=上下文[{0}]将解析web.xml和web-fragment.xml文件,验证为:[{1}],命名空间感知为(:[{2}] +contextConfig.xmlSettings=上下文[{0}]将解析web.xml和web-fragment.xml文件,验证为:[{1}],命名空间感知为:[{2}] engineConfig.cce=生命周期事件数据对象[{0}]不是一个引擎(Engine) engineConfig.start=EngineConfig:处理开始。 @@ -107,12 +107,12 @@ hostConfig.context.restart=上下文[{0}]重新启动时出错。 hostConfig.createDirs=无法为部署创建目录:[{0}] hostConfig.deploy.error=部署web应用程序目录[{0}]时发生异常 hostConfig.deployDescriptor=正在部署部署描述符[{0}]。 -hostConfig.deployDescriptor.blocked=(:未部署上下文路径为[{0}]的Web应用程序,因为它包含一个部署描述符[{1}],该描述符可能包含安全部署应用程序所需的配置,但此主机的DeployXML设置阻止了部署描述符的处理。应该在[{2}]创建适当的描述符来部署此应用程序。 +hostConfig.deployDescriptor.blocked=未部署上下文路径为[{0}]的Web应用程序,因为它包含一个部署描述符[{1}],该描述符可能包含安全部署应用程序所需的配置,但此主机的DeployXML设置阻止了部署描述符的处理。应该在[{2}]创建适当的描述符来部署此应用程序。 hostConfig.deployDescriptor.error=部署描述符[{0}]时出错 hostConfig.deployDescriptor.finished=部署描述符[{0}]的部署已在[{1}]ms内完成 hostConfig.deployDescriptor.hiddenDir=使用外部docBase部署部署描述符[{0}]意味着appBase中的目录[{1}]将被忽略 hostConfig.deployDescriptor.hiddenWar=使用外部docBase部署部署描述符[{0}]意味着appBase中的WAR[{1}]将被忽略 -hostConfig.deployDescriptor.localDocBaseSpecified=(:在主机appBase 中指定了docBase [{0}],将被忽略 +hostConfig.deployDescriptor.localDocBaseSpecified=在主机appBase 中指定了docBase [{0}],将被忽略 hostConfig.deployDescriptor.path=部署描述符[{1}]中值为[{0}]的路径属性已被忽略 hostConfig.deployDescriptor.threaded.error=等待部署描述符的多线程部署完成时出错 hostConfig.deployDir=把web 应用程序部署到目录 [{0}] @@ -135,7 +135,7 @@ hostConfig.jmx.unregister=移除注册上下文[{0}]失败 hostConfig.reload=重新加载上下文[{0}] hostConfig.resourceNotAbsolute=无法从上下文[{0}]中删除资源,因为[{1}]不是绝对路径 hostConfig.start=HostConfig: 开始处理 -hostConfig.stop=:)Host配置:停止处理 +hostConfig.stop=Host配置:停止处理 hostConfig.undeploy=正在取消部署上下文[{0}] hostConfig.undeployVersion=正在取消部署没有活动会话的旧版本上下文[{0}] diff --git a/java/org/apache/tomcat/util/LocalStrings_zh_CN.properties b/java/org/apache/tomcat/util/LocalStrings_zh_CN.properties index f6edc24..0498df4 100644 --- a/java/org/apache/tomcat/util/LocalStrings_zh_CN.properties +++ b/java/org/apache/tomcat/util/LocalStrings_zh_CN.properties @@ -14,7 +14,7 @@ # limitations under the License. diagnostics.threadDumpTitle=打印全部线程 -diagnostics.vmInfoClassCompilation=:)class汇编 +diagnostics.vmInfoClassCompilation=class汇编 diagnostics.vmInfoClassLoading=类加载中 diagnostics.vmInfoGarbageCollectors=垃圾收集器[{0}] diagnostics.vmInfoLogger=日志记录器(Logger)信息 --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org