Author: remm
Date: Wed Dec 5 16:37:42 2018
New Revision: 1848225
URL: http://svn.apache.org/viewvc?rev=1848225&view=rev
Log:
Add i18n for the loader package.
Modified:
tomcat/trunk/java/org/apache/catalina/loader/LocalStrings.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=1848225&r1=1848224&r2=1848225&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/loader/LocalStrings.properties
[UTF-8] (original)
+++ tomcat/trunk/java/org/apache/catalina/loader/LocalStrings.properties
[UTF-8] Wed Dec 5 16:37:42 2018
@@ -46,6 +46,8 @@ webappClassLoader.loadedByThisOrChildFai
webappClassLoader.readError=Resource read error: Could not load [{0}].
webappClassLoader.removeTransformer=Removed class file transformer [{0}] from
web application [{1}].
webappClassLoader.resourceModified=Resource [{0}] has been modified. The last
modified time was [{1}] and is now [{2}]
+webappClassLoader.restrictedPackage=Security violation, attempt to use
restricted class [{0}]
+webappClassLoader.securityException=Security exception trying to find class
[{0}] in findClassInternal [{1}]
webappClassLoader.stackTrace=The web application [{0}] appears to have started
a thread named [{1}] but has failed to stop it. This is very likely to create a
memory leak. Stack trace of thread:{2}
webappClassLoader.stackTraceRequestThread=The web application [{0}] is still
processing a request that has yet to finish. This is very likely to create a
memory leak. You can control the time allowed for requests to finish by using
the unloadDelay attribute of the standard Context implementation. Stack trace
of request processing thread:[{2}]
webappClassLoader.stopThreadFail=Failed to terminate thread named [{0}] for
web application [{1}]
@@ -64,8 +66,12 @@ webappLoader.copyFailure=Failed to copy
webappLoader.deploy=Deploying class repositories to work directory [{0}]
webappLoader.jarDeploy=Deploy JAR [{0}] to [{1}]
webappLoader.mkdirFailure=Failed to create destination directory to copy
resources
+webappLoader.noResources=No resources found for context [{0}]
webappLoader.readFailure=Unable to read resource [{0}]
webappLoader.reloadable=Cannot set reloadable property to [{0}]
webappLoader.setContext.ise=Setting the Context is not permitted while the
loader is started.
+webappLoader.startError=Error starting the loader
webappLoader.starting=Starting this Loader
+webappLoader.stopError=Error stopping the loader
webappLoader.stopping=Stopping this Loader
+webappLoader.unknownClassLoader=Unknown class loader [{0}] of class [{1}]
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=1848225&r1=1848224&r2=1848225&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java Wed
Dec 5 16:37:42 2018
@@ -850,8 +850,8 @@ public abstract class WebappClassLoaderB
clazz = findClassInternal(name);
}
} catch(AccessControlException ace) {
- log.warn("WebappClassLoader.findClassInternal(" + name
- + ") security exception: " + ace.getMessage(), ace);
+ log.warn(sm.getString("webappClassLoader.securityException",
name,
+ ace.getMessage()), ace);
throw new ClassNotFoundException(name, ace);
} catch (RuntimeException e) {
if (log.isTraceEnabled())
@@ -862,8 +862,8 @@ public abstract class WebappClassLoaderB
try {
clazz = super.findClass(name);
} catch(AccessControlException ace) {
- log.warn("WebappClassLoader.findClassInternal(" + name
- + ") security exception: " + ace.getMessage(),
ace);
+
log.warn(sm.getString("webappClassLoader.securityException", name,
+ ace.getMessage()), ace);
throw new ClassNotFoundException(name, ace);
} catch (RuntimeException e) {
if (log.isTraceEnabled())
@@ -1278,8 +1278,7 @@ public abstract class WebappClassLoaderB
try {
securityManager.checkPackageAccess(name.substring(0,i));
} catch (SecurityException se) {
- String error = "Security Violation, attempt to use " +
- "Restricted Class: " + name;
+ String error =
sm.getString("webappClassLoader.restrictedPackage", name);
log.info(error, se);
throw new ClassNotFoundException(error, se);
}
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=1848225&r1=1848224&r2=1848225&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java (original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java Wed Dec 5
16:37:42 2018
@@ -62,6 +62,7 @@ import org.apache.tomcat.util.res.String
public class WebappLoader extends LifecycleMBeanBase
implements Loader, PropertyChangeListener {
+ private static final Log log = LogFactory.getLog(WebappLoader.class);
// ----------------------------------------------------------- Constructors
@@ -377,7 +378,7 @@ public class WebappLoader extends Lifecy
log.debug(sm.getString("webappLoader.starting"));
if (context.getResources() == null) {
- log.info("No resources for " + context);
+ log.info(sm.getString("webappLoader.noResources", context));
setState(LifecycleState.STARTING);
return;
}
@@ -409,8 +410,7 @@ public class WebappLoader extends Lifecy
} catch (Throwable t) {
t = ExceptionUtils.unwrapInvocationTargetException(t);
ExceptionUtils.handleThrowable(t);
- log.error( "LifecycleException ", t );
- throw new LifecycleException("start: ", t);
+ throw new
LifecycleException(sm.getString("webappLoader.startError"), t);
}
setState(LifecycleState.STARTING);
@@ -455,7 +455,7 @@ public class WebappLoader extends Lifecy
context.getParent().getName() + ",context=" +
contextName);
Registry.getRegistry(null, null).unregisterComponent(cloname);
} catch (Exception e) {
- log.error("LifecycleException ", e);
+ log.error(sm.getString("webappLoader.stopError"), e);
}
}
@@ -624,16 +624,12 @@ public class WebappLoader extends Lifecy
}
return false;
} else {
- log.info( "Unknown loader " + loader + " " + loader.getClass());
+ log.info(sm.getString("webappLoader.unknownClassLoader", loader,
loader.getClass()));
return false;
}
return true;
}
-
- private static final Log log = LogFactory.getLog(WebappLoader.class);
-
-
@Override
protected String getDomainInternal() {
return context.getDomain();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
