[jbossws-commits] JBossWS SVN: r5454 - in stack/native/trunk/src/test/resources: jaxrpc/jbws1762/WEB-INF and 1 other directories.

Author: thomas.diesler(a)jboss.com Date: 2008-01-10 05:45:57 -0500 (Thu, 10 Jan 2008) New Revision: 5454 Modified: stack/native/trunk/src/test/resources/jaxrpc/jbws1762/WEB-INF/web.xml 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 stack/native/trunk/src/test/resources/test-excludes-jboss421.txt stack/native/trunk/src/test/resources/test-excludes-jboss422.txt Log: [JBWS-1762] web.xml modified to web.xml.org - Subsequent runs fail Modified: stack/native/trunk/src/test/resources/jaxrpc/jbws1762/WEB-INF/web.xml =================================================================== --- stack/native/trunk/src/test/resources/jaxrpc/jbws1762/WEB-INF/web.xml 2008-01-10 09:32:27 UTC (rev 5453) +++ stack/native/trunk/src/test/resources/jaxrpc/jbws1762/WEB-INF/web.xml 2008-01-10 10:45:57 UTC (rev 5454) @@ -1,15 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> -<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.jaxrpc.jbws1762.services.POJOBean</servlet-class> - </servlet> - <servlet-mapping> - <servlet-name>POJOBean</servlet-name> - <url-pattern>/POJOBean</url-pattern> - </servlet-mapping> + +<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.wsf.stack.jbws.EndpointServlet</servlet-class> + <init-param> + <param-name>jboss.ws.endpoint</param-name> + <param-value>org.jboss.test.ws.jaxrpc.jbws1762.services.POJOBean</param-value> + </init-param> + </servlet> + <servlet-mapping> + <servlet-name>POJOBean</servlet-name> + <url-pattern>/POJOBean</url-pattern> + </servlet-mapping> </web-app> 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 2008-01-10 09:32:27 UTC (rev 5453) +++ stack/native/trunk/src/test/resources/jaxws/jbws1762/WEB-INF/web.xml 2008-01-10 10:45:57 UTC (rev 5454) @@ -1,15 +1,7 @@ <?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"> +<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.wsf.stack.jbws.EndpointServlet</servlet-class> @@ -22,18 +14,4 @@ <servlet-name>POJOBean</servlet-name> <url-pattern>/POJOBean</url-pattern> </servlet-mapping> -</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--> +</web-app> \ No newline at end of file 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 2008-01-10 09:32:27 UTC (rev 5453) +++ stack/native/trunk/src/test/resources/test-excludes-jboss405.no.ejb3.txt 2008-01-10 10:45:57 UTC (rev 5454) @@ -53,6 +53,5 @@ 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), which is not possible for 4.0.5 -org/jboss/test/ws/jaxws/jbws1762/** -org/jboss/test/ws/jaxrpc/jbws1762/** +# This requires changes to the AS web meta data (servlet init params) +org/jboss/test/ws/*/jbws1762/** Modified: stack/native/trunk/src/test/resources/test-excludes-jboss405.txt =================================================================== --- stack/native/trunk/src/test/resources/test-excludes-jboss405.txt 2008-01-10 09:32:27 UTC (rev 5453) +++ stack/native/trunk/src/test/resources/test-excludes-jboss405.txt 2008-01-10 10:45:57 UTC (rev 5454) @@ -20,6 +20,5 @@ org/jboss/test/ws/jaxws/samples/jmstransport/** # [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/** -org/jboss/test/ws/jaxrpc/jbws1762/** +# This requires changes to the AS web meta data (servlet init params) +org/jboss/test/ws/*/jbws1762/** Modified: stack/native/trunk/src/test/resources/test-excludes-jboss421.txt =================================================================== --- stack/native/trunk/src/test/resources/test-excludes-jboss421.txt 2008-01-10 09:32:27 UTC (rev 5453) +++ stack/native/trunk/src/test/resources/test-excludes-jboss421.txt 2008-01-10 10:45:57 UTC (rev 5454) @@ -3,8 +3,6 @@ # EJB3/Injection excludes org/jboss/test/ws/jaxws/samples/webserviceref/** org/jboss/test/ws/jaxws/webserviceref/** -org/jboss/test/ws/jaxws/jbws1762/** -org/jboss/test/ws/jaxrpc/jbws1762/** # UsernameTokenHTTPSTestCase requires keystore & trustore in jboss-web tomcat configuration org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestCase.* @@ -15,3 +13,6 @@ # [JBWS-1911] Support the JMS transport with JAX-WS org/jboss/test/ws/jaxws/samples/jmstransport/** +# [JBWS-1762] web.xml modified to web.xml.org - Subsequent runs fail +# This requires changes to the AS web meta data (servlet init params) +org/jboss/test/ws/*/jbws1762/** Modified: stack/native/trunk/src/test/resources/test-excludes-jboss422.txt =================================================================== --- stack/native/trunk/src/test/resources/test-excludes-jboss422.txt 2008-01-10 09:32:27 UTC (rev 5453) +++ stack/native/trunk/src/test/resources/test-excludes-jboss422.txt 2008-01-10 10:45:57 UTC (rev 5454) @@ -3,8 +3,6 @@ # EJB3/Injection excludes org/jboss/test/ws/jaxws/samples/webserviceref/** org/jboss/test/ws/jaxws/webserviceref/** -org/jboss/test/ws/jaxws/jbws1762/** -org/jboss/test/ws/jaxrpc/jbws1762/** # [JBWS-1797] Setting .NET friendly Endpoint in web.xml org/jboss/test/ws/jaxws/jbws1797/** @@ -14,3 +12,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) +org/jboss/test/ws/*/jbws1762/**