Author: remm
Date: Wed Dec 5 13:17:54 2018
New Revision: 1848211
URL: http://svn.apache.org/viewvc?rev=1848211&view=rev
Log:
Add i18n for the mapper package.
Modified:
tomcat/trunk/java/org/apache/catalina/mapper/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/mapper/Mapper.java
Modified: tomcat/trunk/java/org/apache/catalina/mapper/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mapper/LocalStrings.properties?rev=1848211&r1=1848210&r2=1848211&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/mapper/LocalStrings.properties
[UTF-8] (original)
+++ tomcat/trunk/java/org/apache/catalina/mapper/LocalStrings.properties
[UTF-8] Wed Dec 5 13:17:54 2018
@@ -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}]
Modified: tomcat/trunk/java/org/apache/catalina/mapper/Mapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mapper/Mapper.java?rev=1848211&r1=1848210&r2=1848211&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/mapper/Mapper.java (original)
+++ tomcat/trunk/java/org/apache/catalina/mapper/Mapper.java Wed Dec 5
13:17:54 2018
@@ -270,12 +270,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);
@@ -388,7 +388,7 @@ 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;
}
@@ -396,15 +396,14 @@ public final class Mapper {
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
