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 2018/10/03 16:14:48 UTC
[cxf] 07/07: Fixing some failing security systests with JDK11
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 4da42032f95e667a402b113d6daf4bd0514c6d60
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Wed Oct 3 17:13:56 2018 +0100
Fixing some failing security systests with JDK11
---
.../ws/wssec10/WSSecurity10UsernameAuthorizationLegacyTest.java | 4 ++--
.../systest/ws/wssec10/WSSecurity10UsernameAuthorizationTest.java | 8 ++++----
.../apache/cxf/systest/ws/wssec10/server/AuthorizedServer.java | 2 +-
.../apache/cxf/systest/ws/wssec10/server/AuthorizedServer2.java | 2 +-
...client_restricted_unauthorized.xml => client_unauthorized.xml} | 4 ++--
.../{server_restricted_authorized.xml => server_authorized.xml} | 4 ++--
...server_restricted_authorized_2.xml => server_authorized_2.xml} | 4 ++--
7 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/WSSecurity10UsernameAuthorizationLegacyTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/WSSecurity10UsernameAuthorizationLegacyTest.java
index 112912a..abe2dda 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/WSSecurity10UsernameAuthorizationLegacyTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/WSSecurity10UsernameAuthorizationLegacyTest.java
@@ -68,7 +68,7 @@ public class WSSecurity10UsernameAuthorizationLegacyTest extends AbstractBusClie
@Test
public void testClientServerComplexPolicyAuthorized() {
- String configName = "org/apache/cxf/systest/ws/wssec10/client_restricted.xml";
+ String configName = "org/apache/cxf/systest/ws/wssec10/client.xml";
Bus bus = new SpringBusFactory().createBus(configName);
IPingService port = getComplexPolicyPort(bus);
@@ -81,7 +81,7 @@ public class WSSecurity10UsernameAuthorizationLegacyTest extends AbstractBusClie
@Test
public void testClientServerComplexPolicyUnauthorized() {
- String configName = "org/apache/cxf/systest/ws/wssec10/client_restricted_unauthorized.xml";
+ String configName = "org/apache/cxf/systest/ws/wssec10/client_unauthorized.xml";
Bus bus = new SpringBusFactory().createBus(configName);
IPingService port = getComplexPolicyPort(bus);
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/WSSecurity10UsernameAuthorizationTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/WSSecurity10UsernameAuthorizationTest.java
index 26a6662..bb96736 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/WSSecurity10UsernameAuthorizationTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/WSSecurity10UsernameAuthorizationTest.java
@@ -69,7 +69,7 @@ public class WSSecurity10UsernameAuthorizationTest extends AbstractBusClientServ
@Test
public void testClientServerUTOnlyAuthorized() throws IOException {
- String configName = "org/apache/cxf/systest/ws/wssec10/client_restricted.xml";
+ String configName = "org/apache/cxf/systest/ws/wssec10/client.xml";
Bus bus = new SpringBusFactory().createBus(configName);
IPingService port = getUTOnlyPort(bus, false);
@@ -83,7 +83,7 @@ public class WSSecurity10UsernameAuthorizationTest extends AbstractBusClientServ
@Test
public void testClientServerUTOnlyUnauthorized() throws IOException {
- String configName = "org/apache/cxf/systest/ws/wssec10/client_restricted_unauthorized.xml";
+ String configName = "org/apache/cxf/systest/ws/wssec10/client_unauthorized.xml";
Bus bus = new SpringBusFactory().createBus(configName);
IPingService port = getUTOnlyPort(bus, true);
@@ -101,7 +101,7 @@ public class WSSecurity10UsernameAuthorizationTest extends AbstractBusClientServ
@Test
public void testClientServerComplexPolicyAuthorized() throws IOException {
- String configName = "org/apache/cxf/systest/ws/wssec10/client_restricted.xml";
+ String configName = "org/apache/cxf/systest/ws/wssec10/client.xml";
Bus bus = new SpringBusFactory().createBus(configName);
IPingService port = getComplexPolicyPort(bus);
@@ -115,7 +115,7 @@ public class WSSecurity10UsernameAuthorizationTest extends AbstractBusClientServ
@Test
public void testClientServerComplexPolicyUnauthorized() throws IOException {
- String configName = "org/apache/cxf/systest/ws/wssec10/client_restricted_unauthorized.xml";
+ String configName = "org/apache/cxf/systest/ws/wssec10/client_unauthorized.xml";
Bus bus = new SpringBusFactory().createBus(configName);
IPingService port = getComplexPolicyPort(bus);
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/AuthorizedServer.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/AuthorizedServer.java
index a170e92..de527ed 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/AuthorizedServer.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/AuthorizedServer.java
@@ -27,7 +27,7 @@ public class AuthorizedServer extends AbstractBusTestServerBase {
static final String PORT = allocatePort(AuthorizedServer.class);
private static String configFileName =
- "org/apache/cxf/systest/ws/wssec10/server_restricted_authorized.xml";
+ "org/apache/cxf/systest/ws/wssec10/server_authorized.xml";
public AuthorizedServer() throws Exception {
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/AuthorizedServer2.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/AuthorizedServer2.java
index ae04f61..73ebd65 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/AuthorizedServer2.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/AuthorizedServer2.java
@@ -27,7 +27,7 @@ public class AuthorizedServer2 extends AbstractBusTestServerBase {
static final String PORT = allocatePort(AuthorizedServer2.class);
private static String configFileName =
- "org/apache/cxf/systest/ws/wssec10/server_restricted_authorized_2.xml";
+ "org/apache/cxf/systest/ws/wssec10/server_authorized_2.xml";
public AuthorizedServer2() throws Exception {
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client_restricted_unauthorized.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client_unauthorized.xml
similarity index 97%
rename from systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client_restricted_unauthorized.xml
rename to systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client_unauthorized.xml
index a09fb2a..36093cb 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client_restricted_unauthorized.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client_unauthorized.xml
@@ -39,10 +39,10 @@
<http:conduit name="https://.*/UserNameOverTransport.*">
<http:tlsClientParameters disableCNCheck="true">
<sec:keyManagers keyPassword="password">
- <sec:keyStore type="jks" password="password" resource="certs/restricted/alice.jks"/>
+ <sec:keyStore type="jks" password="password" resource="keys/alice.jks"/>
</sec:keyManagers>
<sec:trustManagers>
- <sec:keyStore type="jks" password="password" resource="certs/restricted/bob.jks"/>
+ <sec:keyStore type="jks" password="password" resource="keys/bob.jks"/>
</sec:trustManagers>
</http:tlsClientParameters>
</http:conduit>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server_restricted_authorized.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server_authorized.xml
similarity index 98%
rename from systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server_restricted_authorized.xml
rename to systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server_authorized.xml
index fd692dd..adaeaec 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server_restricted_authorized.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server_authorized.xml
@@ -27,10 +27,10 @@
<httpj:engine port="${testutil.ports.wssec10.server.AuthorizedServer.1}">
<httpj:tlsServerParameters>
<sec:keyManagers keyPassword="password">
- <sec:keyStore type="jks" password="password" resource="certs/restricted/bob.jks"/>
+ <sec:keyStore type="jks" password="password" resource="keys/bob.jks"/>
</sec:keyManagers>
<sec:trustManagers>
- <sec:keyStore type="jks" password="password" resource="certs/restricted/alice.jks"/>
+ <sec:keyStore type="jks" password="password" resource="keys/alice.jks"/>
</sec:trustManagers>
<!--
<sec:clientAuthentication want="true" required="true"/>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server_restricted_authorized_2.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server_authorized_2.xml
similarity index 98%
rename from systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server_restricted_authorized_2.xml
rename to systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server_authorized_2.xml
index 2705b11..a3a6d46 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server_restricted_authorized_2.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server_authorized_2.xml
@@ -27,10 +27,10 @@
<httpj:engine port="${testutil.ports.AuthorizedServer2.1}">
<httpj:tlsServerParameters>
<sec:keyManagers keyPassword="password">
- <sec:keyStore type="jks" password="password" resource="certs/restricted/bob.jks"/>
+ <sec:keyStore type="jks" password="password" resource="keys/bob.jks"/>
</sec:keyManagers>
<sec:trustManagers>
- <sec:keyStore type="jks" password="password" resource="certs/restricted/alice.jks"/>
+ <sec:keyStore type="jks" password="password" resource="keys/alice.jks"/>
</sec:trustManagers>
<!--
<sec:clientAuthentication want="true" required="true"/>