Author: pete.muir(a)jboss.org Date: 2009-08-11 06:26:56 -0400 (Tue, 11 Aug 2009) New Revision: 3428 Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithBeanConstructorParameter/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithBeanConstructorParameter/PassivationCapableBeanWithNonPassivatingInterceptorTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithInitializerMethodParameter/ Removed: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithBeanConstructorParameter/NonSerializableTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivationCapableBeanWithNonPassivatingInterceptor/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken13/ Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithBeanConstructorParameter/BakedBean.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithBeanConstructorParameter/BakedBinding.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithBeanConstructorParameter/BrokenInterceptor.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithBeanConstructorParameter/InterceptorType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithBeanConstructorParameter/Violation.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithBeanConstructorParameter/ViolationProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithInitializerMethodParameter/BakedBean.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithInitializerMethodParameter/BakedBinding.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithInitializerMethodParameter/BrokenInterceptor.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithInitializerMethodParameter/InterceptorType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithInitializerMethodParameter/PassivationCapableBeanWithNonPassivatingInterceptorTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithInitializerMethodParameter/Violation.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithInitializerMethodParameter/ViolationProducer.java Log: rename test/packages Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithBeanConstructorParameter (from rev 3426, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken13) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithBeanConstructorParameter/BakedBean.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken13/BakedBean.java 2009-08-11 00:09:18 UTC (rev 3426) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithBeanConstructorParameter/BakedBean.java 2009-08-11 10:26:56 UTC (rev 3428) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.context.passivating.broken13; +package org.jboss.jsr299.tck.tests.context.passivating.broken.nonPassivatingInterceptorWithBeanConstructorParameter; import javax.enterprise.context.SessionScoped; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithBeanConstructorParameter/BakedBinding.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken13/BakedBinding.java 2009-08-11 00:09:18 UTC (rev 3426) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithBeanConstructorParameter/BakedBinding.java 2009-08-11 10:26:56 UTC (rev 3428) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.context.passivating.broken13; +package org.jboss.jsr299.tck.tests.context.passivating.broken.nonPassivatingInterceptorWithBeanConstructorParameter; import static java.lang.annotation.RetentionPolicy.RUNTIME; import static java.lang.annotation.ElementType.TYPE; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithBeanConstructorParameter/BrokenInterceptor.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken13/BrokenInterceptor.java 2009-08-11 00:09:18 UTC (rev 3426) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithBeanConstructorParameter/BrokenInterceptor.java 2009-08-11 10:26:56 UTC (rev 3428) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.context.passivating.broken13; +package org.jboss.jsr299.tck.tests.context.passivating.broken.nonPassivatingInterceptorWithBeanConstructorParameter; import javax.enterprise.inject.Current; import javax.interceptor.AroundInvoke; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithBeanConstructorParameter/InterceptorType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken13/InterceptorType.java 2009-08-11 00:09:18 UTC (rev 3426) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithBeanConstructorParameter/InterceptorType.java 2009-08-11 10:26:56 UTC (rev 3428) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.context.passivating.broken13; +package org.jboss.jsr299.tck.tests.context.passivating.broken.nonPassivatingInterceptorWithBeanConstructorParameter; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.TYPE; Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithBeanConstructorParameter/NonSerializableTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken13/NonSerializableTest.java 2009-08-11 00:09:18 UTC (rev 3426) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithBeanConstructorParameter/NonSerializableTest.java 2009-08-11 10:26:56 UTC (rev 3428) @@ -1,22 +0,0 @@ -package org.jboss.jsr299.tck.tests.context.passivating.broken13; - -import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DeploymentError; -import org.jboss.test.audit.annotations.SpecAssertion; -import org.jboss.test.audit.annotations.SpecVersion; -import org.jboss.testharness.impl.packaging.Artifact; -import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; -import org.testng.annotations.Test; - -@Artifact -(a)ExpectedDeploymentException(DeploymentError.class) -@SpecVersion("20090625") -public class NonSerializableTest extends AbstractJSR299Test -{ - @Test(groups = { "contexts", "passivation", "ri-broken" }) - @SpecAssertion(section = "6.6.4", id = "aad") - public void testPassivationCapableBeanWithNonPassivatingInterceptorFails() - { - assert false; - } -} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithBeanConstructorParameter/PassivationCapableBeanWithNonPassivatingInterceptorTest.java (from rev 3426, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken13/NonSerializableTest.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithBeanConstructorParameter/PassivationCapableBeanWithNonPassivatingInterceptorTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithBeanConstructorParameter/PassivationCapableBeanWithNonPassivatingInterceptorTest.java 2009-08-11 10:26:56 UTC (rev 3428) @@ -0,0 +1,22 @@ +package org.jboss.jsr299.tck.tests.context.passivating.broken.nonPassivatingInterceptorWithBeanConstructorParameter; + +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.DeploymentError; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; +import org.testng.annotations.Test; + +@Artifact +(a)ExpectedDeploymentException(DeploymentError.class) +@SpecVersion("20090625") +public class PassivationCapableBeanWithNonPassivatingInterceptorTest extends AbstractJSR299Test +{ + @Test(groups = { "contexts", "passivation", "ri-broken" }) + @SpecAssertion(section = "6.6.4", id = "aad") + public void testPassivationCapableBeanWithNonPassivatingInterceptorFails() + { + assert false; + } +} Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithBeanConstructorParameter/Violation.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken13/Violation.java 2009-08-11 00:09:18 UTC (rev 3426) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithBeanConstructorParameter/Violation.java 2009-08-11 10:26:56 UTC (rev 3428) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.context.passivating.broken13; +package org.jboss.jsr299.tck.tests.context.passivating.broken.nonPassivatingInterceptorWithBeanConstructorParameter; class Violation { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithBeanConstructorParameter/ViolationProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken13/ViolationProducer.java 2009-08-11 00:09:18 UTC (rev 3426) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithBeanConstructorParameter/ViolationProducer.java 2009-08-11 10:26:56 UTC (rev 3428) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.context.passivating.broken13; +package org.jboss.jsr299.tck.tests.context.passivating.broken.nonPassivatingInterceptorWithBeanConstructorParameter; import javax.enterprise.inject.Produces; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithInitializerMethodParameter (from rev 3427, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivationCapableBeanWithNonPassivatingInterceptor) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithInitializerMethodParameter/BakedBean.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivationCapableBeanWithNonPassivatingInterceptor/BakedBean.java 2009-08-11 10:23:15 UTC (rev 3427) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithInitializerMethodParameter/BakedBean.java 2009-08-11 10:26:56 UTC (rev 3428) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.context.passivating.broken.passivationCapableBeanWithNonPassivatingInterceptor; +package org.jboss.jsr299.tck.tests.context.passivating.broken.nonPassivatingInterceptorWithInitializerMethodParameter; import javax.enterprise.context.SessionScoped; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithInitializerMethodParameter/BakedBinding.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivationCapableBeanWithNonPassivatingInterceptor/BakedBinding.java 2009-08-11 10:23:15 UTC (rev 3427) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithInitializerMethodParameter/BakedBinding.java 2009-08-11 10:26:56 UTC (rev 3428) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.context.passivating.broken.passivationCapableBeanWithNonPassivatingInterceptor; +package org.jboss.jsr299.tck.tests.context.passivating.broken.nonPassivatingInterceptorWithInitializerMethodParameter; import static java.lang.annotation.RetentionPolicy.RUNTIME; import static java.lang.annotation.ElementType.TYPE; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithInitializerMethodParameter/BrokenInterceptor.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivationCapableBeanWithNonPassivatingInterceptor/BrokenInterceptor.java 2009-08-11 10:23:15 UTC (rev 3427) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithInitializerMethodParameter/BrokenInterceptor.java 2009-08-11 10:26:56 UTC (rev 3428) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.context.passivating.broken.passivationCapableBeanWithNonPassivatingInterceptor; +package org.jboss.jsr299.tck.tests.context.passivating.broken.nonPassivatingInterceptorWithInitializerMethodParameter; import javax.enterprise.inject.Current; import javax.enterprise.inject.Initializer; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithInitializerMethodParameter/InterceptorType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivationCapableBeanWithNonPassivatingInterceptor/InterceptorType.java 2009-08-11 10:23:15 UTC (rev 3427) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithInitializerMethodParameter/InterceptorType.java 2009-08-11 10:26:56 UTC (rev 3428) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.context.passivating.broken.passivationCapableBeanWithNonPassivatingInterceptor; +package org.jboss.jsr299.tck.tests.context.passivating.broken.nonPassivatingInterceptorWithInitializerMethodParameter; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.TYPE; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithInitializerMethodParameter/PassivationCapableBeanWithNonPassivatingInterceptorTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivationCapableBeanWithNonPassivatingInterceptor/PassivationCapableBeanWithNonPassivatingInterceptorTest.java 2009-08-11 10:23:15 UTC (rev 3427) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithInitializerMethodParameter/PassivationCapableBeanWithNonPassivatingInterceptorTest.java 2009-08-11 10:26:56 UTC (rev 3428) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.context.passivating.broken.passivationCapableBeanWithNonPassivatingInterceptor; +package org.jboss.jsr299.tck.tests.context.passivating.broken.nonPassivatingInterceptorWithInitializerMethodParameter; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DeploymentError; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithInitializerMethodParameter/Violation.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivationCapableBeanWithNonPassivatingInterceptor/Violation.java 2009-08-11 10:23:15 UTC (rev 3427) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithInitializerMethodParameter/Violation.java 2009-08-11 10:26:56 UTC (rev 3428) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.context.passivating.broken.passivationCapableBeanWithNonPassivatingInterceptor; +package org.jboss.jsr299.tck.tests.context.passivating.broken.nonPassivatingInterceptorWithInitializerMethodParameter; class Violation { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithInitializerMethodParameter/ViolationProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivationCapableBeanWithNonPassivatingInterceptor/ViolationProducer.java 2009-08-11 10:23:15 UTC (rev 3427) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithInitializerMethodParameter/ViolationProducer.java 2009-08-11 10:26:56 UTC (rev 3428) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.context.passivating.broken.passivationCapableBeanWithNonPassivatingInterceptor; +package org.jboss.jsr299.tck.tests.context.passivating.broken.nonPassivatingInterceptorWithInitializerMethodParameter; import javax.enterprise.inject.Produces;