[weld-commits] Weld SVN: r6189 - in extensions/trunk/src: main/java/org/jboss/weld/extensions/bean and 3 other directories.

[weld-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2010-04-28 12:34:22 -0400 (Wed, 28 Apr 2010)
New Revision: 6189

Added:
   extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/lookup/
Removed:
   extensions/trunk/src/main/java/org/jboss/weld/extensions/beanlookup/
Modified:
   extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/generic/GenericBeanInjectionTargetWrapper.java
   extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/lookup/AnnotatedTypeIdentifier.java
   extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/lookup/IdentifiableBeanExtension.java
   extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/lookup/IdentifiableInjectionTarget.java
   extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/lookup/RequiresIdentification.java
   extensions/trunk/src/test/java/org/jboss/weld/extensions/test/beanlookup/IdentifiableBeansTest.java
   extensions/trunk/src/test/java/org/jboss/weld/extensions/test/beanlookup/IdentifiableInterceptorBinding.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:21:33 UTC (rev 6188)
+++ extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/generic/GenericBeanInjectionTargetWrapper.java	2010-04-28 16:34:22 UTC (rev 6189)
@@ -23,12 +23,11 @@
 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
  * 
@@ -53,9 +52,9 @@
    
    private final InjectionTarget<T> delegate;
    private final Annotation annotation;
-   private final ReannotatedType<T> annotatedType;
+   private final AnnotatedType<T> annotatedType;
 
-   public GenericBeanInjectionTargetWrapper(ReannotatedType<T> annotatedType, InjectionTarget<T> delegate, Annotation annotation)
+   public GenericBeanInjectionTargetWrapper(AnnotatedType<T> annotatedType, InjectionTarget<T> delegate, Annotation annotation)
    {
       this.annotation = annotation;
       this.delegate = delegate;
@@ -69,7 +68,7 @@
 
          if (annotation.annotationType().isAssignableFrom(f.getType()))
          {
-            ReannotatedField<? super T> reannotatedField = annotatedType.getField(f);
+            AnnotatedField<? super T> reannotatedField = annotatedType.getField(f);
             if (reannotatedField.isAnnotationPresent(InjectConfiguration.class))
             {
                try

Copied: extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/lookup (from rev 6188, extensions/trunk/src/main/java/org/jboss/weld/extensions/beanlookup)

Modified: extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/lookup/AnnotatedTypeIdentifier.java
===================================================================
--- extensions/trunk/src/main/java/org/jboss/weld/extensions/beanlookup/AnnotatedTypeIdentifier.java	2010-04-28 16:21:33 UTC (rev 6188)
+++ extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/lookup/AnnotatedTypeIdentifier.java	2010-04-28 16:34:22 UTC (rev 6189)
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jboss.weld.extensions.beanlookup;
+package org.jboss.weld.extensions.bean.lookup;
 
 import javax.enterprise.inject.spi.AnnotatedType;
 import javax.inject.Inject;

Modified: extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/lookup/IdentifiableBeanExtension.java
===================================================================
--- extensions/trunk/src/main/java/org/jboss/weld/extensions/beanlookup/IdentifiableBeanExtension.java	2010-04-28 16:21:33 UTC (rev 6188)
+++ extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/lookup/IdentifiableBeanExtension.java	2010-04-28 16:34:22 UTC (rev 6189)
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jboss.weld.extensions.beanlookup;
+package org.jboss.weld.extensions.bean.lookup;
 
 import java.lang.annotation.Annotation;
 import java.util.Collections;

Modified: extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/lookup/IdentifiableInjectionTarget.java
===================================================================
--- extensions/trunk/src/main/java/org/jboss/weld/extensions/beanlookup/IdentifiableInjectionTarget.java	2010-04-28 16:21:33 UTC (rev 6188)
+++ extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/lookup/IdentifiableInjectionTarget.java	2010-04-28 16:34:22 UTC (rev 6189)
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jboss.weld.extensions.beanlookup;
+package org.jboss.weld.extensions.bean.lookup;
 
 import java.util.Map;
 import java.util.Set;

Modified: extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/lookup/RequiresIdentification.java
===================================================================
--- extensions/trunk/src/main/java/org/jboss/weld/extensions/beanlookup/RequiresIdentification.java	2010-04-28 16:21:33 UTC (rev 6188)
+++ extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/lookup/RequiresIdentification.java	2010-04-28 16:34:22 UTC (rev 6189)
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jboss.weld.extensions.beanlookup;
+package org.jboss.weld.extensions.bean.lookup;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

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:21:33 UTC (rev 6188)
+++ extensions/trunk/src/test/java/org/jboss/weld/extensions/test/beanlookup/IdentifiableBeansTest.java	2010-04-28 16:34:22 UTC (rev 6189)
@@ -22,7 +22,7 @@
 
 import org.jboss.testharness.impl.packaging.Artifact;
 import org.jboss.testharness.impl.packaging.Classes;
-import org.jboss.weld.extensions.beanlookup.AnnotatedTypeIdentifier;
+import org.jboss.weld.extensions.bean.lookup.AnnotatedTypeIdentifier;
 import org.jboss.weld.test.AbstractWeldTest;
 import org.testng.annotations.Test;
 @Artifact

Modified: extensions/trunk/src/test/java/org/jboss/weld/extensions/test/beanlookup/IdentifiableInterceptorBinding.java
===================================================================
--- extensions/trunk/src/test/java/org/jboss/weld/extensions/test/beanlookup/IdentifiableInterceptorBinding.java	2010-04-28 16:21:33 UTC (rev 6188)
+++ extensions/trunk/src/test/java/org/jboss/weld/extensions/test/beanlookup/IdentifiableInterceptorBinding.java	2010-04-28 16:34:22 UTC (rev 6189)
@@ -23,7 +23,7 @@
 
 import javax.interceptor.InterceptorBinding;
 
-import org.jboss.weld.extensions.beanlookup.RequiresIdentification;
+import org.jboss.weld.extensions.bean.lookup.RequiresIdentification;
 
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.METHOD,ElementType.TYPE})