This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 04564c61795130d83c47462ba7178b48d84c89ab
Author: Fabien Zindy <fabien.zi...@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 91c3697..a1116c5 100644
--- a/java/org/apache/catalina/manager/LocalStrings.properties
+++ b/java/org/apache/catalina/manager/LocalStrings.properties
@@ -131,7 +131,6 @@ managerServlet.inService=FAIL - The application [{0}] is
already being serviced
managerServlet.invalidCommand=FAIL - Invalid parameters supplied for command
[{0}]
managerServlet.invalidPath=FAIL - Invalid context path [{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.noCommand=FAIL - No command was specified
managerServlet.noContext=FAIL - No context exists named [{0}]
diff --git a/java/org/apache/catalina/manager/LocalStrings_de.properties
b/java/org/apache/catalina/manager/LocalStrings_de.properties
index 21eb39d..856d389 100644
--- a/java/org/apache/catalina/manager/LocalStrings_de.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_de.properties
@@ -70,7 +70,6 @@ managerServlet.deployed=OK - Anwendung mit Kontext Pfad [{0}]
installiert
managerServlet.exception=FEHLER - Ausnahme aufgetreten [{0}]
managerServlet.invalidPath=FEHLER - Ungültiger Kontext Pfad [{0}] 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.noCommand=FEHLER - Es wurde kein Kommando angegeben
managerServlet.noContext=FEHLER - Es existiert kein Kontext für Pfad [{0}]
diff --git a/java/org/apache/catalina/manager/LocalStrings_es.properties
b/java/org/apache/catalina/manager/LocalStrings_es.properties
index 28c7e72..743e99c 100644
--- a/java/org/apache/catalina/manager/LocalStrings_es.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_es.properties
@@ -86,7 +86,6 @@ managerServlet.findleaksNone=OK - No se han hallado fallos de
memoria
managerServlet.invalidCommand=Fallo - Se proveiron parámetros inválidos para
el comando [{0}]
managerServlet.invalidPath=FALLO - Se ha especificado una trayectoria inválida
de contexto [{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.noCommand=FALLO - No se ha especificado comando
managerServlet.noContext=FALLO - No existe contexto para trayectoria [{0}]
diff --git a/java/org/apache/catalina/manager/LocalStrings_fr.properties
b/java/org/apache/catalina/manager/LocalStrings_fr.properties
index 4fbe336..d1a5e2e 100644
--- a/java/org/apache/catalina/manager/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_fr.properties
@@ -129,7 +129,6 @@ managerServlet.inService=ECHEC - Une opération de gestion
est déjà en cours p
managerServlet.invalidCommand=ECHEC - Des paramètres incorrects ont été
fournis pour la commande [{0}]
managerServlet.invalidPath=ECHEC - Un chemin de contexte invalide [{0}] a été
spécifié
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.noCommand=ECHEC - Aucune commande n'a été spécifiée
managerServlet.noContext=ECHEC - Aucun contexte n''existe pour le chemin [{0}]
diff --git a/java/org/apache/catalina/manager/LocalStrings_ja.properties
b/java/org/apache/catalina/manager/LocalStrings_ja.properties
index 3cea8c7..044bac2 100644
--- a/java/org/apache/catalina/manager/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_ja.properties
@@ -131,7 +131,6 @@ managerServlet.inService=FAIL - アプリケーション [{0}] はすでにサ
managerServlet.invalidCommand=FAIL - コマンド[{0}]に無効なパラメータが指定されました
managerServlet.invalidPath=FAIL - 無効なコンテキストパス [{0}] が指定されました
managerServlet.listed=OK - バーチャルホスト [{0}] のアプリケーション一覧です
-managerServlet.listitem={0}:{1}:{2}:{3}
managerServlet.mkdirFail=FAIL - ディレクトリ [{0}] は作成できません。
managerServlet.noCommand=FAIL - コマンドが指定されていません
managerServlet.noContext=FAIL - パス [{0}] のコンテキストが存在しません
diff --git a/java/org/apache/catalina/manager/LocalStrings_ko.properties
b/java/org/apache/catalina/manager/LocalStrings_ko.properties
index 192daaf..3307f95 100644
--- a/java/org/apache/catalina/manager/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_ko.properties
@@ -129,7 +129,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 02bb71e..7dfa87b 100644
--- a/java/org/apache/catalina/manager/LocalStrings_ru.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_ru.properties
@@ -128,7 +128,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 b6f1c31..fc9c225 100644
--- a/java/org/apache/catalina/manager/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_zh_CN.properties
@@ -128,7 +128,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 be6ce2d..04bb3d9 100644
--- a/java/org/apache/catalina/manager/ManagerServlet.java
+++ b/java/org/apache/catalina/manager/ManagerServlet.java
@@ -67,6 +67,7 @@ import org.apache.coyote.http11.AbstractHttp11Protocol;
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.net.SSLContext;
import org.apache.tomcat.util.net.SSLHostConfig;
@@ -1042,19 +1043,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-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
