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 2020/07/07 10:03:29 UTC

[tomcat] branch 7.0.x updated (60da928 -> 259177c)

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

markt pushed a change to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git.


    from 60da928  maven-resolver-ant-tasks is used instead of maven-ant-tasks
     new 6943e29  Remove the `managerServlet.listitem` from the localized strings
     new e36b6a7  Remove `hostManagerServlet.listitem` from the localized strings
     new 259177c  Update

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 java/org/apache/catalina/manager/LocalStrings.properties      |  1 -
 java/org/apache/catalina/manager/LocalStrings_de.properties   |  1 -
 java/org/apache/catalina/manager/LocalStrings_es.properties   |  1 -
 java/org/apache/catalina/manager/LocalStrings_fr.properties   |  1 -
 java/org/apache/catalina/manager/LocalStrings_ja.properties   |  1 -
 java/org/apache/catalina/manager/LocalStrings_ko.properties   |  1 -
 java/org/apache/catalina/manager/LocalStrings_ru.properties   |  1 -
 .../org/apache/catalina/manager/LocalStrings_zh_CN.properties |  1 -
 java/org/apache/catalina/manager/ManagerServlet.java          | 11 +++++++----
 java/org/apache/catalina/manager/host/HostManagerServlet.java | 11 ++---------
 java/org/apache/catalina/manager/host/LocalStrings.properties |  1 -
 .../apache/catalina/manager/host/LocalStrings_es.properties   |  1 -
 .../apache/catalina/manager/host/LocalStrings_fr.properties   |  1 -
 .../apache/catalina/manager/host/LocalStrings_ja.properties   |  1 -
 .../apache/catalina/manager/host/LocalStrings_ko.properties   |  1 -
 .../apache/catalina/manager/host/LocalStrings_ru.properties   |  1 -
 .../catalina/manager/host/LocalStrings_zh_CN.properties       |  1 -
 webapps/docs/changelog.xml                                    |  9 +++++++++
 18 files changed, 18 insertions(+), 28 deletions(-)


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


[tomcat] 01/03: Remove the `managerServlet.listitem` from the localized strings

Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 6943e29e339dafa410e0ad1d6617ccb233844a91
Author: Fabien Zindy <fa...@gmail.com>
AuthorDate: Tue Jun 30 21:04:14 2020 +0200

    Remove the `managerServlet.listitem` from the localized strings
---
 java/org/apache/catalina/manager/LocalStrings.properties      |  1 -
 java/org/apache/catalina/manager/LocalStrings_de.properties   |  1 -
 java/org/apache/catalina/manager/LocalStrings_es.properties   |  1 -
 java/org/apache/catalina/manager/LocalStrings_fr.properties   |  1 -
 java/org/apache/catalina/manager/LocalStrings_ja.properties   |  1 -
 java/org/apache/catalina/manager/LocalStrings_ko.properties   |  1 -
 java/org/apache/catalina/manager/LocalStrings_ru.properties   |  1 -
 .../org/apache/catalina/manager/LocalStrings_zh_CN.properties |  1 -
 java/org/apache/catalina/manager/ManagerServlet.java          | 11 +++++++----
 9 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/java/org/apache/catalina/manager/LocalStrings.properties b/java/org/apache/catalina/manager/LocalStrings.properties
