Author: pete.muir(a)jboss.org Date: 2010-02-20 13:48:21 -0500 (Sat, 20 Feb 2010) New Revision: 5895 Added: cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/ cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithConversationScope/ cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithConversationScope/ejb-jar.xml Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithConversationScope/SingletonWithConversationScopeTest.java Log: port CDITCK-112 to trunk Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithConversationScope/SingletonWithConversationScopeTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithConversationScope/SingletonWithConversationScopeTest.java 2010-02-20 18:44:00 UTC (rev 5894) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithConversationScope/SingletonWithConversationScopeTest.java 2010-02-20 18:48:21 UTC (rev 5895) @@ -25,11 +25,13 @@ 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.ear.EjbJarXml; import org.testng.annotations.Test; @ExpectedDeploymentException(DeploymentFailure.class) @Artifact @Packaging(PackagingType.EAR) +(a)EjbJarXml(&quot;ejb-jar.xml&quot;) @SpecVersion(spec="cdi", version="20091101") public class SingletonWithConversationScopeTest extends AbstractJSR299Test { Added: cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithConversationScope/ejb-jar.xml =================================================================== --- cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithConversationScope/ejb-jar.xml (rev 0) +++ cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithConversationScope/ejb-jar.xml 2010-02-20 18:48:21 UTC (rev 5895) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ejb-jar xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_1.xsd" + version="3.1"> + +</ejb-jar> Property changes on: cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithConversationScope/ejb-jar.xml ___________________________________________________________________ Name: svn:mime-type + text/plain