Author: pete.muir(a)jboss.org Date: 2010-12-10 13:42:32 -0500 (Fri, 10 Dec 2010) New Revision: 7130 Added: cdi-tck/branches/1.0/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/web2.xml Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/InjectionIntoNonContextualComponentTest.java Log: CDITCK-187 Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/InjectionIntoNonContextualComponentTest.java =================================================================== --- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/InjectionIntoNonContextualComponentTest.java 2010-12-10 18:18:44 UTC (rev 7129) +++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/InjectionIntoNonContextualComponentTest.java 2010-12-10 18:42:32 UTC (rev 7130) @@ -38,7 +38,7 @@ @Resource(destination = "TagPage.jsp", source = "TagPage.jsp"), @Resource(destination = "ManagedBeanTestPage.jsp", source = "ManagedBeanTestPage.jsp")}) @SpecVersion(spec="cdi", version="20091101") -(a)WebXml(&quot;web.xml&quot;) +(a)WebXml(&quot;web2.xml&quot;) public class InjectionIntoNonContextualComponentTest extends AbstractJSR299Test { @Test Added: cdi-tck/branches/1.0/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/web2.xml =================================================================== --- cdi-tck/branches/1.0/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/web2.xml (rev 0) +++ cdi-tck/branches/1.0/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/web2.xml 2010-12-10 18:42:32 UTC (rev 7130) @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="UTF-8"?> +<web-app version="2.5" 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/web-app_2_5.xsd"> + <display-name>Dependency Injection Test</display-name> + <listener> + <listener-class>org.jboss.jsr299.tck.tests.lookup.injection.non.contextual.TestListener</listener-class> + </listener> + <servlet> + <servlet-name>TestServlet</servlet-name> + <servlet-class>org.jboss.jsr299.tck.tests.lookup.injection.non.contextual.TestServlet</servlet-class> + <load-on-startup>1</load-on-startup> + </servlet> + <servlet> + <servlet-name>Faces Servlet</servlet-name> + <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> + <load-on-startup>1</load-on-startup> + </servlet> + <filter> + <filter-name>TestFilter</filter-name> + <filter-class>org.jboss.jsr299.tck.tests.lookup.injection.non.contextual.TestFilter</filter-class> + </filter> + <servlet-mapping> + <servlet-name>TestServlet</servlet-name> + <url-pattern>/Test/*</url-pattern> + </servlet-mapping> + <servlet-mapping> + <servlet-name>Faces Servlet</servlet-name> + <url-pattern>*.jsf</url-pattern> + </servlet-mapping> + <filter-mapping> + <filter-name>TestFilter</filter-name> + <url-pattern>/TestFilter</url-pattern> + </filter-mapping> + <session-config> + <session-timeout>10</session-timeout> + </session-config> +</web-app>