From 223dc478635dfbfdbdaa93327d2887f512d420c0 Mon Sep 17 00:00:00 2001 From: markt Date: Mon, 7 Mar 2011 22:18:02 +0000 Subject: [PATCH] Remove unused code git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1078981 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/catalina/core/LocalStrings.properties | 1 - java/org/apache/catalina/core/LocalStrings_es.properties | 1 - java/org/apache/catalina/core/LocalStrings_fr.properties | 1 - java/org/apache/catalina/core/LocalStrings_ja.properties | 1 - java/org/apache/catalina/core/StandardWrapper.java | 13 ------------- 5 files changed, 17 deletions(-) diff --git a/java/org/apache/catalina/core/LocalStrings.properties b/java/org/apache/catalina/core/LocalStrings.properties index 886f2440a..176474e8d 100644 --- a/java/org/apache/catalina/core/LocalStrings.properties +++ b/java/org/apache/catalina/core/LocalStrings.properties @@ -59,7 +59,6 @@ aprListener.aprDestroy=Failed shutdown of APR based Apache Tomcat Native library aprListener.sslInit=Failed to initialize the SSLEngine. aprListener.tcnValid=Loaded APR based Apache Tomcat Native library {0}. aprListener.flags=APR capabilities: IPv6 [{0}], sendfile [{1}], accept filters [{2}], random [{3}]. -containerBase.addDefaultMapper=Exception configuring default mapper of class {0} containerBase.alreadyStarted=Container {0} has already been started containerBase.notConfigured=No basic Valve has been configured containerBase.notStarted=Container {0} has not been started diff --git a/java/org/apache/catalina/core/LocalStrings_es.properties b/java/org/apache/catalina/core/LocalStrings_es.properties index b4123db7a..a71ed0261 100644 --- a/java/org/apache/catalina/core/LocalStrings_es.properties +++ b/java/org/apache/catalina/core/LocalStrings_es.properties @@ -37,7 +37,6 @@ aprListener.aprDestroy = No pude apagar la biblioteca nativa de Apache Tomcat aprListener.sslInit = No pude inicializar el SSLEngine (Motor SSL) aprListener.tcnValid = Cargada la biblioteca nativa APR de Apache Tomcat {0} aprListener.flags = Capacidades APR\: IPv6 [{0}], enviar fichero [{1}], aceptar filtros [{2}], aleatorio [{3}]. -containerBase.addDefaultMapper = Excepci\u00f3n configurando mapeador por defecto de clase {0} containerBase.alreadyStarted = Ya ha sido arrancado el Contenedor {0} containerBase.notConfigured = No se ha configurado V\u00e1lvula b\u00e1sica containerBase.notStarted = No se ha arrancado el Contenedor {0} diff --git a/java/org/apache/catalina/core/LocalStrings_fr.properties b/java/org/apache/catalina/core/LocalStrings_fr.properties index b494c9747..bd1c3fab6 100644 --- a/java/org/apache/catalina/core/LocalStrings_fr.properties +++ b/java/org/apache/catalina/core/LocalStrings_fr.properties @@ -27,7 +27,6 @@ applicationRequest.badParent=Impossible de trouver l''impl\u00e9mentation requ\u applicationRequest.badRequest=La requ\u00eate n''est pas une "javax.servlet.ServletRequestWrapper" applicationResponse.badParent=Impossible de trouver une impl\u00e9mentation r\u00e9ponse parente (parent response) applicationResponse.badResponse=La r\u00e9ponse n''est pas une "javax.servlet.ServletResponseWrapper" -containerBase.addDefaultMapper=Exception lors de la configuration du routeur par d\u00e9faut (default mapper) pour la classe {0} containerBase.alreadyStarted=Le conteneur {0} a d\u00e9j\u00e0 \u00e9t\u00e9 d\u00e9marr\u00e9 containerBase.notConfigured=Aucune Valve basique (basic valve) n''a \u00e9t\u00e9 configur\u00e9e containerBase.notStarted=Le conteneur {0} n''a pas \u00e9t\u00e9 d\u00e9marr\u00e9 diff --git a/java/org/apache/catalina/core/LocalStrings_ja.properties b/java/org/apache/catalina/core/LocalStrings_ja.properties index 337a6986c..92e7e6e88 100644 --- a/java/org/apache/catalina/core/LocalStrings_ja.properties +++ b/java/org/apache/catalina/core/LocalStrings_ja.properties @@ -28,7 +28,6 @@ applicationRequest.badParent=\u89aa\u306e\u30ea\u30af\u30a8\u30b9\u30c8\u5b9f\u8 applicationRequest.badRequest=\u30ea\u30af\u30a8\u30b9\u30c8\u304cjavax.servlet.ServletRequestWrapper\u3067\u306f\u3042\u308a\u307e\u305b\u3093 applicationResponse.badParent=\u89aa\u306e\u30ec\u30b9\u30dd\u30f3\u30b9\u5b9f\u88c5\u3092\u914d\u7f6e\u3067\u304d\u307e\u305b\u3093 applicationResponse.badResponse=\u30ec\u30b9\u30dd\u30f3\u30b9\u304cjavax.servlet.ServletResponseWrapper\u3067\u306f\u3042\u308a\u307e\u305b\u3093 -containerBase.addDefaultMapper=\u30af\u30e9\u30b9 {0} \u306e\u30c7\u30d5\u30a9\u30eb\u30c8\u306e\u30de\u30c3\u30d1\u3092\u8a2d\u5b9a\u4e2d\u306b\u4f8b\u5916\u304c\u767a\u751f\u3057\u307e\u3057\u305f containerBase.alreadyStarted=\u30b3\u30f3\u30c6\u30ca {0} \u306f\u65e2\u306b\u8d77\u52d5\u3055\u308c\u3066\u3044\u307e\u3059 containerBase.notConfigured=\u57fa\u672c\u30d0\u30eb\u30d6\u304c\u8a2d\u5b9a\u3055\u308c\u3066\u3044\u307e\u305b\u3093 containerBase.notStarted=\u30b3\u30f3\u30c6\u30ca {0} \u306f\u307e\u3060\u8d77\u52d5\u3055\u308c\u3066\u3044\u307e\u305b\u3093 diff --git a/java/org/apache/catalina/core/StandardWrapper.java b/java/org/apache/catalina/core/StandardWrapper.java index e7b653bc1..8e0c2ec5c 100644 --- a/java/org/apache/catalina/core/StandardWrapper.java +++ b/java/org/apache/catalina/core/StandardWrapper.java @@ -1598,19 +1598,6 @@ public class StandardWrapper extends ContainerBase /** - * Add a default Mapper implementation if none have been configured - * explicitly. - * - * @param mapperClass Java class name of the default Mapper - */ - protected void addDefaultMapper(String mapperClass) { - - // No need for a default Mapper on a Wrapper - - } - - - /** * Return true if the specified class name represents a * container provided servlet class that should be loaded by the * server class loader. -- 2.11.0