index 001fcaa..51bffb4 100644
--- a/java/org/apache/catalina/manager/LocalStrings.properties
+++ b/java/org/apache/catalina/manager/LocalStrings.properties
@@ -122,7 +122,6 @@ managerServlet.invalidCommand=FAIL - Invalid parameters supplied for command [{0
 managerServlet.invalidPath=FAIL - Invalid context path [{0}] was specified
 managerServlet.invalidWar=FAIL - Invalid application URL [{0}] was specified
 managerServlet.listed=OK - Listed applications for virtual host [{0}]
-managerServlet.listitem={0}:{1}:{2}:{3}
 managerServlet.mkdirFail=FAIL - Unable to create directory [{0}]
 managerServlet.noAppBase=FAIL - Cannot identify application base for context path [{0}]
 managerServlet.noCommand=FAIL - No command was specified
diff --git a/java/org/apache/catalina/manager/LocalStrings_de.properties b/java/org/apache/catalina/manager/LocalStrings_de.properties
index c93da49..40d7398 100644
--- a/java/org/apache/catalina/manager/LocalStrings_de.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_de.properties
@@ -70,7 +70,6 @@ managerServlet.exception=FEHLER - Ausnahme aufgetreten [{0}]
 managerServlet.invalidPath=FEHLER - Ungültiger Kontext Pfad [{0}] angegeben
 managerServlet.invalidWar=FEHLER - Ungültige URL [{0}] für Anwendung angegeben
 managerServlet.listed=OK - Auflistung der Webanwendungen für virtuellen Server [{0}]
-managerServlet.listitem={0}:{1}:{2}:{3}
 managerServlet.mkdirFail=Fehler - Das Verzeichnis [{0}] konnte nicht erstellt werden.
 managerServlet.noAppBase=FEHLER - Kann Verzeichnis für Kontext Pfad [{0}] nicht finden
 managerServlet.noCommand=FEHLER - Es wurde kein Kommando angegeben
diff --git a/java/org/apache/catalina/manager/LocalStrings_es.properties b/java/org/apache/catalina/manager/LocalStrings_es.properties
index 389b530..7ff7931 100644
--- a/java/org/apache/catalina/manager/LocalStrings_es.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_es.properties
@@ -87,7 +87,6 @@ managerServlet.invalidCommand=Fallo - Se proveiron parámetros inválidos para e
 managerServlet.invalidPath=FALLO - Se ha especificado una trayectoria inválida de contexto [{0}]
 managerServlet.invalidWar=FALLO - Se ha especificado una URL de aplicación inválida [{0}]
 managerServlet.listed=OK - Aplicaciones listadas para máquina virtual [{0}]
-managerServlet.listitem={0}:{1}:{2}:{3}
 managerServlet.mkdirFail=FALLO - No pude crear directorio [{0}]
 managerServlet.noAppBase=FALLO - No puedo identificar aplicación base para trayectoria de contexto [{0}]
 managerServlet.noCommand=FALLO - No se ha especificado comando
diff --git a/java/org/apache/catalina/manager/LocalStrings_fr.properties b/java/org/apache/catalina/manager/LocalStrings_fr.properties
index 41c1277..1f2c996 100644
--- a/java/org/apache/catalina/manager/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_fr.properties
@@ -120,7 +120,6 @@ managerServlet.invalidCommand=ECHEC - Des paramètres incorrects ont été fourn
 managerServlet.invalidPath=ECHEC - Un chemin de contexte invalide [{0}] a été spécifié
 managerServlet.invalidWar=ECHEC - Une URL d''application invalide [{0}] a été spécifiée
 managerServlet.listed=OK - Applications listées pour l''hôte virtuel (virtual host) [{0}]
-managerServlet.listitem={0} : {1} : {2} : {3}
 managerServlet.mkdirFail=ECHEC - Le répertoire [{0}] n''a pas pu être créé
 managerServlet.noAppBase=ECHEC - Impossible d''identifier la base de l''application base pour le chemin de contexte [{0}]
 managerServlet.noCommand=ECHEC - Aucune commande n'a été spécifiée
diff --git a/java/org/apache/catalina/manager/LocalStrings_ja.properties b/java/org/apache/catalina/manager/LocalStrings_ja.properties
index 2bcf0d7..48526f7 100644
--- a/java/org/apache/catalina/manager/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_ja.properties
@@ -122,7 +122,6 @@ managerServlet.invalidCommand=FAIL  - コマンド[{0}]に無効なパラメー
 managerServlet.invalidPath=FAIL - 無効なコンテキストパス [{0}] が指定されました
 managerServlet.invalidWar=FAIL - 無効なアプリケーションのURL [{0}] が指定されました
 managerServlet.listed=OK - バーチャルホスト [{0}] のアプリケーション一覧です
-managerServlet.listitem={0}:{1}:{2}:{3}
 managerServlet.mkdirFail=FAIL - ディレクトリ [{0}] は作成できません。
 managerServlet.noAppBase=FAIL - コンテキストパス [{0}] に対してアプリケーションベースを確認できません
 managerServlet.noCommand=FAIL - コマンドが指定されていません
diff --git a/java/org/apache/catalina/manager/LocalStrings_ko.properties b/java/org/apache/catalina/manager/LocalStrings_ko.properties
index 5b77c3a..921ffa3 100644
--- a/java/org/apache/catalina/manager/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_ko.properties
@@ -117,7 +117,6 @@ managerServlet.inService=실패 - 애플리케이션 [{0}]이(가) 이미 서비
 managerServlet.invalidCommand=실패 - 명령 [{0}]을(를) 위해 유효하지 않은 파라미터들이 제공되었습니다.
 managerServlet.invalidPath=실패 - 유효하지 않은 컨텍스트 경로 [{0}]이(가) 지정되었습니다.
 managerServlet.listed=OK - 가상 호스트 [{0}]을(를) 위한 애플리케이션들의 목록이 표시되었습니다.
-managerServlet.listitem={0}:{1}:{2}:{3}
 managerServlet.mkdirFail=실패 - 디렉토리 [{0}]을(를) 생성할 수 없습니다.
 managerServlet.noCommand=실패 - 명령이 지정되지 않았습니다.
 managerServlet.noContext=실패 - [{0}](이)라는 이름을 가진 컨텍스트가 없습니다.
diff --git a/java/org/apache/catalina/manager/LocalStrings_ru.properties b/java/org/apache/catalina/manager/LocalStrings_ru.properties
index db7320e..8d165d9 100644
--- a/java/org/apache/catalina/manager/LocalStrings_ru.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_ru.properties
@@ -116,7 +116,6 @@ managerServlet.inService=ОШИБКА -  Приложение [{0}] уже об
 managerServlet.invalidCommand=ОШИБКА - Недопустимые параметры, предоставленные для команды [{0}]
 managerServlet.invalidPath=ОШИБКА - Указан недопустимый контекстный путь [{0}]
 managerServlet.listed=OK - Список приложений для виртуального хоста [{0}]
-managerServlet.listitem={0}:{1}:{2}:{3}
 managerServlet.mkdirFail=ОШИБКА - Не удалось создать директорию [{0}]
 managerServlet.noCommand=ОШИБКА - Команда не указана.
 managerServlet.noContext=ОШИБКА - Контекст не существует [{0}]
diff --git a/java/org/apache/catalina/manager/LocalStrings_zh_CN.properties b/java/org/apache/catalina/manager/LocalStrings_zh_CN.properties
index fae4f75..64ee889 100644
--- a/java/org/apache/catalina/manager/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_zh_CN.properties
@@ -116,7 +116,6 @@ managerServlet.inService=失败 - 应用程序[{0}]已服务
 managerServlet.invalidCommand=失败 - 无效参数,命令[{0}]
 managerServlet.invalidPath=失败 - 指定了无效到上下文路径[{0}]
 managerServlet.listed=OK - 虚拟主机[{0}]下的应用程序列表
-managerServlet.listitem={0}:{1}:{2}:{3}
 managerServlet.mkdirFail=失败 - 无法创建目录 [{0}]
 managerServlet.noCommand=失败 - 未指定命令
 managerServlet.noContext=失败 - 上下文环境[{0}]不存在
diff --git a/java/org/apache/catalina/manager/ManagerServlet.java b/java/org/apache/catalina/manager/ManagerServlet.java
index 3c893d3..21eff06 100644
--- a/java/org/apache/catalina/manager/ManagerServlet.java
+++ b/java/org/apache/catalina/manager/ManagerServlet.java
@@ -56,6 +56,7 @@ import org.apache.catalina.util.ServerInfo;
 import org.apache.tomcat.util.Diagnostics;
 import org.apache.tomcat.util.ExceptionUtils;
 import org.apache.tomcat.util.IntrospectionUtils;
+import org.apache.tomcat.util.buf.StringUtils;
 import org.apache.tomcat.util.modeler.Registry;
 import org.apache.tomcat.util.res.StringManager;
 
@@ -967,19 +968,21 @@ public class ManagerServlet extends HttpServlet implements ContainerServlet {
                 String displayPath = context.getPath();
                 if (displayPath.equals(""))
                     displayPath = "/";
+                List<String> parts = null;
                 if (context.getState().isAvailable()) {
-                    writer.println(smClient.getString("managerServlet.listitem",
+                    parts = Arrays.asList(
                             displayPath,
                             "running",
                             "" + context.getManager().findSessions().length,
-                            context.getDocBase()));
+                            context.getDocBase());
                 } else {
-                    writer.println(smClient.getString("managerServlet.listitem",
+                    parts = Arrays.asList(
                             displayPath,
                             "stopped",
                             "0",
-                            context.getDocBase()));
+                            context.getDocBase());
                 }
+                writer.println(StringUtils.join(parts, ':'));
             }
         }
     }


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


