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

Author: pete.muir(a)jboss.org Date: 2009-11-02 15:35:04 -0500 (Mon, 02 Nov 2009) New Revision: 4559 Modified: cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/application/web.xml cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/request/web.xml cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/session/web.xml cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/clientProxy/incontainer/web.xml cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/el/integration/web.xml cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/web.xml cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/not/bean/web.xml Log: ws, always use harness listener Modified: cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/application/web.xml =================================================================== --- cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/application/web.xml 2009-11-02 20:23:37 UTC (rev 4558) +++ cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/application/web.xml 2009-11-02 20:35:04 UTC (rev 4559) @@ -1,51 +1,52 @@ <?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"> - <description>Test servlets used to test session contexts.</description> - <display-name>Session Context Tests</display-name> - <listener> - <listener-class>org.jboss.jsr299.tck.tests.context.application.TestServletContextListener</listener-class> -</listener> -<listener> - <listener-class>org.jboss.jsr299.tck.tests.context.application.TestHttpSessionListener</listener-class> -</listener> -<listener> - <listener-class>org.jboss.jsr299.tck.tests.context.application.TestServletRequestListener</listener-class> -</listener> - <filter> - <display-name>Test Filter for Sessions</display-name> - <filter-name>filterTest</filter-name> - <filter-class>org.jboss.jsr299.tck.tests.context.application.TestFilter</filter-class> - </filter> - <filter-mapping> - <filter-name>filterTest</filter-name> - <url-pattern>/SimplePage.html</url-pattern> - </filter-mapping> - <listener> - <listener-class>org.jboss.testharness.impl.runner.servlet.HarnessServletListener</listener-class> - </listener> - <servlet> - <display-name>TestServlet</display-name> - <servlet-name>TestServlet</servlet-name> - <servlet-class>org.jboss.jsr299.tck.tests.context.application.TestServlet</servlet-class> - </servlet> - <servlet> - <display-name>Introspection Service for Application Context</display-name> - <servlet-name>applicationIntrospector</servlet-name> - <servlet-class>org.jboss.jsr299.tck.tests.context.application.IntrospectApplication</servlet-class> - </servlet> - <servlet-mapping> - <servlet-name>TestServlet</servlet-name> - <url-pattern>/TestServlet</url-pattern> - </servlet-mapping> - <servlet-mapping> - <servlet-name>applicationIntrospector</servlet-name> - <url-pattern>/IntrospectApplication</url-pattern> - </servlet-mapping> - <session-config> - <session-timeout>10</session-timeout> - </session-config> - <login-config> - <auth-method>BASIC</auth-method> - </login-config> + 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"> + <description>Test servlets used to test session contexts.</description> + <display-name>Session Context Tests</display-name> + <listener> + <listener-class>org.jboss.jsr299.tck.tests.context.application.TestServletContextListener</listener-class> + </listener> + <listener> + <listener-class>org.jboss.jsr299.tck.tests.context.application.TestHttpSessionListener</listener-class> + </listener> + <listener> + <listener-class>org.jboss.jsr299.tck.tests.context.application.TestServletRequestListener</listener-class> + </listener> + <filter> + <display-name>Test Filter for Sessions</display-name> + <filter-name>filterTest</filter-name> + <filter-class>org.jboss.jsr299.tck.tests.context.application.TestFilter</filter-class> + </filter> + <filter-mapping> + <filter-name>filterTest</filter-name> + <url-pattern>/SimplePage.html</url-pattern> + </filter-mapping> + <listener> + <listener-class>org.jboss.testharness.impl.runner.servlet.HarnessServletListener</listener-class> + </listener> + <servlet> + <display-name>TestServlet</display-name> + <servlet-name>TestServlet</servlet-name> + <servlet-class>org.jboss.jsr299.tck.tests.context.application.TestServlet</servlet-class> + </servlet> + <servlet> + <display-name>Introspection Service for Application Context</display-name> + <servlet-name>applicationIntrospector</servlet-name> + <servlet-class>org.jboss.jsr299.tck.tests.context.application.IntrospectApplication</servlet-class> + </servlet> + <servlet-mapping> + <servlet-name>TestServlet</servlet-name> + <url-pattern>/TestServlet</url-pattern> + </servlet-mapping> + <servlet-mapping> + <servlet-name>applicationIntrospector</servlet-name> + <url-pattern>/IntrospectApplication</url-pattern> + </servlet-mapping> + <session-config> + <session-timeout>10</session-timeout> + </session-config> + <login-config> + <auth-method>BASIC</auth-method> + </login-config> </web-app> Modified: cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/request/web.xml =================================================================== --- cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/request/web.xml 2009-11-02 20:23:37 UTC (rev 4558) +++ cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/request/web.xml 2009-11-02 20:35:04 UTC (rev 4559) @@ -1,42 +1,43 @@ <?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"> - <description>Test servlets used to test session contexts.</description> - <display-name>Session Context Tests</display-name> - <filter> - <display-name>Test Filter for Sessions</display-name> - <filter-name>filterTest</filter-name> - <filter-class>org.jboss.jsr299.tck.tests.context.request.TestFilter</filter-class> - </filter> - <filter-mapping> - <filter-name>filterTest</filter-name> - <url-pattern>/SimplePage.html</url-pattern> - </filter-mapping> - <listener> - <listener-class>org.jboss.testharness.impl.runner.servlet.HarnessServletListener</listener-class> - </listener> - <servlet> - <display-name>serviceMethod</display-name> - <servlet-name>service</servlet-name> - <servlet-class>org.jboss.jsr299.tck.tests.context.request.ServiceMethodServlet</servlet-class> - </servlet> - <servlet> - <display-name>Introspection Service for Request Context</display-name> - <servlet-name>requestIntrospector</servlet-name> - <servlet-class>org.jboss.jsr299.tck.tests.context.request.IntrospectRequestScope</servlet-class> - </servlet> - <servlet-mapping> - <servlet-name>service</servlet-name> - <url-pattern>/serviceMethodTest</url-pattern> - </servlet-mapping> - <servlet-mapping> - <servlet-name>requestIntrospector</servlet-name> - <url-pattern>/IntrospectRequest</url-pattern> - </servlet-mapping> - <session-config> - <session-timeout>10</session-timeout> - </session-config> - <login-config> - <auth-method>BASIC</auth-method> - </login-config> + 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"> + <description>Test servlets used to test session contexts.</description> + <display-name>Session Context Tests</display-name> + <filter> + <display-name>Test Filter for Sessions</display-name> + <filter-name>filterTest</filter-name> + <filter-class>org.jboss.jsr299.tck.tests.context.request.TestFilter</filter-class> + </filter> + <filter-mapping> + <filter-name>filterTest</filter-name> + <url-pattern>/SimplePage.html</url-pattern> + </filter-mapping> + <listener> + <listener-class>org.jboss.testharness.impl.runner.servlet.HarnessServletListener</listener-class> + </listener> + <servlet> + <display-name>serviceMethod</display-name> + <servlet-name>service</servlet-name> + <servlet-class>org.jboss.jsr299.tck.tests.context.request.ServiceMethodServlet</servlet-class> + </servlet> + <servlet> + <display-name>Introspection Service for Request Context</display-name> + <servlet-name>requestIntrospector</servlet-name> + <servlet-class>org.jboss.jsr299.tck.tests.context.request.IntrospectRequestScope</servlet-class> + </servlet> + <servlet-mapping> + <servlet-name>service</servlet-name> + <url-pattern>/serviceMethodTest</url-pattern> + </servlet-mapping> + <servlet-mapping> + <servlet-name>requestIntrospector</servlet-name> + <url-pattern>/IntrospectRequest</url-pattern> + </servlet-mapping> + <session-config> + <session-timeout>10</session-timeout> + </session-config> + <login-config> + <auth-method>BASIC</auth-method> + </login-config> </web-app> Modified: cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/session/web.xml =================================================================== --- cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/session/web.xml 2009-11-02 20:23:37 UTC (rev 4558) +++ cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/session/web.xml 2009-11-02 20:35:04 UTC (rev 4559) @@ -1,51 +1,52 @@ <?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"> - <description>Test servlets used to test session contexts.</description> - <display-name>Session Context Tests</display-name> - <filter> - <display-name>Test Filter for Sessions</display-name> - <filter-name>filterTest</filter-name> - <filter-class>org.jboss.jsr299.tck.tests.context.session.TestFilter</filter-class> - </filter> - <filter-mapping> - <filter-name>filterTest</filter-name> - <url-pattern>/SimplePage.html</url-pattern> - </filter-mapping> - <listener> - <listener-class>org.jboss.testharness.impl.runner.servlet.HarnessServletListener</listener-class> - </listener> - <servlet> - <display-name>serviceMethod</display-name> - <servlet-name>service</servlet-name> - <servlet-class>org.jboss.jsr299.tck.tests.context.session.ServiceMethodServlet</servlet-class> - </servlet> - <servlet> - <display-name>Introspection Service for Sessions</display-name> - <servlet-name>sessionIntrospector</servlet-name> - <servlet-class>org.jboss.jsr299.tck.tests.context.session.IntrospectSession</servlet-class> - </servlet> - <servlet> - <display-name>Session Invalidation</display-name> - <servlet-name>invalidator</servlet-name> - <servlet-class>org.jboss.jsr299.tck.tests.context.session.InvalidateSession</servlet-class> - </servlet> - <servlet-mapping> - <servlet-name>service</servlet-name> - <url-pattern>/serviceMethodTest</url-pattern> - </servlet-mapping> - <servlet-mapping> - <servlet-name>sessionIntrospector</servlet-name> - <url-pattern>/IntrospectSession</url-pattern> - </servlet-mapping> - <servlet-mapping> - <servlet-name>invalidator</servlet-name> - <url-pattern>/InvalidateSession</url-pattern> - </servlet-mapping> - <session-config> - <session-timeout>10</session-timeout> - </session-config> - <login-config> - <auth-method>BASIC</auth-method> - </login-config> + 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"> + <description>Test servlets used to test session contexts.</description> + <display-name>Session Context Tests</display-name> + <filter> + <display-name>Test Filter for Sessions</display-name> + <filter-name>filterTest</filter-name> + <filter-class>org.jboss.jsr299.tck.tests.context.session.TestFilter</filter-class> + </filter> + <filter-mapping> + <filter-name>filterTest</filter-name> + <url-pattern>/SimplePage.html</url-pattern> + </filter-mapping> + <listener> + <listener-class>org.jboss.testharness.impl.runner.servlet.HarnessServletListener</listener-class> + </listener> + <servlet> + <display-name>serviceMethod</display-name> + <servlet-name>service</servlet-name> + <servlet-class>org.jboss.jsr299.tck.tests.context.session.ServiceMethodServlet</servlet-class> + </servlet> + <servlet> + <display-name>Introspection Service for Sessions</display-name> + <servlet-name>sessionIntrospector</servlet-name> + <servlet-class>org.jboss.jsr299.tck.tests.context.session.IntrospectSession</servlet-class> + </servlet> + <servlet> + <display-name>Session Invalidation</display-name> + <servlet-name>invalidator</servlet-name> + <servlet-class>org.jboss.jsr299.tck.tests.context.session.InvalidateSession</servlet-class> + </servlet> + <servlet-mapping> + <servlet-name>service</servlet-name> + <url-pattern>/serviceMethodTest</url-pattern> + </servlet-mapping> + <servlet-mapping> + <servlet-name>sessionIntrospector</servlet-name> + <url-pattern>/IntrospectSession</url-pattern> + </servlet-mapping> + <servlet-mapping> + <servlet-name>invalidator</servlet-name> + <url-pattern>/InvalidateSession</url-pattern> + </servlet-mapping> + <session-config> + <session-timeout>10</session-timeout> + </session-config> + <login-config> + <auth-method>BASIC</auth-method> + </login-config> </web-app> Modified: cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/clientProxy/incontainer/web.xml =================================================================== --- cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/clientProxy/incontainer/web.xml 2009-11-02 20:23:37 UTC (rev 4558) +++ cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/clientProxy/incontainer/web.xml 2009-11-02 20:35:04 UTC (rev 4559) @@ -1,26 +1,26 @@ <?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> - <servlet> - <servlet-name>TestServlet</servlet-name> - <servlet-class>org.jboss.jsr299.tck.tests.lookup.clientProxy.incontainer.TestServlet</servlet-class> - <load-on-startup>1</load-on-startup> - </servlet> - <servlet> - <servlet-name>JBoss Test Harness Test Runner</servlet-name> - <servlet-class>org.jboss.testharness.impl.runner.servlet.ServletTestRunner</servlet-class> - </servlet> - <servlet-mapping> - <servlet-name>TestServlet</servlet-name> - <url-pattern>/Test/*</url-pattern> - </servlet-mapping> - <servlet-mapping> - <servlet-name>JBoss Test Harness Test Runner</servlet-name> - <url-pattern>/</url-pattern> - </servlet-mapping> - <session-config> - <session-timeout>10</session-timeout> - </session-config> + 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> + <servlet> + <servlet-name>TestServlet</servlet-name> + <servlet-class>org.jboss.jsr299.tck.tests.lookup.clientProxy.incontainer.TestServlet</servlet-class> + <load-on-startup>1</load-on-startup> + </servlet> + <servlet> + <servlet-name>JBoss Test Harness Test Runner</servlet-name> + <servlet-class>org.jboss.testharness.impl.runner.servlet.ServletTestRunner</servlet-class> + </servlet> + <servlet-mapping> + <servlet-name>TestServlet</servlet-name> + <url-pattern>/Test/*</url-pattern> + </servlet-mapping> + <servlet-mapping> + <servlet-name>JBoss Test Harness Test Runner</servlet-name> + <url-pattern>/</url-pattern> + </servlet-mapping> + <session-config> + <session-timeout>10</session-timeout> + </session-config> </web-app> Modified: cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/el/integration/web.xml =================================================================== --- cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/el/integration/web.xml 2009-11-02 20:23:37 UTC (rev 4558) +++ cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/el/integration/web.xml 2009-11-02 20:35:04 UTC (rev 4559) @@ -1,23 +1,23 @@ <?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>Integration with Unified EL Test</display-name> - <servlet> - <servlet-name>JBoss Test Harness Test Runner</servlet-name> - <servlet-class>org.jboss.testharness.impl.runner.servlet.ServletTestRunner</servlet-class> - </servlet> - <servlet> - <servlet-name>Faces Servlet</servlet-name> - <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> - <load-on-startup>1</load-on-startup> - </servlet> - <servlet-mapping> - <servlet-name>Faces Servlet</servlet-name> - <url-pattern>*.jsf</url-pattern> - </servlet-mapping> - <servlet-mapping> - <servlet-name>JBoss Test Harness Test Runner</servlet-name> - <url-pattern>/</url-pattern> - </servlet-mapping> + 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>Integration with Unified EL Test</display-name> + <servlet> + <servlet-name>JBoss Test Harness Test Runner</servlet-name> + <servlet-class>org.jboss.testharness.impl.runner.servlet.ServletTestRunner</servlet-class> + </servlet> + <servlet> + <servlet-name>Faces Servlet</servlet-name> + <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> + <load-on-startup>1</load-on-startup> + </servlet> + <servlet-mapping> + <servlet-name>Faces Servlet</servlet-name> + <url-pattern>*.jsf</url-pattern> + </servlet-mapping> + <servlet-mapping> + <servlet-name>JBoss Test Harness Test Runner</servlet-name> + <url-pattern>/</url-pattern> + </servlet-mapping> </web-app> Modified: cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/web.xml =================================================================== --- cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/web.xml 2009-11-02 20:23:37 UTC (rev 4558) +++ cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/web.xml 2009-11-02 20:35:04 UTC (rev 4559) @@ -3,6 +3,10 @@ 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.testharness.impl.runner.servlet.HarnessServletListener</listener-class> + </listener> <servlet> <servlet-name>TestWebService</servlet-name> <servlet-class>org.jboss.jsr299.tck.tests.lookup.injection.non.contextual.ws.SheepWSEndPoint</servlet-class> Modified: cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/not/bean/web.xml =================================================================== --- cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/not/bean/web.xml 2009-11-02 20:23:37 UTC (rev 4558) +++ cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/not/bean/web.xml 2009-11-02 20:35:04 UTC (rev 4559) @@ -8,6 +8,9 @@ <servlet-class>org.jboss.jsr299.tck.tests.lookup.injectionpoint.broken.not.bean.TestServlet_Broken</servlet-class> <load-on-startup>1</load-on-startup> </servlet> + <listener> + <listener-class>org.jboss.testharness.impl.runner.servlet.HarnessServletListener</listener-class> + </listener> <servlet> <servlet-name>JBoss Test Harness Test Runner</servlet-name> <servlet-class>org.jboss.testharness.impl.runner.servlet.ServletTestRunner</servlet-class>