[webbeans-commits] Webbeans SVN: r3769 - in ri/trunk: impl/src/main/java/org/jboss/webbeans/util and 1 other directories.

[webbeans-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2009-09-23 15:53:54 -0400 (Wed, 23 Sep 2009)
New Revision: 3769

Modified:
   ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployer.java
   ri/trunk/impl/src/main/java/org/jboss/webbeans/util/Reflections.java
   ri/trunk/version-matrix/pom.xml
Log:
fix some security access problem

Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployer.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployer.java	2009-09-23 18:22:11 UTC (rev 3768)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployer.java	2009-09-23 19:53:54 UTC (rev 3769)
@@ -74,7 +74,7 @@
       return this;
    }
    
-   private <X> ProcessAnnotatedTypeImpl<X> createProcessAnnotatedTypeEvent(Class<X> clazz, ClassTransformer classTransformer)
+   private static <X> ProcessAnnotatedTypeImpl<X> createProcessAnnotatedTypeEvent(Class<X> clazz, ClassTransformer classTransformer)
    {
       WBClass<X> annotatedType = classTransformer.loadClass(clazz);
       return new ProcessAnnotatedTypeImpl<X>(annotatedType) {};

Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/util/Reflections.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/util/Reflections.java	2009-09-23 18:22:11 UTC (rev 3768)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/util/Reflections.java	2009-09-23 19:53:54 UTC (rev 3769)
@@ -31,12 +31,15 @@
 import java.lang.reflect.Type;
 import java.lang.reflect.TypeVariable;
 import java.lang.reflect.WildcardType;
+import java.security.AccessControlException;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
 
 import javax.inject.Qualifier;
 
+import org.jboss.webbeans.log.Log;
+import org.jboss.webbeans.log.Logging;
 import org.jboss.webbeans.util.reflection.ParameterizedTypeImpl;
 
 /**
@@ -48,6 +51,8 @@
 public class Reflections
 {
    
+   private static final Log log = Logging.getLog(Reflections.class);
+   
    private static final Type[] EMPTY_TYPES = {};
    
    public static class HierarchyDiscovery
@@ -129,11 +134,19 @@
       @SuppressWarnings("unchecked")
       private void discoverFromClass(Class<?> clazz)
       {
-         discoverTypes(resolveType(type, clazz.getGenericSuperclass()));
-         for (Type c : clazz.getGenericInterfaces())
+         try
          {
-            discoverTypes(resolveType(type, c));
+            discoverTypes(resolveType(type, clazz.getGenericSuperclass()));
+            for (Type c : clazz.getGenericInterfaces())
+            {
+               discoverTypes(resolveType(type, c));
+            }
          }
+         catch (AccessControlException e)
+         {
+            // TODO Hmm, is this a hack?
+            log.trace("Security exception scanning " + clazz.getName(), e);
+         }
       }
       
       /**

Modified: ri/trunk/version-matrix/pom.xml
===================================================================
--- ri/trunk/version-matrix/pom.xml	2009-09-23 18:22:11 UTC (rev 3768)
+++ ri/trunk/version-matrix/pom.xml	2009-09-23 19:53:54 UTC (rev 3769)
@@ -202,13 +202,13 @@
          <dependency>
             <groupId>javax.faces</groupId>
             <artifactId>jsf-api</artifactId>
-            <version>1.2_12</version>
+            <version>1.2_13</version>
          </dependency>
          
          <dependency>
             <groupId>javax.faces</groupId>
             <artifactId>jsf-impl</artifactId>
-            <version>1.2_12</version>
+            <version>1.2_13</version>
          </dependency>
          
          <dependency>