JBossWS SVN: r12645 - in common/branches/jbossws-common-1.1.0.SP2_CP01_JBPAPP-4647: src/main/java/org/jboss/wsf/common and 1 other directory.
by jbossws-commits@lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2010-07-14 10:02:11 -0400 (Wed, 14 Jul 2010)
New Revision: 12645
Modified:
common/branches/jbossws-common-1.1.0.SP2_CP01_JBPAPP-4647/pom.xml
common/branches/jbossws-common-1.1.0.SP2_CP01_JBPAPP-4647/src/main/java/org/jboss/wsf/common/DOMUtils.java
Log:
[JBPAPP-4647] Set disable external entity resolve
Modified: common/branches/jbossws-common-1.1.0.SP2_CP01_JBPAPP-4647/pom.xml
===================================================================
--- common/branches/jbossws-common-1.1.0.SP2_CP01_JBPAPP-4647/pom.xml 2010-07-14 13:35:43 UTC (rev 12644)
+++ common/branches/jbossws-common-1.1.0.SP2_CP01_JBPAPP-4647/pom.xml 2010-07-14 14:02:11 UTC (rev 12645)
@@ -8,7 +8,7 @@
<artifactId>jbossws-common</artifactId>
<packaging>jar</packaging>
- <version>1.1.0.SP2_CP01</version>
+ <version>1.1.0.SP2_CP01_JBPAPP-4647</version>
<!-- Parent -->
<parent>
Modified: common/branches/jbossws-common-1.1.0.SP2_CP01_JBPAPP-4647/src/main/java/org/jboss/wsf/common/DOMUtils.java
===================================================================
--- common/branches/jbossws-common-1.1.0.SP2_CP01_JBPAPP-4647/src/main/java/org/jboss/wsf/common/DOMUtils.java 2010-07-14 13:35:43 UTC (rev 12644)
+++ common/branches/jbossws-common-1.1.0.SP2_CP01_JBPAPP-4647/src/main/java/org/jboss/wsf/common/DOMUtils.java 2010-07-14 14:02:11 UTC (rev 12645)
@@ -83,6 +83,7 @@
factory = JBossWSDocumentBuilderFactory.newInstance();
factory.setValidating(false);
factory.setNamespaceAware(true);
+ factory.setExpandEntityReferences(false);
try
{
15 years, 9 months
JBossWS SVN: r12644 - common/branches.
by jbossws-commits@lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2010-07-14 09:35:43 -0400 (Wed, 14 Jul 2010)
New Revision: 12644
Added:
common/branches/jbossws-common-1.1.0.SP2_CP01_JBPAPP-4647/
Log:
[JBPAPP-4647] Branch for patch.
Copied: common/branches/jbossws-common-1.1.0.SP2_CP01_JBPAPP-4647 (from rev 12643, common/tags/jbossws-common-1.1.0.SP2_CP01)
15 years, 9 months
JBossWS SVN: r12643 - common/branches/jbossws-common-1.0.0.GA_CP/src/main/java/org/jboss/wsf/common.
by jbossws-commits@lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2010-07-14 09:14:32 -0400 (Wed, 14 Jul 2010)
New Revision: 12643
Modified:
common/branches/jbossws-common-1.0.0.GA_CP/src/main/java/org/jboss/wsf/common/DOMUtils.java
Log:
[JBPAPP-4646] Disable XML external entity resolver.
Modified: common/branches/jbossws-common-1.0.0.GA_CP/src/main/java/org/jboss/wsf/common/DOMUtils.java
===================================================================
--- common/branches/jbossws-common-1.0.0.GA_CP/src/main/java/org/jboss/wsf/common/DOMUtils.java 2010-07-14 12:15:47 UTC (rev 12642)
+++ common/branches/jbossws-common-1.0.0.GA_CP/src/main/java/org/jboss/wsf/common/DOMUtils.java 2010-07-14 13:14:32 UTC (rev 12643)
@@ -85,6 +85,7 @@
DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
factory.setValidating(false);
factory.setNamespaceAware(true);
+ factory.setExpandEntityReferences(false);
try
{
15 years, 9 months
JBossWS SVN: r12642 - stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/jaxws/client.
by jbossws-commits@lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2010-07-14 08:15:47 -0400 (Wed, 14 Jul 2010)
New Revision: 12642
Modified:
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/jaxws/client/ResponseImpl.java
Log:
[JBPAPP-4515] Corrected race condition regarding type of exception thrown from calls to get
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-14 12:12:17 UTC (rev 12641)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/jaxws/client/ResponseImpl.java 2010-07-14 12:15:47 UTC (rev 12642)
@@ -72,6 +72,20 @@
return delegate;
}
+
+ /*
+ * The get methods are required to throw any returned Exception as an
+ * ExecutionException so use this internal getFuture instead to avoid
+ * wrapping the exception with WebServiceException which is a
+ * RuntimeException.
+ */
+ private Future getFutureInternal()
+ {
+ if (delegate == null)
+ throw new IllegalStateException("Future not available");
+
+ return delegate;
+ }
public void setFuture(Future delegate)
{
@@ -97,7 +111,7 @@
{
if (result == null)
{
- getFuture().get();
+ getFutureInternal().get();
}
if (exception != null)
@@ -110,7 +124,7 @@
{
if (result == null)
{
- getFuture().get(timeout, unit);
+ getFutureInternal().get(timeout, unit);
}
if (exception != null)
15 years, 9 months
JBossWS SVN: r12641 - stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-4610/modules/core/src/main/java/org/jboss/ws/core/jaxws/client.
by jbossws-commits@lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2010-07-14 08:12:17 -0400 (Wed, 14 Jul 2010)
New Revision: 12641
Modified:
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-4610/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ResponseImpl.java
Log:
[JBPAPP-4610] Corrected race condition regarding type of exception thrown from calls to get
Modified: stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-4610/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ResponseImpl.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-4610/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ResponseImpl.java 2010-07-14 12:09:20 UTC (rev 12640)
+++ stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-4610/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ResponseImpl.java 2010-07-14 12:12:17 UTC (rev 12641)
@@ -70,6 +70,20 @@
return delegate;
}
+
+ /*
+ * The get methods are required to throw any returned Exception as an
+ * ExecutionException so use this internal getFuture instead to avoid
+ * wrapping the exception with WebServiceException which is a
+ * RuntimeException.
+ */
+ private Future getFutureInternal()
+ {
+ if (delegate == null)
+ throw new IllegalStateException("Future not available");
+
+ return delegate;
+ }
public void setFuture(Future delegate)
{
@@ -95,7 +109,7 @@
{
if (result == null)
{
- getFuture().get();
+ getFutureInternal().get();
}
if (exception != null)
@@ -108,7 +122,7 @@
{
if (result == null)
{
- getFuture().get(timeout, unit);
+ getFutureInternal().get(timeout, unit);
}
if (exception != null)
15 years, 9 months
JBossWS SVN: r12640 - stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/jaxws/client.
by jbossws-commits@lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2010-07-14 08:09:20 -0400 (Wed, 14 Jul 2010)
New Revision: 12640
Modified:
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ResponseImpl.java
Log:
[JBPAPP-4515] Corrected race condition regarding type of exception thrown from calls to get
Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ResponseImpl.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ResponseImpl.java 2010-07-14 12:04:06 UTC (rev 12639)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ResponseImpl.java 2010-07-14 12:09:20 UTC (rev 12640)
@@ -70,6 +70,20 @@
return delegate;
}
+
+ /*
+ * The get methods are required to throw any returned Exception as an
+ * ExecutionException so use this internal getFuture instead to avoid
+ * wrapping the exception with WebServiceException which is a
+ * RuntimeException.
+ */
+ private Future getFutureInternal()
+ {
+ if (delegate == null)
+ throw new IllegalStateException("Future not available");
+
+ return delegate;
+ }
public void setFuture(Future delegate)
{
@@ -95,7 +109,7 @@
{
if (result == null)
{
- getFuture().get();
+ getFutureInternal().get();
}
if (exception != null)
@@ -108,7 +122,7 @@
{
if (result == null)
{
- getFuture().get(timeout, unit);
+ getFutureInternal().get(timeout, unit);
}
if (exception != null)
15 years, 9 months
JBossWS SVN: r12639 - stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client.
by jbossws-commits@lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2010-07-14 08:04:06 -0400 (Wed, 14 Jul 2010)
New Revision: 12639
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ResponseImpl.java
Log:
[JBWS-3071] Corrected race condition regarding type of exception thrown from calls to get
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ResponseImpl.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ResponseImpl.java 2010-07-13 11:48:59 UTC (rev 12638)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ResponseImpl.java 2010-07-14 12:04:06 UTC (rev 12639)
@@ -70,6 +70,20 @@
return delegate;
}
+
+ /*
+ * The get methods are required to throw any returned Exception as an
+ * ExecutionException so use this internal getFuture instead to avoid
+ * wrapping the exception with WebServiceException which is a
+ * RuntimeException.
+ */
+ private Future getFutureInternal()
+ {
+ if (delegate == null)
+ throw new IllegalStateException("Future not available");
+
+ return delegate;
+ }
public void setFuture(Future delegate)
{
@@ -95,7 +109,7 @@
{
if (result == null)
{
- getFuture().get();
+ getFutureInternal().get();
}
if (exception != null)
@@ -108,7 +122,7 @@
{
if (result == null)
{
- getFuture().get(timeout, unit);
+ getFutureInternal().get(timeout, unit);
}
if (exception != null)
15 years, 9 months
JBossWS SVN: r12638 - in stack/native/branches/jbossws-native-2.0.1.SP2_CP: src/main/java/org/jboss/ws/core/jaxws/client and 5 other directories.
by jbossws-commits@lists.jboss.org
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
15 years, 9 months
JBossWS SVN: r12637 - in stack/cxf/trunk/modules: endorsed and 7 other directories.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-07-13 06:57:06 -0400 (Tue, 13 Jul 2010)
New Revision: 12637
Modified:
stack/cxf/trunk/modules/client/
stack/cxf/trunk/modules/endorsed/
stack/cxf/trunk/modules/management/
stack/cxf/trunk/modules/resources/
stack/cxf/trunk/modules/server/
stack/cxf/trunk/modules/testsuite/
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/
stack/cxf/trunk/modules/testsuite/cxf-tests/
stack/cxf/trunk/modules/testsuite/framework-tests/
Log:
updating svn:ignores
Property changes on: stack/cxf/trunk/modules/client
___________________________________________________________________
Name: svn:ignore
- target
+ target
.classpath
.project
.settings
Property changes on: stack/cxf/trunk/modules/endorsed
___________________________________________________________________
Name: svn:ignore
- target
+ target
.classpath
.project
.settings
Property changes on: stack/cxf/trunk/modules/management
___________________________________________________________________
Name: svn:ignore
- target
+ target
.classpath
.project
.settings
Property changes on: stack/cxf/trunk/modules/resources
___________________________________________________________________
Name: svn:ignore
- target
+ target
.classpath
.project
.settings
Property changes on: stack/cxf/trunk/modules/server
___________________________________________________________________
Name: svn:ignore
- target
+ target
.classpath
.project
.settings
Property changes on: stack/cxf/trunk/modules/testsuite
___________________________________________________________________
Name: svn:ignore
- target
+ target
.classpath
.project
.settings
Property changes on: stack/cxf/trunk/modules/testsuite/cxf-spring-tests
___________________________________________________________________
Name: svn:ignore
- target
+ target
.classpath
.project
.settings
Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests
___________________________________________________________________
Name: svn:ignore
- target
+ target
.classpath
.project
.settings
Property changes on: stack/cxf/trunk/modules/testsuite/framework-tests
___________________________________________________________________
Name: svn:ignore
- target
org
transaction.log
+ target
.classpath
.project
.settings
org
transaction.log
15 years, 9 months
JBossWS SVN: r12636 - in stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-4610/modules: core/src/main/java/org/jboss/ws/core/jaxws/client and 6 other directories.
by jbossws-commits@lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2010-07-12 16:28:36 -0400 (Mon, 12 Jul 2010)
New Revision: 12636
Added:
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-4610/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3071/
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-4610/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3071/JBWS3071TestCase.java
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-4610/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3071/StringHandler.java
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-4610/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3071/TestEndpoint.java
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-4610/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3071/TestEndpointImpl.java
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-4610/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3071/TestException.java
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-4610/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3071/
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-4610/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3071/WEB-INF/
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-4610/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3071/WEB-INF/web.xml
Removed:
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-4610/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3071/JBWS3071TestCase.java
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-4610/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3071/StringHandler.java
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-4610/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3071/TestEndpoint.java
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-4610/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3071/TestEndpointImpl.java
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-4610/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3071/TestException.java
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-4610/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3071/WEB-INF/
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-4610/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3071/WEB-INF/web.xml
Modified:
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-4610/modules/core/pom.xml
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-4610/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientProxy.java
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-4610/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ResponseImpl.java
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-4610/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml
Log:
[JBPAPP-4610] JAX-WS Asynchronous Client Exception issues.
Modified: stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-4610/modules/core/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-4610/modules/core/pom.xml 2010-07-12 20:27:39 UTC (rev 12635)
+++ stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-4610/modules/core/pom.xml 2010-07-12 20:28:36 UTC (rev 12636)
@@ -127,6 +127,16 @@
<artifactId>jaxws-rt</artifactId>
</dependency>
<dependency>
+ <groupId>com.sun.xml.stream.buffer</groupId>
+ <artifactId>streambuffer</artifactId>
+ <version>0.9</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jvnet.staxex</groupId>
+ <artifactId>stax-ex</artifactId>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
<groupId>com.sun.xml.ws</groupId>
<artifactId>jaxws-tools</artifactId>
</dependency>
Modified: stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-4610/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientProxy.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-4610/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientProxy.java 2010-07-12 20:27:39 UTC (rev 12635)
+++ stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-4610/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientProxy.java 2010-07-12 20:28:36 UTC (rev 12636)
@@ -158,7 +158,7 @@
}
private Object invoke(QName opName, Object[] args, Class retType, Map<String, Object> resContext) throws RemoteException
- {
+ {
Object retObj = client.invoke(opName, args, resContext);
if (retObj != null)
{
@@ -176,7 +176,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);
@@ -251,7 +252,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);
@@ -265,28 +267,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-3.1.2.SP3-patch-02_JBPAPP-4610/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ResponseImpl.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-4610/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ResponseImpl.java 2010-07-12 20:27:39 UTC (rev 12635)
+++ stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-4610/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ResponseImpl.java 2010-07-12 20:28:36 UTC (rev 12636)
@@ -42,11 +42,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;
}
@@ -57,7 +57,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;
}
Modified: stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-4610/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-4610/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2010-07-12 20:27:39 UTC (rev 12635)
+++ stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-4610/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2010-07-12 20:28:36 UTC (rev 12636)
@@ -570,8 +570,16 @@
<webinf dir="${tests.output.dir}/test-resources/jaxws/jbws2698/WEB-INF">
<include name="jboss-web.xml"/>
</webinf>
- </war>
+ </war>
+ <!-- jaxws-jbws3071 -->
+ <war warfile="${tests.output.dir}/test-libs/jaxws-jbws3071.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws3071/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/jbws3071/TestEndpointImpl.class" />
+ <include name="org/jboss/test/ws/jaxws/jbws3071/TestException.class" />
+ </classes>
+ </war>
+
<!-- jaxws-webserviceref -->
<war warfile="${tests.output.dir}/test-libs/jaxws-webserviceref.war" webxml="${tests.output.dir}/test-resources/jaxws/webserviceref/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
Copied: stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-4610/modules/testsuite/native-tests/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-3.1.2.SP3-patch-02_JBPAPP-4610/modules/testsuite/native-tests/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-3.1.2.SP3-patch-02_JBPAPP-4610/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3071/JBWS3071TestCase.java 2010-07-12 20:28:36 UTC (rev 12636)
@@ -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-3.1.2.SP3-patch-02_JBPAPP-4610/modules/testsuite/native-tests/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-3.1.2.SP3-patch-02_JBPAPP-4610/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3071/JBWS3071TestCase.java (rev 0)
+++ stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-4610/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3071/JBWS3071TestCase.java 2010-07-12 20:28:36 UTC (rev 12636)
@@ -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-3.1.2.SP3-patch-02_JBPAPP-4610/modules/testsuite/native-tests/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-3.1.2.SP3-patch-02_JBPAPP-4610/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3071/StringHandler.java 2010-07-12 20:28:36 UTC (rev 12636)
@@ -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-3.1.2.SP3-patch-02_JBPAPP-4610/modules/testsuite/native-tests/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-3.1.2.SP3-patch-02_JBPAPP-4610/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3071/StringHandler.java (rev 0)
+++ stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-4610/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3071/StringHandler.java 2010-07-12 20:28:36 UTC (rev 12636)
@@ -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-3.1.2.SP3-patch-02_JBPAPP-4610/modules/testsuite/native-tests/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-3.1.2.SP3-patch-02_JBPAPP-4610/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3071/TestEndpoint.java 2010-07-12 20:28:36 UTC (rev 12636)
@@ -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-3.1.2.SP3-patch-02_JBPAPP-4610/modules/testsuite/native-tests/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-3.1.2.SP3-patch-02_JBPAPP-4610/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3071/TestEndpoint.java (rev 0)
+++ stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-4610/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3071/TestEndpoint.java 2010-07-12 20:28:36 UTC (rev 12636)
@@ -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-3.1.2.SP3-patch-02_JBPAPP-4610/modules/testsuite/native-tests/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-3.1.2.SP3-patch-02_JBPAPP-4610/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3071/TestEndpointImpl.java 2010-07-12 20:28:36 UTC (rev 12636)
@@ -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-3.1.2.SP3-patch-02_JBPAPP-4610/modules/testsuite/native-tests/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-3.1.2.SP3-patch-02_JBPAPP-4610/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3071/TestEndpointImpl.java (rev 0)
+++ stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-4610/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3071/TestEndpointImpl.java 2010-07-12 20:28:36 UTC (rev 12636)
@@ -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-3.1.2.SP3-patch-02_JBPAPP-4610/modules/testsuite/native-tests/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-3.1.2.SP3-patch-02_JBPAPP-4610/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3071/TestException.java 2010-07-12 20:28:36 UTC (rev 12636)
@@ -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-3.1.2.SP3-patch-02_JBPAPP-4610/modules/testsuite/native-tests/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-3.1.2.SP3-patch-02_JBPAPP-4610/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3071/TestException.java (rev 0)
+++ stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-4610/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3071/TestException.java 2010-07-12 20:28:36 UTC (rev 12636)
@@ -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-3.1.2.SP3-patch-02_JBPAPP-4610/modules/testsuite/native-tests/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-3.1.2.SP3-patch-02_JBPAPP-4610/modules/testsuite/native-tests/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-3.1.2.SP3-patch-02_JBPAPP-4610/modules/testsuite/native-tests/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-3.1.2.SP3-patch-02_JBPAPP-4610/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3071/WEB-INF/web.xml 2010-07-12 20:28:36 UTC (rev 12636)
@@ -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-3.1.2.SP3-patch-02_JBPAPP-4610/modules/testsuite/native-tests/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-3.1.2.SP3-patch-02_JBPAPP-4610/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3071/WEB-INF/web.xml (rev 0)
+++ stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-4610/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3071/WEB-INF/web.xml 2010-07-12 20:28:36 UTC (rev 12636)
@@ -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
15 years, 9 months