Author: markt
Date: Wed Feb 8 21:36:12 2012
New Revision: 1242111
URL: http://svn.apache.org/viewvc?rev=1242111&view=rev
Log:
Remove StandardClassLoader
Removed:
tomcat/trunk/java/org/apache/catalina/loader/StandardClassLoader.java
tomcat/trunk/java/org/apache/catalina/loader/StandardClassLoaderMBean.java
Modified:
tomcat/trunk/build.xml
tomcat/trunk/java/org/apache/catalina/startup/ClassLoaderFactory.java
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1242111&r1=1242110&r2=1242111&view=diff
==============================================================================
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Wed Feb 8 21:36:12 2012
@@ -279,7 +279,6 @@
<include name="org/apache/catalina/startup/ClassLoaderFactory.*" />
<include name="org/apache/catalina/startup/ClassLoaderFactory$*.*" />
<include name="org/apache/catalina/startup/Tool.*" />
- <include name="org/apache/catalina/loader/StandardClassLoader*.*" />
<include name="org/apache/catalina/loader/Extension.*" />
<include name="org/apache/catalina/loader/Reloader.*" />
<include name="org/apache/catalina/security/SecurityClassLoad.*" />
Modified: tomcat/trunk/java/org/apache/catalina/startup/ClassLoaderFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ClassLoaderFactory.java?rev=1242111&r1=1242110&r2=1242111&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/ClassLoaderFactory.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ClassLoaderFactory.java Wed
Feb 8 21:36:12 2012
@@ -14,14 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-
package org.apache.catalina.startup;
-
import java.io.File;
import java.io.IOException;
import java.net.URL;
+import java.net.URLClassLoader;
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.LinkedHashSet;
@@ -29,11 +27,9 @@ import java.util.List;
import java.util.Locale;
import java.util.Set;
-import org.apache.catalina.loader.StandardClassLoader;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
-
/**
* <p>Utility class for building class loaders for Catalina. The factory
* method requires the following parameters in order to build a new class
@@ -52,7 +48,6 @@ import org.apache.juli.logging.LogFactor
* @author Craig R. McClanahan
* @version $Id$
*/
-
public final class ClassLoaderFactory {
@@ -125,13 +120,13 @@ public final class ClassLoaderFactory {
// Construct the class loader itself
final URL[] array = set.toArray(new URL[set.size()]);
return AccessController.doPrivileged(
- new PrivilegedAction<StandardClassLoader>() {
+ new PrivilegedAction<URLClassLoader>() {
@Override
- public StandardClassLoader run() {
+ public URLClassLoader run() {
if (parent == null)
- return new StandardClassLoader(array);
+ return new URLClassLoader(array);
else
- return new StandardClassLoader(array, parent);
+ return new URLClassLoader(array, parent);
}
});
}
@@ -223,13 +218,13 @@ public final class ClassLoaderFactory {
}
return AccessController.doPrivileged(
- new PrivilegedAction<StandardClassLoader>() {
+ new PrivilegedAction<URLClassLoader>() {
@Override
- public StandardClassLoader run() {
+ public URLClassLoader run() {
if (parent == null)
- return new StandardClassLoader(array);
+ return new URLClassLoader(array);
else
- return new StandardClassLoader(array, parent);
+ return new URLClassLoader(array, parent);
}
});
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
