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 d8f44fe1c9d67538dee8993a00b783ddc3e979f6
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Sep 26 13:31:50 2023 +0100
Align with 9.0.x onwards
---
java/org/apache/catalina/mapper/LocalStrings.properties | 5 +++++
java/org/apache/catalina/mapper/LocalStrings_fr.properties | 5 +++++
java/org/apache/catalina/mapper/LocalStrings_ja.properties | 5 +++++
java/org/apache/catalina/mapper/LocalStrings_ko.properties | 5 +++++
.../org/apache/catalina/mapper/LocalStrings_zh_CN.properties | 5 +++++
java/org/apache/catalina/mapper/Mapper.java | 12 ++++++------
6 files changed, 31 insertions(+), 6 deletions(-)
diff --git a/java/org/apache/catalina/mapper/LocalStrings.properties
b/java/org/apache/catalina/mapper/LocalStrings.properties
index 74e5b461bf..b5544fc2fc 100644
--- a/java/org/apache/catalina/mapper/LocalStrings.properties
+++ b/java/org/apache/catalina/mapper/LocalStrings.properties
@@ -13,12 +13,17 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+mapper.addContext.hostIsAlias=Host [{0}] found is an alias
+mapper.addContext.noHost=No host found [{0}]
mapper.addHost.sameHost=Duplicate registration of the same host [{0}]. Ignored.
mapper.addHost.success=Registered host [{0}]
mapper.addHostAlias.sameHost=Duplicate registration of alias [{0}] for the
same host [{1}]. Ignored.
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.findContext.noContext=No context found [{0}]
+mapper.findContext.noContextVersion=No context version found [{0}] [{1}]
+mapper.findContext.noHostOrAlias=No host [{0}] or is an alias
mapper.removeWrapper=Removing wrapper from Context [{0}] with path [{1}]
mapperListener.pauseContext=Register Context [{0}] as being reloaded for
service [{1}]
diff --git a/java/org/apache/catalina/mapper/LocalStrings_fr.properties
b/java/org/apache/catalina/mapper/LocalStrings_fr.properties
index 737a125d28..78d3b40cce 100644
--- a/java/org/apache/catalina/mapper/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/mapper/LocalStrings_fr.properties
@@ -13,12 +13,17 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+mapper.addContext.hostIsAlias=L''hôte [{0}] trouvé est un alias
+mapper.addContext.noHost=Pas d''hôte [{0}]
mapper.addHost.sameHost=L''enregistrement en double de l''hôte [{0}] est ignoré
mapper.addHost.success=Enregistré l''hôte [{0}]
mapper.addHostAlias.sameHost=L''enregistrement en double de l''alias [{0}] de
l''hôte [{1}] est ignoré
mapper.addHostAlias.success=L''alias [{0}] pour le hôte [{1}] a été enregistré
mapper.duplicateHost=L''hôte [{0}] est en double et sera ignoré, le nom est
déjà utilisé par l''hôte [{1}]
mapper.duplicateHostAlias=L''alias [{0}] de l''hôte [{1}] est en double et
sera ignoré, le nom est déjà utilisé par l''hôte [{2}]
+mapper.findContext.noContext=Pas de contexte trouvé [{0}]
+mapper.findContext.noContextVersion=Pas de version du contexte trouvée [{0}]
[{1}]
+mapper.findContext.noHostOrAlias=Pas d''hôte [{0}] ou c''est un alias
mapper.removeWrapper=Retire l''enrobeur du contexte [{0}] avec le chemin [{1}]
mapperListener.pauseContext=Enregistrement du contexte [{0}] comme étant en
cours de rechargement dans le service [{1}]
diff --git a/java/org/apache/catalina/mapper/LocalStrings_ja.properties
b/java/org/apache/catalina/mapper/LocalStrings_ja.properties
index a7cc764d24..2c4f66c1bc 100644
--- a/java/org/apache/catalina/mapper/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/mapper/LocalStrings_ja.properties
@@ -13,12 +13,17 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+mapper.addContext.hostIsAlias=見つかったHost[{0}]はエイリアスです。
+mapper.addContext.noHost=ホストが見つかりません [{0}]
mapper.addHost.sameHost=同じホスト [{0}] の登録が重複しています。 無視されます。
mapper.addHost.success=登録されたホスト [{0}]
mapper.addHostAlias.sameHost=ホスト [{1}] にエイリアス [{0}] が重複して登録されました。無視します。
mapper.addHostAlias.success=ホスト [{1}] のエイリアス [{0}] を登録しました。
mapper.duplicateHost=Host名の重複 [{0}]。この名前はHost[{1}] で使用されているため無視されます。
mapper.duplicateHostAlias=Host [{1}] のホストエイリアス [{0}] が重複しています。 名前はすでにHost
[{2}] によって使用されています。 このエイリアスは無視されます。
+mapper.findContext.noContext=コンテキストが見つかりません [{0}]
+mapper.findContext.noContextVersion=コンテキストバージョンが見つかりません[{0}] [{1}]
+mapper.findContext.noHostOrAlias=ホスト [{0}] がないか、エイリアスです
mapper.removeWrapper=コンテキスト [{0}] からパス [{1}] を使用してラッパーを削除します
mapperListener.pauseContext=コンテキスト [{0}] をサービス [{1}] のために再ロードするものとして登録します
diff --git a/java/org/apache/catalina/mapper/LocalStrings_ko.properties
b/java/org/apache/catalina/mapper/LocalStrings_ko.properties
index c1776fc7bb..6ef676782c 100644
--- a/java/org/apache/catalina/mapper/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/mapper/LocalStrings_ko.properties
@@ -13,12 +13,17 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+mapper.addContext.hostIsAlias=발견된 호스트 [{0}]은(는) 별칭입니다.
+mapper.addContext.noHost=호스트 [{0}]을(를) 찾을 수 없습니다.
mapper.addHost.sameHost=동일한 호스트 [{0}]을(를) 중복하여 등록을 시도했는데, 이는 무시됩니다.
mapper.addHost.success=등록된 호스트 [{0}]
mapper.addHostAlias.sameHost=동일한 호스트 [{1}]을(를) 위한 별칭 [{0}]이(가) 중복해서 등록 시도
되었는데, 이는 무시됩니다.
mapper.addHostAlias.success=호스트 [{1}]을(를) 위해 별칭 [{0}]이(가) 등록되었습니다.
mapper.duplicateHost=중복된 호스트 [{0}]. 해당 이름은 이미 호스트 [{1}]에 의해 사용되고 있습니다. 이 호스트는
무시될 것입니다.
mapper.duplicateHostAlias=호스트 [{1}] 내에 중복된 호스트 별칭 [{0}]. 해당 이름이 이미 호스트 [{2}]에
의해 사용되고 있습니다. 이 별칭은 무시될 것입니다.
+mapper.findContext.noContext=컨텍스트 [{0}]을(를) 찾을 수 없습니다.
+mapper.findContext.noContextVersion=컨텍스트 버전을 찾을 수 없습니다: [{0}] [{1}]
+mapper.findContext.noHostOrAlias=[{0}](이)라는 호스트가 없거나, 그것은 별칭입니다.
mapper.removeWrapper=경로 [{1}]의 컨텍스트 [{0}](으)로부터 wapper를 제거합니다.
mapperListener.pauseContext=컨텍스트 [{0}]을(를), 서비스 [{1}]을(를) 위해 다시 로드되고 있는 것으로
등록합니다.
diff --git a/java/org/apache/catalina/mapper/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/mapper/LocalStrings_zh_CN.properties
index a369199d45..10098ee077 100644
--- a/java/org/apache/catalina/mapper/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/mapper/LocalStrings_zh_CN.properties
@@ -13,12 +13,17 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+mapper.addContext.hostIsAlias=找到的主机[{0}]是别名
+mapper.addContext.noHost=找不到主机 [{0}]
mapper.addHost.sameHost=同一主机[{0}]的重复注册。忽略。
mapper.addHost.success=注册主机[{0}]
mapper.addHostAlias.sameHost=为同一主机[{1}]重复注册别名[{0}]。忽略。
mapper.addHostAlias.success=为虚拟主机 [{1}] 注册了别名 [{0}]
mapper.duplicateHost=重复的主机[{0}]。主机[{1}]已使用该名称。此主机将被忽略。
mapper.duplicateHostAlias=主机[{1}]中的主机别名[{0}]重复。主机[{2}]已使用该名称。将忽略此别名。
+mapper.findContext.noContext=找不到上下文[{0}]
+mapper.findContext.noContextVersion=找不到上下文版本[{0}][{1}]
+mapper.findContext.noHostOrAlias=没有主机[{0}]或是别名
mapper.removeWrapper=正在从路径为[{1}]的上下文[{0}]中删除包装。
mapperListener.pauseContext=根据服务需要，注册内容[{0}]已经重新加载
diff --git a/java/org/apache/catalina/mapper/Mapper.java
b/java/org/apache/catalina/mapper/Mapper.java
index c26875bd23..c38e73fe5b 100644
--- a/java/org/apache/catalina/mapper/Mapper.java
+++ b/java/org/apache/catalina/mapper/Mapper.java
@@ -50,8 +50,8 @@ public final class Mapper {
private static final StringManager sm =
StringManager.getManager(Mapper.class);
- // ----------------------------------------------------- Instance Variables
+ // ----------------------------------------------------- Instance Variables
/**
* Array containing the virtual hosts definitions.
@@ -261,12 +261,12 @@ public final class Mapper {
addHost(hostName, new String[0], host);
mappedHost = exactFind(hosts, hostName);
if (mappedHost == null) {
- log.error("No host found: " + hostName);
+ log.error(sm.getString("mapper.addContext.noHost", hostName));
return;
}
}
if (mappedHost.isAlias()) {
- log.error("No host found: " + hostName);
+ log.error(sm.getString("mapper.addContext.hostIsAlias", hostName));
return;
}
int slashCount = slashCount(path);
@@ -372,21 +372,21 @@ public final class Mapper {
MappedHost host = exactFind(hosts, hostName);
if (host == null || host.isAlias()) {
if (!silent) {
- log.error("No host found: " + hostName);
+ log.error(sm.getString("mapper.findContext.noHostOrAlias",
hostName));
}
return null;
}
MappedContext context = exactFind(host.contextList.contexts,
contextPath);
if (context == null) {
if (!silent) {
- log.error("No context found: " + contextPath);
+ log.error(sm.getString("mapper.findContext.noContext",
contextPath));
}
return null;
}
ContextVersion contextVersion = exactFind(context.versions, version);
if (contextVersion == null) {
if (!silent) {
- log.error("No context version found: " + contextPath + " " +
version);
+ log.error(sm.getString("mapper.findContext.noContextVersion",
contextPath, version));
}
return null;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
