Author: heiko.braun(a)jboss.com Date: 2008-01-17 04:45:29 -0500 (Thu, 17 Jan 2008) New Revision: 5486 Added: stack/native/trunk/src/test/java/org/jboss/test/ws/benchmark/jaxws/handlers.xml Removed: stack/native/trunk/src/test/resources/benchmark/jaxws/doclit/WEB-INF/handlers.xml Modified: stack/native/trunk/ant-import-tests/build-jars-jaxws.xml stack/native/trunk/src/test/java/org/jboss/test/ws/benchmark/jaxws/BenchmarkJSEHandlerEndpoint.java Log: Fix jaxws benchmark tests Modified: stack/native/trunk/ant-import-tests/build-jars-jaxws.xml =================================================================== --- stack/native/trunk/ant-import-tests/build-jars-jaxws.xml 2008-01-17 08:29:29 UTC (rev 5485) +++ stack/native/trunk/ant-import-tests/build-jars-jaxws.xml 2008-01-17 09:45:29 UTC (rev 5486) @@ -34,13 +34,11 @@ <war warfile="${tests.output.dir}/libs/jaxws-benchmark-doclit.war" webxml="${tests.output.dir}/resources/benchmark/jaxws/doclit/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/benchmark/jaxws/**/*.class"/> + <include name="org/jboss/test/ws/benchmark/jaxws/**/*.xml"/> </classes> <webinf dir="${tests.output.dir}/resources/benchmark/jaxws/doclit/WEB-INF"> <include name="wsdl/**"/> - </webinf> - <webinf dir="${tests.output.dir}/resources/benchmark/jaxws/doclit/WEB-INF"> - <include name="handlers.xml"/> - </webinf> + </webinf> </war> <war warfile="${tests.output.dir}/libs/ri-benchmark-doclit.war" webxml="${tests.output.dir}/resources/benchmark/jaxws/doclit/ri/WEB-INF/web.xml"> Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/benchmark/jaxws/BenchmarkJSEHandlerEndpoint.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/benchmark/jaxws/BenchmarkJSEHandlerEndpoint.java 2008-01-17 08:29:29 UTC (rev 5485) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/benchmark/jaxws/BenchmarkJSEHandlerEndpoint.java 2008-01-17 09:45:29 UTC (rev 5486) @@ -39,7 +39,7 @@ targetNamespace = "http://org.jboss.ws/benchmark", endpointInterface = "org.jboss.test.ws.benchmark.jaxws.doclit.BenchmarkService" ) -@HandlerChain(file = "WEB-INF/handlers.xml") +@HandlerChain(file = "handlers.xml") public class BenchmarkJSEHandlerEndpoint implements BenchmarkService { @WebMethod Copied: stack/native/trunk/src/test/java/org/jboss/test/ws/benchmark/jaxws/handlers.xml (from rev 5485, stack/native/trunk/src/test/resources/benchmark/jaxws/doclit/WEB-INF/handlers.xml) =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/benchmark/jaxws/handlers.xml (rev 0) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/benchmark/jaxws/handlers.xml 2008-01-17 09:45:29 UTC (rev 5486) @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<handler-chains xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:ns1="http://org.jboss.ws/jaxws/samples/logicalhandler" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee javaee_web_services_1_2.xsd"> + + <handler-chain> + <protocol-bindings>##SOAP11_HTTP</protocol-bindings> + <handler> + <handler-name> SOAP11ServerHandler </handler-name> + <handler-class> org.jboss.test.ws.benchmark.jaxws.ProtocolHandler </handler-class> + </handler> + </handler-chain> + +</handler-chains> \ No newline at end of file Deleted: stack/native/trunk/src/test/resources/benchmark/jaxws/doclit/WEB-INF/handlers.xml =================================================================== --- stack/native/trunk/src/test/resources/benchmark/jaxws/doclit/WEB-INF/handlers.xml 2008-01-17 08:29:29 UTC (rev 5485) +++ stack/native/trunk/src/test/resources/benchmark/jaxws/doclit/WEB-INF/handlers.xml 2008-01-17 09:45:29 UTC (rev 5486) @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<handler-chains xmlns="http://java.sun.com/xml/ns/javaee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:ns1="http://org.jboss.ws/jaxws/samples/logicalhandler" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee javaee_web_services_1_2.xsd"> - - <handler-chain> - <protocol-bindings>##SOAP11_HTTP</protocol-bindings> - <handler> - <handler-name> SOAP11ServerHandler </handler-name> - <handler-class> org.jboss.test.ws.benchmark.jaxws.ProtocolHandler </handler-class> - </handler> - </handler-chain> - -</handler-chains> \ No newline at end of file