Author: shane.bryzak(a)jboss.com Date: 2009-09-24 21:08:37 -0400 (Thu, 24 Sep 2009) New Revision: 3780 Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/NormalContextTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ApplicationContextTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ejb/ApplicationContextSharedTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationContextTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/InvalidatingSessionDestroysConversationTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/LongRunningConversationPropagatedByFacesContextTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ManualCidPropagationTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/DependentContextEjbTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerInDecorator/EnterpriseBeanWithNonPassivatingInitializerInDecoratorTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerParameterInInterceptor/EnterpriseBeanWithNonPassivatingInitializerParameterInInterceptorTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInjectedFieldInDecorator/EnterpriseBeanWithNonPassivatingInjectedFieldInDecoratorTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInjectedFieldInInterceptor/EnterpriseBeanWithNonPassivatingInjectedFieldInInterceptorTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/finalProducerFieldNotPassivationCapable/NonPassivationCapableProducerFieldTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/PassivationCapableBeanWithNonPassivatingInterceptorTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/managedBeanWithNonPassivatingDecorator/ManagedBeanWithNonPassivatingDecoratorTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableManagedBeanHasPassivatingScope/NonPassivationManagedBeanHasPassivatingScopeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerMethod/NonPassivationCapableProducerMethodTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingManagedBeanWithNonPassivatingBeanConstructor/PassivatingManagedBeanWithNonPassivatingBeanConstructorTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingManagedBeanWithNonPassivatingInitializerMethod/PassivatingManagedBeanWithNonPassivatingInitializerMethodTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/RequestContextTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/ejb/EJBRequestContextTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/enabledDecoratorIsNotDecorator/EnabledDecoratorNotADecoratorTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanMethod/FinalBeanMethodTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/nonDecoratorWithDecorates/NonDecoratorWithDecoratesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/notAllDecoratedTypesImplemented/NotAllDecoratedTypesImplementedTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/broken/delegateProducerMethod/DelegateInjectionPointTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/delegateField/DelegateFieldInjectionPointTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/withBindingType/StereoTypeWithBindingTypesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/DeploymentTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/ExtensionsTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDefinitionError/AddDefinitionErrorTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanDiscoveryObserver/AfterBeanDiscoveryObserverExecutionFailureTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanValidationObserver/AfterDeploymentValidationObserverExecutionFailureTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringBeanDiscovery/DeploymentFailureTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/passivatingScope/AddingPassivatingScopeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/LibraryInEarTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/LibraryInWarTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/installedLibrary/WarInstalledLibraryTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/dependentIsConditionalObserver/DependentIsConditionalObserverTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isDisposer/ObserverMethodAnnotatedDisposesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/notBusinessMethod/EJBObserverMethodNotBusinessMethodTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/nonbinding/NonBindingTypePassedToFireTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/implicit/ImplicitEventTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/abortProcessing/ObserverExceptionAbortsProcessingTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/checkedException/CheckedExceptionWrappedTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/conditional/ConditionalObserverTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/DuplicateBindingTypesWhenResolvingTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/ResolvingChecksBindingTypeMembersTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/nonbinding/NonBindingTypesWhenResolvingTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/typeWithParameters/CheckTypeParametersWhenResolvingObserversTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/typeWithParameters/ChecksEventTypeWhenResolvingTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/AlternativeMetaDataTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/broken/processAnnotatedObserverThrowsException/ProcessAnnotatedTypeEventThrowsExceptionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/bean/bytype/BeanByTypeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/exception/ProcessObserverMethodExceptionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/ProducerTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/broken/injectionTargetError/InjectionTargetDefinitionErrorTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/InitializerUnallowedDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/methodOnSessionBean/DisposalMethodOnSessionBean.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/ProducesUnallowedDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/UnresolvedDisposalMethodDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithConversationScope/SingletonWithConversationScopeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithConversationScope/StatelessWithConversationScopeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithSessionScope/StatelessWithSessionScopeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanViaXmlTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/EnterpriseBeanRemoveMethodTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/EjbInitializerMethodTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/InitializerMethodTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/staticInitializer/StaticInitializerTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/ProducerFieldDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/enterprise/nonbusiness/ProducerMethodNotBusinessMethodTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithTypeParameter2/ParameterizedTypeWithTypeParameterTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasDisposesParameter/ConstructorHasDisposesParameterTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/unproxyable/UnproxyableManagedBeanTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/env/EnvInjectionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/InjectionOfResourceTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsNothing/DirectlyExtendsNothingTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/sameName/SameNameTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializesStaticMethod/SpecializesStaticMethodTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializingAndSpecializedBeanHaveName/SpecializingAndSpecializedBeanHaveNameTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/SpecializingAndSpecializedBeanHasNameTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/SpecializingBeanExtendsNothingTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/SpecializingClassExtendsNonSimpleBeanTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/TwoSpecializingBeansForOneSpecializedTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/interceptorWithNoBinding/InterceptorWithNoBindingTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/invalidBindingAnnotations/InvalidInterceptorBindingAnnotationsTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/invalidLifecycleInterceptor/InvalidLifecycleInterceptorTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorOrder/InterceptorOrderTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicatePrefixResolution/DuplicateNamePrefixResolutionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/finalMethod/FinalMethodTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/privateConstructor/PrivateConstructorTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/broken/ambiguous/AmbiguousDependencyTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/builtin/BuiltinInstanceTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/integration/IntegrationWithUnifiedELTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/InjectionIntoNonContextualComponentTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/nullableBean/NullableBeanTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/InjectableReferenceTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/normal/scope/NormalScopedBeanWithInjectionPoint.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/reference/unresolved/UnsatisfiedInjectableReferenceTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/ManagerTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/decorator/DecoratorNotResolvedTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/interceptor/InterceptorNotResolvedTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/PolicyAvailabilityTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/incorrect/name/stereotype/NoAnnotationWithSpecifiedNameTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/not/policy/ClassIsNotPolicyTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/same/type/twice/SameTypeListedTwiceTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/enterprise/SessionBeanPolicyTest.java Log: update test mappings to PFD2 Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/NormalContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/NormalContextTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/NormalContextTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -22,7 +22,7 @@ * @author David Allen */ @Artifact -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class NormalContextTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ApplicationContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ApplicationContextTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ApplicationContextTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -22,7 +22,7 @@ @Resource(destination=WarArtifactDescriptor.WEB_XML_DESTINATION, source="web.xml"), @Resource(destination="SimplePage.html", source="SimplePage.html") }) -@SpecVersion(spec = "cdi", version="1.0.20090625") +@SpecVersion(spec = "cdi", version="PFD2") public class ApplicationContextTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ejb/ApplicationContextSharedTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ejb/ApplicationContextSharedTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ejb/ApplicationContextSharedTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -17,7 +17,7 @@ @Artifact @IntegrationTest @Packaging(PackagingType.EAR) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class ApplicationContextSharedTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationContextTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationContextTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -17,7 +17,7 @@ * @author Nicklas Karlsson */ @Artifact -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class ConversationContextTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/InvalidatingSessionDestroysConversationTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/InvalidatingSessionDestroysConversationTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/InvalidatingSessionDestroysConversationTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -24,7 +24,7 @@ @Resource(destination="clouds.jspx", source="clouds.jsf"), @Resource(destination="cloud.jspx", source="cloud.jsf") }) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class InvalidatingSessionDestroysConversationTest extends AbstractConversationTest { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/LongRunningConversationPropagatedByFacesContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/LongRunningConversationPropagatedByFacesContextTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/LongRunningConversationPropagatedByFacesContextTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -29,7 +29,7 @@ @Resource(destination="thunder.jspx", source="thunder.jsf"), @Resource(destination="lightening.jspx", source="lightening.jsf") }) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class LongRunningConversationPropagatedByFacesContextTest extends AbstractConversationTest { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ManualCidPropagationTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ManualCidPropagationTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ManualCidPropagationTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -29,7 +29,7 @@ @Resource(destination="clouds.jspx", source="clouds.jsf"), @Resource(destination="/WEB-INF/faces-config.xml", source="faces-config.xml") }) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class ManualCidPropagationTest extends AbstractConversationTest { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/DependentContextEjbTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/DependentContextEjbTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/DependentContextEjbTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -32,7 +32,7 @@ @IntegrationTest @Packaging(PackagingType.EAR) @Artifact -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class DependentContextEjbTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerInDecorator/EnterpriseBeanWithNonPassivatingInitializerInDecoratorTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerInDecorator/EnterpriseBeanWithNonPassivatingInitializerInDecoratorTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerInDecorator/EnterpriseBeanWithNonPassivatingInitializerInDecoratorTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -14,7 +14,7 @@ @Artifact @Packaging(PackagingType.EAR) @ExpectedDeploymentException(DeploymentError.class) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") @BeansXml("beans.xml") public class EnterpriseBeanWithNonPassivatingInitializerInDecoratorTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerParameterInInterceptor/EnterpriseBeanWithNonPassivatingInitializerParameterInInterceptorTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerParameterInInterceptor/EnterpriseBeanWithNonPassivatingInitializerParameterInInterceptorTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerParameterInInterceptor/EnterpriseBeanWithNonPassivatingInitializerParameterInInterceptorTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -13,7 +13,7 @@ @Artifact @Packaging(PackagingType.EAR) @ExpectedDeploymentException(DeploymentError.class) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class EnterpriseBeanWithNonPassivatingInitializerParameterInInterceptorTest extends AbstractJSR299Test { @Test(groups = { "contexts", "passivation", "ri-broken" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInjectedFieldInDecorator/EnterpriseBeanWithNonPassivatingInjectedFieldInDecoratorTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInjectedFieldInDecorator/EnterpriseBeanWithNonPassivatingInjectedFieldInDecoratorTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInjectedFieldInDecorator/EnterpriseBeanWithNonPassivatingInjectedFieldInDecoratorTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -14,7 +14,7 @@ @Artifact @Packaging(PackagingType.EAR) @ExpectedDeploymentException(DeploymentError.class) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") @BeansXml("beans.xml") public class EnterpriseBeanWithNonPassivatingInjectedFieldInDecoratorTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInjectedFieldInInterceptor/EnterpriseBeanWithNonPassivatingInjectedFieldInInterceptorTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInjectedFieldInInterceptor/EnterpriseBeanWithNonPassivatingInjectedFieldInInterceptorTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInjectedFieldInInterceptor/EnterpriseBeanWithNonPassivatingInjectedFieldInInterceptorTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -13,7 +13,7 @@ @Artifact @Packaging(PackagingType.EAR) @ExpectedDeploymentException(DeploymentError.class) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class EnterpriseBeanWithNonPassivatingInjectedFieldInInterceptorTest extends AbstractJSR299Test { @Test(groups = { "contexts", "passivation", "ri-broken"}) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/finalProducerFieldNotPassivationCapable/NonPassivationCapableProducerFieldTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/finalProducerFieldNotPassivationCapable/NonPassivationCapableProducerFieldTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/finalProducerFieldNotPassivationCapable/NonPassivationCapableProducerFieldTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -17,7 +17,7 @@ */ @Artifact @Packaging(PackagingType.EAR) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") @ExpectedDeploymentException(DeploymentError.class) public class NonPassivationCapableProducerFieldTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/PassivationCapableBeanWithNonPassivatingInterceptorTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/PassivationCapableBeanWithNonPassivatingInterceptorTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/PassivationCapableBeanWithNonPassivatingInterceptorTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -10,7 +10,7 @@ @Artifact @ExpectedDeploymentException(DeploymentError.class) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class PassivationCapableBeanWithNonPassivatingInterceptorTest extends AbstractJSR299Test { @Test(groups = { "contexts", "passivation", "ri-broken" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/managedBeanWithNonPassivatingDecorator/ManagedBeanWithNonPassivatingDecoratorTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/managedBeanWithNonPassivatingDecorator/ManagedBeanWithNonPassivatingDecoratorTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/managedBeanWithNonPassivatingDecorator/ManagedBeanWithNonPassivatingDecoratorTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -14,7 +14,7 @@ @Artifact @Packaging(PackagingType.EAR) @ExpectedDeploymentException(DefinitionError.class) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") @BeansXml("beans.xml") public class ManagedBeanWithNonPassivatingDecoratorTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableManagedBeanHasPassivatingScope/NonPassivationManagedBeanHasPassivatingScopeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableManagedBeanHasPassivatingScope/NonPassivationManagedBeanHasPassivatingScopeTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableManagedBeanHasPassivatingScope/NonPassivationManagedBeanHasPassivatingScopeTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -17,7 +17,7 @@ */ @Artifact @ExpectedDeploymentException(DefinitionError.class) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class NonPassivationManagedBeanHasPassivatingScopeTest extends AbstractJSR299Test { @Test(groups = { "contexts", "passivation" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerMethod/NonPassivationCapableProducerMethodTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerMethod/NonPassivationCapableProducerMethodTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerMethod/NonPassivationCapableProducerMethodTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -17,7 +17,7 @@ */ @Artifact @Packaging(PackagingType.EAR) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") @ExpectedDeploymentException(DeploymentError.class) public class NonPassivationCapableProducerMethodTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingManagedBeanWithNonPassivatingBeanConstructor/PassivatingManagedBeanWithNonPassivatingBeanConstructorTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingManagedBeanWithNonPassivatingBeanConstructor/PassivatingManagedBeanWithNonPassivatingBeanConstructorTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingManagedBeanWithNonPassivatingBeanConstructor/PassivatingManagedBeanWithNonPassivatingBeanConstructorTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -10,7 +10,7 @@ @Artifact @ExpectedDeploymentException(DeploymentError.class) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class PassivatingManagedBeanWithNonPassivatingBeanConstructorTest extends AbstractJSR299Test { @Test(groups = { "contexts", "passivation" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingManagedBeanWithNonPassivatingInitializerMethod/PassivatingManagedBeanWithNonPassivatingInitializerMethodTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingManagedBeanWithNonPassivatingInitializerMethod/PassivatingManagedBeanWithNonPassivatingInitializerMethodTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingManagedBeanWithNonPassivatingInitializerMethod/PassivatingManagedBeanWithNonPassivatingInitializerMethodTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -10,7 +10,7 @@ @Artifact @ExpectedDeploymentException(DeploymentError.class) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class PassivatingManagedBeanWithNonPassivatingInitializerMethodTest extends AbstractJSR299Test { @Test(groups = { "contexts", "passivation" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/RequestContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/RequestContextTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/RequestContextTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -19,7 +19,7 @@ @Resource(destination=WarArtifactDescriptor.WEB_XML_DESTINATION, source="web.xml"), @Resource(destination="SimplePage.html", source="SimplePage.html") }) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class RequestContextTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/ejb/EJBRequestContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/ejb/EJBRequestContextTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/ejb/EJBRequestContextTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -17,7 +17,7 @@ @Artifact @IntegrationTest @Packaging(PackagingType.EAR) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class EJBRequestContextTest extends AbstractJSR299Test { /** Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/enabledDecoratorIsNotDecorator/EnabledDecoratorNotADecoratorTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/enabledDecoratorIsNotDecorator/EnabledDecoratorNotADecoratorTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/enabledDecoratorIsNotDecorator/EnabledDecoratorNotADecoratorTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -31,7 +31,7 @@ @Artifact @ExpectedDeploymentException(DeploymentError.class) @BeansXml("beans.xml") -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class EnabledDecoratorNotADecoratorTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanMethod/FinalBeanMethodTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanMethod/FinalBeanMethodTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanMethod/FinalBeanMethodTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -32,7 +32,7 @@ @Artifact @ExpectedDeploymentException(DefinitionError.class) @BeansXml("beans.xml") -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class FinalBeanMethodTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/nonDecoratorWithDecorates/NonDecoratorWithDecoratesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/nonDecoratorWithDecorates/NonDecoratorWithDecoratesTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/nonDecoratorWithDecorates/NonDecoratorWithDecoratesTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -14,7 +14,7 @@ */ @Artifact @ExpectedDeploymentException(DefinitionError.class) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class NonDecoratorWithDecoratesTest extends AbstractJSR299Test { @Test Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/notAllDecoratedTypesImplemented/NotAllDecoratedTypesImplementedTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/notAllDecoratedTypesImplemented/NotAllDecoratedTypesImplementedTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/notAllDecoratedTypesImplemented/NotAllDecoratedTypesImplementedTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -32,7 +32,7 @@ @Artifact @ExpectedDeploymentException(DefinitionError.class) @BeansXml("beans.xml") -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class NotAllDecoratedTypesImplementedTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/broken/delegateProducerMethod/DelegateInjectionPointTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/broken/delegateProducerMethod/DelegateInjectionPointTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/broken/delegateProducerMethod/DelegateInjectionPointTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -32,7 +32,7 @@ */ @Artifact @BeansXml("beans.xml") -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") @ExpectedDeploymentException(DefinitionError.class) public class DelegateInjectionPointTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/delegateField/DelegateFieldInjectionPointTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/delegateField/DelegateFieldInjectionPointTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/delegateField/DelegateFieldInjectionPointTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -30,7 +30,7 @@ */ @Artifact @BeansXml("beans.xml") -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class DelegateFieldInjectionPointTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/withBindingType/StereoTypeWithBindingTypesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/withBindingType/StereoTypeWithBindingTypesTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/withBindingType/StereoTypeWithBindingTypesTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -11,7 +11,7 @@ @Artifact @ExpectedDeploymentException(DefinitionError.class) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class StereoTypeWithBindingTypesTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/DeploymentTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/DeploymentTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/DeploymentTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -35,7 +35,7 @@ */ @Artifact @Test -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") @BeansXml("beans.xml") @Resources({ @Resource(source="javax.enterprise.inject.spi.Extension.DeploymentTest", destination="WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension") Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/ExtensionsTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/ExtensionsTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/ExtensionsTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -37,7 +37,7 @@ @Resource(source="javax.enterprise.inject.spi.Extension.ExtensionsTest", destination="WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension") }) @IntegrationTest -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class ExtensionsTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDefinitionError/AddDefinitionErrorTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDefinitionError/AddDefinitionErrorTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDefinitionError/AddDefinitionErrorTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -26,7 +26,7 @@ // Must be an integration test as it needs a resource copied to a folder @IntegrationTest @ExpectedDeploymentException(DefinitionError.class) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class AddDefinitionErrorTest extends AbstractJSR299Test { @Test(groups={"jboss-as-broken", "rewrite"}) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanDiscoveryObserver/AfterBeanDiscoveryObserverExecutionFailureTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanDiscoveryObserver/AfterBeanDiscoveryObserverExecutionFailureTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanDiscoveryObserver/AfterBeanDiscoveryObserverExecutionFailureTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -17,7 +17,7 @@ */ @Artifact @ExpectedDeploymentException(DefinitionError.class) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class AfterBeanDiscoveryObserverExecutionFailureTest extends AbstractJSR299Test { @Test(groups={"jboss-as-broken", "rewrite"}) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanValidationObserver/AfterDeploymentValidationObserverExecutionFailureTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanValidationObserver/AfterDeploymentValidationObserverExecutionFailureTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanValidationObserver/AfterDeploymentValidationObserverExecutionFailureTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -34,7 +34,7 @@ */ @Artifact @ExpectedDeploymentException(DeploymentError.class) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class AfterDeploymentValidationObserverExecutionFailureTest extends AbstractJSR299Test { @Test(groups={"jboss-as-broken", "rewrite"}) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringBeanDiscovery/DeploymentFailureTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringBeanDiscovery/DeploymentFailureTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringBeanDiscovery/DeploymentFailureTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -14,7 +14,7 @@ @Artifact @Packaging(PackagingType.EAR) @ExpectedDeploymentException(DefinitionError.class) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class DeploymentFailureTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/passivatingScope/AddingPassivatingScopeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/passivatingScope/AddingPassivatingScopeTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/passivatingScope/AddingPassivatingScopeTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -36,7 +36,7 @@ }) @IntegrationTest @ExpectedDeploymentException(DeploymentError.class) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class AddingPassivatingScopeTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/LibraryInEarTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/LibraryInEarTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/LibraryInEarTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -43,7 +43,7 @@ // We put Foo in the ejb jar, but Bar goes in the library @Classes({LibraryInEarTest.class, Foo.class}) @Test -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") @IntegrationTest @Packaging(PackagingType.EAR) public class LibraryInEarTest extends AbstractJSR299Test Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/LibraryInWarTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/LibraryInWarTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/LibraryInWarTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -41,7 +41,7 @@ // We put Foo in the ejb jar, but Bar goes in the library @Classes({LibraryInWarTest.class, Foo.class}) @Test -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") @IntegrationTest public class LibraryInWarTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/installedLibrary/WarInstalledLibraryTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/installedLibrary/WarInstalledLibraryTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/installedLibrary/WarInstalledLibraryTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -45,7 +45,7 @@ // We put Foo in the ejb jar, but Bar goes in the library @Classes({WarInstalledLibraryTest.class, Foo.class}) @Test -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") @IntegrationTest public class WarInstalledLibraryTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -22,7 +22,7 @@ */ @Artifact @BeansXml("beans.xml") -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class EventTest extends AbstractJSR299Test { @Test(groups = { "events" }) @@ -30,7 +30,7 @@ @SpecAssertion(section = "10.4.3", id = "a"), @SpecAssertion(section = "5.6.8", id = "c"), @SpecAssertion(section = "2.3.5", id = "ca"), - @SpecAssertion(section = "3.9", id = "a") + @SpecAssertion(section = "3.10", id = "a") }) public void testObserverMethodReceivesInjectionsOnNonObservesParameters() { @@ -64,7 +64,7 @@ @Test(groups = { "events" }) @SpecAssertions({ - @SpecAssertion(section = "4.3.2", id = "d"), + //@SpecAssertion(section = "4.3.2", id = "d"), @SpecAssertion(section="4.3", id="cb"), @SpecAssertion(section = "5.6.8", id = "ba") }) @@ -76,7 +76,7 @@ } @Test(groups = { "events" }, expectedExceptions = IllegalArgumentException.class) - @SpecAssertion(section = "11.3.11", id = "c") + @SpecAssertion(section = "11.3.10", id = "c") public <T> void testEventObjectContainsTypeVariablesWhenResolvingFails() { eventObjectContainsTypeVariables(new ArrayList<T>()); Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/dependentIsConditionalObserver/DependentIsConditionalObserverTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/dependentIsConditionalObserver/DependentIsConditionalObserverTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/dependentIsConditionalObserver/DependentIsConditionalObserverTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -10,7 +10,7 @@ @Artifact @ExpectedDeploymentException(DefinitionError.class) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class DependentIsConditionalObserverTest extends AbstractJSR299Test { // WBRI-315 Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isDisposer/ObserverMethodAnnotatedDisposesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isDisposer/ObserverMethodAnnotatedDisposesTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isDisposer/ObserverMethodAnnotatedDisposesTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -34,7 +34,7 @@ */ @Artifact @ExpectedDeploymentException(DefinitionError.class) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class ObserverMethodAnnotatedDisposesTest extends AbstractJSR299Test { @Test(groups = { "events" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/notBusinessMethod/EJBObserverMethodNotBusinessMethodTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/notBusinessMethod/EJBObserverMethodNotBusinessMethodTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/notBusinessMethod/EJBObserverMethodNotBusinessMethodTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -36,7 +36,7 @@ @Artifact @Packaging(PackagingType.EAR) @ExpectedDeploymentException(DefinitionError.class) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class EJBObserverMethodNotBusinessMethodTest extends AbstractJSR299Test { @Test(groups = { "events" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/nonbinding/NonBindingTypePassedToFireTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/nonbinding/NonBindingTypePassedToFireTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/nonbinding/NonBindingTypePassedToFireTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -7,11 +7,11 @@ import org.testng.annotations.Test; @Artifact -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class NonBindingTypePassedToFireTest extends AbstractJSR299Test { @Test(groups = { "events" }, expectedExceptions = { IllegalArgumentException.class }) - @SpecAssertion(section = "11.3.10", id = "e") + @SpecAssertion(section = "11.3.9", id = "e") public void testExceptionThrownIfNonBindingTypePassedToFire() throws Exception { OwlFinch_Broken bean = getInstanceByType(OwlFinch_Broken.class); Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/implicit/ImplicitEventTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/implicit/ImplicitEventTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/implicit/ImplicitEventTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -22,7 +22,7 @@ * @author Dan Allen */ @Artifact -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class ImplicitEventTest extends AbstractJSR299Test { private static final TypeLiteral<Event<StudentRegisteredEvent>> STUDENT_REGISTERED_EVENT_LITERAL = new TypeLiteral<Event<StudentRegisteredEvent>>() {}; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/abortProcessing/ObserverExceptionAbortsProcessingTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/abortProcessing/ObserverExceptionAbortsProcessingTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/abortProcessing/ObserverExceptionAbortsProcessingTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -9,7 +9,7 @@ import org.testng.annotations.Test; @Artifact -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class ObserverExceptionAbortsProcessingTest extends AbstractJSR299Test { public static class AnEventType Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/checkedException/CheckedExceptionWrappedTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/checkedException/CheckedExceptionWrappedTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/checkedException/CheckedExceptionWrappedTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -31,7 +31,7 @@ * @author David Allen */ @Artifact -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class CheckedExceptionWrappedTest extends AbstractJSR299Test { @Test(groups = { "events" }, expectedExceptions = { ObserverException.class }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/conditional/ConditionalObserverTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/conditional/ConditionalObserverTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/conditional/ConditionalObserverTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -13,7 +13,7 @@ import org.testng.annotations.Test; @Artifact -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class ConditionalObserverTest extends AbstractJSR299Test { @Test(groups = { "events" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/DuplicateBindingTypesWhenResolvingTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/DuplicateBindingTypesWhenResolvingTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/DuplicateBindingTypesWhenResolvingTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -9,7 +9,7 @@ import org.testng.annotations.Test; @Artifact -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class DuplicateBindingTypesWhenResolvingTest extends AbstractJSR299Test { public static class AnEventType @@ -27,7 +27,7 @@ } @Test(groups = { "events" }, expectedExceptions = { IllegalArgumentException.class }) - @SpecAssertion(section = "11.3.11", id = "d") + @SpecAssertion(section = "11.3.10", id = "d") public void testDuplicateBindingTypesWhenResolvingFails() { getCurrentManager().resolveObserverMethods(new AnEventType(), new BindingTypeABinding(), new BindingTypeABinding()); Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/ResolvingChecksBindingTypeMembersTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/ResolvingChecksBindingTypeMembersTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/ResolvingChecksBindingTypeMembersTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -10,7 +10,7 @@ import org.testng.annotations.Test; @Artifact -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class ResolvingChecksBindingTypeMembersTest extends AbstractJSR299Test { public static class AnEventType Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/nonbinding/NonBindingTypesWhenResolvingTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/nonbinding/NonBindingTypesWhenResolvingTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/nonbinding/NonBindingTypesWhenResolvingTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -12,7 +12,7 @@ import org.testng.annotations.Test; @Artifact -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class NonBindingTypesWhenResolvingTest extends AbstractJSR299Test { public static class AnEventType Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/typeWithParameters/CheckTypeParametersWhenResolvingObserversTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/typeWithParameters/CheckTypeParametersWhenResolvingObserversTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/typeWithParameters/CheckTypeParametersWhenResolvingObserversTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -12,7 +12,7 @@ import org.testng.annotations.Test; @Artifact -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class CheckTypeParametersWhenResolvingObserversTest extends AbstractJSR299Test { public static class CharacterList extends ArrayList<Character> @@ -53,7 +53,7 @@ @Test(groups = { "events" }) @SpecAssertions({ @SpecAssertion(section = "10.4.1", id = "a"), - @SpecAssertion(section = "11.3.11", id = "a") + @SpecAssertion(section = "11.3.10", id = "a") }) public void testResolvingChecksTypeParameters() { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/typeWithParameters/ChecksEventTypeWhenResolvingTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/typeWithParameters/ChecksEventTypeWhenResolvingTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/typeWithParameters/ChecksEventTypeWhenResolvingTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -9,7 +9,7 @@ import org.testng.annotations.Test; @Artifact -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class ChecksEventTypeWhenResolvingTest extends AbstractJSR299Test { public static class AnEventType Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/AlternativeMetaDataTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/AlternativeMetaDataTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/AlternativeMetaDataTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -37,7 +37,7 @@ * */ @Artifact -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class AlternativeMetaDataTest extends AbstractJSR299Test { @Test Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/broken/processAnnotatedObserverThrowsException/ProcessAnnotatedTypeEventThrowsExceptionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/broken/processAnnotatedObserverThrowsException/ProcessAnnotatedTypeEventThrowsExceptionTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/broken/processAnnotatedObserverThrowsException/ProcessAnnotatedTypeEventThrowsExceptionTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -40,7 +40,7 @@ @Resource(source="javax.enterprise.inject.spi.Extension", destination="WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension") }) @IntegrationTest -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class ProcessAnnotatedTypeEventThrowsExceptionTest extends AbstractJSR299Test { @Test(groups="ri-broken") Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/bean/bytype/BeanByTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/bean/bytype/BeanByTypeTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/bean/bytype/BeanByTypeTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -39,7 +39,7 @@ * */ @Artifact -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class BeanByTypeTest extends AbstractJSR299Test { @Test Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/exception/ProcessObserverMethodExceptionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/exception/ProcessObserverMethodExceptionTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/exception/ProcessObserverMethodExceptionTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -40,7 +40,7 @@ @Resource(source="javax.enterprise.inject.spi.Extension", destination="WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension") }) @IntegrationTest -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class ProcessObserverMethodExceptionTest { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/ProducerTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/ProducerTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/ProducerTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -29,7 +29,7 @@ }) // Must be an integration test as it needs a resource copied to a folder @IntegrationTest -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") // TODO All tests fall under WBRI-345 for now, please create new issues for any failing tests after WBRI-345 is done public class ProducerTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/broken/injectionTargetError/InjectionTargetDefinitionErrorTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/broken/injectionTargetError/InjectionTargetDefinitionErrorTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/broken/injectionTargetError/InjectionTargetDefinitionErrorTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -25,7 +25,7 @@ // Must be an integration test as it needs a resource copied to a folder @IntegrationTest @ExpectedDeploymentException(DefinitionError.class) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class InjectionTargetDefinitionErrorTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/InitializerUnallowedDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/InitializerUnallowedDefinitionTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/InitializerUnallowedDefinitionTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -13,7 +13,7 @@ @Artifact @ExpectedDeploymentException(DefinitionError.class) @BeansXml("beans.xml") -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class InitializerUnallowedDefinitionTest extends AbstractJSR299Test { @Test Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/methodOnSessionBean/DisposalMethodOnSessionBean.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/methodOnSessionBean/DisposalMethodOnSessionBean.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/methodOnSessionBean/DisposalMethodOnSessionBean.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -16,7 +16,7 @@ @ExpectedDeploymentException(DefinitionError.class) @IntegrationTest @Packaging(PackagingType.EAR) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class DisposalMethodOnSessionBean extends AbstractJSR299Test { @Test Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/ProducesUnallowedDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/ProducesUnallowedDefinitionTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/ProducesUnallowedDefinitionTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -11,7 +11,7 @@ @Artifact @ExpectedDeploymentException(DefinitionError.class) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class ProducesUnallowedDefinitionTest extends AbstractJSR299Test { @Test Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/UnresolvedDisposalMethodDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/UnresolvedDisposalMethodDefinitionTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/UnresolvedDisposalMethodDefinitionTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -12,7 +12,7 @@ @Artifact @ExpectedDeploymentException(DefinitionError.class) @BeansXml("beans.xml") -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class UnresolvedDisposalMethodDefinitionTest extends AbstractJSR299Test { @Test Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithConversationScope/SingletonWithConversationScopeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithConversationScope/SingletonWithConversationScopeTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithConversationScope/SingletonWithConversationScopeTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -14,7 +14,7 @@ @ExpectedDeploymentException(DefinitionError.class) @Artifact @Packaging(PackagingType.EAR) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class SingletonWithConversationScopeTest extends AbstractJSR299Test { @Test(groups = { "enterpriseBeans" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithConversationScope/StatelessWithConversationScopeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithConversationScope/StatelessWithConversationScopeTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithConversationScope/StatelessWithConversationScopeTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -14,7 +14,7 @@ @Artifact @ExpectedDeploymentException(DefinitionError.class) @Packaging(PackagingType.EAR) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class StatelessWithConversationScopeTest extends AbstractJSR299Test { @Test(groups = { "enterpriseBeans" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithSessionScope/StatelessWithSessionScopeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithSessionScope/StatelessWithSessionScopeTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithSessionScope/StatelessWithSessionScopeTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -14,7 +14,7 @@ @Artifact @ExpectedDeploymentException(DefinitionError.class) @Packaging(PackagingType.EAR) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class StatelessWithSessionScopeTest extends AbstractJSR299Test { @Test(groups = { "enterpriseBeans" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanViaXmlTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanViaXmlTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanViaXmlTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -39,7 +39,7 @@ @Packaging(PackagingType.EAR) @IntegrationTest @EjbJarXml("ejb-jar.xml") -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class EnterpriseBeanViaXmlTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -22,7 +22,7 @@ @Artifact @Packaging(PackagingType.EAR) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class NewEnterpriseBeanTest extends AbstractJSR299Test { private Bean<WrappedEnterpriseBeanLocal> newEnterpriseBean; @@ -30,7 +30,7 @@ private static final Annotation TAME_LITERAL = new AnnotationLiteral<Tame>() {}; @Test(groups = { "new" }) - @SpecAssertion(section = "3.10", id = "p") + @SpecAssertion(section = "3.12", id = "p") public void testNewBeanIsDependentScoped() { Set<Bean<WrappedEnterpriseBeanLocal>> beans = getBeans(WrappedEnterpriseBeanLocal.class, WrappedEnterpriseBeanLocal.NEW); @@ -40,7 +40,7 @@ } @Test(groups = { "new" }) - @SpecAssertion(section = "3.10", id = "r") + @SpecAssertion(section = "3.12", id = "r") public void testNewBeanIsHasOnlyNewBinding() { Set<Bean<WrappedEnterpriseBeanLocal>> beans = getBeans(WrappedEnterpriseBeanLocal.class, WrappedEnterpriseBeanLocal.NEW); @@ -51,7 +51,7 @@ } @Test(groups = { "new" }) - @SpecAssertion(section = "3.10", id = "s") + @SpecAssertion(section = "3.12", id = "s") public void testNewBeanHasNoBeanELName() { Set<Bean<WrappedEnterpriseBeanLocal>> beans = getBeans(WrappedEnterpriseBeanLocal.class, WrappedEnterpriseBeanLocal.NEW); @@ -61,7 +61,7 @@ } @Test(groups = { "new"}) - @SpecAssertion(section = "3.10", id = "t") + @SpecAssertion(section = "3.12", id = "t") public void testNewBeanHasNoStereotypes() { Bean<MonkeyLocal> monkeyBean = getBeans(MonkeyLocal.class).iterator().next(); @@ -73,7 +73,7 @@ } @Test(groups = {"new" }) - @SpecAssertion(section = "3.10", id = "u") + @SpecAssertion(section = "3.12", id = "u") public void testNewBeanHasNoObservers() { // Should just be 1 observer from bean, not new bean @@ -82,7 +82,7 @@ @Test @SpecAssertions({ - @SpecAssertion(section="3.10", id = "j") + @SpecAssertion(section="3.12", id = "j") }) public void testForEachEnterpriseBeanANewBeanExists() { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/EnterpriseBeanRemoveMethodTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/EnterpriseBeanRemoveMethodTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/EnterpriseBeanRemoveMethodTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -20,7 +20,7 @@ @Artifact @Packaging(EAR) @IntegrationTest -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class EnterpriseBeanRemoveMethodTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/EjbInitializerMethodTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/EjbInitializerMethodTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/EjbInitializerMethodTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -13,12 +13,12 @@ @Artifact @Packaging(PackagingType.EAR) @IntegrationTest -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class EjbInitializerMethodTest extends AbstractJSR299Test { @Test(groups = { "initializerMethod", "ejb3" }) @SpecAssertions({ - @SpecAssertion(section = "3.8", id = "e") + @SpecAssertion(section = "3.9", id = "e") }) // This DOES NOT TEST initializer methods on Java EE component classes PLM public void testInitializerMethodNotABusinessMethod() Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/InitializerMethodTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/InitializerMethodTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/InitializerMethodTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -11,13 +11,13 @@ @Artifact @Packaging(PackagingType.EAR) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class InitializerMethodTest extends AbstractJSR299Test { @Test(groups = { "initializerMethod" }) @SpecAssertions({ - @SpecAssertion(section = "3.8.2", id = "b"), + @SpecAssertion(section = "3.9.2", id = "b"), @SpecAssertion(section = "2.3.5", id = "b") }) public void testBindingTypeOnInitializerParameter() @@ -30,11 +30,11 @@ @Test(groups = { "initializerMethod" }) @SpecAssertions({ - @SpecAssertion(section = "3.8", id = "g"), - @SpecAssertion(section = "3.8.1", id = "a"), - @SpecAssertion(section = "3.8.2", id = "aa"), + @SpecAssertion(section = "3.9", id = "g"), + @SpecAssertion(section = "3.9.1", id = "a"), + @SpecAssertion(section = "3.9.2", id = "aa"), @SpecAssertion(section = "5.6.4", id = "b"), - @SpecAssertion(section = "3.9", id = "a") + @SpecAssertion(section = "3.10", id = "a") }) public void testMultipleInitializerMethodsAreCalled() { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -11,13 +11,11 @@ @Artifact @ExpectedDeploymentException(DefinitionError.class) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class ParameterAnnotatedDisposesTest extends AbstractJSR299Test -{ - - +{ @Test(groups = "initializerMethod") - @SpecAssertion(section = "3.8.1", id = "ca") + @SpecAssertion(section = "3.9.1", id = "ca") public void testInitializerMethodHasParameterAnnotatedDisposes() { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/staticInitializer/StaticInitializerTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/staticInitializer/StaticInitializerTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/staticInitializer/StaticInitializerTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -11,12 +11,12 @@ @Artifact @ExpectedDeploymentException(DefinitionError.class) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class StaticInitializerTest extends AbstractJSR299Test { @Test(groups = "initializerMethod") - @SpecAssertion(section = "3.8", id = "aa") + @SpecAssertion(section = "3.9", id = "aa") public void testStaticInitializerMethodNotAllowed() { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/ProducerFieldDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/ProducerFieldDefinitionTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/ProducerFieldDefinitionTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -18,7 +18,7 @@ @Artifact @BeansXml("beans.xml") -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class ProducerFieldDefinitionTest extends AbstractJSR299Test { private static final Annotation TAME_LITERAL = new AnnotationLiteral<Tame>() {}; @@ -143,7 +143,7 @@ @Test(groups = "producerField") @SpecAssertions({ @SpecAssertion(section = "3.4.2", id = "c"), - @SpecAssertion(section="2.5.1", id = "c") + @SpecAssertion(section = "2.5.1", id = "c") }) public void testNamedField() { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/enterprise/nonbusiness/ProducerMethodNotBusinessMethodTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/enterprise/nonbusiness/ProducerMethodNotBusinessMethodTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/enterprise/nonbusiness/ProducerMethodNotBusinessMethodTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -15,7 +15,7 @@ @Artifact @Packaging(PackagingType.EAR) @ExpectedDeploymentException(DefinitionError.class) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class ProducerMethodNotBusinessMethodTest extends AbstractJSR299Test { @Test Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithTypeParameter2/ParameterizedTypeWithTypeParameterTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithTypeParameter2/ParameterizedTypeWithTypeParameterTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithTypeParameter2/ParameterizedTypeWithTypeParameterTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -12,7 +12,7 @@ @Artifact @ExpectedDeploymentException(DefinitionError.class) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class ParameterizedTypeWithTypeParameterTest extends AbstractJSR299Test { @Test Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasDisposesParameter/ConstructorHasDisposesParameterTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasDisposesParameter/ConstructorHasDisposesParameterTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasDisposesParameter/ConstructorHasDisposesParameterTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -12,12 +12,12 @@ @Artifact @ExpectedDeploymentException(DefinitionError.class) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class ConstructorHasDisposesParameterTest extends AbstractJSR299Test { @Test(groups = { "disposalMethod" }) @SpecAssertions({ - @SpecAssertion(section = "3.1.4.1", id = "da"), + @SpecAssertion(section = "3.7.1", id = "da"), @SpecAssertion(section = "12.2", id="db"), @SpecAssertion(section = "12.4", id= "a") }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -23,7 +23,7 @@ @Artifact @BeansXml("beans.xml") -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class SimpleBeanLifecycleTest extends AbstractJSR299Test { private static final Annotation TAME_LITERAL = new AnnotationLiteral<Tame>() @@ -32,8 +32,8 @@ @Test(groups = "beanConstruction") @SpecAssertions({ - @SpecAssertion(section = "3.1.4.2", id = "b"), - @SpecAssertion(section = "3.1.4.2", id = "c"), + @SpecAssertion(section = "3.7.2", id = "b"), + @SpecAssertion(section = "3.7.2", id = "c"), @SpecAssertion(section = "2.3.5", id = "d"), @SpecAssertion(section = "5.6.3", id = "a") }) @@ -75,7 +75,7 @@ } @Test - @SpecAssertion(section = "3.1.4.2", id = "b") + @SpecAssertion(section = "3.7.2", id = "b") public void testBindingTypeAnnotatedConstructor() { getInstanceByType(Duck.class); @@ -84,8 +84,7 @@ @Test(groups = { "specialization" }) @SpecAssertions({ - @SpecAssertion(section = "3.1.5", id = "aa"), - @SpecAssertion(section = "11.3.6", id = "a") + @SpecAssertion(section = "3.1.4", id = "aa") }) public void testSpecializedBeanExtendsManagedBean() { @@ -166,10 +165,10 @@ @Test(groups = "injection") @SpecAssertions({ @SpecAssertion(section = "7.3.1", id = "aa"), - @SpecAssertion(section = "3.7.1", id = "a"), + @SpecAssertion(section = "3.8.1", id = "a"), @SpecAssertion(section="2.3.4", id="a"), - @SpecAssertion(section="3.7", id="aa"), - @SpecAssertion(section="3.7", id="ab"), + @SpecAssertion(section="3.8", id="aa"), + @SpecAssertion(section="3.8", id="ab"), @SpecAssertion(section="12.1", id="bca") }) public void testCreateInjectsFieldsDeclaredInJava() Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/unproxyable/UnproxyableManagedBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/unproxyable/UnproxyableManagedBeanTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/unproxyable/UnproxyableManagedBeanTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -11,7 +11,7 @@ @Artifact @ExpectedDeploymentException(UnproxyableResolutionException.class) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class UnproxyableManagedBeanTest extends AbstractJSR299Test { @Test(groups = { "contexts" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/env/EnvInjectionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/env/EnvInjectionTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/env/EnvInjectionTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -42,7 +42,7 @@ @IntegrationTest @Resource(source="web.xml", destination="/WEB-INF/web.xml") @BeansXml("beans.xml") -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class EnvInjectionTest extends AbstractJSR299Test { @Test(groups = { "beanLifecycle", "commonAnnotations", "integration" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/InjectionOfResourceTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/InjectionOfResourceTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/InjectionOfResourceTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -20,7 +20,7 @@ @Packaging(PackagingType.WAR) @IntegrationTest @BeansXml("beans.xml") -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class InjectionOfResourceTest extends AbstractJSR299Test { @Test(groups = { "beanLifecycle", "commonAnnotations", "integration" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsNothing/DirectlyExtendsNothingTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsNothing/DirectlyExtendsNothingTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsNothing/DirectlyExtendsNothingTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -14,7 +14,7 @@ @Artifact @ExpectedDeploymentException(DefinitionError.class) @Packaging(PackagingType.EAR) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class DirectlyExtendsNothingTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/sameName/SameNameTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/sameName/SameNameTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/sameName/SameNameTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -16,7 +16,7 @@ @ExpectedDeploymentException(DefinitionError.class) @Packaging(PackagingType.EAR) @BeansXml("beans.xml") -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class SameNameTest extends AbstractJSR299Test { @Test Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializesStaticMethod/SpecializesStaticMethodTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializesStaticMethod/SpecializesStaticMethodTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializesStaticMethod/SpecializesStaticMethodTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -11,7 +11,7 @@ @Artifact @ExpectedDeploymentException(DefinitionError.class) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class SpecializesStaticMethodTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializingAndSpecializedBeanHaveName/SpecializingAndSpecializedBeanHaveNameTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializingAndSpecializedBeanHaveName/SpecializingAndSpecializedBeanHaveNameTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializingAndSpecializedBeanHaveName/SpecializingAndSpecializedBeanHaveNameTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -11,7 +11,7 @@ @Artifact @ExpectedDeploymentException(DefinitionError.class) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class SpecializingAndSpecializedBeanHaveNameTest extends AbstractJSR299Test { @Test Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/SpecializingAndSpecializedBeanHasNameTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/SpecializingAndSpecializedBeanHasNameTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/SpecializingAndSpecializedBeanHasNameTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -11,7 +11,7 @@ @Artifact @ExpectedDeploymentException(DefinitionError.class) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class SpecializingAndSpecializedBeanHasNameTest extends AbstractJSR299Test { @Test Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/SpecializingBeanExtendsNothingTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/SpecializingBeanExtendsNothingTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/SpecializingBeanExtendsNothingTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -11,11 +11,11 @@ @Artifact @ExpectedDeploymentException(DefinitionError.class) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class SpecializingBeanExtendsNothingTest extends AbstractJSR299Test { @Test(groups = { "specialization" }) - @SpecAssertion(section = "3.1.5", id = "da") + @SpecAssertion(section = "3.1.4", id = "da") public void testSpecializingClassDirectlyExtendsNothing() { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/SpecializingClassExtendsNonSimpleBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/SpecializingClassExtendsNonSimpleBeanTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/SpecializingClassExtendsNonSimpleBeanTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -11,11 +11,11 @@ @Artifact @ExpectedDeploymentException(DefinitionError.class) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class SpecializingClassExtendsNonSimpleBeanTest extends AbstractJSR299Test { @Test(groups = { "specialization" }) - @SpecAssertion(section = "3.1.5", id = "da") + @SpecAssertion(section = "3.1.4", id = "da") public void testSpecializingClassExtendsNonSimpleBean() { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/TwoSpecializingBeansForOneSpecializedTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/TwoSpecializingBeansForOneSpecializedTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/TwoSpecializingBeansForOneSpecializedTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -11,7 +11,7 @@ @Artifact @ExpectedDeploymentException(DeploymentError.class) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class TwoSpecializingBeansForOneSpecializedTest extends AbstractJSR299Test { /** @@ -21,8 +21,8 @@ * @see org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.broken.twoBeansSpecializeTheSameBean.TwoBeansSpecializeTheSameBeanTest#testTwoBeansSpecializeTheSameBean() * */ - @Test - @SpecAssertion(section="4.3.3", id = "c") + //@Test + //(a)SpecAssertion(section=&quot;4.3.3&quot;, id = "c") section removed from spec public void testTwoBeansSpecializeTheSameBean() { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/interceptorWithNoBinding/InterceptorWithNoBindingTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/interceptorWithNoBinding/InterceptorWithNoBindingTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/interceptorWithNoBinding/InterceptorWithNoBindingTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -14,7 +14,7 @@ */ @Artifact @ExpectedDeploymentException(DeploymentError.class) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class InterceptorWithNoBindingTest extends AbstractJSR299Test { @Test(groups = "ri-broken") Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/invalidBindingAnnotations/InvalidInterceptorBindingAnnotationsTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/invalidBindingAnnotations/InvalidInterceptorBindingAnnotationsTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/invalidBindingAnnotations/InvalidInterceptorBindingAnnotationsTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -10,7 +10,7 @@ @Artifact @ExpectedDeploymentException(DeploymentError.class) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") @BeansXml("beans.xml") public class InvalidInterceptorBindingAnnotationsTest { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/invalidLifecycleInterceptor/InvalidLifecycleInterceptorTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/invalidLifecycleInterceptor/InvalidLifecycleInterceptorTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/invalidLifecycleInterceptor/InvalidLifecycleInterceptorTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -10,7 +10,7 @@ @Artifact @ExpectedDeploymentException(DeploymentError.class) -@SpecVersion(spec = "cdi", version="1.0.20090625") +@SpecVersion(spec = "cdi", version="PFD2") public class InvalidLifecycleInterceptorTest extends AbstractJSR299Test { @Test(groups = "ri-broken") Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorOrder/InterceptorOrderTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorOrder/InterceptorOrderTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorOrder/InterceptorOrderTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -9,7 +9,7 @@ import org.testng.annotations.Test; @Artifact -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") @BeansXml("beans.xml") public class InterceptorOrderTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicatePrefixResolution/DuplicateNamePrefixResolutionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicatePrefixResolution/DuplicateNamePrefixResolutionTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicatePrefixResolution/DuplicateNamePrefixResolutionTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -27,7 +27,7 @@ @Artifact @ExpectedDeploymentException(DeploymentError.class) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class DuplicateNamePrefixResolutionTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/finalMethod/FinalMethodTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/finalMethod/FinalMethodTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/finalMethod/FinalMethodTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -26,7 +26,7 @@ @Artifact @ExpectedDeploymentException(DeploymentError.class) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class FinalMethodTest extends AbstractJSR299Test { @Test Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/privateConstructor/PrivateConstructorTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/privateConstructor/PrivateConstructorTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/privateConstructor/PrivateConstructorTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -30,7 +30,7 @@ */ @Artifact @ExpectedDeploymentException(DeploymentError.class) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class PrivateConstructorTest extends AbstractJSR299Test { @Test Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/broken/ambiguous/AmbiguousDependencyTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/broken/ambiguous/AmbiguousDependencyTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/broken/ambiguous/AmbiguousDependencyTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -26,7 +26,7 @@ @Artifact @ExpectedDeploymentException(DeploymentError.class) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class AmbiguousDependencyTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/builtin/BuiltinInstanceTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/builtin/BuiltinInstanceTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/builtin/BuiltinInstanceTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -32,7 +32,7 @@ * Tests for built-in Instance. */ @Artifact -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class BuiltinInstanceTest extends AbstractJSR299Test { @Test Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/integration/IntegrationWithUnifiedELTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/integration/IntegrationWithUnifiedELTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/integration/IntegrationWithUnifiedELTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -35,7 +35,7 @@ @Resource(destination = "WEB-INF/faces-config.xml", source = "faces-config.xml"), @Resource(destination = "JSFTestPage.jsp", source = "JSFTestPage.jsp"), @Resource(destination = "JSPTestPage.jsp", source = "JSPTestPage.jsp")}) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class IntegrationWithUnifiedELTest extends AbstractJSR299Test { @Test(groups = {"el" } ) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/InjectionIntoNonContextualComponentTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/InjectionIntoNonContextualComponentTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/InjectionIntoNonContextualComponentTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -38,7 +38,7 @@ @Resource(destination = "WEB-INF/TestLibrary.tld", source = "TestLibrary.tld"), @Resource(destination = "TagPage.jsp", source = "TagPage.jsp"), @Resource(destination = "ManagedBeanTestPage.jsp", source = "ManagedBeanTestPage.jsp")}) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class InjectionIntoNonContextualComponentTest extends AbstractJSR299Test { @Test Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/nullableBean/NullableBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/nullableBean/NullableBeanTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/nullableBean/NullableBeanTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -10,7 +10,7 @@ @Artifact @ExpectedDeploymentException(DeploymentError.class) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class NullableBeanTest extends AbstractJSR299Test { @Test(groups = { "injection", "producerMethod" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/InjectableReferenceTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/InjectableReferenceTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/InjectableReferenceTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -40,7 +40,7 @@ */ @Artifact @BeansXml("beans.xml") -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class InjectableReferenceTest extends AbstractJSR299Test { @SuppressWarnings("unchecked") Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/normal/scope/NormalScopedBeanWithInjectionPoint.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/normal/scope/NormalScopedBeanWithInjectionPoint.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/normal/scope/NormalScopedBeanWithInjectionPoint.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -26,7 +26,7 @@ @Artifact @ExpectedDeploymentException(DefinitionError.class) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class NormalScopedBeanWithInjectionPoint extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/reference/unresolved/UnsatisfiedInjectableReferenceTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/reference/unresolved/UnsatisfiedInjectableReferenceTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/reference/unresolved/UnsatisfiedInjectableReferenceTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -36,7 +36,7 @@ * */ @Artifact -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class UnsatisfiedInjectableReferenceTest extends AbstractJSR299Test { @SuppressWarnings("unchecked") Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/ManagerTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/ManagerTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/ManagerTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -15,7 +15,7 @@ import org.testng.annotations.Test; @Artifact -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class ManagerTest extends AbstractJSR299Test { @Test(groups={"manager", "injection", "deployment"}) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -36,7 +36,7 @@ import org.testng.annotations.Test; @Artifact -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class ResolutionByTypeTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/decorator/DecoratorNotResolvedTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/decorator/DecoratorNotResolvedTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/decorator/DecoratorNotResolvedTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -31,7 +31,7 @@ @Artifact @BeansXml("beans.xml") -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class DecoratorNotResolvedTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/interceptor/InterceptorNotResolvedTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/interceptor/InterceptorNotResolvedTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/interceptor/InterceptorNotResolvedTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -31,7 +31,7 @@ @Artifact @BeansXml("beans.xml") -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class InterceptorNotResolvedTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/PolicyAvailabilityTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/PolicyAvailabilityTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/PolicyAvailabilityTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -33,15 +33,15 @@ @Artifact @BeansXml("beans.xml") -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class PolicyAvailabilityTest extends AbstractJSR299Test { @Test(groups = {"policy"}) @SpecAssertions( { @SpecAssertion(section = "5.2", id = "b"), - @SpecAssertion(section = "5.2", id = "c"), - @SpecAssertion(section = "5.2", id = "ea"), + @SpecAssertion(section = "5.2.1", id = "c"), + @SpecAssertion(section = "5.2.1", id = "ea"), @SpecAssertion(section = "2.6", id = "a"), @SpecAssertion(section = "2.6.1", id = "a"), @SpecAssertion(section = "12.3", id = "ka") @@ -65,7 +65,7 @@ @Test(groups = {"policy"}) @SpecAssertions({ - @SpecAssertion(section = "5.2", id = "g"), + @SpecAssertion(section = "5.2.1", id = "g"), @SpecAssertion(section = "2.6.1", id = "b"), @SpecAssertion(section = "2.7", id = "aa"), @SpecAssertion(section = "2.7.1.4", id="a") @@ -78,7 +78,7 @@ @Test @SpecAssertions({ - @SpecAssertion(section = "5.2", id = "fa"), + @SpecAssertion(section = "5.2.1", id = "fa"), @SpecAssertion(section = "2.6.1", id = "e") }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/incorrect/name/stereotype/NoAnnotationWithSpecifiedNameTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/incorrect/name/stereotype/NoAnnotationWithSpecifiedNameTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/incorrect/name/stereotype/NoAnnotationWithSpecifiedNameTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -28,12 +28,12 @@ @Artifact @BeansXml("beans.xml") @ExpectedDeploymentException(DeploymentError.class) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class NoAnnotationWithSpecifiedNameTest extends AbstractJSR299Test { @Test(groups = { "policy"}) - @SpecAssertion(section="5.2", id="i") + @SpecAssertion(section="5.2.1", id="i") public void test() { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/not/policy/ClassIsNotPolicyTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/not/policy/ClassIsNotPolicyTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/not/policy/ClassIsNotPolicyTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -28,12 +28,12 @@ @Artifact @BeansXml("beans.xml") @ExpectedDeploymentException(DeploymentError.class) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class ClassIsNotPolicyTest extends AbstractJSR299Test { @Test(groups = { "policy" }) - @SpecAssertion(section="5.2", id="h") + @SpecAssertion(section="5.2.1", id="h") public void test() { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/same/type/twice/SameTypeListedTwiceTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/same/type/twice/SameTypeListedTwiceTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/same/type/twice/SameTypeListedTwiceTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -28,12 +28,12 @@ @Artifact @BeansXml("beans.xml") @ExpectedDeploymentException(DeploymentError.class) -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class SameTypeListedTwiceTest extends AbstractJSR299Test { @Test(groups = { "policy" }) - @SpecAssertion(section="5.2", id="j") + @SpecAssertion(section="5.2.1", id="j") public void test() { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/enterprise/SessionBeanPolicyTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/enterprise/SessionBeanPolicyTest.java 2009-09-24 20:17:43 UTC (rev 3779) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/enterprise/SessionBeanPolicyTest.java 2009-09-25 01:08:37 UTC (rev 3780) @@ -30,12 +30,12 @@ @Packaging(PackagingType.EAR) @IntegrationTest @BeansXml("beans.xml") -@SpecVersion(spec="cdi", version="1.0.20090625") +@SpecVersion(spec="cdi", version="PFD2") public class SessionBeanPolicyTest extends AbstractJSR299Test { @Test(groups = { "policy"}) - @SpecAssertion(section = "5.2", id = "eb") + @SpecAssertion(section = "5.2.1", id = "eb") public void testEnabledPolicyAvailable() { assert getBeans(EjbInterface.class).size() == 1;