Author: heiko.braun(a)jboss.com Date: 2007-05-29 08:45:59 -0400 (Tue, 29 May 2007) New Revision: 3278 Modified: trunk/jbossws-core/ant-import-tests/build-jars-jaxws.xml trunk/testsuite/src/resources/jaxws/samples/xop/doclit/WEB-INF/web.xml Log: Fix handlerlifecycle and mtom tests Modified: trunk/jbossws-core/ant-import-tests/build-jars-jaxws.xml =================================================================== --- trunk/jbossws-core/ant-import-tests/build-jars-jaxws.xml 2007-05-29 10:29:48 UTC (rev 3277) +++ trunk/jbossws-core/ant-import-tests/build-jars-jaxws.xml 2007-05-29 12:45:59 UTC (rev 3278) @@ -103,7 +103,13 @@ </webinf> </war> - <!-- jaxws-handlerscope --> + <jar jarfile="${tests.output.dir}/libs/jaxws-handlerlifecycle-client.jar"> + <metainf dir="${tests.output.dir}/resources/jaxws/handlerlifecycle/META-INF"> + <include name="*.xml"/> + </metainf> + </jar> + + <!-- jaxws-handlerscope --> <war warfile="${tests.output.dir}/libs/jaxws-handlerscope.war" webxml="${tests.output.dir}/resources/jaxws/handlerscope/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/handlerscope/SOAPEndpointBean.class"/> Modified: trunk/testsuite/src/resources/jaxws/samples/xop/doclit/WEB-INF/web.xml =================================================================== --- trunk/testsuite/src/resources/jaxws/samples/xop/doclit/WEB-INF/web.xml 2007-05-29 10:29:48 UTC (rev 3277) +++ trunk/testsuite/src/resources/jaxws/samples/xop/doclit/WEB-INF/web.xml 2007-05-29 12:45:59 UTC (rev 3278) @@ -1,17 +1,28 @@ <?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"> + 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>MTOMService</servlet-name> - <servlet-class>org.jboss.test.ws.jaxws.samples.xop.doclit.MTOMEndpointBean</servlet-class> - </servlet> - <servlet-mapping> - <servlet-name>MTOMService</servlet-name> - <url-pattern>/*</url-pattern> - </servlet-mapping> + <servlet> + <servlet-name>MTOMService</servlet-name> + <servlet-class>org.jboss.test.ws.jaxws.samples.xop.doclit.MTOMEndpointBean</servlet-class> + </servlet> + <servlet> + <servlet-name>WrappedService</servlet-name> + <servlet-class>org.jboss.test.ws.jaxws.samples.xop.doclit.WrappedEndpointImpl</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>MTOMService</servlet-name> + <url-pattern>/bare</url-pattern> + </servlet-mapping> + + + <servlet-mapping> + <servlet-name>WrappedService</servlet-name> + <url-pattern>/wrapped</url-pattern> + </servlet-mapping> </web-app>