You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2020/02/05 17:22:05 UTC
[qpid-broker-j] 01/02: QPID-8404: [Broker-J] Change jetty ssl
context factory to SslContextFactory.Server
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
commit e8725e904e0ce013f7e50ffb5dd5e95b7520c578
Author: Alex Rudyy <or...@apache.org>
AuthorDate: Wed Feb 5 16:34:27 2020 +0000
QPID-8404: [Broker-J] Change jetty ssl context factory to SslContextFactory.Server
---
.../server/security/auth/manager/oauth2/OAuth2MockEndpointHolder.java | 2 +-
.../management/plugin/portunification/TlsOrPlainConnectionFactory.java | 2 +-
.../org/apache/qpid/server/transport/websocket/WebSocketProvider.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/oauth2/OAuth2MockEndpointHolder.java b/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/oauth2/OAuth2MockEndpointHolder.java
index 636def9..f4e2cc6 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/oauth2/OAuth2MockEndpointHolder.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/oauth2/OAuth2MockEndpointHolder.java
@@ -77,7 +77,7 @@ class OAuth2MockEndpointHolder
CommonProperties.QPID_SECURITY_TLS_CIPHER_SUITE_BLACK_LIST_DEFAULT);
_server = new Server();
- SslContextFactory sslContextFactory = new SslContextFactory()
+ SslContextFactory.Server sslContextFactory = new SslContextFactory.Server()
{
@Override
public void customize(final SSLEngine sslEngine)
diff --git a/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/portunification/TlsOrPlainConnectionFactory.java b/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/portunification/TlsOrPlainConnectionFactory.java
index 19685a2..5c094fb 100644
--- a/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/portunification/TlsOrPlainConnectionFactory.java
+++ b/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/portunification/TlsOrPlainConnectionFactory.java
@@ -53,7 +53,7 @@ public class TlsOrPlainConnectionFactory extends AbstractConnectionFactory
@Name("nextProtocol") final String nextProtocol)
{
super("SSL");
- _sslContextFactory = factory == null ? new SslContextFactory() : factory;
+ _sslContextFactory = factory == null ? new SslContextFactory.Server() : factory;
_nextProtocol = nextProtocol;
this.addBean(this._sslContextFactory);
}
diff --git a/broker-plugins/websocket/src/main/java/org/apache/qpid/server/transport/websocket/WebSocketProvider.java b/broker-plugins/websocket/src/main/java/org/apache/qpid/server/transport/websocket/WebSocketProvider.java
index 2d4e494..b098b54 100644
--- a/broker-plugins/websocket/src/main/java/org/apache/qpid/server/transport/websocket/WebSocketProvider.java
+++ b/broker-plugins/websocket/src/main/java/org/apache/qpid/server/transport/websocket/WebSocketProvider.java
@@ -251,7 +251,7 @@ class WebSocketProvider implements AcceptingTransport
private SslContextFactory createSslContextFactory(final AmqpPort<?> port)
{
- SslContextFactory sslContextFactory = new SslContextFactory()
+ SslContextFactory.Server sslContextFactory = new SslContextFactory.Server()
{
@Override
public void customize(final SSLEngine sslEngine)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org