Author: petemuir Date: 2010-10-30 12:47:55 -0400 (Sat, 30 Oct 2010) New Revision: 7047 Modified: cdi-tck/branches/1.0/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingBeanConstructor/beans.xml cdi-tck/branches/1.0/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInitializerMethod/beans.xml cdi-tck/branches/1.0/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInjectedField/beans.xml cdi-tck/branches/1.0/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingConstructorFieldInDecorator/beans.xml cdi-tck/branches/1.0/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingDecorator/beans.xml cdi-tck/branches/1.0/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerInDecorator/beans.xml cdi-tck/branches/1.0/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInjectedFieldInDecorator/beans.xml cdi-tck/branches/1.0/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/passivating/broken/managedBeanWithNonPassivatingDecorator/beans.xml cdi-tck/branches/1.0/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorCanNotDecorateDecorator/beans.xml cdi-tck/branches/1.0/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorListedTwiceInBeansXml/beans.xml cdi-tck/branches/1.0/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/definition/broken/nonExistantClassInBeansXml/beans.xml Log: CDITCK-176 Modified: cdi-tck/branches/1.0/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingBeanConstructor/beans.xml =================================================================== --- cdi-tck/branches/1.0/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingBeanConstructor/beans.xml 2010-10-30 16:41:22 UTC (rev 7046) +++ cdi-tck/branches/1.0/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingBeanConstructor/beans.xml 2010-10-30 16:47:55 UTC (rev 7047) @@ -1,5 +1,5 @@ <beans> <decorators> - <decorator>org.jboss.jsr299.tck.tests.context.passivating.broken.decoratorWithNonPassivatingBeanConstructor.CityDecorator</decorator> + <class>org.jboss.jsr299.tck.tests.context.passivating.broken.decoratorWithNonPassivatingBeanConstructor.CityDecorator</class> </decorators> </beans> Modified: cdi-tck/branches/1.0/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInitializerMethod/beans.xml =================================================================== --- cdi-tck/branches/1.0/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInitializerMethod/beans.xml 2010-10-30 16:41:22 UTC (rev 7046) +++ cdi-tck/branches/1.0/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInitializerMethod/beans.xml 2010-10-30 16:47:55 UTC (rev 7047) @@ -1,5 +1,5 @@ <beans> <decorators> - <decorator>org.jboss.jsr299.tck.tests.context.passivating.broken.decoratorWithNonPassivatingInitializerMethod.CityDecorator</decorator> + <class>org.jboss.jsr299.tck.tests.context.passivating.broken.decoratorWithNonPassivatingInitializerMethod.CityDecorator</class> </decorators> </beans> Modified: cdi-tck/branches/1.0/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInjectedField/beans.xml =================================================================== --- cdi-tck/branches/1.0/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInjectedField/beans.xml 2010-10-30 16:41:22 UTC (rev 7046) +++ cdi-tck/branches/1.0/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInjectedField/beans.xml 2010-10-30 16:47:55 UTC (rev 7047) @@ -1,5 +1,5 @@ <beans> <decorators> - <decorator>org.jboss.jsr299.tck.tests.context.passivating.broken.decoratorWithNonPassivatingInjectedField.CityDecorator</decorator> + <class>org.jboss.jsr299.tck.tests.context.passivating.broken.decoratorWithNonPassivatingInjectedField.CityDecorator</class> </decorators> </beans> Modified: cdi-tck/branches/1.0/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingConstructorFieldInDecorator/beans.xml =================================================================== --- cdi-tck/branches/1.0/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingConstructorFieldInDecorator/beans.xml 2010-10-30 16:41:22 UTC (rev 7046) +++ cdi-tck/branches/1.0/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingConstructorFieldInDecorator/beans.xml 2010-10-30 16:47:55 UTC (rev 7047) @@ -1,5 +1,5 @@ <beans> <decorators> - <decorator>org.jboss.jsr299.tck.tests.context.passivating.broken.enterpriseBeanWithNonPassivatingConstructorFieldInDecorator.BrokenDecorator</decorator> + <class>org.jboss.jsr299.tck.tests.context.passivating.broken.enterpriseBeanWithNonPassivatingConstructorFieldInDecorator.BrokenDecorator</class> </decorators> </beans> Modified: cdi-tck/branches/1.0/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingDecorator/beans.xml =================================================================== --- cdi-tck/branches/1.0/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingDecorator/beans.xml 2010-10-30 16:41:22 UTC (rev 7046) +++ cdi-tck/branches/1.0/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingDecorator/beans.xml 2010-10-30 16:47:55 UTC (rev 7047) @@ -1,5 +1,5 @@ <beans> <decorators> - <decorator>org.jboss.jsr299.tck.tests.context.passivating.broken.enterpriseBeanWithNonPassivatingDecorator.MaarianhaminaDecorator</decorator> + <class>org.jboss.jsr299.tck.tests.context.passivating.broken.enterpriseBeanWithNonPassivatingDecorator.MaarianhaminaDecorator</class> </decorators> </beans> Modified: cdi-tck/branches/1.0/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerInDecorator/beans.xml =================================================================== --- cdi-tck/branches/1.0/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerInDecorator/beans.xml 2010-10-30 16:41:22 UTC (rev 7046) +++ cdi-tck/branches/1.0/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerInDecorator/beans.xml 2010-10-30 16:47:55 UTC (rev 7047) @@ -1,5 +1,5 @@ <beans> <decorators> - <decorator>org.jboss.jsr299.tck.tests.context.passivating.broken.enterpriseBeanWithNonPassivatingInitializerInDecorator.BrokenDecorator</decorator> + <class>org.jboss.jsr299.tck.tests.context.passivating.broken.enterpriseBeanWithNonPassivatingInitializerInDecorator.BrokenDecorator</class> </decorators> </beans> Modified: cdi-tck/branches/1.0/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInjectedFieldInDecorator/beans.xml =================================================================== --- cdi-tck/branches/1.0/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInjectedFieldInDecorator/beans.xml 2010-10-30 16:41:22 UTC (rev 7046) +++ cdi-tck/branches/1.0/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInjectedFieldInDecorator/beans.xml 2010-10-30 16:47:55 UTC (rev 7047) @@ -1,5 +1,5 @@ <beans> <decorators> - <decorator>org.jboss.jsr299.tck.tests.context.passivating.broken.enterpriseBeanWithNonPassivatingInjectedFieldInDecorator.BrokenDecorator</decorator> + <class>org.jboss.jsr299.tck.tests.context.passivating.broken.enterpriseBeanWithNonPassivatingInjectedFieldInDecorator.BrokenDecorator</class> </decorators> </beans> Modified: cdi-tck/branches/1.0/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/passivating/broken/managedBeanWithNonPassivatingDecorator/beans.xml =================================================================== --- cdi-tck/branches/1.0/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/passivating/broken/managedBeanWithNonPassivatingDecorator/beans.xml 2010-10-30 16:41:22 UTC (rev 7046) +++ cdi-tck/branches/1.0/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/passivating/broken/managedBeanWithNonPassivatingDecorator/beans.xml 2010-10-30 16:47:55 UTC (rev 7047) @@ -1,4 +1,4 @@ <beans> - <decorators> <decorator>org.jboss.jsr299.tck.tests.context.passivating.broken.managedBeanWithNonPassivatingDecorator.MaarianhaminaDecorator</decorator> + <decorators> <class>org.jboss.jsr299.tck.tests.context.passivating.broken.managedBeanWithNonPassivatingDecorator.MaarianhaminaDecorator</class> </decorators> </beans> Modified: cdi-tck/branches/1.0/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorCanNotDecorateDecorator/beans.xml =================================================================== --- cdi-tck/branches/1.0/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorCanNotDecorateDecorator/beans.xml 2010-10-30 16:41:22 UTC (rev 7046) +++ cdi-tck/branches/1.0/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorCanNotDecorateDecorator/beans.xml 2010-10-30 16:47:55 UTC (rev 7047) @@ -1,7 +1,7 @@ <beans> <decorators> - <decorator>org.jboss.jsr299.tck.tests.decorators.definition.broken.decoratorCanNotDecorateDecorator.FooDecorator</decorator> - <decorator>org.jboss.jsr299.tck.tests.decorators.definition.broken.decoratorCanNotDecorateDecorator.FooDecoratorDecorator</decorator> + <class>org.jboss.jsr299.tck.tests.decorators.definition.broken.decoratorCanNotDecorateDecorator.FooDecorator</class> + <class>org.jboss.jsr299.tck.tests.decorators.definition.broken.decoratorCanNotDecorateDecorator.FooDecoratorDecorator</class> </decorators> </beans> Modified: cdi-tck/branches/1.0/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorListedTwiceInBeansXml/beans.xml =================================================================== --- cdi-tck/branches/1.0/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorListedTwiceInBeansXml/beans.xml 2010-10-30 16:41:22 UTC (rev 7046) +++ cdi-tck/branches/1.0/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorListedTwiceInBeansXml/beans.xml 2010-10-30 16:47:55 UTC (rev 7047) @@ -1,7 +1,7 @@ <beans> <decorators> - <decorator>org.jboss.jsr299.tck.tests.decorators.definition.broken.decoratorListedTwiceInBeansXml.PresentDecorator</decorator> - <decorator>org.jboss.jsr299.tck.tests.decorators.definition.broken.decoratorListedTwiceInBeansXml.PresentDecorator</decorator> + <class>org.jboss.jsr299.tck.tests.decorators.definition.broken.decoratorListedTwiceInBeansXml.PresentDecorator</class> + <class>org.jboss.jsr299.tck.tests.decorators.definition.broken.decoratorListedTwiceInBeansXml.PresentDecorator</class> </decorators> </beans> Modified: cdi-tck/branches/1.0/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/definition/broken/nonExistantClassInBeansXml/beans.xml =================================================================== --- cdi-tck/branches/1.0/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/definition/broken/nonExistantClassInBeansXml/beans.xml 2010-10-30 16:41:22 UTC (rev 7046) +++ cdi-tck/branches/1.0/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/definition/broken/nonExistantClassInBeansXml/beans.xml 2010-10-30 16:47:55 UTC (rev 7047) @@ -1,5 +1,5 @@ <beans> <decorators> - <decorator>com.acme.NonExistantDecoratorClass</decorator> + <class>com.acme.NonExistantDecoratorClass</class> </decorators> </beans>