You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2014/12/12 18:54:06 UTC
cxf git commit: Switch to ASYNC_ONLY by default
Repository: cxf
Updated Branches:
refs/heads/master 37d5dd4f9 -> 10a8386fc
Switch to ASYNC_ONLY by default
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/10a8386f
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/10a8386f
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/10a8386f
Branch: refs/heads/master
Commit: 10a8386fcef4b7f2220ceceaa6aedca60846f6d1
Parents: 37d5dd4
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Fri Dec 12 17:53:54 2014 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Fri Dec 12 17:53:54 2014 +0000
----------------------------------------------------------------------
parent/pom.xml | 2 +-
.../org/apache/cxf/systest/https/conduit/HTTPSClientTest.java | 1 -
.../apache/cxf/systest/https/conduit/HTTPSConduitTest.java | 4 ----
.../java/org/apache/cxf/systest/https/ssl3/SSLv3Test.java | 7 -------
4 files changed, 1 insertion(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/10a8386f/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index b46ec3f..37c1054 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -404,7 +404,7 @@
<derby.system.home>${basedir}/target/derby</derby.system.home>
<spring.validation.mode>${cxf.spring.validation.mode}</spring.validation.mode>
<server.launcher.vmargs>${cxf.server.launcher.vmargs}</server.launcher.vmargs>
- <org.apache.cxf.transport.http.async.usePolicy>ALWAYS</org.apache.cxf.transport.http.async.usePolicy>
+ <org.apache.cxf.transport.http.async.usePolicy>ASYNC_ONLY</org.apache.cxf.transport.http.async.usePolicy>
<javax.xml.bind.JAXBContext>${cxf.jaxb.context.class}</javax.xml.bind.JAXBContext>
<!--javax.xml.bind.JAXBContext>org.eclipse.persistence.jaxb.JAXBContextFactory</javax.xml.bind.JAXBContext-->
</systemPropertyVariables>
http://git-wip-us.apache.org/repos/asf/cxf/blob/10a8386f/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/HTTPSClientTest.java
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/HTTPSClientTest.java b/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/HTTPSClientTest.java
index af7d702..75515af 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/HTTPSClientTest.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/HTTPSClientTest.java
@@ -128,7 +128,6 @@ public class HTTPSClientTest extends AbstractBusClientServerTestBase {
BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
address);
- //provider.getRequestContext().put("use.async.http.conduit", Boolean.TRUE);
//for (int x = 0; x < 100000; x++) {
assertEquals(port.greetMe("Kitty"), "Hello Kitty");
//}
http://git-wip-us.apache.org/repos/asf/cxf/blob/10a8386f/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/HTTPSConduitTest.java
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/HTTPSConduitTest.java b/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/HTTPSConduitTest.java
index c754f99..2ef713e 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/HTTPSConduitTest.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/HTTPSConduitTest.java
@@ -37,7 +37,6 @@ import javax.net.ssl.KeyManagerFactory;
import javax.net.ssl.TrustManager;
import javax.net.ssl.TrustManagerFactory;
import javax.xml.namespace.QName;
-import javax.xml.ws.BindingProvider;
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
@@ -715,9 +714,6 @@ public class HTTPSConduitTest extends AbstractBusClientServerTestBase {
// This also tests dynamic configuration of the conduit.
Client client = ClientProxy.getClient(gordy);
- BindingProvider provider = (BindingProvider)gordy;
- provider.getRequestContext().put("use.async.http.conduit", Boolean.FALSE);
-
HTTPConduit http =
(HTTPConduit) client.getConduit();
http://git-wip-us.apache.org/repos/asf/cxf/blob/10a8386f/systests/transports/src/test/java/org/apache/cxf/systest/https/ssl3/SSLv3Test.java
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/https/ssl3/SSLv3Test.java b/systests/transports/src/test/java/org/apache/cxf/systest/https/ssl3/SSLv3Test.java
index 9259420..834ff50 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/https/ssl3/SSLv3Test.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/https/ssl3/SSLv3Test.java
@@ -27,7 +27,6 @@ import javax.net.ssl.HttpsURLConnection;
import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLSession;
import javax.net.ssl.TrustManager;
-import javax.xml.ws.BindingProvider;
import org.apache.cxf.Bus;
import org.apache.cxf.bus.spring.SpringBusFactory;
@@ -151,9 +150,6 @@ public class SSLv3Test extends AbstractBusClientServerTestBase {
final Greeter port = service.getHttpsPort();
assertNotNull("Port is null", port);
- BindingProvider provider = (BindingProvider)port;
- provider.getRequestContext().put("use.async.http.conduit", Boolean.FALSE);
-
updateAddressPort(port, PORT3);
try {
@@ -182,9 +178,6 @@ public class SSLv3Test extends AbstractBusClientServerTestBase {
final Greeter port = service.getHttpsPort();
assertNotNull("Port is null", port);
- BindingProvider provider = (BindingProvider)port;
- provider.getRequestContext().put("use.async.http.conduit", Boolean.FALSE);
-
updateAddressPort(port, PORT3);
assertEquals(port.greetMe("Kitty"), "Hello Kitty");