Author: markt
Date: Tue Feb 18 18:29:11 2014
New Revision: 1569465
URL: http://svn.apache.org/r1569465
Log:
Make it easier for TomEE to modify the j2seClassLoader
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/LocalStrings.properties
tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1569398,1569459
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/LocalStrings.properties?rev=1569465&r1=1569464&r2=1569465&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/LocalStrings.properties
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/LocalStrings.properties
Tue Feb 18 18:29:11 2014
@@ -53,6 +53,7 @@ webappClassLoader.checkThreadLocalsForLe
webappClassLoader.checkThreadsHttpClient=Found HttpClient keep-alive thread
using web application class loader. Fixed by switching thread to the parent
class loader.
webappClassLoader.getThreadGroupError=Unable to obtain the parent for
ThreadGroup [{0}]. It will not be possible to check all threads for potential
memory leaks
webappClassLoader.loadedByThisOrChildFail=Failed to fully check the entries in
an instance of [{0}] for potential memory leaks in context [{1}]
+webappClassLoader.javaseClassLoaderNull=The j2seClassLoader attribute may not
be null
webappClassLoader.stopThreadFail=Failed to terminate thread named [{0}] for
web application [{1}]
webappClassLoader.stopTimerThreadFail=Failed to terminate TimerThread named
[{0}] for web application [{1}]
webappClassLoader.validationErrorJarPath=Unable to validate JAR entry with
name {0}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java?rev=1569465&r1=1569464&r2=1569465&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
Tue Feb 18 18:29:11 2014
@@ -435,12 +435,12 @@ public class WebappClassLoader
/**
- * 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.
*/
- protected final ClassLoader j2seClassLoader;
+ protected ClassLoader j2seClassLoader;
/**
@@ -1984,6 +1984,17 @@ public class WebappClassLoader
// ------------------------------------------------------ Protected Methods
+ protected ClassLoader getJavaseClassLoader() {
+ return j2seClassLoader;
+ }
+
+ protected void setJavaseClassLoader(ClassLoader classLoader) {
+ if (classLoader == null) {
+ throw new IllegalArgumentException(
+ sm.getString("webappClassLoader.javaseClassLoaderNull"));
+ }
+ j2seClassLoader = classLoader;
+ }
/**
* Clear references.
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1569465&r1=1569464&r2=1569465&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Feb 18 18:29:11 2014
@@ -56,6 +56,15 @@
issues to not "pop up" wrt. others).
-->
<section name="Tomcat 7.0.53 (violetagg)">
+ <subsection name="Catalina">
+ <changelog>
+ <add>
+ Make it easier for applications embedding and/or extending Tomcat to
+ modify the <code>javaseClassLoader</code> attribute of the
+ <code>WebappClassLoader</code>. (markt)
+ </add>
+ </changelog>
+ </subsection>
<subsection name="WebSocket">
<changelog>
<fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
