[jboss-cvs] JBossAS SVN: r99751 - in projects/jboss-cl/branches/Branch_2_0/classloader/src: test/java/org/jboss/test/classloader and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Jan 21 09:39:55 EST 2010
Author: adrian at jboss.org
Date: 2010-01-21 09:39:55 -0500 (Thu, 21 Jan 2010)
New Revision: 99751
Added:
projects/jboss-cl/branches/Branch_2_0/classloader/src/test/java/org/jboss/test/classloader/general/
projects/jboss-cl/branches/Branch_2_0/classloader/src/test/java/org/jboss/test/classloader/general/GeneralTestSuite.java
projects/jboss-cl/branches/Branch_2_0/classloader/src/test/java/org/jboss/test/classloader/general/support/
projects/jboss-cl/branches/Branch_2_0/classloader/src/test/java/org/jboss/test/classloader/general/support/A.java
projects/jboss-cl/branches/Branch_2_0/classloader/src/test/java/org/jboss/test/classloader/general/test/
projects/jboss-cl/branches/Branch_2_0/classloader/src/test/java/org/jboss/test/classloader/general/test/ShutdownUnitTestCase.java
Modified:
projects/jboss-cl/branches/Branch_2_0/classloader/src/main/java/org/jboss/classloader/spi/base/BaseClassLoader.java
projects/jboss-cl/branches/Branch_2_0/classloader/src/test/java/org/jboss/test/classloader/AbstractClassLoaderTest.java
projects/jboss-cl/branches/Branch_2_0/classloader/src/test/java/org/jboss/test/classloader/ClassLoaderAllTestSuite.java
projects/jboss-cl/branches/Branch_2_0/classloader/src/test/java/org/jboss/test/classloader/junit/test/IsolatedClassLoaderUnitTestCase.java
Log:
[JBCL-138] - Fixes for using a shutdown classloader
Modified: projects/jboss-cl/branches/Branch_2_0/classloader/src/main/java/org/jboss/classloader/spi/base/BaseClassLoader.java
===================================================================
--- projects/jboss-cl/branches/Branch_2_0/classloader/src/main/java/org/jboss/classloader/spi/base/BaseClassLoader.java 2010-01-21 14:09:55 UTC (rev 99750)
+++ projects/jboss-cl/branches/Branch_2_0/classloader/src/main/java/org/jboss/classloader/spi/base/BaseClassLoader.java 2010-01-21 14:39:55 UTC (rev 99751)
@@ -525,7 +525,8 @@
if (domain != null)
return domain.getResource(this, name);
- return null;
+ else
+ return getResourceLocally(name, trace);
}
@Override
@@ -548,6 +549,8 @@
Set<URL> resourceURLs = new TreeSet<URL>(ClassLoaderUtils.URLComparator.INSTANCE);
if (domain != null)
domain.getResources(this, name, resourceURLs);
+ else
+ getResourcesLocally(name, resourceURLs, trace);
return resourceURLs;
}
@@ -858,6 +861,14 @@
log.trace(this + " got class from domain " + ClassLoaderUtils.classToString(result));
return result;
}
+ catch (ClassNotFoundException e)
+ {
+ throw e;
+ }
+ catch (Exception e)
+ {
+ throw new ClassNotFoundException("Class not found: " + name, e);
+ }
finally
{
unlock(trace, true);
Modified: projects/jboss-cl/branches/Branch_2_0/classloader/src/test/java/org/jboss/test/classloader/AbstractClassLoaderTest.java
===================================================================
--- projects/jboss-cl/branches/Branch_2_0/classloader/src/test/java/org/jboss/test/classloader/AbstractClassLoaderTest.java 2010-01-21 14:09:55 UTC (rev 99750)
+++ projects/jboss-cl/branches/Branch_2_0/classloader/src/test/java/org/jboss/test/classloader/AbstractClassLoaderTest.java 2010-01-21 14:39:55 UTC (rev 99751)
@@ -21,6 +21,10 @@
*/
package org.jboss.test.classloader;
+import java.io.IOException;
+import java.net.URL;
+import java.util.Enumeration;
+
import junit.framework.TestCase;
import org.jboss.classloader.plugins.ClassLoaderUtils;
@@ -295,6 +299,34 @@
assertEquals(policy.getName(), pkge.getImplementationTitle());
}
+ protected URL assertGetResource(Class<?> reference, ClassLoader start) throws IOException
+ {
+ String resourceName = ClassLoaderUtils.classNameToPath(reference);
+ URL expected = getResource("/" + resourceName);
+
+ URL actual = start.getResource(resourceName);
+ getLog().debug("Got resource " + actual + " for " + resourceName);
+ assertEquals(expected, actual);
+
+ Enumeration<URL> resources = start.getResources(resourceName);
+ assertTrue("Expected to find resources for " + resourceName, resources.hasMoreElements());
+ actual = resources.nextElement();
+ getLog().debug("Got resources " + actual + " for " + resourceName);
+ assertEquals(expected, actual);
+ assertFalse("Expected to find only one resource for " + resourceName, resources.hasMoreElements());
+ return actual;
+ }
+
+ protected void assertGetResourceFail(Class<?> reference, ClassLoader start) throws IOException
+ {
+ String resourceName = ClassLoaderUtils.classNameToPath(reference);
+ URL actual = start.getResource(resourceName);
+ assertNull("Didn't expect " + actual + " for " + resourceName, start.getResource(resourceName));
+
+ Enumeration<URL> resources = start.getResources(resourceName);
+ assertFalse("Didn't expected to find resources for " + resourceName, resources.hasMoreElements());
+ }
+
protected void assertFilterMatchesClassName(String test, ClassFilter filter)
{
getLog().debug("Checking " + test + " expect it to match filter=" + filter);
Modified: projects/jboss-cl/branches/Branch_2_0/classloader/src/test/java/org/jboss/test/classloader/ClassLoaderAllTestSuite.java
===================================================================
--- projects/jboss-cl/branches/Branch_2_0/classloader/src/test/java/org/jboss/test/classloader/ClassLoaderAllTestSuite.java 2010-01-21 14:09:55 UTC (rev 99750)
+++ projects/jboss-cl/branches/Branch_2_0/classloader/src/test/java/org/jboss/test/classloader/ClassLoaderAllTestSuite.java 2010-01-21 14:39:55 UTC (rev 99751)
@@ -28,6 +28,7 @@
import org.jboss.test.classloader.delegate.DelegateTestSuite;
import org.jboss.test.classloader.domain.ClassLoaderDomainTestSuite;
import org.jboss.test.classloader.filter.FilterTestSuite;
+import org.jboss.test.classloader.general.GeneralTestSuite;
import org.jboss.test.classloader.jmx.JMXTestSuite;
import org.jboss.test.classloader.junit.JUnitTestSuite;
import org.jboss.test.classloader.notifications.ClassLoaderNotificationsTestSuite;
@@ -69,6 +70,7 @@
suite.addTest(ClassLoaderDomainTestSuite.suite());
suite.addTest(ClassLoaderPolicyUnitTestCase.suite());
suite.addTest(BootstrapTestSuite.suite());
+ suite.addTest(GeneralTestSuite.suite());
suite.addTest(OldTestSuite.suite());
suite.addTest(FilterTestSuite.suite());
suite.addTest(DelegateTestSuite.suite());
Added: projects/jboss-cl/branches/Branch_2_0/classloader/src/test/java/org/jboss/test/classloader/general/GeneralTestSuite.java
===================================================================
--- projects/jboss-cl/branches/Branch_2_0/classloader/src/test/java/org/jboss/test/classloader/general/GeneralTestSuite.java (rev 0)
+++ projects/jboss-cl/branches/Branch_2_0/classloader/src/test/java/org/jboss/test/classloader/general/GeneralTestSuite.java 2010-01-21 14:39:55 UTC (rev 99751)
@@ -0,0 +1,61 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.classloader.general;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+import junit.textui.TestRunner;
+
+import org.jboss.test.classloader.general.test.ShutdownUnitTestCase;
+
+/**
+ * General Test Suite.
+ *
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision: 37459 $
+ */
+public class GeneralTestSuite extends TestSuite
+{
+ /**
+ * For running the testsuite from the command line
+ *
+ * @param args the command line args
+ */
+ public static void main(String[] args)
+ {
+ TestRunner.run(suite());
+ }
+
+ /**
+ * Create the testsuite
+ *
+ * @return the testsuite
+ */
+ public static Test suite()
+ {
+ TestSuite suite = new TestSuite("General Tests");
+
+ suite.addTest(ShutdownUnitTestCase.suite());
+
+ return suite;
+ }
+}
Added: projects/jboss-cl/branches/Branch_2_0/classloader/src/test/java/org/jboss/test/classloader/general/support/A.java
===================================================================
--- projects/jboss-cl/branches/Branch_2_0/classloader/src/test/java/org/jboss/test/classloader/general/support/A.java (rev 0)
+++ projects/jboss-cl/branches/Branch_2_0/classloader/src/test/java/org/jboss/test/classloader/general/support/A.java 2010-01-21 14:39:55 UTC (rev 99751)
@@ -0,0 +1,27 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2010, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.test.classloader.general.support;
+
+public class A
+{
+
+}
Added: projects/jboss-cl/branches/Branch_2_0/classloader/src/test/java/org/jboss/test/classloader/general/test/ShutdownUnitTestCase.java
===================================================================
--- projects/jboss-cl/branches/Branch_2_0/classloader/src/test/java/org/jboss/test/classloader/general/test/ShutdownUnitTestCase.java (rev 0)
+++ projects/jboss-cl/branches/Branch_2_0/classloader/src/test/java/org/jboss/test/classloader/general/test/ShutdownUnitTestCase.java 2010-01-21 14:39:55 UTC (rev 99751)
@@ -0,0 +1,106 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.classloader.general.test;
+
+import java.util.Collections;
+
+import junit.framework.Test;
+
+import org.jboss.classloader.spi.ClassLoaderSystem;
+import org.jboss.classloader.spi.DelegateLoader;
+import org.jboss.classloader.test.support.MockClassLoaderPolicy;
+import org.jboss.test.classloader.AbstractClassLoaderTest;
+import org.jboss.test.classloader.general.support.A;
+
+/**
+ * ShutdownUnitTestCase.
+ *
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision: 1.1 $
+ */
+public class ShutdownUnitTestCase extends AbstractClassLoaderTest
+{
+ public static Test suite()
+ {
+ return suite(ShutdownUnitTestCase.class);
+ }
+
+ public ShutdownUnitTestCase(String name)
+ {
+ super(name);
+ }
+
+ public void testSimpleShutdown() throws Exception
+ {
+ ClassLoaderSystem system = createClassLoaderSystemWithModifiedBootstrap();
+ MockClassLoaderPolicy policyA = createMockClassLoaderPolicy("a");
+ policyA.setPathsAndPackageNames(A.class);
+ ClassLoader clA = system.registerClassLoaderPolicy(policyA);
+ assertLoadClass(A.class, clA);
+ assertGetResource(A.class, clA);
+
+ system.unregisterClassLoader(clA);
+ // This is actually correct, we can load from ourselves after shutdown
+ assertLoadClass(A.class, clA);
+ assertGetResource(A.class, clA);
+ }
+
+ public void testShutdownImportAll() throws Exception
+ {
+ ClassLoaderSystem system = createClassLoaderSystemWithModifiedBootstrap();
+ MockClassLoaderPolicy policyA = createMockClassLoaderPolicy("a");
+ policyA.setPathsAndPackageNames(A.class);
+ ClassLoader clA = system.registerClassLoaderPolicy(policyA);
+ assertLoadClass(A.class, clA);
+ assertGetResource(A.class, clA);
+
+ MockClassLoaderPolicy policyB = createMockClassLoaderPolicy("b");
+ policyB.setImportAll(true);
+ ClassLoader clB = system.registerClassLoaderPolicy(policyB);
+ assertLoadClass(A.class, clB, clA);
+ assertGetResource(A.class, clB);
+
+ system.unregisterClassLoader(clA);
+ assertLoadClassFail(A.class, clB);
+ assertGetResourceFail(A.class, clB);
+ }
+
+ public void testShutdownImport() throws Exception
+ {
+ ClassLoaderSystem system = createClassLoaderSystemWithModifiedBootstrap();
+ MockClassLoaderPolicy policyA = createMockClassLoaderPolicy("a");
+ policyA.setPathsAndPackageNames(A.class);
+ ClassLoader clA = system.registerClassLoaderPolicy(policyA);
+ assertLoadClass(A.class, clA);
+ assertGetResource(A.class, clA);
+
+ MockClassLoaderPolicy policyB = createMockClassLoaderPolicy("b");
+ policyB.setDelegates(Collections.singletonList(new DelegateLoader(policyA)));
+ ClassLoader clB = system.registerClassLoaderPolicy(policyB);
+ assertLoadClass(A.class, clB, clA);
+ assertGetResource(A.class, clB);
+
+ system.unregisterClassLoader(clA);
+ assertLoadClassFail(A.class, clB);
+ assertGetResourceFail(A.class, clB);
+ }
+}
Modified: projects/jboss-cl/branches/Branch_2_0/classloader/src/test/java/org/jboss/test/classloader/junit/test/IsolatedClassLoaderUnitTestCase.java
===================================================================
--- projects/jboss-cl/branches/Branch_2_0/classloader/src/test/java/org/jboss/test/classloader/junit/test/IsolatedClassLoaderUnitTestCase.java 2010-01-21 14:09:55 UTC (rev 99750)
+++ projects/jboss-cl/branches/Branch_2_0/classloader/src/test/java/org/jboss/test/classloader/junit/test/IsolatedClassLoaderUnitTestCase.java 2010-01-21 14:39:55 UTC (rev 99751)
@@ -113,7 +113,7 @@
}
catch (Throwable t)
{
- checkThrowable(IllegalStateException.class, t);
+ checkThrowable(NoClassDefFoundError.class, t);
}
try
More information about the jboss-cvs-commits
mailing list