Author: heiko.braun(a)jboss.com Date: 2007-12-17 10:49:12 -0500 (Mon, 17 Dec 2007) New Revision: 5337 Modified: stack/native/trunk/src/test/resources/jaxws/jbws1762/WEB-INF/web.xml stack/native/trunk/src/test/resources/test-excludes-jboss405.no.ejb3.txt stack/native/trunk/src/test/resources/test-excludes-jboss405.txt Log: JBWS1762, reconstitute test scenario. Exclude tests for 4.0.5 Modified: stack/native/trunk/src/test/resources/jaxws/jbws1762/WEB-INF/web.xml =================================================================== --- stack/native/trunk/src/test/resources/jaxws/jbws1762/WEB-INF/web.xml 2007-12-17 15:42:15 UTC (rev 5336) +++ stack/native/trunk/src/test/resources/jaxws/jbws1762/WEB-INF/web.xml 2007-12-17 15:49:12 UTC (rev 5337) @@ -1,18 +1,39 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!-- + Rewriting the web.xml produces the following web.xml from the one listed below. + The *JSEDeployerHook's cannot identify those and thus reject the deployment. + --> + <web-app xmlns="http://java.sun.com/xml/ns/j2ee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" - version="2.4"> - + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" + version="2.4"> <servlet> <servlet-name>POJOBean</servlet-name> - <servlet-class>org.jboss.test.ws.jaxws.jbws1762.services.POJOBean</servlet-class> + <servlet-class>org.jboss.wsf.stack.jbws.EndpointServlet</servlet-class> + <init-param> + <param-name>jboss.ws.endpoint</param-name> + <param-value>org.jboss.test.ws.jaxws.jbws1762.services.POJOBean</param-value> + </init-param> </servlet> - <servlet-mapping> <servlet-name>POJOBean</servlet-name> <url-pattern>/POJOBean</url-pattern> </servlet-mapping> +</web-app> -</web-app> +<!--web-app xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" + version="2.4"> + <servlet> + <servlet-name>POJOBean</servlet-name> + <servlet-class>org.jboss.test.ws.jaxws.jbws1762.services.POJOBean</servlet-class> + </servlet> + <servlet-mapping> + <servlet-name>POJOBean</servlet-name> + <url-pattern>/POJOBean</url-pattern> + </servlet-mapping> +</web-app--> Modified: stack/native/trunk/src/test/resources/test-excludes-jboss405.no.ejb3.txt =================================================================== --- stack/native/trunk/src/test/resources/test-excludes-jboss405.no.ejb3.txt 2007-12-17 15:42:15 UTC (rev 5336) +++ stack/native/trunk/src/test/resources/test-excludes-jboss405.no.ejb3.txt 2007-12-17 15:49:12 UTC (rev 5337) @@ -67,3 +67,7 @@ # [JBWS-1797] Setting .NET friendly Endpoint in web.xml org/jboss/test/ws/jaxws/jbws1797/** + +# [JBWS-1762] web.xml modified to web.xml.org - Subsequent runs fail +# This requires changes to the AS web meta data (servlet init params), whic is not possible for 4.0.5 +org/jboss/test/ws/jaxws/jbws1762/** Modified: stack/native/trunk/src/test/resources/test-excludes-jboss405.txt =================================================================== --- stack/native/trunk/src/test/resources/test-excludes-jboss405.txt 2007-12-17 15:42:15 UTC (rev 5336) +++ stack/native/trunk/src/test/resources/test-excludes-jboss405.txt 2007-12-17 15:49:12 UTC (rev 5337) @@ -15,3 +15,7 @@ # UsernameTokenHTTPSTestCase requires keystore & trustore in jboss-web tomcat configuration org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestCase.* + +# [JBWS-1762] web.xml modified to web.xml.org - Subsequent runs fail +# This requires changes to the AS web meta data (servlet init params), whic is not possible for 4.0.5 +org/jboss/test/ws/jaxws/jbws1762/**