[tomcat] 03/03: Update

Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 259177cf110dbc052da5e33d4f58ad2d4d535c00
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Jul 7 10:57:47 2020 +0100

    Update
---
 webapps/docs/changelog.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index f9564d1..a594f89 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -60,6 +60,15 @@
   issues do not "pop up" wrt. others).
 -->
 <section name="Tomcat 7.0.106 (violetagg)" rtext="in development">
+  <subsection name="Web applications">
+    <changelog>
+      <fix>
+        Remove the localization of the text output of the Manager application 
+        list of contexts and the Host Manager application list of hosts so that
+        the output is more consistent. PR provided by Holomark. (markt)
+      </fix>
+    </changelog>
+  </subsection>
 </section>
 <section name="Tomcat 7.0.105 (violetagg)" rtext="release in progress">
   <subsection name="Catalina">


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


[tomcat] 02/03: Remove `hostManagerServlet.listitem` from the localized strings

Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit e36b6a790d91cc24eb786e8749fd92304e0e7f84
Author: Fabien Zindy <fa...@gmail.com>
AuthorDate: Thu Jul 2 00:34:36 2020 +0200

    Remove `hostManagerServlet.listitem` from the localized strings
---
 java/org/apache/catalina/manager/host/HostManagerServlet.java | 11 ++---------
 java/org/apache/catalina/manager/host/LocalStrings.properties |  1 -
 .../apache/catalina/manager/host/LocalStrings_es.properties   |  1 -
 .../apache/catalina/manager/host/LocalStrings_fr.properties   |  1 -
 .../apache/catalina/manager/host/LocalStrings_ja.properties   |  1 -
 .../apache/catalina/manager/host/LocalStrings_ko.properties   |  1 -
 .../apache/catalina/manager/host/LocalStrings_ru.properties   |  1 -
 .../catalina/manager/host/LocalStrings_zh_CN.properties       |  1 -
 8 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/java/org/apache/catalina/manager/host/HostManagerServlet.java b/java/org/apache/catalina/manager/host/HostManagerServlet.java
