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/08/30 14:19:22 UTC
cxf-fediz git commit: Updating Tomcat8
Repository: cxf-fediz
Updated Branches:
refs/heads/master 6da93223c -> 6dda060e3
Updating Tomcat8
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/6dda060e
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/6dda060e
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/6dda060e
Branch: refs/heads/master
Commit: 6dda060e3bd9b8a83dc6fd13d0b78c7444184954
Parents: 6da9322
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Wed Aug 30 15:19:13 2017 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Wed Aug 30 15:19:13 2017 +0100
----------------------------------------------------------------------
pom.xml | 2 +-
.../cxf/fediz/systests/custom/CustomParametersTest.java | 2 +-
.../org/apache/cxf/fediz/systests/cxf/FederationTest.java | 4 ++--
.../fediz/systests/federation/samlsso/SAMLSSOTest.java | 2 +-
.../cxf/fediz/systests/federation/unknown/WSFedTest.java | 10 +++++-----
.../cxf/fediz/systests/federation/wsfed/WSFedTest.java | 2 +-
.../java/org/apache/cxf/fediz/systests/idp/IdpTest.java | 2 +-
.../jetty9/ClientCertificatePreAuthSpringTest.java | 2 +-
.../cxf/fediz/systests/jetty9/ClientCertificateTest.java | 2 +-
.../cxf/fediz/systests/jetty9/JettyPreAuthSpringTest.java | 2 +-
.../org/apache/cxf/fediz/systests/jetty9/JettyTest.java | 2 +-
.../apache/cxf/fediz/systests/kerberos/KerberosTest.java | 6 +++---
.../java/org/apache/cxf/fediz/systests/ldap/LDAPTest.java | 2 +-
.../java/org/apache/cxf/fediz/systests/oidc/OIDCTest.java | 6 +++---
.../org/apache/cxf/fediz/systests/samlsso/IdpTest.java | 2 +-
.../org/apache/cxf/fediz/systests/spring/Spring3Test.java | 2 +-
.../org/apache/cxf/fediz/systests/spring/SpringTest.java | 2 +-
.../fediz/systests/tomcat8/AudienceRestrictionTest.java | 2 +-
.../cxf/fediz/systests/tomcat8/ClientCertificateTest.java | 2 +-
.../cxf/fediz/systests/tomcat8/HolderOfKeyTest.java | 2 +-
.../org/apache/cxf/fediz/systests/tomcat8/TomcatTest.java | 2 +-
.../org/apache/cxf/fediz/systests/tomcat8/WReqTest.java | 2 +-
22 files changed, 31 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/6dda060e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 0bc8de7..5f9c0b1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,7 +64,7 @@
<slf4j.version>1.7.25</slf4j.version>
<spring.version>4.3.10.RELEASE</spring.version>
<spring.security.version>4.2.3.RELEASE</spring.security.version>
- <tomcat8.version>8.5.12</tomcat8.version>
+ <tomcat8.version>8.5.20</tomcat8.version>
<wss4j.version>2.1.10</wss4j.version>
<tomcat.url>http://localhost:8080/manager/text</tomcat.url>
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/6dda060e/systests/custom/src/test/java/org/apache/cxf/fediz/systests/custom/CustomParametersTest.java
----------------------------------------------------------------------
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 f73dcbc..721d734 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
@@ -93,7 +93,7 @@ public class CustomParametersTest {
httpsConnector.setPort(Integer.parseInt(port));
httpsConnector.setSecure(true);
httpsConnector.setScheme("https");
- //httpsConnector.setAttribute("keyAlias", keyAlias);
+ httpsConnector.setAttribute("keyAlias", "mytomidpkey");
httpsConnector.setAttribute("keystorePass", "tompass");
httpsConnector.setAttribute("keystoreFile", "test-classes/server.jks");
httpsConnector.setAttribute("truststorePass", "tompass");
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/6dda060e/systests/cxf/src/test/java/org/apache/cxf/fediz/systests/cxf/FederationTest.java
----------------------------------------------------------------------
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 b377102..162843e 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
@@ -67,7 +67,7 @@ public class FederationTest extends AbstractTests {
httpsConnector.setPort(Integer.parseInt(idpHttpsPort));
httpsConnector.setSecure(true);
httpsConnector.setScheme("https");
- //httpsConnector.setAttribute("keyAlias", keyAlias);
+ httpsConnector.setAttribute("keyAlias", "mytomidpkey");
httpsConnector.setAttribute("keystorePass", "tompass");
httpsConnector.setAttribute("keystoreFile", "test-classes/server.jks");
httpsConnector.setAttribute("truststorePass", "tompass");
@@ -103,7 +103,7 @@ public class FederationTest extends AbstractTests {
httpsConnector.setPort(Integer.parseInt(rpHttpsPort));
httpsConnector.setSecure(true);
httpsConnector.setScheme("https");
- //httpsConnector.setAttribute("keyAlias", keyAlias);
+ httpsConnector.setAttribute("keyAlias", "mytomidpkey");
httpsConnector.setAttribute("keystorePass", "tompass");
httpsConnector.setAttribute("keystoreFile", "test-classes/server.jks");
httpsConnector.setAttribute("truststorePass", "tompass");
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/6dda060e/systests/federation/samlsso/src/test/java/org/apache/cxf/fediz/systests/federation/samlsso/SAMLSSOTest.java
----------------------------------------------------------------------
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 9bbe6cd..3620624 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
@@ -115,7 +115,7 @@ public class SAMLSSOTest {
httpsConnector.setPort(Integer.parseInt(port));
httpsConnector.setSecure(true);
httpsConnector.setScheme("https");
- //httpsConnector.setAttribute("keyAlias", keyAlias);
+ httpsConnector.setAttribute("keyAlias", "mytomidpkey");
httpsConnector.setAttribute("keystorePass", "tompass");
httpsConnector.setAttribute("keystoreFile", "test-classes/server.jks");
httpsConnector.setAttribute("truststorePass", "tompass");
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/6dda060e/systests/federation/unknown-subject/src/test/java/org/apache/cxf/fediz/systests/federation/unknown/WSFedTest.java
----------------------------------------------------------------------
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 e49aa2a..536f5ca 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
@@ -51,7 +51,7 @@ import org.junit.BeforeClass;
* This is a test for federation using a WS-Federation enabled web application. The web application is configured
* to use a different realm to that of the IdP. The IdP then redirects to a third party IdP for authentication.
* The subject of the trusted third party IdP is not known to the local STS of "realm A" however. Normally this
- * would result in failure, however the STS is configured to allow unknown principals for the realm of this
+ * would result in failure, however the STS is configured to allow unknown principals for the realm of this
* specific TTP IdP.
*/
public class WSFedTest {
@@ -104,7 +104,7 @@ public class WSFedTest {
httpsConnector.setPort(Integer.parseInt(port));
httpsConnector.setSecure(true);
httpsConnector.setScheme("https");
- //httpsConnector.setAttribute("keyAlias", keyAlias);
+ httpsConnector.setAttribute("keyAlias", "mytomidpkey");
httpsConnector.setAttribute("keystorePass", "tompass");
httpsConnector.setAttribute("keystoreFile", "test-classes/server.jks");
httpsConnector.setAttribute("truststorePass", "tompass");
@@ -179,7 +179,7 @@ public class WSFedTest {
public String getServletContextName() {
return "fedizhelloworld";
}
-
+
@org.junit.Test
public void testWSFederationUnknownSubject() throws Exception {
String url = "https://localhost:" + getRpHttpsPort() + "/wsfed/secure/fedservlet";
@@ -187,7 +187,7 @@ public class WSFedTest {
// Thread.sleep(60 * 2 * 1000);
String user = "ALICE"; // realm b credentials
String password = "ECILA";
-
+
final String bodyTextContent =
login(url, user, password, getIdpRealmbHttpsPort(), idpHttpsPort);
@@ -249,7 +249,7 @@ public class WSFedTest {
url2 += "wa=" + wa + "&";
url2 += "wtrealm=" + URLEncoder.encode(wtrealm, "UTF8") + "&";
url2 += "wresult=" + URLEncoder.encode(wresult, "UTF8");
-
+
webClient2.getOptions().setJavaScriptEnabled(false);
final HtmlPage idpPage2 = webClient2.getPage(url2);
webClient2.getOptions().setJavaScriptEnabled(true);
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/6dda060e/systests/federation/wsfed/src/test/java/org/apache/cxf/fediz/systests/federation/wsfed/WSFedTest.java
----------------------------------------------------------------------
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 f055ac3..4cd5d84 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
@@ -125,7 +125,7 @@ public class WSFedTest {
httpsConnector.setPort(Integer.parseInt(port));
httpsConnector.setSecure(true);
httpsConnector.setScheme("https");
- //httpsConnector.setAttribute("keyAlias", keyAlias);
+ httpsConnector.setAttribute("keyAlias", "mytomidpkey");
httpsConnector.setAttribute("keystorePass", "tompass");
httpsConnector.setAttribute("keystoreFile", "test-classes/server.jks");
httpsConnector.setAttribute("truststorePass", "tompass");
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/6dda060e/systests/idp/src/test/java/org/apache/cxf/fediz/systests/idp/IdpTest.java
----------------------------------------------------------------------
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 70db9ee..08450ea 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
@@ -97,7 +97,7 @@ public class IdpTest {
httpsConnector.setPort(Integer.parseInt(port));
httpsConnector.setSecure(true);
httpsConnector.setScheme("https");
- //httpsConnector.setAttribute("keyAlias", keyAlias);
+ httpsConnector.setAttribute("keyAlias", "mytomidpkey");
httpsConnector.setAttribute("keystorePass", "tompass");
httpsConnector.setAttribute("keystoreFile", "test-classes/server.jks");
httpsConnector.setAttribute("truststorePass", "tompass");
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/6dda060e/systests/jetty9/src/test/java/org/apache/cxf/fediz/systests/jetty9/ClientCertificatePreAuthSpringTest.java
----------------------------------------------------------------------
diff --git a/systests/jetty9/src/test/java/org/apache/cxf/fediz/systests/jetty9/ClientCertificatePreAuthSpringTest.java b/systests/jetty9/src/test/java/org/apache/cxf/fediz/systests/jetty9/ClientCertificatePreAuthSpringTest.java
index 7815d0e..673a306 100644
--- a/systests/jetty9/src/test/java/org/apache/cxf/fediz/systests/jetty9/ClientCertificatePreAuthSpringTest.java
+++ b/systests/jetty9/src/test/java/org/apache/cxf/fediz/systests/jetty9/ClientCertificatePreAuthSpringTest.java
@@ -102,7 +102,7 @@ public class ClientCertificatePreAuthSpringTest extends AbstractClientCertTests
httpsConnector.setPort(Integer.parseInt(idpHttpsPort));
httpsConnector.setSecure(true);
httpsConnector.setScheme("https");
- //httpsConnector.setAttribute("keyAlias", keyAlias);
+ httpsConnector.setAttribute("keyAlias", "mytomidpkey");
httpsConnector.setAttribute("keystorePass", "tompass");
httpsConnector.setAttribute("keystoreFile", "test-classes/server.jks");
httpsConnector.setAttribute("truststorePass", "tompass");
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/6dda060e/systests/jetty9/src/test/java/org/apache/cxf/fediz/systests/jetty9/ClientCertificateTest.java
----------------------------------------------------------------------
diff --git a/systests/jetty9/src/test/java/org/apache/cxf/fediz/systests/jetty9/ClientCertificateTest.java b/systests/jetty9/src/test/java/org/apache/cxf/fediz/systests/jetty9/ClientCertificateTest.java
index a0ad527..b2a86f4 100644
--- a/systests/jetty9/src/test/java/org/apache/cxf/fediz/systests/jetty9/ClientCertificateTest.java
+++ b/systests/jetty9/src/test/java/org/apache/cxf/fediz/systests/jetty9/ClientCertificateTest.java
@@ -102,7 +102,7 @@ public class ClientCertificateTest extends AbstractClientCertTests {
httpsConnector.setPort(Integer.parseInt(idpHttpsPort));
httpsConnector.setSecure(true);
httpsConnector.setScheme("https");
- //httpsConnector.setAttribute("keyAlias", keyAlias);
+ httpsConnector.setAttribute("keyAlias", "mytomidpkey");
httpsConnector.setAttribute("keystorePass", "tompass");
httpsConnector.setAttribute("keystoreFile", "test-classes/server.jks");
httpsConnector.setAttribute("truststorePass", "tompass");
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/6dda060e/systests/jetty9/src/test/java/org/apache/cxf/fediz/systests/jetty9/JettyPreAuthSpringTest.java
----------------------------------------------------------------------
diff --git a/systests/jetty9/src/test/java/org/apache/cxf/fediz/systests/jetty9/JettyPreAuthSpringTest.java b/systests/jetty9/src/test/java/org/apache/cxf/fediz/systests/jetty9/JettyPreAuthSpringTest.java
index 54375db..4037c04 100644
--- a/systests/jetty9/src/test/java/org/apache/cxf/fediz/systests/jetty9/JettyPreAuthSpringTest.java
+++ b/systests/jetty9/src/test/java/org/apache/cxf/fediz/systests/jetty9/JettyPreAuthSpringTest.java
@@ -86,7 +86,7 @@ public class JettyPreAuthSpringTest extends AbstractTests {
httpsConnector.setPort(Integer.parseInt(idpHttpsPort));
httpsConnector.setSecure(true);
httpsConnector.setScheme("https");
- //httpsConnector.setAttribute("keyAlias", keyAlias);
+ httpsConnector.setAttribute("keyAlias", "mytomidpkey");
httpsConnector.setAttribute("keystorePass", "tompass");
httpsConnector.setAttribute("keystoreFile", "test-classes/server.jks");
httpsConnector.setAttribute("truststorePass", "tompass");
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/6dda060e/systests/jetty9/src/test/java/org/apache/cxf/fediz/systests/jetty9/JettyTest.java
----------------------------------------------------------------------
diff --git a/systests/jetty9/src/test/java/org/apache/cxf/fediz/systests/jetty9/JettyTest.java b/systests/jetty9/src/test/java/org/apache/cxf/fediz/systests/jetty9/JettyTest.java
index 86c9f9c..a87d68d 100644
--- a/systests/jetty9/src/test/java/org/apache/cxf/fediz/systests/jetty9/JettyTest.java
+++ b/systests/jetty9/src/test/java/org/apache/cxf/fediz/systests/jetty9/JettyTest.java
@@ -84,7 +84,7 @@ public class JettyTest extends AbstractTests {
httpsConnector.setPort(Integer.parseInt(idpHttpsPort));
httpsConnector.setSecure(true);
httpsConnector.setScheme("https");
- //httpsConnector.setAttribute("keyAlias", keyAlias);
+ httpsConnector.setAttribute("keyAlias", "mytomidpkey");
httpsConnector.setAttribute("keystorePass", "tompass");
httpsConnector.setAttribute("keystoreFile", "test-classes/server.jks");
httpsConnector.setAttribute("truststorePass", "tompass");
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/6dda060e/systests/kerberos/src/test/java/org/apache/cxf/fediz/systests/kerberos/KerberosTest.java
----------------------------------------------------------------------
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 dc64681..e95cd5c 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
@@ -66,7 +66,7 @@ public class KerberosTest extends org.junit.Assert {
private static Tomcat idpServer;
private static Tomcat rpServer;
-
+
private static SimpleKdcServer kerbyServer;
@BeforeClass
@@ -77,7 +77,7 @@ public class KerberosTest extends org.junit.Assert {
Assert.assertNotNull("Property 'rp.https.port' null", rpHttpsPort);
WSSConfig.init();
-
+
String basedir = System.getProperty("basedir");
if (basedir == null) {
basedir = new File(".").getCanonicalPath();
@@ -130,7 +130,7 @@ public class KerberosTest extends org.junit.Assert {
httpsConnector.setPort(Integer.parseInt(port));
httpsConnector.setSecure(true);
httpsConnector.setScheme("https");
- //httpsConnector.setAttribute("keyAlias", keyAlias);
+ httpsConnector.setAttribute("keyAlias", "mytomidpkey");
httpsConnector.setAttribute("keystorePass", "tompass");
httpsConnector.setAttribute("keystoreFile", "test-classes/server.jks");
httpsConnector.setAttribute("truststorePass", "tompass");
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/6dda060e/systests/ldap/src/test/java/org/apache/cxf/fediz/systests/ldap/LDAPTest.java
----------------------------------------------------------------------
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 078b50f..a8691b7 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
@@ -167,7 +167,7 @@ public class LDAPTest extends AbstractLdapTestUnit {
httpsConnector.setPort(Integer.parseInt(port));
httpsConnector.setSecure(true);
httpsConnector.setScheme("https");
- //httpsConnector.setAttribute("keyAlias", keyAlias);
+ httpsConnector.setAttribute("keyAlias", "mytomidpkey");
httpsConnector.setAttribute("keystorePass", "tompass");
httpsConnector.setAttribute("keystoreFile", "test-classes/server.jks");
httpsConnector.setAttribute("truststorePass", "tompass");
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/6dda060e/systests/oidc/src/test/java/org/apache/cxf/fediz/systests/oidc/OIDCTest.java
----------------------------------------------------------------------
diff --git a/systests/oidc/src/test/java/org/apache/cxf/fediz/systests/oidc/OIDCTest.java b/systests/oidc/src/test/java/org/apache/cxf/fediz/systests/oidc/OIDCTest.java
index 858320c..401a4ce 100644
--- a/systests/oidc/src/test/java/org/apache/cxf/fediz/systests/oidc/OIDCTest.java
+++ b/systests/oidc/src/test/java/org/apache/cxf/fediz/systests/oidc/OIDCTest.java
@@ -126,7 +126,7 @@ public class OIDCTest {
httpsConnector.setPort(Integer.parseInt(port));
httpsConnector.setSecure(true);
httpsConnector.setScheme("https");
- //httpsConnector.setAttribute("keyAlias", keyAlias);
+ httpsConnector.setAttribute("keyAlias", "mytomidpkey");
httpsConnector.setAttribute("keystorePass", "tompass");
httpsConnector.setAttribute("keystoreFile", "test-classes/server.jks");
httpsConnector.setAttribute("truststorePass", "tompass");
@@ -964,8 +964,8 @@ public class OIDCTest {
webClient.close();
}
-
-
+
+
private static WebClient setupWebClient(String user, String password, String idpPort) {
final WebClient webClient = new WebClient();
webClient.getOptions().setUseInsecureSSL(true);
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/6dda060e/systests/samlsso/src/test/java/org/apache/cxf/fediz/systests/samlsso/IdpTest.java
----------------------------------------------------------------------
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 d0fa7b9..85eb9d2 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
@@ -129,7 +129,7 @@ public class IdpTest {
httpsConnector.setPort(Integer.parseInt(port));
httpsConnector.setSecure(true);
httpsConnector.setScheme("https");
- //httpsConnector.setAttribute("keyAlias", keyAlias);
+ httpsConnector.setAttribute("keyAlias", "mytomidpkey");
httpsConnector.setAttribute("keystorePass", "tompass");
httpsConnector.setAttribute("keystoreFile", "test-classes/server.jks");
httpsConnector.setAttribute("truststorePass", "tompass");
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/6dda060e/systests/spring/src/test/java/org/apache/cxf/fediz/systests/spring/Spring3Test.java
----------------------------------------------------------------------
diff --git a/systests/spring/src/test/java/org/apache/cxf/fediz/systests/spring/Spring3Test.java b/systests/spring/src/test/java/org/apache/cxf/fediz/systests/spring/Spring3Test.java
index aa56b40..9fac732 100644
--- a/systests/spring/src/test/java/org/apache/cxf/fediz/systests/spring/Spring3Test.java
+++ b/systests/spring/src/test/java/org/apache/cxf/fediz/systests/spring/Spring3Test.java
@@ -94,7 +94,7 @@ public class Spring3Test extends AbstractTests {
httpsConnector.setPort(Integer.parseInt(port));
httpsConnector.setSecure(true);
httpsConnector.setScheme("https");
- //httpsConnector.setAttribute("keyAlias", keyAlias);
+ httpsConnector.setAttribute("keyAlias", "mytomidpkey");
httpsConnector.setAttribute("keystorePass", "tompass");
httpsConnector.setAttribute("keystoreFile", "test-classes/server.jks");
httpsConnector.setAttribute("truststorePass", "tompass");
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/6dda060e/systests/spring/src/test/java/org/apache/cxf/fediz/systests/spring/SpringTest.java
----------------------------------------------------------------------
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 622b76f..a2aa5d5 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
@@ -93,7 +93,7 @@ public class SpringTest extends AbstractTests {
httpsConnector.setPort(Integer.parseInt(port));
httpsConnector.setSecure(true);
httpsConnector.setScheme("https");
- //httpsConnector.setAttribute("keyAlias", keyAlias);
+ httpsConnector.setAttribute("keyAlias", "mytomidpkey");
httpsConnector.setAttribute("keystorePass", "tompass");
httpsConnector.setAttribute("keystoreFile", "test-classes/server.jks");
httpsConnector.setAttribute("truststorePass", "tompass");
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/6dda060e/systests/tomcat8/src/test/java/org/apache/cxf/fediz/systests/tomcat8/AudienceRestrictionTest.java
----------------------------------------------------------------------
diff --git a/systests/tomcat8/src/test/java/org/apache/cxf/fediz/systests/tomcat8/AudienceRestrictionTest.java b/systests/tomcat8/src/test/java/org/apache/cxf/fediz/systests/tomcat8/AudienceRestrictionTest.java
index fee50b6..98aacc6 100644
--- a/systests/tomcat8/src/test/java/org/apache/cxf/fediz/systests/tomcat8/AudienceRestrictionTest.java
+++ b/systests/tomcat8/src/test/java/org/apache/cxf/fediz/systests/tomcat8/AudienceRestrictionTest.java
@@ -88,7 +88,7 @@ public class AudienceRestrictionTest {
httpsConnector.setPort(Integer.parseInt(port));
httpsConnector.setSecure(true);
httpsConnector.setScheme("https");
- //httpsConnector.setAttribute("keyAlias", keyAlias);
+ httpsConnector.setAttribute("keyAlias", "mytomidpkey");
httpsConnector.setAttribute("keystorePass", "tompass");
httpsConnector.setAttribute("keystoreFile", "test-classes/server.jks");
httpsConnector.setAttribute("truststorePass", "tompass");
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/6dda060e/systests/tomcat8/src/test/java/org/apache/cxf/fediz/systests/tomcat8/ClientCertificateTest.java
----------------------------------------------------------------------
diff --git a/systests/tomcat8/src/test/java/org/apache/cxf/fediz/systests/tomcat8/ClientCertificateTest.java b/systests/tomcat8/src/test/java/org/apache/cxf/fediz/systests/tomcat8/ClientCertificateTest.java
index 36cfa52..166425c 100644
--- a/systests/tomcat8/src/test/java/org/apache/cxf/fediz/systests/tomcat8/ClientCertificateTest.java
+++ b/systests/tomcat8/src/test/java/org/apache/cxf/fediz/systests/tomcat8/ClientCertificateTest.java
@@ -81,7 +81,7 @@ public class ClientCertificateTest extends AbstractClientCertTests {
httpsConnector.setPort(Integer.parseInt(port));
httpsConnector.setSecure(true);
httpsConnector.setScheme("https");
- //httpsConnector.setAttribute("keyAlias", keyAlias);
+ httpsConnector.setAttribute("keyAlias", "mytomidpkey");
httpsConnector.setAttribute("keystorePass", "tompass");
httpsConnector.setAttribute("keystoreFile", "test-classes/server.jks");
httpsConnector.setAttribute("truststorePass", "tompass");
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/6dda060e/systests/tomcat8/src/test/java/org/apache/cxf/fediz/systests/tomcat8/HolderOfKeyTest.java
----------------------------------------------------------------------
diff --git a/systests/tomcat8/src/test/java/org/apache/cxf/fediz/systests/tomcat8/HolderOfKeyTest.java b/systests/tomcat8/src/test/java/org/apache/cxf/fediz/systests/tomcat8/HolderOfKeyTest.java
index 6d3777b..039c65c 100644
--- a/systests/tomcat8/src/test/java/org/apache/cxf/fediz/systests/tomcat8/HolderOfKeyTest.java
+++ b/systests/tomcat8/src/test/java/org/apache/cxf/fediz/systests/tomcat8/HolderOfKeyTest.java
@@ -90,7 +90,7 @@ public class HolderOfKeyTest {
httpsConnector.setPort(Integer.parseInt(port));
httpsConnector.setSecure(true);
httpsConnector.setScheme("https");
- //httpsConnector.setAttribute("keyAlias", keyAlias);
+ httpsConnector.setAttribute("keyAlias", "mytomidpkey");
httpsConnector.setAttribute("keystorePass", "tompass");
httpsConnector.setAttribute("keystoreFile", "test-classes/server.jks");
httpsConnector.setAttribute("truststorePass", "tompass");
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/6dda060e/systests/tomcat8/src/test/java/org/apache/cxf/fediz/systests/tomcat8/TomcatTest.java
----------------------------------------------------------------------
diff --git a/systests/tomcat8/src/test/java/org/apache/cxf/fediz/systests/tomcat8/TomcatTest.java b/systests/tomcat8/src/test/java/org/apache/cxf/fediz/systests/tomcat8/TomcatTest.java
index 14fc3c0..ffff69c 100644
--- a/systests/tomcat8/src/test/java/org/apache/cxf/fediz/systests/tomcat8/TomcatTest.java
+++ b/systests/tomcat8/src/test/java/org/apache/cxf/fediz/systests/tomcat8/TomcatTest.java
@@ -78,7 +78,7 @@ public class TomcatTest extends AbstractTests {
httpsConnector.setPort(Integer.parseInt(port));
httpsConnector.setSecure(true);
httpsConnector.setScheme("https");
- //httpsConnector.setAttribute("keyAlias", keyAlias);
+ httpsConnector.setAttribute("keyAlias", "mytomidpkey");
httpsConnector.setAttribute("keystorePass", "tompass");
httpsConnector.setAttribute("keystoreFile", "test-classes/server.jks");
httpsConnector.setAttribute("truststorePass", "tompass");
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/6dda060e/systests/tomcat8/src/test/java/org/apache/cxf/fediz/systests/tomcat8/WReqTest.java
----------------------------------------------------------------------
diff --git a/systests/tomcat8/src/test/java/org/apache/cxf/fediz/systests/tomcat8/WReqTest.java b/systests/tomcat8/src/test/java/org/apache/cxf/fediz/systests/tomcat8/WReqTest.java
index 950127c..dc26f8f 100644
--- a/systests/tomcat8/src/test/java/org/apache/cxf/fediz/systests/tomcat8/WReqTest.java
+++ b/systests/tomcat8/src/test/java/org/apache/cxf/fediz/systests/tomcat8/WReqTest.java
@@ -90,7 +90,7 @@ public class WReqTest {
httpsConnector.setPort(Integer.parseInt(port));
httpsConnector.setSecure(true);
httpsConnector.setScheme("https");
- //httpsConnector.setAttribute("keyAlias", keyAlias);
+ httpsConnector.setAttribute("keyAlias", "mytomidpkey");
httpsConnector.setAttribute("keystorePass", "tompass");
httpsConnector.setAttribute("keystoreFile", "test-classes/server.jks");
httpsConnector.setAttribute("truststorePass", "tompass");