[jboss-cvs] JBossAS SVN: r106517 - in projects/scanning/trunk: plugins/src/main/java/org/jboss/scanning/hibernate and 2 other directories.

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

Author: alesj
Date: 2010-07-08 20:05:38 -0400 (Thu, 08 Jul 2010)
New Revision: 106517

Modified:
   projects/scanning/trunk/plugins/src/main/java/org/jboss/scanning/hibernate/TempAnnotationVisitor.java
   projects/scanning/trunk/pom.xml
   projects/scanning/trunk/scanning-impl/src/main/java/org/jboss/scanning/plugins/helpers/ReflectProviderUtilFactory.java
   projects/scanning/trunk/testsuite/src/test/java/org/jboss/test/scanning/annotations/test/AnnotationEnvTestCase.java
Log:
Fix reflect provider usage in temp ann visitor #2.

Modified: projects/scanning/trunk/plugins/src/main/java/org/jboss/scanning/hibernate/TempAnnotationVisitor.java
===================================================================
--- projects/scanning/trunk/plugins/src/main/java/org/jboss/scanning/hibernate/TempAnnotationVisitor.java	2010-07-08 19:53:43 UTC (rev 106516)
+++ projects/scanning/trunk/plugins/src/main/java/org/jboss/scanning/hibernate/TempAnnotationVisitor.java	2010-07-09 00:05:38 UTC (rev 106517)
@@ -23,7 +23,6 @@
 package org.jboss.scanning.hibernate;
 
 import java.lang.annotation.Annotation;
-import java.net.URL;
 import java.util.HashSet;
 import java.util.Set;
 
@@ -31,7 +30,6 @@
 import org.jboss.classloading.spi.visitor.ResourceContext;
 import org.jboss.classloading.spi.visitor.ResourceFilter;
 import org.jboss.reflect.spi.ClassInfo;
-import org.jboss.scanning.plugins.visitor.JavassistReflectProvider;
 import org.jboss.scanning.plugins.visitor.ReflectProvider;
 import org.jboss.scanning.plugins.visitor.ReflectResourceVisitor;
 
