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, 23 Mar 2017 15:55:34 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/30c76de2
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/30c76de2
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/30c76de2

Branch: refs/heads/3.1.x-fixes
Commit: 30c76de217fc5b874f949d1bd5d24a3ac2015e67
Parents: dfb1808
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Thu Mar 23 15:55:20 2017 +0000
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Thu Mar 23 15:55:20 2017 +0000

----------------------------------------------------------------------
 .../http/blueprint/HttpConduitBPBeanDefinitionParser.java        | 4 ----
 .../transport/http/spring/HttpConduitBeanDefinitionParser.java   | 4 ----
 2 files changed, 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/30c76de2/rt/transports/http/src/main/java/org/apache/cxf/transport/http/blueprint/HttpConduitBPBeanDefinitionParser.java
----------------------------------------------------------------------
diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/blueprint/HttpConduitBPBeanDefinitionParser.java
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/blueprint/HttpConduitBPBeanDefinitionParser.java
index 28131b7..1339891 100755
--- a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/blueprint/HttpConduitBPBeanDefinitionParser.java
+++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/blueprint/HttpConduitBPBeanDefinitionParser.java
@@ -101,12 +101,8 @@ public class HttpConduitBPBeanDefinitionParser extends AbstractBPBeanDefinitionP
                 if ("useHttpsURLConnectionDefaultSslSocketFactory".equals(aname) 
                     || "useHttpsURLConnectionDefaultHostnameVerifier".equals(aname)
                     || "disableCNCheck".equals(aname)
-<<<<<<< HEAD
-                    || "jsseProvider".equals(aname) 
-=======
                     || "enableRevocation".equals(aname)
                     || "jsseProvider".equals(aname)
->>>>>>> a7d5d52... CXF-7296 - Add support to enable revocation for TLS
via configuration
                     || "secureSocketProtocol".equals(aname)
                     || "sslCacheTimeout".equals(aname)) {
                     paramsbean.addProperty(aname, createValue(ctx, a.getValue()));

http://git-wip-us.apache.org/repos/asf/cxf/blob/30c76de2/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/HttpConduitBeanDefinitionParser.java
----------------------------------------------------------------------
diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/HttpConduitBeanDefinitionParser.java
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/HttpConduitBeanDefinitionParser.java
index 7b64af5..99ce8e5 100644
--- a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/HttpConduitBeanDefinitionParser.java
+++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/HttpConduitBeanDefinitionParser.java
@@ -120,12 +120,8 @@ public class HttpConduitBeanDefinitionParser
                 if ("useHttpsURLConnectionDefaultSslSocketFactory".equals(aname) 
                     || "useHttpsURLConnectionDefaultHostnameVerifier".equals(aname)
                     || "disableCNCheck".equals(aname)
-<<<<<<< HEAD
-                    || "jsseProvider".equals(aname) 
-=======
                     || "enableRevocation".equals(aname)
                     || "jsseProvider".equals(aname)
->>>>>>> a7d5d52... CXF-7296 - Add support to enable revocation for TLS
via configuration
                     || "secureSocketProtocol".equals(aname)
                     || "sslCacheTimeout".equals(aname)) {
                     paramsbean.addPropertyValue(aname, a.getValue());


Mime
View raw message