index faffbeb..4874ce2 100644
--- a/java/org/apache/catalina/manager/host/HostManagerServlet.java
+++ b/java/org/apache/catalina/manager/host/HostManagerServlet.java
@@ -44,6 +44,7 @@ import org.apache.catalina.core.ContainerBase;
 import org.apache.catalina.core.StandardHost;
 import org.apache.catalina.startup.HostConfig;
 import org.apache.tomcat.util.ExceptionUtils;
+import org.apache.tomcat.util.buf.StringUtils;
 import org.apache.tomcat.util.modeler.Registry;
 import org.apache.tomcat.util.res.StringManager;
 
@@ -556,15 +557,7 @@ public class HostManagerServlet
             Host host = (Host) container;
             String name = host.getName();
             String[] aliases = host.findAliases();
-            StringBuilder buf = new StringBuilder();
-            if (aliases.length > 0) {
-                buf.append(aliases[0]);
-                for (int j = 1; j < aliases.length; j++) {
-                    buf.append(',').append(aliases[j]);
-                }
-            }
-            writer.println(smClient.getString("hostManagerServlet.listitem",
-                                        name, buf.toString()));
+            writer.println(String.format("[%s]:[%s]", name, StringUtils.join(aliases)));
         }
     }
 
diff --git a/java/org/apache/catalina/manager/host/LocalStrings.properties b/java/org/apache/catalina/manager/host/LocalStrings.properties
index 4ec01f3..e9dae5f 100644
--- a/java/org/apache/catalina/manager/host/LocalStrings.properties
+++ b/java/org/apache/catalina/manager/host/LocalStrings.properties
@@ -28,7 +28,6 @@ hostManagerServlet.exception=FAIL - Encountered exception [{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.managerXml=FAIL - Couldn't install manager.xml
 hostManagerServlet.noCommand=FAIL - No command was specified
 hostManagerServlet.noHost=FAIL - Host name [{0}] does not exist
diff --git a/java/org/apache/catalina/manager/host/LocalStrings_es.properties b/java/org/apache/catalina/manager/host/LocalStrings_es.properties
index e1d2c3c..c5b655d 100644
--- a/java/org/apache/catalina/manager/host/LocalStrings_es.properties
+++ b/java/org/apache/catalina/manager/host/LocalStrings_es.properties
@@ -28,7 +28,6 @@ hostManagerServlet.exception=FALLO - Encontrada excepción [{0}]
 hostManagerServlet.invalidHostName=FALLO - Se ha especificado un nombre inválido de máquina [{0}]
 hostManagerServlet.list=listar: Listando máquinas para motor [{0}]
 hostManagerServlet.listed=OK - Máquinas listadas
-hostManagerServlet.listitem=[{0}]:[{1}]
 hostManagerServlet.managerXml=FALLO - no pude instalar manager.xml
 hostManagerServlet.noCommand=FALLO - No se ha especificado comando
 hostManagerServlet.noHost=FALLO - El nombre de máquina [{0}] no existe
diff --git a/java/org/apache/catalina/manager/host/LocalStrings_fr.properties b/java/org/apache/catalina/manager/host/LocalStrings_fr.properties
index 210e521..2e8cf8d 100644
--- a/java/org/apache/catalina/manager/host/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/manager/host/LocalStrings_fr.properties
@@ -28,7 +28,6 @@ hostManagerServlet.exception=ECHEC - Exception [{0}]
 hostManagerServlet.invalidHostName=ECHEC - Un nom d''hôte [{0}] invalide a été spécifié
 hostManagerServlet.list=list : Liste des hôte pour le moteur [{0}]
 hostManagerServlet.listed=OK - Liste des hôtes
-hostManagerServlet.listitem=[{0}] : [{1}]
 hostManagerServlet.managerXml=ECHEC - "manager.xml" n'a pas pu être installé
 hostManagerServlet.noCommand=ECHEC - Aucune commande n'a été spécifiée
 hostManagerServlet.noHost=ECHEC - Le nom d''hôte [{0}] n''existe pas
diff --git a/java/org/apache/catalina/manager/host/LocalStrings_ja.properties b/java/org/apache/catalina/manager/host/LocalStrings_ja.properties
index d3c40a8..9466bf0 100644
--- a/java/org/apache/catalina/manager/host/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/manager/host/LocalStrings_ja.properties
@@ -28,7 +28,6 @@ hostManagerServlet.exception=FAIL  - 例外[{0}]が発生しました
 hostManagerServlet.invalidHostName=FAIL  - 無効なホスト名[{0}]が指定されました
 hostManagerServlet.list=リスト:Engine[{0}]のHostのリスト
 hostManagerServlet.listed=OK - 列挙されたHost
-hostManagerServlet.listitem=[{0}]:[{1}]
 hostManagerServlet.managerXml=FAIL - manager.xml をインストールできませんでした。
 hostManagerServlet.noCommand=FAIL - コマンドが指定されませんでした。
 hostManagerServlet.noHost=FAIL - ホスト名 [{0}] は存在しません。
diff --git a/java/org/apache/catalina/manager/host/LocalStrings_ko.properties b/java/org/apache/catalina/manager/host/LocalStrings_ko.properties
index 98f7a31..bc0a086 100644
--- a/java/org/apache/catalina/manager/host/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/manager/host/LocalStrings_ko.properties
@@ -28,7 +28,6 @@ hostManagerServlet.exception=실패 - 예외 발생 [{0}]
 hostManagerServlet.invalidHostName=실패 - 유효하지 않은 호스트 이름 [{0}]이(가) 지정되었습니다.
 hostManagerServlet.list=목록: 엔진 [{0}]을(를) 위한 호스트들의 목록을 표시합니다.
 hostManagerServlet.listed=OK - 호스트 목록
-hostManagerServlet.listitem=[{0}]:[{1}]
 hostManagerServlet.managerXml=실패 - manager.xml을 설치할 수 없었습니다.
 hostManagerServlet.noCommand=실패 - 명령이 지정되지 않았습니다.
 hostManagerServlet.noHost=실패 - 호스트 이름 [{0}]은(는) 존재하지 않습니다.
diff --git a/java/org/apache/catalina/manager/host/LocalStrings_ru.properties b/java/org/apache/catalina/manager/host/LocalStrings_ru.properties
index e2814f7..57cfc0d 100644
--- a/java/org/apache/catalina/manager/host/LocalStrings_ru.properties
+++ b/java/org/apache/catalina/manager/host/LocalStrings_ru.properties
@@ -28,7 +28,6 @@ hostManagerServlet.exception=Ошибка - Необычная ситуация
 hostManagerServlet.invalidHostName=Ошибка - Указано недопустимое имя сервера [{0}]
 hostManagerServlet.list=list: Список серверов для движка [{0}]
 hostManagerServlet.listed=OK - Список серверов
-hostManagerServlet.listitem=[{0}]:[{1}]
 hostManagerServlet.managerXml=Ошибка - Не удалось создать файл manager.xml
 hostManagerServlet.noCommand=Ошибка - Команда не указана.
 hostManagerServlet.noHost=Ошибка - Сервер с указанным именем [{0}] не существует
diff --git a/java/org/apache/catalina/manager/host/LocalStrings_zh_CN.properties b/java/org/apache/catalina/manager/host/LocalStrings_zh_CN.properties
index 987a1e0..fa8a0f5 100644
--- a/java/org/apache/catalina/manager/host/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/manager/host/LocalStrings_zh_CN.properties
@@ -28,7 +28,6 @@ hostManagerServlet.exception=失败 - 出现异常[{0}]
 hostManagerServlet.invalidHostName=失败 - 指定的主机名称[{0}]无效
 hostManagerServlet.list=列表:列出引擎[{0}]的主机
 hostManagerServlet.listed=OK - 已列出Host
-hostManagerServlet.listitem=[{0}]:[{1}]
 hostManagerServlet.managerXml=FAIL - 无法安装manager.xml
 hostManagerServlet.noCommand=失败 - 未指定命令
 hostManagerServlet.noHost=失败 - 主机名称[{0}]不存在


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