Author: pete.muir(a)jboss.org Date: 2009-11-04 13:29:45 -0500 (Wed, 04 Nov 2009) New Revision: 4668 Added: core/trunk/tests/src/test/java/org/jboss/weld/test/managed/ core/trunk/tests/src/test/java/org/jboss/weld/test/managed/newBean/ core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/named/ core/trunk/tests/src/test/resources/org/jboss/weld/test/decorators/ core/trunk/tests/src/test/resources/org/jboss/weld/test/interceptors/ core/trunk/tests/src/test/resources/org/jboss/weld/test/interceptors/ejb/ core/trunk/tests/src/test/resources/org/jboss/weld/test/interceptors/passivation/ core/trunk/tests/src/test/resources/org/jboss/weld/test/interceptors/passivation/beans.xml core/trunk/tests/src/test/resources/org/jboss/weld/test/interceptors/passivation/broken/ core/trunk/tests/src/test/resources/org/jboss/weld/test/interceptors/passivation/broken/interceptorWithNonSerializableField/ core/trunk/tests/src/test/resources/org/jboss/weld/test/interceptors/passivation/broken/nonSerializableInterceptor/ core/trunk/tests/src/test/resources/org/jboss/weld/test/interceptors/simple/ Removed: core/trunk/tests/src/test/java/org/jboss/weld/test/named/ core/trunk/tests/src/test/java/org/jboss/weld/test/newsimple/ core/trunk/tests/src/test/resources/org/jboss/weld/test/unit/decorator/simple/ core/trunk/tests/src/test/resources/org/jboss/weld/test/unit/interceptor/ejb/ core/trunk/tests/src/test/resources/org/jboss/weld/test/unit/interceptor/passivation/beans.xml core/trunk/tests/src/test/resources/org/jboss/weld/test/unit/interceptor/passivation/broken/interceptorWithNonSerializableField/ core/trunk/tests/src/test/resources/org/jboss/weld/test/unit/interceptor/passivation/broken/nonSerializableInterceptor/ core/trunk/tests/src/test/resources/org/jboss/weld/test/unit/interceptor/simple/ Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/managed/newBean/NewSimpleBeanTest.java core/trunk/tests/src/test/java/org/jboss/weld/test/managed/newBean/WrappedSimpleBean.java core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/named/Important.java core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/named/NamedBeanWithBinding.java core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/named/NamedBeanWithBindingTest.java core/trunk/tests/src/test/resources/org/jboss/weld/test/decorators/beans.xml core/trunk/tests/src/test/resources/org/jboss/weld/test/interceptors/ejb/beans.xml core/trunk/tests/src/test/resources/org/jboss/weld/test/interceptors/passivation/broken/interceptorWithNonSerializableField/beans.xml core/trunk/tests/src/test/resources/org/jboss/weld/test/interceptors/simple/beans.xml core/trunk/tests/unit-tests.xml Log: finish tidy up Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/managed/newBean (from rev 4663, core/trunk/tests/src/test/java/org/jboss/weld/test/newsimple) Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/managed/newBean/NewSimpleBeanTest.java =================================================================== --- core/trunk/tests/src/test/java/org/jboss/weld/test/newsimple/NewSimpleBeanTest.java 2009-11-04 18:04:46 UTC (rev 4663) +++ core/trunk/tests/src/test/java/org/jboss/weld/test/managed/newBean/NewSimpleBeanTest.java 2009-11-04 18:29:45 UTC (rev 4668) @@ -1,4 +1,4 @@ -package org.jboss.weld.test.newsimple; +package org.jboss.weld.test.managed.newBean; import java.util.Set; Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/managed/newBean/WrappedSimpleBean.java =================================================================== --- core/trunk/tests/src/test/java/org/jboss/weld/test/newsimple/WrappedSimpleBean.java 2009-11-04 18:04:46 UTC (rev 4663) +++ core/trunk/tests/src/test/java/org/jboss/weld/test/managed/newBean/WrappedSimpleBean.java 2009-11-04 18:29:45 UTC (rev 4668) @@ -1,4 +1,4 @@ -package org.jboss.weld.test.newsimple; +package org.jboss.weld.test.managed.newBean; import java.io.Serializable; Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/named (from rev 4663, core/trunk/tests/src/test/java/org/jboss/weld/test/named) Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/named/Important.java =================================================================== --- core/trunk/tests/src/test/java/org/jboss/weld/test/named/Important.java 2009-11-04 18:04:46 UTC (rev 4663) +++ core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/named/Important.java 2009-11-04 18:29:45 UTC (rev 4668) @@ -1,4 +1,4 @@ -package org.jboss.weld.test.named; +package org.jboss.weld.test.resolution.named; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/named/NamedBeanWithBinding.java =================================================================== --- core/trunk/tests/src/test/java/org/jboss/weld/test/named/NamedBeanWithBinding.java 2009-11-04 18:04:46 UTC (rev 4663) +++ core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/named/NamedBeanWithBinding.java 2009-11-04 18:29:45 UTC (rev 4668) @@ -1,4 +1,4 @@ -package org.jboss.weld.test.named; +package org.jboss.weld.test.resolution.named; import javax.enterprise.context.RequestScoped; import javax.inject.Named; Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/named/NamedBeanWithBindingTest.java =================================================================== --- core/trunk/tests/src/test/java/org/jboss/weld/test/named/NamedBeanWithBindingTest.java 2009-11-04 18:04:46 UTC (rev 4663) +++ core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/named/NamedBeanWithBindingTest.java 2009-11-04 18:29:45 UTC (rev 4668) @@ -1,4 +1,4 @@ -package org.jboss.weld.test.named; +package org.jboss.weld.test.resolution.named; import javax.enterprise.inject.spi.Bean; Copied: core/trunk/tests/src/test/resources/org/jboss/weld/test/decorators (from rev 4663, core/trunk/tests/src/test/resources/org/jboss/weld/test/unit/decorator/simple) Modified: core/trunk/tests/src/test/resources/org/jboss/weld/test/decorators/beans.xml =================================================================== --- core/trunk/tests/src/test/resources/org/jboss/weld/test/unit/decorator/simple/beans.xml 2009-11-04 18:04:46 UTC (rev 4663) +++ core/trunk/tests/src/test/resources/org/jboss/weld/test/decorators/beans.xml 2009-11-04 18:29:45 UTC (rev 4668) @@ -1,6 +1,6 @@ <beans> <decorators> - <class>org.jboss.weld.test.unit.decorator.simple.SimpleDecorator1</class> - <class>org.jboss.weld.test.unit.decorator.simple.SimpleDecorator2</class> + <class>org.jboss.weld.test.decorators.SimpleDecorator1</class> + <class>org.jboss.weld.test.decorators.SimpleDecorator2</class> </decorators> </beans> Copied: core/trunk/tests/src/test/resources/org/jboss/weld/test/interceptors/ejb (from rev 4663, core/trunk/tests/src/test/resources/org/jboss/weld/test/unit/interceptor/ejb) Modified: core/trunk/tests/src/test/resources/org/jboss/weld/test/interceptors/ejb/beans.xml =================================================================== --- core/trunk/tests/src/test/resources/org/jboss/weld/test/unit/interceptor/ejb/beans.xml 2009-11-04 18:04:46 UTC (rev 4663) +++ core/trunk/tests/src/test/resources/org/jboss/weld/test/interceptors/ejb/beans.xml 2009-11-04 18:29:45 UTC (rev 4668) @@ -1,7 +1,7 @@ <beans> <interceptors> - <class>org.jboss.weld.test.unit.interceptor.ejb.Goalkeeper</class> - <class>org.jboss.weld.test.unit.interceptor.ejb.Defender</class> - <class>org.jboss.weld.test.unit.interceptor.ejb.Referee</class> + <class>org.jboss.weld.test.interceptors.ejb.Goalkeeper</class> + <class>org.jboss.weld.test.interceptors.ejb.Defender</class> + <class>org.jboss.weld.test.interceptors.ejb.Referee</class> </interceptors> </beans> Copied: core/trunk/tests/src/test/resources/org/jboss/weld/test/interceptors/passivation/beans.xml (from rev 4663, core/trunk/tests/src/test/resources/org/jboss/weld/test/unit/interceptor/passivation/beans.xml) =================================================================== --- core/trunk/tests/src/test/resources/org/jboss/weld/test/interceptors/passivation/beans.xml (rev 0) +++ core/trunk/tests/src/test/resources/org/jboss/weld/test/interceptors/passivation/beans.xml 2009-11-04 18:29:45 UTC (rev 4668) @@ -0,0 +1,7 @@ +<beans> + <interceptors> + <class>org.jboss.weld.test.interceptors.passivation.Goalkeeper</class> + <class>org.jboss.weld.test.interceptors.passivation.Defender</class> + <class>org.jboss.weld.test.interceptors.passivation.PassivationActivationInterceptor</class> + </interceptors> +</beans> Copied: core/trunk/tests/src/test/resources/org/jboss/weld/test/interceptors/passivation/broken/interceptorWithNonSerializableField (from rev 4663, core/trunk/tests/src/test/resources/org/jboss/weld/test/unit/interceptor/passivation/broken/interceptorWithNonSerializableField) Modified: core/trunk/tests/src/test/resources/org/jboss/weld/test/interceptors/passivation/broken/interceptorWithNonSerializableField/beans.xml =================================================================== --- core/trunk/tests/src/test/resources/org/jboss/weld/test/unit/interceptor/passivation/broken/interceptorWithNonSerializableField/beans.xml 2009-11-04 18:04:46 UTC (rev 4663) +++ core/trunk/tests/src/test/resources/org/jboss/weld/test/interceptors/passivation/broken/interceptorWithNonSerializableField/beans.xml 2009-11-04 18:29:45 UTC (rev 4668) @@ -1,5 +1,5 @@ <beans> <interceptors> - <class>org.jboss.weld.test.unit.interceptor.passivation.broken.interceptorWithNonSerializableField.Defender</class> + <class>org.jboss.weld.test.interceptors.passivation.broken.interceptorWithNonSerializableField.Defender</class> </interceptors> </beans> \ No newline at end of file Copied: core/trunk/tests/src/test/resources/org/jboss/weld/test/interceptors/passivation/broken/nonSerializableInterceptor (from rev 4663, core/trunk/tests/src/test/resources/org/jboss/weld/test/unit/interceptor/passivation/broken/nonSerializableInterceptor) Copied: core/trunk/tests/src/test/resources/org/jboss/weld/test/interceptors/simple (from rev 4663, core/trunk/tests/src/test/resources/org/jboss/weld/test/unit/interceptor/simple) Modified: core/trunk/tests/src/test/resources/org/jboss/weld/test/interceptors/simple/beans.xml =================================================================== --- core/trunk/tests/src/test/resources/org/jboss/weld/test/unit/interceptor/simple/beans.xml 2009-11-04 18:04:46 UTC (rev 4663) +++ core/trunk/tests/src/test/resources/org/jboss/weld/test/interceptors/simple/beans.xml 2009-11-04 18:29:45 UTC (rev 4668) @@ -1,9 +1,9 @@ <beans> <interceptors> - <class>org.jboss.weld.test.unit.interceptor.simple.SimpleInterceptor</class> - <class>org.jboss.weld.test.unit.interceptor.simple.TwoBindingsInterceptor</class> + <class>org.jboss.weld.test.interceptors.simple.SimpleInterceptor</class> + <class>org.jboss.weld.test.interceptors.simple.TwoBindingsInterceptor</class> </interceptors> <decorators> - <class>org.jboss.weld.test.unit.interceptor.simple.SimpleDecorator</class> + <class>org.jboss.weld.test.interceptors.simple.SimpleDecorator</class> </decorators> </beans> Deleted: core/trunk/tests/src/test/resources/org/jboss/weld/test/unit/interceptor/passivation/beans.xml =================================================================== --- core/trunk/tests/src/test/resources/org/jboss/weld/test/unit/interceptor/passivation/beans.xml 2009-11-04 18:20:14 UTC (rev 4667) +++ core/trunk/tests/src/test/resources/org/jboss/weld/test/unit/interceptor/passivation/beans.xml 2009-11-04 18:29:45 UTC (rev 4668) @@ -1,7 +0,0 @@ -<beans> - <interceptors> - <class>org.jboss.weld.test.unit.interceptor.passivation.Goalkeeper</class> - <class>org.jboss.weld.test.unit.interceptor.passivation.Defender</class> - <class>org.jboss.weld.test.unit.interceptor.passivation.PassivationActivationInterceptor</class> - </interceptors> -</beans> Modified: core/trunk/tests/unit-tests.xml =================================================================== --- core/trunk/tests/unit-tests.xml 2009-11-04 18:20:14 UTC (rev 4667) +++ core/trunk/tests/unit-tests.xml 2009-11-04 18:29:45 UTC (rev 4668) @@ -18,56 +18,53 @@ </run> </groups> <packages> + <package name="org.jboss.weld.test.activities" /> + <package name="org.jboss.weld.test.activities.current" /> + <package name="org.jboss.weld.test.activities.child" /> + <package name="org.jboss.weld.test.annotatedType" /> + <package name="org.jboss.weld.test.annotatedType.decoration" /> + <package name="org.jboss.weld.test.beanDeployment.managed.multiple" /> + <package name="org.jboss.weld.test.beanDeployment.managed.single" /> + <package name="org.jboss.weld.test.beanDeployment.mixed" /> + <package name="org.jboss.weld.test.beanDeployment.producers.singleProducerMethod" /> + <package name="org.jboss.weld.test.beanDeployment.session.multiple" /> + <package name="org.jboss.weld.test.beanDeployment.session.single" /> + <package name="org.jboss.weld.test.beanManager.serializability" /> + <package name="org.jboss.weld.test.contexts" /> + <package name="org.jboss.weld.test.decorators" /> + <package name="org.jboss.weld.test.el.resolver" /> + <package name="org.jboss.weld.test.enterprise" /> + <package name="org.jboss.weld.test.enterprise.lifecycle" /> + <package name="org.jboss.weld.test.event" /> + <package name="org.jboss.weld.test.event.tx" /> <package name="org.jboss.weld.test.examples" /> - <package name="org.jboss.weld.test.unit.activities" /> - <package name="org.jboss.weld.test.unit.activities.current" /> - <package name="org.jboss.weld.test.unit.activities.child" /> - <package name="org.jboss.weld.test.unit.annotated" /> - <package name="org.jboss.weld.test.unit.annotated.decoration" /> + <package name="org.jboss.weld.test.extensions" /> + <package name="org.jboss.weld.test.interceptors.ejb" /> + <package name="org.jboss.weld.test.interceptors.ejb3model" /> + <package name="org.jboss.weld.test.interceptors.passivation" /> + <package name="org.jboss.weld.test.interceptors.simple" /> + <package name="org.jboss.weld.test.managed.newBean" /> + <package name="org.jboss.weld.test.nonContextual" /> + <package name="org.jboss.weld.test.producer.field" /> + <package name="org.jboss.weld.test.producer.method" /> + <package name="org.jboss.weld.test.proxy" /> + <package name="org.jboss.weld.test.proxy.enterprise" /> + <package name="org.jboss.weld.test.resolution" /> + <package name="org.jboss.weld.test.resolution.circular" /> + <package name="org.jboss.weld.test.resolution.named" /> + <package name="org.jboss.weld.test.resolution.wbri279" /> + <package name="org.jboss.weld.test.resolution.wbri293" /> + <package name="org.jboss.weld.test.session.newBean" /> + <package name="org.jboss.weld.test.stereotypes" /> <package name="org.jboss.weld.test.unit.bootstrap" /> - <package name="org.jboss.weld.test.unit.bootstrap.environments" /> - <package name="org.jboss.weld.test.unit.bootstrap.multipleEnterprise" /> - <package name="org.jboss.weld.test.unit.bootstrap.multipleEnterpriseAndSimple" /> - <package name="org.jboss.weld.test.unit.bootstrap.multipleSimple" /> - <package name="org.jboss.weld.test.unit.bootstrap.singleEnterprise" /> - <package name="org.jboss.weld.test.unit.bootstrap.singleProducerMethod" /> - <package name="org.jboss.weld.test.unit.bootstrap.singleSimple" /> <package name="org.jboss.weld.test.unit.cluster" /> - <package name="org.jboss.weld.test.unit.context" /> - <package name="org.jboss.weld.test.unit.decorator.simple" /> - <package name="org.jboss.weld.test.unit.definition" /> <package name="org.jboss.weld.test.unit.deployment.structure.extensions" /> - <package name="org.jboss.weld.test.unit.deployment.structure.resolution" /> <package name="org.jboss.weld.test.unit.deployment.structure.nonTransitiveResolution" /> + <package name="org.jboss.weld.test.unit.deployment.structure.resolution" /> <package name="org.jboss.weld.test.unit.environments.servlet" /> - <package name="org.jboss.weld.test.unit.extensions" /> - <package name="org.jboss.weld.test.unit.implementation" /> - <package name="org.jboss.weld.test.unit.implementation.enterpise" /> - <package name="org.jboss.weld.test.unit.implementation.enterpise.lifecycle" /> - <package name="org.jboss.weld.test.unit.implementation.enterprise.sbi" /> - <package name="org.jboss.weld.test.unit.implementation.event" /> - <package name="org.jboss.weld.test.unit.implementation.event.tx" /> - <package name="org.jboss.weld.test.unit.implementation.exceptions" /> - <package name="org.jboss.weld.test.unit.implementation.named" /> - <package name="org.jboss.weld.test.unit.implementation.newsimple" /> - <package name="org.jboss.weld.test.unit.implementation.producer.field" /> - <package name="org.jboss.weld.test.unit.implementation.producer.method" /> - <package name="org.jboss.weld.test.unit.implementation.proxy" /> - <package name="org.jboss.weld.test.unit.implementation.proxy.enterprise" /> - <package name="org.jboss.weld.test.unit.interceptor.ejb" /> - <package name="org.jboss.weld.test.unit.interceptor.ejb3model" /> - <package name="org.jboss.weld.test.unit.interceptor.passivation" /> - <package name="org.jboss.weld.test.unit.interceptor.simple" /> - <package name="org.jboss.weld.test.unit.lookup" /> - <package name="org.jboss.weld.test.unit.lookup.circular" /> - <package name="org.jboss.weld.test.unit.lookup.wbri279" /> - <package name="org.jboss.weld.test.unit.lookup.wbri293" /> - <package name="org.jboss.weld.test.unit.manager" /> - <package name="org.jboss.weld.test.unit.noncontextual" /> - <package name="org.jboss.weld.test.unit.preinstantiatebeanmanager" /> - <package name="org.jboss.weld.test.unit.security" /> <package name="org.jboss.weld.test.unit.reflection.clazz" /> <package name="org.jboss.weld.test.unit.reflection.method" /> + <package name="org.jboss.weld.test.unit.security" /> </packages> </test>