[webbeans-commits] Webbeans SVN: r3433 - tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating and 7 other directories.

Author: pete.muir(a)jboss.org Date: 2009-08-11 07:56:32 -0400 (Tue, 11 Aug 2009) New Revision: 3433 Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/dependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInitializerMethodParameter/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken12/PassivationCapableBeanWithNonPassivatingInterceptorFailsTest.java Removed: 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/nonPassivatingInterceptorWithInitializerMethodParameter/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken11/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken12/NonSerializableTest.java Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/Validator.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/dependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean/British.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/dependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean/Cow.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/dependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean/CowProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/dependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean/EnterpriseBeanWithIllegalDependencyTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/dependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean/MaarianHaminaLocal_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/dependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean/Maarianhamina_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/BakedBean.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/BakedBinding.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/BrokenInterceptor.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/InterceptorType.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/interceptorWithNonPassivatingBeanConstructorParameter/Violation.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/ViolationProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInitializerMethodParameter/BakedBean.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInitializerMethodParameter/BakedBinding.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInitializerMethodParameter/BrokenInterceptor.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInitializerMethodParameter/InterceptorType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInitializerMethodParameter/PassivationCapableBeanWithNonPassivatingInterceptorTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInitializerMethodParameter/Violation.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInitializerMethodParameter/ViolationProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken10/UnserializableSimpleInjectedIntoPassivatingEnterpriseBeanTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken18/PassivationCapableBeanWIthNonPassivatingInitializerInDecorator.java Log: sort out package names a bit, add validation of decorators Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/Validator.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/Validator.java 2009-08-11 11:20:39 UTC (rev 3432) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/Validator.java 2009-08-11 11:56:32 UTC (rev 3433) @@ -91,7 +91,7 @@ * @param beanManager the current manager * @param specializedBeans the existing specialized beans */ - private void validateRIBean(RIBean<?> bean, BeanManagerImpl beanManager, List<RIBean<?>> specializedBeans) + private void validateRIBean(RIBean<?> bean, BeanManagerImpl beanManager, Collection<RIBean<?>> specializedBeans) { validateBean(bean, beanManager); if (!(bean instanceof NewSimpleBean<?>) && !(bean instanceof NewEnterpriseBean<?>)) @@ -116,12 +116,16 @@ { throw new UnserializableDependencyException("The bean " + bean + " declares a passivating scope but has non-serializable decorator: " + decorator); } + for (InjectionPoint ij : decorator.getInjectionPoints()) + { + Bean<?> resolvedBean = beanManager.resolve(beanManager.getInjectableBeans(ij)); + validateInjectionPointPassivationCapable(ij, resolvedBean, beanManager); + } } } } } - } /** @@ -184,6 +188,14 @@ } if (Beans.isPassivatingScope(ij.getBean(), beanManager) && (!ij.isTransient()) && !Beans.isPassivationCapableBean(resolvedBean)) { + validateInjectionPointPassivationCapable(ij, resolvedBean, beanManager); + } + } + + public void validateInjectionPointPassivationCapable(InjectionPoint ij, Bean<?> resolvedBean, BeanManagerImpl beanManager) + { + if (!ij.isTransient() && !Beans.isPassivationCapableBean(resolvedBean)) + { if (resolvedBean.getScopeType().equals(Dependent.class) && resolvedBean instanceof AbstractProducerBean<?,?>) { throw new IllegalProductException("The bean " + ij.getBean() + " declares a passivating scope but the producer returned a non-serializable bean for injection: " + resolvedBean); @@ -194,8 +206,17 @@ public void validateDeployment(BeanManagerImpl manager, BeanDeployerEnvironment environment) { - List<RIBean<?>> specializedBeans = new ArrayList<RIBean<?>>(); - for (Bean<?> bean : manager.getBeans()) + validateBeans(manager.getDecorators(), new ArrayList<RIBean<?>>(), manager); + validateBeans(manager.getBeans(), new ArrayList<RIBean<?>>(), manager); + validateEnabledDecoratorClasses(manager); + validateEnabledPolicies(manager); + validateDisposalMethods(environment); + validateBeanNames(manager); + } + + public void validateBeans(Collection<? extends Bean<?>> beans, Collection<RIBean<?>> specializedBeans, BeanManagerImpl manager) + { + for (Bean<?> bean : beans) { if (bean instanceof RIBean<?>) { @@ -206,10 +227,6 @@ validateBean(bean, manager); } } - validateEnabledDecoratorClasses(manager); - validateEnabledPolicies(manager); - validateDisposalMethods(environment); - validateBeanNames(manager); } public void validateBeanNames(BeanManagerImpl beanManager) Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/dependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean (from rev 3432, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken11) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/dependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean/British.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken11/British.java 2009-08-11 11:20:39 UTC (rev 3432) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/dependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean/British.java 2009-08-11 11:56:32 UTC (rev 3433) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.context.passivating.broken11; +package org.jboss.jsr299.tck.tests.context.passivating.broken.dependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/dependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean/Cow.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken11/Cow.java 2009-08-11 11:20:39 UTC (rev 3432) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/dependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean/Cow.java 2009-08-11 11:56:32 UTC (rev 3433) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.context.passivating.broken11; +package org.jboss.jsr299.tck.tests.context.passivating.broken.dependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean; class Cow { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/dependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean/CowProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken11/CowProducer.java 2009-08-11 11:20:39 UTC (rev 3432) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/dependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean/CowProducer.java 2009-08-11 11:56:32 UTC (rev 3433) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.context.passivating.broken11; +package org.jboss.jsr299.tck.tests.context.passivating.broken.dependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean; import javax.enterprise.inject.Produces; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/dependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean/EnterpriseBeanWithIllegalDependencyTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken11/EnterpriseBeanWithIllegalDependencyTest.java 2009-08-11 11:20:39 UTC (rev 3432) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/dependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean/EnterpriseBeanWithIllegalDependencyTest.java 2009-08-11 11:56:32 UTC (rev 3433) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.context.passivating.broken11; +package org.jboss.jsr299.tck.tests.context.passivating.broken.dependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean; import javax.enterprise.inject.IllegalProductException; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/dependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean/MaarianHaminaLocal_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken11/MaarianHaminaLocal_Broken.java 2009-08-11 11:20:39 UTC (rev 3432) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/dependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean/MaarianHaminaLocal_Broken.java 2009-08-11 11:56:32 UTC (rev 3433) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.context.passivating.broken11; +package org.jboss.jsr299.tck.tests.context.passivating.broken.dependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean; import javax.ejb.Local; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/dependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean/Maarianhamina_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken11/Maarianhamina_Broken.java 2009-08-11 11:20:39 UTC (rev 3432) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/dependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean/Maarianhamina_Broken.java 2009-08-11 11:56:32 UTC (rev 3433) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.context.passivating.broken11; +package org.jboss.jsr299.tck.tests.context.passivating.broken.dependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean; import javax.ejb.Remove; import javax.ejb.Stateful; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter (from rev 3432, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithBeanConstructorParameter) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/BakedBean.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithBeanConstructorParameter/BakedBean.java 2009-08-11 11:20:39 UTC (rev 3432) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/BakedBean.java 2009-08-11 11:56:32 UTC (rev 3433) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.context.passivating.broken.nonPassivatingInterceptorWithBeanConstructorParameter; +package org.jboss.jsr299.tck.tests.context.passivating.broken.interceptorWithNonPassivatingBeanConstructorParameter; import javax.enterprise.context.SessionScoped; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/BakedBinding.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithBeanConstructorParameter/BakedBinding.java 2009-08-11 11:20:39 UTC (rev 3432) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/BakedBinding.java 2009-08-11 11:56:32 UTC (rev 3433) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.context.passivating.broken.nonPassivatingInterceptorWithBeanConstructorParameter; +package org.jboss.jsr299.tck.tests.context.passivating.broken.interceptorWithNonPassivatingBeanConstructorParameter; 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/interceptorWithNonPassivatingBeanConstructorParameter/BrokenInterceptor.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithBeanConstructorParameter/BrokenInterceptor.java 2009-08-11 11:20:39 UTC (rev 3432) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/BrokenInterceptor.java 2009-08-11 11:56:32 UTC (rev 3433) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.context.passivating.broken.nonPassivatingInterceptorWithBeanConstructorParameter; +package org.jboss.jsr299.tck.tests.context.passivating.broken.interceptorWithNonPassivatingBeanConstructorParameter; import javax.enterprise.inject.Current; import javax.interceptor.AroundInvoke; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/InterceptorType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithBeanConstructorParameter/InterceptorType.java 2009-08-11 11:20:39 UTC (rev 3432) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/InterceptorType.java 2009-08-11 11:56:32 UTC (rev 3433) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.context.passivating.broken.nonPassivatingInterceptorWithBeanConstructorParameter; +package org.jboss.jsr299.tck.tests.context.passivating.broken.interceptorWithNonPassivatingBeanConstructorParameter; 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/interceptorWithNonPassivatingBeanConstructorParameter/PassivationCapableBeanWithNonPassivatingInterceptorTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithBeanConstructorParameter/PassivationCapableBeanWithNonPassivatingInterceptorTest.java 2009-08-11 11:20:39 UTC (rev 3432) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/PassivationCapableBeanWithNonPassivatingInterceptorTest.java 2009-08-11 11:56:32 UTC (rev 3433) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.context.passivating.broken.nonPassivatingInterceptorWithBeanConstructorParameter; +package org.jboss.jsr299.tck.tests.context.passivating.broken.interceptorWithNonPassivatingBeanConstructorParameter; 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/interceptorWithNonPassivatingBeanConstructorParameter/Violation.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithBeanConstructorParameter/Violation.java 2009-08-11 11:20:39 UTC (rev 3432) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/Violation.java 2009-08-11 11:56:32 UTC (rev 3433) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.context.passivating.broken.nonPassivatingInterceptorWithBeanConstructorParameter; +package org.jboss.jsr299.tck.tests.context.passivating.broken.interceptorWithNonPassivatingBeanConstructorParameter; class Violation { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/ViolationProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithBeanConstructorParameter/ViolationProducer.java 2009-08-11 11:20:39 UTC (rev 3432) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/ViolationProducer.java 2009-08-11 11:56:32 UTC (rev 3433) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.context.passivating.broken.nonPassivatingInterceptorWithBeanConstructorParameter; +package org.jboss.jsr299.tck.tests.context.passivating.broken.interceptorWithNonPassivatingBeanConstructorParameter; import javax.enterprise.inject.Produces; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInitializerMethodParameter (from rev 3432, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithInitializerMethodParameter) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInitializerMethodParameter/BakedBean.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithInitializerMethodParameter/BakedBean.java 2009-08-11 11:20:39 UTC (rev 3432) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInitializerMethodParameter/BakedBean.java 2009-08-11 11:56:32 UTC (rev 3433) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.context.passivating.broken.nonPassivatingInterceptorWithInitializerMethodParameter; +package org.jboss.jsr299.tck.tests.context.passivating.broken.interceptorWithNonPassivatingInitializerMethodParameter; import javax.enterprise.context.SessionScoped; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInitializerMethodParameter/BakedBinding.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithInitializerMethodParameter/BakedBinding.java 2009-08-11 11:20:39 UTC (rev 3432) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInitializerMethodParameter/BakedBinding.java 2009-08-11 11:56:32 UTC (rev 3433) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.context.passivating.broken.nonPassivatingInterceptorWithInitializerMethodParameter; +package org.jboss.jsr299.tck.tests.context.passivating.broken.interceptorWithNonPassivatingInitializerMethodParameter; 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/interceptorWithNonPassivatingInitializerMethodParameter/BrokenInterceptor.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithInitializerMethodParameter/BrokenInterceptor.java 2009-08-11 11:20:39 UTC (rev 3432) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInitializerMethodParameter/BrokenInterceptor.java 2009-08-11 11:56:32 UTC (rev 3433) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.context.passivating.broken.nonPassivatingInterceptorWithInitializerMethodParameter; +package org.jboss.jsr299.tck.tests.context.passivating.broken.interceptorWithNonPassivatingInitializerMethodParameter; 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/interceptorWithNonPassivatingInitializerMethodParameter/InterceptorType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithInitializerMethodParameter/InterceptorType.java 2009-08-11 11:20:39 UTC (rev 3432) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInitializerMethodParameter/InterceptorType.java 2009-08-11 11:56:32 UTC (rev 3433) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.context.passivating.broken.nonPassivatingInterceptorWithInitializerMethodParameter; +package org.jboss.jsr299.tck.tests.context.passivating.broken.interceptorWithNonPassivatingInitializerMethodParameter; 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/interceptorWithNonPassivatingInitializerMethodParameter/PassivationCapableBeanWithNonPassivatingInterceptorTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithInitializerMethodParameter/PassivationCapableBeanWithNonPassivatingInterceptorTest.java 2009-08-11 11:20:39 UTC (rev 3432) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInitializerMethodParameter/PassivationCapableBeanWithNonPassivatingInterceptorTest.java 2009-08-11 11:56:32 UTC (rev 3433) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.context.passivating.broken.nonPassivatingInterceptorWithInitializerMethodParameter; +package org.jboss.jsr299.tck.tests.context.passivating.broken.interceptorWithNonPassivatingInitializerMethodParameter; 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/interceptorWithNonPassivatingInitializerMethodParameter/Violation.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithInitializerMethodParameter/Violation.java 2009-08-11 11:20:39 UTC (rev 3432) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInitializerMethodParameter/Violation.java 2009-08-11 11:56:32 UTC (rev 3433) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.context.passivating.broken.nonPassivatingInterceptorWithInitializerMethodParameter; +package org.jboss.jsr299.tck.tests.context.passivating.broken.interceptorWithNonPassivatingInitializerMethodParameter; class Violation { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInitializerMethodParameter/ViolationProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithInitializerMethodParameter/ViolationProducer.java 2009-08-11 11:20:39 UTC (rev 3432) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInitializerMethodParameter/ViolationProducer.java 2009-08-11 11:56:32 UTC (rev 3433) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.context.passivating.broken.nonPassivatingInterceptorWithInitializerMethodParameter; +package org.jboss.jsr299.tck.tests.context.passivating.broken.interceptorWithNonPassivatingInitializerMethodParameter; import javax.enterprise.inject.Produces; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken10/UnserializableSimpleInjectedIntoPassivatingEnterpriseBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken10/UnserializableSimpleInjectedIntoPassivatingEnterpriseBeanTest.java 2009-08-11 11:20:39 UTC (rev 3432) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken10/UnserializableSimpleInjectedIntoPassivatingEnterpriseBeanTest.java 2009-08-11 11:56:32 UTC (rev 3433) @@ -21,7 +21,6 @@ @SpecAssertion(section = "6.6.4", id = "ba") public void testSimpleDependentWebBeanWithNonSerializableImplementationInjectedIntoStatefulSessionBeanFails() { - // WBRI-150 getInstanceByType(EspooLocal_Broken.class); } Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken12/NonSerializableTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken12/NonSerializableTest.java 2009-08-11 11:20:39 UTC (rev 3432) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken12/NonSerializableTest.java 2009-08-11 11:56:32 UTC (rev 3433) @@ -1,22 +0,0 @@ -package org.jboss.jsr299.tck.tests.context.passivating.broken12; - -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 = "aac") - public void testPassivationCapableBeanWithNonPassivatingInterceptorFails() - { - assert false; - } -} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken12/PassivationCapableBeanWithNonPassivatingInterceptorFailsTest.java (from rev 3432, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken12/NonSerializableTest.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken12/PassivationCapableBeanWithNonPassivatingInterceptorFailsTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken12/PassivationCapableBeanWithNonPassivatingInterceptorFailsTest.java 2009-08-11 11:56:32 UTC (rev 3433) @@ -0,0 +1,22 @@ +package org.jboss.jsr299.tck.tests.context.passivating.broken12; + +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 PassivationCapableBeanWithNonPassivatingInterceptorFailsTest extends AbstractJSR299Test +{ + @Test(groups = { "contexts", "passivation", "ri-broken" }) + @SpecAssertion(section = "6.6.4", id = "aac") + public void testPassivationCapableBeanWithNonPassivatingInterceptorFails() + { + assert false; + } +} Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken18/PassivationCapableBeanWIthNonPassivatingInitializerInDecorator.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken18/PassivationCapableBeanWIthNonPassivatingInitializerInDecorator.java 2009-08-11 11:20:39 UTC (rev 3432) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken18/PassivationCapableBeanWIthNonPassivatingInitializerInDecorator.java 2009-08-11 11:56:32 UTC (rev 3433) @@ -13,9 +13,8 @@ @SpecVersion("20090625") public class PassivationCapableBeanWIthNonPassivatingInitializerInDecorator extends AbstractJSR299Test { - @Test(groups = { "contexts", "passivation", "ri-broken" }) + @Test(groups = { "contexts", "passivation" }) @SpecAssertion(section = "6.6.4", id = "aah") - // WBRI-326 public void testPassivationCapableBeanWithNonPassivatingInitializerInDecoratorFails() { assert false;