Author: rjung
Date: Mon Jan 25 19:21:24 2016
New Revision: 1726669
URL: http://svn.apache.org/viewvc?rev=1726669&view=rev
Log:
Remove any references to addRepository or addJar.
The updated code comments moght not be completely
correct but should be better than before.
Modified:
tomcat/trunk/java/org/apache/catalina/loader/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/loader/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/loader/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/catalina/loader/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java
Modified: tomcat/trunk/java/org/apache/catalina/loader/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/LocalStrings.properties?rev=1726669&r1=1726668&r2=1726669&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/loader/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/LocalStrings.properties Mon
Jan 25 19:21:24 2016
@@ -54,7 +54,6 @@ webappClassLoader.transformError=Instrum
webappClassLoaderParallel.registrationFailed=Registration of
org.apache.catalina.loader.ParallelWebappClassLoader as capable of loading
classes in parallel failed
-webappLoader.addRepository=Adding repository {0}
webappLoader.deploy=Deploying class repositories to work directory {0}
webappLoader.jarDeploy=Deploy JAR {0} to {1}
webappLoader.classDeploy=Deploy class files {0} to {1}
Modified:
tomcat/trunk/java/org/apache/catalina/loader/LocalStrings_es.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/LocalStrings_es.properties?rev=1726669&r1=1726668&r2=1726669&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/loader/LocalStrings_es.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/LocalStrings_es.properties Mon
Jan 25 19:21:24 2016
@@ -33,7 +33,6 @@ webappClassLoader.stopTimerThreadFail =
webappClassLoader.validationErrorJarPath = no pude validar entrada JAR con
nombre {0}
webappClassLoader.warnTimerThread = La aplicaci\u00F3n web [{0}] parece haber
arrancado un TimerThread con nombre [{1}] v\u00EDa de la API java.util.Timer,
pero no ha podido pararlo. Para prevenir un fallo de memoria, el
cron\u00F3metro (y el hilo asociado) hasido cancelado a la fuerza.
webappClassLoader.wrongVersion = (no puedo cargar clase {0})
-webappLoader.addRepository = A\u00F1adiendo repositorio {0}
webappLoader.deploy = Desplegando repositorios de clase en directorio de
trabajo {0}
webappLoader.jarDeploy = Despliegue del JAR {0} en {1}
webappLoader.classDeploy = Despliegue de archivos de clase {0} en {1}
Modified:
tomcat/trunk/java/org/apache/catalina/loader/LocalStrings_fr.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/LocalStrings_fr.properties?rev=1726669&r1=1726668&r2=1726669&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/loader/LocalStrings_fr.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/LocalStrings_fr.properties Mon
Jan 25 19:21:24 2016
@@ -13,7 +13,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-webappLoader.addRepository=Ajout du r\u00e9ceptacle (repository) {0}
webappLoader.deploy=D\u00e9ploiement des classes des r\u00e9ceptacles (class
repositories) vers le dossier de travail (work directory) {0}
webappLoader.jarDeploy=D\u00e9ploiement du JAR {0} vers {1}
webappLoader.classDeploy=D\u00e9ploiement des fichiers classes {0} vers {1}
Modified:
tomcat/trunk/java/org/apache/catalina/loader/LocalStrings_ja.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/LocalStrings_ja.properties?rev=1726669&r1=1726668&r2=1726669&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/loader/LocalStrings_ja.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/LocalStrings_ja.properties Mon
Jan 25 19:21:24 2016
@@ -14,7 +14,6 @@
# limitations under the License.
webappClassLoader.stopped=\u4e0d\u6b63\u306a\u30a2\u30af\u30bb\u30b9:
\u3053\u306eWeb\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u306e\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u306f\u65e2\u306b\u505c\u6b62\u3055\u308c\u3066\u3044\u307e\u3059
Could not load {0}.
\u4e0d\u6b63\u306a\u30a2\u30af\u30bb\u30b9\u3092\u5f15\u304d\u8d77\u3053\u3057\u305f\u30b9\u30ec\u30c3\u30c9\u3092\u7d42\u4e86\u3055\u305b\u3001\u6295\u3052\u3089\u308c\u305f\u30a8\u30e9\u30fc\u306b\u3088\u308a\u30c7\u30d0\u30c3\u30b0\u7528\u306b\u6b21\u306e\u30b9\u30bf\u30c3\u30af\u30c8\u30ec\u30fc\u30b9\u304c\u751f\u6210\u3055\u308c\u307e\u3057\u305f\u304c\uff0c\u6a5f\u80fd\u306b\u5f71\u97ff\u306f\u3042\u308a\u307e\u305b\u3093
-webappLoader.addRepository=\u30ea\u30dd\u30b8\u30c8\u30ea {0}
\u3092\u8ffd\u52a0\u3057\u307e\u3059
webappLoader.deploy=\u30af\u30e9\u30b9\u30ea\u30dd\u30b8\u30c8\u30ea\u3092\u4f5c\u696d\u30c7\u30a3\u30ec\u30af\u30c8\u30ea
{0} \u306b\u914d\u5099\u3057\u307e\u3059
webappLoader.jarDeploy=JAR {0} \u3092 {1} \u306b\u914d\u5099\u3057\u307e\u3059
webappLoader.classDeploy=\u30af\u30e9\u30b9\u30d5\u30a1\u30a4\u30eb {0} \u3092
{1} \u306b\u914d\u5099\u3057\u307e\u3059
Modified:
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java?rev=1726669&r1=1726668&r2=1726669&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java Mon
Jan 25 19:21:24 2016
@@ -110,8 +110,7 @@ import org.apache.tomcat.util.res.String
* class is contained inside a JAR.
* <p>
* <strong>IMPLEMENTATION NOTE</strong> - Local repositories are searched in
- * the order they are added via the initial constructor and/or any subsequent
- * calls to <code>addRepository()</code> or <code>addJar()</code>.
+ * the order they are added via the initial constructor.
* <p>
* <strong>IMPLEMENTATION NOTE</strong> - No check for sealing violations or
* security is made unless a security manager is present.
Modified: tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java?rev=1726669&r1=1726668&r2=1726669&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java (original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java Mon Jan 25
19:21:24 2016
@@ -53,10 +53,9 @@ import org.apache.tomcat.util.res.String
* This class loader supports detection of modified
* Java classes, which can be used to implement auto-reload support.
* <p>
- * This class loader is configured by adding the pathnames of directories,
- * JAR files, and ZIP files with the <code>addRepository()</code> method,
+ * This class loader is configured via the Resources children of its Context
* prior to calling <code>start()</code>. When a new class is required,
- * these repositories will be consulted first to locate the class. If it
+ * these Resources will be consulted first to locate the class. If it
* is not present, the system class loader will be used instead.
*
* @author Craig R. McClanahan
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
