This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push:
new b2b30af [CXF-7876]fix netty tests failure with openjdk11
b2b30af is described below
commit b2b30af081861b2f62dd38a86babae694af27355
Author: Freeman Fang <[email protected]>
AuthorDate: Fri Oct 19 13:31:36 2018 +0800
[CXF-7876]fix netty tests failure with openjdk11
---
rt/transports/http-netty/netty-client/pom.xml | 7 +++++++
.../http/netty/client/integration/SSLNettyClientTest.java | 9 +++++----
.../cxf/transport/http/netty/client/integration/ServerConfig.xml | 4 ++--
rt/transports/http-netty/netty-server/pom.xml | 7 +++++++
.../http/netty/server/integration/SSLNettyServerTest.java | 8 ++++----
.../http/netty/server/integration/ApplicationContext.xml | 4 ++--
.../cxf/transport/http/netty/server/integration/ServerConfig.xml | 4 ++--
7 files changed, 29 insertions(+), 14 deletions(-)
diff --git a/rt/transports/http-netty/netty-client/pom.xml
b/rt/transports/http-netty/netty-client/pom.xml
index 5162fbe..2152603 100644
--- a/rt/transports/http-netty/netty-client/pom.xml
+++ b/rt/transports/http-netty/netty-client/pom.xml
@@ -81,6 +81,13 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-testutils</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ <classifier>keys</classifier>
+ </dependency>
<!-- Need to run some integration with jaxws frond end -->
<dependency>
<groupId>org.apache.cxf</groupId>
diff --git
a/rt/transports/http-netty/netty-client/src/test/java/org/apache/cxf/transport/http/netty/client/integration/SSLNettyClientTest.java
b/rt/transports/http-netty/netty-client/src/test/java/org/apache/cxf/transport/http/netty/client/integration/SSLNettyClientTest.java
index 8855ce3..a6c0dfd 100644
---
a/rt/transports/http-netty/netty-client/src/test/java/org/apache/cxf/transport/http/netty/client/integration/SSLNettyClientTest.java
+++
b/rt/transports/http-netty/netty-client/src/test/java/org/apache/cxf/transport/http/netty/client/integration/SSLNettyClientTest.java
@@ -18,7 +18,6 @@
*/
package org.apache.cxf.transport.http.netty.client.integration;
-import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.net.URL;
@@ -124,22 +123,24 @@ public class SSLNettyClientTest extends
AbstractBusClientServerTestBase {
private static void setupTLS(Greeter port)
throws FileNotFoundException, IOException, GeneralSecurityException {
String keyStoreLoc =
-
"src/test/resources/org/apache/cxf/transport/http/netty/client/integration/clientKeystore.jks";
+ "/keys/clientstore.jks";
NettyHttpConduit httpConduit = (NettyHttpConduit)
ClientProxy.getClient(port).getConduit();
TLSClientParameters tlsCP = new TLSClientParameters();
String keyPassword = "ckpass";
KeyStore keyStore = KeyStore.getInstance("JKS");
- keyStore.load(new FileInputStream(keyStoreLoc),
"cspass".toCharArray());
+
keyStore.load(SSLNettyClientTest.class.getResourceAsStream(keyStoreLoc),
"cspass".toCharArray());
KeyManager[] myKeyManagers = getKeyManagers(keyStore, keyPassword);
tlsCP.setKeyManagers(myKeyManagers);
KeyStore trustStore = KeyStore.getInstance("JKS");
- trustStore.load(new FileInputStream(keyStoreLoc),
"cspass".toCharArray());
+
trustStore.load(SSLNettyClientTest.class.getResourceAsStream(keyStoreLoc),
"cspass".toCharArray());
TrustManager[] myTrustStoreKeyManagers = getTrustManagers(trustStore);
tlsCP.setTrustManagers(myTrustStoreKeyManagers);
+
+ tlsCP.setDisableCNCheck(true);
httpConduit.setTlsClientParameters(tlsCP);
}
diff --git
a/rt/transports/http-netty/netty-client/src/test/resources/org/apache/cxf/transport/http/netty/client/integration/ServerConfig.xml
b/rt/transports/http-netty/netty-client/src/test/resources/org/apache/cxf/transport/http/netty/client/integration/ServerConfig.xml
index b909085..cb524db 100644
---
a/rt/transports/http-netty/netty-client/src/test/resources/org/apache/cxf/transport/http/netty/client/integration/ServerConfig.xml
+++
b/rt/transports/http-netty/netty-client/src/test/resources/org/apache/cxf/transport/http/netty/client/integration/ServerConfig.xml
@@ -28,10 +28,10 @@
<httpj:engine port="${SSLNettyClientTest.port}">
<httpj:tlsServerParameters>
<sec:keyManagers keyPassword="skpass">
- <sec:keyStore
file="src/test/resources/org/apache/cxf/transport/http/netty/client/integration/serviceKeystore.jks"
password="sspass" type="JKS"/>
+ <sec:keyStore type="jks" password="sspass"
resource="keys/servicestore.jks"/>
</sec:keyManagers>
<sec:trustManagers>
- <sec:keyStore
file="src/test/resources/org/apache/cxf/transport/http/netty/client/integration/serviceKeystore.jks"
password="sspass" type="JKS"/>
+ <sec:keyStore type="jks" password="stsspass"
resource="keys/stsstore.jks"/>
</sec:trustManagers>
<sec:clientAuthentication want="true" required="true"/>
</httpj:tlsServerParameters>
diff --git a/rt/transports/http-netty/netty-server/pom.xml
b/rt/transports/http-netty/netty-server/pom.xml
index 74c96ec..78435f0 100644
--- a/rt/transports/http-netty/netty-server/pom.xml
+++ b/rt/transports/http-netty/netty-server/pom.xml
@@ -120,6 +120,13 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-testutils</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ <classifier>keys</classifier>
+ </dependency>
<!-- Need to run some integration with jaxws frond end -->
<dependency>
<groupId>org.apache.cxf</groupId>
diff --git
a/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/integration/SSLNettyServerTest.java
b/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/integration/SSLNettyServerTest.java
index b602ba8..9849596 100644
---
a/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/integration/SSLNettyServerTest.java
+++
b/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/integration/SSLNettyServerTest.java
@@ -18,7 +18,6 @@
*/
package org.apache.cxf.transport.http.netty.server.integration;
-import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.net.URL;
@@ -110,22 +109,23 @@ public class SSLNettyServerTest extends
AbstractBusClientServerTestBase {
private static void setupTLS(Greeter port)
throws FileNotFoundException, IOException, GeneralSecurityException {
String keyStoreLoc =
-
"src/test/resources/org/apache/cxf/transport/http/netty/server/integration/clientKeystore.jks";
+ "/keys/clientstore.jks";
HTTPConduit httpConduit = (HTTPConduit)
ClientProxy.getClient(port).getConduit();
TLSClientParameters tlsCP = new TLSClientParameters();
String keyPassword = "ckpass";
KeyStore keyStore = KeyStore.getInstance("JKS");
- keyStore.load(new FileInputStream(keyStoreLoc),
"cspass".toCharArray());
+
keyStore.load(SSLNettyServerTest.class.getResourceAsStream(keyStoreLoc),
"cspass".toCharArray());
KeyManager[] myKeyManagers = getKeyManagers(keyStore, keyPassword);
tlsCP.setKeyManagers(myKeyManagers);
KeyStore trustStore = KeyStore.getInstance("JKS");
- trustStore.load(new FileInputStream(keyStoreLoc),
"cspass".toCharArray());
+
trustStore.load(SSLNettyServerTest.class.getResourceAsStream(keyStoreLoc),
"cspass".toCharArray());
TrustManager[] myTrustStoreKeyManagers = getTrustManagers(trustStore);
tlsCP.setTrustManagers(myTrustStoreKeyManagers);
+ tlsCP.setDisableCNCheck(true);
httpConduit.setTlsClientParameters(tlsCP);
}
diff --git
a/rt/transports/http-netty/netty-server/src/test/resources/org/apache/cxf/transport/http/netty/server/integration/ApplicationContext.xml
b/rt/transports/http-netty/netty-server/src/test/resources/org/apache/cxf/transport/http/netty/server/integration/ApplicationContext.xml
index d1a150e..cc7cb09 100644
---
a/rt/transports/http-netty/netty-server/src/test/resources/org/apache/cxf/transport/http/netty/server/integration/ApplicationContext.xml
+++
b/rt/transports/http-netty/netty-server/src/test/resources/org/apache/cxf/transport/http/netty/server/integration/ApplicationContext.xml
@@ -30,10 +30,10 @@
<httpn:engine port="${SSLNettySpringServerTest.port}">
<httpn:tlsServerParameters>
<sec:keyManagers keyPassword="skpass">
- <sec:keyStore
file="src/test/resources/org/apache/cxf/transport/http/netty/server/integration/serviceKeystore.jks"
password="sspass" type="JKS"/>
+ <sec:keyStore type="jks" password="sspass"
resource="keys/servicestore.jks"/>
</sec:keyManagers>
<sec:trustManagers>
- <sec:keyStore
file="src/test/resources/org/apache/cxf/transport/http/netty/server/integration/serviceKeystore.jks"
password="sspass" type="JKS"/>
+ <sec:keyStore type="jks" password="stsspass"
resource="keys/stsstore.jks"/>
</sec:trustManagers>
<sec:clientAuthentication want="true" required="true"/>
</httpn:tlsServerParameters>
diff --git
a/rt/transports/http-netty/netty-server/src/test/resources/org/apache/cxf/transport/http/netty/server/integration/ServerConfig.xml
b/rt/transports/http-netty/netty-server/src/test/resources/org/apache/cxf/transport/http/netty/server/integration/ServerConfig.xml
index ad58bf5..e6b7c02 100644
---
a/rt/transports/http-netty/netty-server/src/test/resources/org/apache/cxf/transport/http/netty/server/integration/ServerConfig.xml
+++
b/rt/transports/http-netty/netty-server/src/test/resources/org/apache/cxf/transport/http/netty/server/integration/ServerConfig.xml
@@ -28,10 +28,10 @@
<httpn:engine port="${SSLNettyServerTest.port}">
<httpn:tlsServerParameters>
<sec:keyManagers keyPassword="skpass">
- <sec:keyStore
file="src/test/resources/org/apache/cxf/transport/http/netty/server/integration/serviceKeystore.jks"
password="sspass" type="JKS"/>
+ <sec:keyStore type="jks" password="sspass"
resource="keys/servicestore.jks"/>
</sec:keyManagers>
<sec:trustManagers>
- <sec:keyStore
file="src/test/resources/org/apache/cxf/transport/http/netty/server/integration/serviceKeystore.jks"
password="sspass" type="JKS"/>
+ <sec:keyStore resource="keys/stsstore.jks"
password="stsspass" type="JKS"/>
</sec:trustManagers>
<sec:clientAuthentication want="true" required="true"/>
</httpn:tlsServerParameters>