@@ -47,7 +45,7 @@
 
    public TempAnnotationVisitor(ReflectProvider provider, Class<? extends Annotation> annotation, Set<String> strings)
    {
-      super(provider != null ? provider : new JavassistReflectProvider());
+      super(provider);
 
       if (annotation == null)
          throw new IllegalArgumentException("Null annotation");

Modified: projects/scanning/trunk/pom.xml
===================================================================
--- projects/scanning/trunk/pom.xml	2010-07-08 19:53:43 UTC (rev 106516)
+++ projects/scanning/trunk/pom.xml	2010-07-09 00:05:38 UTC (rev 106517)
@@ -31,14 +31,14 @@
     <version.org.jboss.common.core>2.2.17.GA</version.org.jboss.common.core>
     <version.org.jboss.vfs>3.0.0.CR5</version.org.jboss.vfs>
     <version.org.jboss.classpool>1.0.0.Alpha5</version.org.jboss.classpool>
-    <version.org.jboss.reflect>2.2.0.Alpha5</version.org.jboss.reflect>
+    <version.org.jboss.reflect>2.2.0.Alpha7</version.org.jboss.reflect>
     <version.org.jboss.mdr>2.2.0.Alpha3</version.org.jboss.mdr>
     <version.org.jboss.man>2.1.1.SP2</version.org.jboss.man>
     <version.org.jboss.classloader>2.2.0.Alpha6</version.org.jboss.classloader>
     <version.org.jboss.deployers>2.2.0.Alpha4</version.org.jboss.deployers>
     <version.org.jboss.mc-int>2.2.0.Alpha2</version.org.jboss.mc-int>
     <version.org.jboss.weld-int>6.0.0.Beta11</version.org.jboss.weld-int>
-    <version.javassist>3.12.0.GA</version.javassist>
+    <version.javassist>3.12.1.GA</version.javassist>
     <version.ant>1.7.1</version.ant>
     <version.hibernate>3.5.2-Final</version.hibernate>
     <version.junit>4.4</version.junit>

Modified: projects/scanning/trunk/scanning-impl/src/main/java/org/jboss/scanning/plugins/helpers/ReflectProviderUtilFactory.java
===================================================================
--- projects/scanning/trunk/scanning-impl/src/main/java/org/jboss/scanning/plugins/helpers/ReflectProviderUtilFactory.java	2010-07-08 19:53:43 UTC (rev 106516)
+++ projects/scanning/trunk/scanning-impl/src/main/java/org/jboss/scanning/plugins/helpers/ReflectProviderUtilFactory.java	2010-07-09 00:05:38 UTC (rev 106517)
@@ -22,8 +22,13 @@
 
 package org.jboss.scanning.plugins.helpers;
 
+import org.jboss.dependency.spi.Controller;
+import org.jboss.dependency.spi.ControllerContext;
 import org.jboss.deployers.structure.spi.DeploymentUnit;
-import org.jboss.scanning.plugins.visitor.JavassistReflectProvider;
+import org.jboss.kernel.Kernel;
+import org.jboss.kernel.spi.config.KernelConfigurator;
+import org.jboss.kernel.spi.dependency.KernelController;
+import org.jboss.scanning.plugins.visitor.ConfiguratorReflectProvider;
 import org.jboss.scanning.plugins.visitor.ReflectProvider;
 
 /**
@@ -35,6 +40,18 @@
 {
    public ReflectProvider create(DeploymentUnit unit)
    {
-      return new JavassistReflectProvider();
+      DeploymentUnit top = unit.getTopLevel();
+      ControllerContext context = top.getAttachment(ControllerContext.class);
+      if (context == null)
+         throw new IllegalArgumentException("Not a kernel bound deployment unit: " + unit);
+
+      Controller controller = context.getController();
+      if (controller instanceof KernelController == false)
+         throw new IllegalArgumentException("Not a kernel controller: " + controller);
+
+      KernelController kc = (KernelController) controller;
+      Kernel kernel = kc.getKernel();
+      KernelConfigurator configurator = kernel.getConfigurator();
+      return new ConfiguratorReflectProvider(configurator);
    }
 }
\ No newline at end of file

Modified: projects/scanning/trunk/testsuite/src/test/java/org/jboss/test/scanning/annotations/test/AnnotationEnvTestCase.java
===================================================================
--- projects/scanning/trunk/testsuite/src/test/java/org/jboss/test/scanning/annotations/test/AnnotationEnvTestCase.java	2010-07-08 19:53:43 UTC (rev 106516)
+++ projects/scanning/trunk/testsuite/src/test/java/org/jboss/test/scanning/annotations/test/AnnotationEnvTestCase.java	2010-07-09 00:05:38 UTC (rev 106517)
@@ -36,6 +36,8 @@
 import org.jboss.scanning.annotations.spi.Element;
 import org.jboss.scanning.plugins.helpers.CachingResourceOwnerFinder;
 import org.jboss.scanning.plugins.helpers.ResourceOwnerFinder;
+import org.jboss.scanning.plugins.visitor.JavassistReflectProvider;
+import org.jboss.scanning.plugins.visitor.ReflectProvider;
 import org.jboss.test.scanning.annotations.support.AnnotationsHolder;
 import org.jboss.test.scanning.annotations.support.TestAnnotation;
 
@@ -65,6 +67,7 @@
 
       Deployment deployment = createSimpleDeployment("a");
       addMetaData(deployment, new CachingResourceOwnerFinder(), ResourceOwnerFinder.class);
+      addMetaData(deployment, new JavassistReflectProvider(), ReflectProvider.class);
       addClassLoadingMetaData(
             deployment,
             deployment.getName(),
@@ -143,6 +146,7 @@
 
       Deployment deployment = createSimpleDeployment("a");
       addMetaData(deployment, new CachingResourceOwnerFinder(), ResourceOwnerFinder.class);
+      addMetaData(deployment, new JavassistReflectProvider(), ReflectProvider.class);
       addClassLoadingMetaData(
             deployment,
             deployment.getName(),