[jboss-cvs] JBossAS SVN: r93963 - in projects/annotations/trunk/core/src/main/java/org/jboss/papaki: javalangreflect and 2 other directories.

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

Author: jesper.pedersen
Date: 2009-09-23 16:23:32 -0400 (Wed, 23 Sep 2009)
New Revision: 93963

Modified:
   projects/annotations/trunk/core/src/main/java/org/jboss/papaki/AnnotationScanner.java
   projects/annotations/trunk/core/src/main/java/org/jboss/papaki/javalangreflect/JavaClass.java
   projects/annotations/trunk/core/src/main/java/org/jboss/papaki/javassistclasspool/JavassistClassPool.java
   projects/annotations/trunk/core/src/main/java/org/jboss/papaki/javassistinputstream/JavassistInputStream.java
Log:
[JBANN-38] Context class loader should be taken into account

Modified: projects/annotations/trunk/core/src/main/java/org/jboss/papaki/AnnotationScanner.java
===================================================================
--- projects/annotations/trunk/core/src/main/java/org/jboss/papaki/AnnotationScanner.java	2009-09-23 18:37:15 UTC (rev 93962)
+++ projects/annotations/trunk/core/src/main/java/org/jboss/papaki/AnnotationScanner.java	2009-09-23 20:23:32 UTC (rev 93963)
@@ -37,14 +37,15 @@
    public Configuration configure();
 
    /**
-    * Scan
+    * Scan using the context class loader to resolve annotation class definitions
     * @param urls The URLs with the .jar files
     * @return The annotation repository
     */
    public AnnotationRepository scan(URL[] urls);
 
    /**
-    * Scan using additional classloader to resolve annotation class definitions
+    * Scan using the context class loader as well as the additional 
+    * classloaders specified to resolve annotation class definitions
     * @param urls The URLs with the .jar files
     * @param cls Additional class loaders
     * @return The annotation repository

Modified: projects/annotations/trunk/core/src/main/java/org/jboss/papaki/javalangreflect/JavaClass.java
===================================================================
--- projects/annotations/trunk/core/src/main/java/org/jboss/papaki/javalangreflect/JavaClass.java	2009-09-23 18:37:15 UTC (rev 93962)
+++ projects/annotations/trunk/core/src/main/java/org/jboss/papaki/javalangreflect/JavaClass.java	2009-09-23 20:23:32 UTC (rev 93963)
@@ -83,7 +83,7 @@
 
       if (urls != null)
       {
-         URLClassLoader cl = SecurityActions.createURLClassLoader(urls, null);
+         URLClassLoader cl = SecurityActions.createURLClassLoader(urls, SecurityActions.getThreadContextClassLoader());
 
          for (URL u : urls)
          {
@@ -357,7 +357,7 @@
                      }
                      catch (Throwable t)
                      {
-                        // Ignore
+                        log.log(Level.FINE, t.getMessage(), t);
                      }
                   }
                }

Modified: projects/annotations/trunk/core/src/main/java/org/jboss/papaki/javassistclasspool/JavassistClassPool.java
===================================================================
--- projects/annotations/trunk/core/src/main/java/org/jboss/papaki/javassistclasspool/JavassistClassPool.java	2009-09-23 18:37:15 UTC (rev 93962)
+++ projects/annotations/trunk/core/src/main/java/org/jboss/papaki/javassistclasspool/JavassistClassPool.java	2009-09-23 20:23:32 UTC (rev 93963)
@@ -82,7 +82,7 @@
 
       if (urls != null)
       {
-         URLClassLoader cl = SecurityActions.createURLClassLoader(urls, null);
+         URLClassLoader cl = SecurityActions.createURLClassLoader(urls, SecurityActions.getThreadContextClassLoader());
 
          ClassPool cp = new ClassPool();
          cp.appendClassPath(new LoaderClassPath(cl));
@@ -141,7 +141,7 @@
             }
             catch (Throwable t)
             {
-               // Ignore
+               log.log(Level.FINE, t.getMessage(), t);
             }
             finally
             {

Modified: projects/annotations/trunk/core/src/main/java/org/jboss/papaki/javassistinputstream/JavassistInputStream.java
===================================================================
--- projects/annotations/trunk/core/src/main/java/org/jboss/papaki/javassistinputstream/JavassistInputStream.java	2009-09-23 18:37:15 UTC (rev 93962)
+++ projects/annotations/trunk/core/src/main/java/org/jboss/papaki/javassistinputstream/JavassistInputStream.java	2009-09-23 20:23:32 UTC (rev 93963)
@@ -86,7 +86,7 @@
 
       if (urls != null)
       {
-         URLClassLoader cl = SecurityActions.createURLClassLoader(urls, null);
+         URLClassLoader cl = SecurityActions.createURLClassLoader(urls, SecurityActions.getThreadContextClassLoader());
 
          ClassPool cp = new ClassPool();
          cp.appendClassPath(new LoaderClassPath(cl));
@@ -192,7 +192,7 @@
             }
             catch (Throwable t)
             {
-               // Ignore
+               log.log(Level.FINE, t.getMessage(), t);
             }
             finally
             {