[weld-commits] Weld SVN: r4417 - in cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck: impl and 50 other directories.

[weld-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2009-10-29 15:05:21 -0400 (Thu, 29 Oct 2009)
New Revision: 4417

Modified:
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/OldSPIBridge.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/literals/AnyLiteral.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/literals/DefaultLiteral.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/literals/InjectLiteral.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/literals/NamedLiteral.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/literals/NewLiteral.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/literals/RetentionLiteral.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/literals/TargetLiteral.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DependentContextTest.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/RoomBinding.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/DecoratorDefinitionTest.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/BeanDefinitionTest.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/qualifier/ChunkyQualifier.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/qualifier/HairyQualifier.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/qualifier/SynchronousQualifier.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/qualifier/TameQualifier.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/qualifier/WhitefishQualifier.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/qualifier/enterprise/HairlessQualifier.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/qualifier/enterprise/HairyQualifier.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/qualifier/enterprise/SkinnyQualifier.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/StereotypeDefinitionTest.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/ExtensionsTest.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/RoleBinding.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/TameAnnotationLiteral.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/bindingTypes/EventBindingTypesTest.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/bindingTypes/TameAnnotationLiteral.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/bindingTypes/WildAnnotationLiteral.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/FireEventTest.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/MiniBar.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/nonbinding/AnimalStereotypeAnnotationLiteral.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/implicit/HonorsLiteral.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/implicit/ImplicitEventTest.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/RoleBinding.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/resolve/ResolveEventObserversTest.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/resolve/RoleBinding.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/resolve/TameAnnotationLiteral.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/runtimeException/TameAnnotationLiteral.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/transactional/TransactionalObserversTest.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/BindingTypeABinding.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/BindingTypeBBinding.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/BindingTypeCBinding.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/nonbinding/AnimalStereotypeAnnotationLiteral.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/select/SelectEventTest.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/alternative/metadata/CheapLiteral.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/alternative/metadata/ExpensiveLiteral.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/alternative/metadata/GroceryWrapper.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/bean/bytype/NonBindingTypeLiteral.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/bean/bytype/TameLiteral.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/BeanManagerTest.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/ProducerTest.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DisposalMethodDefinitionTest.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanICTest.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanTest.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/ProducerFieldDefinitionTest.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/enterprise/EnterpriseProducerFieldDefinitionTest.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/ProducerFieldLifecycleTest.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/ProducerMethodDefinitionTest.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/EnterpriseProducerMethodDefinitionTest.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/ProducerMethodLifecycleTest.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/NewSimpleBeanTest.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/env/EnvInjectionTest.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/PersistenceContextInjectionTest.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/InjectionOfResourceTest.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationIntegrationTest.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/SimpleBeanSpecializationTest.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/InterceptorDefinitionTest.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/multipleBindings/MultipleInterceptorBindingsTest.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/DynamicLookupTest.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/PayByBinding.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/builtin/BuiltinInstanceTest.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/AnimalStereotypeAnnotationLiteral.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ChunkyLiteral.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Expensive.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ExpensiveLiteral.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/parameterized/AssignabilityOfRawAndParameterizedTypesTest.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/PolicyAvailabilityTest.java
Log:
move classes to util package

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java	2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java	2009-10-29 19:05:21 UTC (rev 4417)
@@ -15,10 +15,10 @@
 
 import javax.enterprise.context.spi.Context;
 import javax.enterprise.inject.AmbiguousResolutionException;
-import javax.enterprise.inject.TypeLiteral;
 import javax.enterprise.inject.UnsatisfiedResolutionException;
 import javax.enterprise.inject.spi.Bean;
 import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.util.TypeLiteral;
 
 import org.jboss.jsr299.tck.api.JSR299Configuration;
 import org.jboss.jsr299.tck.impl.OldSPIBridge;

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/OldSPIBridge.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/OldSPIBridge.java	2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/OldSPIBridge.java	2009-10-29 19:05:21 UTC (rev 4417)
@@ -5,10 +5,10 @@
 import java.util.Set;
 
 import javax.enterprise.inject.AmbiguousResolutionException;
-import javax.enterprise.inject.TypeLiteral;
 import javax.enterprise.inject.UnsatisfiedResolutionException;
 import javax.enterprise.inject.spi.Bean;
 import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.util.TypeLiteral;
 
 
 public class OldSPIBridge

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/literals/AnyLiteral.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/literals/AnyLiteral.java	2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/literals/AnyLiteral.java	2009-10-29 19:05:21 UTC (rev 4417)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.literals;
 
-import javax.enterprise.inject.AnnotationLiteral;
 import javax.enterprise.inject.Any;
+import javax.enterprise.util.AnnotationLiteral;
 
 public class AnyLiteral extends AnnotationLiteral<Any> implements Any
 {

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/literals/DefaultLiteral.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/literals/DefaultLiteral.java	2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/literals/DefaultLiteral.java	2009-10-29 19:05:21 UTC (rev 4417)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.literals;
 
-import javax.enterprise.inject.AnnotationLiteral;
 import javax.enterprise.inject.Default;
+import javax.enterprise.util.AnnotationLiteral;
 
 /**
  * Annotation literal for @Current

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/literals/InjectLiteral.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/literals/InjectLiteral.java	2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/literals/InjectLiteral.java	2009-10-29 19:05:21 UTC (rev 4417)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.literals;
 
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
 import javax.inject.Inject;
 
 /**

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/literals/NamedLiteral.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/literals/NamedLiteral.java	2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/literals/NamedLiteral.java	2009-10-29 19:05:21 UTC (rev 4417)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.literals;
 
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
 import javax.inject.Named;
 
 public class NamedLiteral extends AnnotationLiteral<Named> implements Named

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/literals/NewLiteral.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/literals/NewLiteral.java	2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/literals/NewLiteral.java	2009-10-29 19:05:21 UTC (rev 4417)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.literals;
 
-import javax.enterprise.inject.AnnotationLiteral;
 import javax.enterprise.inject.New;
+import javax.enterprise.util.AnnotationLiteral;
 
 public abstract class NewLiteral extends AnnotationLiteral<New> implements New
 {

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/literals/RetentionLiteral.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/literals/RetentionLiteral.java	2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/literals/RetentionLiteral.java	2009-10-29 19:05:21 UTC (rev 4417)
@@ -18,7 +18,7 @@
 
 import java.lang.annotation.Retention;
 
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
 
 /**
  * @author pmuir

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/literals/TargetLiteral.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/literals/TargetLiteral.java	2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/literals/TargetLiteral.java	2009-10-29 19:05:21 UTC (rev 4417)
@@ -18,7 +18,7 @@
 
 import java.lang.annotation.Target;
 
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
 
 /**
  * @author pmuir

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DependentContextTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DependentContextTest.java	2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DependentContextTest.java	2009-10-29 19:05:21 UTC (rev 4417)
@@ -6,8 +6,8 @@
 import javax.enterprise.context.Dependent;
 import javax.enterprise.context.spi.Context;
 import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.AnnotationLiteral;
 import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.util.AnnotationLiteral;
 
 import org.jboss.jsr299.tck.AbstractJSR299Test;
 import org.jboss.jsr299.tck.impl.MockCreationalContext;

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/RoomBinding.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/RoomBinding.java	2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/RoomBinding.java	2009-10-29 19:05:21 UTC (rev 4417)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.context.dependent;
 
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
 
 class RoomBinding extends AnnotationLiteral<Room> implements Room
 {

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/DecoratorDefinitionTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/DecoratorDefinitionTest.java	2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/DecoratorDefinitionTest.java	2009-10-29 19:05:21 UTC (rev 4417)
@@ -23,9 +23,9 @@
 import java.util.List;
 
 import javax.decorator.Decorates;
-import javax.enterprise.inject.AnnotationLiteral;
 import javax.enterprise.inject.Default;
 import javax.enterprise.inject.spi.Decorator;
+import javax.enterprise.util.AnnotationLiteral;
 
 import org.jboss.jsr299.tck.AbstractJSR299Test;
 import org.jboss.test.audit.annotations.SpecAssertion;

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/BeanDefinitionTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/BeanDefinitionTest.java	2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/BeanDefinitionTest.java	2009-10-29 19:05:21 UTC (rev 4417)
@@ -4,8 +4,8 @@
 import java.util.Set;
 
 import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.AnnotationLiteral;
 import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.util.AnnotationLiteral;
 
 import org.jboss.jsr299.tck.AbstractJSR299Test;
 import org.jboss.test.audit.annotations.SpecAssertion;

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/qualifier/ChunkyQualifier.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/qualifier/ChunkyQualifier.java	2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/qualifier/ChunkyQualifier.java	2009-10-29 19:05:21 UTC (rev 4417)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.definition.qualifier;
 
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
 
 class ChunkyQualifier extends AnnotationLiteral<Chunky> implements Chunky
 {

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/qualifier/HairyQualifier.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/qualifier/HairyQualifier.java	2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/qualifier/HairyQualifier.java	2009-10-29 19:05:21 UTC (rev 4417)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.definition.qualifier;
 
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
 
 public class HairyQualifier extends AnnotationLiteral<Hairy> implements Hairy
 {

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/qualifier/SynchronousQualifier.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/qualifier/SynchronousQualifier.java	2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/qualifier/SynchronousQualifier.java	2009-10-29 19:05:21 UTC (rev 4417)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.definition.qualifier;
 
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
 
 class SynchronousQualifier extends AnnotationLiteral<Synchronous> implements Synchronous
 {

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/qualifier/TameQualifier.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/qualifier/TameQualifier.java	2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/qualifier/TameQualifier.java	2009-10-29 19:05:21 UTC (rev 4417)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.definition.qualifier;
 
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
 
 class TameQualifier extends AnnotationLiteral<Tame> implements Tame
 {

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/qualifier/WhitefishQualifier.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/qualifier/WhitefishQualifier.java	2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/qualifier/WhitefishQualifier.java	2009-10-29 19:05:21 UTC (rev 4417)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.definition.qualifier;
 
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
 
 class WhitefishQualifier extends AnnotationLiteral<Whitefish> implements Whitefish
 {

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/qualifier/enterprise/HairlessQualifier.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/qualifier/enterprise/HairlessQualifier.java	2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/qualifier/enterprise/HairlessQualifier.java	2009-10-29 19:05:21 UTC (rev 4417)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.definition.qualifier.enterprise;
 
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
 
 public class HairlessQualifier extends AnnotationLiteral<Hairless> implements Hairless
 {

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/qualifier/enterprise/HairyQualifier.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/qualifier/enterprise/HairyQualifier.java	2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/qualifier/enterprise/HairyQualifier.java	2009-10-29 19:05:21 UTC (rev 4417)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.definition.qualifier.enterprise;
 
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
 
 public class HairyQualifier extends AnnotationLiteral<Hairy> implements Hairy
 {

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/qualifier/enterprise/SkinnyQualifier.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/qualifier/enterprise/SkinnyQualifier.java	2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/qualifier/enterprise/SkinnyQualifier.java	2009-10-29 19:05:21 UTC (rev 4417)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.definition.qualifier.enterprise;
 
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
 
 public class SkinnyQualifier extends AnnotationLiteral<Skinny> implements Skinny
 {

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/StereotypeDefinitionTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/StereotypeDefinitionTest.java	2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/StereotypeDefinitionTest.java	2009-10-29 19:05:21 UTC (rev 4417)
@@ -6,8 +6,8 @@
 import javax.enterprise.context.Dependent;
 import javax.enterprise.context.RequestScoped;
 import javax.enterprise.context.SessionScoped;
-import javax.enterprise.inject.AnnotationLiteral;
 import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.util.AnnotationLiteral;
 
 import org.jboss.jsr299.tck.AbstractJSR299Test;
 import org.jboss.test.audit.annotations.SpecAssertion;

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/ExtensionsTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/ExtensionsTest.java	2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/ExtensionsTest.java	2009-10-29 19:05:21 UTC (rev 4417)
@@ -16,8 +16,8 @@
  */
 package org.jboss.jsr299.tck.tests.deployment.lifecycle;
 
-import javax.enterprise.inject.AnnotationLiteral;
 import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.util.AnnotationLiteral;
 
 import org.jboss.jsr299.tck.AbstractJSR299Test;
 import org.jboss.test.audit.annotations.SpecAssertion;

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/RoleBinding.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/RoleBinding.java	2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/RoleBinding.java	2009-10-29 19:05:21 UTC (rev 4417)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.event;
 
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
 
 
 class RoleBinding extends AnnotationLiteral<Role> implements Role

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/TameAnnotationLiteral.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/TameAnnotationLiteral.java	2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/TameAnnotationLiteral.java	2009-10-29 19:05:21 UTC (rev 4417)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.event;
 
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
 
 class TameAnnotationLiteral extends AnnotationLiteral<Tame> implements Tame
 {

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/bindingTypes/EventBindingTypesTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/bindingTypes/EventBindingTypesTest.java	2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/bindingTypes/EventBindingTypesTest.java	2009-10-29 19:05:21 UTC (rev 4417)
@@ -1,9 +1,9 @@
 package org.jboss.jsr299.tck.tests.event.bindingTypes;
 
 import javax.enterprise.event.Event;
-import javax.enterprise.inject.AnnotationLiteral;
-import javax.enterprise.inject.TypeLiteral;
 import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.util.AnnotationLiteral;
+import javax.enterprise.util.TypeLiteral;
 
 import org.jboss.jsr299.tck.AbstractJSR299Test;
 import org.jboss.jsr299.tck.literals.AnyLiteral;

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/bindingTypes/TameAnnotationLiteral.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/bindingTypes/TameAnnotationLiteral.java	2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/bindingTypes/TameAnnotationLiteral.java	2009-10-29 19:05:21 UTC (rev 4417)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.event.bindingTypes;
 
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
 
 class TameAnnotationLiteral extends AnnotationLiteral<Tame> implements Tame
 {

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/bindingTypes/WildAnnotationLiteral.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/bindingTypes/WildAnnotationLiteral.java	2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/bindingTypes/WildAnnotationLiteral.java	2009-10-29 19:05:21 UTC (rev 4417)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.event.bindingTypes;
 
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
 
 class WildAnnotationLiteral extends AnnotationLiteral<Wild> implements Wild
 {

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/FireEventTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/FireEventTest.java	2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/FireEventTest.java	2009-10-29 19:05:21 UTC (rev 4417)
@@ -9,10 +9,10 @@
 
 import javax.enterprise.context.spi.CreationalContext;
 import javax.enterprise.event.Event;
-import javax.enterprise.inject.AnnotationLiteral;
 import javax.enterprise.inject.spi.Bean;
 import javax.enterprise.inject.spi.BeanManager;
 import javax.enterprise.inject.spi.InjectionPoint;
+import javax.enterprise.util.AnnotationLiteral;
 
 import org.jboss.jsr299.tck.AbstractJSR299Test;
 import org.jboss.jsr299.tck.literals.AnyLiteral;

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/MiniBar.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/MiniBar.java	2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/MiniBar.java	2009-10-29 19:05:21 UTC (rev 4417)
@@ -4,8 +4,8 @@
 import java.util.Set;
 
 import javax.enterprise.event.Event;
-import javax.enterprise.inject.AnnotationLiteral;
 import javax.enterprise.inject.Any;
+import javax.enterprise.util.AnnotationLiteral;
 import javax.inject.Inject;
 
 class MiniBar

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/nonbinding/AnimalStereotypeAnnotationLiteral.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/nonbinding/AnimalStereotypeAnnotationLiteral.java	2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/nonbinding/AnimalStereotypeAnnotationLiteral.java	2009-10-29 19:05:21 UTC (rev 4417)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.event.fires.nonbinding;
 
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
 
 class AnimalStereotypeAnnotationLiteral extends AnnotationLiteral<AnimalStereotype> implements AnimalStereotype
 {

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/implicit/HonorsLiteral.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/implicit/HonorsLiteral.java	2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/implicit/HonorsLiteral.java	2009-10-29 19:05:21 UTC (rev 4417)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.event.implicit;
 
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
 
 class HonorsLiteral extends AnnotationLiteral<Honors>
 {

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/implicit/ImplicitEventTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/implicit/ImplicitEventTest.java	2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/implicit/ImplicitEventTest.java	2009-10-29 19:05:21 UTC (rev 4417)
@@ -5,7 +5,7 @@
 
 import javax.enterprise.context.Dependent;
 import javax.enterprise.event.Event;
-import javax.enterprise.inject.TypeLiteral;
+import javax.enterprise.util.TypeLiteral;
 
 import org.jboss.jsr299.tck.AbstractJSR299Test;
 import org.jboss.jsr299.tck.literals.AnyLiteral;

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/RoleBinding.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/RoleBinding.java	2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/RoleBinding.java	2009-10-29 19:05:21 UTC (rev 4417)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.event.observer;
 
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
 
 class RoleBinding extends AnnotationLiteral<Role> implements Role
 {

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/resolve/ResolveEventObserversTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/resolve/ResolveEventObserversTest.java	2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/resolve/ResolveEventObserversTest.java	2009-10-29 19:05:21 UTC (rev 4417)
@@ -5,8 +5,8 @@
 import java.util.Set;
 
 import javax.enterprise.event.Observes;
-import javax.enterprise.inject.AnnotationLiteral;
 import javax.enterprise.inject.spi.ObserverMethod;
+import javax.enterprise.util.AnnotationLiteral;
 
 import org.jboss.jsr299.tck.AbstractJSR299Test;
 import org.jboss.test.audit.annotations.SpecAssertion;

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/resolve/RoleBinding.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/resolve/RoleBinding.java	2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/resolve/RoleBinding.java	2009-10-29 19:05:21 UTC (rev 4417)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.event.observer.resolve;
 
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
 
 
 class RoleBinding extends AnnotationLiteral<Role> implements Role

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/resolve/TameAnnotationLiteral.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/resolve/TameAnnotationLiteral.java	2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/resolve/TameAnnotationLiteral.java	2009-10-29 19:05:21 UTC (rev 4417)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.event.observer.resolve;
 
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
 
 class TameAnnotationLiteral extends AnnotationLiteral<Tame> implements Tame
 {

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/runtimeException/TameAnnotationLiteral.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/runtimeException/TameAnnotationLiteral.java	2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/runtimeException/TameAnnotationLiteral.java	2009-10-29 19:05:21 UTC (rev 4417)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.event.observer.runtimeException;
 
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
 
 class TameAnnotationLiteral extends AnnotationLiteral<Tame> implements Tame
 {

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/transactional/TransactionalObserversTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/transactional/TransactionalObserversTest.java	2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/transactional/TransactionalObserversTest.java	2009-10-29 19:05:21 UTC (rev 4417)
@@ -20,7 +20,7 @@
 import java.lang.annotation.Annotation;
 import java.math.BigInteger;
 
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
 
 import org.jboss.jsr299.tck.AbstractJSR299Test;
 import org.jboss.test.audit.annotations.SpecAssertion;

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/BindingTypeABinding.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/BindingTypeABinding.java	2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/BindingTypeABinding.java	2009-10-29 19:05:21 UTC (rev 4417)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.event.resolve.binding;
 
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
 
 class BindingTypeABinding extends AnnotationLiteral<BindingTypeA> implements BindingTypeA
 {

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/BindingTypeBBinding.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/BindingTypeBBinding.java	2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/BindingTypeBBinding.java	2009-10-29 19:05:21 UTC (rev 4417)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.event.resolve.binding;
 
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
 
 class BindingTypeBBinding extends AnnotationLiteral<BindingTypeB> implements BindingTypeB
 {

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/BindingTypeCBinding.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/BindingTypeCBinding.java	2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/BindingTypeCBinding.java	2009-10-29 19:05:21 UTC (rev 4417)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.event.resolve.binding;
 
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
 
 class BindingTypeCBinding extends AnnotationLiteral<BindingTypeC> implements BindingTypeC
 {

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/nonbinding/AnimalStereotypeAnnotationLiteral.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/nonbinding/AnimalStereotypeAnnotationLiteral.java	2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/nonbinding/AnimalStereotypeAnnotationLiteral.java	2009-10-29 19:05:21 UTC (rev 4417)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.event.resolve.nonbinding;
 
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
 
 class AnimalStereotypeAnnotationLiteral extends AnnotationLiteral<AnimalStereotype> implements AnimalStereotype
 {

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/select/SelectEventTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/select/SelectEventTest.java	2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/select/SelectEventTest.java	2009-10-29 19:05:21 UTC (rev 4417)
@@ -1,7 +1,7 @@
 package org.jboss.jsr299.tck.tests.event.select;
 
-import javax.enterprise.inject.AnnotationLiteral;
-import javax.enterprise.inject.TypeLiteral;
+import javax.enterprise.util.AnnotationLiteral;
+import javax.enterprise.util.TypeLiteral;
 
 import org.jboss.jsr299.tck.AbstractJSR299Test;
 import org.jboss.test.audit.annotations.SpecAssertion;

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/alternative/metadata/CheapLiteral.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/alternative/metadata/CheapLiteral.java	2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/alternative/metadata/CheapLiteral.java	2009-10-29 19:05:21 UTC (rev 4417)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.extensions.alternative.metadata;
 
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
 
 class CheapLiteral extends AnnotationLiteral<Cheap> implements Cheap
 {

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/alternative/metadata/ExpensiveLiteral.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/alternative/metadata/ExpensiveLiteral.java	2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/alternative/metadata/ExpensiveLiteral.java	2009-10-29 19:05:21 UTC (rev 4417)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.extensions.alternative.metadata;
 
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
 
 class ExpensiveLiteral extends AnnotationLiteral<Expensive> implements Expensive
 {

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/alternative/metadata/GroceryWrapper.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/alternative/metadata/GroceryWrapper.java	2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/alternative/metadata/GroceryWrapper.java	2009-10-29 19:05:21 UTC (rev 4417)
@@ -11,13 +11,13 @@
 import javax.enterprise.event.Reception;
 import javax.enterprise.event.Observes;
 import javax.enterprise.event.TransactionPhase;
-import javax.enterprise.inject.AnnotationLiteral;
 import javax.enterprise.inject.Produces;
 import javax.enterprise.inject.spi.AnnotatedConstructor;
 import javax.enterprise.inject.spi.AnnotatedField;
 import javax.enterprise.inject.spi.AnnotatedMethod;
 import javax.enterprise.inject.spi.AnnotatedParameter;
 import javax.enterprise.inject.spi.AnnotatedType;
+import javax.enterprise.util.AnnotationLiteral;
 
 import org.jboss.jsr299.tck.literals.InjectLiteral;
 

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/bean/bytype/NonBindingTypeLiteral.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/bean/bytype/NonBindingTypeLiteral.java	2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/bean/bytype/NonBindingTypeLiteral.java	2009-10-29 19:05:21 UTC (rev 4417)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.extensions.bean.bytype;
 
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
 
 public class NonBindingTypeLiteral extends AnnotationLiteral<NonBindingType> implements NonBindingType
 {

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/bean/bytype/TameLiteral.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/bean/bytype/TameLiteral.java	2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/bean/bytype/TameLiteral.java	2009-10-29 19:05:21 UTC (rev 4417)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.extensions.bean.bytype;
 
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
 
 class TameLiteral extends AnnotationLiteral<Tame> implements Tame
 {

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/BeanManagerTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/BeanManagerTest.java	2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/BeanManagerTest.java	2009-10-29 19:05:21 UTC (rev 4417)
@@ -35,7 +35,6 @@
 import javax.enterprise.context.RequestScoped;
 import javax.enterprise.context.SessionScoped;
 import javax.enterprise.inject.AmbiguousResolutionException;
-import javax.enterprise.inject.AnnotationLiteral;
 import javax.enterprise.inject.InjectionException;
 import javax.enterprise.inject.Specializes;
 import javax.enterprise.inject.Stereotype;
@@ -44,6 +43,7 @@
 import javax.enterprise.inject.spi.InjectionPoint;
 import javax.enterprise.inject.spi.PassivationCapable;
 import javax.enterprise.inject.spi.InterceptionType;
+import javax.enterprise.util.AnnotationLiteral;
 import javax.inject.Qualifier;
 
 import org.jboss.jsr299.tck.AbstractJSR299Test;

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/ProducerTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/ProducerTest.java	2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/ProducerTest.java	2009-10-29 19:05:21 UTC (rev 4417)
@@ -1,11 +1,11 @@
 package org.jboss.jsr299.tck.tests.extensions.producer;
 
 import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.AnnotationLiteral;
 import javax.enterprise.inject.spi.Bean;
 import javax.enterprise.inject.spi.InjectionPoint;
 import javax.enterprise.inject.spi.InjectionTarget;
 import javax.enterprise.inject.spi.Producer;
+import javax.enterprise.util.AnnotationLiteral;
 
 import org.jboss.jsr299.tck.AbstractJSR299Test;
 import org.jboss.test.audit.annotations.SpecAssertion;

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DisposalMethodDefinitionTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DisposalMethodDefinitionTest.java	2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DisposalMethodDefinitionTest.java	2009-10-29 19:05:21 UTC (rev 4417)
@@ -3,8 +3,8 @@
 import java.lang.annotation.Annotation;
 
 import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.AnnotationLiteral;
 import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.util.AnnotationLiteral;
 
 import org.jboss.jsr299.tck.AbstractJSR299Test;
 import org.jboss.test.audit.annotations.SpecAssertion;

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java	2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java	2009-10-29 19:05:21 UTC (rev 4417)
@@ -4,8 +4,8 @@
 
 import javax.enterprise.context.Dependent;
 import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.AnnotationLiteral;
 import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.util.AnnotationLiteral;
 
 import org.jboss.jsr299.tck.AbstractJSR299Test;
 import org.jboss.test.audit.annotations.SpecAssertion;

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java	2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java	2009-10-29 19:05:21 UTC (rev 4417)
@@ -8,8 +8,8 @@
 import javax.enterprise.context.RequestScoped;
 import javax.enterprise.context.spi.Context;
 import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.AnnotationLiteral;
 import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.util.AnnotationLiteral;
 
 import org.jboss.jsr299.tck.AbstractJSR299Test;
 import org.jboss.test.audit.annotations.SpecAssertion;

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanICTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanICTest.java	2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanICTest.java	2009-10-29 19:05:21 UTC (rev 4417)
@@ -3,8 +3,8 @@
 import java.util.Set;
 
 import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.AnnotationLiteral;
 import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.util.AnnotationLiteral;
 
 import org.jboss.jsr299.tck.AbstractJSR299Test;
 import org.jboss.test.audit.annotations.SpecAssertion;

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanTest.java	2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanTest.java	2009-10-29 19:05:21 UTC (rev 4417)
@@ -5,9 +5,9 @@
 
 import javax.enterprise.context.Dependent;
 import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.AnnotationLiteral;
 import javax.enterprise.inject.New;
 import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.util.AnnotationLiteral;
 
 import org.jboss.jsr299.tck.AbstractJSR299Test;
 import org.jboss.jsr299.tck.literals.AnyLiteral;

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/ProducerFieldDefinitionTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/ProducerFieldDefinitionTest.java	2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/ProducerFieldDefinitionTest.java	2009-10-29 19:05:21 UTC (rev 4417)
@@ -4,8 +4,8 @@
 import java.util.Set;
 
 import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.AnnotationLiteral;
 import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.util.AnnotationLiteral;
 
 import org.jboss.jsr299.tck.AbstractJSR299Test;
 import org.jboss.jsr299.tck.literals.DefaultLiteral;

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/enterprise/EnterpriseProducerFieldDefinitionTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/enterprise/EnterpriseProducerFieldDefinitionTest.java	2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/enterprise/EnterpriseProducerFieldDefinitionTest.java	2009-10-29 19:05:21 UTC (rev 4417)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.implementation.producer.field.definition.enterprise;
 
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
 
 import org.jboss.jsr299.tck.AbstractJSR299Test;
 import org.jboss.test.audit.annotations.SpecAssertion;

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/ProducerFieldLifecycleTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/ProducerFieldLifecycleTest.java	2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/ProducerFieldLifecycleTest.java	2009-10-29 19:05:21 UTC (rev 4417)
@@ -3,7 +3,7 @@
 import javax.enterprise.inject.IllegalProductException;
 import javax.enterprise.inject.spi.Bean;
 import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
 import javax.enterprise.context.spi.CreationalContext;
 
 import org.jboss.jsr299.tck.AbstractJSR299Test;

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/ProducerMethodDefinitionTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/ProducerMethodDefinitionTest.java	2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/ProducerMethodDefinitionTest.java	2009-10-29 19:05:21 UTC (rev 4417)
@@ -4,10 +4,10 @@
 
 import javax.enterprise.context.RequestScoped;
 import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.AnnotationLiteral;
 import javax.enterprise.inject.IllegalProductException;
-import javax.enterprise.inject.TypeLiteral;
 import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.util.AnnotationLiteral;
+import javax.enterprise.util.TypeLiteral;
 
 import org.jboss.jsr299.tck.AbstractJSR299Test;
 import org.jboss.jsr299.tck.literals.AnyLiteral;

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/EnterpriseProducerMethodDefinitionTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/EnterpriseProducerMethodDefinitionTest.java	2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/EnterpriseProducerMethodDefinitionTest.java	2009-10-29 19:05:21 UTC (rev 4417)
@@ -2,8 +2,8 @@
 
 import java.util.Set;
 
-import javax.enterprise.inject.AnnotationLiteral;
 import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.util.AnnotationLiteral;
 
 import org.jboss.jsr299.tck.AbstractJSR299Test;
 import org.jboss.test.audit.annotations.SpecAssertion;

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/ProducerMethodLifecycleTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/ProducerMethodLifecycleTest.java	2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/ProducerMethodLifecycleTest.java	2009-10-29 19:05:21 UTC (rev 4417)
@@ -4,10 +4,10 @@
 
 import javax.enterprise.context.RequestScoped;
 import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.AnnotationLiteral;
 import javax.enterprise.inject.CreationException;
 import javax.enterprise.inject.IllegalProductException;
 import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.util.AnnotationLiteral;
 
 import org.jboss.jsr299.tck.AbstractJSR299Test;
 import org.jboss.test.audit.annotations.SpecAssertion;

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java	2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java	2009-10-29 19:05:21 UTC (rev 4417)
@@ -7,10 +7,10 @@
 import javax.enterprise.context.spi.Context;
 import javax.enterprise.context.spi.Contextual;
 import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.AnnotationLiteral;
 import javax.enterprise.inject.CreationException;
 import javax.enterprise.inject.Specializes;
 import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.util.AnnotationLiteral;
 
 import org.jboss.jsr299.tck.AbstractJSR299Test;
 import org.jboss.jsr299.tck.impl.MockCreationalContext;

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/NewSimpleBeanTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/NewSimpleBeanTest.java	2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/NewSimpleBeanTest.java	2009-10-29 19:05:21 UTC (rev 4417)
@@ -12,10 +12,10 @@
 import javax.enterprise.context.Dependent;
 import javax.enterprise.context.RequestScoped;
 import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.AnnotationLiteral;
 import javax.enterprise.inject.New;
-import javax.enterprise.inject.TypeLiteral;
 import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.util.AnnotationLiteral;
+import javax.enterprise.util.TypeLiteral;
 
 import org.jboss.jsr299.tck.AbstractJSR299Test;
 import org.jboss.jsr299.tck.literals.AnyLiteral;

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/env/EnvInjectionTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/env/EnvInjectionTest.java	2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/env/EnvInjectionTest.java	2009-10-29 19:05:21 UTC (rev 4417)
@@ -17,8 +17,8 @@
 package org.jboss.jsr299.tck.tests.implementation.simple.resource.env;
 
 import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.AnnotationLiteral;
 import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.util.AnnotationLiteral;
 
 import org.jboss.jsr299.tck.AbstractJSR299Test;
 import org.jboss.test.audit.annotations.SpecAssertion;

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/PersistenceContextInjectionTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/PersistenceContextInjectionTest.java	2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/PersistenceContextInjectionTest.java	2009-10-29 19:05:21 UTC (rev 4417)
@@ -1,9 +1,9 @@
 package org.jboss.jsr299.tck.tests.implementation.simple.resource.persistenceContext;
 
 import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.AnnotationLiteral;
 import javax.enterprise.inject.Any;
 import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.util.AnnotationLiteral;
 import javax.persistence.EntityManager;
 
 import org.jboss.jsr299.tck.AbstractJSR299Test;

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/InjectionOfResourceTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/InjectionOfResourceTest.java	2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/InjectionOfResourceTest.java	2009-10-29 19:05:21 UTC (rev 4417)
@@ -1,9 +1,9 @@
 package org.jboss.jsr299.tck.tests.implementation.simple.resource.resource;
 
 import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.AnnotationLiteral;
 import javax.enterprise.inject.spi.Bean;
 import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.util.AnnotationLiteral;
 
 import org.jboss.jsr299.tck.AbstractJSR299Test;
 import org.jboss.test.audit.annotations.SpecAssertion;

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationIntegrationTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationIntegrationTest.java	2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationIntegrationTest.java	2009-10-29 19:05:21 UTC (rev 4417)
@@ -2,8 +2,8 @@
 
 import java.lang.annotation.Annotation;
 
-import javax.enterprise.inject.AnnotationLiteral;
 import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.util.AnnotationLiteral;
 
 import org.jboss.jsr299.tck.AbstractJSR299Test;
 import org.jboss.test.audit.annotations.SpecAssertion;

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java	2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java	2009-10-29 19:05:21 UTC (rev 4417)
@@ -2,9 +2,9 @@
 
 import java.lang.annotation.Annotation;
 
-import javax.enterprise.inject.AnnotationLiteral;
 import javax.enterprise.inject.Any;
 import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.util.AnnotationLiteral;
 import javax.inject.Named;
 
 import org.jboss.jsr299.tck.AbstractJSR299Test;

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java	2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java	2009-10-29 19:05:21 UTC (rev 4417)
@@ -2,8 +2,8 @@
 
 import java.lang.annotation.Annotation;
 
-import javax.enterprise.inject.AnnotationLiteral;
 import javax.enterprise.inject.Any;
+import javax.enterprise.util.AnnotationLiteral;
 import javax.inject.Named;
 
 import org.jboss.jsr299.tck.AbstractJSR299Test;

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/SimpleBeanSpecializationTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/SimpleBeanSpecializationTest.java	2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/SimpleBeanSpecializationTest.java	2009-10-29 19:05:21 UTC (rev 4417)
@@ -2,9 +2,9 @@
 
 import java.lang.annotation.Annotation;
 
-import javax.enterprise.inject.AnnotationLiteral;
 import javax.enterprise.inject.Any;
 import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.util.AnnotationLiteral;
 import javax.inject.Named;
 
 import org.jboss.jsr299.tck.AbstractJSR299Test;

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/InterceptorDefinitionTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/InterceptorDefinitionTest.java	2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/InterceptorDefinitionTest.java	2009-10-29 19:05:21 UTC (rev 4417)
@@ -27,9 +27,9 @@
 import java.util.List;
 import java.util.Set;
 
-import javax.enterprise.inject.AnnotationLiteral;
 import javax.enterprise.inject.spi.InterceptionType;
 import javax.enterprise.inject.spi.Interceptor;
+import javax.enterprise.util.AnnotationLiteral;
 
 import org.jboss.jsr299.tck.AbstractJSR299Test;
 import org.jboss.test.audit.annotations.SpecAssertion;

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/multipleBindings/MultipleInterceptorBindingsTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/multipleBindings/MultipleInterceptorBindingsTest.java	2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/multipleBindings/MultipleInterceptorBindingsTest.java	2009-10-29 19:05:21 UTC (rev 4417)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.interceptors.definition.multipleBindings;
 
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
 
 import org.jboss.jsr299.tck.AbstractJSR299Test;
 import org.jboss.test.audit.annotations.SpecAssertion;

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/DynamicLookupTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/DynamicLookupTest.java	2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/DynamicLookupTest.java	2009-10-29 19:05:21 UTC (rev 4417)
@@ -20,9 +20,9 @@
 import java.util.Iterator;
 
 import javax.enterprise.inject.AmbiguousResolutionException;
-import javax.enterprise.inject.AnnotationLiteral;
 import javax.enterprise.inject.Instance;
 import javax.enterprise.inject.UnsatisfiedResolutionException;
+import javax.enterprise.util.AnnotationLiteral;
 
 import org.jboss.jsr299.tck.AbstractJSR299Test;
 import org.jboss.jsr299.tck.literals.AnyLiteral;

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/PayByBinding.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/PayByBinding.java	2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/PayByBinding.java	2009-10-29 19:05:21 UTC (rev 4417)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.lookup.dynamic;
 
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
 
 abstract class PayByBinding extends AnnotationLiteral<PayBy> implements PayBy
 {

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/builtin/BuiltinInstanceTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/builtin/BuiltinInstanceTest.java	2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/builtin/BuiltinInstanceTest.java	2009-10-29 19:05:21 UTC (rev 4417)
@@ -18,8 +18,8 @@
 
 import javax.enterprise.context.Dependent;
 import javax.enterprise.inject.Instance;
-import javax.enterprise.inject.TypeLiteral;
 import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.util.TypeLiteral;
 
 import org.jboss.jsr299.tck.AbstractJSR299Test;
 import org.jboss.test.audit.annotations.SpecAssertion;

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/AnimalStereotypeAnnotationLiteral.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/AnimalStereotypeAnnotationLiteral.java	2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/AnimalStereotypeAnnotationLiteral.java	2009-10-29 19:05:21 UTC (rev 4417)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.lookup.injectionpoint;
 
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
 
 class AnimalStereotypeAnnotationLiteral extends AnnotationLiteral<AnimalStereotype> implements AnimalStereotype
 {

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ChunkyLiteral.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ChunkyLiteral.java	2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ChunkyLiteral.java	2009-10-29 19:05:21 UTC (rev 4417)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.lookup.typesafe.resolution;
 
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
 
 class ChunkyLiteral extends AnnotationLiteral<Chunky> implements Chunky
 {

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Expensive.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Expensive.java	2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Expensive.java	2009-10-29 19:05:21 UTC (rev 4417)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.enterprise.inject.Nonbinding;
+import javax.enterprise.util.Nonbinding;
 import javax.inject.Qualifier;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ExpensiveLiteral.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ExpensiveLiteral.java	2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ExpensiveLiteral.java	2009-10-29 19:05:21 UTC (rev 4417)
@@ -1,6 +1,6 @@
 package org.jboss.jsr299.tck.tests.lookup.typesafe.resolution;
 
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
 
 abstract class ExpensiveLiteral extends AnnotationLiteral<Expensive> implements Expensive
 {

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java	2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java	2009-10-29 19:05:21 UTC (rev 4417)
@@ -23,9 +23,9 @@
 import java.util.List;
 import java.util.Set;
 
-import javax.enterprise.inject.AnnotationLiteral;
-import javax.enterprise.inject.TypeLiteral;
 import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.util.AnnotationLiteral;
+import javax.enterprise.util.TypeLiteral;
 
 import org.jboss.jsr299.tck.AbstractJSR299Test;
 import org.jboss.jsr299.tck.literals.AnyLiteral;

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/parameterized/AssignabilityOfRawAndParameterizedTypesTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/parameterized/AssignabilityOfRawAndParameterizedTypesTest.java	2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/parameterized/AssignabilityOfRawAndParameterizedTypesTest.java	2009-10-29 19:05:21 UTC (rev 4417)
@@ -20,8 +20,8 @@
 import java.util.Map;
 import java.util.Set;
 
-import javax.enterprise.inject.TypeLiteral;
 import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.util.TypeLiteral;
 
 import org.jboss.jsr299.tck.AbstractJSR299Test;
 import org.jboss.test.audit.annotations.SpecAssertion;

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/PolicyAvailabilityTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/PolicyAvailabilityTest.java	2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/PolicyAvailabilityTest.java	2009-10-29 19:05:21 UTC (rev 4417)
@@ -20,8 +20,8 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.enterprise.inject.AnnotationLiteral;
 import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.util.AnnotationLiteral;
 
 import org.jboss.jsr299.tck.AbstractJSR299Test;
 import org.jboss.test.audit.annotations.SpecAssertion;