Author: markt
Date: Tue Feb 18 18:19:18 2014
New Revision: 1569459
URL: http://svn.apache.org/r1569459
Log:
s/j2se/javase/
Modified:
tomcat/trunk/java/org/apache/catalina/loader/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.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=1569459&r1=1569458&r2=1569459&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/loader/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/LocalStrings.properties Tue
Feb 18 18:19:18 2014
@@ -37,7 +37,7 @@ webappClassLoader.loadedByThisOrChildFai
webappClassLoader.jarsAdded=One or more JARs have been added to the web
application [{0}]
webappClassLoader.jarsModified=One or more JARs have been modified in the web
application [{0}]
webappClassLoader.jarsRemoved=One or more JARs have been removed from the web
application [{0}]
-webappClassLoader.j2seClassLoaderNull=The j2seClassLoader attribute may not be
null
+webappClassLoader.javaseClassLoaderNull=The j2seClassLoader attribute may not
be null
webappClassLoader.resourceModified=Resource [{0}] has been modified. The last
modified time was [{1}] and is now [{2}]
webappClassLoader.stopThreadFail=Failed to terminate thread named [{0}] for
web application [{1}]
webappClassLoader.stopTimerThreadFail=Failed to terminate TimerThread named
[{0}] for web application [{1}]
Modified: tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java?rev=1569459&r1=1569458&r2=1569459&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java Tue Feb
18 18:19:18 2014
@@ -229,7 +229,7 @@ public class WebappClassLoader extends U
j = j.getParent();
}
}
- this.j2seClassLoader = j;
+ this.javaseClassLoader = j;
securityManager = System.getSecurityManager();
if (securityManager != null) {
@@ -264,7 +264,7 @@ public class WebappClassLoader extends U
j = j.getParent();
}
}
- this.j2seClassLoader = j;
+ this.javaseClassLoader = j;
securityManager = System.getSecurityManager();
if (securityManager != null) {
@@ -334,12 +334,12 @@ public class WebappClassLoader extends U
/**
- * The bootstrap class loader used to load the J2SE classes. In some
+ * The bootstrap class loader used to load the JavaSE classes. In some
* implementations this class loader is always <code>null</null> and in
* those cases {@link ClassLoader#getParent()} will be called recursively
on
* the system class loader and the last non-null result used.
*/
- private ClassLoader j2seClassLoader;
+ private ClassLoader javaseClassLoader;
/**
@@ -1240,10 +1240,10 @@ public class WebappClassLoader extends U
// (0.2) Try loading the class with the system class loader, to prevent
// the webapp from overriding J2SE classes
String resourceName = binaryNameToPath(name, false);
- ClassLoader j2seLoader = getJ2seClassLoader();
- if (j2seLoader.getResource(resourceName) != null) {
+ ClassLoader javaseLoader = getJavaseClassLoader();
+ if (javaseLoader.getResource(resourceName) != null) {
try {
- clazz = j2seLoader.loadClass(name);
+ clazz = javaseLoader.loadClass(name);
if (clazz != null) {
if (resolve)
resolveClass(clazz);
@@ -1506,16 +1506,16 @@ public class WebappClassLoader extends U
// ------------------------------------------------------ Protected Methods
- protected ClassLoader getJ2seClassLoader() {
- return j2seClassLoader;
+ protected ClassLoader getJavaseClassLoader() {
+ return javaseClassLoader;
}
- protected void setJ2seClassLoader(ClassLoader classLoader) {
+ protected void setJavaseClassLoader(ClassLoader classLoader) {
if (classLoader == null) {
throw new IllegalArgumentException(
- sm.getString("webappClassLoader.j2seClassLoaderNull"));
+ sm.getString("webappClassLoader.javaseClassLoaderNull"));
}
- j2seClassLoader = classLoader;
+ javaseClassLoader = classLoader;
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
