You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by bu...@apache.org on 2020/08/26 08:18:56 UTC
[cxf-fediz] branch master updated (7d53fa5 -> 250b42b)
This is an automated email from the ASF dual-hosted git repository.
buhhunyx pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git.
from 7d53fa5 FEDIZ-251 - Adding some tests
new 217ca81 Update to ehcache 3.8.1
new 250b42b Replace deprecated api usage
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../core/samlsso/SAMLEncryptedResponseTest.java | 32 -----------------
pom.xml | 2 +-
.../WEB-INF/views/oAuthAuthorizationData.jsp | 4 +--
.../systests/custom/CustomParametersTest.java | 18 +++++-----
.../cxf/fediz/systests/cxf/FederationTest.java | 36 +++++++++----------
.../cxf/fediz/systests/cxf/TokenExpiryTest.java | 36 +++++++++----------
.../WEB-INF/views/oAuthAuthorizationData.jsp | 4 +--
.../systests/federation/samlsso/SAMLSSOTest.java | 18 +++++-----
.../systests/federation/unknown/WSFedTest.java | 18 +++++-----
.../fediz/systests/federation/wsfed/WSFedTest.java | 18 +++++-----
.../org/apache/cxf/fediz/systests/idp/IdpTest.java | 42 +++++++++++-----------
.../cxf/fediz/systests/jetty9/TomcatUtils.java | 18 +++++-----
.../cxf/fediz/systests/kerberos/KerberosTest.java | 18 +++++-----
.../apache/cxf/fediz/systests/ldap/LDAPTest.java | 18 +++++-----
.../cxf/fediz/systests/oidc/AbstractOIDCTest.java | 16 ++++-----
.../apache/cxf/fediz/systests/samlsso/CXFTest.java | 18 +++++-----
.../apache/cxf/fediz/systests/samlsso/IdpTest.java | 18 +++++-----
.../cxf/fediz/systests/samlsso/JettyTest.java | 18 +++++-----
.../cxf/fediz/systests/samlsso/SpringTest.java | 18 +++++-----
.../fediz/systests/samlsso/TomcatPluginTest.java | 18 +++++-----
.../cxf/fediz/systests/spring/SpringTest.java | 18 +++++-----
.../cxf/fediz/systests/spring/TokenExpiryTest.java | 18 +++++-----
.../cxf/fediz/systests/tomcat/TomcatLauncher.java | 14 ++++----
.../fediz/systests/websphere/WebsphereTest.java | 18 +++++-----
24 files changed, 212 insertions(+), 244 deletions(-)
[cxf-fediz] 02/02: Replace deprecated api usage
Posted by bu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
buhhunyx pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git
commit 250b42b05e1c7e6a56fa058707263b18ebba9498
Author: Alexey Markevich <bu...@gmail.com>
AuthorDate: Wed Aug 26 11:18:05 2020 +0300
Replace deprecated api usage
---
.../core/samlsso/SAMLEncryptedResponseTest.java | 32 -----------------
.../WEB-INF/views/oAuthAuthorizationData.jsp | 4 +--
.../systests/custom/CustomParametersTest.java | 18 +++++-----
.../cxf/fediz/systests/cxf/FederationTest.java | 36 +++++++++----------
.../cxf/fediz/systests/cxf/TokenExpiryTest.java | 36 +++++++++----------
.../WEB-INF/views/oAuthAuthorizationData.jsp | 4 +--
.../systests/federation/samlsso/SAMLSSOTest.java | 18 +++++-----
.../systests/federation/unknown/WSFedTest.java | 18 +++++-----
.../fediz/systests/federation/wsfed/WSFedTest.java | 18 +++++-----
.../org/apache/cxf/fediz/systests/idp/IdpTest.java | 42 +++++++++++-----------
.../cxf/fediz/systests/jetty9/TomcatUtils.java | 18 +++++-----
.../cxf/fediz/systests/kerberos/KerberosTest.java | 18 +++++-----
.../apache/cxf/fediz/systests/ldap/LDAPTest.java | 18 +++++-----
.../cxf/fediz/systests/oidc/AbstractOIDCTest.java | 16 ++++-----
.../apache/cxf/fediz/systests/samlsso/CXFTest.java | 18 +++++-----
.../apache/cxf/fediz/systests/samlsso/IdpTest.java | 18 +++++-----
.../cxf/fediz/systests/samlsso/JettyTest.java | 18 +++++-----
.../cxf/fediz/systests/samlsso/SpringTest.java | 18 +++++-----
.../fediz/systests/samlsso/TomcatPluginTest.java | 18 +++++-----
.../cxf/fediz/systests/spring/SpringTest.java | 18 +++++-----
.../cxf/fediz/systests/spring/TokenExpiryTest.java | 18 +++++-----
.../cxf/fediz/systests/tomcat/TomcatLauncher.java | 14 ++++----
.../fediz/systests/websphere/WebsphereTest.java | 18 +++++-----
23 files changed, 211 insertions(+), 243 deletions(-)
diff --git a/plugins/core/src/test/java/org/apache/cxf/fediz/core/samlsso/SAMLEncryptedResponseTest.java b/plugins/core/src/test/java/org/apache/cxf/fediz/core/samlsso/SAMLEncryptedResponseTest.java
index fb1e001..2c2b20a 100644
--- a/plugins/core/src/test/java/org/apache/cxf/fediz/core/samlsso/SAMLEncryptedResponseTest.java
+++ b/plugins/core/src/test/java/org/apache/cxf/fediz/core/samlsso/SAMLEncryptedResponseTest.java
@@ -371,38 +371,6 @@ public class SAMLEncryptedResponseTest {
return encodeResponse(response);
}
- private Element createSamlResponse(SamlAssertionWrapper assertion, String alias,
- boolean sign, String requestID)
- throws IOException, UnsupportedCallbackException, WSSecurityException, Exception {
- WSPasswordCallback[] cb = {
- new WSPasswordCallback(alias, WSPasswordCallback.SIGNATURE)
- };
- cbPasswordHandler.handle(cb);
- String password = cb[0].getPassword();
-
- if (sign) {
- assertion.signAssertion(alias, password, crypto, false);
- }
-
- DocumentBuilder docBuilder = docBuilderFactory.newDocumentBuilder();
-
- Status status =
- SAML2PResponseComponentBuilder.createStatus(
- "urn:oasis:names:tc:SAML:2.0:status:Success", null
- );
- Response response =
- SAML2PResponseComponentBuilder.createSAMLResponse(requestID,
- assertion.getIssuerString(),
- status);
- response.getAssertions().add(assertion.getSaml2());
-
- Document doc = docBuilder.newDocument();
- Element policyElement = OpenSAMLUtil.toDom(response, doc);
- doc.appendChild(policyElement);
-
- return policyElement;
- }
-
private Element createEncryptedSamlResponse(SamlAssertionWrapper assertion, String alias,
boolean sign, String requestID)
throws IOException, UnsupportedCallbackException, WSSecurityException, Exception {
diff --git a/services/oidc/src/main/webapp/WEB-INF/views/oAuthAuthorizationData.jsp b/services/oidc/src/main/webapp/WEB-INF/views/oAuthAuthorizationData.jsp
index 6fc7065..e1dace4 100644
--- a/services/oidc/src/main/webapp/WEB-INF/views/oAuthAuthorizationData.jsp
+++ b/services/oidc/src/main/webapp/WEB-INF/views/oAuthAuthorizationData.jsp
@@ -87,7 +87,7 @@
<td>
<input type="checkbox"
<%
- if (perm.isDefault() || authorizedScopes.contains(perm.getPermission())) {
+ if (perm.isDefaultPermission() || authorizedScopes.contains(perm.getPermission())) {
%>
disabled="disabled"
<%
@@ -98,7 +98,7 @@
value="allow"
><big><big><%= perm.getDescription() %></big></big></input>
<%
- if (perm.isDefault()) {
+ if (perm.isDefaultPermission()) {
%>
<input type="hidden" name="<%= perm.getPermission()%>_status" value="allow" />
<%
diff --git a/systests/custom/src/test/java/org/apache/cxf/fediz/systests/custom/CustomParametersTest.java b/systests/custom/src/test/java/org/apache/cxf/fediz/systests/custom/CustomParametersTest.java
index f21d9bd..6a38a20 100644
--- a/systests/custom/src/test/java/org/apache/cxf/fediz/systests/custom/CustomParametersTest.java
+++ b/systests/custom/src/test/java/org/apache/cxf/fediz/systests/custom/CustomParametersTest.java
@@ -86,20 +86,20 @@ public class CustomParametersTest {
httpsConnector.setPort(Integer.parseInt(port));
httpsConnector.setSecure(true);
httpsConnector.setScheme("https");
- httpsConnector.setAttribute("sslProtocol", "TLS");
- httpsConnector.setAttribute("SSLEnabled", true);
-// httpsConnector.setAttribute("keyAlias", "mytomidpkey");
- httpsConnector.setAttribute("keystorePass", "tompass");
- httpsConnector.setAttribute("keystoreFile", "test-classes/server.jks");
+ httpsConnector.setProperty("sslProtocol", "TLS");
+ httpsConnector.setProperty("SSLEnabled", "true");
+// httpsConnector.setProperty("keyAlias", "mytomidpkey");
+ httpsConnector.setProperty("keystorePass", "tompass");
+ httpsConnector.setProperty("keystoreFile", "test-classes/server.jks");
server.getService().addConnector(httpsConnector);
if (idp) {
server.getHost().setAppBase("tomcat/idp/webapps");
- httpsConnector.setAttribute("truststorePass", "tompass");
- httpsConnector.setAttribute("truststoreFile", "test-classes/server.jks");
- httpsConnector.setAttribute("clientAuth", "want");
+ httpsConnector.setProperty("truststorePass", "tompass");
+ httpsConnector.setProperty("truststoreFile", "test-classes/server.jks");
+ httpsConnector.setProperty("clientAuth", "want");
Path stsWebapp = targetDir.resolve(server.getHost().getAppBase()).resolve("fediz-idp-sts");
server.addWebapp("/fediz-idp-sts", stsWebapp.toString());
@@ -109,7 +109,7 @@ public class CustomParametersTest {
} else {
server.getHost().setAppBase("tomcat/rp/webapps");
- httpsConnector.setAttribute("clientAuth", "false");
+ httpsConnector.setProperty("clientAuth", "false");
Path rpWebapp = targetDir.resolve(server.getHost().getAppBase()).resolve("simpleWebapp");
Context cxt = server.addWebapp("/fedizhelloworld", rpWebapp.toString());
diff --git a/systests/cxf/src/test/java/org/apache/cxf/fediz/systests/cxf/FederationTest.java b/systests/cxf/src/test/java/org/apache/cxf/fediz/systests/cxf/FederationTest.java
index 30153c7..84cc44e 100644
--- a/systests/cxf/src/test/java/org/apache/cxf/fediz/systests/cxf/FederationTest.java
+++ b/systests/cxf/src/test/java/org/apache/cxf/fediz/systests/cxf/FederationTest.java
@@ -78,15 +78,15 @@ public class FederationTest extends AbstractTests {
httpsConnector.setPort(Integer.parseInt(idpHttpsPort));
httpsConnector.setSecure(true);
httpsConnector.setScheme("https");
- httpsConnector.setAttribute("keyAlias", "mytomidpkey");
- httpsConnector.setAttribute("keystorePass", "tompass");
- httpsConnector.setAttribute("keystoreFile", "test-classes/server.jks");
- httpsConnector.setAttribute("truststorePass", "tompass");
- httpsConnector.setAttribute("truststoreFile", "test-classes/server.jks");
- httpsConnector.setAttribute("clientAuth", "want");
- // httpsConnector.setAttribute("clientAuth", "false");
- httpsConnector.setAttribute("sslProtocol", "TLS");
- httpsConnector.setAttribute("SSLEnabled", true);
+ httpsConnector.setProperty("keyAlias", "mytomidpkey");
+ httpsConnector.setProperty("keystorePass", "tompass");
+ httpsConnector.setProperty("keystoreFile", "test-classes/server.jks");
+ httpsConnector.setProperty("truststorePass", "tompass");
+ httpsConnector.setProperty("truststoreFile", "test-classes/server.jks");
+ httpsConnector.setProperty("clientAuth", "want");
+ // httpsConnector.setProperty("clientAuth", "false");
+ httpsConnector.setProperty("sslProtocol", "TLS");
+ httpsConnector.setProperty("SSLEnabled", "true");
idpServer.getService().addConnector(httpsConnector);
@@ -114,15 +114,15 @@ public class FederationTest extends AbstractTests {
httpsConnector.setPort(Integer.parseInt(rpHttpsPort));
httpsConnector.setSecure(true);
httpsConnector.setScheme("https");
- httpsConnector.setAttribute("keyAlias", "mytomidpkey");
- httpsConnector.setAttribute("keystorePass", "tompass");
- httpsConnector.setAttribute("keystoreFile", "test-classes/server.jks");
- httpsConnector.setAttribute("truststorePass", "tompass");
- httpsConnector.setAttribute("truststoreFile", "test-classes/server.jks");
- // httpsConnector.setAttribute("clientAuth", "false");
- httpsConnector.setAttribute("clientAuth", "want");
- httpsConnector.setAttribute("sslProtocol", "TLS");
- httpsConnector.setAttribute("SSLEnabled", true);
+ httpsConnector.setProperty("keyAlias", "mytomidpkey");
+ httpsConnector.setProperty("keystorePass", "tompass");
+ httpsConnector.setProperty("keystoreFile", "test-classes/server.jks");
+ httpsConnector.setProperty("truststorePass", "tompass");
+ httpsConnector.setProperty("truststoreFile", "test-classes/server.jks");
+ // httpsConnector.setProperty("clientAuth", "false");
+ httpsConnector.setProperty("clientAuth", "want");
+ httpsConnector.setProperty("sslProtocol", "TLS");
+ httpsConnector.setProperty("SSLEnabled", "true");
rpServer.getService().addConnector(httpsConnector);
diff --git a/systests/cxf/src/test/java/org/apache/cxf/fediz/systests/cxf/TokenExpiryTest.java b/systests/cxf/src/test/java/org/apache/cxf/fediz/systests/cxf/TokenExpiryTest.java
index 835d61a..5e2218e 100644
--- a/systests/cxf/src/test/java/org/apache/cxf/fediz/systests/cxf/TokenExpiryTest.java
+++ b/systests/cxf/src/test/java/org/apache/cxf/fediz/systests/cxf/TokenExpiryTest.java
@@ -68,15 +68,15 @@ public class TokenExpiryTest extends AbstractExpiryTests {
httpsConnector.setPort(Integer.parseInt(idpHttpsPort));
httpsConnector.setSecure(true);
httpsConnector.setScheme("https");
- httpsConnector.setAttribute("keyAlias", "mytomidpkey");
- httpsConnector.setAttribute("keystorePass", "tompass");
- httpsConnector.setAttribute("keystoreFile", "test-classes/server.jks");
- httpsConnector.setAttribute("truststorePass", "tompass");
- httpsConnector.setAttribute("truststoreFile", "test-classes/server.jks");
- httpsConnector.setAttribute("clientAuth", "want");
- // httpsConnector.setAttribute("clientAuth", "false");
- httpsConnector.setAttribute("sslProtocol", "TLS");
- httpsConnector.setAttribute("SSLEnabled", true);
+ httpsConnector.setProperty("keyAlias", "mytomidpkey");
+ httpsConnector.setProperty("keystorePass", "tompass");
+ httpsConnector.setProperty("keystoreFile", "test-classes/server.jks");
+ httpsConnector.setProperty("truststorePass", "tompass");
+ httpsConnector.setProperty("truststoreFile", "test-classes/server.jks");
+ httpsConnector.setProperty("clientAuth", "want");
+ // httpsConnector.setProperty("clientAuth", "false");
+ httpsConnector.setProperty("sslProtocol", "TLS");
+ httpsConnector.setProperty("SSLEnabled", "true");
idpServer.getService().addConnector(httpsConnector);
@@ -104,15 +104,15 @@ public class TokenExpiryTest extends AbstractExpiryTests {
httpsConnector.setPort(Integer.parseInt(rpHttpsPort));
httpsConnector.setSecure(true);
httpsConnector.setScheme("https");
- httpsConnector.setAttribute("keyAlias", "mytomidpkey");
- httpsConnector.setAttribute("keystorePass", "tompass");
- httpsConnector.setAttribute("keystoreFile", "test-classes/server.jks");
- httpsConnector.setAttribute("truststorePass", "tompass");
- httpsConnector.setAttribute("truststoreFile", "test-classes/server.jks");
- // httpsConnector.setAttribute("clientAuth", "false");
- httpsConnector.setAttribute("clientAuth", "want");
- httpsConnector.setAttribute("sslProtocol", "TLS");
- httpsConnector.setAttribute("SSLEnabled", true);
+ httpsConnector.setProperty("keyAlias", "mytomidpkey");
+ httpsConnector.setProperty("keystorePass", "tompass");
+ httpsConnector.setProperty("keystoreFile", "test-classes/server.jks");
+ httpsConnector.setProperty("truststorePass", "tompass");
+ httpsConnector.setProperty("truststoreFile", "test-classes/server.jks");
+ // httpsConnector.setProperty("clientAuth", "false");
+ httpsConnector.setProperty("clientAuth", "want");
+ httpsConnector.setProperty("sslProtocol", "TLS");
+ httpsConnector.setProperty("SSLEnabled", "true");
rpServer.getService().addConnector(httpsConnector);
diff --git a/systests/federation/oidcIdpWebapp/src/main/webapp/WEB-INF/views/oAuthAuthorizationData.jsp b/systests/federation/oidcIdpWebapp/src/main/webapp/WEB-INF/views/oAuthAuthorizationData.jsp
index 1a71624..aac46e7 100644
--- a/systests/federation/oidcIdpWebapp/src/main/webapp/WEB-INF/views/oAuthAuthorizationData.jsp
+++ b/systests/federation/oidcIdpWebapp/src/main/webapp/WEB-INF/views/oAuthAuthorizationData.jsp
@@ -86,7 +86,7 @@
<td>
<input type="checkbox"
<%
- if (perm.isDefault() || authorizedScopes.contains(perm.getPermission())) {
+ if (perm.isDefaultPermission() || authorizedScopes.contains(perm.getPermission())) {
%>
disabled="disabled"
<%
@@ -97,7 +97,7 @@
value="allow"
><big><big><%= perm.getDescription() %></big></big></input>
<%
- if (perm.isDefault()) {
+ if (perm.isDefaultPermission()) {
%>
<input type="hidden" name="<%= perm.getPermission()%>_status" value="allow" />
<%
diff --git a/systests/federation/samlsso/src/test/java/org/apache/cxf/fediz/systests/federation/samlsso/SAMLSSOTest.java b/systests/federation/samlsso/src/test/java/org/apache/cxf/fediz/systests/federation/samlsso/SAMLSSOTest.java
index dbec2c3..d94033a 100644
--- a/systests/federation/samlsso/src/test/java/org/apache/cxf/fediz/systests/federation/samlsso/SAMLSSOTest.java
+++ b/systests/federation/samlsso/src/test/java/org/apache/cxf/fediz/systests/federation/samlsso/SAMLSSOTest.java
@@ -116,15 +116,15 @@ public class SAMLSSOTest {
httpsConnector.setPort(Integer.parseInt(port));
httpsConnector.setSecure(true);
httpsConnector.setScheme("https");
- httpsConnector.setAttribute("keyAlias", "mytomidpkey");
- httpsConnector.setAttribute("keystorePass", "tompass");
- httpsConnector.setAttribute("keystoreFile", "test-classes/server.jks");
- httpsConnector.setAttribute("truststorePass", "tompass");
- httpsConnector.setAttribute("truststoreFile", "test-classes/server.jks");
- httpsConnector.setAttribute("clientAuth", "want");
- // httpsConnector.setAttribute("clientAuth", "false");
- httpsConnector.setAttribute("sslProtocol", "TLS");
- httpsConnector.setAttribute("SSLEnabled", true);
+ httpsConnector.setProperty("keyAlias", "mytomidpkey");
+ httpsConnector.setProperty("keystorePass", "tompass");
+ httpsConnector.setProperty("keystoreFile", "test-classes/server.jks");
+ httpsConnector.setProperty("truststorePass", "tompass");
+ httpsConnector.setProperty("truststoreFile", "test-classes/server.jks");
+ httpsConnector.setProperty("clientAuth", "want");
+ // httpsConnector.setProperty("clientAuth", "false");
+ httpsConnector.setProperty("sslProtocol", "TLS");
+ httpsConnector.setProperty("SSLEnabled", "true");
server.getService().addConnector(httpsConnector);
diff --git a/systests/federation/unknown-subject/src/test/java/org/apache/cxf/fediz/systests/federation/unknown/WSFedTest.java b/systests/federation/unknown-subject/src/test/java/org/apache/cxf/fediz/systests/federation/unknown/WSFedTest.java
index 96d64e0..85c9ab3 100644
--- a/systests/federation/unknown-subject/src/test/java/org/apache/cxf/fediz/systests/federation/unknown/WSFedTest.java
+++ b/systests/federation/unknown-subject/src/test/java/org/apache/cxf/fediz/systests/federation/unknown/WSFedTest.java
@@ -105,15 +105,15 @@ public class WSFedTest {
httpsConnector.setPort(Integer.parseInt(port));
httpsConnector.setSecure(true);
httpsConnector.setScheme("https");
- httpsConnector.setAttribute("keyAlias", "mytomidpkey");
- httpsConnector.setAttribute("keystorePass", "tompass");
- httpsConnector.setAttribute("keystoreFile", "test-classes/server.jks");
- httpsConnector.setAttribute("truststorePass", "tompass");
- httpsConnector.setAttribute("truststoreFile", "test-classes/server.jks");
- httpsConnector.setAttribute("clientAuth", "want");
- // httpsConnector.setAttribute("clientAuth", "false");
- httpsConnector.setAttribute("sslProtocol", "TLS");
- httpsConnector.setAttribute("SSLEnabled", true);
+ httpsConnector.setProperty("keyAlias", "mytomidpkey");
+ httpsConnector.setProperty("keystorePass", "tompass");
+ httpsConnector.setProperty("keystoreFile", "test-classes/server.jks");
+ httpsConnector.setProperty("truststorePass", "tompass");
+ httpsConnector.setProperty("truststoreFile", "test-classes/server.jks");
+ httpsConnector.setProperty("clientAuth", "want");
+ // httpsConnector.setProperty("clientAuth", "false");
+ httpsConnector.setProperty("sslProtocol", "TLS");
+ httpsConnector.setProperty("SSLEnabled", "true");
server.getService().addConnector(httpsConnector);
diff --git a/systests/federation/wsfed/src/test/java/org/apache/cxf/fediz/systests/federation/wsfed/WSFedTest.java b/systests/federation/wsfed/src/test/java/org/apache/cxf/fediz/systests/federation/wsfed/WSFedTest.java
index 0d5808d..81ade30 100644
--- a/systests/federation/wsfed/src/test/java/org/apache/cxf/fediz/systests/federation/wsfed/WSFedTest.java
+++ b/systests/federation/wsfed/src/test/java/org/apache/cxf/fediz/systests/federation/wsfed/WSFedTest.java
@@ -113,14 +113,14 @@ public class WSFedTest {
httpsConnector.setPort(Integer.parseInt(port));
httpsConnector.setSecure(true);
httpsConnector.setScheme("https");
- httpsConnector.setAttribute("sslProtocol", "TLS");
- httpsConnector.setAttribute("SSLEnabled", true);
- httpsConnector.setAttribute("keystorePass", "tompass");
- httpsConnector.setAttribute("keystoreFile", "test-classes/server.jks");
- httpsConnector.setAttribute("keyAlias", "mytomidpkey");
- httpsConnector.setAttribute("truststorePass", "tompass");
- httpsConnector.setAttribute("truststoreFile", "test-classes/server.jks");
- httpsConnector.setAttribute("clientAuth", "want");
+ httpsConnector.setProperty("sslProtocol", "TLS");
+ httpsConnector.setProperty("SSLEnabled", "true");
+ httpsConnector.setProperty("keystorePass", "tompass");
+ httpsConnector.setProperty("keystoreFile", "test-classes/server.jks");
+ httpsConnector.setProperty("keyAlias", "mytomidpkey");
+ httpsConnector.setProperty("truststorePass", "tompass");
+ httpsConnector.setProperty("truststoreFile", "test-classes/server.jks");
+ httpsConnector.setProperty("clientAuth", "want");
if (serverType == ServerType.IDP) {
server.getHost().setAppBase("tomcat/idp/webapps");
@@ -151,7 +151,7 @@ public class WSFedTest {
} else {
server.getHost().setAppBase("tomcat/rp/webapps");
- httpsConnector.setAttribute("clientAuth", "false");
+ httpsConnector.setProperty("clientAuth", "false");
FederationAuthenticator fa = new FederationAuthenticator();
fa.setConfigFile(targetDir.resolve("test-classes").resolve("fediz_config_wsfed.xml").toString());
diff --git a/systests/idp/src/test/java/org/apache/cxf/fediz/systests/idp/IdpTest.java b/systests/idp/src/test/java/org/apache/cxf/fediz/systests/idp/IdpTest.java
index 53eca9a..59dcf81 100644
--- a/systests/idp/src/test/java/org/apache/cxf/fediz/systests/idp/IdpTest.java
+++ b/systests/idp/src/test/java/org/apache/cxf/fediz/systests/idp/IdpTest.java
@@ -99,15 +99,15 @@ public class IdpTest {
httpsConnector.setPort(Integer.parseInt(port));
httpsConnector.setSecure(true);
httpsConnector.setScheme("https");
- httpsConnector.setAttribute("keyAlias", "mytomidpkey");
- httpsConnector.setAttribute("keystorePass", "tompass");
- httpsConnector.setAttribute("keystoreFile", "test-classes/server.jks");
- httpsConnector.setAttribute("truststorePass", "tompass");
- httpsConnector.setAttribute("truststoreFile", "test-classes/server.jks");
- httpsConnector.setAttribute("clientAuth", "want");
- // httpsConnector.setAttribute("clientAuth", "false");
- httpsConnector.setAttribute("sslProtocol", "TLS");
- httpsConnector.setAttribute("SSLEnabled", true);
+ httpsConnector.setProperty("keyAlias", "mytomidpkey");
+ httpsConnector.setProperty("keystorePass", "tompass");
+ httpsConnector.setProperty("keystoreFile", "test-classes/server.jks");
+ httpsConnector.setProperty("truststorePass", "tompass");
+ httpsConnector.setProperty("truststoreFile", "test-classes/server.jks");
+ httpsConnector.setProperty("clientAuth", "want");
+ // httpsConnector.setProperty("clientAuth", "false");
+ httpsConnector.setProperty("sslProtocol", "TLS");
+ httpsConnector.setProperty("SSLEnabled", "true");
server.getService().addConnector(httpsConnector);
@@ -811,13 +811,13 @@ public class IdpTest {
// Send a query parameter that's too big
@org.junit.Test
public void testLargeQueryParameterRejected() throws Exception {
- String url = "https://localhost:" + getIdpHttpsPort() + "/fediz-idp/federation?";
- url += "wa=wsignin1.0";
- url += "&whr=urn:org:apache:cxf:fediz:idp:realm-A";
- url += "&wtrealm=urn:org:apache:cxf:fediz:fedizhelloworld";
+ String url = "https://localhost:" + getIdpHttpsPort() + "/fediz-idp/federation?"
+ + "wa=wsignin1.0"
+ + "&whr=urn:org:apache:cxf:fediz:idp:realm-A"
+ + "&wtrealm=urn:org:apache:cxf:fediz:fedizhelloworld";
- StringBuilder sb = new StringBuilder("https://localhost:" + getRpHttpsPort() + "/"
- + getServletContextName() + "/secure/fedservlet");
+ StringBuilder sb = new StringBuilder("https://localhost:").append(getRpHttpsPort()).append('/')
+ .append(getServletContextName()).append("/secure/fedservlet");
for (int i = 0; i < 100; i++) {
sb.append("aaaaaaaaaa");
}
@@ -847,13 +847,13 @@ public class IdpTest {
// Send a query parameter that's bigger than the accepted default, but is allowed by configuration
@org.junit.Test
public void testLargeQueryParameterAccepted() throws Exception {
- String url = "https://localhost:" + getIdpHttpsPort() + "/fediz-idp/federation?";
- url += "wa=wsignin1.0";
- url += "&whr=urn:org:apache:cxf:fediz:idp:realm-A";
- url += "&wtrealm=urn:org:apache:cxf:fediz:fedizhelloworld";
+ String url = "https://localhost:" + getIdpHttpsPort() + "/fediz-idp/federation?"
+ + "wa=wsignin1.0"
+ + "&whr=urn:org:apache:cxf:fediz:idp:realm-A"
+ + "&wtrealm=urn:org:apache:cxf:fediz:fedizhelloworld";
- StringBuilder sb = new StringBuilder("https://localhost:" + getRpHttpsPort()
- + "/" + getServletContextName() + "/secure/fedservlet");
+ StringBuilder sb = new StringBuilder("https://localhost:").append(getRpHttpsPort()).append('/')
+ .append(getServletContextName()).append("/secure/fedservlet");
for (int i = 0; i < 50; i++) {
sb.append("aaaaaaaaaa");
}
diff --git a/systests/jetty9/src/test/java/org/apache/cxf/fediz/systests/jetty9/TomcatUtils.java b/systests/jetty9/src/test/java/org/apache/cxf/fediz/systests/jetty9/TomcatUtils.java
index aff1c74..a39bdf1 100644
--- a/systests/jetty9/src/test/java/org/apache/cxf/fediz/systests/jetty9/TomcatUtils.java
+++ b/systests/jetty9/src/test/java/org/apache/cxf/fediz/systests/jetty9/TomcatUtils.java
@@ -53,15 +53,15 @@ public final class TomcatUtils {
httpsConnector.setPort(Integer.parseInt(IDP_HTTPS_PORT));
httpsConnector.setSecure(true);
httpsConnector.setScheme("https");
- httpsConnector.setAttribute("keyAlias", "mytomidpkey");
- httpsConnector.setAttribute("keystorePass", "tompass");
- httpsConnector.setAttribute("keystoreFile", "test-classes/server.jks");
- httpsConnector.setAttribute("truststorePass", "tompass");
- httpsConnector.setAttribute("truststoreFile", "test-classes/server.jks");
- httpsConnector.setAttribute("clientAuth", "want");
- // httpsConnector.setAttribute("clientAuth", "false");
- httpsConnector.setAttribute("sslProtocol", "TLS");
- httpsConnector.setAttribute("SSLEnabled", true);
+ httpsConnector.setProperty("keyAlias", "mytomidpkey");
+ httpsConnector.setProperty("keystorePass", "tompass");
+ httpsConnector.setProperty("keystoreFile", "test-classes/server.jks");
+ httpsConnector.setProperty("truststorePass", "tompass");
+ httpsConnector.setProperty("truststoreFile", "test-classes/server.jks");
+ httpsConnector.setProperty("clientAuth", "want");
+ // httpsConnector.setProperty("clientAuth", "false");
+ httpsConnector.setProperty("sslProtocol", "TLS");
+ httpsConnector.setProperty("SSLEnabled", "true");
idpServer.getService().addConnector(httpsConnector);
diff --git a/systests/kerberos/src/test/java/org/apache/cxf/fediz/systests/kerberos/KerberosTest.java b/systests/kerberos/src/test/java/org/apache/cxf/fediz/systests/kerberos/KerberosTest.java
index c2ca4a3..482341d 100644
--- a/systests/kerberos/src/test/java/org/apache/cxf/fediz/systests/kerberos/KerberosTest.java
+++ b/systests/kerberos/src/test/java/org/apache/cxf/fediz/systests/kerberos/KerberosTest.java
@@ -131,15 +131,15 @@ public class KerberosTest {
httpsConnector.setPort(Integer.parseInt(port));
httpsConnector.setSecure(true);
httpsConnector.setScheme("https");
- httpsConnector.setAttribute("keyAlias", "mytomidpkey");
- httpsConnector.setAttribute("keystorePass", "tompass");
- httpsConnector.setAttribute("keystoreFile", "test-classes/server.jks");
- httpsConnector.setAttribute("truststorePass", "tompass");
- httpsConnector.setAttribute("truststoreFile", "test-classes/server.jks");
- httpsConnector.setAttribute("clientAuth", "want");
- // httpsConnector.setAttribute("clientAuth", "false");
- httpsConnector.setAttribute("sslProtocol", "TLS");
- httpsConnector.setAttribute("SSLEnabled", true);
+ httpsConnector.setProperty("keyAlias", "mytomidpkey");
+ httpsConnector.setProperty("keystorePass", "tompass");
+ httpsConnector.setProperty("keystoreFile", "test-classes/server.jks");
+ httpsConnector.setProperty("truststorePass", "tompass");
+ httpsConnector.setProperty("truststoreFile", "test-classes/server.jks");
+ httpsConnector.setProperty("clientAuth", "want");
+ // httpsConnector.setProperty("clientAuth", "false");
+ httpsConnector.setProperty("sslProtocol", "TLS");
+ httpsConnector.setProperty("SSLEnabled", "true");
server.getService().addConnector(httpsConnector);
diff --git a/systests/ldap/src/test/java/org/apache/cxf/fediz/systests/ldap/LDAPTest.java b/systests/ldap/src/test/java/org/apache/cxf/fediz/systests/ldap/LDAPTest.java
index bf46b16..348bbda 100644
--- a/systests/ldap/src/test/java/org/apache/cxf/fediz/systests/ldap/LDAPTest.java
+++ b/systests/ldap/src/test/java/org/apache/cxf/fediz/systests/ldap/LDAPTest.java
@@ -157,15 +157,15 @@ public class LDAPTest extends AbstractLdapTestUnit {
httpsConnector.setPort(Integer.parseInt(port));
httpsConnector.setSecure(true);
httpsConnector.setScheme("https");
- httpsConnector.setAttribute("keyAlias", "mytomidpkey");
- httpsConnector.setAttribute("keystorePass", "tompass");
- httpsConnector.setAttribute("keystoreFile", "test-classes/server.jks");
- httpsConnector.setAttribute("truststorePass", "tompass");
- httpsConnector.setAttribute("truststoreFile", "test-classes/server.jks");
- httpsConnector.setAttribute("clientAuth", "want");
- // httpsConnector.setAttribute("clientAuth", "false");
- httpsConnector.setAttribute("sslProtocol", "TLS");
- httpsConnector.setAttribute("SSLEnabled", true);
+ httpsConnector.setProperty("keyAlias", "mytomidpkey");
+ httpsConnector.setProperty("keystorePass", "tompass");
+ httpsConnector.setProperty("keystoreFile", "test-classes/server.jks");
+ httpsConnector.setProperty("truststorePass", "tompass");
+ httpsConnector.setProperty("truststoreFile", "test-classes/server.jks");
+ httpsConnector.setProperty("clientAuth", "want");
+ // httpsConnector.setProperty("clientAuth", "false");
+ httpsConnector.setProperty("sslProtocol", "TLS");
+ httpsConnector.setProperty("SSLEnabled", "true");
server.getService().addConnector(httpsConnector);
diff --git a/systests/oidc/src/test/java/org/apache/cxf/fediz/systests/oidc/AbstractOIDCTest.java b/systests/oidc/src/test/java/org/apache/cxf/fediz/systests/oidc/AbstractOIDCTest.java
index a17bf39..3513cdd 100644
--- a/systests/oidc/src/test/java/org/apache/cxf/fediz/systests/oidc/AbstractOIDCTest.java
+++ b/systests/oidc/src/test/java/org/apache/cxf/fediz/systests/oidc/AbstractOIDCTest.java
@@ -143,17 +143,17 @@ abstract class AbstractOIDCTest {
httpsConnector.setPort(port);
httpsConnector.setSecure(true);
httpsConnector.setScheme("https");
- httpsConnector.setAttribute("sslProtocol", "TLS");
- httpsConnector.setAttribute("SSLEnabled", true);
- httpsConnector.setAttribute("keystoreFile", "test-classes/server.jks");
- httpsConnector.setAttribute("keystorePass", "tompass");
+ httpsConnector.setProperty("sslProtocol", "TLS");
+ httpsConnector.setProperty("SSLEnabled", "true");
+ httpsConnector.setProperty("keystoreFile", "test-classes/server.jks");
+ httpsConnector.setProperty("keystorePass", "tompass");
if (null == servletContextName) { // IDP
server.getHost().setAppBase("tomcat/idp/webapps");
- httpsConnector.setAttribute("truststoreFile", "test-classes/server.jks");
- httpsConnector.setAttribute("truststorePass", "tompass");
- httpsConnector.setAttribute("clientAuth", "want");
+ httpsConnector.setProperty("truststoreFile", "test-classes/server.jks");
+ httpsConnector.setProperty("truststorePass", "tompass");
+ httpsConnector.setProperty("clientAuth", "want");
Path stsWebapp = targetDir.resolve(server.getHost().getAppBase()).resolve("fediz-idp-sts");
server.addWebapp("/fediz-idp-sts", stsWebapp.toString());
@@ -163,7 +163,7 @@ abstract class AbstractOIDCTest {
} else { // RP
server.getHost().setAppBase("tomcat/rp/webapps");
- httpsConnector.setAttribute("clientAuth", "false");
+ httpsConnector.setProperty("clientAuth", "false");
Path rpWebapp = targetDir.resolve(server.getHost().getAppBase()).resolve(servletContextName);
Context ctx = server.addWebapp(servletContextName, rpWebapp.toString());
diff --git a/systests/samlsso/src/test/java/org/apache/cxf/fediz/systests/samlsso/CXFTest.java b/systests/samlsso/src/test/java/org/apache/cxf/fediz/systests/samlsso/CXFTest.java
index d1f2f0e..9ad76e1 100644
--- a/systests/samlsso/src/test/java/org/apache/cxf/fediz/systests/samlsso/CXFTest.java
+++ b/systests/samlsso/src/test/java/org/apache/cxf/fediz/systests/samlsso/CXFTest.java
@@ -113,15 +113,15 @@ public class CXFTest extends AbstractTests {
httpsConnector.setPort(Integer.parseInt(port));
httpsConnector.setSecure(true);
httpsConnector.setScheme("https");
- httpsConnector.setAttribute("keyAlias", "mytomidpkey");
- httpsConnector.setAttribute("keystorePass", "tompass");
- httpsConnector.setAttribute("keystoreFile", "test-classes/server.jks");
- httpsConnector.setAttribute("truststorePass", "tompass");
- httpsConnector.setAttribute("truststoreFile", "test-classes/server.jks");
- httpsConnector.setAttribute("clientAuth", "want");
- // httpsConnector.setAttribute("clientAuth", "false");
- httpsConnector.setAttribute("sslProtocol", "TLS");
- httpsConnector.setAttribute("SSLEnabled", true);
+ httpsConnector.setProperty("keyAlias", "mytomidpkey");
+ httpsConnector.setProperty("keystorePass", "tompass");
+ httpsConnector.setProperty("keystoreFile", "test-classes/server.jks");
+ httpsConnector.setProperty("truststorePass", "tompass");
+ httpsConnector.setProperty("truststoreFile", "test-classes/server.jks");
+ httpsConnector.setProperty("clientAuth", "want");
+ // httpsConnector.setProperty("clientAuth", "false");
+ httpsConnector.setProperty("sslProtocol", "TLS");
+ httpsConnector.setProperty("SSLEnabled", "true");
server.getService().addConnector(httpsConnector);
diff --git a/systests/samlsso/src/test/java/org/apache/cxf/fediz/systests/samlsso/IdpTest.java b/systests/samlsso/src/test/java/org/apache/cxf/fediz/systests/samlsso/IdpTest.java
index 5aff4ee..52eff1a 100644
--- a/systests/samlsso/src/test/java/org/apache/cxf/fediz/systests/samlsso/IdpTest.java
+++ b/systests/samlsso/src/test/java/org/apache/cxf/fediz/systests/samlsso/IdpTest.java
@@ -139,15 +139,15 @@ public class IdpTest {
httpsConnector.setPort(Integer.parseInt(port));
httpsConnector.setSecure(true);
httpsConnector.setScheme("https");
- httpsConnector.setAttribute("keyAlias", "mytomidpkey");
- httpsConnector.setAttribute("keystorePass", "tompass");
- httpsConnector.setAttribute("keystoreFile", "test-classes/server.jks");
- httpsConnector.setAttribute("truststorePass", "tompass");
- httpsConnector.setAttribute("truststoreFile", "test-classes/server.jks");
- httpsConnector.setAttribute("clientAuth", "want");
- // httpsConnector.setAttribute("clientAuth", "false");
- httpsConnector.setAttribute("sslProtocol", "TLS");
- httpsConnector.setAttribute("SSLEnabled", true);
+ httpsConnector.setProperty("keyAlias", "mytomidpkey");
+ httpsConnector.setProperty("keystorePass", "tompass");
+ httpsConnector.setProperty("keystoreFile", "test-classes/server.jks");
+ httpsConnector.setProperty("truststorePass", "tompass");
+ httpsConnector.setProperty("truststoreFile", "test-classes/server.jks");
+ httpsConnector.setProperty("clientAuth", "want");
+ // httpsConnector.setProperty("clientAuth", "false");
+ httpsConnector.setProperty("sslProtocol", "TLS");
+ httpsConnector.setProperty("SSLEnabled", "true");
server.getService().addConnector(httpsConnector);
diff --git a/systests/samlsso/src/test/java/org/apache/cxf/fediz/systests/samlsso/JettyTest.java b/systests/samlsso/src/test/java/org/apache/cxf/fediz/systests/samlsso/JettyTest.java
index 2fde8e6..e952b5d 100644
--- a/systests/samlsso/src/test/java/org/apache/cxf/fediz/systests/samlsso/JettyTest.java
+++ b/systests/samlsso/src/test/java/org/apache/cxf/fediz/systests/samlsso/JettyTest.java
@@ -79,15 +79,15 @@ public class JettyTest extends AbstractTests {
httpsConnector.setPort(Integer.parseInt(IDP_HTTPS_PORT));
httpsConnector.setSecure(true);
httpsConnector.setScheme("https");
- httpsConnector.setAttribute("keyAlias", "mytomidpkey");
- httpsConnector.setAttribute("keystorePass", "tompass");
- httpsConnector.setAttribute("keystoreFile", "test-classes/server.jks");
- httpsConnector.setAttribute("truststorePass", "tompass");
- httpsConnector.setAttribute("truststoreFile", "test-classes/server.jks");
- httpsConnector.setAttribute("clientAuth", "want");
- // httpsConnector.setAttribute("clientAuth", "false");
- httpsConnector.setAttribute("sslProtocol", "TLS");
- httpsConnector.setAttribute("SSLEnabled", true);
+ httpsConnector.setProperty("keyAlias", "mytomidpkey");
+ httpsConnector.setProperty("keystorePass", "tompass");
+ httpsConnector.setProperty("keystoreFile", "test-classes/server.jks");
+ httpsConnector.setProperty("truststorePass", "tompass");
+ httpsConnector.setProperty("truststoreFile", "test-classes/server.jks");
+ httpsConnector.setProperty("clientAuth", "want");
+ // httpsConnector.setProperty("clientAuth", "false");
+ httpsConnector.setProperty("sslProtocol", "TLS");
+ httpsConnector.setProperty("SSLEnabled", "true");
idpServer.getService().addConnector(httpsConnector);
diff --git a/systests/samlsso/src/test/java/org/apache/cxf/fediz/systests/samlsso/SpringTest.java b/systests/samlsso/src/test/java/org/apache/cxf/fediz/systests/samlsso/SpringTest.java
index ce6a4ee..470c597 100644
--- a/systests/samlsso/src/test/java/org/apache/cxf/fediz/systests/samlsso/SpringTest.java
+++ b/systests/samlsso/src/test/java/org/apache/cxf/fediz/systests/samlsso/SpringTest.java
@@ -113,15 +113,15 @@ public class SpringTest extends AbstractTests {
httpsConnector.setPort(Integer.parseInt(port));
httpsConnector.setSecure(true);
httpsConnector.setScheme("https");
- httpsConnector.setAttribute("keyAlias", "mytomidpkey");
- httpsConnector.setAttribute("keystorePass", "tompass");
- httpsConnector.setAttribute("keystoreFile", "test-classes/server.jks");
- httpsConnector.setAttribute("truststorePass", "tompass");
- httpsConnector.setAttribute("truststoreFile", "test-classes/server.jks");
- httpsConnector.setAttribute("clientAuth", "want");
- // httpsConnector.setAttribute("clientAuth", "false");
- httpsConnector.setAttribute("sslProtocol", "TLS");
- httpsConnector.setAttribute("SSLEnabled", true);
+ httpsConnector.setProperty("keyAlias", "mytomidpkey");
+ httpsConnector.setProperty("keystorePass", "tompass");
+ httpsConnector.setProperty("keystoreFile", "test-classes/server.jks");
+ httpsConnector.setProperty("truststorePass", "tompass");
+ httpsConnector.setProperty("truststoreFile", "test-classes/server.jks");
+ httpsConnector.setProperty("clientAuth", "want");
+ // httpsConnector.setProperty("clientAuth", "false");
+ httpsConnector.setProperty("sslProtocol", "TLS");
+ httpsConnector.setProperty("SSLEnabled", "true");
server.getService().addConnector(httpsConnector);
diff --git a/systests/samlsso/src/test/java/org/apache/cxf/fediz/systests/samlsso/TomcatPluginTest.java b/systests/samlsso/src/test/java/org/apache/cxf/fediz/systests/samlsso/TomcatPluginTest.java
index d67a08b..8045e50 100644
--- a/systests/samlsso/src/test/java/org/apache/cxf/fediz/systests/samlsso/TomcatPluginTest.java
+++ b/systests/samlsso/src/test/java/org/apache/cxf/fediz/systests/samlsso/TomcatPluginTest.java
@@ -97,15 +97,15 @@ public class TomcatPluginTest extends AbstractTests {
httpsConnector.setPort(Integer.parseInt(port));
httpsConnector.setSecure(true);
httpsConnector.setScheme("https");
- httpsConnector.setAttribute("keyAlias", "mytomidpkey");
- httpsConnector.setAttribute("keystorePass", "tompass");
- httpsConnector.setAttribute("keystoreFile", "test-classes/server.jks");
- httpsConnector.setAttribute("truststorePass", "tompass");
- httpsConnector.setAttribute("truststoreFile", "test-classes/server.jks");
- httpsConnector.setAttribute("clientAuth", "want");
- // httpsConnector.setAttribute("clientAuth", "false");
- httpsConnector.setAttribute("sslProtocol", "TLS");
- httpsConnector.setAttribute("SSLEnabled", true);
+ httpsConnector.setProperty("keyAlias", "mytomidpkey");
+ httpsConnector.setProperty("keystorePass", "tompass");
+ httpsConnector.setProperty("keystoreFile", "test-classes/server.jks");
+ httpsConnector.setProperty("truststorePass", "tompass");
+ httpsConnector.setProperty("truststoreFile", "test-classes/server.jks");
+ httpsConnector.setProperty("clientAuth", "want");
+ // httpsConnector.setProperty("clientAuth", "false");
+ httpsConnector.setProperty("sslProtocol", "TLS");
+ httpsConnector.setProperty("SSLEnabled", "true");
server.getService().addConnector(httpsConnector);
diff --git a/systests/spring/src/test/java/org/apache/cxf/fediz/systests/spring/SpringTest.java b/systests/spring/src/test/java/org/apache/cxf/fediz/systests/spring/SpringTest.java
index 39c5d2a..c27847a 100644
--- a/systests/spring/src/test/java/org/apache/cxf/fediz/systests/spring/SpringTest.java
+++ b/systests/spring/src/test/java/org/apache/cxf/fediz/systests/spring/SpringTest.java
@@ -104,15 +104,15 @@ public class SpringTest extends AbstractTests {
httpsConnector.setPort(Integer.parseInt(port));
httpsConnector.setSecure(true);
httpsConnector.setScheme("https");
- httpsConnector.setAttribute("keyAlias", "mytomidpkey");
- httpsConnector.setAttribute("keystorePass", "tompass");
- httpsConnector.setAttribute("keystoreFile", "test-classes/server.jks");
- httpsConnector.setAttribute("truststorePass", "tompass");
- httpsConnector.setAttribute("truststoreFile", "test-classes/server.jks");
- httpsConnector.setAttribute("clientAuth", "want");
- // httpsConnector.setAttribute("clientAuth", "false");
- httpsConnector.setAttribute("sslProtocol", "TLS");
- httpsConnector.setAttribute("SSLEnabled", true);
+ httpsConnector.setProperty("keyAlias", "mytomidpkey");
+ httpsConnector.setProperty("keystorePass", "tompass");
+ httpsConnector.setProperty("keystoreFile", "test-classes/server.jks");
+ httpsConnector.setProperty("truststorePass", "tompass");
+ httpsConnector.setProperty("truststoreFile", "test-classes/server.jks");
+ httpsConnector.setProperty("clientAuth", "want");
+ // httpsConnector.setProperty("clientAuth", "false");
+ httpsConnector.setProperty("sslProtocol", "TLS");
+ httpsConnector.setProperty("SSLEnabled", "true");
server.getService().addConnector(httpsConnector);
diff --git a/systests/spring/src/test/java/org/apache/cxf/fediz/systests/spring/TokenExpiryTest.java b/systests/spring/src/test/java/org/apache/cxf/fediz/systests/spring/TokenExpiryTest.java
index 76932a5..96c10fa 100644
--- a/systests/spring/src/test/java/org/apache/cxf/fediz/systests/spring/TokenExpiryTest.java
+++ b/systests/spring/src/test/java/org/apache/cxf/fediz/systests/spring/TokenExpiryTest.java
@@ -77,15 +77,15 @@ public class TokenExpiryTest extends AbstractExpiryTests {
httpsConnector.setPort(Integer.parseInt(port));
httpsConnector.setSecure(true);
httpsConnector.setScheme("https");
- httpsConnector.setAttribute("keyAlias", "mytomidpkey");
- httpsConnector.setAttribute("keystorePass", "tompass");
- httpsConnector.setAttribute("keystoreFile", "test-classes/server.jks");
- httpsConnector.setAttribute("truststorePass", "tompass");
- httpsConnector.setAttribute("truststoreFile", "test-classes/server.jks");
- httpsConnector.setAttribute("clientAuth", "want");
- // httpsConnector.setAttribute("clientAuth", "false");
- httpsConnector.setAttribute("sslProtocol", "TLS");
- httpsConnector.setAttribute("SSLEnabled", true);
+ httpsConnector.setProperty("keyAlias", "mytomidpkey");
+ httpsConnector.setProperty("keystorePass", "tompass");
+ httpsConnector.setProperty("keystoreFile", "test-classes/server.jks");
+ httpsConnector.setProperty("truststorePass", "tompass");
+ httpsConnector.setProperty("truststoreFile", "test-classes/server.jks");
+ httpsConnector.setProperty("clientAuth", "want");
+ // httpsConnector.setProperty("clientAuth", "false");
+ httpsConnector.setProperty("sslProtocol", "TLS");
+ httpsConnector.setProperty("SSLEnabled", "true");
server.getService().addConnector(httpsConnector);
diff --git a/systests/tomcat/src/test/java/org/apache/cxf/fediz/systests/tomcat/TomcatLauncher.java b/systests/tomcat/src/test/java/org/apache/cxf/fediz/systests/tomcat/TomcatLauncher.java
index 2f0d7c2..ff29797 100644
--- a/systests/tomcat/src/test/java/org/apache/cxf/fediz/systests/tomcat/TomcatLauncher.java
+++ b/systests/tomcat/src/test/java/org/apache/cxf/fediz/systests/tomcat/TomcatLauncher.java
@@ -67,13 +67,13 @@ public abstract class TomcatLauncher {
httpsConnector.setPort(Integer.parseInt(port));
httpsConnector.setSecure(true);
httpsConnector.setScheme("https");
- httpsConnector.setAttribute("sslProtocol", "TLS");
- httpsConnector.setAttribute("SSLEnabled", true);
- httpsConnector.setAttribute("keystoreFile", "test-classes/server.jks");
- httpsConnector.setAttribute("keystorePass", "tompass");
- httpsConnector.setAttribute("truststoreFile", "test-classes/server.jks");
- httpsConnector.setAttribute("truststorePass", "tompass");
- httpsConnector.setAttribute("clientAuth", "want");
+ httpsConnector.setProperty("sslProtocol", "TLS");
+ httpsConnector.setProperty("SSLEnabled", "true");
+ httpsConnector.setProperty("keystoreFile", "test-classes/server.jks");
+ httpsConnector.setProperty("keystorePass", "tompass");
+ httpsConnector.setProperty("truststoreFile", "test-classes/server.jks");
+ httpsConnector.setProperty("truststorePass", "tompass");
+ httpsConnector.setProperty("clientAuth", "want");
server.getService().addConnector(httpsConnector);
if (null == servletContextName) { // IDP
diff --git a/systests/websphere/src/test/java/org/apache/cxf/fediz/systests/websphere/WebsphereTest.java b/systests/websphere/src/test/java/org/apache/cxf/fediz/systests/websphere/WebsphereTest.java
index 8101641..2671257 100644
--- a/systests/websphere/src/test/java/org/apache/cxf/fediz/systests/websphere/WebsphereTest.java
+++ b/systests/websphere/src/test/java/org/apache/cxf/fediz/systests/websphere/WebsphereTest.java
@@ -72,15 +72,15 @@ public class WebsphereTest extends AbstractTests {
httpsConnector.setPort(Integer.parseInt(idpHttpsPort));
httpsConnector.setSecure(true);
httpsConnector.setScheme("https");
- // httpsConnector.setAttribute("keyAlias", keyAlias);
- httpsConnector.setAttribute("keystorePass", "tompass");
- httpsConnector.setAttribute("keystoreFile", "test-classes/server.jks");
- httpsConnector.setAttribute("truststorePass", "tompass");
- httpsConnector.setAttribute("truststoreFile", "test-classes/server.jks");
- httpsConnector.setAttribute("clientAuth", "want");
- // httpsConnector.setAttribute("clientAuth", "false");
- httpsConnector.setAttribute("sslProtocol", "TLS");
- httpsConnector.setAttribute("SSLEnabled", true);
+ // httpsConnector.setProperty("keyAlias", keyAlias);
+ httpsConnector.setProperty("keystorePass", "tompass");
+ httpsConnector.setProperty("keystoreFile", "test-classes/server.jks");
+ httpsConnector.setProperty("truststorePass", "tompass");
+ httpsConnector.setProperty("truststoreFile", "test-classes/server.jks");
+ httpsConnector.setProperty("clientAuth", "want");
+ // httpsConnector.setProperty("clientAuth", "false");
+ httpsConnector.setProperty("sslProtocol", "TLS");
+ httpsConnector.setProperty("SSLEnabled", "true");
idpServer.getService().addConnector(httpsConnector);
[cxf-fediz] 01/02: Update to ehcache 3.8.1
Posted by bu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
buhhunyx pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git
commit 217ca819749dc2aca944b815d3b8b96959aef3fb
Author: Alexey Markevich <bu...@gmail.com>
AuthorDate: Wed Aug 26 11:17:19 2020 +0300
Update to ehcache 3.8.1
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index e891011..fb6e300 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,7 +47,7 @@
<cxf.build-utils.version>3.4.4</cxf.build-utils.version>
<easymock.version>4.0.2</easymock.version>
<ehcache.version>2.10.6</ehcache.version>
- <ehcache3.version>3.0.3</ehcache3.version>
+ <ehcache3.version>3.8.1</ehcache3.version>
<jcache.version>1.0.0</jcache.version>
<hsqldb.version>2.5.1</hsqldb.version>
<htmlunit.version>2.43.0</htmlunit.version>