JBossWS SVN: r16426 - stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-06-25 07:41:09 -0400 (Mon, 25 Jun 2012)
New Revision: 16426
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/PicketLinkSTService.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/STSCallbackHandler.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/SampleSTS.java
Log:
[JBWS-3434] Properly delegate UT auth on STS to JAAS integration
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/PicketLinkSTService.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/PicketLinkSTService.java 2012-06-24 17:05:13 UTC (rev 16425)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/PicketLinkSTService.java 2012-06-25 11:41:09 UTC (rev 16426)
@@ -45,7 +45,8 @@
@EndpointProperties(value = {
@EndpointProperty(key = "ws-security.signature.username", value = "mystskey"),
@EndpointProperty(key = "ws-security.signature.properties", value = "stsKeystore.properties"),
- @EndpointProperty(key = "ws-security.callback-handler", value = "org.jboss.test.ws.jaxws.samples.wsse.policy.trust.STSCallbackHandler")
+ @EndpointProperty(key = "ws-security.callback-handler", value = "org.jboss.test.ws.jaxws.samples.wsse.policy.trust.STSCallbackHandler"),
+ @EndpointProperty(key = "ws-security.validate.token", value = "false") //to let the JAAS integration deal with validation through the interceptor below
})
@InInterceptors(interceptors = {"org.jboss.wsf.stack.cxf.security.authentication.SubjectCreatingPolicyInterceptor"})
public class PicketLinkSTService extends PicketLinkSTS
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/STSCallbackHandler.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/STSCallbackHandler.java 2012-06-24 17:05:13 UTC (rev 16425)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/STSCallbackHandler.java 2012-06-25 11:41:09 UTC (rev 16426)
@@ -34,9 +34,6 @@
if ("mystskey".equals(pc.getIdentifier())) {
pc.setPassword("stskpass");
break;
- } else if ("alice".equals(pc.getIdentifier())) {
- pc.setPassword("clarinet");
- break;
}
}
}
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/SampleSTS.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/SampleSTS.java 2012-06-24 17:05:13 UTC (rev 16425)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/SampleSTS.java 2012-06-25 11:41:09 UTC (rev 16426)
@@ -47,7 +47,8 @@
@EndpointProperties(value = {
@EndpointProperty(key = "ws-security.signature.username", value = "mystskey"),
@EndpointProperty(key = "ws-security.signature.properties", value = "stsKeystore.properties"),
- @EndpointProperty(key = "ws-security.callback-handler", value = "org.jboss.test.ws.jaxws.samples.wsse.policy.trust.STSCallbackHandler")
+ @EndpointProperty(key = "ws-security.callback-handler", value = "org.jboss.test.ws.jaxws.samples.wsse.policy.trust.STSCallbackHandler"),
+ @EndpointProperty(key = "ws-security.validate.token", value = "false") //to let the JAAS integration deal with validation through the interceptor below
})
@InInterceptors(interceptors = {"org.jboss.wsf.stack.cxf.security.authentication.SubjectCreatingPolicyInterceptor"})
public class SampleSTS extends SecurityTokenServiceProvider
11 years, 10 months
JBossWS SVN: r16425 - stack/cxf/branches/jbossws-cxf-4.0.x.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2012-06-24 13:05:13 -0400 (Sun, 24 Jun 2012)
New Revision: 16425
Modified:
stack/cxf/branches/jbossws-cxf-4.0.x/
Log:
Blocked revisions 16373,16388,16405-16406,16410-16411,16422 via svnmerge
.......
r16373 | richard.opalka(a)jboss.com | 2012-06-05 11:21:10 +0200 (Tue, 05 Jun 2012) | 1 line
sync. dependencies with native & AS7
.......
r16388 | alessio.soldano(a)jboss.com | 2012-06-05 12:17:04 +0200 (Tue, 05 Jun 2012) | 2 lines
Use latest parent
.......
r16405 | richard.opalka(a)jboss.com | 2012-06-08 22:23:00 +0200 (Fri, 08 Jun 2012) | 1 line
don't use httpserver spi snapshot until necessary
.......
r16406 | richard.opalka(a)jboss.com | 2012-06-10 08:50:44 +0200 (Sun, 10 Jun 2012) | 1 line
Apache CXF 2.6.1 -> 2.7.0-SNAPSHOT
.......
r16410 | alessio.soldano(a)jboss.com | 2012-06-15 10:55:40 +0200 (Fri, 15 Jun 2012) | 2 lines
svn merge -r 16406:16405 https://svn.jboss.org/repos/jbossws/stack/cxf/trunk
.......
r16411 | alessio.soldano(a)jboss.com | 2012-06-15 16:49:05 +0200 (Fri, 15 Jun 2012) | 2 lines
[JBWS-3517] Moving to Apache CXF 2.7.0-SNAPSHOT
.......
r16422 | richard.opalka(a)jboss.com | 2012-06-22 12:22:57 +0200 (Fri, 22 Jun 2012) | 1 line
sync. with AS7 upstream
.......
Property changes on: stack/cxf/branches/jbossws-cxf-4.0.x
___________________________________________________________________
Modified: svnmerge-blocked
- https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:15645-15648,15650,156...
+ https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:15645-15648,15650,156...
11 years, 10 months
JBossWS SVN: r16424 - in stack/native/branches/jbossws-native-4.0.x: modules/core/src/main/java/org/jboss/wsf/stack/jbws and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2012-06-24 12:40:59 -0400 (Sun, 24 Jun 2012)
New Revision: 16424
Modified:
stack/native/branches/jbossws-native-4.0.x/
stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java
Log:
Merged revisions 16390 via svnmerge from
https://svn.jboss.org/repos/jbossws/stack/native/trunk
.......
r16390 | alessio.soldano(a)jboss.com | 2012-06-05 12:18:34 +0200 (Tue, 05 Jun 2012) | 2 lines
Create logger only when needed for exception dealing
.......
Property changes on: stack/native/branches/jbossws-native-4.0.x
___________________________________________________________________
Modified: svnmerge-integrated
- https://svn.jboss.org/repos/jbossws/stack/native/trunk:1-15651,15653-1567...
+ https://svn.jboss.org/repos/jbossws/stack/native/trunk:1-15651,15653-1567...
Modified: svn:mergeinfo
- /stack/native/branches/asoldano:14057,14069
/stack/native/branches/ropalka:13836-13879
/stack/native/trunk:15653,15670-15677,15686,15696,15707,15714,15726-15731,15739-15740,15749-15759,15761,15775-15777,15779,15787-15791,15793,15795,15797-15804,15810,15812-15818,15821,15823-15827,15829,15831,15836-15840,15858,15861,15871,15873,15880-15883,15887,15890-15891,15904-15931,15944,15974,15988,15991,15995,15997,15999,16003,16013,16015,16021,16050-16052,16063-16065,16073-16078,16081-16085,16091-16095,16103-16105,16157-16160,16165,16169-16171,16182,16202-16225,16228-16246,16263,16268
+ /stack/native/branches/asoldano:14057,14069
/stack/native/branches/ropalka:13836-13879
/stack/native/trunk:15653,15670-15677,15686,15696,15707,15714,15726-15731,15739-15740,15749-15759,15761,15775-15777,15779,15787-15791,15793,15795,15797-15804,15810,15812-15818,15821,15823-15827,15829,15831,15836-15840,15858,15861,15871,15873,15880-15883,15887,15890-15891,15904-15931,15944,15974,15988,15991,15995,15997,15999,16003,16013,16015,16021,16050-16052,16063-16065,16073-16078,16081-16085,16091-16095,16103-16105,16157-16160,16165,16169-16171,16182,16202-16225,16228-16246,16263,16268,16390
Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java 2012-06-24 16:38:15 UTC (rev 16423)
+++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java 2012-06-24 16:40:59 UTC (rev 16424)
@@ -46,10 +46,6 @@
*/
public final class EndpointServlet extends AbstractEndpointServlet implements ServletDelegate
{
-
- // provide logging
- protected static final Logger log = Logger.getLogger(EndpointServlet.class);
-
private List<PreDestroyHolder> preDestroyRegistry = new LinkedList<PreDestroyHolder>();
private final Object lock = new Object();
@@ -85,7 +81,7 @@
}
catch (Exception exception)
{
- log.error(exception.getLocalizedMessage(), exception);
+ Logger.getLogger(EndpointServlet.class).error(exception.getLocalizedMessage(), exception);
}
}
this.preDestroyRegistry.clear();
11 years, 10 months
JBossWS SVN: r16423 - stack/native/branches/jbossws-native-4.0.x.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2012-06-24 12:38:15 -0400 (Sun, 24 Jun 2012)
New Revision: 16423
Modified:
stack/native/branches/jbossws-native-4.0.x/
Log:
Blocked revisions 16352,16389,16421 via svnmerge
.......
r16352 | richard.opalka(a)jboss.com | 2012-06-05 09:25:56 +0200 (Tue, 05 Jun 2012) | 1 line
[JBWS-3335] fixing test compilation issue after SPI config added methods
.......
r16389 | alessio.soldano(a)jboss.com | 2012-06-05 12:17:41 +0200 (Tue, 05 Jun 2012) | 2 lines
Use latest parent
.......
r16421 | richard.opalka(a)jboss.com | 2012-06-22 12:22:42 +0200 (Fri, 22 Jun 2012) | 1 line
sync. with AS7 upstream
.......
Property changes on: stack/native/branches/jbossws-native-4.0.x
___________________________________________________________________
Modified: svnmerge-blocked
- https://svn.jboss.org/repos/jbossws/stack/native/trunk:15652,15877,15934,...
+ https://svn.jboss.org/repos/jbossws/stack/native/trunk:15652,15877,15934,...
11 years, 10 months
JBossWS SVN: r16422 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2012-06-22 06:22:57 -0400 (Fri, 22 Jun 2012)
New Revision: 16422
Modified:
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
sync. with AS7 upstream
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2012-06-22 10:22:42 UTC (rev 16421)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2012-06-22 10:22:57 UTC (rev 16422)
@@ -1224,7 +1224,7 @@
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-remote-naming</artifactId>
- <version>1.0.3.Final</version>
+ <version>1.0.4.Final</version>
</dependency>
<dependency>
<groupId>javax.mail</groupId>
@@ -1325,7 +1325,7 @@
<dependency>
<groupId>org.jboss.remoting3</groupId>
<artifactId>jboss-remoting</artifactId>
- <version>3.2.7.GA</version>
+ <version>3.2.8.GA</version>
<scope>test</scope>
</dependency>
<dependency>
11 years, 10 months
JBossWS SVN: r16421 - stack/native/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2012-06-22 06:22:42 -0400 (Fri, 22 Jun 2012)
New Revision: 16421
Modified:
stack/native/trunk/modules/testsuite/pom.xml
Log:
sync. with AS7 upstream
Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2012-06-21 12:05:22 UTC (rev 16420)
+++ stack/native/trunk/modules/testsuite/pom.xml 2012-06-22 10:22:42 UTC (rev 16421)
@@ -368,7 +368,7 @@
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-remote-naming</artifactId>
- <version>1.0.3.Final</version>
+ <version>1.0.4.Final</version>
</dependency>
<dependency>
<groupId>org.jboss</groupId>
@@ -394,7 +394,7 @@
<dependency>
<groupId>org.jboss.remoting3</groupId>
<artifactId>jboss-remoting</artifactId>
- <version>3.2.7.GA</version>
+ <version>3.2.8.GA</version>
<scope>test</scope>
</dependency>
</dependencies>
11 years, 10 months
JBossWS SVN: r16420 - in stack/cxf/trunk/modules/testsuite/cxf-tests: src/test/java/org/jboss/test/ws/jaxws/cxf and 4 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-06-21 08:05:22 -0400 (Thu, 21 Jun 2012)
New Revision: 16420
Added:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/continuations/
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/continuations/ContinuationsTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/continuations/Endpoint.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/continuations/EndpointImpl.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/continuations/
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/continuations/WEB-INF/
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/continuations/WEB-INF/web.xml
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml
Log:
[JBWS-3409] Adding testcase for manual/direct usage of Apache CXF continuations api
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2012-06-21 10:15:55 UTC (rev 16419)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2012-06-21 12:05:22 UTC (rev 16420)
@@ -84,6 +84,16 @@
prefix="WEB-INF/wsdl"/>
</war>
+ <!-- jaxws-cxf-continuations -->
+ <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-continuations.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/continuations/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/cxf/continuations/EndpointImpl*.class"/>
+ </classes>
+ <manifest>
+ <attribute name="Dependencies" value="org.apache.cxf"/>
+ </manifest>
+ </war>
+
<!-- jaxws-cxf-endorse -->
<war warfile="${tests.output.dir}/test-libs/jaxws-cxf-endorse.war"
manifest="${tests.output.dir}/test-resources/jaxws/cxf/endorse/META-INF/MANIFEST.MF"
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/continuations/ContinuationsTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/continuations/ContinuationsTestCase.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/continuations/ContinuationsTestCase.java 2012-06-21 12:05:22 UTC (rev 16420)
@@ -0,0 +1,98 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2012, 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.cxf.continuations;
+
+import java.net.URL;
+import java.util.concurrent.Future;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.AsyncHandler;
+import javax.xml.ws.Response;
+import javax.xml.ws.Service;
+
+import junit.framework.Test;
+
+import org.jboss.wsf.test.JBossWSCXFTestSetup;
+import org.jboss.wsf.test.JBossWSTest;
+
+/**
+ * Asynchronous web services test case with endpoint impl making
+ * direct use of Apache CXF continuations api
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 21-Jun-2012
+ */
+public class ContinuationsTestCase extends JBossWSTest
+{
+ private String endpointAddress = "http://" + getServerHost() + ":8080/jaxws-cxf-continuations";
+
+ public static Test suite()
+ {
+ return new JBossWSCXFTestSetup(ContinuationsTestCase.class, "jaxws-cxf-continuations.war");
+ }
+
+ public void testAsyncEndpoint() throws Exception
+ {
+ QName serviceName = new QName("http://org.jboss.ws/cxf/continuations", "EndpointImplService");
+ URL wsdlURL = new URL(endpointAddress + "?wsdl");
+ Service service = Service.create(wsdlURL, serviceName);
+ Endpoint proxy = service.getPort(Endpoint.class);
+ final String user = "Kermit";
+ //do something... then get the result
+ assertEquals(user + " (ASYNC)", proxy.echoAsync(user).get());
+ }
+
+ public void testAsyncEndpointUsingHandler() throws Exception
+ {
+ QName serviceName = new QName("http://org.jboss.ws/cxf/continuations", "EndpointImplService");
+ URL wsdlURL = new URL(endpointAddress + "?wsdl");
+ Service service = Service.create(wsdlURL, serviceName);
+ Endpoint proxy = service.getPort(Endpoint.class);
+ final String user = "Kermit";
+ TestAsyncHandler handler = new TestAsyncHandler();
+ Future<String> future = proxy.echoAsync(user, handler);
+ //do something... then get the result when it's ready
+ while (!future.isDone()) {
+ Thread.sleep(100);
+ }
+ assertEquals(user + " (ASYNC)", handler.getResponse());
+ }
+
+ private class TestAsyncHandler implements AsyncHandler<String> {
+
+ private String res;
+
+ @Override
+ public void handleResponse(Response<String> response) {
+ try {
+ res = response.get();
+ } catch (Exception e) {
+ e.printStackTrace();
+ res = e.getMessage();
+ }
+ }
+
+ public String getResponse() {
+ return res;
+ }
+ }
+}
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/continuations/Endpoint.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/continuations/Endpoint.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/continuations/Endpoint.java 2012-06-21 12:05:22 UTC (rev 16420)
@@ -0,0 +1,46 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2012, 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.cxf.continuations;
+
+import java.util.concurrent.Future;
+
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+import javax.xml.ws.AsyncHandler;
+import javax.xml.ws.Response;
+
+@WebService(name = "EndpointService", targetNamespace = "http://org.jboss.ws/cxf/continuations")
+@SOAPBinding(style = SOAPBinding.Style.DOCUMENT, use = SOAPBinding.Use.LITERAL, parameterStyle = SOAPBinding.ParameterStyle.WRAPPED)
+public interface Endpoint
+{
+ @WebMethod
+ public String echo(String user);
+
+ //The following methods are added (or generated by wsconsume) for the sake of using asynch jaxws client only
+
+ @WebMethod(operationName = "echo")
+ public Response<String> echoAsync(String user);
+
+ @WebMethod(operationName = "echo")
+ public Future<String> echoAsync(String user, AsyncHandler<String> handler);
+}
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/continuations/EndpointImpl.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/continuations/EndpointImpl.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/continuations/EndpointImpl.java 2012-06-21 12:05:22 UTC (rev 16420)
@@ -0,0 +1,102 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2012, 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.cxf.continuations;
+
+import java.util.concurrent.Callable;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
+import java.util.concurrent.FutureTask;
+
+import javax.annotation.Resource;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+import javax.xml.ws.WebServiceContext;
+
+import org.apache.cxf.continuations.Continuation;
+import org.apache.cxf.continuations.ContinuationProvider;
+
+@WebService(name = "EndpointService", targetNamespace = "http://org.jboss.ws/cxf/continuations")
+@SOAPBinding(style = SOAPBinding.Style.DOCUMENT, use = SOAPBinding.Use.LITERAL, parameterStyle = SOAPBinding.ParameterStyle.BARE)
+public class EndpointImpl
+{
+ private Executor executor = Executors.newCachedThreadPool();
+ private static final int TIMEOUT = 2000;
+
+ @Resource
+ WebServiceContext ctx;
+
+ public String echo(String user)
+ {
+ final ContinuationProvider cp = (ContinuationProvider) ctx.getMessageContext().get(ContinuationProvider.class.getName());
+ final Continuation c = cp.getContinuation();
+ if (c.isNew())
+ {
+ FutureTask<String> task = new FutureTask<String>(new MyCallable(user, c));
+ c.setObject(task);
+ executor.execute(task);
+ c.suspend(TIMEOUT);
+ }
+ else
+ {
+ @SuppressWarnings("unchecked")
+ FutureTask<String> task = (FutureTask<String>) c.getObject();
+ if (task.isDone())
+ {
+ try
+ {
+ return task.get();
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException(e);
+ }
+ }
+ c.suspend(TIMEOUT);
+ }
+ return null;
+ }
+
+ private class MyCallable implements Callable<String>
+ {
+
+ private String user;
+ private Continuation c;
+
+ public MyCallable(String user, Continuation c)
+ {
+ this.user = user;
+ this.c = c;
+ }
+
+ @Override
+ public String call() throws Exception
+ {
+ try {
+ //long running process...
+ System.out.println("user: " + user);
+ return user + " (ASYNC)";
+ } finally {
+ c.resume();
+ }
+ }
+ }
+}
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/continuations/WEB-INF/web.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/continuations/WEB-INF/web.xml (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/continuations/WEB-INF/web.xml 2012-06-21 12:05:22 UTC (rev 16420)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app
+ version="3.0" xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
+ <servlet>
+ <servlet-name>AsynchService</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.cxf.continuations.EndpointImpl</servlet-class>
+ <async-supported>true</async-supported>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>AsynchService</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+</web-app>
11 years, 10 months
JBossWS SVN: r16419 - in stack/cxf/trunk/modules/testsuite/cxf-tests: src/test/java/org/jboss/test/ws/jaxws/samples and 4 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-06-21 06:15:55 -0400 (Thu, 21 Jun 2012)
New Revision: 16419
Added:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/asynch/
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/asynch/AsynchTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/asynch/Endpoint.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/asynch/EndpointImpl.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/asynch/
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/asynch/WEB-INF/
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/asynch/WEB-INF/web.xml
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml
Log:
[JBWS-3523] Adding testcase for server side async with CXF @UseAsynchMethod
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml 2012-06-21 09:14:46 UTC (rev 16418)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml 2012-06-21 10:15:55 UTC (rev 16419)
@@ -38,6 +38,18 @@
<mkdir dir="${tests.output.dir}/test-libs"/>
+ <!-- jaxws-samples-asynch -->
+ <war
+ warfile="${tests.output.dir}/test-libs/jaxws-samples-asynch.war"
+ webxml="${tests.output.dir}/test-resources/jaxws/samples/asynch/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/samples/asynch/EndpointImpl*.class"/>
+ </classes>
+ <manifest>
+ <attribute name="Dependencies" value="org.apache.cxf"/>
+ </manifest>
+ </war>
+
<!-- jaxws-samples-mtom -->
<war
warfile="${tests.output.dir}/test-libs/jaxws-samples-mtom.war"
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/asynch/AsynchTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/asynch/AsynchTestCase.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/asynch/AsynchTestCase.java 2012-06-21 10:15:55 UTC (rev 16419)
@@ -0,0 +1,97 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2012, 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.samples.asynch;
+
+import java.net.URL;
+import java.util.concurrent.Future;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.AsyncHandler;
+import javax.xml.ws.Response;
+import javax.xml.ws.Service;
+
+import junit.framework.Test;
+
+import org.jboss.wsf.test.JBossWSCXFTestSetup;
+import org.jboss.wsf.test.JBossWSTest;
+
+/**
+ * Asynchronous web services test case (both client and server side async)
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 21-Jun-2012
+ */
+public class AsynchTestCase extends JBossWSTest
+{
+ private String endpointAddress = "http://" + getServerHost() + ":8080/jaxws-samples-asynch";
+
+ public static Test suite()
+ {
+ return new JBossWSCXFTestSetup(AsynchTestCase.class, "jaxws-samples-asynch.war");
+ }
+
+ public void testAsyncEndpoint() throws Exception
+ {
+ QName serviceName = new QName("http://org.jboss.ws/cxf/samples/asynch", "EndpointImplService");
+ URL wsdlURL = new URL(endpointAddress + "?wsdl");
+ Service service = Service.create(wsdlURL, serviceName);
+ Endpoint proxy = service.getPort(Endpoint.class);
+ final String user = "Kermit";
+ //do something... then get the result
+ assertEquals(user + " (ASYNC)", proxy.echoAsync(user).get());
+ }
+
+ public void testAsyncEndpointUsingHandler() throws Exception
+ {
+ QName serviceName = new QName("http://org.jboss.ws/cxf/samples/asynch", "EndpointImplService");
+ URL wsdlURL = new URL(endpointAddress + "?wsdl");
+ Service service = Service.create(wsdlURL, serviceName);
+ Endpoint proxy = service.getPort(Endpoint.class);
+ final String user = "Kermit";
+ TestAsyncHandler handler = new TestAsyncHandler();
+ Future<String> future = proxy.echoAsync(user, handler);
+ //do something... then get the result when it's ready
+ while (!future.isDone()) {
+ Thread.sleep(100);
+ }
+ assertEquals(user + " (ASYNC)", handler.getResponse());
+ }
+
+ private class TestAsyncHandler implements AsyncHandler<String> {
+
+ private String res;
+
+ @Override
+ public void handleResponse(Response<String> response) {
+ try {
+ res = response.get();
+ } catch (Exception e) {
+ e.printStackTrace();
+ res = e.getMessage();
+ }
+ }
+
+ public String getResponse() {
+ return res;
+ }
+ }
+}
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/asynch/Endpoint.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/asynch/Endpoint.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/asynch/Endpoint.java 2012-06-21 10:15:55 UTC (rev 16419)
@@ -0,0 +1,46 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2012, 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.samples.asynch;
+
+import java.util.concurrent.Future;
+
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+import javax.xml.ws.AsyncHandler;
+import javax.xml.ws.Response;
+
+@WebService(name = "EndpointService", targetNamespace = "http://org.jboss.ws/cxf/samples/asynch")
+@SOAPBinding(style = SOAPBinding.Style.DOCUMENT, use = SOAPBinding.Use.LITERAL, parameterStyle = SOAPBinding.ParameterStyle.WRAPPED)
+public interface Endpoint
+{
+ @WebMethod
+ public String echo(String user);
+
+ //The following methods are added (or generated by wsconsume) for the sake of using asynch jaxws client only
+
+ @WebMethod(operationName = "echo")
+ public Response<String> echoAsync(String user);
+
+ @WebMethod(operationName = "echo")
+ public Future<String> echoAsync(String user, AsyncHandler<String> handler);
+}
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/asynch/EndpointImpl.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/asynch/EndpointImpl.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/asynch/EndpointImpl.java 2012-06-21 10:15:55 UTC (rev 16419)
@@ -0,0 +1,109 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2012, 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.samples.asynch;
+
+import java.util.Map;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+import javax.xml.ws.AsyncHandler;
+
+import org.apache.cxf.annotations.UseAsyncMethod;
+
+@WebService(name = "EndpointService", targetNamespace = "http://org.jboss.ws/cxf/samples/asynch")
+@SOAPBinding(style = SOAPBinding.Style.DOCUMENT, use = SOAPBinding.Use.LITERAL, parameterStyle = SOAPBinding.ParameterStyle.BARE)
+public class EndpointImpl
+{
+ //be sure to add dependency on org.apache.cxf module for @UseAsyncMethod annotation to be resolved
+ @UseAsyncMethod //.. if supported by underlying container
+ public String echo(String user)
+ {
+ System.out.println("user: " + user);
+ return user + " (SYNC)";
+ }
+
+ //this method is not actually converted into an operation in the wsdl contract, as it's up to the
+ //Apache CXF implementation to redirect invocation to this when the @UseAsyncMethod annotated
+ //echo method is called.
+ public Future<?> echoAsync(final String user, final AsyncHandler<String> asyncHandler)
+ {
+ final ServerAsyncResponse<String> r = new ServerAsyncResponse<String>();
+ //here the business method would likely enqueue the request for a long running process;
+ //then the queue might for instance be consumed by a different thread pool...
+ new Thread() {
+ public void run() {
+ r.set(user + " (ASYNC)");
+ System.out.println("Responding on background thread...");
+ asyncHandler.handleResponse(r);
+ }
+ }.start();
+ //the web container thread proceeds further and the container is able to serve new web requests with it
+ return r;
+ }
+
+ //helper class
+ private class ServerAsyncResponse<T> implements javax.xml.ws.Response<T> {
+ T value;
+ boolean done;
+ Throwable throwable;
+
+ /**
+ * Currently unused
+ */
+ public boolean cancel(boolean mayInterruptIfRunning) {
+ return false;
+ }
+ /**
+ * Currently unused
+ */
+ public boolean isCancelled() {
+ return false;
+ }
+ public boolean isDone() {
+ return done;
+ }
+ public void set(T t) {
+ value = t;
+ done = true;
+ }
+ public T get() throws InterruptedException, ExecutionException {
+ if (throwable != null) {
+ throw new ExecutionException(throwable);
+ }
+ return value;
+ }
+ public T get(long timeout, TimeUnit unit)
+ throws InterruptedException, ExecutionException, TimeoutException {
+ return value;
+ }
+ /**
+ * Currently unused
+ */
+ public Map<String, Object> getContext() {
+ return null;
+ }
+ }
+}
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/asynch/WEB-INF/web.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/asynch/WEB-INF/web.xml (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/asynch/WEB-INF/web.xml 2012-06-21 10:15:55 UTC (rev 16419)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app
+ version="3.0" xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
+ <servlet>
+ <servlet-name>AsynchService</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.samples.asynch.EndpointImpl</servlet-class>
+ <async-supported>true</async-supported>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>AsynchService</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+</web-app>
11 years, 10 months
JBossWS SVN: r16418 - in stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf: interceptor and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2012-06-21 05:14:46 -0400 (Thu, 21 Jun 2012)
New Revision: 16418
Added:
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/EnableDecoupledFaultInterceptor.java
Removed:
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/EnableOneWayDecoupledFaultInterceptor.java
Modified:
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java
Log:
[JBWS-3516]:Enable transmit the fault message to faultTo endpoint
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java 2012-06-20 11:06:18 UTC (rev 16417)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java 2012-06-21 09:14:46 UTC (rev 16418)
@@ -45,7 +45,7 @@
import org.jboss.wsf.spi.metadata.webservices.JBossWebservicesMetaData;
import org.jboss.wsf.stack.cxf.client.Constants;
import org.jboss.wsf.stack.cxf.deployment.WSDLFilePublisher;
-import org.jboss.wsf.stack.cxf.interceptor.EnableOneWayDecoupledFaultInterceptor;
+import org.jboss.wsf.stack.cxf.interceptor.EnableDecoupledFaultInterceptor;
import org.jboss.wsf.stack.cxf.interceptor.EndpointAssociationInterceptor;
import org.jboss.wsf.stack.cxf.interceptor.NsCtxSelectorStoreInterceptor;
@@ -138,7 +138,7 @@
//Install the EndpointAssociationInterceptor for linking every message exchange
//with the proper spi Endpoint retrieved in CXFServletExt
bus.getInInterceptors().add(new EndpointAssociationInterceptor());
- bus.getInInterceptors().add(new EnableOneWayDecoupledFaultInterceptor());
+ bus.getInInterceptors().add(new EnableDecoupledFaultInterceptor());
bus.getInInterceptors().add(new NsCtxSelectorStoreInterceptor());
}
Copied: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/EnableDecoupledFaultInterceptor.java (from rev 16417, stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/EnableOneWayDecoupledFaultInterceptor.java)
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/EnableDecoupledFaultInterceptor.java (rev 0)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/EnableDecoupledFaultInterceptor.java 2012-06-21 09:14:46 UTC (rev 16418)
@@ -0,0 +1,54 @@
+/*
+ * 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.wsf.stack.cxf.interceptor;
+
+import org.apache.cxf.message.Message;
+import org.apache.cxf.phase.AbstractPhaseInterceptor;
+import org.apache.cxf.phase.Phase;
+import org.apache.cxf.ws.addressing.soap.MAPCodec;
+
+/**
+ * This intercetpor adds the context property decoupled_fault_support
+ * to enable decoupled faultTo. This is an optinal feature in cxf and we
+ * need this to be default to make it same behavior with native stack.
+ * @author <a href="mailto:ema@redhat.com>Jim Ma</a>
+ */
+public class EnableDecoupledFaultInterceptor extends AbstractPhaseInterceptor<Message>
+{
+
+ public EnableDecoupledFaultInterceptor()
+ {
+ super(Phase.PRE_PROTOCOL);
+ addBefore(MAPCodec.class.getName());
+ }
+
+ public void handleMessage(Message message)
+ {
+ message.put("org.apache.cxf.ws.addressing.decoupled_fault_support", true);
+ }
+
+ public void handleFault(Message message)
+ {
+ //complete
+ }
+
+}
Deleted: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/EnableOneWayDecoupledFaultInterceptor.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/EnableOneWayDecoupledFaultInterceptor.java 2012-06-20 11:06:18 UTC (rev 16417)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/EnableOneWayDecoupledFaultInterceptor.java 2012-06-21 09:14:46 UTC (rev 16418)
@@ -1,54 +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.wsf.stack.cxf.interceptor;
-
-import org.apache.cxf.message.Message;
-import org.apache.cxf.phase.AbstractPhaseInterceptor;
-import org.apache.cxf.phase.Phase;
-import org.apache.cxf.ws.addressing.soap.MAPCodec;
-
-/**
- * This intercetpor adds the context property decoupled_fault_support
- * to enable decoupled faultTo. This is an optinal feature in cxf and we
- * need this to be default to make it same behavior with native stack.
- * @author <a href="mailto:ema@redhat.com>Jim Ma</a>
- */
-public class EnableOneWayDecoupledFaultInterceptor extends AbstractPhaseInterceptor<Message>
-{
-
- public EnableOneWayDecoupledFaultInterceptor()
- {
- super(Phase.PRE_PROTOCOL);
- addBefore(MAPCodec.class.getName());
- }
-
- public void handleMessage(Message message)
- {
- message.put("org.apache.cxf.ws.addressing.oneway.decoupled_fault_support", true);
- }
-
- public void handleFault(Message message)
- {
- //complete
- }
-
-}
11 years, 10 months
JBossWS SVN: r16417 - stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-06-20 07:06:18 -0400 (Wed, 20 Jun 2012)
New Revision: 16417
Modified:
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/JBossWSInvoker.java
Log:
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/JBossWSInvoker.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/JBossWSInvoker.java 2012-06-20 10:58:57 UTC (rev 16416)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/JBossWSInvoker.java 2012-06-20 11:06:18 UTC (rev 16417)
@@ -97,7 +97,6 @@
* @author Thomas.Diesler(a)jboss.org
* @author richard.opalka(a)jboss.com
*
- * @see org.apache.cxf.jaxws.AbstractJAXWSMethodInvoker
*/
public class JBossWSInvoker extends JAXWSMethodInvoker implements Invoker
{
11 years, 10 months