[weld-commits] Weld SVN: r4192 - in cdi-tck/trunk/impl/src/main: java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptor and 10 other directories.

Author: marius.bogoevici Date: 2009-10-19 03:41:09 -0400 (Mon, 19 Oct 2009) New Revision: 4192 Added: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptor/CityBinding.java cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptor/ cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptor/beans.xml cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInjectedField/ cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInjectedField/beans.xml Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Transactional.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptor/BrokenInterceptor.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptor/EnterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptorTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptor/Espoo_Broken.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInjectedFieldInInterceptor/BrokenInterceptor.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInjectedFieldInInterceptor/EnterpriseBeanWithNonPassivatingInjectedFieldInInterceptorTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInjectedFieldInInterceptor/Espoo_Broken.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInitializerMethodParameter/PassivationCapableBeanWithNonPassivatingInterceptorTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInjectedField/BakedBean.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInjectedField/PassivationCapableBeanWithNonPassivatingInterceptorTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/managedBeanWithNonSerializableInterceptorClass/ManagedBeanWithNonSerializableInterceptorClassTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/Transactional.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/Atomic.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/MissileBinding.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/Secure.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/Transactional.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorOrder/Transactional.java Log: Fixing tests where interceptors and interceptor bindings were defined incorrectly (wrong ElementType, @Interceptor without binding) Enable tests that pass. Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Transactional.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Transactional.java 2009-10-19 07:38:42 UTC (rev 4191) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Transactional.java 2009-10-19 07:41:09 UTC (rev 4192) @@ -12,7 +12,7 @@ import javax.interceptor.InterceptorBinding; -@Target( { TYPE, METHOD, PARAMETER, FIELD }) +@Target( { TYPE, METHOD}) @Retention(RUNTIME) @Documented @InterceptorBinding Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptor/BrokenInterceptor.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptor/BrokenInterceptor.java 2009-10-19 07:38:42 UTC (rev 4191) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptor/BrokenInterceptor.java 2009-10-19 07:41:09 UTC (rev 4192) @@ -2,12 +2,17 @@ import javax.interceptor.Interceptor; import javax.interceptor.InvocationContext; +import javax.interceptor.AroundInvoke; +import javax.inject.Inject; +import java.io.Serializable; -@Interceptor -class BrokenInterceptor +@Interceptor @CityBinding +class BrokenInterceptor implements Serializable { + @Inject public BrokenInterceptor(District district) {} - + + @AroundInvoke public Object intercept(InvocationContext ctx) throws Exception { return ctx.proceed(); Copied: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptor/CityBinding.java (from rev 4162, cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/CityBinding.java) =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptor/CityBinding.java (rev 0) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptor/CityBinding.java 2009-10-19 07:41:09 UTC (rev 4192) @@ -0,0 +1,20 @@ +package org.jboss.jsr299.tck.tests.context.passivating.broken.enterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptor; + +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.enterprise.context.Dependent; +import javax.interceptor.InterceptorBinding; + +@InterceptorBinding +@Dependent +@Target({TYPE, METHOD}) +@Retention(RUNTIME) +@interface CityBinding +{ + +} \ No newline at end of file Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptor/EnterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptorTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptor/EnterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptorTest.java 2009-10-19 07:38:42 UTC (rev 4191) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptor/EnterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptorTest.java 2009-10-19 07:41:09 UTC (rev 4192) @@ -8,15 +8,17 @@ import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.jboss.testharness.impl.packaging.Packaging; import org.jboss.testharness.impl.packaging.PackagingType; +import org.jboss.testharness.impl.packaging.jsr299.BeansXml; import org.testng.annotations.Test; @Artifact @Packaging(PackagingType.EAR) @ExpectedDeploymentException(DeploymentError.class) +(a)BeansXml(&quot;beans.xml&quot;) @SpecVersion(spec="cdi", version="20091018") public class EnterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptorTest extends AbstractJSR299Test { - @Test(groups = { "contexts", "passivation", "ri-broken" }) + @Test(groups = { "contexts", "passivation"}) @SpecAssertion(section = "6.6.4", id = "bdb") // WBRI-361 public void testSessionBeanWithNonPassivatingBeanConstructorParamInInterceptorFails() Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptor/Espoo_Broken.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptor/Espoo_Broken.java 2009-10-19 07:38:42 UTC (rev 4191) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptor/Espoo_Broken.java 2009-10-19 07:41:09 UTC (rev 4192) @@ -7,7 +7,7 @@ @Stateful @SessionScoped -(a)Interceptors(BrokenInterceptor.class) +@CityBinding class Espoo_Broken implements EspooLocal_Broken { @Remove Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInjectedFieldInInterceptor/BrokenInterceptor.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInjectedFieldInInterceptor/BrokenInterceptor.java 2009-10-19 07:38:42 UTC (rev 4191) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInjectedFieldInInterceptor/BrokenInterceptor.java 2009-10-19 07:41:09 UTC (rev 4192) @@ -3,12 +3,13 @@ import javax.inject.Inject; import javax.interceptor.Interceptor; import javax.interceptor.InvocationContext; +import javax.interceptor.AroundInvoke; -@Interceptor class BrokenInterceptor { @Inject District district; - + + @AroundInvoke public Object intercept(InvocationContext ctx) throws Exception { return ctx.proceed(); Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInjectedFieldInInterceptor/EnterpriseBeanWithNonPassivatingInjectedFieldInInterceptorTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInjectedFieldInInterceptor/EnterpriseBeanWithNonPassivatingInjectedFieldInInterceptorTest.java 2009-10-19 07:38:42 UTC (rev 4191) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInjectedFieldInInterceptor/EnterpriseBeanWithNonPassivatingInjectedFieldInInterceptorTest.java 2009-10-19 07:41:09 UTC (rev 4192) @@ -16,7 +16,7 @@ @SpecVersion(spec="cdi", version="20091018") public class EnterpriseBeanWithNonPassivatingInjectedFieldInInterceptorTest extends AbstractJSR299Test { - @Test(groups = { "contexts", "passivation", "ri-broken"}) + @Test(groups = { "contexts", "passivation"}) @SpecAssertion(section = "6.6.4", id = "bda") // WBRI-361 public void testSessionBeanWithNonPassivatingInjectedFieldInInterceptorFails() Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInjectedFieldInInterceptor/Espoo_Broken.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInjectedFieldInInterceptor/Espoo_Broken.java 2009-10-19 07:38:42 UTC (rev 4191) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInjectedFieldInInterceptor/Espoo_Broken.java 2009-10-19 07:41:09 UTC (rev 4192) @@ -8,7 +8,7 @@ @Stateful @SessionScoped @Interceptors(BrokenInterceptor.class) -class Espoo_Broken implements EspooLocal_Broken +public class Espoo_Broken implements EspooLocal_Broken { @Remove public void bye() { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInitializerMethodParameter/PassivationCapableBeanWithNonPassivatingInterceptorTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInitializerMethodParameter/PassivationCapableBeanWithNonPassivatingInterceptorTest.java 2009-10-19 07:38:42 UTC (rev 4191) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInitializerMethodParameter/PassivationCapableBeanWithNonPassivatingInterceptorTest.java 2009-10-19 07:41:09 UTC (rev 4192) @@ -13,7 +13,7 @@ @SpecVersion(spec="cdi", version="20091018") public class PassivationCapableBeanWithNonPassivatingInterceptorTest extends AbstractJSR299Test { - @Test(groups = { "contexts", "passivation", "ri-broken" }) + @Test(groups = { "contexts", "passivation"}) @SpecAssertion(section = "6.6.4", id = "aae") // WBRI-361 public void testPassivationCapableBeanWithNonPassivatingInterceptorFails() Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInjectedField/BakedBean.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInjectedField/BakedBean.java 2009-10-19 07:38:42 UTC (rev 4191) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInjectedField/BakedBean.java 2009-10-19 07:41:09 UTC (rev 4192) @@ -1,9 +1,10 @@ package org.jboss.jsr299.tck.tests.context.passivating.broken.interceptorWithNonPassivatingInjectedField; import javax.enterprise.context.SessionScoped; +import java.io.Serializable; @SessionScoped @BakedBinding -class BakedBean +class BakedBean implements Serializable { - + void bake() {} } Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInjectedField/PassivationCapableBeanWithNonPassivatingInterceptorTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInjectedField/PassivationCapableBeanWithNonPassivatingInterceptorTest.java 2009-10-19 07:38:42 UTC (rev 4191) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInjectedField/PassivationCapableBeanWithNonPassivatingInterceptorTest.java 2009-10-19 07:41:09 UTC (rev 4192) @@ -6,17 +6,19 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; +import org.jboss.testharness.impl.packaging.jsr299.BeansXml; import org.testng.annotations.Test; @Artifact @ExpectedDeploymentException(DeploymentError.class) @SpecVersion(spec="cdi", version="20091018") +(a)BeansXml(&quot;beans.xml&quot;) public class PassivationCapableBeanWithNonPassivatingInterceptorTest extends AbstractJSR299Test { - @Test(groups = { "contexts", "passivation", "ri-broken" }) + @Test(groups = { "contexts", "passivation" }) @SpecAssertion(section = "6.6.4", id = "aac") public void testPassivationCapableBeanWithNonPassivatingInterceptorFails() { assert false; } -} +} \ No newline at end of file Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/managedBeanWithNonSerializableInterceptorClass/ManagedBeanWithNonSerializableInterceptorClassTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/managedBeanWithNonSerializableInterceptorClass/ManagedBeanWithNonSerializableInterceptorClassTest.java 2009-10-19 07:38:42 UTC (rev 4191) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/managedBeanWithNonSerializableInterceptorClass/ManagedBeanWithNonSerializableInterceptorClassTest.java 2009-10-19 07:41:09 UTC (rev 4192) @@ -13,7 +13,7 @@ @SpecVersion(spec="cdi", version="20091018") public class ManagedBeanWithNonSerializableInterceptorClassTest extends AbstractJSR299Test { - @Test(groups = { "contexts", "passivation", "ri-broken"}) + @Test(groups = { "contexts", "passivation"}) @SpecAssertion(section = "6.6.1", id = "bb") // WBRI-361 public void testManagedBeanWithNonSerializableInterceptorClassNotOK() Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/Transactional.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/Transactional.java 2009-10-19 07:38:42 UTC (rev 4191) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/Transactional.java 2009-10-19 07:41:09 UTC (rev 4192) @@ -1,8 +1,6 @@ package org.jboss.jsr299.tck.tests.extensions.beanManager; -import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; @@ -12,7 +10,7 @@ import javax.interceptor.InterceptorBinding; -@Target( { TYPE, METHOD, PARAMETER, FIELD }) +@Target( { TYPE, METHOD }) @Retention(RUNTIME) @Documented @InterceptorBinding Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/Atomic.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/Atomic.java 2009-10-19 07:38:42 UTC (rev 4191) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/Atomic.java 2009-10-19 07:41:09 UTC (rev 4192) @@ -12,7 +12,7 @@ import javax.interceptor.InterceptorBinding; -@Target( { TYPE, METHOD, PARAMETER, FIELD }) +@Target( { TYPE, METHOD }) @Retention(RUNTIME) @Documented @MissileBinding Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/MissileBinding.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/MissileBinding.java 2009-10-19 07:38:42 UTC (rev 4191) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/MissileBinding.java 2009-10-19 07:41:09 UTC (rev 4192) @@ -1,8 +1,6 @@ package org.jboss.jsr299.tck.tests.interceptors.definition; -import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; @@ -12,7 +10,7 @@ import javax.interceptor.InterceptorBinding; -@Target( { TYPE, METHOD, PARAMETER, FIELD }) +@Target( { TYPE, METHOD }) @Retention(RUNTIME) @Documented @InterceptorBinding Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/Secure.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/Secure.java 2009-10-19 07:38:42 UTC (rev 4191) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/Secure.java 2009-10-19 07:41:09 UTC (rev 4192) @@ -1,8 +1,6 @@ package org.jboss.jsr299.tck.tests.interceptors.definition; -import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; @@ -12,7 +10,7 @@ import javax.interceptor.InterceptorBinding; -@Target( { TYPE, METHOD, PARAMETER, FIELD }) +@Target( { TYPE, METHOD }) @Retention(RUNTIME) @Documented @InterceptorBinding Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/Transactional.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/Transactional.java 2009-10-19 07:38:42 UTC (rev 4191) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/Transactional.java 2009-10-19 07:41:09 UTC (rev 4192) @@ -1,8 +1,6 @@ package org.jboss.jsr299.tck.tests.interceptors.definition; -import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; @@ -12,7 +10,7 @@ import javax.interceptor.InterceptorBinding; -@Target( { TYPE, METHOD, PARAMETER, FIELD }) +@Target( { TYPE, METHOD }) @Retention(RUNTIME) @Documented @InterceptorBinding Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorOrder/Transactional.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorOrder/Transactional.java 2009-10-19 07:38:42 UTC (rev 4191) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorOrder/Transactional.java 2009-10-19 07:41:09 UTC (rev 4192) @@ -12,7 +12,7 @@ import javax.interceptor.InterceptorBinding; -@Target( { TYPE, METHOD, PARAMETER, FIELD }) +@Target( { TYPE, METHOD }) @Retention(RUNTIME) @Documented @InterceptorBinding Added: cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptor/beans.xml =================================================================== --- cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptor/beans.xml (rev 0) +++ cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptor/beans.xml 2009-10-19 07:41:09 UTC (rev 4192) @@ -0,0 +1,5 @@ +<beans> + <interceptors> + <class>org.jboss.jsr299.tck.tests.context.passivating.broken.enterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptor.BrokenInterceptor</class> + </interceptors> +</beans> \ No newline at end of file Added: cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInjectedField/beans.xml =================================================================== --- cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInjectedField/beans.xml (rev 0) +++ cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInjectedField/beans.xml 2009-10-19 07:41:09 UTC (rev 4192) @@ -0,0 +1,5 @@ +<beans> + <interceptors> + <class>org.jboss.jsr299.tck.tests.context.passivating.broken.interceptorWithNonPassivatingInjectedField.BrokenInterceptor</class> + </interceptors> +</beans> \ No newline at end of file