Author: darran.lofthouse(a)jboss.com Date: 2010-07-13 07:48:59 -0400 (Tue, 13 Jul 2010) New Revision: 12638 Added: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws3071/ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws3071/JBWS3071TestCase.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws3071/StringHandler.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws3071/TestEndpoint.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws3071/TestEndpointImpl.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws3071/TestException.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws3071/ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws3071/WEB-INF/ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws3071/WEB-INF/web.xml Removed: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws3071/JBWS3071TestCase.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws3071/StringHandler.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws3071/TestEndpoint.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws3071/TestEndpointImpl.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws3071/TestException.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws3071/WEB-INF/ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws3071/WEB-INF/web.xml Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/ant-import-tests/build-jars-jaxws.xml stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/jaxws/client/ClientProxy.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/jaxws/client/ResponseImpl.java Log: [JBPAPP-4515] JAX-WS Asynchronous Client Exception issues. Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/ant-import-tests/build-jars-jaxws.xml =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/ant-import-tests/build-jars-jaxws.xml 2010-07-13 10:57:06 UTC (rev 12637) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/ant-import-tests/build-jars-jaxws.xml 2010-07-13 11:48:59 UTC (rev 12638) @@ -717,8 +717,16 @@ <webinf dir="${tests.output.dir}/resources/jaxws/jbws2845/WEB-INF"> <include name="jboss-web.xml"/> </webinf> - </war> + </war> + <!-- jaxws-jbws3071 --> + <war warfile="${tests.output.dir}/libs/jaxws-jbws3071.war" webxml="${tests.output.dir}/resources/jaxws/jbws3071/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/jbws3071/TestEndpointImpl.class" /> + <include name="org/jboss/test/ws/jaxws/jbws3071/TestException.class" /> + </classes> + </war> + <!-- jaxws namespace --> <war warfile="${tests.output.dir}/libs/jaxws-namespace.war" webxml="${tests.output.dir}/resources/jaxws/namespace/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/jaxws/client/ClientProxy.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/jaxws/client/ClientProxy.java 2010-07-13 10:57:06 UTC (rev 12637) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/jaxws/client/ClientProxy.java 2010-07-13 11:48:59 UTC (rev 12638) @@ -178,7 +178,8 @@ ResponseImpl response = new ResponseImpl(); Runnable task = new AsyncRunnable(response, null, opName, args, retType); - if(log.isDebugEnabled()) log.debug("Schedule task " + ((AsyncRunnable)task).getTaskID().toString()); + if (log.isDebugEnabled()) + log.debug("Schedule task " + ((AsyncRunnable)task).getTaskID().toString()); Future future = executor.submit(task); response.setFuture(future); @@ -253,7 +254,8 @@ Map<String, Object> resContext = response.getContext(); Object result = invoke(opName, args, retType, resContext); - if(log.isDebugEnabled()) log.debug("Finished task " + getTaskID().toString()+": " + result); + if (log.isDebugEnabled()) + log.debug("Finished task " + getTaskID().toString() + ": " + result); response.set(result); @@ -267,28 +269,35 @@ } } - // 4.18 Conformance (Failed Dispatch.invokeAsync): When an operation is invoked using an invokeAsync - // method, an implementation MUST throw a WebServiceException if there is any error in the configuration - // of the Dispatch instance. Errors that occur during the invocation are reported when the client - // attempts to retrieve the results of the operation. + // 2.3.4.5 Conformance (Asychronous fault cause): An ExecutionException that is thrown by the get method + // of Response as a result of a WSDL fault MUST have as its cause the service specific exception mapped + // from the WSDL fault, if there is one, otherwise the ProtocolException mapped from the WSDL fault. private void handleAsynInvokeException(Exception ex) { - String msg = "Cannot dispatch message"; - log.error(msg, ex); + Exception toBeWrapped = ex; + if (ex instanceof SOAPFaultException) + { + // Unwrap the cause if it is an Application Exception, otherwise use a protocol exception + Throwable cause = ex.getCause(); + if (cause instanceof Exception) + { + // Use unwrapped WebServiceException + if (cause instanceof WebServiceException) + ex = (WebServiceException)cause; - WebServiceException wsex; - if (ex instanceof WebServiceException) - { - wsex = (WebServiceException)ex; + // Use application exception if possible. + if (((cause instanceof SOAPException) == false) && ((cause instanceof RuntimeException) == false)) + { + toBeWrapped = (Exception)cause; + } + } } - else - { - wsex = new WebServiceException(msg, ex); - } - response.setException(wsex); + + response.setException(toBeWrapped); } - public UUID getTaskID() { + public UUID getTaskID() + { return uuid; } } Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/jaxws/client/ResponseImpl.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/jaxws/client/ResponseImpl.java 2010-07-13 10:57:06 UTC (rev 12637) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/jaxws/client/ResponseImpl.java 2010-07-13 11:48:59 UTC (rev 12638) @@ -44,11 +44,11 @@ { private Future delegate; private Object result; - private WebServiceException exception; + private Exception exception; private Map<String, Object> context = new HashMap<String, Object>(); - public void setException(WebServiceException ex) + public void setException(Exception ex) { this.exception = ex; } @@ -59,7 +59,16 @@ throw new IllegalStateException("Future not available"); if (exception != null) - throw exception; + { + if (exception instanceof WebServiceException) + { + throw (WebServiceException)exception; + } + else + { + throw new WebServiceException(exception); + } + } return delegate; } Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws3071 (from rev 12633, stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3071) Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws3071/JBWS3071TestCase.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3071/JBWS3071TestCase.java 2010-07-12 17:42:00 UTC (rev 12633) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws3071/JBWS3071TestCase.java 2010-07-13 11:48:59 UTC (rev 12638) @@ -1,133 +0,0 @@ -/* -* JBoss, Home of Professional Open Source. -* Copyright 2010, Red Hat Middleware LLC, and individual contributors -* as indicated by the @author tags. See the copyright.txt file in the -* distribution for a full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ -package org.jboss.test.ws.jaxws.jbws3071; - -import java.net.URL; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.Future; -import java.util.concurrent.TimeUnit; - -import javax.xml.namespace.QName; -import javax.xml.ws.Response; -import javax.xml.ws.Service; - -import junit.framework.Test; - -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestSetup; - -/** - * Test case to test JBWS-3071 for the correct - * exception mapping for async endpoints. - * - * @author darran.lofthouse(a)jboss.com - * @since 12th July 2010 - */ -public class JBWS3071TestCase extends JBossWSTest -{ - - public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws3071/"; - - private static TestEndpoint port; - - public static Test suite() throws Exception - { - return new JBossWSTestSetup(JBWS3071TestCase.class, "jaxws-jbws3071.war"); - } - - public void setUp() throws Exception - { - super.setUp(); - URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); - QName serviceName = new QName("http://ws.test.jboss.org/jbws3071";, "TestEndpointService"); - - Service service = Service.create(wsdlURL, serviceName); - port = service.getPort(TestEndpoint.class); - } - - public void testEchoSynchronous() throws Exception - { - assertEquals("Response", "Message_1", port.echo("Message_1")); - } - - public void testEchoFailSynchronous() throws Exception - { - try - { - String response = port.echo("FAIL"); - fail("Expected 'TestException' not thrown."); - } - catch (TestException ignored) - { - } - } - - public void testEchoAsyncResponse() throws Exception - { - Response<String> echoResponse = port.echoAsync("Message_2"); - String response = echoResponse.get(2, TimeUnit.SECONDS); - assertEquals("Response", "Message_2", response); - } - - public void testEchoAsyncFuture() throws Exception - { - StringHandler handler = new StringHandler(); - Future future = port.echoAsync("Message_3", handler); - future.get(2, TimeUnit.SECONDS); - Response<String> echoResponse = handler.getResponse(); - String response = echoResponse.get(2, TimeUnit.SECONDS); - assertEquals("Response", "Message_3", response); - } - - public void testEchoFailAsyncResponse() throws Exception - { - Response<String> echoResponse = port.echoAsync("FAIL"); - try - { - echoResponse.get(2, TimeUnit.SECONDS); - fail("Expected 'ExecutionException' not thrown."); - } - catch (ExecutionException ee) - { - Exception cause = (Exception)ee.getCause(); - assertEquals("Cause Type", TestException.class, cause.getClass()); - } - - } - - public void testEchoFailAsyncFuture() throws Exception - { - StringHandler handler = new StringHandler(); - Future future = port.echoAsync("FAIL", handler); - try - { - future.get(2, TimeUnit.SECONDS); - fail("Expected 'ExecutionException' not thrown."); - } - catch (ExecutionException ee) - { - Exception cause = (Exception)ee.getCause(); - assertEquals("Cause Type", TestException.class, cause.getClass()); - } - } - -} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws3071/JBWS3071TestCase.java (from rev 12633, stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3071/JBWS3071TestCase.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws3071/JBWS3071TestCase.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws3071/JBWS3071TestCase.java 2010-07-13 11:48:59 UTC (rev 12638) @@ -0,0 +1,133 @@ +/* +* JBoss, Home of Professional Open Source. +* Copyright 2010, Red Hat Middleware LLC, and individual contributors +* as indicated by the @author tags. See the copyright.txt file in the +* distribution for a full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ +package org.jboss.test.ws.jaxws.jbws3071; + +import java.net.URL; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.Future; +import java.util.concurrent.TimeUnit; + +import javax.xml.namespace.QName; +import javax.xml.ws.Response; +import javax.xml.ws.Service; + +import junit.framework.Test; + +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * Test case to test JBWS-3071 for the correct + * exception mapping for async endpoints. + * + * @author darran.lofthouse(a)jboss.com + * @since 12th July 2010 + */ +public class JBWS3071TestCase extends JBossWSTest +{ + + public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws3071/"; + + private static TestEndpoint port; + + public static Test suite() throws Exception + { + return new JBossWSTestSetup(JBWS3071TestCase.class, "jaxws-jbws3071.war"); + } + + public void setUp() throws Exception + { + super.setUp(); + URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); + QName serviceName = new QName("http://ws.test.jboss.org/jbws3071";, "TestEndpointService"); + + Service service = Service.create(wsdlURL, serviceName); + port = service.getPort(TestEndpoint.class); + } + + public void testEchoSynchronous() throws Exception + { + assertEquals("Response", "Message_1", port.echo("Message_1")); + } + + public void testEchoFailSynchronous() throws Exception + { + try + { + String response = port.echo("FAIL"); + fail("Expected 'TestException' not thrown."); + } + catch (TestException ignored) + { + } + } + + public void testEchoAsyncResponse() throws Exception + { + Response<String> echoResponse = port.echoAsync("Message_2"); + String response = echoResponse.get(2, TimeUnit.SECONDS); + assertEquals("Response", "Message_2", response); + } + + public void testEchoAsyncFuture() throws Exception + { + StringHandler handler = new StringHandler(); + Future future = port.echoAsync("Message_3", handler); + future.get(2, TimeUnit.SECONDS); + Response<String> echoResponse = handler.getResponse(); + String response = echoResponse.get(2, TimeUnit.SECONDS); + assertEquals("Response", "Message_3", response); + } + + public void testEchoFailAsyncResponse() throws Exception + { + Response<String> echoResponse = port.echoAsync("FAIL"); + try + { + echoResponse.get(2, TimeUnit.SECONDS); + fail("Expected 'ExecutionException' not thrown."); + } + catch (ExecutionException ee) + { + Exception cause = (Exception)ee.getCause(); + assertEquals("Cause Type", TestException.class, cause.getClass()); + } + + } + + public void testEchoFailAsyncFuture() throws Exception + { + StringHandler handler = new StringHandler(); + Future future = port.echoAsync("FAIL", handler); + try + { + future.get(2, TimeUnit.SECONDS); + fail("Expected 'ExecutionException' not thrown."); + } + catch (ExecutionException ee) + { + Exception cause = (Exception)ee.getCause(); + assertEquals("Cause Type", TestException.class, cause.getClass()); + } + } + +} Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws3071/StringHandler.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3071/StringHandler.java 2010-07-12 17:42:00 UTC (rev 12633) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws3071/StringHandler.java 2010-07-13 11:48:59 UTC (rev 12638) @@ -1,47 +0,0 @@ -/* -* JBoss, Home of Professional Open Source. -* Copyright 2010, Red Hat Middleware LLC, and individual contributors -* as indicated by the @author tags. See the copyright.txt file in the -* distribution for a full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ -package org.jboss.test.ws.jaxws.jbws3071; - -import javax.xml.ws.AsyncHandler; -import javax.xml.ws.Response; - -/** - * @author darran.lofthouse(a)jboss.com - * @since 12th July 2010 - */ -public class StringHandler implements AsyncHandler<String> -{ - - private Response<String> response; - - @Override - public void handleResponse(Response<String> res) - { - this.response = res; - } - - public Response<String> getResponse() - { - return response; - } - -} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws3071/StringHandler.java (from rev 12633, stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3071/StringHandler.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws3071/StringHandler.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws3071/StringHandler.java 2010-07-13 11:48:59 UTC (rev 12638) @@ -0,0 +1,46 @@ +/* +* JBoss, Home of Professional Open Source. +* Copyright 2010, Red Hat Middleware LLC, and individual contributors +* as indicated by the @author tags. See the copyright.txt file in the +* distribution for a full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ +package org.jboss.test.ws.jaxws.jbws3071; + +import javax.xml.ws.AsyncHandler; +import javax.xml.ws.Response; + +/** + * @author darran.lofthouse(a)jboss.com + * @since 12th July 2010 + */ +public class StringHandler implements AsyncHandler<String> +{ + + private Response<String> response; + + public void handleResponse(Response<String> res) + { + this.response = res; + } + + public Response<String> getResponse() + { + return response; + } + +} Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws3071/TestEndpoint.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3071/TestEndpoint.java 2010-07-12 17:42:00 UTC (rev 12633) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws3071/TestEndpoint.java 2010-07-13 11:48:59 UTC (rev 12638) @@ -1,49 +0,0 @@ -/* -* JBoss, Home of Professional Open Source. -* Copyright 2010, Red Hat Middleware LLC, and individual contributors -* as indicated by the @author tags. See the copyright.txt file in the -* distribution for a full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ -package org.jboss.test.ws.jaxws.jbws3071; - -import java.util.concurrent.Future; - -import javax.jws.WebMethod; -import javax.jws.WebService; -import javax.xml.ws.AsyncHandler; -import javax.xml.ws.Response; - -/** - * - * @author darran.lofthouse(a)jboss.com - * @since 12th July 2010 - */ -@WebService(name = "TestEndpoint", serviceName = "TestEndpointService", targetNamespace = "http://ws.test.jboss.org/jbws3071") -public interface TestEndpoint -{ - - @WebMethod(operationName = "echo") - public String echo(String message) throws TestException; - - @WebMethod(operationName = "echo") - public Response<String> echoAsync(String message) throws TestException; - - @WebMethod(operationName = "echo") - public Future<?> echoAsync(String message, AsyncHandler<String> handler) throws TestException; - -} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws3071/TestEndpoint.java (from rev 12633, stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3071/TestEndpoint.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws3071/TestEndpoint.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws3071/TestEndpoint.java 2010-07-13 11:48:59 UTC (rev 12638) @@ -0,0 +1,49 @@ +/* +* JBoss, Home of Professional Open Source. +* Copyright 2010, Red Hat Middleware LLC, and individual contributors +* as indicated by the @author tags. See the copyright.txt file in the +* distribution for a full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ +package org.jboss.test.ws.jaxws.jbws3071; + +import java.util.concurrent.Future; + +import javax.jws.WebMethod; +import javax.jws.WebService; +import javax.xml.ws.AsyncHandler; +import javax.xml.ws.Response; + +/** + * + * @author darran.lofthouse(a)jboss.com + * @since 12th July 2010 + */ +@WebService(name = "TestEndpoint", serviceName = "TestEndpointService", targetNamespace = "http://ws.test.jboss.org/jbws3071") +public interface TestEndpoint +{ + + @WebMethod(operationName = "echo") + public String echo(String message) throws TestException; + + @WebMethod(operationName = "echo") + public Response<String> echoAsync(String message) throws TestException; + + @WebMethod(operationName = "echo") + public Future<?> echoAsync(String message, AsyncHandler<String> handler) throws TestException; + +} Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws3071/TestEndpointImpl.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3071/TestEndpointImpl.java 2010-07-12 17:42:00 UTC (rev 12633) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws3071/TestEndpointImpl.java 2010-07-13 11:48:59 UTC (rev 12638) @@ -1,45 +0,0 @@ -/* -* JBoss, Home of Professional Open Source. -* Copyright 2010, Red Hat Middleware LLC, and individual contributors -* as indicated by the @author tags. See the copyright.txt file in the -* distribution for a full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ -package org.jboss.test.ws.jaxws.jbws3071; - -import javax.jws.WebService; - -/** - * - * @author darran.lofthouse(a)jboss.com - * @since 12th July 2010 - */ -@WebService(name = "TestEndpoint", serviceName = "TestEndpointService", targetNamespace = "http://ws.test.jboss.org/jbws3071") -public class TestEndpointImpl -{ - - public String echo(String message) throws TestException - { - if ("FAIL".equals(message)) - { - throw new TestException(message); - } - - return message; - } - -} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws3071/TestEndpointImpl.java (from rev 12633, stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3071/TestEndpointImpl.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws3071/TestEndpointImpl.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws3071/TestEndpointImpl.java 2010-07-13 11:48:59 UTC (rev 12638) @@ -0,0 +1,45 @@ +/* +* JBoss, Home of Professional Open Source. +* Copyright 2010, Red Hat Middleware LLC, and individual contributors +* as indicated by the @author tags. See the copyright.txt file in the +* distribution for a full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ +package org.jboss.test.ws.jaxws.jbws3071; + +import javax.jws.WebService; + +/** + * + * @author darran.lofthouse(a)jboss.com + * @since 12th July 2010 + */ +@WebService(name = "TestEndpoint", serviceName = "TestEndpointService", targetNamespace = "http://ws.test.jboss.org/jbws3071") +public class TestEndpointImpl +{ + + public String echo(String message) throws TestException + { + if ("FAIL".equals(message)) + { + throw new TestException(message); + } + + return message; + } + +} Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws3071/TestException.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3071/TestException.java 2010-07-12 17:42:00 UTC (rev 12633) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws3071/TestException.java 2010-07-13 11:48:59 UTC (rev 12638) @@ -1,37 +0,0 @@ -/* -* JBoss, Home of Professional Open Source. -* Copyright 2010, Red Hat Middleware LLC, and individual contributors -* as indicated by the @author tags. See the copyright.txt file in the -* distribution for a full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ -package org.jboss.test.ws.jaxws.jbws3071; - -/** - * - * @author darran.lofthouse(a)jboss.com - * @since 12th July 2010 - */ -public class TestException extends Exception -{ - - public TestException(String message) - { - super(message); - } - -} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws3071/TestException.java (from rev 12633, stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3071/TestException.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws3071/TestException.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws3071/TestException.java 2010-07-13 11:48:59 UTC (rev 12638) @@ -0,0 +1,37 @@ +/* +* JBoss, Home of Professional Open Source. +* Copyright 2010, Red Hat Middleware LLC, and individual contributors +* as indicated by the @author tags. See the copyright.txt file in the +* distribution for a full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ +package org.jboss.test.ws.jaxws.jbws3071; + +/** + * + * @author darran.lofthouse(a)jboss.com + * @since 12th July 2010 + */ +public class TestException extends Exception +{ + + public TestException(String message) + { + super(message); + } + +} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws3071 (from rev 12633, stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3071) Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws3071/WEB-INF (from rev 12633, stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3071/WEB-INF) Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws3071/WEB-INF/web.xml =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3071/WEB-INF/web.xml 2010-07-12 17:42:00 UTC (rev 12633) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws3071/WEB-INF/web.xml 2010-07-13 11:48:59 UTC (rev 12638) @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<web-app version="2.4" 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"> - - <servlet> - <servlet-name>TestEndpoint</servlet-name> - <servlet-class>org.jboss.test.ws.jaxws.jbws3071.TestEndpointImpl</servlet-class> - </servlet> - - <servlet-mapping> - <servlet-name>TestEndpoint</servlet-name> - <url-pattern>/*</url-pattern> - </servlet-mapping> - -</web-app> \ No newline at end of file Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws3071/WEB-INF/web.xml (from rev 12633, stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3071/WEB-INF/web.xml) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws3071/WEB-INF/web.xml (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws3071/WEB-INF/web.xml 2010-07-13 11:48:59 UTC (rev 12638) @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<web-app version="2.4" 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"> + + <servlet> + <servlet-name>TestEndpoint</servlet-name> + <servlet-class>org.jboss.test.ws.jaxws.jbws3071.TestEndpointImpl</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>TestEndpoint</servlet-name> + <url-pattern>/*</url-pattern> + </servlet-mapping> + +</web-app> \ No newline at end of file