Author: thomas.diesler(a)jboss.com Date: 2007-11-19 05:39:55 -0500 (Mon, 19 Nov 2007) New Revision: 5064 Modified: stack/native/trunk/src/test/resources/jaxws/jbws1762/META-INF/exploded/application.xml stack/native/trunk/src/test/resources/jaxws/jbws1762/META-INF/jboss-service.xml stack/native/trunk/src/test/resources/jaxws/jbws1762/META-INF/packaged/application.xml stack/native/trunk/src/test/resources/jaxws/jbws1762/WEB-INF/web.xml Log: Sync jbws-1762 resources with branch 2.0.2 Modified: stack/native/trunk/src/test/resources/jaxws/jbws1762/META-INF/exploded/application.xml =================================================================== --- stack/native/trunk/src/test/resources/jaxws/jbws1762/META-INF/exploded/application.xml 2007-11-19 09:02:45 UTC (rev 5063) +++ stack/native/trunk/src/test/resources/jaxws/jbws1762/META-INF/exploded/application.xml 2007-11-19 10:39:55 UTC (rev 5064) @@ -1,15 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> + <application 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/application_1_4.xsd" version="1.4"> + <module> <ejb>jaxws-jbws1762-exploded.jar</ejb> </module> + <module> <web> <web-uri>jaxws-jbws1762-exploded.war</web-uri> <context-root>jaxws-jbws1762</context-root> </web> </module> + </application> Modified: stack/native/trunk/src/test/resources/jaxws/jbws1762/META-INF/jboss-service.xml =================================================================== --- stack/native/trunk/src/test/resources/jaxws/jbws1762/META-INF/jboss-service.xml 2007-11-19 09:02:45 UTC (rev 5063) +++ stack/native/trunk/src/test/resources/jaxws/jbws1762/META-INF/jboss-service.xml 2007-11-19 10:39:55 UTC (rev 5064) @@ -1,3 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> + <server> </server> \ No newline at end of file Modified: stack/native/trunk/src/test/resources/jaxws/jbws1762/META-INF/packaged/application.xml =================================================================== --- stack/native/trunk/src/test/resources/jaxws/jbws1762/META-INF/packaged/application.xml 2007-11-19 09:02:45 UTC (rev 5063) +++ stack/native/trunk/src/test/resources/jaxws/jbws1762/META-INF/packaged/application.xml 2007-11-19 10:39:55 UTC (rev 5064) @@ -1,15 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> + <application 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/application_1_4.xsd" version="1.4"> + <module> <ejb>jaxws-jbws1762-packaged.jar</ejb> </module> + <module> <web> <web-uri>jaxws-jbws1762-packaged.war</web-uri> <context-root>jaxws-jbws1762</context-root> </web> </module> + </application> 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-11-19 09:02:45 UTC (rev 5063) +++ stack/native/trunk/src/test/resources/jaxws/jbws1762/WEB-INF/web.xml 2007-11-19 10:39:55 UTC (rev 5064) @@ -1,39 +1,18 @@ <?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.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-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 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>