[weld-commits] Weld SVN: r5615 - in cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests: context/request and 8 other directories.

Author: pete.muir(a)jboss.org Date: 2010-01-22 11:59:27 -0500 (Fri, 22 Jan 2010) New Revision: 5615 Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ClientConversationContextTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/InvalidatingSessionDestroysConversationTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/LongRunningConversationPropagatedByFacesContextTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ManualCidPropagationTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/RequestContextTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/SessionContextTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/env/EnvInjectionTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/PersistenceContextInjectionTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/incontainer/ClientProxyTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/integration/IntegrationWithUnifiedELTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ContainerEventTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/InjectionIntoNonContextualComponentTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/InjectionIntoWebServiceEndPointTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/not/bean/InjectionPointTest.java Log: port r5540 to trunk Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ClientConversationContextTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ClientConversationContextTest.java 2010-01-22 16:58:41 UTC (rev 5614) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ClientConversationContextTest.java 2010-01-22 16:59:27 UTC (rev 5615) @@ -24,7 +24,7 @@ import org.jboss.testharness.impl.packaging.IntegrationTest; import org.jboss.testharness.impl.packaging.Resource; import org.jboss.testharness.impl.packaging.Resources; -import org.jboss.testharness.impl.packaging.war.WarArtifactDescriptor; +import org.jboss.testharness.impl.packaging.war.WebXml; import org.testng.annotations.Test; import com.gargoylesoftware.htmlunit.Page; @@ -41,7 +41,6 @@ @Classes({Storm.class, ConversationTestPhaseListener.class, ConversationStatusServlet.class, Cloud.class, CloudController.class}) @IntegrationTest(runLocally=true) @Resources({ - @Resource(destination=WarArtifactDescriptor.WEB_XML_DESTINATION, source="web.xml"), @Resource(destination="home.jspx", source="home.jsf"), @Resource(destination="cloud.jspx", source="cloud.jsf"), @Resource(destination="clouds.jspx", source="clouds.jsf"), @@ -49,6 +48,7 @@ @Resource(destination="/WEB-INF/faces-config.xml", source="faces-config.xml"), @Resource(destination="rain.jspx", source="rain.jsf") }) +(a)WebXml("web.xml") @SpecVersion(spec="cdi", version="20091101") public class ClientConversationContextTest extends AbstractConversationTest { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/InvalidatingSessionDestroysConversationTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/InvalidatingSessionDestroysConversationTest.java 2010-01-22 16:58:41 UTC (rev 5614) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/InvalidatingSessionDestroysConversationTest.java 2010-01-22 16:59:27 UTC (rev 5615) @@ -23,7 +23,7 @@ import org.jboss.testharness.impl.packaging.IntegrationTest; import org.jboss.testharness.impl.packaging.Resource; import org.jboss.testharness.impl.packaging.Resources; -import org.jboss.testharness.impl.packaging.war.WarArtifactDescriptor; +import org.jboss.testharness.impl.packaging.war.WebXml; import org.testng.annotations.Test; import com.gargoylesoftware.htmlunit.WebClient; @@ -35,11 +35,11 @@ @Classes({Storm.class, ConversationTestPhaseListener.class, ConversationStatusServlet.class, Cloud.class, CloudController.class}) @IntegrationTest(runLocally=true) @Resources({ - @Resource(destination=WarArtifactDescriptor.WEB_XML_DESTINATION, source="web.xml"), @Resource(destination="WEB-INF/faces-config.xml", source="faces-config.xml"), @Resource(destination="clouds.jspx", source="clouds.jsf"), @Resource(destination="cloud.jspx", source="cloud.jsf") }) +(a)WebXml("web.xml") @SpecVersion(spec="cdi", version="20091101") public class InvalidatingSessionDestroysConversationTest extends AbstractConversationTest { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/LongRunningConversationPropagatedByFacesContextTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/LongRunningConversationPropagatedByFacesContextTest.java 2010-01-22 16:58:41 UTC (rev 5614) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/LongRunningConversationPropagatedByFacesContextTest.java 2010-01-22 16:59:27 UTC (rev 5615) @@ -24,7 +24,7 @@ import org.jboss.testharness.impl.packaging.IntegrationTest; import org.jboss.testharness.impl.packaging.Resource; import org.jboss.testharness.impl.packaging.Resources; -import org.jboss.testharness.impl.packaging.war.WarArtifactDescriptor; +import org.jboss.testharness.impl.packaging.war.WebXml; import org.testng.annotations.Test; import com.gargoylesoftware.htmlunit.WebClient; @@ -39,12 +39,12 @@ @Classes({Storm.class, ConversationTestPhaseListener.class, ConversationStatusServlet.class, Cloud.class}) @IntegrationTest(runLocally=true) @Resources({ - @Resource(destination=WarArtifactDescriptor.WEB_XML_DESTINATION, source="web.xml"), @Resource(destination="WEB-INF/faces-config.xml", source="faces-config.xml"), @Resource(destination="storm.jspx", source="storm.jsf"), @Resource(destination="thunder.jspx", source="thunder.jsf"), @Resource(destination="lightening.jspx", source="lightening.jsf") }) +(a)WebXml("web.xml") @SpecVersion(spec="cdi", version="20091101") public class LongRunningConversationPropagatedByFacesContextTest extends AbstractConversationTest { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ManualCidPropagationTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ManualCidPropagationTest.java 2010-01-22 16:58:41 UTC (rev 5614) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ManualCidPropagationTest.java 2010-01-22 16:59:27 UTC (rev 5615) @@ -23,7 +23,7 @@ import org.jboss.testharness.impl.packaging.IntegrationTest; import org.jboss.testharness.impl.packaging.Resource; import org.jboss.testharness.impl.packaging.Resources; -import org.jboss.testharness.impl.packaging.war.WarArtifactDescriptor; +import org.jboss.testharness.impl.packaging.war.WebXml; import org.testng.annotations.Test; import com.gargoylesoftware.htmlunit.WebClient; @@ -39,12 +39,12 @@ @Classes({Storm.class, ConversationTestPhaseListener.class, ConversationStatusServlet.class, Cloud.class, CloudController.class}) @IntegrationTest(runLocally=true) @Resources({ - @Resource(destination=WarArtifactDescriptor.WEB_XML_DESTINATION, source="web.xml"), @Resource(destination="cloud.jspx", source="cloud.jsf"), @Resource(destination="storm.jspx", source="storm.jsf"), @Resource(destination="clouds.jspx", source="clouds.jsf"), @Resource(destination="/WEB-INF/faces-config.xml", source="faces-config.xml") }) +(a)WebXml("web.xml") @SpecVersion(spec="cdi", version="20091101") public class ManualCidPropagationTest extends AbstractConversationTest { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/RequestContextTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/RequestContextTest.java 2010-01-22 16:58:41 UTC (rev 5614) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/RequestContextTest.java 2010-01-22 16:59:27 UTC (rev 5615) @@ -23,7 +23,7 @@ import org.jboss.testharness.impl.packaging.IntegrationTest; import org.jboss.testharness.impl.packaging.Resource; import org.jboss.testharness.impl.packaging.Resources; -import org.jboss.testharness.impl.packaging.war.WarArtifactDescriptor; +import org.jboss.testharness.impl.packaging.war.WebXml; import org.testng.annotations.Test; import com.gargoylesoftware.htmlunit.TextPage; @@ -32,9 +32,9 @@ @Artifact @IntegrationTest(runLocally=true) @Resources({ - @Resource(destination=WarArtifactDescriptor.WEB_XML_DESTINATION, source="web.xml"), @Resource(destination="SimplePage.html", source="SimplePage.html") }) +(a)WebXml("web.xml") @SpecVersion(spec="cdi", version="20091101") public class RequestContextTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/SessionContextTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/SessionContextTest.java 2010-01-22 16:58:41 UTC (rev 5614) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/SessionContextTest.java 2010-01-22 16:59:27 UTC (rev 5615) @@ -23,7 +23,7 @@ import org.jboss.testharness.impl.packaging.IntegrationTest; import org.jboss.testharness.impl.packaging.Resource; import org.jboss.testharness.impl.packaging.Resources; -import org.jboss.testharness.impl.packaging.war.WarArtifactDescriptor; +import org.jboss.testharness.impl.packaging.war.WebXml; import org.testng.annotations.Test; import com.gargoylesoftware.htmlunit.TextPage; @@ -32,9 +32,9 @@ @Artifact @IntegrationTest(runLocally=true) @Resources({ - @Resource(destination=WarArtifactDescriptor.WEB_XML_DESTINATION, source="web.xml"), @Resource(destination="SimplePage.html", source="SimplePage.html") }) +(a)WebXml("web.xml") @SpecVersion(spec="cdi", version="20091101") public class SessionContextTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/env/EnvInjectionTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/env/EnvInjectionTest.java 2010-01-22 16:58:41 UTC (rev 5614) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/env/EnvInjectionTest.java 2010-01-22 16:59:27 UTC (rev 5615) @@ -28,8 +28,8 @@ import org.jboss.testharness.impl.packaging.IntegrationTest; import org.jboss.testharness.impl.packaging.Packaging; import org.jboss.testharness.impl.packaging.PackagingType; -import org.jboss.testharness.impl.packaging.Resource; import org.jboss.testharness.impl.packaging.jsr299.BeansXml; +import org.jboss.testharness.impl.packaging.war.WebXml; import org.testng.annotations.Test; /** @@ -40,9 +40,9 @@ @Artifact @Packaging(PackagingType.WAR) @IntegrationTest -(a)Resource(source="web.xml", destination="/WEB-INF/web.xml") @BeansXml("beans.xml") @SpecVersion(spec="cdi", version="20091101") +(a)WebXml("web.xml") public class EnvInjectionTest extends AbstractJSR299Test { @Test(groups = { "beanLifecycle", "commonAnnotations", "integration" }) Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/PersistenceContextInjectionTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/PersistenceContextInjectionTest.java 2010-01-22 16:58:41 UTC (rev 5614) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/PersistenceContextInjectionTest.java 2010-01-22 16:59:27 UTC (rev 5615) @@ -30,7 +30,7 @@ import org.jboss.testharness.impl.packaging.IntegrationTest; import org.jboss.testharness.impl.packaging.Packaging; import org.jboss.testharness.impl.packaging.PackagingType; -import org.jboss.testharness.impl.packaging.Resource; +import org.jboss.testharness.impl.packaging.ear.PersistenceXml; import org.jboss.testharness.impl.packaging.jsr299.BeansXml; import org.testng.annotations.Test; @@ -42,8 +42,7 @@ @Artifact @Packaging(PackagingType.WAR) @IntegrationTest -@Resource(source = "persistence.xml", destination = "WEB-INF/classes/META-INF/persistence.xml") -//(a)PersistenceXml("persistence.xml") +(a)PersistenceXml("persistence.xml") @BeansXml("beans.xml") @SpecVersion(spec="cdi", version="20091101") public class PersistenceContextInjectionTest extends AbstractJSR299Test Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/incontainer/ClientProxyTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/incontainer/ClientProxyTest.java 2010-01-22 16:58:41 UTC (rev 5614) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/incontainer/ClientProxyTest.java 2010-01-22 16:59:27 UTC (rev 5615) @@ -21,16 +21,15 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.IntegrationTest; -import org.jboss.testharness.impl.packaging.Resource; -import org.jboss.testharness.impl.packaging.war.WarArtifactDescriptor; +import org.jboss.testharness.impl.packaging.war.WebXml; import org.testng.annotations.Test; import com.gargoylesoftware.htmlunit.WebClient; @Artifact @IntegrationTest(runLocally = true) -@Resource(destination = WarArtifactDescriptor.WEB_XML_DESTINATION, source = "web.xml") @SpecVersion(spec="cdi", version="20091101") +(a)WebXml("web.xml") public class ClientProxyTest extends AbstractJSR299Test { @Test Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/integration/IntegrationWithUnifiedELTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/integration/IntegrationWithUnifiedELTest.java 2010-01-22 16:58:41 UTC (rev 5614) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/integration/IntegrationWithUnifiedELTest.java 2010-01-22 16:59:27 UTC (rev 5615) @@ -23,7 +23,7 @@ import org.jboss.testharness.impl.packaging.IntegrationTest; import org.jboss.testharness.impl.packaging.Resource; import org.jboss.testharness.impl.packaging.Resources; -import org.jboss.testharness.impl.packaging.war.WarArtifactDescriptor; +import org.jboss.testharness.impl.packaging.war.WebXml; import org.testng.annotations.Test; import com.gargoylesoftware.htmlunit.WebClient; @@ -31,11 +31,11 @@ @Artifact @IntegrationTest(runLocally = true) @Resources( { - @Resource(destination = WarArtifactDescriptor.WEB_XML_DESTINATION, source = "web.xml"), @Resource(destination = "WEB-INF/faces-config.xml", source = "faces-config.xml"), @Resource(destination = "JSFTestPage.jsp", source = "JSFTestPage.jsp"), @Resource(destination = "JSPTestPage.jsp", source = "JSPTestPage.jsp")}) @SpecVersion(spec="cdi", version="20091101") +(a)WebXml("web.xml") public class IntegrationWithUnifiedELTest extends AbstractJSR299Test { @Test(groups = {"el" } ) Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ContainerEventTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ContainerEventTest.java 2010-01-22 16:58:41 UTC (rev 5614) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ContainerEventTest.java 2010-01-22 16:59:27 UTC (rev 5615) @@ -41,7 +41,7 @@ import org.jboss.testharness.impl.packaging.IntegrationTest; import org.jboss.testharness.impl.packaging.Resource; import org.jboss.testharness.impl.packaging.Resources; -import org.jboss.testharness.impl.packaging.war.WarArtifactDescriptor; +import org.jboss.testharness.impl.packaging.war.WebXml; import org.testng.annotations.Test; /** @@ -52,13 +52,13 @@ */ @Artifact @Resources( { - @Resource(destination = WarArtifactDescriptor.WEB_XML_DESTINATION, source = "web.xml"), @Resource(destination = "WEB-INF/faces-config.xml", source = "faces-config.xml"), @Resource(destination = "WEB-INF/TestLibrary.tld", source = "TestLibrary.tld"), @Resource(destination = "TagPage.jsp", source = "TagPage.jsp"), @Resource(destination = "ManagedBeanTestPage.jsp", source = "ManagedBeanTestPage.jsp"), @Resource(source = "javax.enterprise.inject.spi.Extension", destination = "WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension") }) @IntegrationTest +(a)WebXml("web.xml") @SpecVersion(spec = "cdi", version = "20091101") public class ContainerEventTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/InjectionIntoNonContextualComponentTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/InjectionIntoNonContextualComponentTest.java 2010-01-22 16:58:41 UTC (rev 5614) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/InjectionIntoNonContextualComponentTest.java 2010-01-22 16:59:27 UTC (rev 5615) @@ -24,7 +24,7 @@ import org.jboss.testharness.impl.packaging.IntegrationTest; import org.jboss.testharness.impl.packaging.Resource; import org.jboss.testharness.impl.packaging.Resources; -import org.jboss.testharness.impl.packaging.war.WarArtifactDescriptor; +import org.jboss.testharness.impl.packaging.war.WebXml; import org.testng.annotations.Test; import com.gargoylesoftware.htmlunit.WebClient; @@ -33,12 +33,12 @@ @Artifact @IntegrationTest(runLocally = true) @Resources( { - @Resource(destination = WarArtifactDescriptor.WEB_XML_DESTINATION, source = "web.xml"), @Resource(destination = "WEB-INF/faces-config.xml", source = "faces-config.xml"), @Resource(destination = "WEB-INF/TestLibrary.tld", source = "TestLibrary.tld"), @Resource(destination = "TagPage.jsp", source = "TagPage.jsp"), @Resource(destination = "ManagedBeanTestPage.jsp", source = "ManagedBeanTestPage.jsp")}) @SpecVersion(spec="cdi", version="20091101") +(a)WebXml("web.xml") public class InjectionIntoNonContextualComponentTest extends AbstractJSR299Test { @Test Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/InjectionIntoWebServiceEndPointTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/InjectionIntoWebServiceEndPointTest.java 2010-01-22 16:58:41 UTC (rev 5614) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/InjectionIntoWebServiceEndPointTest.java 2010-01-22 16:59:27 UTC (rev 5615) @@ -24,14 +24,13 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.IntegrationTest; -import org.jboss.testharness.impl.packaging.Resource; -import org.jboss.testharness.impl.packaging.war.WarArtifactDescriptor; +import org.jboss.testharness.impl.packaging.war.WebXml; import org.testng.annotations.Test; @Artifact @IntegrationTest(runLocally = true) -@Resource(destination = WarArtifactDescriptor.WEB_XML_DESTINATION, source = "web.xml") @SpecVersion(spec="cdi", version="20091101") +(a)WebXml("web.xml") public class InjectionIntoWebServiceEndPointTest extends AbstractJSR299Test { @WebServiceRef(wsdlLocation = "http://localhost:8080/org.jboss.jsr299.tck.tests.lookup.injection.non.contextual.ws.InjectionIntoWebServiceEndPointTest/TestWebService?wsdl") Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/not/bean/InjectionPointTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/not/bean/InjectionPointTest.java 2010-01-22 16:58:41 UTC (rev 5614) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/not/bean/InjectionPointTest.java 2010-01-22 16:59:27 UTC (rev 5615) @@ -23,15 +23,14 @@ import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.jboss.testharness.impl.packaging.IntegrationTest; -import org.jboss.testharness.impl.packaging.Resource; -import org.jboss.testharness.impl.packaging.war.WarArtifactDescriptor; +import org.jboss.testharness.impl.packaging.war.WebXml; import org.testng.annotations.Test; @Artifact @SpecVersion(spec = "cdi", version = "20091101") @ExpectedDeploymentException(DeploymentFailure.class) @IntegrationTest -@Resource(destination = WarArtifactDescriptor.WEB_XML_DESTINATION, source = "web.xml") +(a)WebXml("web.xml") public class InjectionPointTest extends AbstractJSR299Test { @Test