[weld-commits] Weld SVN: r6190 - in extensions/trunk/src: main/resources/META-INF/services and 1 other directories.

[weld-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2010-04-28 12:39:02 -0400 (Wed, 28 Apr 2010)
New Revision: 6190

Modified:
   extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/generic/GenericBeanInjectionTargetWrapper.java
   extensions/trunk/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
   extensions/trunk/src/test/java/org/jboss/weld/extensions/test/beanlookup/IdentifiableBeansTest.java
Log:
WELDX-98

Modified: extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/generic/GenericBeanInjectionTargetWrapper.java
===================================================================
--- extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/generic/GenericBeanInjectionTargetWrapper.java	2010-04-28 16:34:22 UTC (rev 6189)
+++ extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/generic/GenericBeanInjectionTargetWrapper.java	2010-04-28 16:39:02 UTC (rev 6190)
@@ -23,11 +23,12 @@
 import java.util.Set;
 
 import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.AnnotatedField;
-import javax.enterprise.inject.spi.AnnotatedType;
 import javax.enterprise.inject.spi.InjectionPoint;
 import javax.enterprise.inject.spi.InjectionTarget;
 
+import org.jboss.weld.extensions.util.reannotated.ReannotatedField;
+import org.jboss.weld.extensions.util.reannotated.ReannotatedType;
+
 /**
  * injection target wrapper that injects the configuration for generic beans
  * 
@@ -52,9 +53,9 @@
    
    private final InjectionTarget<T> delegate;
    private final Annotation annotation;
-   private final AnnotatedType<T> annotatedType;
+   private final ReannotatedType<T> annotatedType;
 
-   public GenericBeanInjectionTargetWrapper(AnnotatedType<T> annotatedType, InjectionTarget<T> delegate, Annotation annotation)
+   public GenericBeanInjectionTargetWrapper(ReannotatedType<T> annotatedType, InjectionTarget<T> delegate, Annotation annotation)
    {
       this.annotation = annotation;
       this.delegate = delegate;
@@ -68,7 +69,7 @@
 
          if (annotation.annotationType().isAssignableFrom(f.getType()))
          {
-            AnnotatedField<? super T> reannotatedField = annotatedType.getField(f);
+            ReannotatedField<? super T> reannotatedField = annotatedType.getField(f);
             if (reannotatedField.isAnnotationPresent(InjectConfiguration.class))
             {
                try

Modified: extensions/trunk/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
===================================================================
--- extensions/trunk/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension	2010-04-28 16:34:22 UTC (rev 6189)
+++ extensions/trunk/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension	2010-04-28 16:39:02 UTC (rev 6190)
@@ -1,6 +1,6 @@
 org.jboss.weld.extensions.bean.generic.GenericExtension
 org.jboss.weld.extensions.resourceLoader.servlet.ServletResourceExtension
-org.jboss.weld.extensions.beanlookup.IdentifiableBeanExtension
+org.jboss.weld.extensions.bean.lookup.IdentifiableBeanExtension
 org.jboss.weld.extensions.CoreExtension
 org.jboss.weld.extensions.managedproducer.ManagedProducerExtension
 org.jboss.weld.extensions.interceptor.InterceptorExtension
\ No newline at end of file

Modified: extensions/trunk/src/test/java/org/jboss/weld/extensions/test/beanlookup/IdentifiableBeansTest.java
===================================================================
--- extensions/trunk/src/test/java/org/jboss/weld/extensions/test/beanlookup/IdentifiableBeansTest.java	2010-04-28 16:34:22 UTC (rev 6189)
+++ extensions/trunk/src/test/java/org/jboss/weld/extensions/test/beanlookup/IdentifiableBeansTest.java	2010-04-28 16:39:02 UTC (rev 6190)
@@ -26,7 +26,7 @@
 import org.jboss.weld.test.AbstractWeldTest;
 import org.testng.annotations.Test;
 @Artifact
- at Classes(packages = { "org.jboss.weld.extensions.beanlookup" })
+ at Classes(packages = { "org.jboss.weld.extensions.bean.lookup" })
 public class IdentifiableBeansTest extends AbstractWeldTest
 {
    @Test