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 2017/03/24 18:45:09 UTC
[1/3] cxf git commit: Fixing merge
Repository: cxf
Updated Branches:
refs/heads/3.1.x-fixes d69a34be8 -> fd28dc95e
Fixing merge
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/fd28dc95
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/fd28dc95
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/fd28dc95
Branch: refs/heads/3.1.x-fixes
Commit: fd28dc95e719fdd29a05eee48ad99ae505cfbc9e
Parents: 6a23ff6
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Fri Mar 24 18:44:52 2017 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Fri Mar 24 18:45:05 2017 +0000
----------------------------------------------------------------------
.../http_jetty/JettyHTTPServerEngineFactory.java | 12 ------------
1 file changed, 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/fd28dc95/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactory.java
----------------------------------------------------------------------
diff --git a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactory.java b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactory.java
index f9d0765..e5e85a8 100644
--- a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactory.java
+++ b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactory.java
@@ -268,13 +268,6 @@ public class JettyHTTPServerEngineFactory {
* @throws GeneralSecurityException
* @throws IOException
*/
-<<<<<<< HEAD
- public synchronized JettyHTTPServerEngine createJettyHTTPServerEngine(String host, int port,
- String protocol) throws GeneralSecurityException, IOException {
- LOG.fine("Creating Jetty HTTP Server Engine for port " + port + ".");
- JettyHTTPServerEngine ref = getOrCreate(this, host, port, null);
- // checking the protocol
-=======
public synchronized JettyHTTPServerEngine createJettyHTTPServerEngine(String host, int port,
String protocol, String id) throws GeneralSecurityException, IOException {
LOG.fine("Creating Jetty HTTP Server Engine for port " + port + ".");
@@ -284,7 +277,6 @@ public class JettyHTTPServerEngineFactory {
}
JettyHTTPServerEngine ref = getOrCreate(this, host, port, tlsParameters);
// checking the protocol
->>>>>>> e70c78e... CXF-7299 - No way to configure TLS for the JettyHTTPServerEngineFactory in code
if (!protocol.equals(ref.getProtocol())) {
throw new IOException("Protocol mismatch for port " + port + ": "
+ "engine's protocol is " + ref.getProtocol()
@@ -314,16 +306,12 @@ public class JettyHTTPServerEngineFactory {
String protocol) throws GeneralSecurityException, IOException {
return createJettyHTTPServerEngine(null, port, protocol);
}
-<<<<<<< HEAD
-
-=======
public synchronized JettyHTTPServerEngine createJettyHTTPServerEngine(String host, int port,
String protocol) throws GeneralSecurityException, IOException {
return createJettyHTTPServerEngine(host, port, protocol, null);
}
->>>>>>> e70c78e... CXF-7299 - No way to configure TLS for the JettyHTTPServerEngineFactory in code
/**
* This method removes the Server Engine from the port map and stops it.
*/
[3/3] cxf git commit: CXF-7299 - No way to configure TLS for the
JettyHTTPServerEngineFactory in code
Posted by co...@apache.org.
CXF-7299 - No way to configure TLS for the JettyHTTPServerEngineFactory in code
# Conflicts:
# rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactory.java
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/5d4433e2
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/5d4433e2
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/5d4433e2
Branch: refs/heads/3.1.x-fixes
Commit: 5d4433e2077e65f9f6bde5a20793ca3c09a3d446
Parents: d69a34b
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Fri Mar 24 16:55:53 2017 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Fri Mar 24 18:45:05 2017 +0000
----------------------------------------------------------------------
.../JettyHTTPServerEngineFactory.java | 22 ++++++++++++++++++++
1 file changed, 22 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/5d4433e2/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactory.java
----------------------------------------------------------------------
diff --git a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactory.java b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactory.java
index bd468a6..f9d0765 100644
--- a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactory.java
+++ b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactory.java
@@ -263,15 +263,28 @@ public class JettyHTTPServerEngineFactory {
* server will listen on all local addresses.
* @param port listen port for server
* @param protocol "http" or "https"
+ * @param id The key to reference into the tlsParametersMap. Can be null.
* @return
* @throws GeneralSecurityException
* @throws IOException
*/
+<<<<<<< HEAD
public synchronized JettyHTTPServerEngine createJettyHTTPServerEngine(String host, int port,
String protocol) throws GeneralSecurityException, IOException {
LOG.fine("Creating Jetty HTTP Server Engine for port " + port + ".");
JettyHTTPServerEngine ref = getOrCreate(this, host, port, null);
// checking the protocol
+=======
+ public synchronized JettyHTTPServerEngine createJettyHTTPServerEngine(String host, int port,
+ String protocol, String id) throws GeneralSecurityException, IOException {
+ LOG.fine("Creating Jetty HTTP Server Engine for port " + port + ".");
+ TLSServerParameters tlsParameters = null;
+ if (id != null && tlsParametersMap != null && tlsParametersMap.containsKey(id)) {
+ tlsParameters = tlsParametersMap.get(id);
+ }
+ JettyHTTPServerEngine ref = getOrCreate(this, host, port, tlsParameters);
+ // checking the protocol
+>>>>>>> e70c78e... CXF-7299 - No way to configure TLS for the JettyHTTPServerEngineFactory in code
if (!protocol.equals(ref.getProtocol())) {
throw new IOException("Protocol mismatch for port " + port + ": "
+ "engine's protocol is " + ref.getProtocol()
@@ -301,7 +314,16 @@ public class JettyHTTPServerEngineFactory {
String protocol) throws GeneralSecurityException, IOException {
return createJettyHTTPServerEngine(null, port, protocol);
}
+<<<<<<< HEAD
+=======
+
+ public synchronized JettyHTTPServerEngine createJettyHTTPServerEngine(String host, int port,
+ String protocol) throws GeneralSecurityException, IOException {
+ return createJettyHTTPServerEngine(host, port, protocol, null);
+ }
+
+>>>>>>> e70c78e... CXF-7299 - No way to configure TLS for the JettyHTTPServerEngineFactory in code
/**
* This method removes the Server Engine from the port map and stops it.
*/
[2/3] cxf git commit: Recording .gitmergeinfo Changes
Posted by co...@apache.org.
Recording .gitmergeinfo Changes
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/6a23ff64
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/6a23ff64
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/6a23ff64
Branch: refs/heads/3.1.x-fixes
Commit: 6a23ff6455b9b2a2685a1587ca35010772601c58
Parents: 5d4433e
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Fri Mar 24 17:35:04 2017 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Fri Mar 24 18:45:05 2017 +0000
----------------------------------------------------------------------
.gitmergeinfo | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/6a23ff64/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index b2a2aed..e7ee421 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -483,6 +483,7 @@ M df3854cefae5d2da71f8d222a86218e81df7bd05
M e4cb2ea437185caa28b95a2344ffa8aa0ba516b7
M e578ea946aa13177adef98727e3e4606652ffc76
M e6d42f6d6684feb46fc0bfbc0520ed13f0f002aa
+M e70c78ead201362c1a2f0937c23d9c50e3ca9542
M e92e57c1f14de911cd2315a907443c79e91a94de
M eb31ffe4f95c4dc6ac9a2ac56e15ae89b578359e
M ed9298066428c0dfc4590a556876d696a4ba13c0