cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [3/3] cxf git commit: Fixing merge
Date Thu, 02 Mar 2017 18:21:35 GMT
Fixing merge


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

Branch: refs/heads/3.1.x-fixes
Commit: 1d962560563a96a4577db705a3264d74dbeb6f12
Parents: df54745
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Thu Mar 2 18:21:23 2017 +0000
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Thu Mar 2 18:21:23 2017 +0000

----------------------------------------------------------------------
 .../cxf/transport/http/MessageTrustDecider.java       |  6 ------
 .../interceptors/HttpsTokenInterceptorProvider.java   | 14 --------------
 .../apache/cxf/systest/ws/https/HttpsTokenTest.java   |  3 ---
 3 files changed, 23 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/1d962560/rt/transports/http/src/main/java/org/apache/cxf/transport/http/MessageTrustDecider.java
----------------------------------------------------------------------
diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/MessageTrustDecider.java
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/MessageTrustDecider.java
index 923b5e5..6360570 100644
--- a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/MessageTrustDecider.java
+++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/MessageTrustDecider.java
@@ -29,15 +29,9 @@ import org.apache.cxf.message.Message;
  * java.net.URLConnection implementations. 
  * 
  * The HttpURLConnection will be set up and connected, but no data
-<<<<<<< HEAD
- * yet sent (at least according to the JDK 1.5 default implemenation), 
- * and in the case of an HttpsURLConnection (again with caveat on
- * particular java.net.HttpsURLConnection implemenation), the TLS handshake 
-=======
  * yet sent (at least according to the JDK 1.5 default implementation),
  * and in the case of an HttpsURLConnection (again with caveat on
  * particular java.net.HttpsURLConnection implementation), the TLS handshake
->>>>>>> 0252de5... [CXF-5525] - Adding a JAX-WS property to disable
client cert verification policy check + tests
  * will be completed and certain TLS artifacts will be available.
  * <p>
  * Each MessageTrustDecider has a "logical" name that may be used in logging

http://git-wip-us.apache.org/repos/asf/cxf/blob/1d962560/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/HttpsTokenInterceptorProvider.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/HttpsTokenInterceptorProvider.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/HttpsTokenInterceptorProvider.java
index 537c8c5..8857811 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/HttpsTokenInterceptorProvider.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/HttpsTokenInterceptorProvider.java
@@ -146,23 +146,9 @@ public class HttpsTokenInterceptorProvider extends AbstractPolicyInterceptorProv
                                             + " the server set to ask for client authorization?");
                                     }
                                 }
-<<<<<<< HEAD
-                                HttpsURLConnectionInfo info = (HttpsURLConnectionInfo)connectionInfo;
-                                if (info.getLocalCertificates() == null 
-                                    || info.getLocalCertificates().length == 0) {
-                                    throw new UntrustedURLConnectionIOException(
-                                        "RequireClientCertificate is set, "
-                                        + "but no local certificates were negotiated.  Is"
-                                        + " the server set to ask for client authorization?");
-                                }
-                            }
-                        };
-                        message.put(MessageTrustDecider.class, trust);
-=======
                             };
                             message.put(MessageTrustDecider.class, trust);
                         }
->>>>>>> 0252de5... [CXF-5525] - Adding a JAX-WS property to disable
client cert verification policy check + tests
                         PolicyUtils.assertPolicy(aim, new QName(token.getName().getNamespaceURI(),
                                                                 SPConstants.REQUIRE_CLIENT_CERTIFICATE));
                     }

http://git-wip-us.apache.org/repos/asf/cxf/blob/1d962560/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/https/HttpsTokenTest.java
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/https/HttpsTokenTest.java
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/https/HttpsTokenTest.java
index b0a1bca..4dbbf8f 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/https/HttpsTokenTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/https/HttpsTokenTest.java
@@ -131,8 +131,6 @@ public class HttpsTokenTest extends AbstractBusClientServerTestBase {
         bus.shutdown(true);
     }
     
-<<<<<<< HEAD
-=======
     @org.junit.Test
     public void testNoClientCertRequirement() throws Exception {
 
@@ -177,7 +175,6 @@ public class HttpsTokenTest extends AbstractBusClientServerTestBase {
         bus.shutdown(true);
     }
 
->>>>>>> 0252de5... [CXF-5525] - Adding a JAX-WS property to disable
client cert verification policy check + tests
     @org.junit.Test
     public void testBasicAuth() throws Exception {
 


Mime
View raw message