cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [7/8] cxf git commit: Change default test Async value to ASYNC_ONLY
Date Fri, 12 Dec 2014 17:49:29 GMT
Change default test Async value to ASYNC_ONLY


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/1c3eaf3c
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/1c3eaf3c
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/1c3eaf3c

Branch: refs/heads/3.0.x-fixes
Commit: 1c3eaf3cd860709f6b927db423b6a5d21e4848d4
Parents: 6fe5baf
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Fri Dec 12 17:43:08 2014 +0000
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Fri Dec 12 17:43:08 2014 +0000

----------------------------------------------------------------------
 parent/pom.xml                                  |  2 +-
 .../systest/https/conduit/HTTPSClientTest.java  |  1 -
 .../systest/https/conduit/HTTPSConduitTest.java |  4 --
 .../conduit/KeyPasswordCallbackHandler.java     | 39 ------------
 .../cxf/systest/https/ssl3/SSLv3Test.java       |  7 ---
 .../https/conduit/jaxws-publish-callback.xml    | 64 --------------------
 6 files changed, 1 insertion(+), 116 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/1c3eaf3c/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 50e17ff..019e0e3 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -417,7 +417,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/1c3eaf3c/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 52bc396..c46abb7 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/1c3eaf3c/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/1c3eaf3c/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/KeyPasswordCallbackHandler.java
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/KeyPasswordCallbackHandler.java
b/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/KeyPasswordCallbackHandler.java
deleted file mode 100644
index 403917e..0000000
--- a/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/KeyPasswordCallbackHandler.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.cxf.systest.https.conduit;
-
-import java.io.IOException;
-
-import javax.security.auth.callback.Callback;
-import javax.security.auth.callback.CallbackHandler;
-import javax.security.auth.callback.PasswordCallback;
-import javax.security.auth.callback.UnsupportedCallbackException;
-
-public class KeyPasswordCallbackHandler implements CallbackHandler {
-
-    @Override
-    public void handle(Callback[] callbacks) throws IOException,
-        UnsupportedCallbackException {
-        for (int i = 0; i < callbacks.length; i++) {
-            PasswordCallback pc = (PasswordCallback)callbacks[i];
-            pc.setPassword("password".toCharArray());
-        }
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/cxf/blob/1c3eaf3c/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");

http://git-wip-us.apache.org/repos/asf/cxf/blob/1c3eaf3c/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/jaxws-publish-callback.xml
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/jaxws-publish-callback.xml
b/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/jaxws-publish-callback.xml
deleted file mode 100644
index 9a94baa..0000000
--- a/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/jaxws-publish-callback.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:sec="http://cxf.apache.org/configuration/security"
xsi:schemaLocation="         http://www.springframework.org/schema/beans                 http://www.springframework.org/schema/beans/spring-beans.xsd
        http://cxf.apache.org/jaxws                                 http://cxf.apache.org/schemas/jaxws.xsd
        http://cxf.apache.org/transports/http/configuration         http://cxf.apache.org/schemas/configuration/http-conf.xsd
        http://cxf.apache.org/transports/http-jetty/configuration   http://cxf.apache.org/schemas/configuration/http-jetty.xsd
        http://cxf.apache.org/configuration/security                http://cxf.apache.org/schemas/configuration/security.xsd
        ">
-    <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
-    <!-- -->
-    <!-- This Spring config file is designed to represent a minimal -->
-    <!-- configuration for spring-loading a CXF servant, where the -->
-    <!-- servant listens using HTTP/S as the transport protocol. -->
-    <!-- -->
-    <!-- Note that the service endpoint is spring-loaded.  In the -->
-    <!-- scenario in which this config is designed to run, the -->
-    <!-- server application merely instantiates a Bus, and does not -->
-    <!-- publish any services programmatically -->
-    <!-- -->
-    <!-- -->
-    <!-- Spring-load an HTTPS servant -->
-    <!-- -->
-    <jaxws:endpoint xmlns:e="http://apache.org/hello_world/services" xmlns:s="http://apache.org/hello_world/services"
id="JaxwsHttpsEndpoint" implementor="org.apache.cxf.systest.http.GreeterImpl" address="https://localhost:${testutil.ports.BusServer.1}/SoapContext/HttpsPort"
serviceName="s:SOAPService" endpointName="e:HttpsPort" depends-on="port-9001-tls-config"/>
-    <!-- -->
-    <!-- TLS Port configuration parameters for port 9001 -->
-    <!-- -->
-    <httpj:engine-factory id="port-9001-tls-config">
-        <httpj:engine port="${testutil.ports.BusServer.1}">
-            <httpj:tlsServerParameters>
-                <sec:keyManagers keyPasswordCallbackHandler="org.apache.cxf.systest.https.conduit.KeyPasswordCallbackHandler">
-                    <sec:keyStore type="JKS" password="password" file="src/test/resources/keys/Bethal.jks"/>
-                </sec:keyManagers>
-                <sec:trustManagers>
-                    <sec:keyStore type="JKS" password="password" file="src/test/resources/keys/Truststore.jks"/>
-                </sec:trustManagers>
-            </httpj:tlsServerParameters>
-        </httpj:engine>
-    </httpj:engine-factory>
-    <!-- -->
-    <!-- HTTP/S configuration for clients -->
-    <!-- -->
-    <http:conduit name="{http://apache.org/hello_world/services}HttpsPort.http-conduit">
-        <http:tlsClientParameters disableCNCheck="true">
-            <sec:keyManagers keyPasswordCallbackHandler="org.apache.cxf.systest.https.conduit.KeyPasswordCallbackHandler">
-                <sec:keyStore type="JKS" password="password" resource="keys/Morpit.jks"/>
-            </sec:keyManagers>
-            <sec:trustManagers>
-                <sec:keyStore type="JKS" password="password" resource="keys/Truststore.jks"/>
-            </sec:trustManagers>
-        </http:tlsClientParameters>
-    </http:conduit>
-</beans>


Mime
View raw message