[jboss-svn-commits] JBoss Common SVN: r4707 - in shrinkwrap/trunk/extension-classloader/src: test/java/org/jboss/shrinkwrap/classloader and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: aslak
Date: 2010-07-08 18:35:20 -0400 (Thu, 08 Jul 2010)
New Revision: 4707

Modified:
   shrinkwrap/trunk/extension-classloader/src/main/java/org/jboss/shrinkwrap/classloader/ShrinkWrapClassLoader.java
   shrinkwrap/trunk/extension-classloader/src/test/java/org/jboss/shrinkwrap/classloader/ShrinkWrapClassLoaderTestCase.java
Log:
SHRINKWRAP-161 Fixed parent ClassLoader not being passed to super. Added Class == false test. Added JavaDoc.


Modified: shrinkwrap/trunk/extension-classloader/src/main/java/org/jboss/shrinkwrap/classloader/ShrinkWrapClassLoader.java
===================================================================
--- shrinkwrap/trunk/extension-classloader/src/main/java/org/jboss/shrinkwrap/classloader/ShrinkWrapClassLoader.java	2010-07-08 21:32:05 UTC (rev 4706)
+++ shrinkwrap/trunk/extension-classloader/src/main/java/org/jboss/shrinkwrap/classloader/ShrinkWrapClassLoader.java	2010-07-08 22:35:20 UTC (rev 4707)
@@ -47,7 +47,12 @@
    private Set<ExecutorService> executorServices = new HashSet<ExecutorService>();
    
    /**
-    * @param archives
+    * Constructs a new ShrinkWrapClassLoader for the specified {@link Archive}s using the
+    * default delegation parent <code>ClassLoader</code>. The {@link Archive}s will
+    * be searched in the order specified for classes and resources after
+    * first searching in the parent class loader.
+    * 
+    * @param archives the {@link Archive}s from which to load classes and resources
     */
    public ShrinkWrapClassLoader(final Archive<?>... archives)
    {
@@ -61,12 +66,16 @@
    }
    
    /**
-    * @param parent
-    * @param archives
+    * Constructs a new ShrinkWrapClassLoader for the given {@link Archive}s. The {@link Archive}s will be
+    * searched in the order specified for classes and resources after first
+    * searching in the specified parent class loader. 
+    * 
+    * @param parent the parent class loader for delegation
+    * @param archives the {@link Archive}s from which to load classes and resources
     */
    public ShrinkWrapClassLoader(ClassLoader parent, final Archive<?>... archives)
    {
-      super(new URL[]{});
+      super(new URL[]{}, parent);
       
       if(archives == null) 
       {

Modified: shrinkwrap/trunk/extension-classloader/src/test/java/org/jboss/shrinkwrap/classloader/ShrinkWrapClassLoaderTestCase.java
===================================================================
--- shrinkwrap/trunk/extension-classloader/src/test/java/org/jboss/shrinkwrap/classloader/ShrinkWrapClassLoaderTestCase.java	2010-07-08 21:32:05 UTC (rev 4706)
+++ shrinkwrap/trunk/extension-classloader/src/test/java/org/jboss/shrinkwrap/classloader/ShrinkWrapClassLoaderTestCase.java	2010-07-08 22:35:20 UTC (rev 4707)
@@ -45,7 +45,7 @@
    @Test
    public void shouldBeAbleToLoadClassFromArchive() throws Exception
    {
-      ShrinkWrapClassLoader archiveClassLoader = new ShrinkWrapClassLoader(createArchive());
+      ShrinkWrapClassLoader archiveClassLoader = new ShrinkWrapClassLoader((ClassLoader)null, createArchive());
       
       try
       {
@@ -53,6 +53,8 @@
                "org.jboss.shrinkwrap.classloader.LoadedTestClass");
          
          Assert.assertNotNull(loadedTestClass);
+         
+         Assert.assertFalse(LoadedTestClass.class == loadedTestClass.newInstance());
       } 
       finally
       {
@@ -63,7 +65,7 @@
    @Test
    public void shouldBeAbleToLoadResourceFromArchive() throws Exception
    {
-      ShrinkWrapClassLoader archiveClassLoader = new ShrinkWrapClassLoader(createArchive());
+      ShrinkWrapClassLoader archiveClassLoader = new ShrinkWrapClassLoader((ClassLoader)null, createArchive());
       
       try
       {