yoavs 2004/10/05 09:29:02 Modified: catalina/src/share/org/apache/catalina/loader Tag: TOMCAT_5_0 LocalStrings.properties LocalStrings_es.properties LocalStrings_ja.properties WebappClassLoader.java webapps/docs Tag: TOMCAT_5_0 changelog.xml Log: Bugzilla 31549: add name of resource to webappclassloader.stopped message. Revision Changes Path No revision No revision 1.2.2.1 +1 -1 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/loader/LocalStrings.properties Index: LocalStrings.properties =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/loader/LocalStrings.properties,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -r1.2 -r1.2.2.1 --- LocalStrings.properties 17 Aug 2003 08:36:14 -0000 1.2 +++ LocalStrings.properties 5 Oct 2004 16:29:01 -0000 1.2.2.1 @@ -13,7 +13,7 @@ standardLoader.removeRepository=Removing repository {0} standardLoader.starting=Starting this Loader standardLoader.stopping=Stopping this Loader -webappClassLoader.stopped=Illegal access: this web application instance has been stopped already (the eventual following stack trace is caused by an error thrown for debugging purposes as well as to attempt to terminate the thread which caused the illegal access, and has no functional impact) +webappClassLoader.stopped=Illegal access: this web application instance has been stopped already. Could not load {0}. The eventual following stack trace is caused by an error thrown for debugging purposes as well as to attempt to terminate the thread which caused the illegal access, and has no functional impact) webappLoader.addRepository=Adding repository {0} webappLoader.deploy=Deploying class repositories to work directory {0} webappLoader.jarDeploy=Deploy JAR {0} to {1} 1.1.2.1 +1 -1 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/loader/LocalStrings_es.properties Index: LocalStrings_es.properties =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/loader/LocalStrings_es.properties,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -r1.1 -r1.1.2.1 --- LocalStrings_es.properties 17 Jan 2004 01:43:58 -0000 1.1 +++ LocalStrings_es.properties 5 Oct 2004 16:29:01 -0000 1.1.2.1 @@ -13,7 +13,7 @@ standardLoader.removeRepository=Quitando repositorio {0} standardLoader.starting=Arrancando este Cargador standardLoader.stopping=Parando este Cargador -webappClassLoader.stopped=Acceso ilegal: esta instancia de aplicación web ya ha sido parada (la eventual traza de pila que sigue ha sido motivada por un error lanzado con motivos de depuración así como para intentar terminar el hilo que motivó el acceso ilegal y no tiene impacto funcional) +webappClassLoader.stopped=Acceso ilegal: esta instancia de aplicación web ya ha sido parada. Could not load {0}. La eventual traza de pila que sigue ha sido motivada por un error lanzado con motivos de depuración así como para intentar terminar el hilo que motivó el acceso ilegal y no tiene impacto funcional) webappLoader.addRepository=Añadiendo repositorio {0} webappLoader.deploy=Desplegando repositorios de clase en directorio de trabajo {0} webappLoader.jarDeploy=Despliegue del JAR {0} en {1} 1.3.2.1 +1 -1 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/loader/LocalStrings_ja.properties Index: LocalStrings_ja.properties =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/loader/LocalStrings_ja.properties,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -r1.3 -r1.3.2.1 --- LocalStrings_ja.properties 2 Sep 2003 14:09:46 -0000 1.3 +++ LocalStrings_ja.properties 5 Oct 2004 16:29:01 -0000 1.3.2.1 @@ -13,7 +13,7 @@ standardLoader.removeRepository=\u30ea\u30dd\u30b8\u30c8\u30ea {0} \u3092\u524a\u9664\u3057\u307e\u3059 standardLoader.starting=\u3053\u306e\u30ed\u30fc\u30c0\u3092\u8d77\u52d5\u3057\u307e\u3059 standardLoader.stopping=\u3053\u306e\u30ed\u30fc\u30c0\u3092\u505c\u6b62\u3057\u307e\u3059 -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 (\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) +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 1.34.2.1 +3 -3 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java Index: WebappClassLoader.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java,v retrieving revision 1.34 retrieving revision 1.34.2.1 diff -u -r1.34 -r1.34.2.1 --- WebappClassLoader.java 26 May 2004 15:47:40 -0000 1.34 +++ WebappClassLoader.java 5 Oct 2004 16:29:01 -0000 1.34.2.1 @@ -1225,7 +1225,7 @@ // Don't load classes if class loader is stopped if (!started) { - log.info(sm.getString("webappClassLoader.stopped")); + log.info(sm.getString("webappClassLoader.stopped", name)); throw new ThreadDeath(); } @@ -1678,7 +1678,7 @@ protected ResourceEntry findResourceInternal(String name, String path) { if (!started) { - log.info(sm.getString("webappClassLoader.stopped")); + log.info(sm.getString("webappClassLoader.stopped", name)); return null; } No revision No revision 1.70.2.49 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.70.2.48 retrieving revision 1.70.2.49 diff -u -r1.70.2.48 -r1.70.2.49 --- changelog.xml 5 Oct 2004 14:49:43 -0000 1.70.2.48 +++ changelog.xml 5 Oct 2004 16:29:02 -0000 1.70.2.49 @@ -100,6 +100,9 @@ <fix> <bug>31511</bug>: Don't call setenv.bat if not found in *using-launcher scripts. (yoavs) </fix> + <fix> + <bug>31549</bug>: Add name of resource to load failed messaged in WebappClassLoader. (yoavs) + </fix> </changelog> </subsection> <subsection name="Webapps">
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]